Update Node 24 (#2414)

ardatan · web-flow · commit 1f0b64388d64 · 2025-05-12T21:04:45.000+03:00
diff --git a/.changeset/stupid-candies-fetch.md b/.changeset/stupid-candies-fetch.md
@@ -0,0 +1,6 @@
+---
+'@whatwg-node/node-fetch': patch
+---
+
+Improvements for Node 24 and use `once` from `node:events` for Promise-based event handling whenever
+possible
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Setup env
         uses: the-guild-org/shared-config/setup@main
         with:
-          nodeVersion: 23
+          nodeVersion: 24
           packageManager: yarn
       - name: Build Packages
         run: yarn build
@@ -74,7 +74,7 @@ jobs:
       - name: Setup env
         uses: the-guild-org/shared-config/setup@main
         with:
-          nodeVersion: 23
+          nodeVersion: 24
           packageManager: yarn
       - name: Setup K6
         run: |
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -31,7 +31,7 @@ jobs:
     with:
       npmTag: alpha
       buildScript: build
-      nodeVersion: 22
+      nodeVersion: 24
     secrets:
       githubToken: ${{ secrets.GITHUB_TOKEN }}
       npmToken: ${{ secrets.NODE_AUTH_TOKEN }}
@@ -48,7 +48,7 @@ jobs:
     with:
       npmTag: rc
       buildScript: build
-      nodeVersion: 23
+      nodeVersion: 24
       restoreDeletedChangesets: true
     secrets:
       githubToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
     uses: the-guild-org/shared-config/.github/workflows/release-stable.yml@main
     with:
       releaseScript: release
-      nodeVersion: 22
+      nodeVersion: 24
     secrets:
       githubToken: ${{ secrets.GITHUB_TOKEN }}
       npmToken: ${{ secrets.NODE_AUTH_TOKEN }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Setup env
         uses: the-guild-org/shared-config/setup@main
         with:
-          nodeVersion: 23
+          nodeVersion: 24
       - name: Prettier Check
         run: yarn prettier:check
   lint:
@@ -43,7 +43,7 @@ jobs:
       - name: Setup env
         uses: the-guild-org/shared-config/setup@main
         with:
-          nodeVersion: 23
+          nodeVersion: 24
       - name: ESLint
         run: yarn lint
 
@@ -58,7 +58,7 @@ jobs:
       - name: Setup env
         uses: the-guild-org/shared-config/setup@main
         with:
-          nodeVersion: 23
+          nodeVersion: 24
       - name: Type Check
         run: yarn ts:check
 
@@ -72,7 +72,7 @@ jobs:
           - 8888:80
     strategy:
       matrix:
-        node-version: [18, 20, 22, 23]
+        node-version: [18, 20, 23, 24]
       fail-fast: false
     steps:
       - name: Checkout Master
@@ -119,7 +119,7 @@ jobs:
       - name: Setup env
         uses: the-guild-org/shared-config/setup@main
         with:
-          nodeVersion: 23
+          nodeVersion: 24
       - name: Test
         run: yarn test:bun --ci
 
@@ -139,7 +139,7 @@ jobs:
       - name: Setup env
         uses: the-guild-org/shared-config/setup@main
         with:
-          nodeVersion: 23
+          nodeVersion: 24
       - name: Test
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
         with:
@@ -158,7 +158,7 @@ jobs:
       - name: Setup env
         uses: the-guild-org/shared-config/setup@main
         with:
-          nodeVersion: 23
+          nodeVersion: 24
       - name: Build Packages
         run: yarn build
       - name: Test ESM
@@ -200,7 +200,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@master
         with:
-          node-version: 23
+          node-version: 24
 
       - name: Install Required Libraries
         run: sudo apt update && sudo apt install -y libcurl4-openssl-dev libssl-dev
diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-v23
+v24
diff --git a/package.json b/package.json
@@ -29,6 +29,7 @@
     "ts:check": "tsc --noEmit --skipLibCheck"
   },
   "optionalDependencies": {
+    "node-libcurl": "4.1.0",
     "uWebSockets.js": "uNetworking/uWebSockets.js#v20.52.0"
   },
   "devDependencies": {
@@ -64,7 +65,6 @@
     "husky": "9.1.7",
     "jest": "29.7.0",
     "lint-staged": "16.0.0",
-    "node-libcurl": "4.1.0",
     "patch-package": "8.0.0",
     "prettier": "3.5.3",
     "rimraf": "6.0.1",
diff --git a/packages/node-fetch/src/ReadableStream.ts b/packages/node-fetch/src/ReadableStream.ts
@@ -1,5 +1,7 @@
 import { Buffer } from 'node:buffer';
+import { once } from 'node:events';
 import { Readable } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
 import { handleMaybePromise } from '@whatwg-node/promise-helpers';
 import { fakePromise } from './utils.js';
 import { PonyfillWritableStream } from './WritableStream.js';
@@ -144,7 +146,8 @@ export class PonyfillReadableStream<T> implements ReadableStream<T> {
 
   cancel(reason?: any): Promise<void> {
     this.readable.destroy(reason);
-    return new Promise(resolve => this.readable.once('end', resolve));
+    // @ts-expect-error - we know it is void
+    return once(this.readable, 'close');
   }
 
   locked = false;
@@ -154,6 +157,7 @@ export class PonyfillReadableStream<T> implements ReadableStream<T> {
   getReader(_options?: ReadableStreamGetReaderOptions): ReadableStreamReader<T> {
     const iterator = this.readable[Symbol.asyncIterator]();
     this.locked = true;
+    const thisReadable = this.readable;
     return {
       read() {
         return iterator.next() as Promise<ReadableStreamReadResult<T>>;
@@ -182,10 +186,12 @@ export class PonyfillReadableStream<T> implements ReadableStream<T> {
         this.locked = false;
         return fakePromise();
       },
-      closed: new Promise((resolve, reject) => {
-        this.readable.once('end', resolve);
-        this.readable.once('error', reject);
-      }),
+      get closed() {
+        return Promise.race([
+          once(thisReadable, 'end'),
+          once(thisReadable, 'error').then(err => Promise.reject(err)),
+        ]) as Promise<any>;
+      },
     };
   }
 
@@ -228,10 +234,8 @@ export class PonyfillReadableStream<T> implements ReadableStream<T> {
 
   pipeTo(destination: WritableStream<T>): Promise<void> {
     if (isPonyfillWritableStream(destination)) {
-      return new Promise((resolve, reject) => {
-        this.readable.pipe(destination.writable);
-        destination.writable.once('finish', resolve);
-        destination.writable.once('error', reject);
+      return pipeline(this.readable, destination.writable, {
+        end: true,
       });
     } else {
       const writer = destination.getWriter();
diff --git a/packages/node-fetch/src/TextEncoderDecoderStream.ts b/packages/node-fetch/src/TextEncoderDecoderStream.ts
@@ -8,9 +8,8 @@ export class PonyfillTextDecoderStream
   private textDecoder: TextDecoder;
   constructor(encoding?: BufferEncoding, options?: TextDecoderOptions) {
     super({
-      transform: (chunk, controller) => {
-        controller.enqueue(this.textDecoder.decode(chunk, { stream: true }));
-      },
+      transform: (chunk, controller) =>
+        controller.enqueue(this.textDecoder.decode(chunk, { stream: true })),
     });
     this.textDecoder = new PonyfillTextDecoder(encoding, options);
   }
@@ -35,9 +34,7 @@ export class PonyfillTextEncoderStream
   private textEncoder: TextEncoder;
   constructor(encoding?: BufferEncoding) {
     super({
-      transform: (chunk, controller) => {
-        controller.enqueue(this.textEncoder.encode(chunk));
-      },
+      transform: (chunk, controller) => controller.enqueue(this.textEncoder.encode(chunk)),
     });
     this.textEncoder = new PonyfillTextEncoder(encoding);
   }
diff --git a/packages/node-fetch/src/WritableStream.ts b/packages/node-fetch/src/WritableStream.ts
@@ -1,3 +1,4 @@
+import { once } from 'node:events';
 import { Writable } from 'node:stream';
 import { fakeRejectPromise } from '@whatwg-node/promise-helpers';
 import { endStream, fakePromise, safeWrite } from './utils.js';
@@ -62,19 +63,15 @@ export class PonyfillWritableStream<W = any> implements WritableStream<W> {
   getWriter(): WritableStreamDefaultWriter<W> {
     const writable = this.writable;
     return {
-      closed: new Promise<undefined>(resolve => {
-        writable.once('close', () => {
-          resolve(undefined);
-        });
-      }),
+      get closed() {
+        return once(writable, 'close') as Promise<any>;
+      },
       get desiredSize() {
         return writable.writableLength;
       },
-      ready: new Promise<undefined>(resolve => {
-        writable.once('drain', () => {
-          resolve(undefined);
-        });
-      }),
+      get ready() {
+        return once(writable, 'drain') as Promise<any>;
+      },
       releaseLock() {
         // no-op
       },
@@ -95,10 +92,8 @@ export class PonyfillWritableStream<W = any> implements WritableStream<W> {
         return fakePromise().then(() => endStream(writable));
       },
       abort(reason) {
-        return new Promise<void>(resolve => {
-          writable.destroy(reason);
-          writable.once('close', resolve);
-        });
+        writable.destroy(reason);
+        return once(writable, 'close') as Promise<any>;
       },
     };
   }
@@ -114,10 +109,8 @@ export class PonyfillWritableStream<W = any> implements WritableStream<W> {
   }
 
   abort(reason: any): Promise<void> {
-    return new Promise<void>(resolve => {
-      this.writable.destroy(reason);
-      this.writable.once('close', resolve);
-    });
+    this.writable.destroy(reason);
+    return once(this.writable, 'close') as Promise<any>;
   }
 
   locked = false;
diff --git a/packages/node-fetch/src/fetchNodeHttp.ts b/packages/node-fetch/src/fetchNodeHttp.ts
@@ -132,7 +132,7 @@ export function fetchNodeHttp<TResponseJSON = any, TRequestJSON = any>(
 
       if (fetchRequest['_buffer'] != null) {
         handleMaybePromise(
-          () => safeWrite(fetchRequest['_buffer'], nodeRequest),
+          () => safeWrite(fetchRequest['_buffer'], nodeRequest, fetchRequest.signal),
           () => endStream(nodeRequest),
           reject,
         );
diff --git a/packages/node-fetch/src/utils.ts b/packages/node-fetch/src/utils.ts
@@ -1,5 +1,6 @@
+import { once } from 'node:events';
 import { IncomingMessage } from 'node:http';
-import { PassThrough, Readable } from 'node:stream';
+import { PassThrough, Readable, Writable } from 'node:stream';
 import { pipeline } from 'node:stream/promises';
 
 function isHeadersInstance(obj: any): obj is Headers {
@@ -76,12 +77,11 @@ export function endStream(stream: { end: () => void }) {
   return stream.end(null, null, null);
 }
 
-export function safeWrite(
-  chunk: any,
-  stream: { write: (chunk: any) => boolean; once: (event: string, listener: () => void) => void },
-) {
+export function safeWrite(chunk: any, stream: Writable, signal?: AbortSignal | undefined) {
   const result = stream.write(chunk);
   if (!result) {
-    return new Promise<void>(resolve => stream.once('drain', resolve));
+    return once(stream, 'drain', {
+      signal,
+    }) as unknown as Promise<any>;
   }
 }
diff --git a/packages/node-fetch/tests/TextEncoderDecoderStream.spec.ts b/packages/node-fetch/tests/TextEncoderDecoderStream.spec.ts
diff --git a/packages/server/test/proxy.spec.ts b/packages/server/test/proxy.spec.ts
diff --git a/packages/server/test/request-listener.spec.ts b/packages/server/test/request-listener.spec.ts
diff --git a/packages/server/test/test-server.ts b/packages/server/test/test-server.ts
diff --git a/patches/@eslint+eslintrc+3.3.0.patch b/patches/@eslint+eslintrc+3.3.0.patch
diff --git a/yarn.lock b/yarn.lock
