k99 0.6.0-alpha.7 → 0.6.0-alpha.9

package/browser.cjs

@@ -1,5 +1,5 @@
 /*!
- * k99 v0.6.0-alpha.7
+ * k99 v0.6.0-alpha.9
  * (c) 2019-2023 猛火Fierflame
  * @license MIT
  */

package/browser.d.ts

@@ -1,5 +1,5 @@
 /*!
- * k99 v0.6.0-alpha.7
+ * k99 v0.6.0-alpha.9
  * (c) 2019-2023 猛火Fierflame
  * @license MIT
  */

package/browser.js

@@ -1,5 +1,5 @@
 /*!
- * k99 v0.6.0-alpha.7
+ * k99 v0.6.0-alpha.9
  * (c) 2019-2023 猛火Fierflame
  * @license MIT
  */

package/browser.min.js

@@ -1,5 +1,5 @@
 /*!
- * k99 v0.6.0-alpha.7
+ * k99 v0.6.0-alpha.9
  * (c) 2019-2023 猛火Fierflame
  * @license MIT
  */

package/browser.min.mjs

@@ -1,5 +1,5 @@
 /*!
- * k99 v0.6.0-alpha.7
+ * k99 v0.6.0-alpha.9
  * (c) 2019-2023 猛火Fierflame
  * @license MIT
  */

package/browser.mjs

@@ -1,5 +1,5 @@
 /*!
- * k99 v0.6.0-alpha.7
+ * k99 v0.6.0-alpha.9
  * (c) 2019-2023 猛火Fierflame
  * @license MIT
  */

package/cli/index.cjs

@@ -1,5 +1,5 @@
 /*!
- * k99 v0.6.0-alpha.7
+ * k99 v0.6.0-alpha.9
  * (c) 2019-2023 猛火Fierflame
  * @license MIT
  */
@@ -106,7 +106,7 @@ async function exec({
     cfg.dependencies = {};
   }
   if (!cfg.dependencies.k99) {
-    cfg.dependencies.k99 = '^0.6.0-alpha.7';
+    cfg.dependencies.k99 = '^0.6.0-alpha.9';
   }
   await fsPromise__namespace.writeFile('package.json', JSON.stringify(cfg, null, 2));
 }

package/cli/{index.d.ts → index.d.cts}

@@ -1,5 +1,5 @@
 /*!
- * k99 v0.6.0-alpha.7
+ * k99 v0.6.0-alpha.9
  * (c) 2019-2023 猛火Fierflame
  * @license MIT
  */
@@ -10,11 +10,7 @@ declare const name$3 = "socket";
 declare const explain$5 = "\u76D1\u542C\u7684\u672C\u5730\u5957\u63A5\u5B57";
 
 declare namespace listen {
-  export {
-    explain$5 as explain,
-    name$3 as name,
-    value$3 as value,
-  };
+  export { explain$5 as explain, name$3 as name, value$3 as value };
 }
 
 declare function value$2(...opts: string[]): string;
@@ -22,11 +18,7 @@ declare const name$2 = "path";
 declare const explain$4 = "\u73AF\u5883\u8DEF\u5F84";
 
 declare namespace path {
-  export {
-    explain$4 as explain,
-    name$2 as name,
-    value$2 as value,
-  };
+  export { explain$4 as explain, name$2 as name, value$2 as value };
 }
 
 declare function value$1(...opts: string[]): number | undefined;
@@ -34,11 +26,7 @@ declare const name$1 = "port";
 declare const explain$3 = "\u76D1\u542C\u7684\u7F51\u7EDC\u7AEF\u53E3\u53F7";
 
 declare namespace port {
-  export {
-    explain$3 as explain,
-    name$1 as name,
-    value$1 as value,
-  };
+  export { explain$3 as explain, name$1 as name, value$1 as value };
 }
 
 declare function value(...opts: string[]): string;
@@ -48,11 +36,7 @@ declare const explain$2 = "\u7ED1\u5B9A\u7684 IP";
 declare const bind_name: typeof name;
 declare const bind_value: typeof value;
 declare namespace bind {
-  export {
-    explain$2 as explain,
-    bind_name as name,
-    bind_value as value,
-  };
+  export { explain$2 as explain, bind_name as name, bind_value as value };
 }
 
 type List = keyof typeof opt;
@@ -71,13 +55,7 @@ declare const explain$1 = "\u542F\u52A8\u670D\u52A1\u5668";
 declare function help$1(...argv: string[]): Promise<void>;
 
 declare namespace start {
-  export {
-    argv$1 as argv,
-    exec$1 as exec,
-    explain$1 as explain,
-    help$1 as help,
-    opts$1 as opts,
-  };
+  export { argv$1 as argv, exec$1 as exec, explain$1 as explain, help$1 as help, opts$1 as opts };
 }
 
 declare function exec({ path }: opt, ...args: string[]): Promise<void>;
@@ -92,13 +70,7 @@ declare const init_explain: typeof explain;
 declare const init_help: typeof help;
 declare const init_opts: typeof opts;
 declare namespace init {
-  export {
-    init_argv as argv,
-    init_exec as exec,
-    init_explain as explain,
-    init_help as help,
-    init_opts as opts,
-  };
+  export { init_argv as argv, init_exec as exec, init_explain as explain, init_help as help, init_opts as opts };
 }
 
 declare const _default: {

package/cli.cjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /*!
- * k99 v0.6.0-alpha.7
+ * k99 v0.6.0-alpha.9
  * (c) 2019-2023 猛火Fierflame
  * @license MIT
  */

package/index.cjs

@@ -1,5 +1,5 @@
 /*!
- * k99 v0.6.0-alpha.7
+ * k99 v0.6.0-alpha.9
  * (c) 2019-2023 猛火Fierflame
  * @license MIT
  */
@@ -373,6 +373,7 @@ function createWrite() {
       abortReject = reject;
     }
   });
+  abortedPromise.then(null, () => {});
   function abort(e) {
     if (abortException) {
       return false;
@@ -889,67 +890,70 @@ function signal2promise(signal) {
     });
   });
 }
-function main(req, getHandler, environment, parent) {
+function main(req, getHandler, environment, runner, parent) {
   const aborted = signal2promise(req.signal);
   const {
     context,
     setParams,
     destroy,
     sendHeaders
-  } = createContext(req, opt => main(createRequest(opt), getHandler, environment, context), environment, parent);
-  return Promise.race([aborted, Promise.resolve().then(() => getHandler(context, setParams))]).then(handler => new Promise(resolve => {
-    if (!handler) {
-      destroy();
-      return resolve(null);
-    }
-    const [writable, readable, abortResponse] = createWrite();
-    aborted.catch(e => abortResponse(e));
-    function send() {
-      if (!sendHeaders()) {
-        return;
+  } = createContext(req, opt => main(createRequest(opt), getHandler, environment, runner, context), environment, parent);
+  function run() {
+    return Promise.race([aborted, Promise.resolve().then(() => getHandler(context, setParams))]).then(handler => new Promise(resolve => {
+      if (!handler) {
+        destroy();
+        return resolve(null);
       }
-      const {
-        status
-      } = context;
-      resolve({
-        ...readable,
-        get status() {
-          return status;
-        },
+      const [writable, readable, abortResponse] = createWrite();
+      aborted.catch(e => abortResponse(e));
+      function send() {
+        if (!sendHeaders()) {
+          return;
+        }
+        const {
+          status
+        } = context;
+        resolve({
+          ...readable,
+          get status() {
+            return status;
+          },
+          get finished() {
+            return writable.ended;
+          },
+          headers: Object.freeze(context.getHeaders()),
+          [Symbol.asyncIterator]() {
+            return readable;
+          }
+        });
+      }
+      const contextS = {
         get finished() {
           return writable.ended;
         },
-        headers: Object.freeze(context.getHeaders()),
-        [Symbol.asyncIterator]() {
-          return readable;
+        write(chunk) {
+          send();
+          return writable.write(chunk);
         }
-      });
-    }
-    const contextS = {
-      get finished() {
-        return writable.ended;
-      },
-      write(chunk) {
+      };
+      const actionContext = Object.create(context, Object.getOwnPropertyDescriptors(contextS));
+      Promise.race([aborted, runHandle(actionContext, handler)]).then(() => {
         send();
-        return writable.write(chunk);
-      }
-    };
-    const actionContext = Object.create(context, Object.getOwnPropertyDescriptors(contextS));
-    Promise.race([aborted, runHandle(actionContext, handler)]).then(() => {
-      send();
-      destroy();
-      writable.end();
-    }, e => {
-      context.status = 500;
-      send();
-      abortResponse(e);
+        destroy();
+        writable.end();
+      }, e => {
+        context.status = 500;
+        send();
+        abortResponse(e);
+        destroy(e || true);
+        writable.end();
+      });
+    }), e => {
       destroy(e || true);
-      writable.end();
+      return Promise.reject(e);
     });
-  }), e => {
-    destroy(e || true);
-    return Promise.reject(e);
-  });
+  }
+  return runner ? runner(context, run) : run();
 }
 
 async function defaultRead$2() {
@@ -1138,12 +1142,12 @@ function createEnvironment(options) {
 
 function run(req, getHandler, options) {
   const environment = createEnvironment(options);
-  return main(req, getHandler, environment);
+  return main(req, getHandler, environment, options?.runner);
 }
 
 function make(getHandler, options) {
   const environment = createEnvironment(options);
-  return r => main(r, getHandler, environment);
+  return r => main(r, getHandler, environment, options?.runner);
 }
 
 async function runHandles(context, handlers) {
@@ -1531,6 +1535,28 @@ class ApiRouter extends Router {
    * @param router 要注册的子路由
    */
 
+  /**
+   * 添加子路由
+   * @param path   要注册的路径
+   * @param router 要注册的子路由
+   */
+
+  /**
+   * 添加子路由
+   * @param path   要注册的路径
+   */
+
+  /**
+   * 添加子路由
+   * @param find 要注册的子路由的 Finder
+   */
+
+  /**
+   * 添加子路由
+   * @param path 要注册的路径
+   * @param find 要注册的子路由的 Finder
+   */
+
   route(...p) {
     const [a] = p;
     if (a && typeof a === 'object' && !(a instanceof Router)) {
@@ -1571,6 +1597,19 @@ class ApiRouter extends Router {
    * @param handler 要注册的处理函数
    */
 
+  /**
+   * 注册处理函数
+   * @param method  要注册的方法
+   * @param path    要注册的路径
+   * @param handler 要注册的处理函数
+   */
+
+  /**
+   * 注册处理函数
+   * @param method 要注册的方法
+   * @param path   要注册的路径
+   */
+
   verb(methods, path, handler) {
     const allMethods = getMethods(methods);
     if (!allMethods.length) {
@@ -1583,6 +1622,22 @@ class ApiRouter extends Router {
    * @param handler 要注册的处理函数
    */
 
+  /**
+   * 注册处理函数
+   * @param path    要注册的路径
+   * @param handler 要注册的处理函数
+   */
+
+  /**
+   * 注册 HTTP GET/POST/PUT/DELETE 处理函数
+   * @param path 要注册的路径
+   */
+
+  /**
+   * 注册 HTTP GET/POST/PUT/DELETE 处理函数
+   * @param path 要注册的路径
+   */
+
   match(...p) {
     return verb(this.#routes, ['GET', 'POST', 'PUT', 'DELETE'], p);
   }
@@ -1591,6 +1646,22 @@ class ApiRouter extends Router {
    * @param handler 要注册的处理函数
    */
 
+  /**
+   * 注册 HTTP GET 处理函数
+   * @param path    要注册的路径
+   * @param handler 要注册的处理函数
+   */
+
+  /**
+   * 注册 HTTP GET 处理函数
+   * @param path 要注册的路径
+   */
+
+  /**
+   * 注册 HTTP GET 处理函数
+   * @param path 要注册的路径
+   */
+
   get(...p) {
     return verb(this.#routes, ['GET'], p);
   }
@@ -1599,6 +1670,22 @@ class ApiRouter extends Router {
    * @param handler 要注册的处理函数
    */
 
+  /**
+   * 注册 HTTP POST 处理函数
+   * @param path    要注册的路径
+   * @param handler 要注册的处理函数
+   */
+
+  /**
+   * 注册 HTTP POST 处理函数
+   * @param path 要注册的路径
+   */
+
+  /**
+   * 注册 HTTP POST 处理函数
+   * @param path 要注册的路径
+   */
+
   post(...p) {
     return verb(this.#routes, ['POST'], p);
   }
@@ -1607,6 +1694,22 @@ class ApiRouter extends Router {
    * @param handler 要注册的处理函数
    */
 
+  /**
+   * 注册 HTTP PUT 处理函数
+   * @param path    要注册的路径
+   * @param handler 要注册的处理函数
+   */
+
+  /**
+   * 注册 HTTP PUT 处理函数
+   * @param path 要注册的路径
+   */
+
+  /**
+   * 注册 HTTP PUT 处理函数
+   * @param path 要注册的路径
+   */
+
   put(...p) {
     return verb(this.#routes, ['PUT'], p);
   }
@@ -1615,6 +1718,22 @@ class ApiRouter extends Router {
    * @param handler 要注册的处理函数
    */
 
+  /**
+   * 注册 HTTP DELETE 处理函数
+   * @param path    要注册的路径
+   * @param handler 要注册的处理函数
+   */
+
+  /**
+   * 注册 HTTP DELETE 处理函数
+   * @param path 要注册的路径
+   */
+
+  /**
+   * 注册 HTTP DELETE 处理函数
+   * @param path 要注册的路径
+   */
+
   delete(...p) {
     return verb(this.#routes, ['DELETE'], p);
   }
@@ -1623,6 +1742,22 @@ class ApiRouter extends Router {
    * @param handler 要注册的处理函数
    */
 
+  /**
+   * 注册 HTTP HEAD 处理函数
+   * @param path    要注册的路径
+   * @param handler 要注册的处理函数
+   */
+
+  /**
+   * 注册 HTTP HEAD 处理函数
+   * @param path 要注册的路径
+   */
+
+  /**
+   * 注册 HTTP HEAD 处理函数
+   * @param path 要注册的路径
+   */
+
   head(...p) {
     return verb(this.#routes, ['HEAD'], p);
   }
@@ -1631,6 +1766,22 @@ class ApiRouter extends Router {
    * @param handler 要注册的处理函数
    */
 
+  /**
+   * 注册 HTTP OPTIONS 处理函数
+   * @param path    要注册的路径
+   * @param handler 要注册的处理函数
+   */
+
+  /**
+   * 注册 HTTP OPTIONS 处理函数
+   * @param path 要注册的路径
+   */
+
+  /**
+   * 注册 HTTP OPTIONS 处理函数
+   * @param path 要注册的路径
+   */
+
   options(...p) {
     return verb(this.#routes, ['OPTIONS'], p);
   }
@@ -1645,7 +1796,8 @@ class Plugin {
     router,
     setting,
     asset,
-    log
+    log,
+    runner
   } = {}) {
     const routers = [];
     for (const plugin of Object.values(plugins)) {
@@ -1657,7 +1809,8 @@ class Plugin {
     return make(Router.make(routers), {
       setting,
       asset: Plugin.bindAsset(asset, plugins),
-      log
+      log,
+      runner
     });
   }
   static bindAsset(api, plugins, pluginPath = 'plugins') {
@@ -1700,6 +1853,12 @@ class Plugin {
 
   /** 包名 */
 
+  /** 版本 */
+
+  /** 作者 */
+
+  /** 开源协议 */
+
   constructor(name, /** 版本 */
   version, {
     author,

package/index.d.ts

@@ -1,5 +1,5 @@
 /*!
- * k99 v0.6.0-alpha.7
+ * k99 v0.6.0-alpha.9
  * (c) 2019-2023 猛火Fierflame
  * @license MIT
  */
@@ -216,6 +216,8 @@ declare namespace Service {
         readonly rootOnly?: boolean;
     }
 }
+type StoreService<T> = Service<T | undefined, T, [s?: T]>;
+type StateService<T> = Service<T, T, []>;
 interface Context {
     readonly environment?: Environment;
     /** 当前的路由 */
@@ -338,6 +340,10 @@ interface Handler {
     plugin?: string;
 }
 
+interface Runner {
+    (context: Context, run: () => Promise<K99Response | null>): Promise<K99Response | null>;
+}
+
 interface Guard {
     (ctx: Context): PromiseLike<boolean | Handler | void> | boolean | Handler | void;
 }
@@ -347,7 +353,7 @@ type FindItem = [
     string[]
 ];
 interface Finder {
-    (method: Method, path: string[]): AsyncIterable<FindItem> | Iterable<FindItem>;
+    (this: Router, method: Method, path: string[]): AsyncIterable<FindItem> | Iterable<FindItem>;
 }
 declare abstract class Router {
     disabled: boolean;
@@ -364,14 +370,14 @@ declare namespace Router {
     }
 }
 
-interface Match {
-    (paths: string[]): [Record<string, string | string[]>, string[]] | undefined;
-}
-
 interface Binder {
     (handler: Handler): () => void;
 }
 
+interface Match {
+    (paths: string[]): [Record<string, string | string[]>, string[]] | undefined;
+}
+
 interface Route {
     /** 路径匹配 */
     match?: Match;
@@ -603,18 +609,20 @@ declare class ApiRouter extends Router {
     options(...path: Parameters<typeof String.raw>): Binder;
 }
 
-declare function main(req: K99Request, getHandler: (ctx: Context, setParams: (v: any) => void) => PromiseLike<Handler | null> | Handler | null, environment?: Environment, parent?: Context): Promise<K99Response | null>;
+declare function main(req: K99Request, getHandler: (ctx: Context, setParams: (v: any) => void) => PromiseLike<Handler | null> | Handler | null, environment?: Environment, runner?: Runner, parent?: Context): Promise<K99Response | null>;
 
 declare function run(req: K99Request, getHandler: (ctx: Context, setParams: (v: any) => void) => Promise<Handler | null> | Handler | null, options?: {
     setting?: Setting.Api;
     asset?: Asset.Api;
     log?: Log.Api;
+    runner?: Runner;
 }): Promise<K99Response | null>;
 
 declare function make(getHandler: (ctx: Context, setParams: (v: any) => void) => Promise<Handler | null> | Handler | null, options?: {
     setting?: Setting.Api;
     asset?: Asset.Api;
     log?: Log.Api;
+    runner?: Runner;
 }): (r: K99Request) => Promise<K99Response | null>;
 
 declare function merge(...handlers: (Handler | Handler[])[]): Handler;
@@ -622,20 +630,21 @@ declare function merge(...handlers: (Handler | Handler[])[]): Handler;
 declare function service<T, D, P extends any[]>(exec: (ctx: ServiceContext<D, false>, ...p: P) => T, destroy?: ((ctx: ServiceContext<D, true>) => PromiseLike<void> | void) | null, options?: Service.Options): Service<T, D, P>;
 declare function service<T, D, P extends any[]>(exec: (ctx: ServiceContext<D, false>, ...p: P) => T, options?: Service.Options): Service<T, D, P>;
 
-declare function stateService<T>(init: (ctx: ServiceContext<void, false>) => T, options?: Service.Options): Service<T, T, []>;
-declare function stateService<T>(init: (ctx: ServiceContext<void, false>) => T, destroy?: ((state: T | undefined, ctx: ServiceContext<T, true>) => PromiseLike<void> | void) | null, options?: Service.Options): Service<T, T, []>;
-declare function stateService<T>(init: (ctx: ServiceContext<void, false>) => T, destroy?: ((state: T | undefined, ctx: ServiceContext<T, true>) => PromiseLike<void> | void) | null, exec?: ((state: T, ctx: ServiceContext<T, false>) => any) | null, options?: Service.Options): Service<T, T, []>;
+declare function stateService<T>(init: (ctx: ServiceContext<void, false>) => T, options?: Service.Options): StateService<T>;
+declare function stateService<T>(init: (ctx: ServiceContext<void, false>) => T, destroy?: ((state: T | undefined, ctx: ServiceContext<T, true>) => PromiseLike<void> | void) | null, options?: Service.Options): StateService<T>;
+declare function stateService<T>(init: (ctx: ServiceContext<void, false>) => T, destroy?: ((state: T | undefined, ctx: ServiceContext<T, true>) => PromiseLike<void> | void) | null, exec?: ((state: T, ctx: ServiceContext<T, false>) => any) | null, options?: Service.Options): StateService<T>;
 
-declare function storeService<T>(options?: Service.Options): Service<T | undefined, T, [s?: T]>;
-declare function storeService<T>(destroy?: ((state: T | undefined, ctx: ServiceContext<T, true>) => PromiseLike<void> | void) | null, options?: Service.Options): Service<T | undefined, T, [s?: T]>;
-declare function storeService<T>(destroy?: ((state: T | undefined, ctx: ServiceContext<T, true>) => PromiseLike<void> | void) | null, exec?: ((state: T | undefined, ctx: ServiceContext<T, false>) => any) | null, options?: Service.Options): Service<T | undefined, T, [s?: T]>;
+declare function storeService<T>(options?: Service.Options): StoreService<T>;
+declare function storeService<T>(destroy?: ((state: T | undefined, ctx: ServiceContext<T, true>) => PromiseLike<void> | void) | null, options?: Service.Options): StoreService<T>;
+declare function storeService<T>(destroy?: ((state: T | undefined, ctx: ServiceContext<T, true>) => PromiseLike<void> | void) | null, exec?: ((state: T | undefined, ctx: ServiceContext<T, false>) => any) | null, options?: Service.Options): StoreService<T>;
 
 declare abstract class Plugin<T extends Router = Router> {
-    static make(plugins: Record<string, Plugin>, { router, setting, asset, log }?: {
+    static make(plugins: Record<string, Plugin>, { router, setting, asset, log, runner }?: {
         router?: Router;
         asset?: Asset.Api;
         setting?: Setting.Api;
         log?: Log.Api;
+        runner?: Runner;
     }): (r: K99Request) => Promise<K99Response | null>;
     static bindAsset(api: Asset.Api, plugins?: Record<string, Plugin>, pluginPath?: string): Asset.Api;
     static bindAsset(api?: Asset.Api, plugins?: Record<string, Plugin>, pluginPath?: string): Asset.Api | undefined;
@@ -673,4 +682,4 @@ declare function createEnvironment(options?: {
     error?: (e: unknown) => void;
 }): Environment;
 
-export { ActionContext, ApiRouter, Asset, Binder, Context, CookieClearOption, CookieOption, CookieOptionInfo, Encoding, Environment, FindItem, Finder, Guard, Handler, HexEncoding, K99Headers, K99Request, K99Response, Log, Match, Method, Plugin, Route, RouteBinder, Router, RouterRoute, Service, ServiceContext, Setting, WriteType, createEnvironment, main, make, merge, run, service, stateService, storeService };
+export { type ActionContext, ApiRouter, Asset, type Binder, type Context, type CookieClearOption, type CookieOption, type CookieOptionInfo, type Encoding, type Environment, type FindItem, type Finder, type Guard, type Handler, type HexEncoding, type K99Headers, K99Request, type K99Response, Log, type Match, type Method, Plugin, type Route, type RouteBinder, Router, type RouterRoute, type Runner, Service, type ServiceContext, Setting, type WriteType, createEnvironment, main, make, merge, run, service, stateService, storeService };