Skip to content

Commit cd31971

Browse files
[vite-plugin-cloudflare] make sure that runner initialization is properly validated (#7846)
1 parent 51ce630 commit cd31971

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

.changeset/smart-mice-appear.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@cloudflare/vite-plugin": patch
3+
---
4+
5+
fix: make sure that runner initialization is properly validated

packages/vite-plugin-cloudflare/src/cloudflare-environment.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,10 @@ export class CloudflareDevEnvironment extends vite.DevEnvironment {
9999
}
100100
);
101101

102-
assert(response.ok, "Failed to initialize module runner");
102+
assert(
103+
response.ok,
104+
`Failed to initialize module runner, error: ${await response.text()}`
105+
);
103106

104107
const webSocket = response.webSocket;
105108
assert(webSocket, "Failed to establish WebSocket");

packages/vite-plugin-cloudflare/src/runner-worker/index.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,14 @@ export function createWorkerEntrypointWrapper(
173173

174174
if (url.pathname === INIT_PATH) {
175175
const { 0: client, 1: server } = new WebSocketPair();
176-
createModuleRunner(this.env, server);
176+
try {
177+
await createModuleRunner(this.env, server);
178+
} catch (e) {
179+
return new Response(
180+
e instanceof Error ? e.message : JSON.stringify(e),
181+
{ status: 500 }
182+
);
183+
}
177184

178185
return new Response(null, { status: 101, webSocket: client });
179186
}

0 commit comments

Comments
 (0)