lopata 0.18.4 → 0.19.0

package/src/bindings/do-executor.ts

@@ -1,4 +1,5 @@
 import type { Database } from 'bun:sqlite'
+import type { WranglerConfig } from '../config'
 import type { ContainerConfig } from './container'
 import type { DurableObjectBase, DurableObjectIdImpl, DurableObjectLimits } from './durable-object'
 
@@ -7,11 +8,24 @@ export interface ExecutorConfig {
 	db: Database
 	namespaceName: string
 	cls: new(ctx: any, env: unknown) => DurableObjectBase
-	env: unknown
+	env: Record<string, unknown>
 	dataDir?: string
 	limits?: DurableObjectLimits
 	containerConfig?: ContainerConfig
 	onAlarmSet?: (time: number | null) => void
+	/** @internal Worker-thread DO executors re-import the user module + config
+	 *  inside their Bun Worker; the factory injects these paths. */
+	_modulePath?: string
+	_configPath?: string
+	/** @internal Main's already-parsed, env-overridden wrangler config. Passed to
+	 *  the DO worker so it doesn't re-load from `_configPath` WITHOUT the `--env`
+	 *  overrides (which the re-parse silently dropped). */
+	_wranglerConfig?: WranglerConfig
+	/** @internal Disposal of the PRIOR executor for this same id, still in flight
+	 *  (its Docker container is being `docker rm`'d). A container DO awaits this
+	 *  before its first command so a fresh `docker run` for the same name doesn't
+	 *  race the teardown — which could `docker rm -f` the replacement. */
+	_priorDisposal?: Promise<void>
 }
 
 export interface DOExecutor {
@@ -39,6 +53,11 @@ export interface DOExecutor {
 	/** Whether the instance has been aborted */
 	isAborted(): boolean
 
+	/** Whether the underlying executor is dead (e.g. its Worker crashed). A
+	 *  disposed executor is unusable — the namespace drops it and recreates a
+	 *  fresh one on next access. Optional: executors that can't die report `false`. */
+	isDisposed?(): boolean
+
 	/** Hot-swap the DO class and env without disposing (preserves WebSocket connections) */
 	reloadClass?(cls: new(ctx: any, env: unknown) => DurableObjectBase, env: unknown): void
 
@@ -48,4 +67,7 @@ export interface DOExecutor {
 
 export interface DOExecutorFactory {
 	create(config: ExecutorConfig): DOExecutor
+	/** Tell the factory where user code lives + the already-parsed env-overridden
+	 *  config (only used by worker-thread DO executors). */
+	configure?(modulePath: string, configPath: string, wranglerConfig?: WranglerConfig): void
 }

package/src/bindings/do-worker-entry.ts

@@ -5,6 +5,9 @@
  * postMessage from the main thread (handshake), then initializes.
  */
 
+import { dirname } from 'node:path'
+import { deserializeError, serializeError } from '../worker-thread/protocol'
+import { OutboundStreamRegistry, pumpStream, STREAM_BACKPRESSURE_WINDOW, StreamReceiver } from '../worker-thread/stream-shared'
 import type { DOCommand, DOMainMessage, DOResult, DOWorkerMessage } from './do-executor-worker'
 
 declare var self: Worker
@@ -12,6 +15,10 @@ declare var self: Worker
 interface WorkerConfig {
 	modulePath: string
 	configPath: string
+	/** Main's parsed, env-overridden config. When present it's used verbatim so
+	 *  the DO env honors `--env` overrides; absent (e.g. standalone test factory)
+	 *  we fall back to re-loading from `configPath`. */
+	wranglerConfig?: import('../config').WranglerConfig
 	dataDir: string
 	namespaceName: string
 	idStr: string
@@ -28,17 +35,12 @@ self.onmessage = async (event: MessageEvent) => {
 	try {
 		await initWorker(workerConfig)
 	} catch (e) {
-		const error = e instanceof Error ? e : new Error(String(e))
+		const message = e instanceof Error ? e.message : String(e)
 		postMessage(
 			{
 				type: 'result',
 				id: -1,
-				result: {
-					type: 'error',
-					message: `Worker init failed: ${error.message}`,
-					stack: error.stack,
-					name: error.name,
-				},
+				result: { type: 'error', error: serializeError(new Error(`Worker init failed: ${message}`, { cause: e })) },
 			} satisfies DOMainMessage,
 		)
 	}
@@ -51,25 +53,44 @@ async function initWorker(workerConfig: WorkerConfig) {
 	// Register Bun plugins for cloudflare:workers etc.
 	await import('../plugin')
 
-	const { loadConfig } = await import('../config')
-	const { buildWorkerEnv } = await import('./do-worker-env')
+	const { buildWorkerEnv, createDoEnvRpc } = await import('./do-worker-env')
 	const { DurableObjectStateImpl, DurableObjectIdImpl } = await import('./durable-object')
-	const { BridgeWebSocket } = await import('./do-websocket-bridge')
+	const { CFWebSocket } = await import('./websocket-pair')
+	const { WsGuestBridge } = await import('../worker-thread/ws-bridge-shared')
+	const { ContainerBase, ContainerContext, ContainerRuntime } = await import('./container')
+	const { DockerManager } = await import('./container-docker')
+	const { containerLabels } = await import('./container-cleanup')
 
-	const config = await loadConfig(workerConfig.configPath)
-	const { db, env, doNamespaces } = buildWorkerEnv(config, workerConfig.dataDir)
+	// Prefer main's already-parsed, env-overridden config; only re-load from disk
+	// (WITHOUT --env overrides) when no parsed config was threaded through — e.g.
+	// the standalone test factory.
+	const config = workerConfig.wranglerConfig ?? await (await import('../config')).loadConfig(workerConfig.configPath)
+	// Per-worker dir for `.dev.vars`/`.env`/assets — the config file's directory.
+	const baseDir = dirname(workerConfig.configPath)
+	const envRpc = createDoEnvRpc(msg => postMessage(msg))
+
+	/**
+	 * Bridge for `Response{webSocket}` returned from env-binding fetches the
+	 * DO worker calls (e.g. `this.env.SVC.fetch('/ws')`). The user-facing peer
+	 * lives here; bytes sent / closes on it travel through this bridge back to
+	 * the upstream CFWebSocket adopted on main.
+	 */
+	const envWsBridge = new WsGuestBridge<DOMainMessage>(msg => postMessage(msg), {
+		remoteMessage: (wsId, data) => ({ type: 'env-ws-outgoing', wsId, data }),
+		remoteClose: (wsId, code, reason, wasClean) => ({ type: 'env-ws-close-out', wsId, code, reason, wasClean }),
+	})
+
+	const { db, env } = buildWorkerEnv(config, workerConfig.dataDir, baseDir, envRpc, workerConfig.namespaceName, envWsBridge)
+
+	// Publish env to `globalEnv` so top-level `import { env } from
+	// 'cloudflare:workers'` in the user module sees this DO worker's env (not
+	// an empty default). Must happen BEFORE the dynamic import below.
+	const { setGlobalEnv } = await import('../env')
+	setGlobalEnv(env)
 
 	// Import user's worker module
 	const workerModule = await import(workerConfig.modulePath)
 
-	// Wire DO classes for nested DOs
-	for (const entry of doNamespaces) {
-		const cls = workerModule[entry.className]
-		if (cls) {
-			entry.namespace._setClass(cls as any, env)
-		}
-	}
-
 	// Create this DO's instance
 	const id = new DurableObjectIdImpl(workerConfig.idStr, workerConfig.idName)
 	const cls = workerModule[workerConfig.namespaceName]
@@ -78,11 +99,106 @@ async function initWorker(workerConfig: WorkerConfig) {
 	}
 
 	const state = new DurableObjectStateImpl(id, db, workerConfig.namespaceName, workerConfig.dataDir)
+
+	// Mirror the instance's abort/block lifecycle to main so the idle reaper
+	// evicts an aborted instance (every subsequent command throws — it must be
+	// recreated fresh) and never evicts mid-blockConcurrencyWhile. Main only sees
+	// commands/WS traffic, so without these signals it can't observe either.
+	const postState = () => {
+		postMessage({ type: 'do-state', aborted: state._isAborted(), blocked: state._isBlocked() } satisfies DOMainMessage)
+	}
+	const originalAbort = state.abort.bind(state)
+	state.abort = (reason?: string) => {
+		originalAbort(reason)
+		postState()
+	}
+	const originalBlock = state.blockConcurrencyWhile.bind(state)
+	state.blockConcurrencyWhile = <T>(cb: () => Promise<T>): Promise<T> => {
+		const p = originalBlock(cb)
+		postState() // entered the block
+		// left it — both-callbacks form so a rejecting callback (the caller's
+		// to handle via the returned `p`) can't float an unhandled rejection
+		p.then(postState, postState)
+		return p
+	}
+
+	// Mirrors the `ContainerRuntime` wiring `InProcessExecutor` did on main —
+	// without it, `ContainerBase` instances fail with "Container runtime not
+	// initialized" on the first `startAndWaitForPorts` call.
+	const containerEntry = config.containers?.find(c => c.class_name === workerConfig.namespaceName)
+	let containerRuntime: InstanceType<typeof ContainerRuntime> | undefined
+	if (containerEntry) {
+		// `DockerManager` itself stays per-worker (the hot path is `docker
+		// inspect` polling — no point routing every health check through
+		// main). Cleanup tracking, however, lives on main: the worker posts
+		// `container-registered` / `container-removed` so main's `exit`
+		// handler can rm -f everything regardless of which worker spawned it.
+		const dockerManager = new DockerManager({
+			onRegister: name => postMessage({ type: 'container-registered', name } satisfies DOMainMessage),
+			onRemove: name => postMessage({ type: 'container-removed', name } satisfies DOMainMessage),
+			labels: containerLabels(),
+		})
+		containerRuntime = new ContainerRuntime(
+			workerConfig.namespaceName,
+			id.toString(),
+			containerEntry.image,
+			dockerManager,
+		)
+		state.container = new ContainerContext(containerRuntime)
+	}
+
 	const instance = new (cls as any)(state, env)
 
+	if (containerRuntime && instance instanceof ContainerBase) {
+		instance._wireRuntime(containerRuntime)
+	}
+
 	state._setInstanceResolver(() => instance)
 
-	const bridgedWebSockets = new Map<string, InstanceType<typeof BridgeWebSocket>>()
+	/**
+	 * Bridge for `Response{webSocket}` returned by the DO's own fetch(). Forwards
+	 * the user-facing peer's events up to main and dispatches inbound real-client
+	 * events onto the user-facing peer.
+	 */
+	const fetchWsBridge = new WsGuestBridge<DOMainMessage>(msg => postMessage(msg), {
+		remoteMessage: (wsId, data) => ({ type: 'fetch-ws-outgoing', wsId, data }),
+		remoteClose: (wsId, code, reason, wasClean) => ({ type: 'fetch-ws-close-out', wsId, code, reason, wasClean }),
+	})
+
+	/** Active body pumps for streamed DO-fetch responses, keyed by `streamId`,
+	 *  so an inbound `do-stream-cancel` can stop the source reader. */
+	const fetchStreams = new OutboundStreamRegistry()
+
+	/** Active reconstructed DO-fetch request bodies (main → DO worker). Chunks
+	 *  arriving before the controller registers queue inside the receiver. */
+	const requestStreams = new StreamReceiver(
+		(streamId) => {
+			postMessage({ type: 'do-req-stream-cancel', streamId } satisfies DOMainMessage)
+		},
+		{
+			window: STREAM_BACKPRESSURE_WINDOW,
+			onCredit: (streamId) => postMessage({ type: 'do-req-stream-ack', streamId } satisfies DOMainMessage),
+		},
+	)
+
+	function pumpFetchBody(streamId: number, body: ReadableStream<Uint8Array>): void {
+		type Chunk = Extract<DOMainMessage, { type: 'do-stream-chunk' }>
+		type End = Extract<DOMainMessage, { type: 'do-stream-end' }>
+		type Err = Extract<DOMainMessage, { type: 'do-stream-error' }>
+		pumpStream<Chunk, End, Err>(
+			streamId,
+			body,
+			fetchStreams,
+			msg => postMessage(msg),
+			{
+				chunk: (id, chunk) => ({ type: 'do-stream-chunk', streamId: id, chunk }),
+				end: (id) => ({ type: 'do-stream-end', streamId: id }),
+				error: (id, error) => ({ type: 'do-stream-error', streamId: id, error }),
+			},
+			undefined,
+			STREAM_BACKPRESSURE_WINDOW,
+		)
+	}
 
 	// Wire alarm callback
 	state.storage._setAlarmCallback((time: number | null) => {
@@ -91,7 +207,20 @@ async function initWorker(workerConfig: WorkerConfig) {
 
 	// --- Command handler ---
 
-	async function handleCommand(cmd: DOCommand): Promise<DOResult> {
+	/**
+	 * Some commands need to perform side effects *after* their result message is
+	 * posted — specifically, streamed fetch responses must wait for main to see
+	 * the `streamId` on the `result` before chunk messages arrive (otherwise the
+	 * first chunks land before `start()` registers the controller and have to
+	 * sit in `_pendingStreamEvents`). The handler returns a continuation so the
+	 * dispatcher can post the result first and then start the pump.
+	 */
+	interface HandledCommand {
+		result: DOResult
+		afterPost?: () => void
+	}
+
+	async function handleCommand(cmd: DOCommand): Promise<HandledCommand> {
 		switch (cmd.type) {
 			case 'fetch': {
 				await state._enter()
@@ -100,21 +229,61 @@ async function initWorker(workerConfig: WorkerConfig) {
 					if (typeof fetchFn !== 'function') {
 						throw new Error('Durable Object does not implement fetch()')
 					}
+					const reqBody = cmd.streamId !== undefined ? requestStreams.open(cmd.streamId) : cmd.body
 					const request = new Request(cmd.url, {
 						method: cmd.method,
 						headers: cmd.headers,
-						body: cmd.body,
+						body: reqBody,
 					})
-					const response = await fetchFn.call(instance, request)
-					const resBody = response.body ? await response.arrayBuffer() : null
+					let response: Response
+					try {
+						response = await fetchFn.call(instance, request)
+					} catch (e) {
+						// The instance's fetch errored without draining the streamed
+						// request body — cancel the receiver so main stops pumping and
+						// buffered chunks are dropped. Mirrors dispatchRpcFetch's contract.
+						if (cmd.streamId !== undefined) requestStreams.cancel(cmd.streamId)
+						throw e
+					}
+					// Resolved but the body wasn't consumed (e.g. a 401 before reading) —
+					// cancel the receiver so main's pump doesn't park forever holding the
+					// source. DO fetch has no ctx.waitUntil, so nothing reads it later.
+					if (cmd.streamId !== undefined && !request.bodyUsed) {
+						requestStreams.cancel(cmd.streamId)
+					}
+					const clientWs = (response as { webSocket?: unknown }).webSocket
+					const hasWebSocket = response.status === 101 && clientWs instanceof CFWebSocket
 					const resHeaders: [string, string][] = []
 					response.headers.forEach((v: string, k: string) => resHeaders.push([k, v]))
+
+					let fetchWebSocketId: string | undefined
+					if (hasWebSocket) {
+						const cw = clientWs as InstanceType<typeof CFWebSocket>
+						// Main pins the executor on this id (hibernation or plain socket
+						// alike) when it processes the result and unpins on close, so no
+						// separate accept signal is needed.
+						fetchWebSocketId = fetchWsBridge.register(cw)
+					}
+
+					let streamId: number | undefined
+					let afterPost: (() => void) | undefined
+					if (!hasWebSocket && response.body) {
+						streamId = fetchStreams.allocateId()
+						const body = response.body
+						afterPost = () => pumpFetchBody(streamId!, body)
+					}
+
 					return {
-						type: 'fetch',
-						status: response.status,
-						statusText: response.statusText,
-						headers: resHeaders,
-						body: resBody,
+						result: {
+							type: 'fetch',
+							status: response.status,
+							statusText: response.statusText,
+							headers: resHeaders,
+							body: null,
+							fetchWebSocketId,
+							streamId,
+						},
+						afterPost,
 					}
 				} finally {
 					state._exit()
@@ -129,7 +298,7 @@ async function initWorker(workerConfig: WorkerConfig) {
 						throw new Error(`"${cmd.method}" is not a method on the Durable Object`)
 					}
 					const result = await val.call(instance, ...cmd.args)
-					return { type: 'rpc-call', value: result }
+					return { result: { type: 'rpc-call', value: result } }
 				} finally {
 					state._exit()
 				}
@@ -140,9 +309,9 @@ async function initWorker(workerConfig: WorkerConfig) {
 				try {
 					const val = (instance as any)[cmd.prop]
 					if (typeof val === 'function') {
-						return { type: 'rpc-get', value: '__function__' }
+						return { result: { type: 'rpc-get', kind: 'function' } }
 					}
-					return { type: 'rpc-get', value: val }
+					return { result: { type: 'rpc-get', kind: 'value', value: val } }
 				} finally {
 					state._exit()
 				}
@@ -158,18 +327,17 @@ async function initWorker(workerConfig: WorkerConfig) {
 							isRetry: cmd.retryCount > 0,
 						})
 					}
-					return { type: 'alarm' }
+					return { result: { type: 'alarm' } }
 				} finally {
 					state._exit()
 				}
 			}
 
-			case 'ws-create': {
-				const bridgeWs = new BridgeWebSocket(cmd.wsId, (msg: any) => {
-					postMessage({ type: 'ws-bridge', payload: msg } satisfies DOMainMessage)
-				})
-				bridgedWebSockets.set(cmd.wsId, bridgeWs)
-				return { type: 'ws-created', wsId: cmd.wsId }
+			case 'cleanup': {
+				// Tear down the Docker container (rm -f + stop timers) before main
+				// terminates this thread. No-op for non-container DOs.
+				await containerRuntime?.cleanup()
+				return { result: { type: 'cleanup' } }
 			}
 
 			default:
@@ -181,37 +349,51 @@ async function initWorker(workerConfig: WorkerConfig) {
 	self.onmessage = async (event: MessageEvent<DOWorkerMessage>) => {
 		const msg = event.data
 
+		// Env-binding RPC replies from main (service-binding fetches, etc.)
+		if (envRpc.handle(msg as { type: string })) return
+
 		if (msg.type === 'command') {
 			try {
-				const result = await handleCommand(msg.command)
+				const { result, afterPost } = await handleCommand(msg.command)
 				postMessage({ type: 'result', id: msg.id, result } satisfies DOMainMessage)
+				// Post-result side effects: for streamed fetch responses, start the
+				// body pump *after* `result` ships so main has registered the
+				// `streamId` before any chunk arrives.
+				afterPost?.()
+				// Surface any abort/block transition this command caused (e.g. it
+				// called state.abort()). The wrappers above catch abort/block from
+				// outside a command (timers, WS handlers); this catches in-command.
+				postState()
 			} catch (e) {
-				const error = e instanceof Error ? e : new Error(String(e))
 				postMessage(
 					{
 						type: 'result',
 						id: msg.id,
-						result: {
-							type: 'error',
-							message: error.message,
-							stack: error.stack,
-							name: error.name,
-						},
+						result: { type: 'error', error: serializeError(e) },
 					} satisfies DOMainMessage,
 				)
+				// The command may have thrown because the instance was aborted
+				// (state._enter() rejects once aborted) — make sure main learns of it.
+				postState()
 			}
-		} else if (msg.type === 'ws-message') {
-			const ws = bridgedWebSockets.get(msg.wsId)
-			if (ws) ws._onMessage(msg.data)
-		} else if (msg.type === 'ws-close') {
-			const ws = bridgedWebSockets.get(msg.wsId)
-			if (ws) {
-				ws._onClose(msg.code, msg.reason, msg.wasClean)
-				bridgedWebSockets.delete(msg.wsId)
-			}
-		} else if (msg.type === 'ws-error') {
-			const ws = bridgedWebSockets.get(msg.wsId)
-			if (ws) ws._onError()
+		} else if (msg.type === 'do-stream-ack') {
+			fetchStreams.grantCredit(msg.streamId)
+		} else if (msg.type === 'do-stream-cancel') {
+			fetchStreams.cancel(msg.streamId)
+		} else if (msg.type === 'do-req-stream-chunk') {
+			requestStreams.push(msg.streamId, msg.chunk)
+		} else if (msg.type === 'do-req-stream-end') {
+			requestStreams.end(msg.streamId)
+		} else if (msg.type === 'do-req-stream-error') {
+			requestStreams.error(msg.streamId, deserializeError(msg.error))
+		} else if (msg.type === 'fetch-ws-incoming') {
+			fetchWsBridge.deliverClientMessage(msg.wsId, msg.data)
+		} else if (msg.type === 'fetch-ws-close-in') {
+			fetchWsBridge.deliverClientClose(msg.wsId, msg.code, msg.reason, msg.wasClean)
+		} else if (msg.type === 'env-ws-incoming') {
+			envWsBridge.deliverClientMessage(msg.wsId, msg.data)
+		} else if (msg.type === 'env-ws-close-in') {
+			envWsBridge.deliverClientClose(msg.wsId, msg.code, msg.reason, msg.wasClean)
 		}
 	}