void 0.22.0 → 0.23.0

package/dist/runtime/ai.mjs

@@ -1,5 +1,6 @@
 import { t as cfAccessHeaders } from "../cf-access-DRsQRe6k.mjs";
 import { a as getRawRuntimeEnv } from "../env-raw-Cx8ElDdj.mjs";
+import { a as readUsageLimit, i as limitOperation, r as limitFromResponse, t as UsageLimit } from "../limits-Cjuk2VPm.mjs";
 //#region src/runtime/ai-types.ts
 /** Maps provider prefix to expected env var name for the API key */
 const PROVIDER_KEY_MAP = {
@@ -315,6 +316,8 @@ function makeServiceBindingBackend(proxy, runtimeEnv) {
 				...body
 			})
 		});
+		const limit = await limitFromResponse(res, "ai");
+		if (limit) throw limit;
 		if (options.throwOnError !== false && !res.ok) {
 			const text = await res.text();
 			throw new Error(`ai: Proxy request failed with ${res.status}: '${text}'.`);
@@ -395,6 +398,8 @@ function makeHttpBackend(token, projectId, runtimeEnv) {
 			}),
 			redirect: "manual"
 		});
+		const limit = await limitFromResponse(res, "ai");
+		if (limit) throw limit;
 		if (options.throwOnError !== false && !res.ok) {
 			const text = await res.text();
 			throw new Error(`ai: Proxy request failed with ${res.status}: '${text}'.`);
@@ -434,11 +439,24 @@ function makeHttpBackend(token, projectId, runtimeEnv) {
 	};
 }
 function makeDirectBackend(directAi, runtimeEnv, gatewayId) {
+	const run = async (model, inputs, options) => {
+		const opts = options ?? {};
+		const response = await directAi.run(model, inputs, {
+			...opts,
+			returnRawResponse: true
+		});
+		if (!(response instanceof Response)) return response;
+		const limit = await limitFromResponse(response, "ai");
+		if (limit) throw limit;
+		if (opts.returnRawResponse || opts.websocket) return response;
+		if (!response.ok) throw new Error(`ai: Request failed with ${response.status}: '${await response.text()}'.`);
+		return isJsonMediaType(mediaTypeFromContentType(response.headers.get("content-type"))) ? response.json() : response.body;
+	};
 	return {
-		run: directAi.run.bind(directAi),
+		run,
 		async image(model, inputs, options) {
 			const { runOptions } = splitImageOptions(options);
-			return responseFromResult(await directAi.run(model, inputs, runOptions));
+			return responseFromResult(await run(model, inputs, runOptions));
 		},
 		async providerFetch(provider, path, init, options) {
 			if (!gatewayId) return Response.json({ error: "ai: ai.provider().fetch() needs an AI Gateway when self-hosting. Set \"ai\": { \"gateway\": \"<id>\" } in void.json." }, { status: 501 });
@@ -474,22 +492,71 @@ let _backend;
 function backend() {
 	return _backend ??= resolveBackend();
 }
+/** Normalize provider 429 responses and binding quota failures before they reach callers. */
+function aiOperation(execute, rawStream = false) {
+	return limitOperation(async () => {
+		const value = await execute();
+		if (value instanceof Response) {
+			const limit = await limitFromResponse(value, "ai");
+			if (limit) throw limit;
+		}
+		return value;
+	}, classifyAiLimit, (value, limited) => {
+		if (value instanceof Response && value.body && value.headers.get("content-type")?.includes("text/event-stream")) return new Response(streamResponse(value.body, limited).body, value);
+		if (rawStream && value instanceof ReadableStream) return streamResponse(value, limited).body;
+		return value;
+	});
+}
+function classifyAiLimit(error) {
+	if (error instanceof UsageLimit) return error;
+	const e = error;
+	return e && (e.status === 429 || e.statusCode === 429 || e.response?.status === 429) ? new UsageLimit({
+		resource: "ai",
+		reason: "rate_limit",
+		message: "AI usage limit exceeded."
+	}) : null;
+}
+/** Streaming failures after headers are sent end with an explicit terminal SSE event. */
+function streamResponse(body, limited) {
+	const reader = body.getReader();
+	return new Response(new ReadableStream({
+		async pull(controller) {
+			try {
+				const chunk = await reader.read();
+				if (chunk.done) controller.close();
+				else controller.enqueue(chunk.value);
+			} catch (error) {
+				const limit = classifyAiLimit(error);
+				let data = { message: "Generation was interrupted. Please try again." };
+				if (limit) {
+					data = await limit.response().json();
+					try {
+						const fallback = await limited(limit);
+						if (fallback instanceof Response) data = readUsageLimit(await fallback.json().catch(() => null)) ?? data;
+					} catch {}
+				}
+				controller.enqueue(new TextEncoder().encode(`event: ${limit ? "void:limit" : "void:error"}\ndata: ${JSON.stringify(data)}\n\n`));
+				controller.close();
+			}
+		},
+		cancel(reason) {
+			return reader.cancel(reason);
+		}
+	}), { headers: {
+		"content-type": "text/event-stream",
+		"cache-control": "no-cache"
+	} });
+}
 const ai = new Proxy({}, { get(_, prop) {
-	if (prop === "stream") return async (model, inputs, options) => {
-		const body = await backend().run(model, {
-			...inputs,
-			stream: true
-		}, options);
-		return new Response(body, { headers: {
-			"content-type": "text/event-stream",
-			"cache-control": "no-cache"
-		} });
-	};
-	if (prop === "run") return backend().run;
-	if (prop === "image") return backend().image;
-	if (prop === "provider") return (provider, options) => ({ fetch: (path, init) => backend().providerFetch(provider, path, init, options) });
-	if (prop === "models") return backend().models;
-	if (prop === "toMarkdown") return backend().toMarkdown;
+	if (prop === "stream") return (model, inputs, options) => aiOperation(async () => new Response(await backend().run(model, {
+		...inputs,
+		stream: true
+	}, options), { headers: {
+		"content-type": "text/event-stream",
+		"cache-control": "no-cache"
+	} }));
+	if (prop === "provider") return (provider, options) => ({ fetch: (path, init) => aiOperation(() => backend().providerFetch(provider, path, init, options)) });
+	if (prop === "run" || prop === "image" || prop === "models" || prop === "toMarkdown") return (...args) => aiOperation(() => backend()[prop](...args), prop === "run" && hasStreamFlag(args[1]) && args[1].stream === true);
 } });
 //#endregion
 export { ai };

package/dist/runtime/better-auth-mysql.mjs

@@ -1,5 +1,5 @@
 import { t as applyMySqlAuthMigrations } from "../auth-migrations-9vif1uj8.mjs";
-import { t as createVoidAuthRuntime } from "../better-auth-shared-rsBGBvWJ.mjs";
+import { t as createVoidAuthRuntime } from "../better-auth-shared-hy6RPh9W.mjs";
 //#region src/runtime/better-auth-mysql.ts
 function resolveConnectionString(env) {
 	const connectionString = typeof env.DATABASE_URL === "string" && env.DATABASE_URL.length > 0 ? env.DATABASE_URL : typeof env.HYPERDRIVE?.connectionString === "string" && env.HYPERDRIVE.connectionString.length > 0 ? env.HYPERDRIVE.connectionString : void 0;

package/dist/runtime/better-auth-pg.mjs

@@ -1,5 +1,5 @@
 import { n as applyPgAuthMigrations } from "../auth-migrations-9vif1uj8.mjs";
-import { t as createVoidAuthRuntime } from "../better-auth-shared-rsBGBvWJ.mjs";
+import { t as createVoidAuthRuntime } from "../better-auth-shared-hy6RPh9W.mjs";
 import { t as disablePgPassFallback } from "../pg-J2HbZIkX.mjs";
 //#region src/runtime/better-auth-pg.ts
 function resolveConnectionString(env) {

package/dist/runtime/better-auth.mjs

@@ -1,5 +1,5 @@
 import { r as applySqliteAuthMigrations } from "../auth-migrations-9vif1uj8.mjs";
-import { t as createVoidAuthRuntime } from "../better-auth-shared-rsBGBvWJ.mjs";
+import { t as createVoidAuthRuntime } from "../better-auth-shared-hy6RPh9W.mjs";
 //#region src/runtime/better-auth.ts
 async function resolveDatabase(env) {
 	if (!env.DB) throw new Error("auth: Better Auth requires the \"DB\" D1 binding for sqlite apps.");

package/dist/runtime/client-react.mjs

@@ -1,5 +1,5 @@
 import { t as FetchError } from "../fetch-error-Dj3crt0e.mjs";
-import { t as fetch } from "../fetch-CXDChK7B.mjs";
-import { t as fetchStream } from "../fetch-stream-AOByI7Ki.mjs";
+import { t as fetch } from "../fetch-BIZJh7vR.mjs";
+import { t as fetchStream } from "../fetch-stream-IvCYKyQL.mjs";
 import { n as createAuthClient, t as auth } from "../auth-client-react-CMLwT2xI.mjs";
 export { FetchError, FetchError as StreamError, auth, createAuthClient, fetch, fetchStream };

package/dist/runtime/client-solid.mjs

@@ -1,5 +1,5 @@
 import { t as FetchError } from "../fetch-error-Dj3crt0e.mjs";
-import { t as fetch } from "../fetch-CXDChK7B.mjs";
-import { t as fetchStream } from "../fetch-stream-AOByI7Ki.mjs";
+import { t as fetch } from "../fetch-BIZJh7vR.mjs";
+import { t as fetchStream } from "../fetch-stream-IvCYKyQL.mjs";
 import { n as createAuthClient, t as auth } from "../auth-client-solid-UoreJWZG.mjs";
 export { FetchError, FetchError as StreamError, auth, createAuthClient, fetch, fetchStream };

package/dist/runtime/client-svelte.mjs

@@ -1,5 +1,5 @@
 import { t as FetchError } from "../fetch-error-Dj3crt0e.mjs";
-import { t as fetch } from "../fetch-CXDChK7B.mjs";
-import { t as fetchStream } from "../fetch-stream-AOByI7Ki.mjs";
+import { t as fetch } from "../fetch-BIZJh7vR.mjs";
+import { t as fetchStream } from "../fetch-stream-IvCYKyQL.mjs";
 import { n as createAuthClient, t as auth } from "../auth-client-svelte-Cv_WvrRk.mjs";
 export { FetchError, FetchError as StreamError, auth, createAuthClient, fetch, fetchStream };

package/dist/runtime/client-vue.mjs

@@ -1,5 +1,5 @@
 import { t as FetchError } from "../fetch-error-Dj3crt0e.mjs";
-import { t as fetch } from "../fetch-CXDChK7B.mjs";
-import { t as fetchStream } from "../fetch-stream-AOByI7Ki.mjs";
+import { t as fetch } from "../fetch-BIZJh7vR.mjs";
+import { t as fetchStream } from "../fetch-stream-IvCYKyQL.mjs";
 import { n as createAuthClient, t as auth } from "../auth-client-vue-CFk7Xbv3.mjs";
 export { FetchError, FetchError as StreamError, auth, createAuthClient, fetch, fetchStream };

package/dist/runtime/client.mjs

@@ -1,5 +1,5 @@
 import { t as FetchError } from "../fetch-error-Dj3crt0e.mjs";
-import { t as fetch } from "../fetch-CXDChK7B.mjs";
-import { t as fetchStream } from "../fetch-stream-AOByI7Ki.mjs";
+import { t as fetch } from "../fetch-BIZJh7vR.mjs";
+import { t as fetchStream } from "../fetch-stream-IvCYKyQL.mjs";
 import { n as createAuthClient, t as auth } from "../auth-client-BWBT8HLp.mjs";
 export { FetchError, FetchError as StreamError, auth, createAuthClient, fetch, fetchStream };

package/dist/runtime/durable.d.mts

@@ -25,6 +25,8 @@ export type DurableStateClass<TMethods> = {
   };
 };
 export type DurableStateDefinition<TState, TEnv extends Record<string, unknown>, TMethods extends DurableStateMethods<TState, TEnv>> = {
+  /** Optional persistent resource name. Pin the name reported by `void info` before moving this definition. */
+  name?: string;
   initialState: TState | ((env: TEnv) => TState | Promise<TState>);
   /** Current persisted state version. Defaults to 0. */
   version?: number;
@@ -37,7 +39,7 @@ export type DurableStateDefinition<TState, TEnv extends Record<string, unknown>,
 export type DurableStateApi<TMethods> = {
   class: DurableStateClass<TMethods>;
   /** @internal Called by Void's generated worker entry. */
-  __bind(bindingName: string): void;
+  __bind(bindingName: string, resourceName?: string): void;
   get(name: string): TypedDurableObjectStub<TMethods>;
   get(namespace: DurableObjectNamespace, name: string): TypedDurableObjectStub<TMethods>;
   getById(id: DurableObjectId): TypedDurableObjectStub<TMethods>;

package/dist/runtime/durable.mjs

@@ -1,3 +1,4 @@
+import { t as isResourceName } from "../resource-name-C7LVpcRm.mjs";
 import { a as requireRuntimeBinding, o as withRuntimeEnv } from "../env-D5liuQYR.mjs";
 import { DurableObject } from "cloudflare:workers";
 //#region src/runtime/durable.ts
@@ -17,6 +18,7 @@ function assertMigrations(version, migrations) {
 	return byVersion;
 }
 function defineDurableState(definition) {
+	if (definition.name !== void 0 && !isResourceName(definition.name)) throw new Error("durable: name must contain a word starting with a letter.");
 	const version = definition.version ?? 0;
 	if (!Number.isInteger(version) || version < 0) throw new Error("durable: version must be a non-negative integer.");
 	const migrations = assertMigrations(version, definition.migrations ?? []);
@@ -126,7 +128,8 @@ function defineDurableState(definition) {
 	}
 	return {
 		class: VoidDurableState,
-		__bind(name) {
+		__bind(name, resourceName) {
+			if (definition.name !== resourceName) throw new Error("durable: name must be statically discoverable in defineDurableState(). Run void info to inspect this definition.");
 			if (bindingName && bindingName !== name) throw new Error(`durable: state definition is already bound to '${bindingName}' and cannot also bind to '${name}'.`);
 			bindingName = name;
 		},

package/dist/runtime/email/testing.mjs

@@ -1,6 +1,6 @@
 import { i as normalizeEmail, r as buildMime } from "../../mime-D5Nmdzf7.mjs";
-import { y as registerEmailSink } from "../../dev-inbox-P0u4tM8Y.mjs";
 import { n as compileEmailPattern, t as compareEmailRoutes } from "../../email--tEtMoj_.mjs";
+import { y as registerEmailSink } from "../../dev-inbox-P0u4tM8Y.mjs";
 import { i as createMessageProxy, n as MAX_INBOUND_HEADERS, t as MAX_INBOUND_BYTES } from "../../inbound-aVHEUhKo.mjs";
 //#region src/runtime/email/testing.ts
 /**

package/dist/runtime/env-public.d.mts

@@ -1,4 +1,4 @@
 /// <reference types="@cloudflare/workers-types" />
 import { a as number, c as url, i as json, n as boolean, o as oneOf, r as email, s as string, t as EnvSchema } from "../env-helpers-CyKtOBpj.mjs";
-import { a as _getSchemaDefaults, c as defineEnv, i as _getRegisteredSchema, l as env, n as EnvValidationReport, o as _hasRegisteredSchema, r as ValidatedEnv, s as _validateEnvOnce, t as EnvValidationError, u as validateAllEnv } from "../env-public-BxU_0yTL.mjs";
+import { a as _getSchemaDefaults, c as defineEnv, i as _getRegisteredSchema, l as env, n as EnvValidationReport, o as _hasRegisteredSchema, r as ValidatedEnv, s as _validateEnvOnce, t as EnvValidationError, u as validateAllEnv } from "../env-public-BX_r8HR6.mjs";
 export { type EnvSchema, EnvValidationError, EnvValidationReport, ValidatedEnv, _getRegisteredSchema, _getSchemaDefaults, _hasRegisteredSchema, _validateEnvOnce, boolean, defineEnv, email, env, json, number, oneOf, string, url, validateAllEnv };

package/dist/runtime/fetch-stream.mjs

@@ -1,3 +1,3 @@
 import { t as FetchError } from "../fetch-error-Dj3crt0e.mjs";
-import { t as fetchStream } from "../fetch-stream-AOByI7Ki.mjs";
+import { t as fetchStream } from "../fetch-stream-IvCYKyQL.mjs";
 export { FetchError as StreamError, fetchStream };

package/dist/runtime/fetch.mjs

@@ -1,3 +1,3 @@
 import { t as FetchError } from "../fetch-error-Dj3crt0e.mjs";
-import { t as fetch } from "../fetch-CXDChK7B.mjs";
+import { t as fetch } from "../fetch-BIZJh7vR.mjs";
 export { FetchError, fetch };

package/dist/runtime/handler.d.mts

@@ -1,3 +1,3 @@
 /// <reference types="@cloudflare/workers-types" />
-import { C as defer, E as ValidatorSlots, S as InferProps, T as HandlerInput, _ as defineQueue, a as CloudEnv, b as Deferred, c as QueueRetryOptions, d as TypedQueueHandler, f as VoidAssetRewriteError, g as defineMiddleware, h as defineHead, i as CloudContextVariables, l as RenderAssetTags, m as defineHandler, n as CloudBindings, o as QueueBatch, p as basicAuth, r as CloudContext, s as QueueMessage, t as BasicAuthOptions, u as TypedHandler, v as defineRender, w as ValidationError, y as defineScheduled } from "../handler-HEcZsaij.mjs";
+import { C as defer, E as ValidatorSlots, S as InferProps, T as HandlerInput, _ as defineQueue, a as CloudEnv, b as Deferred, c as QueueRetryOptions, d as TypedQueueHandler, f as VoidAssetRewriteError, g as defineMiddleware, h as defineHead, i as CloudContextVariables, l as RenderAssetTags, m as defineHandler, n as CloudBindings, o as QueueBatch, p as basicAuth, r as CloudContext, s as QueueMessage, t as BasicAuthOptions, u as TypedHandler, v as defineRender, w as ValidationError, y as defineScheduled } from "../handler-CZ4nAylQ.mjs";
 export { BasicAuthOptions, CloudBindings, CloudContext, CloudContextVariables, CloudEnv, type Deferred, type HandlerInput, type InferProps, QueueBatch, QueueMessage, QueueRetryOptions, RenderAssetTags, TypedHandler, TypedQueueHandler, ValidationError, type ValidatorSlots, VoidAssetRewriteError, basicAuth, defer, defineHandler, defineHead, defineMiddleware, defineQueue, defineRender, defineScheduled };

package/dist/runtime/kv.mjs

@@ -9,7 +9,6 @@ function parseValue(raw) {
 	}
 }
 function serializeValue(value) {
-	if (typeof value === "string") return value;
 	return JSON.stringify(value);
 }
 function getListCursor(result) {

package/dist/runtime/limits.d.mts

@@ -0,0 +1,2 @@
+import { a as asUsageLimit, c as readUsageLimit, i as UsageLimitData, n as LimitOperation, o as limitFromResponse, r as UsageLimit, s as limitOperation, t as LimitHandlers } from "../limits-Bq5LG8Id.mjs";
+export { LimitHandlers, LimitOperation, UsageLimit, type UsageLimitData, asUsageLimit, limitFromResponse, limitOperation, readUsageLimit };

package/dist/runtime/limits.mjs

@@ -0,0 +1,2 @@
+import { a as readUsageLimit, i as limitOperation, n as asUsageLimit, r as limitFromResponse, t as UsageLimit } from "../limits-Cjuk2VPm.mjs";
+export { UsageLimit, asUsageLimit, limitFromResponse, limitOperation, readUsageLimit };

package/dist/runtime/live-client.d.mts

@@ -1,4 +1,4 @@
-import { t as LiveClientEvent } from "../live-CKJlvlNp.mjs";
+import { t as LiveClientEvent } from "../live-Chw1eIMv.mjs";
 //#region src/runtime/live-client.d.ts
 export type LiveSubscribeOptions<Data = unknown> = {
   id: string;

package/dist/runtime/live-server.mjs

@@ -1,4 +1,4 @@
-import { n as eventStream } from "../sse-BaC1jXko.mjs";
+import { n as eventStream } from "../sse-CQNaDFFV.mjs";
 import { t as __getLiveBindingName } from "../live-CB1y5IuC.mjs";
 //#region src/runtime/live-server.ts
 const GENERATION_KEY = "connection:generation";
@@ -42,16 +42,18 @@ function createLiveDurableObject() {
 			if (previous) {
 				const active = [...previous.subscriptions.values()].filter((sub) => sub.active);
 				for (const subscription of previous.subscriptions.values()) subscription.active = false;
-				await previous.stream.close().catch(() => {});
+				previous.abort.abort();
 				await Promise.all(active.map((sub) => this.unregisterTopic(message.streamId, message.connectionId, sub)));
 			}
 			const generation = (await this.state.storage.get(GENERATION_KEY) ?? 0) + 1;
 			await this.state.storage.put(GENERATION_KEY, generation);
+			const abort = new AbortController();
 			return eventStream(async (stream) => {
 				const subscriptions = previous?.owner === message.owner ? previous.subscriptions : /* @__PURE__ */ new Map();
 				for (const subscription of subscriptions.values()) subscription.active = false;
 				this.connection = {
 					stream,
+					abort,
 					owner: message.owner,
 					generation,
 					subscriptions,
@@ -59,17 +61,22 @@ function createLiveDurableObject() {
 					queued: 0,
 					limits: message.limits
 				};
-				await stream.comment("connected");
-				await stream.closed;
-				if (this.connection?.generation === generation) {
-					const active = [...this.connection.subscriptions.values()].filter((sub) => sub.active);
-					this.connection = null;
+				try {
+					await stream.comment("connected");
+					await stream.closed;
+				} finally {
+					const active = [...subscriptions.values()].filter((sub) => sub.active && sub.generation === generation);
+					for (const sub of active) sub.active = false;
+					if (this.connection?.generation === generation) this.connection = null;
 					await Promise.all(active.map((sub) => this.unregisterTopic(message.streamId, message.connectionId, sub)));
 				}
-			}, { keepAlive: {
-				intervalMs: 15e3,
-				comment: "keep-alive"
-			} });
+			}, {
+				signal: abort.signal,
+				keepAlive: {
+					intervalMs: 15e3,
+					comment: "keep-alive"
+				}
+			});
 		}
 		async control(message) {
 			const connection = this.connection;
@@ -174,8 +181,8 @@ function createLiveDurableObject() {
 					continue;
 				}
 				if (connection.queued >= connection.limits.maxQueuedEventsPerConnection) {
-					await connection.stream.close().catch(() => {});
-					this.connection = null;
+					connection.abort.abort();
+					if (this.connection === connection) this.connection = null;
 					return new Response("connection queue full", { status: 410 });
 				}
 				const event = {
@@ -193,7 +200,7 @@ function createLiveDurableObject() {
 					data: event
 				})).catch(() => {
 					if (this.connection === activeConnection) this.connection = null;
-					connection.stream.close().catch(() => {});
+					connection.abort.abort();
 				}).finally(() => {
 					connection.queued--;
 				});
@@ -275,7 +282,8 @@ function createLiveDurableObject() {
 					if (outcome.status === "rejected") throw outcome.reason;
 					const response = outcome.value;
 					const items = batch[index][1];
-					if (!response || response.status === 410 || response.status === 404) {
+					if (!response) continue;
+					if (response.status === 410 || response.status === 404) {
 						await this.state.storage.delete(items.map((item) => item.key));
 						continue;
 					}
@@ -316,7 +324,8 @@ function createLiveDurableObject() {
 					if (outcome.status === "rejected") throw outcome.reason;
 					const response = outcome.value;
 					const items = batch[index][1];
-					if (!response || response.status === 410 || response.status === 404) {
+					if (!response) continue;
+					if (response.status === 410 || response.status === 404) {
 						staleKeys.push(...items.map((item) => item.key));
 						continue;
 					}

package/dist/runtime/live.d.mts

@@ -1,3 +1,3 @@
 /// <reference types="@cloudflare/workers-types" />
-import { _ as __getLiveBindingName, a as LiveControlErrorCode, c as LiveControlOptions, d as LiveHookContext, f as LiveLimits, g as LiveSubscribeHookContext, h as LiveStreamOptions, i as LiveControlError, l as LiveControlRequest, m as LiveStream, n as LiveConnectHookContext, o as LiveControlOperation, p as LivePublishOptions, r as LiveConnectOptions, s as LiveControlOperationResult, t as LiveClientEvent, u as LiveControlResponse, v as __setLiveBindingName, y as defineLiveStream } from "../live-CKJlvlNp.mjs";
+import { _ as __getLiveBindingName, a as LiveControlErrorCode, c as LiveControlOptions, d as LiveHookContext, f as LiveLimits, g as LiveSubscribeHookContext, h as LiveStreamOptions, i as LiveControlError, l as LiveControlRequest, m as LiveStream, n as LiveConnectHookContext, o as LiveControlOperation, p as LivePublishOptions, r as LiveConnectOptions, s as LiveControlOperationResult, t as LiveClientEvent, u as LiveControlResponse, v as __setLiveBindingName, y as defineLiveStream } from "../live-Chw1eIMv.mjs";
 export { LiveClientEvent, LiveConnectHookContext, LiveConnectOptions, LiveControlError, LiveControlErrorCode, LiveControlOperation, LiveControlOperationResult, LiveControlOptions, LiveControlRequest, LiveControlResponse, LiveHookContext, LiveLimits, LivePublishOptions, LiveStream, LiveStreamOptions, LiveSubscribeHookContext, __getLiveBindingName, __setLiveBindingName, defineLiveStream };

package/dist/runtime/migration-handler.mjs

@@ -1,4 +1,4 @@
-import { t as canonicalJson } from "../canonical-json-DuDiiUsQ.mjs";
+import { canonicalJson } from "@void/deploy-core";
 //#region src/runtime/migration-handler.ts
 const SUPPORTED_CLASSIFIER_VERSION = 1;
 function createMigrationHandler(env, migrations, _dialect, runAuthMigrations, planBundle) {
@@ -85,7 +85,8 @@ async function createTrackingTable(db) {
     )`).run();
 }
 async function createAttemptTables(db) {
-	await db.batch([db.prepare(`CREATE TABLE IF NOT EXISTS _void_migration_attempts (
+	await db.batch([
+		db.prepare(`CREATE TABLE IF NOT EXISTS _void_migration_attempts (
         attempt_id TEXT PRIMARY KEY,
         deployment_id TEXT,
         migration_list_hash TEXT NOT NULL,
@@ -95,16 +96,23 @@ async function createAttemptTables(db) {
         started_at TEXT NOT NULL,
         completed_at TEXT,
         error TEXT
-      )`), db.prepare(`CREATE TABLE IF NOT EXISTS _void_migration_lock (
+      )`),
+		db.prepare(`CREATE TABLE IF NOT EXISTS _void_migration_lock (
         name TEXT PRIMARY KEY,
         attempt_id TEXT NOT NULL,
         acquired_at TEXT NOT NULL
-      )`)]);
+      )`),
+		db.prepare(`CREATE TABLE IF NOT EXISTS _void_migration_fences (
+        attempt_id TEXT PRIMARY KEY,
+        owned INTEGER NOT NULL CHECK (owned = 1)
+      )`)
+	]);
 }
-async function upgradeTrackingTable(db) {
+async function upgradeTrackingTable(db, fencedAttemptId) {
 	const { results } = await db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='_migrations'").all();
 	if (!results || results.length === 0) return;
 	await db.batch([
+		...ownershipFence(db, fencedAttemptId),
 		db.prepare(`CREATE TABLE IF NOT EXISTS _void_migrations (
         name TEXT PRIMARY KEY,
         applied_at TEXT NOT NULL
@@ -121,18 +129,13 @@ async function runD1AppMigrations(db, migrations, planBundle, attempt) {
 	const verified = await verifyPlanBundle(migrations, planBundle);
 	await createAttemptTables(db);
 	const now = (/* @__PURE__ */ new Date()).toISOString();
-	const lock = await acquireAttemptLock(db, attempt.attemptId, now);
-	if (lock !== "acquired") return lock;
 	const plannedNames = migrations.map((migration) => migration.name);
 	const planHashes = verified.plans.map((plan) => plan.planHash);
-	try {
-		await db.prepare(`INSERT INTO _void_migration_attempts
+	const fenced = verified.plans.every((plan) => plan.kind !== "legacy-unsplit-multi-statement");
+	const lock = await acquireAttemptLock(db, attempt.attemptId, now, [db.prepare(`INSERT INTO _void_migration_attempts
           (attempt_id, deployment_id, migration_list_hash, planned_names_json, plan_hashes_json, status, started_at)
-         VALUES (?, ?, ?, ?, ?, 'running', ?)`).bind(attempt.attemptId, attempt.deploymentId ?? null, verified.migrationListHash, JSON.stringify(plannedNames), JSON.stringify(planHashes), now).run();
-	} catch {
-		await releaseAttemptLock(db, attempt.attemptId);
-		return reconcileAttempt(db, attempt.attemptId);
-	}
+         VALUES (?, ?, ?, ?, ?, 'running', ?)`).bind(attempt.attemptId, attempt.deploymentId ?? null, verified.migrationListHash, JSON.stringify(plannedNames), JSON.stringify(planHashes), now), ...fenced ? [db.prepare("INSERT INTO _void_migration_fences (attempt_id, owned) VALUES (?, 1)").bind(attempt.attemptId)] : []]);
+	if (lock !== "acquired") return lock;
 	const migrationResults = [];
 	const confirmedApplied = [];
 	const confirmedSkipped = [];
@@ -140,7 +143,7 @@ async function runD1AppMigrations(db, migrations, planBundle, attempt) {
 	let stability = "stable";
 	try {
 		await createTrackingTable(db);
-		await upgradeTrackingTable(db);
+		await upgradeTrackingTable(db, fenced ? attempt.attemptId : void 0);
 		const applied = await readAppliedSet(db);
 		for (let index = 0; index < migrations.length; index++) {
 			const migration = migrations[index];
@@ -159,7 +162,7 @@ async function runD1AppMigrations(db, migrations, planBundle, attempt) {
 			}
 			const start = Date.now();
 			try {
-				await executeMigrationPlan(db, migration, plan);
+				await executeMigrationPlan(db, migration, plan, fenced ? attempt.attemptId : void 0);
 				applied.add(migration.name);
 				confirmedApplied.push(migration.name);
 				migrationResults.push({
@@ -223,16 +226,16 @@ async function runD1AppMigrations(db, migrations, planBundle, attempt) {
 		};
 	}
 }
-async function acquireAttemptLock(db, attemptId, acquiredAt) {
+async function acquireAttemptLock(db, attemptId, acquiredAt, initialize) {
 	for (let tries = 0; tries < 2; tries++) try {
-		await db.prepare("INSERT INTO _void_migration_lock (name, attempt_id, acquired_at) VALUES (?, ?, ?)").bind("app", attemptId, acquiredAt).run();
+		await db.batch([db.prepare("INSERT INTO _void_migration_lock (name, attempt_id, acquired_at) VALUES (?, ?, ?)").bind("app", attemptId, acquiredAt), ...initialize]);
 		return "acquired";
 	} catch {
 		const existing = await db.prepare("SELECT attempt_id FROM _void_migration_lock WHERE name = ?").bind("app").first();
-		if (existing?.attempt_id === attemptId) return reconcileAttempt(db, attemptId);
+		if (!existing && await readAttempt(db, attemptId)) return reconcileAttempt(db, attemptId, false);
 		if (existing?.attempt_id) {
 			const row = await readAttempt(db, existing.attempt_id);
-			if (!row || row.status === "completed" || row.status === "failed" || row.status === "unknown") {
+			if (row?.status === "completed" || row?.status === "failed") {
 				await releaseAttemptLock(db, existing.attempt_id).catch(() => {});
 				continue;
 			}
@@ -253,23 +256,41 @@ async function acquireAttemptLock(db, attemptId, acquiredAt) {
 		error: "migration lock could not be acquired"
 	};
 }
-async function executeMigrationPlan(db, migration, plan) {
+async function executeMigrationPlan(db, migration, plan, fencedAttemptId) {
 	const appliedAt = (/* @__PURE__ */ new Date()).toISOString();
 	if (plan.kind === "single-statement") {
-		await db.batch([db.prepare(migration.sql), db.prepare("INSERT INTO _void_migrations (name, applied_at) VALUES (?, ?)").bind(migration.name, appliedAt)]);
+		await db.batch([
+			...ownershipFence(db, fencedAttemptId),
+			db.prepare(migration.sql),
+			db.prepare("INSERT INTO _void_migrations (name, applied_at) VALUES (?, ?)").bind(migration.name, appliedAt)
+		]);
 		return;
 	}
 	if (plan.kind === "breakpoint-framed") {
-		await db.batch([...plan.statements.map((statement) => db.prepare(statement)), db.prepare("INSERT INTO _void_migrations (name, applied_at) VALUES (?, ?)").bind(migration.name, appliedAt)]);
+		await db.batch([
+			...ownershipFence(db, fencedAttemptId),
+			...plan.statements.map((statement) => db.prepare(statement)),
+			db.prepare("INSERT INTO _void_migrations (name, applied_at) VALUES (?, ?)").bind(migration.name, appliedAt)
+		]);
 		return;
 	}
 	await db.exec(migration.sql);
 	await db.prepare("INSERT OR IGNORE INTO _void_migrations (name, applied_at) VALUES (?, ?)").bind(migration.name, appliedAt).run();
 }
-async function markAttempt(db, attemptId, status, error) {
-	await db.prepare(`UPDATE _void_migration_attempts
+/** Fail the whole D1 batch if recovery has revoked this executor's ownership. */
+function ownershipFence(db, attemptId) {
+	if (!attemptId) return [];
+	return [db.prepare(`INSERT INTO _void_migration_fences (attempt_id, owned)
+     VALUES (?, EXISTS(SELECT 1 FROM _void_migration_lock WHERE name = 'app' AND attempt_id = ?))
+     ON CONFLICT(attempt_id) DO UPDATE SET owned = excluded.owned`).bind(attemptId, attemptId)];
+}
+function attemptUpdate(db, attemptId, status, error) {
+	return db.prepare(`UPDATE _void_migration_attempts
        SET status = ?, completed_at = ?, error = ?
-       WHERE attempt_id = ?`).bind(status, (/* @__PURE__ */ new Date()).toISOString(), error ?? null, attemptId).run();
+       WHERE attempt_id = ? AND status ${status === "completed" ? "IN ('running', 'unknown')" : "= 'running'"}`).bind(status, (/* @__PURE__ */ new Date()).toISOString(), error ?? null, attemptId);
+}
+async function markAttempt(db, attemptId, status, error) {
+	await attemptUpdate(db, attemptId, status, error).run();
 }
 async function releaseAttemptLock(db, attemptId) {
 	await db.prepare("DELETE FROM _void_migration_lock WHERE name = ? AND attempt_id = ?").bind("app", attemptId).run();
@@ -277,27 +298,26 @@ async function releaseAttemptLock(db, attemptId) {
 async function readAttempt(db, attemptId) {
 	return db.prepare("SELECT * FROM _void_migration_attempts WHERE attempt_id = ?").bind(attemptId).first();
 }
-async function reconcileAttempt(db, attemptId) {
+async function reconcileAttempt(db, attemptId, recover = true) {
 	await createAttemptTables(db);
 	await createTrackingTable(db);
 	const row = await readAttempt(db, attemptId);
-	if (!row) {
-		await releaseAttemptLock(db, attemptId).catch(() => {});
-		return {
-			ok: false,
-			protocolVersion: 2,
-			attemptId,
-			migrations: [],
-			error: "migration attempt not found"
-		};
-	}
+	if (!row) return {
+		ok: false,
+		protocolVersion: 2,
+		attemptId,
+		migrations: [],
+		error: "migration attempt not found"
+	};
+	const fenced = await db.prepare("SELECT attempt_id FROM _void_migration_fences WHERE attempt_id = ?").bind(attemptId).first();
+	if (recover && fenced) await db.batch([attemptUpdate(db, attemptId, "unknown", "migration outcome unknown"), db.prepare("DELETE FROM _void_migration_lock WHERE name = ? AND attempt_id = ?").bind("app", attemptId)]);
 	const plannedNames = JSON.parse(row.planned_names_json);
 	const applied = await readAppliedSet(db);
 	const confirmed = plannedNames.filter((name) => applied.has(name));
 	const complete = confirmed.length === plannedNames.length;
 	if (complete && row.status !== "completed") await markAttempt(db, attemptId, "completed").catch(() => {});
-	if (!complete && row.status === "running") await markAttempt(db, attemptId, "unknown", row.error ?? "migration outcome unknown").catch(() => {});
-	await releaseAttemptLock(db, attemptId).catch(() => {});
+	const inProgress = !fenced && !complete && (row.status === "running" || row.status === "unknown");
+	if (complete || row.status === "completed" || row.status === "failed") await releaseAttemptLock(db, attemptId);
 	return {
 		ok: complete,
 		protocolVersion: 2,
@@ -310,7 +330,7 @@ async function reconcileAttempt(db, attemptId) {
 			name,
 			status: applied.has(name) ? "skipped" : "failed"
 		})),
-		error: complete ? void 0 : row.error ?? "migration outcome unknown",
+		error: complete ? void 0 : inProgress ? `migration already in progress for attempt ${attemptId}; wait for this migration to finish before retrying recovery` : row.error ?? "migration outcome unknown",
 		stability: "stable"
 	};
 }
@@ -322,7 +342,7 @@ async function verifyPlanBundle(migrations, planBundle) {
 		const migration = migrations[index];
 		const plan = planBundle.plans[index];
 		if (plan.name !== migration.name || plan.dialect !== "sqlite" || plan.classifierVersion !== SUPPORTED_CLASSIFIER_VERSION) throw new Error(`invalid migration execution plan for ${migration.name}`);
-		const sqlHash = await sha256Hex(canonicalSql(migration.sql));
+		const sqlHash = await sha256Hex(canonicalSql$1(migration.sql));
 		if (plan.sqlHash !== sqlHash) throw new Error(`migration SQL hash mismatch for ${migration.name}`);
 		const planHash = await hashPlan(plan);
 		if (plan.planHash !== planHash) throw new Error(`migration plan hash mismatch for ${migration.name}`);
@@ -335,7 +355,7 @@ async function verifyPlanBundle(migrations, planBundle) {
 	if (planBundle.migrationListHash !== migrationListHash) throw new Error("migration list hash mismatch");
 	return planBundle;
 }
-function canonicalSql(sql) {
+function canonicalSql$1(sql) {
 	return (sql.charCodeAt(0) === 65279 ? sql.slice(1) : sql).replace(/\r\n?/g, "\n");
 }
 async function sha256Hex(value) {