devflare 1.0.0-next.62 → 1.0.0-next.63

package/dist/_chunks/{cli-sOZfXGua.js → cli-DsmlUqPd.js}

@@ -1101,7 +1101,7 @@ async function runInit(parsed, logger, options) {
 	return runInitCommand(parsed, logger, options);
 }
 async function runDev(parsed, logger, options) {
-	const { runDevCommand } = await import("./dev-9XMiBRSG.js");
+	const { runDevCommand } = await import("./dev-o1NHvkSX.js");
 	return runDevCommand(parsed, logger, options);
 }
 async function runBuild(parsed, logger, options) {

package/dist/_chunks/{dev-9XMiBRSG.js → dev-o1NHvkSX.js}

@@ -1706,6 +1706,20 @@ export default {
 			if (matchedRoute) {
 				return handleDoWebSocket(request, env, url, matchedRoute)
 			}
+			// Worker mode: the app worker (SvelteKit etc.) owns app WebSocket routes.
+			// A handler like GET /api/doc/:id/subscribe that does
+			// \`return stub.fetch(clientUpgradeRequest)\` must reach the app worker so
+			// its returned 101 (with the DO's client socket) flows back to the
+			// browser and the DO's hibernation handlers fire. The gateway previously
+			// hijacked EVERY unmatched WS upgrade into the in-worker bridge socket
+			// (handleBridgeWebSocket), so the app route never ran and two tabs never
+			// shared the DO. Forward to the app first; only fall back to the bridge
+			// socket when the app did not answer with a WebSocket upgrade (e.g. a
+			// Node-side bridge RPC client, which only exists when there is no app).
+			const appWsResponse = await forwardWebSocketToApp(request, env)
+			if (appWsResponse) {
+				return appWsResponse
+			}
 			return handleBridgeWebSocket(request, env, ctx)
 		}
 
@@ -1913,6 +1927,25 @@ function matchWsRoute(pathname) {
 	return null
 }
 
+// Forward a WebSocket upgrade to the app worker (worker mode) and pass through
+// its response ONLY when the app answered with a genuine WebSocket upgrade
+// (status 101 + a webSocket). Returns null otherwise so the caller falls back to
+// the in-worker bridge socket. This is what lets an app route that does
+// \`return stub.fetch(clientUpgradeRequest)\` reach the DO and stream the DO's
+// client socket back to the browser (hibernation handlers then fire, and two
+// tabs share one DO instance). A GET upgrade has no body, so forwarding the same
+// request and — on a non-101 answer — discarding it is safe (no stream consumed).
+async function forwardWebSocketToApp(request, env) {
+	if (!APP_SERVICE_BINDING) return null
+	const appWorker = env[APP_SERVICE_BINDING]
+	if (!appWorker || typeof appWorker.fetch !== 'function') return null
+	const response = await appWorker.fetch(request)
+	if (response.status === 101 && response.webSocket) {
+		return response
+	}
+	return null
+}
+
 async function handleDoWebSocket(request, env, url, route) {
 	try {
 		const namespace = env[route.doNamespace]

package/dist/cli/index.js

@@ -1,2 +1,2 @@
-import { n as runCli, t as parseArgs } from "../_chunks/cli-sOZfXGua.js";
+import { n as runCli, t as parseArgs } from "../_chunks/cli-DsmlUqPd.js";
 export { parseArgs, runCli };

package/dist/dev-server/gateway-script.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gateway-script.d.ts","sourceRoot":"","sources":["../../src/dev-server/gateway-script.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAE9C;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,gBAAgB,CAC/B,QAAQ,GAAE,aAAa,EAAO,EAC9B,KAAK,UAAQ,EACb,qBAAqB,GAAE,MAAM,GAAG,IAAW,GACzC,MAAM,CA4QR"}
+{"version":3,"file":"gateway-script.d.ts","sourceRoot":"","sources":["../../src/dev-server/gateway-script.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAE9C;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,gBAAgB,CAC/B,QAAQ,GAAE,aAAa,EAAO,EAC9B,KAAK,UAAQ,EACb,qBAAqB,GAAE,MAAM,GAAG,IAAW,GACzC,MAAM,CA6SR"}

package/dist/index.js

@@ -4,6 +4,6 @@ import { a as ConfigResourceResolutionError, d as configSchema, n as ConfigValid
 import { n as compileConfig, s as stringifyConfig } from "./_chunks/compiler-CgIFPfRA.js";
 import { t as workerName } from "./_chunks/workerName-CFJsLZA-.js";
 import { n as getDurableObjectOptions, t as durableObject } from "./_chunks/decorators-QmV57ixr.js";
-import { n as runCli, t as parseArgs } from "./_chunks/cli-sOZfXGua.js";
+import { n as runCli, t as parseArgs } from "./_chunks/cli-DsmlUqPd.js";
 import { i as vars, r as env } from "./_chunks/env-UqevBSTd.js";
 export { ConfigNotFoundError, ConfigResourceResolutionError, ConfigValidationError, compileConfig, configSchema, defineConfig as default, defineConfig, durableObject, env, getDurableObjectOptions, loadConfig, loadResolvedConfig, parseArgs, preview, ref, runCli, stringifyConfig, vars, workerName };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "devflare",
-	"version": "1.0.0-next.62",
+	"version": "1.0.0-next.63",
 	"description": "Devflare is a developer-first toolkit for Cloudflare Workers that sits on top of Miniflare and Wrangler-compatible config",
 	"repository": {
 		"type": "git",
@@ -84,7 +84,7 @@
 		"test:unit": "bun test tests/unit",
 		"test:coverage": "bun test tests/unit --coverage",
 		"test:integration:control": "bun test tests/integration/cli tests/integration/examples tests/integration/package-entry tests/integration/vite",
-		"test:integration:bridge": "bun test tests/integration/bridge/bridge-proxy.test.ts --parallel=1 --max-concurrency=1 && bun test tests/integration/bridge/case18-do.test.ts --parallel=1 --max-concurrency=1 && bun test tests/integration/bridge/durable-object.test.ts --parallel=1 --max-concurrency=1 && bun test tests/integration/bridge/do-websocket.test.ts --parallel=1 --max-concurrency=1 && bun test tests/integration/bridge/do-rpc-native.test.ts --parallel=1 --max-concurrency=1 && bun test tests/integration/bridge/do-websocket-hibernation.test.ts --parallel=1 --max-concurrency=1 && bun test tests/integration/bridge/do-websocket-hibernation-test-context.test.ts --parallel=1 --max-concurrency=1 && bun test tests/integration/bridge/miniflare.test.ts --parallel=1 --max-concurrency=1 && bun test tests/integration/bridge/r2-transfer.test.ts --parallel=1 --max-concurrency=1 && bun test tests/integration/bridge/r2-presign.test.ts --parallel=1 --max-concurrency=1",
+		"test:integration:bridge": "bun test tests/integration/bridge/bridge-proxy.test.ts --parallel=1 --max-concurrency=1 && bun test tests/integration/bridge/case18-do.test.ts --parallel=1 --max-concurrency=1 && bun test tests/integration/bridge/durable-object.test.ts --parallel=1 --max-concurrency=1 && bun test tests/integration/bridge/do-websocket.test.ts --parallel=1 --max-concurrency=1 && bun test tests/integration/bridge/do-rpc-native.test.ts --parallel=1 --max-concurrency=1 && bun test tests/integration/bridge/do-websocket-hibernation.test.ts --parallel=1 --max-concurrency=1 && bun test tests/integration/bridge/do-websocket-hibernation-test-context.test.ts --parallel=1 --max-concurrency=1 && bun test tests/integration/bridge/do-websocket-app-route.test.ts --parallel=1 --max-concurrency=1 && bun test tests/integration/bridge/miniflare.test.ts --parallel=1 --max-concurrency=1 && bun test tests/integration/bridge/r2-transfer.test.ts --parallel=1 --max-concurrency=1 && bun test tests/integration/bridge/r2-presign.test.ts --parallel=1 --max-concurrency=1",
 		"test:integration:test-context": "bun test tests/integration/test-context --parallel=1 --max-concurrency=1",
 		"test:integration:dev-server": "bun test tests/integration/dev-server --parallel=1 --max-concurrency=1",
 		"test:integration:shims": "bun test tests/integration/shims --parallel=1 --max-concurrency=1",