@lovrozagar/honey 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@lovrozagar/honey",
-	"version": "0.1.0",
+	"version": "0.1.1",
 	"description": "Type-safe API framework built on Web Standards. Builder-pattern DX, precompiled radix tree in production.",
 	"keywords": [
 		"api",
@@ -11,10 +11,16 @@
 		"type-safe",
 		"web-standards"
 	],
+	"homepage": "https://github.com/lovrozagar/honey#readme",
+	"bugs": {
+		"url": "https://github.com/lovrozagar/honey/issues"
+	},
 	"license": "MIT",
+	"author": "lovrozagar",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/lovrozagar/honey"
+		"url": "git+https://github.com/lovrozagar/honey.git",
+		"directory": "packages/core"
 	},
 	"publishConfig": {
 		"access": "public"

package/src/cli.ts

@@ -74,7 +74,7 @@ async function loadConfigFromVite(configPath: string): Promise<HoneyVitePluginCo
 	await jiti.import(configPath)
 
 	/* read stashed config from the same module graph */
-	const pluginMod = (await jiti.import("honey/plugin")) as Record<string, unknown>
+	const pluginMod = (await jiti.import("@lovrozagar/honey/plugin")) as Record<string, unknown>
 	const getter = pluginMod.getLastHoneyConfig as typeof getLastHoneyConfig | undefined
 	return getter?.()
 }

package/src/index.ts

@@ -231,6 +231,15 @@ function walkTreeHandlers(
 const EMPTY_PARAMS = EMPTY_OBJ as Record<string, string>
 const EMPTY_MW: RuntimeMiddleware[] = []
 
+function requestIsWsUpgrade(request: Request): boolean {
+	try {
+		return request.headers.get("upgrade")?.toLowerCase() === "websocket";
+	} catch {
+		/* Deno closes the Request after upgradeWebSocket */
+		return false;
+	}
+}
+
 /** Find first '?' or '#' in url starting from pos */
 function findSearchOrHash(url: string, pos: number): number {
 	for (let i = pos; i < url.length; i++) {
@@ -262,8 +271,32 @@ type FetchCtx<TEnv> = {
 	request: Request;
 	startTime: number;
 	url: () => URL;
+	/** Already known from fetch() before Deno.upgradeWebSocket consumes the request. */
+	wsUpgrade?: boolean;
+	/** Headers copied before Deno.upgradeWebSocket closes the Request. */
+	headerSnap?: Headers;
 };
 
+function requestWithHeaders(req: Request, headers: Headers): Request {
+	return new Proxy(req, {
+		get(target, prop) {
+			if (prop === "headers") return headers
+			const value = Reflect.get(target, prop, target)
+			return typeof value === "function" ? (value as (...args: never[]) => unknown).bind(target) : value
+		},
+	})
+}
+
+function ctxRequest(fc: FetchCtx<unknown>): Request {
+	if (!fc.headerSnap) return fc.request
+	try {
+		void fc.request.headers.get("upgrade")
+		return fc.request
+	} catch {
+		return requestWithHeaders(fc.request, fc.headerSnap)
+	}
+}
+
 function defaultErrorFormatter(
 	_error: HoneyError,
 	defaultShape: Record<string, unknown>,
@@ -1778,6 +1811,7 @@ export class Honey<
 			return this._doFetch(request, env, executionCtx);
 		}
 		const isWsUpgrade = request.headers.get("upgrade")?.toLowerCase() === "websocket"
+		const headerSnap = isWsUpgrade ? new Headers(request.headers) : undefined
 		const path = this.pathFromRequest(request)
 		const canPreUpgrade =
 			isWsUpgrade &&
@@ -1785,7 +1819,14 @@ export class Honey<
 			!this.trailingSlashRedirects(path) &&
 			matchWsRoute(this._root, this.pathAfterPrefix(path)) !== null
 		const pre = canPreUpgrade ? this._wsAdapter?.preUpgrade?.(request) : undefined
-		const work = this._doFetch(request, env, executionCtx)
+		/* After Deno.upgradeWebSocket the Request is closed. A sync throw here
+		 * used to be boxed by async _doFetch; keep 101 returning either way. */
+		let work: Response | Promise<Response>
+		try {
+			work = this._doFetch(request, env, executionCtx, isWsUpgrade === true, headerSnap)
+		} catch (err) {
+			work = Promise.reject(err)
+		}
 		if (!pre) return work
 		void Promise.resolve(work)
 			.then((res) => {
@@ -1842,6 +1883,8 @@ export class Honey<
 		request: Request,
 		env: TEnv,
 		executionCtx?: { waitUntil?: (p: Promise<unknown>) => void },
+		knownWsUpgrade = false,
+		headerSnap?: Headers,
 	): Response | Promise<Response> {
 		const startTime = performance.now();
 
@@ -1875,6 +1918,8 @@ export class Honey<
 			request,
 			startTime,
 			url: getUrl,
+			wsUpgrade: knownWsUpgrade,
+			headerSnap,
 		};
 
 		if (this._telemetry !== null) {
@@ -1913,8 +1958,8 @@ export class Honey<
 			}
 		}
 
-		/* WebSocket route check */
-		const isWsUpgrade = request.headers.get("upgrade") === "websocket";
+		/* WebSocket route check — do not re-read headers after Deno.upgradeWebSocket */
+		const isWsUpgrade = knownWsUpgrade || requestIsWsUpgrade(request);
 		if (isWsUpgrade) {
 			const wsMatch = matchWsRoute(this._root, path);
 			if (wsMatch !== null) {
@@ -2085,8 +2130,7 @@ export class Honey<
 			return this._handleRealtime(fc, wsMatch, realtimeConfig);
 		}
 
-		const isUpgrade =
-			fc.request.headers.get("upgrade")?.toLowerCase() === "websocket";
+		const isUpgrade = fc.wsUpgrade === true || requestIsWsUpgrade(fc.request);
 		if (!isUpgrade) {
 			return new Response(null, {
 				headers: { upgrade: "websocket" },
@@ -2108,7 +2152,7 @@ export class Honey<
 			env: fc.env,
 			executionCtx: fc.executionCtx,
 			params: wsMatch.params,
-			req: fc.request,
+			req: ctxRequest(fc),
 			urlFn: fc.url,
 		});
 		if (this._contextValues) Object.assign(wsCtx, this._contextValues);
@@ -2188,8 +2232,7 @@ export class Honey<
 		wsMatch: { handler: WSRouteHandler; params: Record<string, string> },
 		config: { handler: RealtimeRouteOpts["handler"]; middlewares?: RealtimeRouteOpts["use"]; reconnectBuffer?: number },
 	): Promise<Response> {
-		const isUpgrade =
-			fc.request.headers.get("upgrade")?.toLowerCase() === "websocket";
+		const isUpgrade = fc.wsUpgrade === true || requestIsWsUpgrade(fc.request);
 		if (!isUpgrade) {
 			return new Response(null, {
 				headers: { upgrade: "websocket" },
@@ -2217,7 +2260,7 @@ export class Honey<
 			env: fc.env,
 			executionCtx: fc.executionCtx,
 			params: wsMatch.params,
-			req: fc.request,
+			req: ctxRequest(fc),
 			urlFn: fc.url,
 		});
 		if (this._contextValues) Object.assign(ctx, this._contextValues);

package/src/node-request.ts

@@ -121,7 +121,8 @@ export class NodeRequest {
 	get body(): ReadableStream<Uint8Array> | null {
 		if (!this.#hasBody) return null
 		if (this.#webBody === undefined) {
-			this.#webBody = Readable.toWeb(this.#incoming) as ReadableStream<Uint8Array>
+			// Node's web stream and the DOM/Bun ReadableStream brands do not overlap.
+			this.#webBody = Readable.toWeb(this.#incoming) as unknown as ReadableStream<Uint8Array>
 		}
 		return this.#webBody
 	}

package/src/node.ts

@@ -16,6 +16,11 @@ type ServeOptions<TEnv> = {
 const BUFFER_BODY_MAX = 256 * 1024
 const RAW_BODY = Symbol.for("honey.rawBody")
 
+// Node's `Readable.fromWeb` wants `node:stream/web` streams; DOM/Bun brands do not overlap.
+function asNodeWebStream(stream: ReadableStream<Uint8Array>): import("node:stream/web").ReadableStream {
+	return stream as unknown as import("node:stream/web").ReadableStream
+}
+
 function incomingToRequest(req: IncomingMessage): Request {
 	return incomingToNodeRequest(req)
 }
@@ -79,7 +84,7 @@ async function responseToNode(response: Response, res: ServerResponse): Promise<
 		}
 		res.writeHead(response.status, response.plainHeaders)
 		try {
-			await pipeline(Readable.fromWeb(stream as import("node:stream/web").ReadableStream), res)
+			await pipeline(Readable.fromWeb(asNodeWebStream(stream)), res)
 		} catch {
 			if (!res.destroyed) res.destroy()
 		}
@@ -114,7 +119,7 @@ async function responseToNode(response: Response, res: ServerResponse): Promise<
 
 	res.writeHead(response.status, collectNodeHeaders(response))
 	try {
-		await pipeline(Readable.fromWeb(body as import("node:stream/web").ReadableStream), res)
+		await pipeline(Readable.fromWeb(asNodeWebStream(body)), res)
 	} catch {
 		if (!res.destroyed) res.destroy()
 	}