Merge branch 'main' into main

Author: sdnts

.changeset/few-bobcats-brake.md

@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+When reporting errors to Sentry, Wrangler will now include the console output as additional metadata

.changeset/gorgeous-papayas-trade.md

@@ -0,0 +1,5 @@
+---
+"@cloudflare/workers-shared": patch
+---
+
+fix: interpolation search method now checks for a single match at the beginning of every iteration

.changeset/kind-spiders-hunt.md

@@ -0,0 +1,5 @@
+---
+"@cloudflare/workers-shared": patch
+---
+
+chore: Bump interpolation search method for asset manifest reading to 1%

.changeset/odd-months-crash.md

@@ -0,0 +1,5 @@
+---
+"@cloudflare/workers-shared": minor
+---
+
+chore: Add status code analytics to router-worker

.changeset/stale-zoos-drop.md

@@ -0,0 +1,7 @@
+---
+"@cloudflare/vite-plugin": minor
+---
+
+No longer call `next` in server middleware.
+
+This is so that the Cloudflare plugin can override subsequent dev middleware for framework integrations.

packages/vite-plugin-cloudflare/playground/hot-channel/vite.config.ts

@@ -4,7 +4,6 @@ import { defineConfig } from "vite";
 
 export default defineConfig({
 	plugins: [
-		cloudflare({ persistState: false }),
 		{
 			name: "test-plugin",
 			configureServer(viteDevServer) {
@@ -22,5 +21,6 @@ export default defineConfig({
 				};
 			},
 		},
+		cloudflare({ persistState: false }),
 	],
 });

packages/vite-plugin-cloudflare/src/cloudflare-environment.ts

@@ -161,6 +161,7 @@ export function createCloudflareEnvironmentOptions(
 		optimizeDeps: {
 			// Note: ssr pre-bundling is opt-in and we need to enable it by setting `noDiscovery` to false
 			noDiscovery: false,
+			entries: workerConfig.main,
 			exclude: [
 				...cloudflareBuiltInModules,
 				// we have to exclude all node modules to work in dev-mode not just the unenv externals...

packages/vite-plugin-cloudflare/src/index.ts

@@ -267,11 +267,14 @@ export function cloudflare(pluginConfig: PluginConfig = {}): vite.Plugin[] {
 					miniflare
 				);
 
-				const middleware = createMiddleware(({ request }) => {
-					return entryWorker.fetch(toMiniflareRequest(request), {
-						redirect: "manual",
-					}) as any;
-				});
+				const middleware = createMiddleware(
+					({ request }) => {
+						return entryWorker.fetch(toMiniflareRequest(request), {
+							redirect: "manual",
+						}) as any;
+					},
+					{ alwaysCallNext: false }
+				);
 
 				handleWebSocket(
 					viteDevServer.httpServer,
@@ -293,11 +296,14 @@ export function cloudflare(pluginConfig: PluginConfig = {}): vite.Plugin[] {
 					)
 				);
 
-				const middleware = createMiddleware(({ request }) => {
-					return miniflare.dispatchFetch(toMiniflareRequest(request), {
-						redirect: "manual",
-					}) as any;
-				});
+				const middleware = createMiddleware(
+					({ request }) => {
+						return miniflare.dispatchFetch(toMiniflareRequest(request), {
+							redirect: "manual",
+						}) as any;
+					},
+					{ alwaysCallNext: false }
+				);
 
 				handleWebSocket(
 					vitePreviewServer.httpServer,

packages/workers-shared/asset-worker/src/analytics.ts

@@ -18,6 +18,8 @@ type Data = {
 	metalId?: number;
 	// double4 - Colo tier (e.g. tier 1, tier 2, tier 3)
 	coloTier?: number;
+	// double5 - Response status code
+	status?: number;
 
 	// -- Blobs --
 	// blob1 - Hostname of the request
@@ -66,6 +68,7 @@ export class Analytics {
 				this.data.coloId ?? -1, // double2
 				this.data.metalId ?? -1, // double3
 				this.data.coloTier ?? -1, // double4
+				this.data.status ?? -1, // double5
 			],
 			blobs: [
 				this.data.hostname?.substring(0, 256), // blob1 - trim to 256 bytes

packages/workers-shared/asset-worker/src/assets-manifest.ts

@@ -88,24 +88,36 @@ export const interpolationSearch = (
 	if (arr.byteLength === 0) {
 		return false;
 	}
+	// top and tail the search space
 	let low = 0;
 	let high = arr.byteLength / ENTRY_SIZE - 1;
-	if (high === low) {
-		const current = new Uint8Array(arr.buffer, arr.byteOffset, PATH_HASH_SIZE);
-		if (current.byteLength !== searchValue.byteLength) {
-			throw new TypeError(
-				"Search value and current value are of different lengths"
-			);
-		}
-		const cmp = compare(current, searchValue);
-		if (cmp === 0) {
-			return new Uint8Array(arr.buffer, arr.byteOffset, ENTRY_SIZE);
-		} else {
-			return false;
-		}
-	}
 	const searchValueNumber = uint8ArrayToNumber(searchValue);
 	while (low <= high) {
+		if (low === high) {
+			// search space has been reduced to a single element
+			const current = new Uint8Array(
+				arr.buffer,
+				arr.byteOffset + low * ENTRY_SIZE,
+				PATH_HASH_SIZE
+			);
+			if (current.byteLength !== searchValue.byteLength) {
+				throw new TypeError(
+					"Search value and current value are of different lengths"
+				);
+			}
+			const cmp = compare(current, searchValue);
+			if (cmp === 0) {
+				// and it's a match!
+				return new Uint8Array(
+					arr.buffer,
+					arr.byteOffset + low * ENTRY_SIZE,
+					ENTRY_SIZE
+				);
+			} else {
+				// and it's not a match!
+				return false;
+			}
+		}
 		const lowValue = new Uint8Array(
 			arr.buffer,
 			arr.byteOffset + low * ENTRY_SIZE,
@@ -119,17 +131,19 @@ export const interpolationSearch = (
 		const lowValueNumber = uint8ArrayToNumber(lowValue);
 		const highValueNumber = uint8ArrayToNumber(highValue);
 		const denominator = highValueNumber - lowValueNumber;
-		if (denominator < 0n) {
-			return false;
+		if (denominator <= 0n) {
+			throw new TypeError("Search space is unordered");
 		}
 		const numerator = searchValueNumber - lowValueNumber;
 		if (numerator < 0n) {
+			// the lowest value in our search space is smaller than the search value (so it can't be in the search space)
 			return false;
 		}
 		const mid = Math.floor(
 			Number(BigInt(low) + (BigInt(high - low) * numerator) / denominator)
 		);
 		if (mid < low || mid > high) {
+			// our next guess is either entirely out of range of the search space or we've already searched it
 			return false;
 		}
 		const current = new Uint8Array(
@@ -150,8 +164,10 @@ export const interpolationSearch = (
 				ENTRY_SIZE
 			);
 		} else if (cmp < 0) {
+			// our estimate was too low so our search space now becomes mid+1 -> high
 			low = mid + 1;
 		} else {
+			// our estimate was too high so our search space now becomes low -> mid-1
 			high = mid - 1;
 		}
 	}