Merge branch 'nodejs:main' into main

Author: mertcanaltin

.github/dependabot.yml

@@ -0,0 +1,9 @@
+# Set update schedule for GitHub Actions
+
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: monthly
+    open-pull-requests-limit: 10

.github/workflows/coverage-linux.yml

@@ -37,11 +37,11 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c  # v3.3.0
         with:
           persist-credentials: false
       - name: Set up Python ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435  # v4.5.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: Environment Information
@@ -64,6 +64,6 @@ jobs:
       - name: Clean tmp
         run: rm -rf coverage/tmp && rm -rf out
       - name: Upload
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70  # v3.1.1
         with:
           directory: ./coverage

.github/workflows/daily-wpt-fyi.yml

@@ -62,10 +62,10 @@ jobs:
           ref: ${{ env.NIGHTLY_REF || steps.setup-node.outputs.node-version }}
       - name: Set env.NODE
         run: echo "NODE=$(which node)" >> $GITHUB_ENV
-      - name: Set env.WPT_DAILY_REF
+      - name: Set env.WPT_REVISION
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: echo "WPT_DAILY_REF=$(gh api /repos/web-platform-tests/wpt/branches/epochs/daily --jq '.commit.sha')" >> $GITHUB_ENV
+        run: echo "WPT_REVISION=$(gh api /repos/web-platform-tests/wpt/branches/epochs/daily --jq '.commit.sha')" >> $GITHUB_ENV
 
       # replace checked out WPT with the synchronized branch
       - name: Remove stale WPT
@@ -78,10 +78,7 @@ jobs:
           persist-credentials: false
           path: test/fixtures/wpt
           clean: false
-          ref: ${{ env.WPT_DAILY_REF }}
-      - name: Set env.WPT_REVISION
-        run: echo "WPT_REVISION=$(git rev-parse HEAD)" >> $GITHUB_ENV
-        working-directory: test/fixtures/wpt
+          ref: ${{ env.WPT_REVISION }}
 
       - name: Run WPT and generate report
         run: make test-wpt-report || true

.github/workflows/tools.yml

@@ -154,6 +154,16 @@ jobs:
                 echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV
                 ./tools/dep_updaters/update-ada.sh "$NEW_VERSION"
               fi
+          - id: nghttp2
+            subsystem: deps
+            label: dependencies
+            run: |
+              NEW_VERSION=$(gh api repos/nghttp2/nghttp2/releases/latest -q '.tag_name|ltrimstr("v")')
+              CURRENT_VERSION=$(grep "#define NGHTTP2_VERSION" ./deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h | sed -n "s/^.*VERSION \(.*\)/\1/p")
+              if [ "$NEW_VERSION" != "$CURRENT_VERSION" ]; then
+                echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV
+                ./tools/update-nghttp2.sh "$NEW_VERSION"
+              fi
     steps:
       - uses: actions/checkout@v3
         with:

AUTHORS

@@ -3609,5 +3609,7 @@ Mohamed Akram <mohd-akram@users.noreply.github.com>
 三咲智子 Kevin Deng <sxzz@sxzz.moe>
 Nicolas DUBIEN <github@dubien.org>
 richiemccoll <richie.mccoll@hotmail.co.uk>
+sinkhaha <1468709106@qq.com>
+Mert Can Altın <mertgold60@gmail.com>
 
 # Generated by tools/update-authors.mjs

CHANGELOG.md

@@ -35,7 +35,8 @@ release.
 </tr>
 <tr>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V19.md#19.6.1">19.6.1</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V19.md#19.7.0">19.7.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V19.md#19.6.1">19.6.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V19.md#19.6.0">19.6.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V19.md#19.5.0">19.5.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V19.md#19.4.0">19.4.0</a><br/>
@@ -46,7 +47,8 @@ release.
 <a href="doc/changelogs/CHANGELOG_V19.md#19.0.0">19.0.0</a><br/>
   </td>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V18.md#18.14.1">18.14.1</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V18.md#18.14.2">18.14.2</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V18.md#18.14.1">18.14.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V18.md#18.14.0">18.14.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V18.md#18.13.0">18.13.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V18.md#18.12.1">18.12.1</a><br/>

Makefile

@@ -368,6 +368,9 @@ DOCBUILDSTAMP_PREREQS = tools/doc/addon-verify.mjs doc/api/addons.md
 ifeq ($(OSTYPE),aix)
 DOCBUILDSTAMP_PREREQS := $(DOCBUILDSTAMP_PREREQS) out/$(BUILDTYPE)/node.exp
 endif
+ifeq ($(OSTYPE),os400)
+DOCBUILDSTAMP_PREREQS := $(DOCBUILDSTAMP_PREREQS) out/$(BUILDTYPE)/node.exp
+endif
 
 node_use_openssl = $(call available-node,"-p" \
 			 "process.versions.openssl != undefined")

benchmark/assert/deepequal-buffer.js

@@ -6,27 +6,47 @@ const bench = common.createBenchmark(main, {
   n: [2e4],
   len: [1e2, 1e3],
   strict: [0, 1],
-  method: ['deepEqual', 'notDeepEqual'],
+  arrayBuffer: [0, 1],
+  method: ['deepEqual', 'notDeepEqual', 'unequal_length'],
+}, {
+  combinationFilter: (p) => {
+    return p.strict === 1 || p.method === 'deepEqual';
+  },
 });
 
-function main({ len, n, method, strict }) {
-  const data = Buffer.allocUnsafe(len + 1);
-  const actual = Buffer.alloc(len);
-  const expected = Buffer.alloc(len);
-  const expectedWrong = Buffer.alloc(len + 1);
-  data.copy(actual);
-  data.copy(expected);
-  data.copy(expectedWrong);
+function main({ len, n, method, strict, arrayBuffer }) {
+  let actual = Buffer.alloc(len);
+  let expected = Buffer.alloc(len + Number(method === 'unequal_length'));
+
+
+  if (method === 'unequal_length') {
+    method = 'notDeepEqual';
+  }
+
+  for (let i = 0; i < len; i++) {
+    actual.writeInt8(i % 128, i);
+    expected.writeInt8(i % 128, i);
+  }
+
+  if (method.includes('not')) {
+    const position = Math.floor(len / 2);
+    expected[position] = expected[position] + 1;
+  }
 
   if (strict) {
     method = method.replace('eep', 'eepStrict');
   }
+
   const fn = assert[method];
-  const value2 = method.includes('not') ? expectedWrong : expected;
+
+  if (arrayBuffer) {
+    actual = actual.buffer;
+    expected = expected.buffer;
+  }
 
   bench.start();
   for (let i = 0; i < n; ++i) {
-    fn(actual, value2);
+    fn(actual, expected);
   }
   bench.end(n);
 }

benchmark/assert/deepequal-object.js

@@ -4,14 +4,21 @@ const common = require('../common.js');
 const assert = require('assert');
 
 const bench = common.createBenchmark(main, {
-  n: [5e3],
-  size: [1e2, 1e3, 5e4],
-  strict: [0, 1],
+  n: [25, 2e2, 2e3],
+  size: [1e2, 1e3, 1e4],
+  strict: [1],
   method: ['deepEqual', 'notDeepEqual'],
+}, {
+  combinationFilter: (p) => {
+    return p.size === 1e4 && p.n === 25 ||
+           p.size === 1e3 && p.n === 2e2 ||
+           p.size === 1e2 && p.n === 2e3 ||
+           p.size === 1;
+  },
 });
 
-function createObj(source, add = '') {
-  return source.map((n) => ({
+function createObj(size, add = '') {
+  return Array.from({ length: size }, (n) => ({
     foo: 'yarp',
     nope: {
       bar: `123${add}`,
@@ -24,22 +31,17 @@ function createObj(source, add = '') {
 }
 
 function main({ size, n, method, strict }) {
-  const len = Math.min(Math.ceil(n / size), 20);
-
-  const source = Array.apply(null, Array(size));
-  const actual = createObj(source);
-  const expected = createObj(source);
-  const expectedWrong = createObj(source, '4');
-
   if (strict) {
     method = method.replace('eep', 'eepStrict');
   }
   const fn = assert[method];
-  const value2 = method.includes('not') ? expectedWrong : expected;
+
+  const actual = createObj(size);
+  const expected = method.includes('not') ? createObj(size, '4') : createObj(size);
 
   bench.start();
-  for (let i = 0; i < len; ++i) {
-    fn(actual, value2);
+  for (let i = 0; i < n; ++i) {
+    fn(actual, expected);
   }
-  bench.end(len);
+  bench.end(n);
 }

benchmark/assert/deepequal-prims-and-objs-big-loop.js

@@ -2,35 +2,77 @@
 const common = require('../common.js');
 const assert = require('assert');
 
+const circular = {};
+circular.circular = circular;
+const circular2 = {};
+circular2.circular = circular2;
+const notCircular = {};
+notCircular.circular = {};
+
 const primValues = {
-  'string': 'a',
-  'number': 1,
-  'object': { 0: 'a' },
+  'string': 'abcdef',
+  'number': 1_000,
+  'boolean': true,
+  'object': { property: 'abcdef' },
+  'object_other_property': { property: 'abcdef' },
+  'array': [1, 2, 3],
+  'set_object': new Set([[1]]),
+  'set_simple': new Set([1, 2, 3]),
+  'circular': circular,
+  'empty_object': {},
+  'regexp': /abc/i,
+  'date': new Date(),
+};
+
+const primValues2 = {
+  'object': { property: 'abcdef' },
   'array': [1, 2, 3],
+  'set_object': new Set([[1]]),
+  'set_simple': new Set([1, 3, 2]),
+  'circular': circular2,
+  'empty_object': {},
+  'regexp': /abc/i,
+  'date': new Date(primValues.date),
+};
+
+const primValuesUnequal = {
+  'string': 'abcdez',
+  'number': 1_001,
+  'boolean': false,
+  'object': { property2: 'abcdef' },
+  'array': [1, 3, 2],
+  'set_object': new Set([[2]]),
+  'set_simple': new Set([1, 4, 2]),
+  'circular': notCircular,
+  'empty_object': [],
+  'regexp': /abc/g,
+  'date': new Date(primValues.date.getTime() + 1),
 };
 
 const bench = common.createBenchmark(main, {
   primitive: Object.keys(primValues),
-  n: [2e4],
+  n: [1e5],
   strict: [0, 1],
   method: ['deepEqual', 'notDeepEqual'],
+}, {
+  combinationFilter: (p) => {
+    return p.strict === 1 || p.method === 'deepEqual';
+  },
 });
 
 function main({ n, primitive, method, strict }) {
   const prim = primValues[primitive];
-  const actual = prim;
-  const expected = prim;
-  const expectedWrong = 'b';
+  const actual = primValues2[primitive] ?? prim;
+  const expected = method.includes('not') ? primValuesUnequal[primitive] : prim;
 
   if (strict) {
     method = method.replace('eep', 'eepStrict');
   }
   const fn = assert[method];
-  const value2 = method.includes('not') ? expectedWrong : expected;
 
   bench.start();
   for (let i = 0; i < n; ++i) {
-    fn([actual], [value2]);
+    fn(actual, expected);
   }
   bench.end(n);
 }

benchmark/assert/deepequal-prims-and-objs-big-array-set.js renamed to benchmark/assert/deepequal-simple-array-and-set.js

@@ -4,18 +4,10 @@ const common = require('../common.js');
 const { deepEqual, deepStrictEqual, notDeepEqual, notDeepStrictEqual } =
   require('assert');
 
-const primValues = {
-  'string': 'a',
-  'number': 1,
-  'object': { 0: 'a' },
-  'array': [1, 2, 3],
-};
-
 const bench = common.createBenchmark(main, {
-  primitive: Object.keys(primValues),
-  n: [25],
-  len: [2e4],
-  strict: [0, 1],
+  n: [5e2],
+  len: [1e4],
+  strict: [1],
   method: [
     'deepEqual_Array',
     'notDeepEqual_Array',
@@ -32,38 +24,32 @@ function run(fn, n, actual, expected) {
   bench.end(n);
 }
 
-function main({ n, len, primitive, method, strict }) {
-  const prim = primValues[primitive];
+function main({ n, len, method, strict }) {
   const actual = [];
   const expected = [];
-  const expectedWrong = [];
 
-  for (let x = 0; x < len; x++) {
-    actual.push(prim);
-    expected.push(prim);
-    expectedWrong.push(prim);
+  for (let i = 0; i < len; i++) {
+    actual.push(i);
+    expected.push(i);
+  }
+  if (method.includes('not')) {
+    expected[len - 1] += 1;
   }
-  expectedWrong.pop();
-  expectedWrong.push('b');
-
-  // Note: primitives are only added once to a set
-  const actualSet = new Set(actual);
-  const expectedSet = new Set(expected);
-  const expectedWrongSet = new Set(expectedWrong);
 
   switch (method) {
     case 'deepEqual_Array':
       run(strict ? deepStrictEqual : deepEqual, n, actual, expected);
       break;
     case 'notDeepEqual_Array':
-      run(strict ? notDeepStrictEqual : notDeepEqual, n, actual, expectedWrong);
+      run(strict ? notDeepStrictEqual : notDeepEqual, n, actual, expected);
       break;
     case 'deepEqual_Set':
-      run(strict ? deepStrictEqual : deepEqual, n, actualSet, expectedSet);
+      run(strict ? deepStrictEqual : deepEqual,
+          n, new Set(actual), new Set(expected));
       break;
     case 'notDeepEqual_Set':
       run(strict ? notDeepStrictEqual : notDeepEqual,
-          n, actualSet, expectedWrongSet);
+          n, new Set(actual), new Set(expected));
       break;
     default:
       throw new Error(`Unsupported method "${method}"`);