spooder 4.5.1 → 4.5.3

package/README.md

@@ -933,6 +933,10 @@ server.websocket('/path/to/websocket', {
 		// validates a request before it is upgraded
 		// returns HTTP 401 if FALSE is returned
 		// allows you to check headers/authentication
+
+		// if an OBJECT is returned, the object will
+		// be accessible on the websocket as ws.data.*
+
 		return true;
 	},
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "spooder",
 	"type": "module",
-	"version": "4.5.1",
+	"version": "4.5.3",
 	"exports": {
 		".": {
 			"bun": "./src/api.ts",

package/src/api.ts

@@ -104,8 +104,9 @@ export async function caution(err_message_or_obj: string | object, ...err: objec
 	await handle_error('caution: ', err_message_or_obj, ...err);
 }
 
+type WebsocketAcceptReturn = object | boolean;
 type WebsocketHandlers = {
-	accept?: (req: Request) => boolean | Promise<boolean>,
+	accept?: (req: Request) => WebsocketAcceptReturn | Promise<WebsocketAcceptReturn>,
 	message?: (ws: WebSocket, message: string) => void,
 	message_json?: (ws: WebSocket, message: JsonSerializable) => void,
 	open?: (ws: WebSocket) => void,
@@ -810,10 +811,18 @@ export function serve(port: number) {
 		/** Add a route to upgrade connections to websockets. */
 		websocket: (path: string, handlers: WebsocketHandlers): void => {
 			routes.push([path.split('/'), async (req: Request, url: URL) => {
-				if (await handlers.accept?.(req) === false)
-					return 401; // Unauthorized
+				let context_data = undefined;
+				if (handlers.accept) {
+					const res = await handlers.accept(req);
+					
+					if (typeof res === 'object') {
+						context_data = res;
+					} else if (!res) {
+						return 401; // Unauthorized
+					}
+				}
 
-				if (server.upgrade(req))
+				if (server.upgrade(req, { data: context_data }))
 					return 101; // Switching Protocols
 
 				return new Response('WebSocket upgrade failed', { status: 500 });