void 0.26.1 → 0.28.0

package/dist/runtime/remote/binding-handler.mjs

@@ -1,8 +1,27 @@
+import { t as base64ToBytes } from "../../base64-DVrOndmI.mjs";
 import { t as parseR2Conditional } from "../../r2-conditions-D1Wk8i7b.mjs";
 import { Hono } from "hono";
 //#region src/runtime/remote/binding-handler.ts
-function decodeBase64(value) {
-	return Uint8Array.from(atob(value), (ch) => ch.charCodeAt(0));
+/** Parse the body, answer 400 when `invalid` names a problem, and 404 for an unknown binding. */
+async function readBindingRequest(c, env, invalid) {
+	const body = await c.req.json();
+	const error = invalid(body);
+	if (error) return c.json({ error }, 400);
+	const binding = env[body.binding];
+	if (!binding) return c.json({ error: `unknown binding "${body.binding}"` }, 404);
+	return {
+		body,
+		binding
+	};
+}
+function requireBinding(body) {
+	return body.binding ? void 0 : "binding required";
+}
+function requireKey(body) {
+	return body.binding && body.key ? void 0 : "binding and key required";
+}
+function r2DeleteKeys(body) {
+	return body.keys ? body.keys : body.key ? [body.key] : [];
 }
 /**
 * Creates a Hono app that handles `/__void/*` routes for native binding access.
@@ -22,10 +41,9 @@ function createBindingHandler(env) {
 		await next();
 	});
 	app.post("/d1/query", async (c) => {
-		const body = await c.req.json();
-		if (!body.binding || !body.sql) return c.json({ error: "binding and sql required" }, 400);
-		const db = env[body.binding];
-		if (!db) return c.json({ error: `unknown binding "${body.binding}"` }, 404);
+		const request = await readBindingRequest(c, env, (body) => body.binding && body.sql ? void 0 : "binding and sql required");
+		if (request instanceof Response) return request;
+		const { body, binding: db } = request;
 		const stmt = db.prepare(body.sql).bind(...body.params ?? []);
 		switch (body.method) {
 			case "first": {
@@ -60,10 +78,9 @@ function createBindingHandler(env) {
 		}
 	});
 	app.post("/d1/batch", async (c) => {
-		const body = await c.req.json();
-		if (!body.binding || !Array.isArray(body.statements)) return c.json({ error: "binding and statements required" }, 400);
-		const db = env[body.binding];
-		if (!db) return c.json({ error: `unknown binding "${body.binding}"` }, 404);
+		const request = await readBindingRequest(c, env, (body) => body.binding && Array.isArray(body.statements) ? void 0 : "binding and statements required");
+		if (request instanceof Response) return request;
+		const { body, binding: db } = request;
 		const stmts = body.statements.map((s) => db.prepare(s.sql).bind(...s.params ?? []));
 		const results = await db.batch(stmts);
 		return c.json(results.map((r) => ({
@@ -73,10 +90,9 @@ function createBindingHandler(env) {
 		})));
 	});
 	app.post("/kv/get", async (c) => {
-		const body = await c.req.json();
-		if (!body.binding || !body.key) return c.json({ error: "binding and key required" }, 400);
-		const kv = env[body.binding];
-		if (!kv) return c.json({ error: `unknown binding "${body.binding}"` }, 404);
+		const request = await readBindingRequest(c, env, requireKey);
+		if (request instanceof Response) return request;
+		const { body, binding: kv } = request;
 		const type = body.type ?? "text";
 		if (type === "json") {
 			const val = await kv.get(body.key, "json");
@@ -92,37 +108,31 @@ function createBindingHandler(env) {
 			if (val === null) return c.json(null);
 			return new Response(val, { headers: { "content-type": "application/octet-stream" } });
 		}
-		const val = await kv.get(body.key, "text");
-		if (val === null) return c.json(null);
-		return c.json(val);
+		return c.json(await kv.get(body.key, "text"));
 	});
 	app.post("/kv/put", async (c) => {
-		const body = await c.req.json();
-		if (!body.binding || !body.key) return c.json({ error: "binding and key required" }, 400);
-		const kv = env[body.binding];
-		if (!kv) return c.json({ error: `unknown binding "${body.binding}"` }, 404);
+		const request = await readBindingRequest(c, env, requireKey);
+		if (request instanceof Response) return request;
+		const { body, binding: kv } = request;
 		const opts = {};
 		if (body.expiration) opts.expiration = body.expiration;
 		if (body.expiration_ttl) opts.expirationTtl = body.expiration_ttl;
 		let value;
-		if (body.base64 && typeof body.value === "string") value = decodeBase64(body.value).buffer;
+		if (body.base64 && typeof body.value === "string") value = base64ToBytes(body.value).buffer;
 		else value = typeof body.value === "string" ? body.value : JSON.stringify(body.value);
 		await kv.put(body.key, value, opts);
 		return c.json({ success: true });
 	});
 	app.post("/kv/delete", async (c) => {
-		const body = await c.req.json();
-		if (!body.binding || !body.key) return c.json({ error: "binding and key required" }, 400);
-		const kv = env[body.binding];
-		if (!kv) return c.json({ error: `unknown binding "${body.binding}"` }, 404);
-		await kv.delete(body.key);
+		const request = await readBindingRequest(c, env, requireKey);
+		if (request instanceof Response) return request;
+		await request.binding.delete(request.body.key);
 		return c.json({ success: true });
 	});
 	app.post("/kv/list", async (c) => {
-		const body = await c.req.json();
-		if (!body.binding) return c.json({ error: "binding required" }, 400);
-		const kv = env[body.binding];
-		if (!kv) return c.json({ error: `unknown binding "${body.binding}"` }, 404);
+		const request = await readBindingRequest(c, env, requireBinding);
+		if (request instanceof Response) return request;
+		const { body, binding: kv } = request;
 		const opts = {};
 		if (body.prefix) opts.prefix = body.prefix;
 		if (body.limit) opts.limit = body.limit;
@@ -135,24 +145,21 @@ function createBindingHandler(env) {
 		});
 	});
 	app.post("/r2/get", async (c) => {
-		const body = await c.req.json();
-		if (!body.binding || !body.key) return c.json({ error: "binding and key required" }, 400);
-		const bucket = env[body.binding];
-		if (!bucket) return c.json({ error: `unknown binding "${body.binding}"` }, 404);
-		const obj = await bucket.get(body.key);
+		const request = await readBindingRequest(c, env, requireKey);
+		if (request instanceof Response) return request;
+		const obj = await request.binding.get(request.body.key);
 		if (!obj) return c.json(null);
 		const headers = new Headers();
 		headers.set("content-type", obj.httpMetadata?.contentType ?? "application/octet-stream");
-		if (obj.size !== void 0) headers.set("content-length", String(obj.size));
+		headers.set("content-length", String(obj.size));
 		if (obj.httpEtag) headers.set("etag", obj.httpEtag);
 		return new Response(obj.body, { headers });
 	});
 	app.on("POST", ["/r2/put", "/r2/put-conditional"], async (c) => {
-		const body = await c.req.json();
-		if (!body.binding || !body.key) return c.json({ error: "binding and key required" }, 400);
-		const bucket = env[body.binding];
-		if (!bucket) return c.json({ error: `unknown binding "${body.binding}"` }, 404);
-		const data = body.base64 ? decodeBase64(body.base64) : new TextEncoder().encode(body.value ?? "");
+		const request = await readBindingRequest(c, env, requireKey);
+		if (request instanceof Response) return request;
+		const { body, binding: bucket } = request;
+		const data = body.base64 ? base64ToBytes(body.base64) : new TextEncoder().encode(body.value ?? "");
 		let onlyIf;
 		try {
 			if (body.onlyIf !== void 0 || c.req.path.endsWith("/put-conditional")) onlyIf = parseR2Conditional(body.onlyIf);
@@ -177,20 +184,15 @@ function createBindingHandler(env) {
 		});
 	});
 	app.post("/r2/delete", async (c) => {
-		const body = await c.req.json();
-		if (!body.binding) return c.json({ error: "binding required" }, 400);
-		const keys = body.keys ? body.keys : body.key ? [body.key] : [];
-		if (keys.length === 0) return c.json({ error: "key or keys required" }, 400);
-		const bucket = env[body.binding];
-		if (!bucket) return c.json({ error: `unknown binding "${body.binding}"` }, 404);
-		await bucket.delete(keys);
+		const request = await readBindingRequest(c, env, (body) => requireBinding(body) ?? (r2DeleteKeys(body).length === 0 ? "key or keys required" : void 0));
+		if (request instanceof Response) return request;
+		await request.binding.delete(r2DeleteKeys(request.body));
 		return c.json({ success: true });
 	});
 	app.post("/r2/list", async (c) => {
-		const body = await c.req.json();
-		if (!body.binding) return c.json({ error: "binding required" }, 400);
-		const bucket = env[body.binding];
-		if (!bucket) return c.json({ error: `unknown binding "${body.binding}"` }, 404);
+		const request = await readBindingRequest(c, env, requireBinding);
+		if (request instanceof Response) return request;
+		const { body, binding: bucket } = request;
 		const opts = {};
 		if (body.prefix) opts.prefix = body.prefix;
 		if (body.limit) opts.limit = body.limit;
@@ -201,24 +203,22 @@ function createBindingHandler(env) {
 			objects: result.objects.map((o) => ({
 				key: o.key,
 				size: o.size,
-				lastModified: o.uploaded?.toISOString() ?? ""
+				lastModified: o.uploaded.toISOString()
 			})),
 			truncated: result.truncated,
 			cursor: result.truncated ? result.cursor : null
 		});
 	});
 	app.post("/r2/head", async (c) => {
-		const body = await c.req.json();
-		if (!body.binding || !body.key) return c.json({ error: "binding and key required" }, 400);
-		const bucket = env[body.binding];
-		if (!bucket) return c.json({ error: `unknown binding "${body.binding}"` }, 404);
-		const obj = await bucket.head(body.key);
+		const request = await readBindingRequest(c, env, requireKey);
+		if (request instanceof Response) return request;
+		const obj = await request.binding.head(request.body.key);
 		if (!obj) return c.json(null);
 		return c.json({
-			key: body.key,
+			key: request.body.key,
 			size: obj.size,
-			etag: obj.httpEtag ?? "",
-			lastModified: obj.uploaded?.toISOString() ?? "",
+			etag: obj.httpEtag,
+			lastModified: obj.uploaded.toISOString(),
 			contentType: obj.httpMetadata?.contentType ?? "application/octet-stream"
 		});
 	});

package/dist/runtime/remote/index.mjs

@@ -1,12 +1,7 @@
-import { t as cfAccessHeaders } from "../../cf-access-TWNzXltp.mjs";
+import { n as bytesToBase64 } from "../../base64-DVrOndmI.mjs";
+import { t as cfAccessHeaders } from "../../cf-access-BM9G0lhO.mjs";
 import { n as serializeR2Conditional } from "../../r2-conditions-D1Wk8i7b.mjs";
 //#region src/runtime/remote/client.ts
-/** Base64-encode binary values for JSON transport to the proxy. */
-function bytesToBase64(bytes) {
-	let binary = "";
-	for (const byte of bytes) binary += String.fromCharCode(byte);
-	return btoa(binary);
-}
 function readableMessage(value) {
 	if (typeof value !== "string") return;
 	const text = value.replace(/(?:\u001b\]|\u009d)[\s\S]*?(?:\u0007|\u001b\\|\u009c|$)/g, "").replace(/(?:\u001b\[|\u009b)[0-?]*[ -/]*[@-~]/g, "").replace(/[\u0000-\u001f\u007f-\u009f]/g, " ").trim();
@@ -93,32 +88,6 @@ var ProxyClient = class {
 		if (!res.ok) throw await proxyError(res);
 		return res;
 	}
-	/**
-	* Send a request to the proxy and return the raw Response (for streaming).
-	* Injects `Authorization` header and `projectId` into the JSON body.
-	* Throws on non-OK responses.
-	*/
-	async stream(path, init) {
-		let body = init.body;
-		if (typeof body === "string") try {
-			const parsed = JSON.parse(body);
-			body = JSON.stringify({
-				...parsed,
-				projectId: this.projectId
-			});
-		} catch {}
-		const res = await globalThis.fetch(`${this.proxyUrl}${path}`, {
-			...init,
-			headers: {
-				...init.headers,
-				...this.authHeaders
-			},
-			body,
-			redirect: "manual"
-		});
-		if (!res.ok) throw await proxyError(res);
-		return res;
-	}
 };
 //#endregion
 //#region src/runtime/remote/d1.ts
@@ -160,6 +129,12 @@ var ProxyD1Database = class {
 	dump() {
 		throw new Error("dump() is not supported with remote bindings");
 	}
+	withSession(_constraintOrBookmark) {
+		return this;
+	}
+	getBookmark() {
+		return null;
+	}
 };
 /**
 * D1PreparedStatement implementation backed by the remote proxy.
@@ -216,10 +191,6 @@ var ProxyD1PreparedStatement = class ProxyD1PreparedStatement {
 var ProxyKVNamespace = class {
 	client;
 	binding;
-	normalizeGetOptions(options) {
-		if (typeof options === "string") return options;
-		if (options?.type === "json" || options?.type === "text" || options?.type === "arrayBuffer" || options?.type === "stream") return { type: options.type };
-	}
 	constructor(client, binding) {
 		this.client = client;
 		this.binding = binding;
@@ -231,42 +202,14 @@ var ProxyKVNamespace = class {
 			key,
 			type
 		});
-		const ct = res.headers.get("content-type") ?? "";
-		if (type === "arrayBuffer" || type === "stream") {
-			if (ct.includes("application/json")) {
-				const data = await res.json();
-				if (data === null) return null;
-				const encoded = new TextEncoder().encode(JSON.stringify(data));
-				return type === "arrayBuffer" ? encoded.buffer : new ReadableStream({ start(controller) {
-					controller.enqueue(encoded);
-					controller.close();
-				} });
-			}
-			if (type === "arrayBuffer") return res.arrayBuffer();
-			return res.body;
-		}
-		return res.json();
+		if (type !== "arrayBuffer" && type !== "stream" || res.headers.get("content-type")?.includes("application/json")) return res.json();
+		return type === "arrayBuffer" ? res.arrayBuffer() : res.body;
 	}
 	async getWithMetadata(key, options) {
-		const normalized = this.normalizeGetOptions(options);
-		let value;
-		switch (typeof normalized === "string" ? normalized : normalized?.type) {
-			case "json":
-				value = await this.get(key, "json");
-				break;
-			case "text":
-				value = await this.get(key, "text");
-				break;
-			case "arrayBuffer":
-				value = await this.get(key, "arrayBuffer");
-				break;
-			case "stream":
-				value = await this.get(key, "stream");
-				break;
-			default: value = await this.get(key);
-		}
+		const requested = typeof options === "string" ? options : options?.type;
+		const type = requested === "json" || requested === "arrayBuffer" || requested === "stream" ? requested : "text";
 		return {
-			value,
+			value: await this.get(key, type),
 			metadata: null,
 			cacheStatus: null
 		};
@@ -328,13 +271,9 @@ var ProxyR2Bucket = class {
 		return makeR2Object(data);
 	}
 	async get(key) {
-		const res = await this.client.stream("/r2/get", {
-			method: "POST",
-			headers: { "Content-Type": "application/json" },
-			body: JSON.stringify({
-				binding: this.binding,
-				key
-			})
+		const res = await this.client.fetch("/r2/get", {
+			binding: this.binding,
+			key
 		});
 		if ((res.headers.get("content-type") ?? "").includes("application/json")) {
 			if (await res.clone().json() === null) return null;

package/dist/runtime/routing.d.mts

@@ -1,5 +1,5 @@
 import { t as DevCssAsset } from "../types-BAp5AEBU.mjs";
-import { a as handlePageMutation, i as handlePageGet } from "../protocol-BPZaNqBo.mjs";
+import { a as handlePageMutation, i as handlePageGet } from "../protocol-4H7V_3Os.mjs";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { Context, ExecutionContext, Hono, MiddlewareHandler } from "hono";
 //#region src/runtime/routing-errors.d.ts
@@ -157,7 +157,6 @@ export type RoutingContext = Context & {
 };
 export type RoutingRuntime = {
   requestContext: AsyncLocalStorage<RequestContextStore>;
-  originalUrls: WeakMap<Request, URL>;
   contextMiddleware: MiddlewareHandler;
   requestMiddleware: MiddlewareHandler;
   routingMiddleware: (rules: Array<RoutingRule>) => MiddlewareHandler;
@@ -171,9 +170,7 @@ export declare function createRoutingRuntime(app: Hono, options?: {
   nodeTarget?: boolean;
   managedDispatch?: boolean;
   blockedAssetExtensions?: Array<string>;
-  originalUrls?: WeakMap<Request, URL>;
 }): RoutingRuntime;
-export declare const DEFAULT_ASSET_EXTENSIONS: Array<string>;
 export declare function markNoMatch(request: Request, response: Response): Response;
 export declare function createHttpRouteHandler(load: () => Promise<Record<string, (c: Context) => unknown>>, method: string): (c: Context) => Promise<Response>;
 export declare function createModuleLoader<T>(load: () => Promise<T>, cache?: boolean): () => Promise<T>;