k99 0.6.0-beta.4 → 0.6.0

package/index.cjs

@@ -1,21 +1,21 @@
 /*!
- * k99 v0.6.0-beta.4
+ * k99 v0.6.0
  * (c) 2019-2024 猛火Fierflame
  * @license MIT
  */
 'use strict';
 
 /**
- * 
- * @param {string} str 
+ *
+ * @param {string} str
  * @returns {Uint8Array}
  */
 function str2utf8bin(str) {
 	return new TextEncoder().encode(str);
 }
 /**
- * 
- * @param {unknown} chunk 
+ *
+ * @param {unknown} chunk
  * @returns {chunk is ArrayBuffer | SharedArrayBuffer}
  */
 function isBufferSource(chunk) {
@@ -28,9 +28,9 @@ function isBufferSource(chunk) {
 	return false;
 }
 /**
- * 
+ *
  * @template T
- * @param {any} result 
+ * @param {any} result
  * @returns {result is Iterable<T> | AsyncIterable<T>}
  */
 function isIterable(result) {
@@ -39,7 +39,7 @@ function isIterable(result) {
 }
 /**
  * 向可写流中写入数据
- * @param {WritableStreamDefaultWriter<Uint8Array>} writer 
+ * @param {WritableStreamDefaultWriter<Uint8Array>} writer
  * @param {unknown} chunk 要写入的数据
  * @returns {Promise<void>}
  */
@@ -64,9 +64,9 @@ async function write(writer, chunk) {
 }
 
 /**
- * 
- * @param {any} k 
- * @param {any} v 
+ *
+ * @param {any} k
+ * @param {any} v
  * @returns {any}
  */
 function replacer(k, v) {
@@ -77,9 +77,9 @@ function replacer(k, v) {
 }
 
 /**
- * 
- * @param {any} result 
- * @param {Promise<never>} [aborted] 
+ *
+ * @param {any} result
+ * @param {Promise<never>} [aborted]
  * @returns {[BodyInit, number, string] | null}
  */
 function toBodyData(result, aborted) {
@@ -112,7 +112,7 @@ function toBodyData(result, aborted) {
 	/** @type {TransformStream<Uint8Array, Uint8Array>} */
 	const { writable, readable } = new TransformStream();
 	const writer = writable.getWriter();
-	aborted?.catch((e) => {
+	aborted?.catch(e => {
 		writable.abort(e || new DOMException('The user aborted a request.')).catch(() => {});
 	});
 	(async () => {
@@ -125,11 +125,11 @@ function toBodyData(result, aborted) {
 	return [readable, 0, ''];
 }
 /**
- * 
- * @param {any} result 
- * @param {Headers} headers 
- * @param {Promise<never>} [aborted] 
- * @returns 
+ *
+ * @param {any} result
+ * @param {Headers} headers
+ * @param {Promise<never>} [aborted]
+ * @returns
  */
 function toBody(result, headers, aborted) {
 	const bodyData = toBodyData(result, aborted);
@@ -145,9 +145,9 @@ function toBody(result, headers, aborted) {
 }
 
 /**
- * 
- * @param {import('./types').Cookie[]} sentCookies 
- * @param {string} [name] 
+ *
+ * @param {import('./types').Cookie[]} sentCookies
+ * @param {string} [name]
  * @returns {Iterable<import('./types').Cookie>}
  */
 function *getCookie(sentCookies, name) {
@@ -159,9 +159,9 @@ function *getCookie(sentCookies, name) {
 }
 
 /**
- * 
- * @param {Headers} headers 
- * @param {import('./types').Cookie[]} cookies 
+ *
+ * @param {Headers} headers
+ * @param {import('./types').Cookie[]} cookies
  * @returns {void}
  */
 function setCookiesHeader(headers, cookies) {
@@ -179,8 +179,8 @@ function setCookiesHeader(headers, cookies) {
 	}
 }
 /**
- * 
- * @param {string} cookie 
+ *
+ * @param {string} cookie
  * @returns {Record<string, string>}
  */
 function getRequestCookies(cookie) {
@@ -194,11 +194,11 @@ function getRequestCookies(cookie) {
 	return cookies;
 }
 /**
- * 
- * @param {import('./types').Cookie[]} sentCookies 
- * @param {Record<string, string>} cookies 
- * @param {string | import('./types').CookieOption} [name] 
- * @param {import('./types').CookieOption | boolean} [opt] 
+ *
+ * @param {import('./types').Cookie[]} sentCookies
+ * @param {Record<string, string>} cookies
+ * @param {string | import('./types').CookieOption} [name]
+ * @param {import('./types').CookieOption | boolean} [opt]
  * @returns {void}
  */
 function clearCookie(
@@ -227,8 +227,8 @@ function clearCookie(
 
 const noBodyMethods = new Set(['GET', 'OPTIONS']);
 /**
- * 
- * @param {AbortSignal} signal 
+ *
+ * @param {AbortSignal} signal
  * @returns {Promise<never>}
  */
 function signal2promise(signal) {
@@ -245,10 +245,10 @@ function signal2promise(signal) {
 }
 
 /**
- * 
- * @param {Headers} headers 
- * @param {string} name 
- * @param {string} [value] 
+ *
+ * @param {Headers} headers
+ * @param {string} name
+ * @param {string} [value]
  */
 function setHeader(headers, name, value) {
 	if (value) {
@@ -258,9 +258,9 @@ function setHeader(headers, name, value) {
 	}
 }
 /**
- * 
- * @param {Request} request 
- * @param {string | ((request: Request) => string)} [toMethod] 
+ *
+ * @param {Request} request
+ * @param {string | ((request: Request) => string)} [toMethod]
  * @returns {import('./types').Method}
  */
 function getMethod(request, toMethod) {
@@ -276,20 +276,20 @@ function getMethod(request, toMethod) {
 	return /** @type {import('./types').Method} */(methodStr.toUpperCase());
 }
 /**
- * 
- * @param {Request} request 
- * @param {import('./types').FindHandler} getHandler 
+ *
+ * @param {Request} request
+ * @param {import('./types').FindHandler} getHandler
  * @param {import('./types').Options} [options]
  * @returns {Promise<Response | null>}
  */
 function main(
 	request, getHandler,
-	{ runner, error: echoError, method: toMethod, environment } = {},
+	{ runner, error: echoError, catch: catchError, method: toMethod, environment } = {},
 ) {
 	/**
-	 * 
-	 * @param {Request} request 
-	 * @param {import('./types').Context} [parent] 
+	 *
+	 * @param {Request} request
+	 * @param {import('./types').Context} [parent]
 	 * @returns {Promise<Response | null>}
 	 */
 	function exec(request, parent) {
@@ -311,7 +311,7 @@ function main(
 
 		let resolve = () => {};
 		/** @type {(error: unknown) => void} */
-		let reject = (error) => {};
+		let reject = () => {};
 		/** @type {Promise<void>} */
 		const donePromise = new Promise((a, b) => { resolve = a; reject = b; });
 		donePromise.catch(() => {});
@@ -381,9 +381,9 @@ function main(
 				setCookiesHeader(responseHeaders, sentCookies);
 			},
 			/**
-			 * 
-			 * @param {string | import('./types').CookieOption} [name] 
-			 * @param {import('./types').CookieOption | boolean} [opt] 
+			 *
+			 * @param {string | import('./types').CookieOption} [name]
+			 * @param {import('./types').CookieOption | boolean} [opt]
 			 * @returns {void}
 			 */
 			clearCookie(name, opt) {
@@ -413,7 +413,7 @@ function main(
 				error = e || true;
 				reject(error);
 				return Promise.reject(e);
-			});
+			}).catch(catchError);
 		}
 		return runner ? runner(context, run) : run();
 	}
@@ -421,19 +421,19 @@ function main(
 }
 
 /**
- * 
- * @param {import('./main/types').FindHandler} getHandler 
- * @param {import('./main/types').Options} options 
+ *
+ * @param {import('./main/types').FindHandler} getHandler
+ * @param {import('./main/types').Options} options
  * @returns {(request: Request) => Promise<Response | null>}
  */
 function make(getHandler, options) {
-	return (r) => main(r, getHandler, options);
+	return r => main(r, getHandler, options);
 }
 
 /**
- * 
- * @param {import('./main/types').Context} context 
- * @param {import('./main/types').Handler[]} handlers 
+ *
+ * @param {import('./main/types').Context} context
+ * @param {import('./main/types').Handler[]} handlers
  * @returns {Promise<string | boolean | object | undefined>}
  */
 async function runHandles(context, handlers) {
@@ -446,8 +446,8 @@ async function runHandles(context, handlers) {
 }
 
 /**
- * 
- * @param  {...(import('./main/types').Handler | import('./main/types').Handler[])} handlers 
+ *
+ * @param  {...(import('./main/types').Handler | import('./main/types').Handler[])} handlers
  * @returns {import('./main/types').Handler}
  */
 function merge(...handlers) {
@@ -455,30 +455,30 @@ function merge(...handlers) {
 }
 
 /**
- * 
+ *
  * @template T
  * @template {any[]} P
  * @overload
- * @param {(ctx: import('./main/types').Context, ...p: P) => T} exec 
- * @param {((ctx: import('./main/types').Context, error?: unknown) => PromiseLike<void> | void)?} [destroy] 
- * @param {import('./main/types').Service.Options?} [options] 
+ * @param {(ctx: import('./main/types').Context, ...p: P) => T} exec
+ * @param {((ctx: import('./main/types').Context, error?: unknown) => PromiseLike<void> | void)?} [destroy]
+ * @param {import('./main/types').Service.Options?} [options]
  * @returns {import('./main/types').Service<T, P>}
  */
 /**
- * 
+ *
  * @template T
  * @template {any[]} P
  * @overload
- * @param {(ctx: import('./main/types').Context, ...p: P) => T} exec 
- * @param {import('./main/types').Service.Options?} [options] 
+ * @param {(ctx: import('./main/types').Context, ...p: P) => T} exec
+ * @param {import('./main/types').Service.Options?} [options]
  * @returns {import('./main/types').Service<T, P>}
  */
 /**
  * @template T
  * @template {any[]} P
- * @param {(ctx: import('./main/types').Context, ...p: P) => T} exec 
- * @param {((ctx: import('./main/types').Context, error?: unknown) => PromiseLike<void> | void) | import('./main/types').Service.Options | null} [destroy] 
- * @param {import('./main/types').Service.Options?} [options] 
+ * @param {(ctx: import('./main/types').Context, ...p: P) => T} exec
+ * @param {((ctx: import('./main/types').Context, error?: unknown) => PromiseLike<void> | void) | import('./main/types').Service.Options | null} [destroy]
+ * @param {import('./main/types').Service.Options?} [options]
  * @returns {import('./main/types').Service<T, P>}
  */
 function service(exec, destroy, options) {
@@ -502,38 +502,38 @@ function service(exec, destroy, options) {
 }
 
 /**
- * 
+ *
  * @template T
  * @overload
- * @param {(ctx: import('./main/types').Context) => T} init 
- * @param {import('./main/types').Service.Options} [options] 
+ * @param {(ctx: import('./main/types').Context) => T} init
+ * @param {import('./main/types').Service.Options} [options]
  * @returns {import('./main/types').StateService<T>}
  */
 /**
- * 
+ *
  * @template T
  * @overload
- * @param {(ctx: import('./main/types').Context) => T} init 
- * @param {((state: T | undefined, ctx: import('./main/types').Context, error?: unknown) => PromiseLike<void> | void)?} [destroy] 
- * @param {import('./main/types').Service.Options?} [options] 
+ * @param {(ctx: import('./main/types').Context) => T} init
+ * @param {((state: T | undefined, ctx: import('./main/types').Context, error?: unknown) => PromiseLike<void> | void)?} [destroy]
+ * @param {import('./main/types').Service.Options?} [options]
  * @returns {import('./main/types').StateService<T>}
  */
 /**
- * 
+ *
  * @template T
  * @overload
- * @param {(ctx: import('./main/types').Context) => T} init 
- * @param {((state: T | undefined, ctx: import('./main/types').Context, error?: unknown) => PromiseLike<void> | void)?} [destroy] 
- * @param {((state: T, ctx: import('./main/types').Context) => any)?} [exec] 
- * @param {import('./main/types').Service.Options?} [options] 
+ * @param {(ctx: import('./main/types').Context) => T} init
+ * @param {((state: T | undefined, ctx: import('./main/types').Context, error?: unknown) => PromiseLike<void> | void)?} [destroy]
+ * @param {((state: T, ctx: import('./main/types').Context) => any)?} [exec]
+ * @param {import('./main/types').Service.Options?} [options]
  * @returns {import('./main/types').StateService<T>}
  */
 /**
  * @template T
- * @param {(ctx: import('./main/types').Context) => T} init 
- * @param {((state: T | undefined, ctx: import('./main/types').Context, error?: unknown) => PromiseLike<void> | void) | import('./main/types').Service.Options | null} [destroy] 
- * @param {((state: T, ctx: import('./main/types').Context) => any) | import('./main/types').Service.Options | null} [exec] 
- * @param {import('./main/types').Service.Options?} [options] 
+ * @param {(ctx: import('./main/types').Context) => T} init
+ * @param {((state: T | undefined, ctx: import('./main/types').Context, error?: unknown) => PromiseLike<void> | void) | import('./main/types').Service.Options | null} [destroy]
+ * @param {((state: T, ctx: import('./main/types').Context) => any) | import('./main/types').Service.Options | null} [exec]
+ * @param {import('./main/types').Service.Options?} [options]
  * @returns {import('./main/types').StateService<T>}
  */
 function stateService(init, destroy, exec, options) {
@@ -562,34 +562,34 @@ function stateService(init, destroy, exec, options) {
 }
 
 /**
- * 
+ *
  * @template T
  * @overload
- * @param {import('./main/types').Service.Options?} [options] 
+ * @param {import('./main/types').Service.Options?} [options]
  * @returns {import('./main/types').StoreService<T>}
  */
 /**
- * 
+ *
  * @template T
  * @overload
- * @param {((state: T | undefined, ctx: import('./main/types').Context, error?: unknown) => PromiseLike<void> | void)?} [destroy] 
- * @param {import('./main/types').Service.Options?} [options] 
+ * @param {((state: T | undefined, ctx: import('./main/types').Context, error?: unknown) => PromiseLike<void> | void)?} [destroy]
+ * @param {import('./main/types').Service.Options?} [options]
  * @returns {import('./main/types').StoreService<T>}
  */
 /**
- * 
+ *
  * @template T
  * @overload
- * @param {((state: T | undefined, ctx: import('./main/types').Context, error?: unknown) => PromiseLike<void> | void)?} [destroy] 
- * @param {((state: T | undefined, ctx: import('./main/types').Context) => any)?} [exec] 
- * @param {import('./main/types').Service.Options?} [options] 
+ * @param {((state: T | undefined, ctx: import('./main/types').Context, error?: unknown) => PromiseLike<void> | void)?} [destroy]
+ * @param {((state: T | undefined, ctx: import('./main/types').Context) => any)?} [exec]
+ * @param {import('./main/types').Service.Options?} [options]
  * @returns {import('./main/types').StoreService<T>}
  */
 /**
  * @template T
- * @param {((state: T | undefined, ctx: import('./main/types').Context, error?: unknown) => PromiseLike<void> | void) | import('./main/types').Service.Options | null} [destroy] 
- * @param {((state: T | undefined, ctx: import('./main/types').Context) => any) | import('./main/types').Service.Options | null} [exec] 
- * @param {import('./main/types').Service.Options?} [options] 
+ * @param {((state: T | undefined, ctx: import('./main/types').Context, error?: unknown) => PromiseLike<void> | void) | import('./main/types').Service.Options | null} [destroy]
+ * @param {((state: T | undefined, ctx: import('./main/types').Context) => any) | import('./main/types').Service.Options | null} [exec]
+ * @param {import('./main/types').Service.Options?} [options]
  * @returns {import('./main/types').StoreService<T>}
  */
 function storeService(destroy, exec, options) {
@@ -631,18 +631,30 @@ function storeService(destroy, exec, options) {
 }
 
 /**
- * @callback Guard
- * @param {import('./main/types').Context} ctx
- * @returns {PromiseLike<boolean | import('./main/types').Handler | void> | boolean | import('./main/types').Handler | void}
+ * @callback Packer
+ * @param {import('./main/types').Handler} handler
+ * @returns {import('./main/types').Handler}
  */
+/** @type {Packer} */
+const noop$1 = h => h;
+/**
+ *
+ * @param {import('./onionskin.mjs').Onionskin} onionskin
+ * @param {Packer} [packer]
+ * @returns {Packer}
+ */
+function packer(onionskin, packer = noop$1) {
+	return h => {
+		const handler = packer(h);
+		return async (ctx) => onionskin(ctx, async () => handler(ctx));
+	};
+}
 
 /**
- * @callback Onionskin
+ * @callback Guard
  * @param {import('./main/types').Context} ctx
- * @param {() => Promise<import('./main/types').HandlerResult>} next
- * @returns {PromiseLike<import('./main/types').HandlerResult> | import('./main/types').HandlerResult}
+ * @returns {PromiseLike<boolean | import('./main/types').Handler | void> | boolean | import('./main/types').Handler | void}
  */
-
 /**
  * @typedef {[import('./main/types').Handler | Router, Record<string, any>, string[]]} FindItem
  */
@@ -753,7 +765,7 @@ class Router {
 	 * @returns {Router}
 	 */
 	static create(find) {
-		return Object.create(Router.prototype, {
+		return Object.defineProperties(new Router(), {
 			'find': { configurable: true, value: find, writable: true },
 		});
 	}
@@ -765,14 +777,8 @@ class Router {
 	 * @returns {import('./main/types').Handler}
 	 */
 	__onionskin = (h) => h;
-	/** @param {Onionskin} os */
-	onionskin(os) {
-		let run = this.__onionskin;
-		this.__onionskin = h => {
-			const h2 = run(h);
-			return async (ctx) => os(ctx, async () => h2(ctx));
-		};
-	}
+	/** @param {import('./onionskin.mjs').Onionskin} os */
+	onionskin(os) { this.__onionskin = packer(os, this.__onionskin); }
 }
 
 /**
@@ -785,8 +791,8 @@ class Router {
 
 const regex = /^:([a-zA-Z][a-zA-Z0-9]*)(?:\((.+)\))?([ius]+)?([?+*]?)$/;
 /**
- * 
- * @param {string} p 
+ *
+ * @param {string} p
  * @returns {Pattern | string}
  */
 function parse(p) {
@@ -843,10 +849,10 @@ function parse(p) {
 
 }
 /**
- * 
- * @param {(Pattern | string)[]} match 
- * @param {string[]} path 
- * @param {boolean} end 
+ *
+ * @param {(Pattern | string)[]} match
+ * @param {string[]} path
+ * @param {boolean} end
  * @returns {[Record<string, string | string[]>, string[]] | undefined}
  */
 function exec(match, path, end) {
@@ -874,9 +880,9 @@ function exec(match, path, end) {
 
 }
 /**
- * 
- * @param {string} path 
- * @param {boolean} end 
+ *
+ * @param {string} path
+ * @param {boolean} end
  * @returns {import('./index.mjs').Match | undefined}
  */
 function toMatch(path, end) {
@@ -891,11 +897,11 @@ function toMatch(path, end) {
 }
 
 /**
- * 
- * @param {(import('./index.mjs').Route | import('./index.mjs').RouterRoute)[]} routes 
- * @param {import('../main/types').Method[]} methods 
- * @param {string} path 
- * @param {import('../main/types').Handler} handler 
+ *
+ * @param {(import('./index.mjs').Route | import('./index.mjs').RouterRoute)[]} routes
+ * @param {import('../main/types').Method[]} methods
+ * @param {string} path
+ * @param {import('../main/types').Handler} handler
  * @returns {() => void}
  */
 function bind(routes, methods, path, handler) {
@@ -918,10 +924,10 @@ function bind(routes, methods, path, handler) {
 /** @type {(v: any) => v is import('../main/types').Handler} */
 const findHandler = v => typeof v === 'function';
 /**
- * 
- * @param {(import('./index.mjs').Route | import('./index.mjs').RouterRoute)[]} routes 
- * @param {import('../main/types').Method[]} methods 
- * @param {any[]} p 
+ *
+ * @param {(import('./index.mjs').Route | import('./index.mjs').RouterRoute)[]} routes
+ * @param {import('../main/types').Method[]} methods
+ * @param {any[]} p
  * @returns {import('./index.mjs').Binder | (() => void)}
  */
 function verb(routes, methods, p) {
@@ -943,14 +949,14 @@ function verb(routes, methods, p) {
 
 const methods = new Set(['GET', 'POST', 'PUT', 'DELETE', 'HEAD', 'OPTIONS']);
 /**
- * 
- * @param {any} v 
+ *
+ * @param {any} v
  * @returns {v is import('../main/types').Method}
  */
 function isMethod(v) { return methods.has(v); }
 /**
- * 
- * @param {import('../main/types').Method | Iterable<import('../main/types').Method> | ArrayLike<import('../main/types').Method>} [methods] 
+ *
+ * @param {import('../main/types').Method | Iterable<import('../main/types').Method> | ArrayLike<import('../main/types').Method>} [methods]
  * @returns {import('../main/types').Method[]}
  */
 function getMethods(methods) {
@@ -1000,10 +1006,10 @@ function getMethods(methods) {
  * @returns {T extends import('../Router.mjs').Finder ? Router : T}
  */
 /**
- * 
- * @param {(Route | RouterRoute)[]} routes 
- * @param {string} path 
- * @param {Router | import('../Router.mjs').Finder} [r] 
+ *
+ * @param {(Route | RouterRoute)[]} routes
+ * @param {string} path
+ * @param {Router | import('../Router.mjs').Finder} [r]
  * @returns {Router}
  */
 function bindRouter(routes, path, r) {
@@ -1058,10 +1064,10 @@ class ApiRouter extends Router {
 		return bindRouter(this.#routes, path, r);
 	}
 	/**
-	 * 
-	 * @param {import('../main/types').Method} method 
-	 * @param {string[]} path 
-	 * @param {import('../main/types').Context} ctx 
+	 *
+	 * @param {import('../main/types').Method} method
+	 * @param {string[]} path
+	 * @param {import('../main/types').Context} ctx
 	 * @returns {Iterable<import('../Router.mjs').FindItem>}
 	 */
 	*find(method, path, ctx) {
@@ -1103,7 +1109,7 @@ class ApiRouter extends Router {
 	 * @returns {Binder}
 	 */
 	/**
-	 * @param {import('../main/types').Method | Iterable<import('../main/types').Method> | ArrayLike<import('../main/types').Method>} methods 
+	 * @param {import('../main/types').Method | Iterable<import('../main/types').Method> | ArrayLike<import('../main/types').Method>} methods
 	 * @param {string| import('../main/types').Handler} [path]
 	 * @param {import('../main/types').Handler} [handler]
 	 * @returns {Binder | (() => void)}
@@ -1335,9 +1341,9 @@ class ApiRouter extends Router {
 }
 
 /**
- * 
- * @param {(request: Request) => Promise<Response | null>} run 
- * @param {((request: Request) => Response | Promise<Response>)?} [notFound] 
+ *
+ * @param {(request: Request) => Promise<Response | null>} run
+ * @param {((request: Request) => Response | Promise<Response>)?} [notFound]
  * @returns {(input: RequestInfo, init?: RequestInit) => Promise<Response>}
  */
 function createFetch(run, notFound) {
@@ -1357,12 +1363,37 @@ function createFetch(run, notFound) {
 	};
 }
 
+/**
+ * @callback Onionskin
+ * @param {import('./main/types').Context} ctx
+ * @param {() => Promise<import('./main/types').HandlerResult>} next
+ * @returns {PromiseLike<import('./main/types').HandlerResult> | import('./main/types').HandlerResult}
+ */
+
+const noop = () => {};
+/**
+ *
+ * @param  {...(Onionskin | Onionskin[])} handlers
+ * @returns {import('./main/types').Handler}
+ */
+function onionskin(...handlers) {
+	/** @type {import('./main/types').Handler} */
+	let handler = noop;
+	for (const os of handlers.flat()) {
+		const currentHandler = handler;
+		handler = async ctx => os(ctx, async () => currentHandler(ctx));
+	}
+	return handler;
+}
+
 exports.ApiRouter = ApiRouter;
 exports.Router = Router;
 exports.createFetch = createFetch;
 exports.main = main;
 exports.make = make;
 exports.merge = merge;
+exports.onionskin = onionskin;
+exports.packer = packer;
 exports.service = service;
 exports.stateService = stateService;
 exports.storeService = storeService;