Skip to content

fix: pass cloudflare env & context in websocket context #3904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emretinaztepe wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −0
Open

fix: pass cloudflare env & context in websocket context #3904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/presets/cloudflare/runtime/cloudflare-durable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@ export default createHandler<Env>({
// Websocket upgrade
// https://crossws.unjs.io/adapters/cloudflare#durable-objects
if (hasWebSocket && request.headers.get("upgrade") === "websocket") {
// Ensure Cloudflare bindings are available on `peer.context` inside WebSocket handlers.
// crossws will forward `request.context` to `peer.context`.
let wsContext = (request as any).context;
if (!wsContext) {
wsContext = {};
Object.defineProperty(request as any, "context", { enumerable: true, value: wsContext });
}
wsContext.cloudflare ||= {};
wsContext.cloudflare.env ||= env;
wsContext.cloudflare.context ||= context;
return ws!.handleUpgrade(request, env, context);
}
},
Expand Down
10 changes: 10 additions & 0 deletions src/presets/cloudflare/runtime/cloudflare-module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@ export default createHandler<Env>({
// Websocket upgrade
// https://crossws.unjs.io/adapters/cloudflare
if (hasWebSocket && request.headers.get("upgrade") === "websocket") {
// Ensure Cloudflare bindings are available on `peer.context` inside WebSocket handlers.
// crossws will forward `request.context` to `peer.context`.
let wsContext = (request as any).context;
if (!wsContext) {
wsContext = {};
Object.defineProperty(request as any, "context", { enumerable: true, value: wsContext });
}
wsContext.cloudflare ||= {};
wsContext.cloudflare.env ||= env;
wsContext.cloudflare.context ||= context;
return ws!.handleUpgrade(request as any, env, context);
}
},
Expand Down