This repository was archived by the owner on Mar 11, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 5
WebSocket support #128
Merged
Merged
WebSocket support #128
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
94d1c8e
Added websockets playground
jamesopstad f3f9bde
Initial implementation
jamesopstad 8ba57d3
Improved playground
jamesopstad 9e2386f
Added WebSocket tests
jamesopstad 797c9b3
Added support for WebSockets in preview
jamesopstad 0cc9339
In progress. Fixing close events.
jamesopstad cd2321c
Tidy up
jamesopstad fceaf00
Remove logger variable
jamesopstad 46985a7
Added nodeHeadersToWebHeaders function
jamesopstad 1a9fc0d
Add jsdoc
jamesopstad 192f4e8
Fix lock file
jamesopstad File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| import ws from 'ws'; | ||
| import { UNKNOWN_HOST } from './shared'; | ||
| import { nodeHeadersToWebHeaders } from './utils'; | ||
| import type { Fetcher } from '@cloudflare/workers-types/experimental'; | ||
| import type { ReplaceWorkersTypes } from 'miniflare'; | ||
| import type { IncomingMessage } from 'node:http'; | ||
| import type { Duplex } from 'node:stream'; | ||
| import type * as vite from 'vite'; | ||
|
|
||
| /** | ||
| * This function handles 'upgrade' requests to the Vite HTTP server and forwards WebSocket events between the client and Worker environments. | ||
| */ | ||
| export function handleWebSocket( | ||
| httpServer: vite.HttpServer, | ||
| fetcher: ReplaceWorkersTypes<Fetcher>['fetch'], | ||
| logger: vite.Logger, | ||
| ) { | ||
| const nodeWebSocket = new ws.Server({ noServer: true }); | ||
|
|
||
| httpServer.on( | ||
| 'upgrade', | ||
| async (request: IncomingMessage, socket: Duplex, head: Buffer) => { | ||
| const url = new URL(request.url ?? '', UNKNOWN_HOST); | ||
|
|
||
| // Ignore Vite HMR WebSockets | ||
| if (request.headers['sec-websocket-protocol']?.startsWith('vite')) { | ||
| return; | ||
| } | ||
|
|
||
| const headers = nodeHeadersToWebHeaders(request.headers); | ||
| const response = await fetcher(url, { | ||
| headers, | ||
| method: request.method, | ||
| }); | ||
| const workerWebSocket = response.webSocket; | ||
jamesopstad marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| if (!workerWebSocket) { | ||
| socket.destroy(); | ||
jamesopstad marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return; | ||
| } | ||
|
|
||
| nodeWebSocket.handleUpgrade( | ||
| request, | ||
| socket, | ||
| head, | ||
| async (clientWebSocket) => { | ||
| workerWebSocket.accept(); | ||
|
|
||
| // Forward Worker events to client | ||
| workerWebSocket.addEventListener('message', (event) => { | ||
| clientWebSocket.send(event.data); | ||
| }); | ||
| workerWebSocket.addEventListener('error', (event) => { | ||
| logger.error( | ||
| `WebSocket error:\n${event.error?.stack || event.error?.message}`, | ||
| { error: event.error }, | ||
| ); | ||
| }); | ||
| workerWebSocket.addEventListener('close', () => { | ||
| clientWebSocket.close(); | ||
| }); | ||
|
|
||
| // Forward client events to Worker | ||
| clientWebSocket.on('message', (event: ArrayBuffer | string) => { | ||
| workerWebSocket.send(event); | ||
| }); | ||
| clientWebSocket.on('error', (error) => { | ||
| logger.error(`WebSocket error:\n${error.stack || error.message}`, { | ||
| error, | ||
| }); | ||
| }); | ||
| clientWebSocket.on('close', () => { | ||
| workerWebSocket.close(); | ||
| }); | ||
|
|
||
| nodeWebSocket.emit('connection', clientWebSocket, request); | ||
| }, | ||
| ); | ||
| }, | ||
| ); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| import { expect, test, vi } from 'vitest'; | ||
| import { page } from '../../__test-utils__'; | ||
|
|
||
| async function openWebSocket() { | ||
| const openButton = page.getByRole('button', { name: 'Open WebSocket' }); | ||
| const statusTextBefore = await page.textContent('h2'); | ||
| expect(statusTextBefore).toBe('WebSocket closed'); | ||
| await openButton.click(); | ||
| await vi.waitFor(async () => { | ||
| const statusTextAfter = await page.textContent('h2'); | ||
| expect(statusTextAfter).toBe('WebSocket open'); | ||
| }); | ||
| } | ||
|
|
||
| test('opens WebSocket connection', openWebSocket); | ||
|
|
||
| test('closes WebSocket connection', async () => { | ||
| await openWebSocket(); | ||
| const closeButton = page.getByRole('button', { name: 'Close WebSocket' }); | ||
| const statusTextBefore = await page.textContent('h2'); | ||
| expect(statusTextBefore).toBe('WebSocket open'); | ||
| await closeButton.click(); | ||
| await vi.waitFor(async () => { | ||
| const statusTextAfter = await page.textContent('h2'); | ||
| expect(statusTextAfter).toBe('WebSocket closed'); | ||
| }); | ||
| }); | ||
|
|
||
| test('sends and receives WebSocket messages', async () => { | ||
| await openWebSocket(); | ||
| const sendButton = page.getByRole('button', { name: 'Send message' }); | ||
| const messageTextBefore = await page.textContent('p'); | ||
| expect(messageTextBefore).toBe(''); | ||
| await sendButton.click(); | ||
| await vi.waitFor(async () => { | ||
| const messageTextAfter = await page.textContent('p'); | ||
| expect(messageTextAfter).toBe( | ||
| `Durable Object received client message: 'Client event'.`, | ||
| ); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "name": "@playground/websockets", | ||
| "private": true, | ||
| "type": "module", | ||
| "scripts": { | ||
| "build": "vite build --app", | ||
| "check:types": "tsc --build", | ||
| "dev": "vite dev", | ||
| "preview": "vite preview" | ||
| }, | ||
| "devDependencies": { | ||
| "@cloudflare/workers-types": "catalog:default", | ||
| "@flarelabs-net/vite-plugin-cloudflare": "workspace:*", | ||
| "@vite-plugin-cloudflare/typescript-config": "workspace:*", | ||
| "typescript": "catalog:default", | ||
| "vite": "catalog:default", | ||
| "wrangler": "catalog:default" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| <!doctype html> | ||
| <html> | ||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| </head> | ||
| <body> | ||
| <main> | ||
| <h1>WebSockets playground</h1> | ||
| <button id="open" aria-label="Open WebSocket">Open</button> | ||
| <button id="close" aria-label="Close WebSocket">Close</button> | ||
| <button id="send" aria-label="Send message">Send</button> | ||
| <h2 id="status">WebSocket closed</h2> | ||
| <p id="message"></p> | ||
| </main> | ||
| </body> | ||
| <script type="module"> | ||
| let ws; | ||
| const openButton = document.querySelector('#open'); | ||
| const closeButton = document.querySelector('#close'); | ||
| const sendButton = document.querySelector('#send'); | ||
| const statusText = document.querySelector('#status'); | ||
| const messageText = document.querySelector('#message'); | ||
|
|
||
| openButton.addEventListener('click', () => open()); | ||
| closeButton.addEventListener('click', () => close()); | ||
| sendButton.addEventListener('click', () => send('Client event')); | ||
|
|
||
| function open() { | ||
| if (ws) { | ||
| console.log('WebSocket already open'); | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| ws = new WebSocket(`${location.origin.replace(/^http/, 'ws')}/websocket`); | ||
|
|
||
| ws.addEventListener('message', (event) => { | ||
| console.log('Received server event', event.data); | ||
| messageText.textContent = event.data; | ||
| }); | ||
|
|
||
| ws.addEventListener('open', (event) => { | ||
| console.log('Client open'); | ||
| statusText.textContent = 'WebSocket open'; | ||
| }); | ||
|
|
||
| ws.addEventListener('close', (event) => { | ||
| console.log('Client close'); | ||
| statusText.textContent = 'WebSocket closed'; | ||
| }); | ||
| } | ||
|
|
||
| function close() { | ||
| if (!ws) { | ||
| console.log('WebSocket already closed'); | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| ws.close(); | ||
| ws = undefined; | ||
| } | ||
|
|
||
| function send(message) { | ||
| ws.send(message); | ||
| } | ||
| </script> | ||
| </html> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| import html from './index.html?raw'; | ||
| import { DurableObject } from 'cloudflare:workers'; | ||
|
|
||
| interface Env { | ||
| WEBSOCKET_SERVER: DurableObjectNamespace<WebSocketServer>; | ||
| } | ||
|
|
||
| export class WebSocketServer extends DurableObject { | ||
| override fetch() { | ||
| const { 0: client, 1: server } = new WebSocketPair(); | ||
|
|
||
| this.ctx.acceptWebSocket(server); | ||
|
|
||
| return new Response(null, { status: 101, webSocket: client }); | ||
| } | ||
|
|
||
| override async webSocketMessage(ws: WebSocket, data: string | ArrayBuffer) { | ||
| const decoder = new TextDecoder(); | ||
| const message = typeof data === 'string' ? data : decoder.decode(data); | ||
|
|
||
| ws.send(`Durable Object received client message: '${message}'.`); | ||
| } | ||
| } | ||
|
|
||
| export default { | ||
| async fetch(request, env) { | ||
| if (request.url.endsWith('/websocket')) { | ||
| const upgradeHeader = request.headers.get('Upgrade'); | ||
|
|
||
| if (!upgradeHeader || upgradeHeader !== 'websocket') { | ||
| return new Response('Durable Object expected Upgrade: websocket', { | ||
| status: 426, | ||
| }); | ||
| } | ||
|
|
||
| const id = env.WEBSOCKET_SERVER.idFromName('id'); | ||
| const stub = env.WEBSOCKET_SERVER.get(id); | ||
|
|
||
| return stub.fetch(request); | ||
| } | ||
|
|
||
| return new Response(html, { headers: { 'content-type': 'text/html' } }); | ||
| }, | ||
| } satisfies ExportedHandler<Env>; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "files": [], | ||
| "references": [ | ||
| { "path": "./tsconfig.node.json" }, | ||
| { "path": "./tsconfig.worker.json" } | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| { | ||
| "extends": ["@vite-plugin-cloudflare/typescript-config/base.json"], | ||
| "include": ["vite.config.ts", "__tests__"] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| { | ||
| "extends": ["@vite-plugin-cloudflare/typescript-config/worker.json"], | ||
| "include": ["src"] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| import { cloudflare } from '@flarelabs-net/vite-plugin-cloudflare'; | ||
| import { defineConfig } from 'vite'; | ||
|
|
||
| export default defineConfig({ | ||
| plugins: [cloudflare({ persistState: false })], | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| name = "worker" | ||
| main = "./src/index.ts" | ||
| compatibility_date = "2024-09-09" | ||
|
|
||
| [durable_objects] | ||
| bindings = [{ name = "WEBSOCKET_SERVER", class_name = "WebSocketServer" }] | ||
|
|
||
| [[migrations]] | ||
| tag = "v1" | ||
| new_classes = ["WebSocketServer"] |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.