Merge branch 'main' into renovate/major-netlify-packages

Author: serhalp

.github/workflows/test.yaml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        node-version: ['*']
+        node-version: ['24']
         include:
           - os: ubuntu-latest
             # Many of our dependencies require 20.6.0, so we use the same minimum.
@@ -42,7 +42,7 @@ jobs:
       # Use npm@10 on Node 22+ due to https://github.com/npm/cli/issues/8489
       - name: Setup npm version
         run: npm install -g npm@10
-        if: "${{ matrix.node-version == '*' }}"
+        if: "${{ matrix.node-version == '24' }}"
       - name: Setup Deno
         uses: denoland/setup-deno@v1
         with:

package-lock.json

@@ -1,3 +1,4 @@
 export interface DeleteStoreResponse {
   blobs_deleted: number
+  has_more: boolean
 }

packages/blobs/src/backend/delete_store.ts

@@ -1500,7 +1500,7 @@ describe('deleteAll', () => {
       const mockStore = new MockFetch()
         .delete({
           headers: { authorization: `Bearer ${apiToken}` },
-          response: Response.json({ blobs_deleted: 3 }),
+          response: Response.json({ blobs_deleted: 3, has_more: false }),
           url: `https://api.netlify.com/api/v1/blobs/${siteID}/site:production`,
         })
         .inject()
@@ -1542,7 +1542,7 @@ describe('deleteAll', () => {
       const mockStore = new MockFetch()
         .delete({
           headers: { authorization: `Bearer ${apiToken}` },
-          response: Response.json({ blobs_deleted: 3 }),
+          response: Response.json({ blobs_deleted: 3, has_more: false }),
           url: `https://api.netlify.com/api/v1/blobs/${siteID}/oldie`,
         })
         .inject()
@@ -1565,7 +1565,7 @@ describe('deleteAll', () => {
       const mockStore = new MockFetch()
         .delete({
           headers: { authorization: `Bearer ${edgeToken}` },
-          response: Response.json({ blobs_deleted: 3 }),
+          response: Response.json({ blobs_deleted: 3, has_more: false }),
           url: `${edgeURL}/${siteID}/site:production`,
         })
         .inject()
@@ -1605,6 +1605,33 @@ describe('deleteAll', () => {
 
       expect(mockStore.fulfilled).toBeTruthy()
     })
+
+    test('Handles paginated deletion with multiple batches', async () => {
+      const mockStore = new MockFetch()
+        .delete({
+          headers: { authorization: `Bearer ${edgeToken}` },
+          response: Response.json({ blobs_deleted: 100, has_more: true }),
+          url: `${edgeURL}/${siteID}/site:production`,
+        })
+        .delete({
+          headers: { authorization: `Bearer ${edgeToken}` },
+          response: Response.json({ blobs_deleted: 50, has_more: false }),
+          url: `${edgeURL}/${siteID}/site:production`,
+        })
+        .inject()
+
+      const blobs = getStore({
+        edgeURL,
+        name: 'production',
+        token: edgeToken,
+        siteID,
+      })
+
+      const res = await blobs.deleteAll()
+
+      expect(mockStore.fulfilled).toBeTruthy()
+      expect(res.deletedBlobs).toBe(150)
+    })
   })
 })
 

packages/blobs/src/main.test.ts

@@ -180,7 +180,7 @@ export class BlobsServer {
       }
     }
 
-    return Response.json({ blobs_deleted: blobsDeleted })
+    return Response.json({ blobs_deleted: blobsDeleted, has_more: false })
   }
 
   private async get(req: Request): Promise<Response> {

packages/blobs/src/server.ts

@@ -152,20 +152,28 @@ export class Store {
   }
 
   async deleteAll(): Promise<DeleteStoreResult> {
-    const res = await this.client.makeRequest({ method: HTTPMethod.DELETE, storeName: this.name })
+    let totalDeletedBlobs = 0
+    let hasMore = true
 
-    if (res.status !== 200) {
-      throw new BlobsInternalError(res)
-    }
+    while (hasMore) {
+      const res = await this.client.makeRequest({ method: HTTPMethod.DELETE, storeName: this.name })
+
+      if (res.status !== 200) {
+        throw new BlobsInternalError(res)
+      }
 
-    const data = (await res.json()) as DeleteStoreResponse
+      const data = (await res.json()) as DeleteStoreResponse
 
-    if (typeof data.blobs_deleted !== 'number') {
-      throw new BlobsInternalError(res)
+      if (typeof data.blobs_deleted !== 'number') {
+        throw new BlobsInternalError(res)
+      }
+
+      totalDeletedBlobs += data.blobs_deleted
+      hasMore = typeof data.has_more === 'boolean' && data.has_more
     }
 
     return {
-      deletedBlobs: data.blobs_deleted,
+      deletedBlobs: totalDeletedBlobs,
     }
   }
 

packages/blobs/src/store.ts

@@ -68,7 +68,7 @@
     "parse-gitignore": "^2.0.0",
     "semver": "^7.7.2",
     "tmp-promise": "^3.0.3",
-    "uuid": "^11.1.0",
+    "uuid": "^13.0.0",
     "write-file-atomic": "^5.0.1"
   }
 }

packages/dev-utils/package.json

@@ -1,8 +1,20 @@
-import { IncomingHttpHeaders, IncomingMessage } from 'node:http'
+import { IncomingMessage } from 'node:http'
 import { Readable } from 'node:stream'
 
-export const normalizeHeaders = (headers: IncomingHttpHeaders): HeadersInit => {
+export const normalizeHeaders = (request: IncomingMessage) => {
   const result: [string, string][] = []
+  let headers = request.headers
+
+  // Handle HTTP/2 pseudo-headers: https://www.rfc-editor.org/rfc/rfc9113.html#name-request-pseudo-header-field
+  // In certain versions of Node.js, the built-in `Request` constructor from undici throws
+  // if a header starts with a colon.
+  if (request.httpVersionMajor >= 2) {
+    headers = { ...headers }
+    delete headers[':authority']
+    delete headers[':method']
+    delete headers[':path']
+    delete headers[':scheme']
+  }
 
   for (const [key, value] of Object.entries(headers)) {
     if (Array.isArray(value)) {
@@ -43,11 +55,14 @@ export const getNormalizedRequestFromNodeRequest = (
       ? null
       : (Readable.toWeb(input) as unknown as ReadableStream<unknown>)
 
+  const normalizedHeaders = normalizeHeaders(input)
+  normalizedHeaders.push(['x-nf-request-id', requestID])
+
   return new Request(fullUrl, {
     body,
     // @ts-expect-error Not typed!
     duplex: 'half',
-    headers: normalizeHeaders({ ...input.headers, 'x-nf-request-id': requestID }),
+    headers: normalizedHeaders,
     method,
   })
 }

packages/dev/src/lib/reqres.ts

@@ -1,4 +1,6 @@
 import { readFile } from 'node:fs/promises'
+import { IncomingMessage } from 'node:http'
+import { Socket } from 'node:net'
 import { resolve } from 'node:path'
 
 import { createImageServerHandler, Fixture, generateImage, getImageResponseSize, HTTPServer } from '@netlify/dev-utils'
@@ -14,6 +16,48 @@ describe('Handling requests', () => {
     vi.unstubAllEnvs()
   })
 
+  test('Handles HTTP/2 Node.js requests', async () => {
+    const fixture = new Fixture()
+      .withFile(
+        'netlify.toml',
+        `[build]
+         publish = "public"
+      `,
+      )
+      .withFile('public/index.html', 'Hello from static file')
+    const directory = await fixture.create()
+    const dev = new NetlifyDev({
+      projectRoot: directory,
+      geolocation: { enabled: false },
+    })
+    await dev.start()
+
+    const nodeReq = new IncomingMessage(new Socket())
+    nodeReq.httpVersionMajor = 2
+    nodeReq.httpVersionMinor = 0
+    nodeReq.method = 'GET'
+    nodeReq.url = '/index.html'
+    nodeReq.headers = {
+      accept: 'text/html',
+      host: 'example.netlify.app',
+      'user-agent': 'test-agent',
+      // These four HTTP/2 pseudo request headers are required per the HTTP/2 spec:
+      // https://www.rfc-editor.org/rfc/rfc9113.html#name-request-pseudo-header-field
+      // These show up here like any other header on Node.js IncomingMessage objects,
+      ':method': 'GET',
+      ':path': '/index.html',
+      ':scheme': 'https',
+      ':authority': 'example.netlify.app',
+    }
+    const result = await dev.handleAndIntrospectNodeRequest(nodeReq)
+
+    expect(result?.response.ok).toBe(true)
+    expect(await result?.response.text()).toBe('Hello from static file')
+
+    await dev.stop()
+    await fixture.destroy()
+  })
+
   describe('No linked site', () => {
     test('Same-site rewrite to a static file', async () => {
       const fixture = new Fixture()

packages/dev/src/main.test.ts

@@ -4,7 +4,7 @@
   "description": "Vite plugin for TanStack Start on Netlify",
   "type": "module",
   "engines": {
-    "node": "^22.12.0"
+    "node": "^22.12.0 || >=24.0.0"
   },
   "main": "./dist/main.js",
   "exports": "./dist/main.js",