spooder 5.1.8 → 5.1.10

package/README.md

@@ -1191,10 +1191,11 @@ Register a route which handles websocket connections.
 server.websocket('/path/to/websocket', {
 	// all of these handlers are OPTIONAL
 
-	accept: (req) => {
+	accept: (req, url) => {
 		// validates a request before it is upgraded
 		// returns HTTP 401 if FALSE is returned
 		// allows you to check headers/authentication
+		// url parameter contains query parameters from route
 
 		// if an OBJECT is returned, the object will
 		// be accessible on the websocket as ws.data.*
@@ -1212,7 +1213,7 @@ server.websocket('/path/to/websocket', {
 
 	message: (ws, message) => {
 		// called when a websocket message is received
-		// message is a string
+		// message is a string or buffer
 	},
 
 	message_json: (ws, data) => {

package/bun.lock

@@ -4,7 +4,7 @@
     "": {
       "name": "spooder",
       "devDependencies": {
-        "@types/bun": "^1.2.16",
+        "@types/bun": "^1.2.20",
       },
       "optionalDependencies": {
         "mysql2": "^3.11.0",
@@ -12,15 +12,15 @@
     },
   },
   "packages": {
-    "@types/bun": ["@types/bun@1.2.20", "", { "dependencies": { "bun-types": "1.2.20" } }, "sha512-dX3RGzQ8+KgmMw7CsW4xT5ITBSCrSbfHc36SNT31EOUg/LA9JWq0VDdEXDRSe1InVWpd2yLUM1FUF/kEOyTzYA=="],
+    "@types/bun": ["@types/bun@1.2.21", "", { "dependencies": { "bun-types": "1.2.21" } }, "sha512-NiDnvEqmbfQ6dmZ3EeUO577s4P5bf4HCTXtI6trMc6f6RzirY5IrF3aIookuSpyslFzrnvv2lmEWv5HyC1X79A=="],
 
     "@types/node": ["@types/node@24.3.0", "", { "dependencies": { "undici-types": "~7.10.0" } }, "sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow=="],
 
-    "@types/react": ["@types/react@19.1.10", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-EhBeSYX0Y6ye8pNebpKrwFJq7BoQ8J5SO6NlvNwwHjSj6adXJViPQrKlsyPw7hLBLvckEMO1yxeGdR82YBBlDg=="],
+    "@types/react": ["@types/react@19.1.12", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-cMoR+FoAf/Jyq6+Df2/Z41jISvGZZ2eTlnsaJRptmZ76Caldwy1odD4xTr/gNV9VLj0AWgg/nmkevIyUfIIq5w=="],
 
     "aws-ssl-profiles": ["aws-ssl-profiles@1.1.2", "", {}, "sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g=="],
 
-    "bun-types": ["bun-types@1.2.20", "", { "dependencies": { "@types/node": "*" }, "peerDependencies": { "@types/react": "^19" } }, "sha512-pxTnQYOrKvdOwyiyd/7sMt9yFOenN004Y6O4lCcCUoKVej48FS5cvTw9geRaEcB9TsDZaJKAxPTVvi8tFsVuXA=="],
+    "bun-types": ["bun-types@1.2.21", "", { "dependencies": { "@types/node": "*" }, "peerDependencies": { "@types/react": "^19" } }, "sha512-sa2Tj77Ijc/NTLS0/Odjq/qngmEPZfbfnOERi0KRUYhT9R8M4VBioWVmMWE5GrYbKMc+5lVybXygLdibHaqVqw=="],
 
     "csstype": ["csstype@3.1.3", "", {}, "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="],
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "spooder",
 	"type": "module",
-	"version": "5.1.8",
+	"version": "5.1.10",
 	"module": "./src/api.ts",
 	"bin": {
 		"spooder": "./src/cli.ts"
@@ -15,7 +15,7 @@
 		}
 	},
 	"devDependencies": {
-		"@types/bun": "^1.2.16"
+		"@types/bun": "^1.2.20"
 	},
 	"optionalDependencies": {
 		"mysql2": "^3.11.0"

package/src/api.ts

@@ -820,7 +820,10 @@ export function http_apply_range(file: BunFile, request: Request): BunFile {
 			if (start_is_nan && end_is_nan)
 				return file;
 			
-			file = file.slice(start_is_nan ? file.size - end : start, end_is_nan || start_is_nan ? undefined : end);
+			file = file.slice(
+				start_is_nan ? file.size - end : start,
+				end_is_nan || start_is_nan ? undefined : end + 1
+			);
 		}
 	}
 	return file;
@@ -1011,7 +1014,7 @@ function print_request_info(req: Request, res: Response, url: URL, request_time:
 	// format request time based on range (0-100ms is green, 100-500ms is yellow, 500ms+ is red), use ansi colors.
 	const time_fmt = request_time < 100 ? '\x1b[32m' : request_time < 500 ? '\x1b[33m' : '\x1b[31m';
 	const request_time_str = time_fmt + request_time + 'ms\x1b[0m';
-	
+
 	log_spooder(`[${status_code}] {${req.method}} ${url.pathname} ${search_params} [{${request_time_str}}]`);
 	return res;
 }
@@ -1059,8 +1062,8 @@ async function resolve_bootstrap_content(content: string | BunFile): Promise<str
 
 type WebsocketAcceptReturn = object | boolean;
 type WebsocketHandlers = {
-	accept?: (req: Request) => WebsocketAcceptReturn | Promise<WebsocketAcceptReturn>,
-	message?: (ws: WebSocket, message: string) => void,
+	accept?: (req: Request, url: URL) => WebsocketAcceptReturn | Promise<WebsocketAcceptReturn>,
+	message?: (ws: WebSocket, message: string | Buffer) => void,
 	message_json?: (ws: WebSocket, message: JsonSerializable) => void,
 	open?: (ws: WebSocket) => void,
 	close?: (ws: WebSocket, code: number, reason: string) => void,
@@ -1347,10 +1350,10 @@ export function http_serve(port: number, hostname?: string) {
 		
 		/** Add a route to upgrade connections to websockets. */
 		websocket: (path: string, handlers: WebsocketHandlers): void => {
-			routes.push([path.split('/'), async (req: Request) => {
+			routes.push([path.split('/'), async (req: Request, url: URL) => {
 				let context_data = undefined;
 				if (handlers.accept) {
-					const res = await handlers.accept(req);
+					const res = await handlers.accept(req, url);
 					
 					if (typeof res === 'object') {
 						context_data = res;

package/tsconfig.json

@@ -16,8 +16,7 @@
 		"declaration": true,
 		"allowJs": true,
 		"types": [
-			"node",
-			"bun-types" // add Bun global
+			"bun"
 		]
 	}
 }