Merge branch 'main' into 50649

Author: privatenumber

.github/workflows/scorecard.yml

@@ -33,7 +33,7 @@ jobs:
 
  steps:
  - name: Harden Runner
- uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+ uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
  with:
  egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
@@ -73,6 +73,6 @@ jobs:
 
  # Upload the results to GitHub's code scanning dashboard.
  - name: Upload to code-scanning
- uses: github/codeql-action/upload-sarif@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
+ uses: github/codeql-action/upload-sarif@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
  with:
  sarif_file: results.sarif

benchmark/util/format.js

@@ -18,7 +18,7 @@ const inputs = {
 };
 
 const bench = common.createBenchmark(main, {
- n: [1e5],
+ n: [1e6],
  type: Object.keys(inputs),
 });
 

benchmark/util/inspect-array.js

@@ -4,7 +4,7 @@ const common = require('../common');
 const util = require('util');
 
 const bench = common.createBenchmark(main, {
- n: [5e2],
+ n: [5e3],
  len: [1e2, 1e5],
  type: [
  'denseArray',

benchmark/util/normalize-encoding.js

@@ -21,7 +21,7 @@ const inputs = [
 
 const bench = common.createBenchmark(main, {
  input: inputs.concat(Object.keys(groupedInputs)),
- n: [1e5],
+ n: [1e6],
 }, {
  flags: '--expose-internals',
 });

benchmark/util/text-decoder.js

@@ -6,8 +6,8 @@ const bench = common.createBenchmark(main, {
  encoding: ['utf-8', 'latin1', 'iso-8859-3'],
  ignoreBOM: [0, 1],
  fatal: [0, 1],
- len: [256, 1024 * 16, 1024 * 512],
- n: [1e2],
+ len: [256, 1024 * 16, 1024 * 128],
+ n: [1e3],
  type: ['SharedArrayBuffer', 'ArrayBuffer', 'Buffer'],
 });
 

benchmark/util/type-check.js

@@ -29,7 +29,7 @@ const bench = common.createBenchmark(main, {
  type: Object.keys(args),
  version: ['native', 'js'],
  argument: ['true', 'false-primitive', 'false-object'],
- n: [1e5],
+ n: [1e6],
 }, {
  flags: ['--expose-internals', '--no-warnings'],
 });

deps/undici/src/lib/api/api-request.js

@@ -177,3 +177,4 @@ function request (opts, callback) {
 }
 
 module.exports = request
+module.exports.RequestHandler = RequestHandler

deps/undici/src/lib/api/readable.js

@@ -180,7 +180,7 @@ module.exports = class BodyReadable extends Readable {
  this
  .on('close', function () {
  signalListenerCleanup()
- if (signal?.aborted) {
+ if (signal && signal.aborted) {
  reject(signal.reason || Object.assign(new Error('The operation was aborted'), { name: 'AbortError' }))
  } else {
  resolve(null)

deps/undici/src/lib/cache/symbols.js

@@ -1,5 +1,5 @@
 'use strict'
 
 module.exports = {
- kConstruct: Symbol('constructable')
+ kConstruct: require('../core/symbols').kConstruct
 }

deps/undici/src/lib/core/symbols.js

@@ -58,5 +58,6 @@ module.exports = {
  kHTTP1BuildRequest: Symbol('http1 build request'),
  kHTTP2CopyHeaders: Symbol('http2 copy headers'),
  kHTTPConnVersion: Symbol('http connection version'),
- kRetryHandlerDefaultRetry: Symbol('retry agent default retry')
+ kRetryHandlerDefaultRetry: Symbol('retry agent default retry'),
+ kConstruct: Symbol('constructable')
 }