draft: migrate single worker wrangler dev to miniflare dev registry

Author: edmundhung

packages/wrangler/src/api/integrations/platform/index.ts

@@ -227,7 +227,6 @@ async function getMiniflareOptionsFromConfig(args: {
 			name: config.name,
 			complianceRegion: config.compliance_region,
 			bindings,
-			workerDefinitions: null,
 			queueConsumers: undefined,
 			services: bindings.services,
 			serviceBindings: {},
@@ -402,7 +401,6 @@ export function unstable_getMiniflareWorkerOptions(
 			name: config.name,
 			complianceRegion: config.compliance_region,
 			bindings,
-			workerDefinitions: null,
 			queueConsumers: config.queues.consumers,
 			services: [],
 			serviceBindings: {},

packages/wrangler/src/api/startDevWorker/ConfigController.ts

@@ -152,7 +152,6 @@ async function resolveDevConfig(
 		testScheduled: input.dev?.testScheduled,
 		// absolute resolved path
 		persist: localPersistencePath,
-		registry: input.dev?.registry,
 		bindVectorizeToProd: input.dev?.bindVectorizeToProd ?? false,
 		multiworkerPrimary: input.dev?.multiworkerPrimary,
 		imagesLocalMode: input.dev?.imagesLocalMode ?? false,
@@ -213,7 +212,8 @@ async function resolveBindings(
 		},
 		input.tailConsumers ?? config.tail_consumers,
 		{
-			registry: input.dev?.registry,
+			// FIXME: We can use getWorkerRegistry here, but we might need a way to print the bindings when the registry update?
+			// registry: input.dev?.registry,
 			local: !input.dev?.remote,
 			imagesLocalMode: input.dev?.imagesLocalMode,
 			name: config.name,

packages/wrangler/src/api/startDevWorker/LocalRuntimeController.ts

@@ -17,7 +17,6 @@ import {
 	convertBindingsToCfWorkerInitBindings,
 	convertCfWorkerInitBindingsToBindings,
 } from "./utils";
-import type { WorkerEntrypointsDefinition } from "../../dev-registry";
 import type { RemoteProxySession } from "../remoteBindings";
 import type {
 	BundleCompleteEvent,
@@ -104,7 +103,6 @@ export async function convertToConfigBundle(
 		complianceRegion: event.config.complianceRegion,
 		bindings,
 		migrations: event.config.migrations,
-		workerDefinitions: event.config.dev?.registry,
 		legacyAssetPaths: event.config.legacy?.site?.bucket
 			? {
 					baseDirectory: event.config.legacy?.site?.bucket,
@@ -267,14 +265,13 @@ export class LocalRuntimeController extends RuntimeController {
 				logger.log(chalk.dim("⎔ Container image(s) ready"));
 			}
 
-			const { options, internalObjects, entrypointNames } =
-				await MF.buildMiniflareOptions(
-					this.#log,
-					configBundle,
-					this.#proxyToUserWorkerAuthenticationSecret,
-					this.#remoteProxySessionData?.session?.remoteProxyConnectionString,
-					!!experimentalRemoteBindings
-				);
+			const options = await MF.buildMiniflareOptions(
+				this.#log,
+				configBundle,
+				this.#proxyToUserWorkerAuthenticationSecret,
+				this.#remoteProxySessionData?.session?.remoteProxyConnectionString,
+				!!experimentalRemoteBindings
+			);
 			options.liveReload = false; // TODO: set in buildMiniflareOptions once old code path is removed
 			if (this.#mf === undefined) {
 				logger.log(chalk.dim("⎔ Starting local server..."));
@@ -302,13 +299,6 @@ export class LocalRuntimeController extends RuntimeController {
 				return;
 			}
 
-			// Get entrypoint addresses
-			const entrypointAddresses: WorkerEntrypointsDefinition = {};
-			for (const name of entrypointNames) {
-				const directUrl = await this.#mf.unsafeGetDirectURL(undefined, name);
-				const port = parseInt(directUrl.port);
-				entrypointAddresses[name] = { host: directUrl.hostname, port };
-			}
 			this.emitReloadCompleteEvent({
 				type: "reloadComplete",
 				config: data.config,
@@ -341,8 +331,6 @@ export class LocalRuntimeController extends RuntimeController {
 					},
 					liveReload: data.config.dev?.liveReload,
 					proxyLogsToController: data.bundle.entry.format === "service-worker",
-					internalDurableObjects: internalObjects,
-					entrypointAddresses,
 				},
 			});
 		} catch (error) {

packages/wrangler/src/api/startDevWorker/MultiworkerRuntimeController.ts

@@ -178,7 +178,7 @@ export class MultiworkerRuntimeController extends LocalRuntimeController {
 				logger.log(chalk.dim("⎔ Container image(s) ready"));
 			}
 
-			const { options } = await MF.buildMiniflareOptions(
+			const options = await MF.buildMiniflareOptions(
 				this.#log,
 				await convertToConfigBundle(data),
 				this.#proxyToUserWorkerAuthenticationSecret,
@@ -245,10 +245,6 @@ export class MultiworkerRuntimeController extends LocalRuntimeController {
 						liveReload: data.config.dev?.liveReload,
 						proxyLogsToController:
 							data.bundle.entry.format === "service-worker",
-
-						// It's not possible to bind to Workers in a multi-worker setup across the dev registry, so these are intentionally left empty
-						internalDurableObjects: [],
-						entrypointAddresses: {},
 					},
 				});
 			}

packages/wrangler/src/api/startDevWorker/RemoteRuntimeController.ts

@@ -284,8 +284,6 @@ export class RemoteRuntimeController extends RuntimeController {
 					},
 					liveReload: config.dev.liveReload,
 					proxyLogsToController: true,
-					internalDurableObjects: [],
-					entrypointAddresses: {},
 				},
 			});
 		} catch (error) {

packages/wrangler/src/api/startDevWorker/events.ts

@@ -1,5 +1,3 @@
-import type { CfDurableObject } from "../../deployment-bundle/worker";
-import type { WorkerEntrypointsDefinition } from "../../dev-registry";
 import type { DevToolsEvent } from "./devtools";
 import type { Bundle, StartDevWorkerOptions } from "./types";
 import type { Miniflare } from "miniflare";
@@ -153,6 +151,4 @@ export type ProxyData = {
 	headers: Record<string, string>;
 	liveReload?: boolean;
 	proxyLogsToController?: boolean;
-	internalDurableObjects?: CfDurableObject[];
-	entrypointAddresses: WorkerEntrypointsDefinition | undefined;
 };

packages/wrangler/src/api/startDevWorker/types.ts

@@ -32,7 +32,6 @@ import type {
 	CfVectorize,
 	CfWorkflow,
 } from "../../deployment-bundle/worker";
-import type { WorkerRegistry } from "../../dev-registry";
 import type { CfAccount } from "../../dev/create-worker-preview";
 import type { EsbuildBundle } from "../../dev/use-esbuild";
 import type { ConfigController } from "./ConfigController";
@@ -178,9 +177,6 @@ export interface StartDevWorkerInput {
 		/** An undici MockAgent to declaratively mock fetch calls to particular resources. */
 		mockFetch?: undici.MockAgent;
 
-		/** Describes the registry of other Workers running locally */
-		registry?: WorkerRegistry | null;
-
 		testScheduled?: boolean;
 
 		/** Whether to use Vectorize as a remote binding -- the worker is run locally but accesses to Vectorize are made remotely */