wrangler 0.0.0-e7a0cd5b → 0.0.0-e87ad068

package/src/inspect.ts

@@ -1,9 +1,10 @@
+import { readFileSync } from "fs";
 import { readFile } from "fs/promises";
 import assert from "node:assert";
 import { createServer } from "node:http";
 import os from "node:os";
 import { URL } from "node:url";
-
+import path from "path";
 import open from "open";
 import { useEffect, useRef, useState } from "react";
 import { SourceMapConsumer } from "source-map";
@@ -40,6 +41,13 @@ import type { MessageEvent } from "ws";
  * - handle more methods from console
  */
 
+// Information about Wrangler's bundling process that needs passsed through
+// for DevTools sourcemap transformation
+export interface SourceMapMetadata {
+	tmpDir: string;
+	entryDirectory: string;
+}
+
 interface InspectorProps {
 	/**
 	 * The port that the local proxy server should listen on.
@@ -58,9 +66,13 @@ interface InspectorProps {
 	/**
 	 * Sourcemap path, so that stacktraces can be interpretted
 	 */
-	sourceMapPath?: string | undefined;
+	sourceMapPath: string | undefined;
+
+	sourceMapMetadata: SourceMapMetadata | undefined;
 
 	host?: string;
+
+	name?: string;
 }
 
 export default function useInspector(props: InspectorProps) {
@@ -151,6 +163,18 @@ export default function useInspector(props: InspectorProps) {
 			);
 			ws.close(1013, "Too many clients; only one can be connected at a time");
 		} else {
+			// Since Wrangler proxies the inspector, reloading Chrome DevTools won't trigger debugger initialisation events (because it's connecting to an extant session).
+			// This sends a `Debugger.disable` message to the remote when a new WebSocket connection is initialised,
+			// with the assumption that the new connection will shortly send a `Debugger.enable` event and trigger re-initialisation.
+			// The key initialisation messages that are needed are the `Debugger.scriptParsed events`.
+			remoteWebSocket?.send(
+				JSON.stringify({
+					// This number is arbitrary, and is chosen to be high so as not to conflict with messages that DevTools might actually send.
+					// For completeness, these options don't work: 0, -1, or Number.MAX_SAFE_INTEGER
+					id: 100_000_000,
+					method: "Debugger.disable",
+				})
+			);
 			// As promised, save the created websocket in a state hook
 			setLocalWebSocket(ws);
 
@@ -481,6 +505,65 @@ export default function useInspector(props: InspectorProps) {
 
 		/** Send a message from the local websocket to the remote websocket */
 		function sendMessageToRemoteWebSocket(event: MessageEvent) {
+			try {
+				// Intercept Network.loadNetworkResource to load sourcemaps
+				const message = JSON.parse(event.data as string);
+				if (
+					message.method === "Network.loadNetworkResource" &&
+					props.sourceMapPath !== undefined &&
+					props.sourceMapMetadata !== undefined
+				) {
+					// Read the generated source map from esbuild
+					const sourceMap = JSON.parse(
+						readFileSync(props.sourceMapPath, "utf-8")
+					);
+
+					// The source root is a temporary directory (`tmpDir`), and so shouldn't be user-visible
+					// It provides no useful info to the user
+					sourceMap.sourceRoot = "";
+
+					const tmpDir = props.sourceMapMetadata.tmpDir;
+
+					// See https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit#heading=h.mt2g20loc2ct
+					// The above link documents the x_google_ignoreList property, which is intended to mark code that shouldn't be visible in DevTools
+					// Here we use it to indicate specifically Wrangler-injected code (facades & middleware)
+					sourceMap.x_google_ignoreList = sourceMap.sources
+						// Filter anything in the generated tmpDir, and anything from Wrangler's templates
+						// This should cover facades and middleware, but intentionally doesn't include all non-user code e.g. node_modules
+						.map((s: string, idx: number) =>
+							s.includes(tmpDir) || s.includes("wrangler/templates")
+								? idx
+								: null
+						)
+						.filter((i: number | null) => i !== null);
+
+					const entryDirectory = props.sourceMapMetadata.entryDirectory;
+
+					sourceMap.sources = sourceMap.sources.map(
+						(s: string) =>
+							// These are never loaded by Wrangler or DevTools. However, the presence of a scheme is required for DevTools to show the path as folders in the Sources view
+							// The scheme is intentially not the same as for the sourceMappingURL
+							// Without this difference in scheme, DevTools will not strip prefix `../` path elements from top level folders (../node_modules -> node_modules, for instance)
+							`worker://${props.name}/${path.relative(entryDirectory, s)}`
+					);
+
+					sendMessageToLocalWebSocket({
+						data: JSON.stringify({
+							id: message.id,
+							result: {
+								resource: {
+									success: true,
+									text: JSON.stringify(sourceMap),
+								},
+							},
+						}),
+					});
+					return;
+				}
+			} catch (e) {
+				logger.debug(e);
+				// Ignore errors, fallthrough to the remote inspector
+			}
 			try {
 				assert(
 					remoteWebSocket,
@@ -505,11 +588,28 @@ export default function useInspector(props: InspectorProps) {
 		}
 
 		/** Send a message from the local websocket to the remote websocket */
-		function sendMessageToLocalWebSocket(event: MessageEvent) {
+		function sendMessageToLocalWebSocket(event: Pick<MessageEvent, "data">) {
 			assert(
 				localWebSocket,
 				"Trying to send a message to an undefined `localWebSocket`"
 			);
+			try {
+				// Intercept Debugger.scriptParsed responses to inject URL schemes
+				const message = JSON.parse(event.data as string);
+				if (message.method === "Debugger.scriptParsed") {
+					// Add the worker:// scheme conditionally, since some module types already have schemes (e.g. wasm)
+					message.params.url = new URL(
+						message.params.url,
+						`worker://${props.name}`
+					).href;
+					localWebSocket.send(JSON.stringify(message));
+					return;
+				}
+			} catch (e) {
+				logger.debug(e);
+				// Ignore errors, fallthrough to the local websocket
+			}
+
 			localWebSocket.send(event.data);
 		}
 
@@ -543,7 +643,13 @@ export default function useInspector(props: InspectorProps) {
 				);
 			}
 		};
-	}, [localWebSocket, remoteWebSocket]);
+	}, [
+		localWebSocket,
+		remoteWebSocket,
+		props.name,
+		props.sourceMapMetadata,
+		props.sourceMapPath,
+	]);
 }
 
 // Credit: https://stackoverflow.com/a/2117523
@@ -732,8 +838,15 @@ function logConsoleMessage(evt: Protocol.Runtime.ConsoleAPICalledEvent): void {
 /**
  * Opens the chrome debugger
  */
-export const openInspector = async (inspectorPort: number) => {
-	const url = `https://built-devtools.pages.dev/js_app?experiments=true&v8only=true&ws=localhost:${inspectorPort}/ws`;
+export const openInspector = async (
+	inspectorPort: number,
+	worker: string | undefined
+) => {
+	const query = new URLSearchParams();
+	query.set("theme", "systemPreferred");
+	query.set("ws", `localhost:${inspectorPort}/ws`);
+	if (worker) query.set("domain", worker);
+	const url = `https://devtools.devprod.cloudflare.dev/js_app?${query.toString()}`;
 	const errorMessage =
 		"Failed to open inspector.\nInspector depends on having a Chromium-based browser installed, maybe you need to install one?";
 
@@ -759,6 +872,9 @@ export const openInspector = async (inspectorPort: number) => {
 			{
 				name: open.apps.edge,
 			},
+			{
+				name: open.apps.firefox,
+			},
 		],
 	});
 	childProcess.on("error", () => {

package/src/jest.d.ts

@@ -0,0 +1,4 @@
+declare global {
+	const jest: unknown;
+}
+export {};

package/src/kv/helpers.ts

@@ -8,7 +8,7 @@ import type { Config } from "../config";
 const API_MAX = 10000;
 // The const below are halved from the API's true capacity to help avoid
 // hammering it with large requests.
-const BATCH_KEY_MAX = API_MAX / 2;
+export const BATCH_KEY_MAX = API_MAX / 2;
 
 type KvArgs = {
 	binding?: string;
@@ -256,7 +256,7 @@ export async function deleteKVKeyValue(
 /**
  * Formatter for converting e.g. 5328 --> 5,328
  */
-const formatNumber = new Intl.NumberFormat("en-US", {
+export const formatNumber = new Intl.NumberFormat("en-US", {
 	notation: "standard",
 }).format;
 
@@ -279,7 +279,8 @@ export async function putKVBulkKeyValue(
 	accountId: string,
 	namespaceId: string,
 	keyValues: KeyValue[],
-	quiet = false
+	quiet = false,
+	abortSignal?: AbortSignal
 ) {
 	for (let index = 0; index < keyValues.length; index += BATCH_KEY_MAX) {
 		if (!quiet && keyValues.length > BATCH_KEY_MAX) {
@@ -292,7 +293,9 @@ export async function putKVBulkKeyValue(
 				method: "PUT",
 				body: JSON.stringify(keyValues.slice(index, index + BATCH_KEY_MAX)),
 				headers: { "Content-Type": "application/json" },
-			}
+			},
+			undefined,
+			abortSignal
 		);
 	}
 

package/src/kv/index.ts

@@ -25,12 +25,10 @@ import {
 	putKVKeyValue,
 	unexpectedKVKeyValueProps,
 } from "./helpers";
-import type { ConfigPath } from "../index";
-import type { CommonYargsOptions } from "../yargs-types";
+import type { CommonYargsArgv } from "../yargs-types";
 import type { KeyValue } from "./helpers";
-import type { Argv } from "yargs";
 
-export const kvNamespace = (kvYargs: Argv<CommonYargsOptions>) => {
+export function kvNamespace(kvYargs: CommonYargsArgv) {
 	return kvYargs
 		.command(
 			"create <namespace>",
@@ -56,7 +54,7 @@ export const kvNamespace = (kvYargs: Argv<CommonYargsOptions>) => {
 					);
 				}
 
-				const config = readConfig(args.config as ConfigPath, args);
+				const config = readConfig(args.config, args);
 				if (!config.name) {
 					logger.warn(
 						"No configured name present, using `worker` as a prefix for the title"
@@ -94,9 +92,9 @@ export const kvNamespace = (kvYargs: Argv<CommonYargsOptions>) => {
 		.command(
 			"list",
 			"Outputs a list of all KV namespaces associated with your account id.",
-			{},
+			(listArgs) => listArgs,
 			async (args) => {
-				const config = readConfig(args.config as ConfigPath, args);
+				const config = readConfig(args.config, args);
 
 				const accountId = await requireAuth(config);
 
@@ -133,7 +131,7 @@ export const kvNamespace = (kvYargs: Argv<CommonYargsOptions>) => {
 			},
 			async (args) => {
 				await printWranglerBanner();
-				const config = readConfig(args.config as ConfigPath, args);
+				const config = readConfig(args.config, args);
 
 				let id;
 				try {
@@ -172,9 +170,9 @@ export const kvNamespace = (kvYargs: Argv<CommonYargsOptions>) => {
 				// TODO: delete the preview namespace as well?
 			}
 		);
-};
+}
 
-export const kvKey = (kvYargs: Argv<CommonYargsOptions>) => {
+export const kvKey = (kvYargs: CommonYargsArgv) => {
 	return kvYargs
 		.command(
 			"put <key> [value]",
@@ -231,7 +229,7 @@ export const kvKey = (kvYargs: Argv<CommonYargsOptions>) => {
 			},
 			async ({ key, ttl, expiration, metadata, ...args }) => {
 				await printWranglerBanner();
-				const config = readConfig(args.config as ConfigPath, args);
+				const config = readConfig(args.config, args);
 				const namespaceId = getKVNamespaceId(args, config);
 				// One of `args.path` and `args.value` must be defined
 				const value = args.path
@@ -297,7 +295,7 @@ export const kvKey = (kvYargs: Argv<CommonYargsOptions>) => {
 			},
 			async ({ prefix, ...args }) => {
 				// TODO: support for limit+cursor (pagination)
-				const config = readConfig(args.config as ConfigPath, args);
+				const config = readConfig(args.config, args);
 				const namespaceId = getKVNamespaceId(args, config);
 
 				const accountId = await requireAuth(config);
@@ -351,7 +349,7 @@ export const kvKey = (kvYargs: Argv<CommonYargsOptions>) => {
 					});
 			},
 			async ({ key, ...args }) => {
-				const config = readConfig(args.config as ConfigPath, args);
+				const config = readConfig(args.config, args);
 				const namespaceId = getKVNamespaceId(args, config);
 
 				const accountId = await requireAuth(config);
@@ -398,7 +396,7 @@ export const kvKey = (kvYargs: Argv<CommonYargsOptions>) => {
 			},
 			async ({ key, ...args }) => {
 				await printWranglerBanner();
-				const config = readConfig(args.config as ConfigPath, args);
+				const config = readConfig(args.config, args);
 				const namespaceId = getKVNamespaceId(args, config);
 
 				logger.log(`Deleting the key "${key}" on namespace ${namespaceId}.`);
@@ -413,7 +411,7 @@ export const kvKey = (kvYargs: Argv<CommonYargsOptions>) => {
 		);
 };
 
-export const kvBulk = (kvYargs: Argv<CommonYargsOptions>) => {
+export const kvBulk = (kvYargs: CommonYargsArgv) => {
 	return kvYargs
 		.command(
 			"put <filename>",
@@ -447,7 +445,7 @@ export const kvBulk = (kvYargs: Argv<CommonYargsOptions>) => {
 				// This could be made more efficient with a streaming parser/uploader
 				// but we'll do that in the future if needed.
 
-				const config = readConfig(args.config as ConfigPath, args);
+				const config = readConfig(args.config, args);
 				const namespaceId = getKVNamespaceId(args, config);
 				const content = parseJSON(readFileSync(filename), filename);
 
@@ -541,7 +539,7 @@ export const kvBulk = (kvYargs: Argv<CommonYargsOptions>) => {
 			},
 			async ({ filename, ...args }) => {
 				await printWranglerBanner();
-				const config = readConfig(args.config as ConfigPath, args);
+				const config = readConfig(args.config, args);
 				const namespaceId = getKVNamespaceId(args, config);
 
 				if (!args.force) {

package/src/logger.ts

@@ -1,8 +1,9 @@
 import { format } from "node:util";
+import chalk from "chalk";
+import CLITable from "cli-table3";
 import { formatMessagesSync } from "esbuild";
-import { getEnvironmentVariableFactory } from "./environment-variables";
+import { getEnvironmentVariableFactory } from "./environment-variables/factory";
 import type { BuildFailure } from "esbuild";
-
 export const LOGGER_LEVELS = {
 	none: -1,
 	error: 0,
@@ -25,13 +26,30 @@ const LOGGER_LEVEL_FORMAT_TYPE_MAP = {
 
 const getLogLevelFromEnv = getEnvironmentVariableFactory({
 	variableName: "WRANGLER_LOG",
-	defaultValue: "log",
 });
 
-class Logger {
+function getLoggerLevel(): LoggerLevel {
+	const fromEnv = getLogLevelFromEnv()?.toLowerCase();
+	if (fromEnv !== undefined) {
+		if (fromEnv in LOGGER_LEVELS) return fromEnv as LoggerLevel;
+		const expected = Object.keys(LOGGER_LEVELS)
+			.map((level) => `"${level}"`)
+			.join(" | ");
+		console.warn(
+			`Unrecognised WRANGLER_LOG value ${JSON.stringify(
+				fromEnv
+			)}, expected ${expected}, defaulting to "log"...`
+		);
+	}
+	return "log";
+}
+
+export type TableRow<Keys extends string> = Record<Keys, string>;
+
+export class Logger {
 	constructor() {}
 
-	loggerLevel: LoggerLevel = (getLogLevelFromEnv() as LoggerLevel) ?? "log";
+	loggerLevel = getLoggerLevel();
 	columns = process.stdout.columns;
 
 	debug = (...args: unknown[]) => this.doLog("debug", args);
@@ -39,6 +57,19 @@ class Logger {
 	log = (...args: unknown[]) => this.doLog("log", args);
 	warn = (...args: unknown[]) => this.doLog("warn", args);
 	error = (...args: unknown[]) => this.doLog("error", args);
+	table<Keys extends string>(data: TableRow<Keys>[]) {
+		const keys: Keys[] =
+			data.length === 0 ? [] : (Object.keys(data[0]) as Keys[]);
+		const t = new CLITable({
+			head: keys,
+			style: {
+				head: chalk.level ? ["blue"] : [],
+				border: chalk.level ? ["gray"] : [],
+			},
+		});
+		t.push(...data.map((row) => keys.map((k) => row[k])));
+		return this.doLog("log", [t.toString()]);
+	}
 
 	private doLog(messageLevel: Exclude<LoggerLevel, "none">, args: unknown[]) {
 		if (LOGGER_LEVELS[this.loggerLevel] >= LOGGER_LEVELS[messageLevel]) {

package/src/metrics/metrics-config.ts

@@ -1,11 +1,11 @@
 import { randomUUID } from "node:crypto";
 import { readFileSync, mkdirSync, writeFileSync } from "node:fs";
-import os from "node:os";
 import path from "node:path";
 import { fetchResult } from "../cfetch";
 import { getConfigCache, saveToConfigCache } from "../config-cache";
 import { confirm } from "../dialogs";
-import { getEnvironmentVariableFactory } from "../environment-variables";
+import { getEnvironmentVariableFactory } from "../environment-variables/factory";
+import { getGlobalWranglerConfigPath } from "../global-wrangler-config-path";
 import { CI } from "../is-ci";
 import isInteractive from "../is-interactive";
 import { logger } from "../logger";
@@ -167,7 +167,7 @@ export function readMetricsConfig(): MetricsConfigFile {
  * Get the path to the metrics config file.
  */
 function getMetricsConfigPath(): string {
-	return path.resolve(os.homedir(), ".wrangler/config/metrics.json");
+	return path.resolve(getGlobalWranglerConfigPath(), "metrics.json");
 }
 
 /**

package/src/metrics/send-event.ts

@@ -10,6 +10,8 @@ export type EventNames =
 	| "delete worker script"
 	| "begin log stream"
 	| "end log stream"
+	| "begin pages log stream"
+	| "end pages log stream"
 	| "create encrypted variable"
 	| "delete encrypted variable"
 	| "list encrypted variables"
@@ -53,7 +55,10 @@ export type EventNames =
 	| "build pages functions"
 	| "run dev"
 	| "run dev (api)"
-	| "run pages dev";
+	| "run pages dev"
+	| "view docs"
+	| "view deployments"
+	| "rollback deployments";
 
 /**
  * Send a metrics event, with no extra properties, to Cloudflare, if usage tracking is enabled.

package/src/miniflare-cli/assets.ts

@@ -3,54 +3,70 @@ import { join } from "node:path";
 import { createMetadataObject } from "@cloudflare/pages-shared/metadata-generator/createMetadataObject";
 import { parseHeaders } from "@cloudflare/pages-shared/metadata-generator/parseHeaders";
 import { parseRedirects } from "@cloudflare/pages-shared/metadata-generator/parseRedirects";
-import { fetch as miniflareFetch } from "@miniflare/core";
-import {
-	Response as MiniflareResponse,
-	Request as MiniflareRequest,
-} from "@miniflare/core";
 import { watch } from "chokidar";
 import { getType } from "mime";
 import { hashFile } from "../pages/hash";
 import type { Metadata } from "@cloudflare/pages-shared/asset-server/metadata";
-import type {
-	fetch,
-	Request,
-} from "@cloudflare/pages-shared/environment-polyfills/types";
 import type {
 	ParsedRedirects,
 	ParsedHeaders,
 } from "@cloudflare/pages-shared/metadata-generator/types";
-import type { RequestInfo, RequestInit, FetcherFetch } from "@miniflare/core";
-import type { Log } from "miniflare";
+import type {
+	Request as MiniflareRequest,
+	RequestInfo as MiniflareRequestInfo,
+	RequestInit as MiniflareRequestInit,
+} from "@miniflare/core";
+
+interface Logger {
+	log: (message: string) => void;
+	warn: (message: string) => void;
+	error: (error: Error) => void;
+}
 
 export interface Options {
-	log: Log;
+	log: Logger;
 	proxyPort?: number;
 	directory?: string;
+	tre: boolean;
 }
 
 export default async function generateASSETSBinding(options: Options) {
 	const assetsFetch =
 		options.directory !== undefined
-			? await generateAssetsFetch(options.directory, options.log)
+			? await generateAssetsFetch(options.directory, options.log, options.tre)
 			: invalidAssetsFetch;
 
-	return async function (miniflareRequest: MiniflareRequest) {
+	const miniflare = options.tre
+		? await import("@miniflare/tre")
+		: await import("@miniflare/core");
+
+	const Request = miniflare.Request as typeof MiniflareRequest;
+	const Response = miniflare.Response;
+	// WebSockets won't work with `--experimental-local` until we expose something like `upgradingFetch` from `@miniflare/tre`.
+	const fetch = (
+		options.tre
+			? miniflare.fetch
+			: (await import("@miniflare/web-sockets")).upgradingFetch
+	) as (request: Request) => Promise<Response>;
+
+	return async function (miniflareRequest: Request) {
 		if (options.proxyPort) {
 			try {
 				const url = new URL(miniflareRequest.url);
 				url.host = `localhost:${options.proxyPort}`;
-				return await miniflareFetch(url, miniflareRequest);
+				const proxyRequest = new Request(url, miniflareRequest);
+				if (proxyRequest.headers.get("Upgrade") === "websocket") {
+					proxyRequest.headers.delete("Sec-WebSocket-Accept");
+					proxyRequest.headers.delete("Sec-WebSocket-Key");
+				}
+				return await fetch(proxyRequest as Request);
 			} catch (thrown) {
 				options.log.error(new Error(`Could not proxy request: ${thrown}`));
 
 				// TODO: Pretty error page
-				return new MiniflareResponse(
-					`[wrangler] Could not proxy request: ${thrown}`,
-					{
-						status: 502,
-					}
-				);
+				return new Response(`[wrangler] Could not proxy request: ${thrown}`, {
+					status: 502,
+				});
 			}
 		} else {
 			try {
@@ -59,21 +75,41 @@ export default async function generateASSETSBinding(options: Options) {
 				options.log.error(new Error(`Could not serve static asset: ${thrown}`));
 
 				// TODO: Pretty error page
-				return new MiniflareResponse(
+				return new Response(
 					`[wrangler] Could not serve static asset: ${thrown}`,
 					{ status: 502 }
 				);
 			}
 		}
-	} as FetcherFetch;
+	};
 }
 
 async function generateAssetsFetch(
 	directory: string,
-	log: Log
+	log: Logger,
+	tre: boolean
 ): Promise<typeof fetch> {
 	// Defer importing miniflare until we really need it
-	await import("@cloudflare/pages-shared/environment-polyfills/miniflare");
+
+	// NOTE: These dynamic imports bring in `global` type augmentations from
+	// `@cloudflare/pages-shared/environment-polyfills/types.ts`, allowing us to
+	// use `fetch`, `Headers`, `Request` and `Response` as globals in this file
+	// and the *entire* `miniflare-cli` TypeScript project.
+	const polyfill = tre
+		? (
+				await import(
+					"@cloudflare/pages-shared/environment-polyfills/miniflare-tre"
+				)
+		  ).default
+		: (await import("@cloudflare/pages-shared/environment-polyfills/miniflare"))
+				.default;
+
+	await polyfill();
+
+	const miniflare = tre
+		? await import("@miniflare/tre")
+		: await import("@miniflare/core");
+	const Request = miniflare.Request as typeof MiniflareRequest;
 
 	const { generateHandler, parseQualityWeightedList } = await import(
 		"@cloudflare/pages-shared/asset-server/handler"
@@ -184,7 +220,7 @@ async function generateAssetsFetch(
 				const filepath = assetKeyEntryMap.get(assetKey);
 				if (!filepath) {
 					throw new Error(
-						"Could not fetch asset. Please file an issue on GitHub (https://github.com/cloudflare/wrangler2/issues/new/choose) with reproduction steps."
+						"Could not fetch asset. Please file an issue on GitHub (https://github.com/cloudflare/workers-sdk/issues/new/choose) with reproduction steps."
 					);
 				}
 				const body = readFileSync(filepath) as unknown as ReadableStream;
@@ -202,8 +238,8 @@ async function generateAssetsFetch(
 		});
 	};
 
-	return async (input: RequestInfo, init?: RequestInit) => {
-		const request = new MiniflareRequest(input, init);
+	return async (input: MiniflareRequestInfo, init?: MiniflareRequestInit) => {
+		const request = new Request(input, init);
 		return await generateResponse(request as unknown as Request);
 	};
 }

package/src/miniflare-cli/index.ts

@@ -1,8 +1,8 @@
-import { fetch } from "@miniflare/core";
 import {
 	DurableObjectNamespace,
 	DurableObjectStub,
 } from "@miniflare/durable-objects";
+import { upgradingFetch } from "@miniflare/web-sockets";
 import {
 	Log as MiniflareLog,
 	LogLevel as MiniflareLogLevel,
@@ -17,13 +17,9 @@ import generateASSETSBinding from "./assets";
 import { getRequestContextCheckOptions } from "./request-context";
 import type { LoggerLevel } from "../logger";
 import type { Options } from "./assets";
+import type { EnablePagesAssetsServiceBindingOptions } from "./types";
 import type { AddressInfo } from "net";
 
-export interface EnablePagesAssetsServiceBindingOptions {
-	proxyPort?: number;
-	directory?: string;
-}
-
 // miniflare defines this but importing it throws:
 // Dynamic require of "path" is not supported
 class MiniflareNoOpLog extends MiniflareLog {
@@ -51,7 +47,7 @@ async function main() {
 	config.log =
 		logLevel === MiniflareLogLevel.NONE
 			? new MiniflareNoOpLog()
-			: new MiniflareLog(logLevel, config.logOptions);
+			: new MiniflareLog(logLevel);
 
 	if (logLevel === MiniflareLogLevel.DEBUG) {
 		console.log("MINIFLARE OPTIONS:\n", JSON.stringify(config, null, 2));
@@ -91,7 +87,7 @@ async function main() {
 								id.toString()
 							);
 
-							return fetch(request);
+							return upgradingFetch(request);
 						};
 						return stub;
 					};
@@ -120,6 +116,7 @@ async function main() {
 				log: config.log,
 				proxyPort: opts.proxyPort,
 				directory: opts.directory,
+				tre: false,
 			};
 
 			config.serviceBindings = {
@@ -196,7 +193,7 @@ async function main() {
 		process.send &&
 			process.send(
 				JSON.stringify({
-					mfPort: mfPort,
+					port: mfPort,
 					ready: true,
 					durableObjectsPort: durableObjectsMfPort,
 				})