k99 0.7.0 → 0.8.0

package/index.cjs

@@ -1,6 +1,6 @@
 /*!
- * k99 v0.7.0
- * (c) 2019-2025 猛火Fierflame
+ * k99 v0.8.0
+ * (c) 2019-2026 猛火Fierflame
  * @license MIT
  */
 'use strict';
@@ -8,9 +8,10 @@
 /**
  *
  * @param {string} str
- * @returns {Uint8Array}
+ * @returns {Uint8Array<ArrayBuffer>}
  */
 function str2utf8bin(str) {
+	// @ts-ignore
 	return new TextEncoder().encode(str);
 }
 /**
@@ -49,26 +50,15 @@ async function write(writer, chunk) {
 	}
 }
 
-/**
- *
- * @param {any} k
- * @param {any} v
- * @returns {any}
- */
-function replacer(k, v) {
-	if (typeof v === 'bigint') {
-		return String(v);
-	}
-	return v;
-}
 
 /**
  *
  * @param {any} result
+ * @param {(this: any, key: string, value: any) => any} replacer
  * @param {Promise<never>} [aborted]
  * @returns {[BodyInit, number, string] | null}
  */
-function toBodyData(result, aborted) {
+function toBodyData(result, replacer, aborted) {
 	if (result instanceof ReadableStream) {
 		return [result, 0, ''];
 	}
@@ -82,11 +72,16 @@ function toBodyData(result, aborted) {
 		return [result, 0, ''];
 	}
 	if (ArrayBuffer.isView(result) || result instanceof ArrayBuffer) {
+		// @ts-ignore
 		return [result, result.byteLength, ''];
 	}
 	if (typeof result === 'string') {
 		const body = str2utf8bin(result);
-		return [body, body.byteLength, ''];
+		return [body, body.byteLength, 'text/plain'];
+	}
+	if (['bigint', 'boolean', 'number'].includes(typeof result)) {
+		const body = str2utf8bin(JSON.stringify(result, replacer));
+		return [body, body.byteLength, 'application/json'];
 	}
 	if (typeof result !== 'object') {
 		return null;
@@ -113,11 +108,12 @@ function toBodyData(result, aborted) {
  *
  * @param {any} result
  * @param {Headers} headers
+ * @param {(this: any, key: string, value: any) => any} replacer
  * @param {Promise<never>} [aborted]
  * @returns
  */
-function toBody(result, headers, aborted) {
-	const bodyData = toBodyData(result, aborted);
+function toBody(result, headers, replacer, aborted) {
+	const bodyData = toBodyData(result, replacer, aborted);
 	if (!bodyData) { return null; }
 	const [body, size, type] = bodyData;
 	if (type && !headers.get('Content-Type')) {
@@ -211,7 +207,7 @@ function clearCookie(
 	}
 }
 
-/** @import { Context, Cookie, CookieOption, FindHandler, Method, Options, Params, Service } from './types' */
+/** @import { Context, Cookie, CookieOption, FindHandler, HandlerResult, Method, Options, Params, Service } from './types' */
 
 
 const noBodyMethods = new Set(['GET', 'OPTIONS']);
@@ -264,6 +260,18 @@ function getMethod(request, toMethod) {
 	}
 	return /** @type {Method} */(methodStr.toUpperCase());
 }
+/**
+ *
+ * @param {any} k
+ * @param {any} v
+ * @returns {any}
+ */
+function defaultReplacer(k, v) {
+	if (typeof v === 'bigint') {
+		return String(v);
+	}
+	return v;
+}
 /**
  *
  * @param {Request} request
@@ -271,10 +279,15 @@ function getMethod(request, toMethod) {
  * @param {Options} [options]
  * @returns {Promise<Response | null>}
  */
-function main(
-	request, getHandler,
-	{ runner, error: echoError, catch: catchError, method: toMethod, environment } = {},
-) {
+function main(request, getHandler, {
+	runner,
+	error: echoError,
+	catch: catchError,
+	method: toMethod,
+	environment,
+	replacer: JSONReplacer,
+} = {}) {
+	const replacer = typeof JSONReplacer === 'function' ? JSONReplacer : defaultReplacer;
 	/**
 	 *
 	 * @param {Request} request
@@ -298,12 +311,12 @@ function main(
 		/** @type {any} */
 		let error = null;
 
-		let resolve = () => {};
+		let resolve = () => { };
 		/** @type {(error: unknown) => void} */
-		let reject = () => {};
+		let reject = () => { };
 		/** @type {Promise<void>} */
 		const donePromise = new Promise((a, b) => { resolve = a; reject = b; });
-		donePromise.catch(() => {});
+		donePromise.catch(() => { });
 
 		/** @type {Params} */
 		let params = {};
@@ -321,7 +334,7 @@ function main(
 				if (!data || noBodyMethods.has(method.toUpperCase())) {
 					return exec(new Request(fetchUrl, { method, headers, signal }), context);
 				}
-				const body = toBody(data, headers);
+				const body = toBody(data, headers, replacer);
 				return exec(new Request(fetchUrl, { method, headers, signal, body }), context);
 			},
 			done(onfulfilled, onrejected) {
@@ -366,7 +379,7 @@ function main(
 			set responseType(type) { setHeader(responseHeaders, 'content-type', type); },
 			getCookie(name) { return getCookie(sentCookies, name); },
 			setCookie(name, value, { expire, domain, path, secure, httpOnly } = {}) {
-				sentCookies.push({name, value, expire, domain, path, secure, httpOnly});
+				sentCookies.push({ name, value, expire, domain, path, secure, httpOnly });
 				setCookiesHeader(responseHeaders, sentCookies);
 			},
 			/**
@@ -384,16 +397,22 @@ function main(
 			return Promise.race([
 				aborted,
 				Promise.resolve().then(() => getHandler(context, v => { params = v; })),
-			]).then(handler => handler ? Promise.race([aborted, handler(context)]).then(result => {
-				if (result instanceof Response) {
-					return result;
+			]).then(async handlers => {
+				const allHandlers = [handlers].flat().filter(h => typeof h === 'function');
+				if (!allHandlers.length) { return null; }
+				/** @type {HandlerResult?} */
+				let result;
+				for (const handle of allHandlers) {
+					result = await Promise.race([aborted, handle(context)]);
+					if (result !== undefined) { break; }
 				}
+				if (result instanceof Response) { return result; }
 				const headers = new Headers(context.responseHeaders);
 				const { status } = context;
 				if (!result) { return new Response(null, { status, headers }); }
-				const body = toBody(result, headers, aborted);
+				const body = toBody(result, headers, replacer, aborted);
 				return new Response(body, { status, headers });
-			}) : null).then(response => {
+			}).then(response => {
 				destroyed = true;
 				resolve();
 				return response;
@@ -421,12 +440,12 @@ function make(getHandler, options) {
 	return r => main(r, getHandler, options);
 }
 
-/** @import { Context, Handler } from './main/types' */
+/** @import { Context, Handler, HandlerResult } from './main/types' */
 /**
  *
  * @param {Context} context
  * @param {Handler[]} handlers
- * @returns {Promise<string | boolean | object | undefined>}
+ * @returns {Promise<HandlerResult>}
  */
 async function runHandles(context, handlers) {
 	for (const handle of handlers) {
@@ -628,9 +647,11 @@ function storeService(destroy, exec, options) {
 /** @import { Onionskin } from './onionskin.mjs' */
 /**
  * @callback Packer
- * @param {Handler} handler
- * @returns {Handler}
+ * @param {Handler | Handler[]} handler
+ * @returns {Handler | Handler[]}
  */
+
+
 /** @type {Packer} */
 const noop$1 = h => h;
 /**
@@ -642,7 +663,7 @@ const noop$1 = h => h;
 function packer(onionskin, packer = noop$1) {
 	return h => {
 		const handler = packer(h);
-		return async (ctx) => onionskin(ctx, async () => handler(ctx));
+		return async (ctx) => onionskin(ctx, async () => runHandles(ctx, [handler].flat()));
 	};
 }
 
@@ -655,7 +676,7 @@ function packer(onionskin, packer = noop$1) {
  * @returns {PromiseLike<boolean | Handler | void> | boolean | Handler | void}
  */
 /**
- * @typedef {[Handler | Router, Record<string | symbol, any>, string[]]} FindItem
+ * @typedef {[Handler | Handler[] | Router, Record<string | symbol, any>, string[]]} FindItem
  */
 /**
  * @callback Finder
@@ -666,55 +687,6 @@ function packer(onionskin, packer = noop$1) {
  * @returns {AsyncIterable<FindItem> | Iterable<FindItem>}
  */
 
-/**
- * 
- * @param {Set<Guard>} guards 
- * @param {Context} ctx 
- * @param {(v: any) => void} setParams 
- * @param {object} params 
- * @returns {Promise<boolean | Handler>}
- */
-async function execGuard(guards, ctx, setParams, params) {
-	if (!guards.size) { return true; }
-	setParams(params);
-	for (const guard of guards) {
-		if (ctx.destroyed) { return false; }
-		const ret = await guard(Object.create(ctx, {
-			params: { value: { ...params } },
-		}));
-		if (ret === false) { return false; }
-		// @ts-ignore
-		if (typeof ret === 'function') { return ret; }
-	}
-	return true;
-}
-
-/**
- * 
- * @param {Router | Handler} route 
- * @param {string[]} path 
- * @param {Context} ctx 
- * @param {(v: Params) => void} setParams 
- * @param {Params} params 
- * @returns {Promise<Handler | null>}
- */
-async function find(route, path, ctx, setParams, params) {
-	if (!(route instanceof Router)) {
-		setParams(params);
-		return route;
-	}
-	if (route.disabled) { return null; }
-	const guardResult = await execGuard(route.guards, ctx, setParams, params);
-	if (!guardResult) { return null; }
-	if (typeof guardResult === 'function') { return guardResult; }
-	if (ctx.destroyed) { return null; }
-	for await (const [r, result, p] of route.find(ctx.method, path, ctx)) {
-		if (ctx.destroyed) { return null; }
-		const res = await find(r, p, ctx, setParams, { ...params, ...result });
-		if (res) { return route.__onionskin(res); }
-	}
-	return null;
-}
 
 /**
  * 
@@ -733,6 +705,29 @@ function uriDecode(t) {
  */
 class Router {
 	disabled = false;
+	/**
+	 * 
+	 * @param {Router | Handler[] | Handler} route 
+	 * @param {string[]} path 
+	 * @param {Context} ctx 
+	 * @param {(v: Params) => void} setParams 
+	 * @param {Params} params 
+	 * @returns {Promise<Handler[] | null>}
+	 */
+	static async #find(route, path, ctx, setParams, params) {
+		if (!(route instanceof Router)) {
+			setParams(params);
+			return [route].flat();
+		}
+		if (route.disabled) { return null; }
+		if (ctx.destroyed) { return null; }
+		for await (const [r, result, p] of route.find(ctx.method, path, ctx)) {
+			if (ctx.destroyed) { return null; }
+			const res = await Router.#find(r, p, ctx, setParams, { ...params, ...result });
+			if (res) { return [route.#guards, route.#onionskin(res)].flat(); }
+		}
+		return null;
+	}
 	/**
 	 * @abstract
 	 * @param {Method} method 
@@ -751,13 +746,28 @@ class Router {
 			const list = routers.flat();
 			const path = ctx.url.pathname.split('/').filter(Boolean).map(uriDecode);
 			for (const route of list) {
-				const res = await find(route, path, ctx, setParams, {});
+				const res = await Router.#find(route, path, ctx, setParams, {});
 				if (res) { return res; }
 			}
 			return null;
 		};
 	}
 
+
+	/** @type {Handler[]} */
+	#guards = [];
+	/**
+	 * 
+	 * @param  {...Handler | Handler[]} guards 
+	 */
+	guard(...guards) {
+		const list =this.#guards;
+		for (const guard of guards.flat()) {
+			if (typeof guard !== 'function') { continue; }
+			list.push(guard);
+		}
+	}
+
 	/**
 	 * 
 	 * @param {Finder} find 
@@ -768,16 +778,14 @@ class Router {
 			'find': { configurable: true, value: find, writable: true },
 		});
 	}
-	/** @readonly @type {Set<Guard>} */
-	guards = new Set();
 	/**
 	 * 
-	 * @param {Handler} h 
-	 * @returns {Handler}
+	 * @param {Handler | Handler[]} h 
+	 * @returns {Handler | Handler[]}
 	 */
-	__onionskin = (h) => h;
+	#onionskin = (h) => h;
 	/** @param {Onionskin} os */
-	onionskin(os) { this.__onionskin = packer(os, this.__onionskin); }
+	onionskin(os) { this.#onionskin = packer(os, this.#onionskin); }
 }
 
 /** @import { Match } from './index.mjs' */
@@ -943,6 +951,7 @@ function toMatch(path, end) {
 								optional: modifier === '?' || modifier === '*',
 								many: modifier === '+' || modifier === '*',
 							});
+							continue;
 						}
 					}
 				}
@@ -974,7 +983,7 @@ function toMatch(path, end) {
  */
 function bind(routes, methods, match, handlers) {
 	/** @type {Route} */
-	const route = { match, methods, handler: ctx => runHandles(ctx, handlers) };
+	const route = { match, methods, handlers: handlers };
 	routes.push(route);
 	let removed = false;
 	return () => {
@@ -1056,8 +1065,7 @@ function getMethods(methods) {
  * @typedef {object} Route
  * @property {Match} [match] 路径匹配
  * @property {null} [router]
- * @property {string} [plugin] 所属插件
- * @property {Handler} handler 处理函数
+ * @property {Handler[]} handlers 处理函数
  * @property {Set<Method>} methods 方法列表
  */
 
@@ -1144,14 +1152,14 @@ class ApiRouter extends Router {
 			const {match} = route;
 			if (!match) {
 				if (route.router || !path.length) {
-					yield [route.router || route.handler, {}, path];
+					yield [route.router || route.handlers, {}, path];
 				}
 				continue;
 			}
 			if (!path.length) { continue; }
 			const result = match(path);
 			if (!result) { continue; }
-			yield [route.router || route.handler, ...result];
+			yield [route.router || route.handlers, ...result];
 		}
 	}
 	/**
@@ -1179,25 +1187,25 @@ class ApiRouter extends Router {
 	/**
 	 * @param {Method | Iterable<Method> | ArrayLike<Method>} methods
 	 * @param {string| Handler} [path]
-	 * @param {Handler} [handler]
+	 * @param {...Handler} handler
 	 * @returns {Binder | (() => void)}
 	 */
-	verb(methods, path, handler) {
+	verb(methods, path, ...handler) {
 		const allMethods = getMethods(methods);
 		if (!allMethods.length) { return () => {}; }
-		return verb(this.#routes, allMethods, [path, handler]);
+		return verb(this.#routes, allMethods, [path, ...handler]);
 	}
 	/**
 	 * 注册 HTTP GET/POST/PUT/DELETE 处理函数
 	 * @overload
-	 * @param {Handler} handler 要注册的处理函数
+	 * @param {...Handler} handlers 要注册的处理函数
 	 * @returns {() => void}
 	 */
 	/**
 	 * 注册处理函数
 	 * @overload
 	 * @param {string} path 要注册的路径
-	 * @param {Handler} handler 要注册的处理函数
+	 * @param {...Handler} handlers 要注册的处理函数
 	 * @returns {() => void}
 	 */
 	/**
@@ -1223,14 +1231,14 @@ class ApiRouter extends Router {
 	/**
 	 * 注册 HTTP GET 处理函数
 	 * @overload
-	 * @param {Handler} handler 要注册的处理函数
+	 * @param {...Handler} handlers 要注册的处理函数
 	 * @returns {() => void}
 	 */
 	/**
 	 * 注册 HTTP GET 处理函数
 	 * @overload
 	 * @param {string} path 要注册的路径
-	 * @param {Handler} handler 要注册的处理函数
+	 * @param {...Handler} handlers 要注册的处理函数
 	 * @returns {() => void}
 	 */
 	/**
@@ -1254,14 +1262,14 @@ class ApiRouter extends Router {
 	/**
 	 * 注册 HTTP POST 处理函数
 	 * @overload
-	 * @param {Handler} handler 要注册的处理函数
+	 * @param {...Handler} handlers 要注册的处理函数
 	 * @returns {() => void}
 	 */
 	/**
 	 * 注册 HTTP POST 处理函数
 	 * @overload
 	 * @param {string} path 要注册的路径
-	 * @param {Handler} handler 要注册的处理函数
+	 * @param {...Handler} handlers 要注册的处理函数
 	 * @returns {() => void}
 	 */
 	/**
@@ -1285,14 +1293,14 @@ class ApiRouter extends Router {
 	/**
 	 * 注册 HTTP PUT 处理函数
 	 * @overload
-	 * @param {Handler} handler 要注册的处理函数
+	 * @param {...Handler} handlers 要注册的处理函数
 	 * @returns {() => void}
 	 */
 	/**
 	 * 注册 HTTP PUT 处理函数
 	 * @overload
 	 * @param {string} path 要注册的路径
-	 * @param {Handler} handler 要注册的处理函数
+	 * @param {...Handler} handlers 要注册的处理函数
 	 * @returns {() => void}
 	 */
 	/**
@@ -1316,14 +1324,14 @@ class ApiRouter extends Router {
 	/**
 	 * 注册 HTTP DELETE 处理函数
 	 * @overload
-	 * @param {Handler} handler 要注册的处理函数
+	 * @param {...Handler} handlers 要注册的处理函数
 	 * @returns {() => void}
 	 */
 	/**
 	 * 注册 HTTP DELETE 处理函数
 	 * @overload
 	 * @param {string} path 要注册的路径
-	 * @param {Handler} handler 要注册的处理函数
+	 * @param {...Handler} handlers 要注册的处理函数
 	 * @returns {() => void}
 	 */
 	/**
@@ -1347,14 +1355,14 @@ class ApiRouter extends Router {
 	/**
 	 * 注册 HTTP HEAD 处理函数
 	 * @overload
-	 * @param {Handler} handler 要注册的处理函数
+	 * @param {...Handler} handlers 要注册的处理函数
 	 * @returns {() => void}
 	 */
 	/**
 	 * 注册 HTTP HEAD 处理函数
 	 * @overload
 	 * @param {string} path 要注册的路径
-	 * @param {Handler} handler 要注册的处理函数
+	 * @param {...Handler} handlers 要注册的处理函数
 	 * @returns {() => void}
 	 */
 	/**
@@ -1378,14 +1386,14 @@ class ApiRouter extends Router {
 	/**
 	 * 注册 HTTP OPTIONS 处理函数
 	 * @overload
-	 * @param {Handler} handler 要注册的处理函数
+	 * @param {...Handler} handlers 要注册的处理函数
 	 * @returns {() => void}
 	 */
 	/**
 	 * 注册 HTTP OPTIONS 处理函数
 	 * @overload
 	 * @param {string} path 要注册的路径
-	 * @param {Handler} handler 要注册的处理函数
+	 * @param {...Handler} handlers 要注册的处理函数
 	 * @returns {() => void}
 	 */
 	/**
@@ -1463,7 +1471,7 @@ class Param {
 	get pattern() { return this.#pattern; }
 	/**
 	 * 
-	 * @param {RegExp} pattern 
+	 * @param {RegExp?} [pattern] 
 	 */
 	constructor(pattern) {
 		this.#pattern = pattern;