fix: support for Node.js 20

.github/workflows/access-client.yml

@@ -18,14 +18,19 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node_version:
+          - 18
+          - 20
     steps:
       - uses: actions/checkout@v3
       - uses: pnpm/[email protected]
         with:
           version: 8
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: ${{ matrix.node_version }}
           cache: 'pnpm'
       - run: pnpm install
       - run: pnpm run build

.github/workflows/aggregate-client.yml

@@ -18,14 +18,19 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node_version:
+          - 18
+          - 20
     steps:
       - uses: actions/checkout@v3
       - uses: pnpm/[email protected]
         with:
           version: 8
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: ${{ matrix.node_version }}
           cache: 'pnpm'
       - run: pnpm install
       - run: pnpm run build

.github/workflows/upload-client.yml

@@ -18,14 +18,19 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node_version:
+          - 18
+          - 20
     steps:
       - uses: actions/checkout@v3
       - uses: pnpm/[email protected]
         with:
           version: 8
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: ${{ matrix.node_version }}
           cache: 'pnpm'
       - run: pnpm install
       - run: pnpm run build

.github/workflows/w3up-client.yml

@@ -16,6 +16,11 @@ jobs:
   test:
     name: Test
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node_version:
+          - 18
+          - 20
     defaults:
       run:
         working-directory: ./packages/w3up-client
@@ -29,7 +34,7 @@ jobs:
       - name: Setup
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: ${{ matrix.node_version }}
           registry-url: https://registry.npmjs.org/
           cache: 'pnpm'
       - run: pnpm --filter '@web3-storage/w3up-client...' install

packages/upload-client/src/car.js

@@ -42,6 +42,16 @@ export class BlockStream extends ReadableStream {
     let blocksPromise = null
     const getBlocksIterable = () => {
       if (blocksPromise) return blocksPromise
+      // FIXME: remove when resolved: https://github.com/nodejs/node/issues/48916
+      /* c8 ignore next 10 */
+      if (parseInt(globalThis.process?.versions?.node) > 18) {
+        blocksPromise = (async () => {
+          // @ts-expect-error
+          const bytes = await car.arrayBuffer()
+          return CarBlockIterator.fromBytes(new Uint8Array(bytes))
+        })()
+        return blocksPromise
+      }
       blocksPromise = CarBlockIterator.fromIterable(toIterable(car.stream()))
       return blocksPromise
     }
@@ -77,11 +87,11 @@ export class BlockStream extends ReadableStream {
  * @param {{ getReader: () => ReadableStreamDefaultReader<T> } | AsyncIterable<T>} stream
  * @returns {AsyncIterable<T>}
  */
+/* c8 ignore next 16 */
 function toIterable(stream) {
   return Symbol.asyncIterator in stream
     ? stream
-    : /* c8 ignore next 12 */
-      (async function* () {
+    : (async function* () {
         const reader = stream.getReader()
         try {
           while (true) {