Fix tests in v5.x for Node 20

.taprc

@@ -3,5 +3,5 @@ jsx: false
 flow: false
 coverage: false
 expose-gc: true
-timeout: 60
+timeout: 120
 check-coverage: false

lib/cookies/index.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { parseSetCookie } = require('./parse')
-const { stringify, getHeadersList } = require('./util')
+const { stringify } = require('./util')
 const { webidl } = require('../fetch/webidl')
 const { Headers } = require('../fetch/headers')
 
@@ -77,14 +77,13 @@ function getSetCookies (headers) {
 
   webidl.brandCheck(headers, Headers, { strict: false })
 
-  const cookies = getHeadersList(headers).cookies
+  const cookies = headers.getSetCookie()
 
   if (!cookies) {
     return []
   }
 
-  // In older versions of undici, cookies is a list of name:value.
-  return cookies.map((pair) => parseSetCookie(Array.isArray(pair) ? pair[1] : pair))
+  return cookies.map((pair) => parseSetCookie(pair))
 }
 
 /**

lib/cookies/util.js

@@ -1,8 +1,9 @@
 'use strict'
 
-const assert = require('assert')
-const { kHeadersList } = require('../core/symbols')
-
+/**
+ * @param {string} value
+ * @returns {boolean}
+ */
 function isCTLExcludingHtab (value) {
   if (value.length === 0) {
     return false
@@ -263,29 +264,11 @@ function stringify (cookie) {
   return out.join('; ')
 }
 
-let kHeadersListNode
-
-function getHeadersList (headers) {
-  if (headers[kHeadersList]) {
-    return headers[kHeadersList]
-  }
-
-  if (!kHeadersListNode) {
-    kHeadersListNode = Object.getOwnPropertySymbols(headers).find(
-      (symbol) => symbol.description === 'headers list'
-    )
-
-    assert(kHeadersListNode, 'Headers cannot be parsed')
-  }
-
-  const headersList = headers[kHeadersListNode]
-  assert(headersList)
-
-  return headersList
-}
-
 module.exports = {
   isCTLExcludingHtab,
-  stringify,
-  getHeadersList
+  validateCookieName,
+  validateCookiePath,
+  validateCookieValue,
+  toIMFDate,
+  stringify
 }

lib/fetch/headers.js

@@ -10,6 +10,7 @@ const {
   isValidHeaderName,
   isValidHeaderValue
 } = require('./util')
+const util = require('util')
 const { webidl } = require('./webidl')
 const assert = require('assert')
 
@@ -563,6 +564,9 @@ Object.defineProperties(Headers.prototype, {
   [Symbol.toStringTag]: {
     value: 'Headers',
     configurable: true
+  },
+  [util.inspect.custom]: {
+    enumerable: false
   }
 })
 

test/client.js

@@ -18,6 +18,8 @@ const hasIPv6 = (() => {
   )
 })()
 
+const isNode20OrHigher = Number(process.versions.node.split('.')[0]) >= 20
+
 test('basic get', (t) => {
   t.plan(24)
 
@@ -1896,7 +1898,7 @@ test('async iterator early return closes early', (t) => {
   })
 })
 
-test('async iterator yield unsupported TypedArray', (t) => {
+test('async iterator yield unsupported TypedArray', { skip: isNode20OrHigher }, (t) => {
   t.plan(3)
   const server = createServer((req, res) => {
     req.on('end', () => {

test/cookie/global-headers.js

@@ -7,7 +7,6 @@ const {
   getSetCookies,
   setCookie
 } = require('../..')
-const { getHeadersList } = require('../../lib/cookies/util')
 
 /* global Headers */
 
@@ -41,7 +40,7 @@ test('Using global Headers', (t) => {
       'set-cookie': 'undici=getSetCookies; Secure'
     })
 
-    const supportsCookies = getHeadersList(headers).cookies
+    const supportsCookies = headers.getSetCookie()
 
     if (!supportsCookies) {
       t.same(getSetCookies(headers), [])

test/http2.js

@@ -402,11 +402,16 @@ test(
         }
       })
     } catch (error) {
-      t.equal(
-        error.message,
-        'Client network socket disconnected before secure TLS connection was established'
+      t.ok(
+        error.message === 'Client network socket disconnected before secure TLS connection was established' ||
+        error.message.includes('SSL routines:ssl3_read_bytes:tlsv1 alert no application protocol'),
+        `Error message should be as expected: ${error.message}`
+      )
+      t.ok(
+        error.code === 'ECONNRESET' ||
+        error.code === 'ERR_SSL_TLSV1_ALERT_NO_APPLICATION_PROTOCOL',
+        `Error code should be as expected: ${error.code}`
       )
-      t.equal(error.code, 'ECONNRESET')
     }
   }
 )

test/redirect-request.js

@@ -13,14 +13,20 @@ const {
   startRedirectingWithQueryParams
 } = require('./utils/redirecting-servers')
 const { createReadable, createReadableStream } = require('./utils/stream')
+const Agent = undici.Agent
 
 for (const factory of [
   (server, opts) => new undici.Agent(opts),
   (server, opts) => new undici.Pool(`http://${server}`, opts),
   (server, opts) => new undici.Client(`http://${server}`, opts)
 ]) {
   const request = (t, server, opts, ...args) => {
-    const dispatcher = factory(server, opts)
+    opts = opts || {}
+    const dispatcher = factory(server, {
+      keepAliveMaxTimeout: 1000,
+      keepAliveTimeout: 1000,
+      ...opts
+    })
     t.teardown(() => dispatcher.close())
     return undici.request(args[0], { ...args[1], dispatcher }, args[2])
   }
@@ -348,9 +354,16 @@ for (const factory of [
 t.test('should follow redirections when going cross origin', async t => {
   const [server1, server2, server3] = await startRedirectingChainServers(t)
 
+  const agent = new Agent({
+    keepAliveTimeout: 1000,
+    keepAliveMaxTimeout: 1000
+  })
+  t.teardown(agent.close.bind(agent))
+
   const { statusCode, headers, body: bodyStream, context: { history } } = await undici.request(`http://${server1}`, {
     method: 'POST',
-    maxRedirections: 10
+    maxRedirections: 10,
+    dispatcher: agent
   })
 
   const body = await bodyStream.text()
@@ -371,10 +384,17 @@ t.test('should follow redirections when going cross origin', async t => {
 t.test('should handle errors (callback)', t => {
   t.plan(1)
 
+  const agent = new Agent({
+    keepAliveTimeout: 1000,
+    keepAliveMaxTimeout: 1000
+  })
+  t.teardown(agent.close.bind(agent))
+
   undici.request(
     'http://localhost:0',
     {
-      maxRedirections: 10
+      maxRedirections: 10,
+      dispatcher: agent
     },
     error => {
       t.match(error.code, /EADDRNOTAVAIL|ECONNREFUSED/)
@@ -383,18 +403,29 @@ t.test('should handle errors (callback)', t => {
 })
 
 t.test('should handle errors (promise)', async t => {
+  const agent = new Agent({
+    keepAliveTimeout: 1000,
+    keepAliveMaxTimeout: 1000
+  })
+  t.teardown(agent.close.bind(agent))
   try {
-    await undici.request('http://localhost:0', { maxRedirections: 10 })
+    await undici.request('http://localhost:0', { maxRedirections: 10, dispatcher: agent })
     t.fail('Did not throw')
   } catch (error) {
     t.match(error.code, /EADDRNOTAVAIL|ECONNREFUSED/)
   }
 })
 
 t.test('removes authorization header on third party origin', async t => {
+  const agent = new Agent({
+    keepAliveTimeout: 1000,
+    keepAliveMaxTimeout: 1000
+  })
+  t.teardown(agent.close.bind(agent))
   const [server1] = await startRedirectingWithAuthorization(t, 'secret')
   const { body: bodyStream } = await undici.request(`http://${server1}`, {
     maxRedirections: 10,
+    dispatcher: agent,
     headers: {
       authorization: 'secret'
     }
@@ -406,9 +437,15 @@ t.test('removes authorization header on third party origin', async t => {
 })
 
 t.test('removes cookie header on third party origin', async t => {
+  const agent = new Agent({
+    keepAliveTimeout: 1000,
+    keepAliveMaxTimeout: 1000
+  })
+  t.teardown(agent.close.bind(agent))
   const [server1] = await startRedirectingWithCookie(t, 'a=b')
   const { body: bodyStream } = await undici.request(`http://${server1}`, {
     maxRedirections: 10,
+    dispatcher: agent,
     headers: {
       cookie: 'a=b'
     }

test/utils/redirecting-servers.js

@@ -9,8 +9,13 @@ function close (server) {
     return new Promise(resolve => {
       if (isNode20) {
         server.closeAllConnections()
+        server.close(function () {
+          resolve()
+        })
       }
-      server.close(resolve)
+      server.close()
+      server.unref()
+      resolve()
     })
   }
 }

test/wpt/runner/runner.mjs

@@ -5,7 +5,7 @@ import { fileURLToPath } from 'node:url'
 import { Worker } from 'node:worker_threads'
 import { colors, handlePipes, normalizeName, parseMeta, resolveStatusPath } from './util.mjs'
 
-const basePath = fileURLToPath(join(import.meta.url, '../..'))
+const basePath = fileURLToPath(new URL('..', import.meta.url))
 const testPath = join(basePath, 'tests')
 const statusPath = join(basePath, 'status')
 
@@ -131,7 +131,7 @@ export class WPTRunner extends EventEmitter {
   }
 
   async run () {
-    const workerPath = join(fileURLToPath(import.meta.url), '../worker.mjs')
+    const workerPath = fileURLToPath(new URL('../worker.mjs', import.meta.url))
     /** @type {Set<Worker>} */
     const activeWorkers = new Set()
     let finishedFiles = 1