spooder 3.2.0 → 3.2.2

package/README.md

@@ -613,6 +613,14 @@ server.dir('/content', './public/content', { index: 'index.html' });
 
 The above will serve `./public/content/index.html` when `/content` is requested.
 
+#### `server.stop(method: ServerStop)`
+
+The `stop` function allows you to stop the server. `method` is one of `ServerStop.IMMEDIATE` or `ServerStop.GRACEFUL`.
+
+`ServerStop.GRACEFUL` will stop accepting new requests and wait for all in-flight requests to complete before stopping the server. This is the default behavior.
+
+`ServerStop.IMMEDIATE` will immediately stop the server, terminating all in-flight requests.
+
 ---
 
 #### `route_location(redirect_url: string)`

package/package.json

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

package/src/api.d.ts

@@ -13,6 +13,13 @@ type DirOptions = {
 };
 /** Built-in route handler for redirecting to a different URL. */
 export declare function route_location(redirect_url: string): (req: Request, url: URL) => Response;
+export declare const ServerStop: {
+    /** Stops the server immediately, terminating in-flight requests. */
+    IMMEDIATE: number;
+    /** Stops the server after all in-flight requests have completed. */
+    GRACEFUL: number;
+};
+type ServerStop = typeof ServerStop[keyof typeof ServerStop];
 export declare function serve(port: number): {
     /** Register a handler for a specific route. */
     route: (path: string, handler: RequestHandler) => void;
@@ -24,5 +31,7 @@ export declare function serve(port: number): {
     handle: (status_code: number, handler: StatusCodeHandler) => void;
     /** Register a handler for uncaught errors. */
     error: (handler: ErrorHandler) => void;
+    /** Stops the server. */
+    stop: (method?: ServerStop) => void;
 };
 export {};

package/src/api.ts

@@ -98,6 +98,21 @@ function route_directory(route_path: string, dir: string, options: DirOptions):
 	};
 }
 
+export const ServerStop = {
+	/** Stops the server immediately, terminating in-flight requests. */
+	IMMEDIATE: 0,
+
+	/** Stops the server after all in-flight requests have completed. */
+	GRACEFUL: 1
+};
+
+type ServerStop = typeof ServerStop[keyof typeof ServerStop];
+
+function print_request_info(req: Request, res: Response, url: URL): Response {
+	console.log(`[${res.status}] ${req.method} ${url.pathname}`);
+	return res;
+}
+
 export function serve(port: number) {
 	const routes = new Map<string[], RequestHandler>();
 	const handlers = new Map<number, StatusCodeHandler>();
@@ -136,76 +151,74 @@ export function serve(port: number) {
 			const url = new URL(req.url);
 			let status_code = 200;
 
-			console.log(`${req.method} ${url.pathname}`);
+			try {
+				const route_array = url.pathname.split('/').filter(e => !(e === '..' || e === '.'));
+				let handler: RequestHandler | undefined;
 
-			const route_array = url.pathname.split('/').filter(e => !(e === '..' || e === '.'));
-			let handler: RequestHandler | undefined;
+				for (const [path, route_handler] of routes) {
+					const is_trailing_wildcard = path[path.length - 1] === '*';
+					if (!is_trailing_wildcard && path.length !== route_array.length)
+						continue;
 
-			for (const [path, route_handler] of routes) {
-				const is_trailing_wildcard = path[path.length - 1] === '*';
-				if (!is_trailing_wildcard && path.length !== route_array.length)
-					continue;
+					let match = true;
+					for (let i = 0; i < path.length; i++) {
+						const path_part = path[i];
 
-				let match = true;
-				for (let i = 0; i < path.length; i++) {
-					const path_part = path[i];
+						if (path_part === '*')
+							continue;
 
-					if (path_part === '*')
-						continue;
+						if (path_part.startsWith(':')) {
+							url.searchParams.append(path_part.slice(1), route_array[i]);
+							continue;
+						}
 
-					if (path_part.startsWith(':')) {
-						url.searchParams.append(path_part.slice(1), route_array[i]);
-						continue;
+						if (path_part !== route_array[i]) {
+							match = false;
+							break;
+						}
 					}
 
-					if (path_part !== route_array[i]) {
-						match = false;
+					if (match) {
+						handler = route_handler;
 						break;
 					}
 				}
 
-				if (match) {
-					handler = route_handler;
-					break;
+				// Check for a handler for the route.
+				if (handler !== undefined) {
+					const response = await resolve_handler(handler(req, url), status_code, true);
+					if (response instanceof Response)
+						return print_request_info(req, response, url);
+
+					// If the handler returned a status code, use that instead.
+					status_code = response;
+				} else {
+					status_code = 404;
 				}
-			}
 
-			// Check for a handler for the route.
-			if (handler !== undefined) {
-				const response = await resolve_handler(handler(req, url), status_code, true);
-				if (response instanceof Response)
-					return response;
+				// Fallback to checking for a handler for the status code.
+				const status_code_handler = handlers.get(status_code);
+				if (status_code_handler !== undefined) {
+					const response = await resolve_handler(status_code_handler(req), status_code);
+					if (response instanceof Response)
+						return print_request_info(req, response, url);
+				}
 
-				// If the handler returned a status code, use that instead.
-				status_code = response;
-			} else {
-				status_code = 404;
-			}
+				// Fallback to the default handler, if any.
+				if (default_handler !== undefined) {
+					const response = await resolve_handler(default_handler(req, status_code), status_code);
+					if (response instanceof Response)
+						return print_request_info(req, response, url);
+				}
 
-			// Fallback to checking for a handler for the status code.
-			const status_code_handler = handlers.get(status_code);
-			if (status_code_handler !== undefined) {
-				const response = await resolve_handler(status_code_handler(req), status_code);
-				if (response instanceof Response)
-					return response;
-			}
+				// Fallback to returning a basic response.
+				return print_request_info(req, new Response(http.STATUS_CODES[status_code], { status: status_code }), url);
+			} catch (e) {
+				if (error_handler !== undefined)
+					return print_request_info(req, error_handler(e as Error), url);
 
-			// Fallback to the default handler, if any.
-			if (default_handler !== undefined) {
-				const response = await resolve_handler(default_handler(req, status_code), status_code);
-				if (response instanceof Response)
-					return response;
+				return print_request_info(req, new Response(http.STATUS_CODES[500], { status: 500 }), url);
 			}
-
-			// Fallback to returning a basic response.
-			return new Response(http.STATUS_CODES[status_code], { status: status_code });
-		},
-
-		error(err: Error): Response {
-			if (error_handler !== undefined)
-				return error_handler(err);
-
-			return new Response(http.STATUS_CODES[500], { status: 500 });
 		}
 	});
 
@@ -238,6 +251,11 @@ export function serve(port: number) {
 		/** Register a handler for uncaught errors. */
 		error: (handler: ErrorHandler): void => {
 			error_handler = handler;
+		},
+
+		/** Stops the server. */
+		stop: (method: ServerStop = ServerStop.GRACEFUL): void => {
+			server.stop(method === ServerStop.IMMEDIATE);
 		}
 	}
 }