Merge pull request #213 from nksaraf/party

feat: party API (inspired by partykit)

.changeset/wise-beds-work.md

@@ -0,0 +1,6 @@
+---
+"vinxi": patch
+"react-ssr-basic": patch
+---
+
+feat: party API (inspired by partykit)

examples/react/ssr/basic/app.config.js

@@ -28,7 +28,13 @@ export default createApp({
 			handler: "./app/ws.ts",
 			target: "server",
 			base: "/_ws",
-			plugins: () => [reactRefresh()],
+		},
+		{
+			name: "party",
+			type: "http",
+			handler: "./app/party.ts",
+			target: "server",
+			base: "/party",
 		},
 		{
 			name: "ssr",

examples/react/ssr/basic/app/party.ts

@@ -0,0 +1,13 @@
+// import { defineWebSocket, eventHandler } from "vinxi/http";
+import { partyHandler } from "vinxi/party";
+
+export default partyHandler({
+	onConnect(party, conn) {
+		console.log(party);
+		conn.send("Hello from the server!");
+		party.broadcast(
+			"Hello from the server!" +
+				[...party.getConnections()].map((c) => c.id).join(","),
+		);
+	},
+});

packages/vinxi/lib/nitro-dev.js

@@ -262,10 +262,22 @@ export async function createDevServer(nitro) {
 
 	const adapter = wsAdapter({
 		...wsApp.websocket,
-		adapterHooks: {
-			"node:message": (event) => {
+		hooks: {
+			open: (event) => {
 				event.ctx.node.req.url = event.ctx.node.req.originalUrl;
 			},
+			message: (event) => {
+				event.ctx.node.req.url = event.ctx.node.req.originalUrl;
+			},
+			close: (event) => {
+				event.ctx.node.req.url = event.ctx.node.req.originalUrl;
+			},
+			error: (event) => {
+				event.ctx.node.req.url = event.ctx.node.req.originalUrl;
+			},
+			upgrade: (event) => {
+				// event.ctx.node.req.url = event.ctx.node.req.originalUrl;
+			},
 		},
 	});
 	// Listen
@@ -288,7 +300,7 @@ export async function createDevServer(nitro) {
 		if (import.meta._websocket) {
 			console.log("enabling websockets");
 			listener.server.on("upgrade", (req, sock, head) => {
-				console.log("upgrading");
+				req.url = req.originalUrl;
 				adapter.handleUpgrade(req, sock, head);
 			});
 		}

packages/vinxi/lib/router-modes.js

@@ -262,7 +262,7 @@ const routerModes = {
 						const { default: handler } = await viteServer.ssrLoadModule(
 							handlerModule(router),
 						);
-						return handler.__websocket__?.[hook]?.(...args);
+						return await handler.__websocket__?.[hook]?.(...args);
 					};
 				}
 

packages/vinxi/runtime/party.js

@@ -1,12 +1,4 @@
-import {
-	eventHandler,
-	isWebSocketEvent,
-	isWebSocketUpgradeRequest,
-	lazyEventHandler,
-	toWebRequest,
-	toWebSocketEvent,
-	upgradeWebSocket,
-} from "./server";
+import { eventHandler } from "./server";
 
 class InternalParty {
 	connections = new Map();
@@ -94,33 +86,42 @@ function createConnection(webSocket) {
 	return webSocket;
 }
 
+globalThis.parties ??= {};
+
+async function getParty(partyServer, id) {
+	if (!globalThis.parties[id]) {
+		globalThis.parties[id] = new InternalParty(id);
+		await partyServer.onStart?.(globalThis.parties[id]);
+	}
+
+	return globalThis.parties[id];
+}
+
 /**
  * @param {import('../types/party.d.ts').PartyHandler} partyServer
  */
 export function partyHandler(partyServer) {
-	return lazyEventHandler(async () => {
-		const party = new InternalParty("main");
-		await partyServer.onStart?.(party);
-		return eventHandler((e) => {
-			if (isWebSocketEvent(e)) {
-				const wsEvent = toWebSocketEvent(e);
-				const conn = createConnection(wsEvent.connection);
-				if (wsEvent.type === "connection") {
-					party.onConnect(conn);
-					partyServer.onConnect?.(party, conn);
-				} else if (wsEvent.type === "message") {
-					partyServer.onMessage?.(party, wsEvent.message, conn);
-				} else if (wsEvent.type === "error") {
-					partyServer.onError?.(party, conn, wsEvent.error);
-				} else if (wsEvent.type === "close") {
-					party.onClose(conn);
-					partyServer.onClose?.(party, conn);
-				}
-			} else if (isWebSocketUpgradeRequest(e)) {
-				return upgradeWebSocket(e);
-			} else {
-				return partyServer.onRequest?.(party, toWebRequest(e));
-			}
-		});
+	return eventHandler({
+		handler: (e) => {},
+		websocket: {
+			async open(peer) {
+				const party = await getParty(partyServer, peer.url);
+				await party.onConnect(peer);
+				return await partyServer.onConnect?.(party, peer);
+			},
+			async close(peer, details) {
+				const party = await getParty(partyServer, peer.url);
+				await party.onClose(peer);
+				return await partyServer.onClose?.(party, peer);
+			},
+			async message(peer, message) {
+				const party = await getParty(partyServer, peer.url);
+				return await partyServer.onMessage?.(party, message, peer);
+			},
+			async error(peer, error) {
+				const party = await getParty(partyServer, peer.url);
+				return await partyServer.onError?.(party, peer, error);
+			},
+		},
 	});
 }