@kevisual/router 0.0.6-alpha-2 → 0.0.6-alpha-4

package/dist/router-browser.d.ts

@@ -118,7 +118,9 @@ type RouteOpts = {
 type DefineRouteOpts = Omit<RouteOpts, 'idUsePath' | 'verify' | 'verifyKey' | 'nextRoute'>;
 declare const pickValue: readonly ["path", "key", "id", "description", "type", "validator", "middleware"];
 type RouteInfo = Pick<Route, (typeof pickValue)[number]>;
-declare class Route {
+declare class Route<U = {
+    [key: string]: any;
+}> {
     path?: string;
     key?: string;
     id?: string;
@@ -180,13 +182,13 @@ declare class Route {
     } = RouterContextT>(opts: DefineRouteOpts): this;
     define<T extends {
         [key: string]: any;
-    } = RouterContextT>(fn: Run<T>): this;
+    } = RouterContextT>(fn: Run<T & U>): this;
     define<T extends {
         [key: string]: any;
-    } = RouterContextT>(key: string, fn: Run<T>): this;
+    } = RouterContextT>(key: string, fn: Run<T & U>): this;
     define<T extends {
         [key: string]: any;
-    } = RouterContextT>(path: string, key: string, fn: Run<T>): this;
+    } = RouterContextT>(path: string, key: string, fn: Run<T & U>): this;
     addTo(router: QueryRouter | {
         add: (route: Route) => void;
         [key: string]: any;
@@ -270,7 +272,7 @@ declare class QueryRouter {
         path: string;
         key?: string;
         [key: string]: any;
-    }) => Promise<{
+    }, handleContext?: RouteContext) => Promise<{
         [key: string]: any;
         code: string;
         data?: any;
@@ -279,8 +281,14 @@ declare class QueryRouter {
         code: any;
         data: any;
         message: any;
+    } | {
+        code: number;
+        message: any;
+        data?: undefined;
     }>;
-    exportRoutes(): Route[];
+    exportRoutes(): Route<{
+        [key: string]: any;
+    }>[];
     importRoutes(routes: Route[]): void;
     importRouter(router: QueryRouter): void;
     throw(code?: number | string, message?: string, tips?: string): void;
@@ -312,10 +320,10 @@ declare class QueryRouterServer extends QueryRouter {
     use(path: string, fn: (ctx: any) => any, opts?: RouteOpts): void;
     addRoute(route: Route): void;
     Route: typeof Route;
-    route(opts: RouteOpts): Route;
-    route(path: string, key?: string): Route;
-    route(path: string, opts?: RouteOpts): Route;
-    route(path: string, key?: string, opts?: RouteOpts): Route;
+    route(opts: RouteOpts): Route<Required<RouteContext>>;
+    route(path: string, key?: string): Route<Required<RouteContext>>;
+    route(path: string, opts?: RouteOpts): Route<Required<RouteContext>>;
+    route(path: string, key?: string, opts?: RouteOpts): Route<Required<RouteContext>>;
     /**
      * 等于queryRoute，但是调用了handle
      * @param param0

package/dist/router-browser.js

@@ -3,7 +3,7 @@ const urlAlphabet =
 
 let nanoid = (size = 21) => {
   let id = '';
-  let bytes = crypto.getRandomValues(new Uint8Array(size));
+  let bytes = crypto.getRandomValues(new Uint8Array((size |= 0)));
   while (size--) {
     id += urlAlphabet[bytes[size] & 63];
   }
@@ -5901,15 +5901,20 @@ class QueryRouter {
         });
     }
     getHandle(router, wrapperFn, ctx) {
-        return async (msg) => {
-            const context = { ...ctx };
-            const res = await router.parse(msg, context);
-            if (wrapperFn) {
-                res.data = res.body;
-                return wrapperFn(res, context);
-            }
-            const { code, body, message } = res;
-            return { code, data: body, message };
+        return async (msg, handleContext) => {
+            try {
+                const context = { ...ctx, ...handleContext };
+                const res = await router.parse(msg, context);
+                if (wrapperFn) {
+                    res.data = res.body;
+                    return wrapperFn(res, context);
+                }
+                const { code, body, message } = res;
+                return { code, data: body, message };
+            }
+            catch (e) {
+                return { code: 500, message: e.message };
+            }
         };
     }
     exportRoutes() {

package/dist/router.d.ts

@@ -3,6 +3,7 @@ export { Schema } from 'zod';
 import http, { IncomingMessage, ServerResponse } from 'http';
 import https from 'https';
 import http2 from 'http2';
+import * as cookie from 'cookie';
 import { WebSocketServer, WebSocket } from 'ws';
 
 type BaseRule = {
@@ -122,7 +123,9 @@ type RouteOpts = {
 type DefineRouteOpts = Omit<RouteOpts, 'idUsePath' | 'verify' | 'verifyKey' | 'nextRoute'>;
 declare const pickValue: readonly ["path", "key", "id", "description", "type", "validator", "middleware"];
 type RouteInfo = Pick<Route, (typeof pickValue)[number]>;
-declare class Route {
+declare class Route<U = {
+    [key: string]: any;
+}> {
     path?: string;
     key?: string;
     id?: string;
@@ -184,13 +187,13 @@ declare class Route {
     } = RouterContextT>(opts: DefineRouteOpts): this;
     define<T extends {
         [key: string]: any;
-    } = RouterContextT>(fn: Run<T>): this;
+    } = RouterContextT>(fn: Run<T & U>): this;
     define<T extends {
         [key: string]: any;
-    } = RouterContextT>(key: string, fn: Run<T>): this;
+    } = RouterContextT>(key: string, fn: Run<T & U>): this;
     define<T extends {
         [key: string]: any;
-    } = RouterContextT>(path: string, key: string, fn: Run<T>): this;
+    } = RouterContextT>(path: string, key: string, fn: Run<T & U>): this;
     addTo(router: QueryRouter | {
         add: (route: Route) => void;
         [key: string]: any;
@@ -274,7 +277,7 @@ declare class QueryRouter {
         path: string;
         key?: string;
         [key: string]: any;
-    }) => Promise<{
+    }, handleContext?: RouteContext) => Promise<{
         [key: string]: any;
         code: string;
         data?: any;
@@ -283,8 +286,14 @@ declare class QueryRouter {
         code: any;
         data: any;
         message: any;
+    } | {
+        code: number;
+        message: any;
+        data?: undefined;
     }>;
-    exportRoutes(): Route[];
+    exportRoutes(): Route<{
+        [key: string]: any;
+    }>[];
     importRoutes(routes: Route[]): void;
     importRouter(router: QueryRouter): void;
     throw(code?: number | string, message?: string, tips?: string): void;
@@ -316,10 +325,10 @@ declare class QueryRouterServer extends QueryRouter {
     use(path: string, fn: (ctx: any) => any, opts?: RouteOpts): void;
     addRoute(route: Route): void;
     Route: typeof Route;
-    route(opts: RouteOpts): Route;
-    route(path: string, key?: string): Route;
-    route(path: string, opts?: RouteOpts): Route;
-    route(path: string, key?: string, opts?: RouteOpts): Route;
+    route(opts: RouteOpts): Route<Required<RouteContext>>;
+    route(path: string, key?: string): Route<Required<RouteContext>>;
+    route(path: string, opts?: RouteOpts): Route<Required<RouteContext>>;
+    route(path: string, key?: string, opts?: RouteOpts): Route<Required<RouteContext>>;
     /**
      * 等于queryRoute，但是调用了handle
      * @param param0
@@ -363,6 +372,18 @@ declare class QueryConnect {
 }
 
 type Listener = (...args: any[]) => void;
+type CookieFn = (name: string, value: string, options?: cookie.SerializeOptions, end?: boolean) => void;
+type HandleCtx = {
+    req: IncomingMessage & {
+        cookies: Record<string, string>;
+    };
+    res: ServerResponse & {
+        /**
+         * cookie 函数， end 参数用于设置是否立即设置到响应头，设置了后面的cookie再设置会覆盖前面的
+         */
+        cookie: CookieFn;
+    };
+};
 type Cors = {
     /**
      * @default '*''
@@ -377,6 +398,9 @@ type ServerOpts = {
         path: string;
         key?: string;
         [key: string]: any;
+    }, ctx?: {
+        req: http.IncomingMessage;
+        res: http.ServerResponse;
     }) => any;
     cors?: Cors;
     httpType?: 'http' | 'https' | 'http2';
@@ -427,6 +451,7 @@ declare class Server {
  * @returns
  */
 declare const handleServer: (req: IncomingMessage, res: ServerResponse) => Promise<{
+    cookies: Record<string, string>;
     token: string;
 }>;
 
@@ -506,7 +531,11 @@ type AppOptions<T = {}> = {
         path?: string;
     };
 };
-declare class App<T = {}> {
+type AppReqRes = HandleCtx;
+/**
+ *  封装了 Router 和 Server 的 App 模块，处理http的请求和响应，内置了 Cookie 和 Token 和 res 的处理
+ */
+declare class App<T = {}, U = AppReqRes> {
     router: QueryRouter;
     server: Server;
     io: WsServer;
@@ -523,10 +552,10 @@ declare class App<T = {}> {
     addRoute(route: Route): void;
     add: (route: Route) => void;
     Route: typeof Route;
-    route(opts: RouteOpts): Route;
-    route(path: string, key?: string): Route;
-    route(path: string, opts?: RouteOpts): Route;
-    route(path: string, key?: string, opts?: RouteOpts): Route;
+    route(opts: RouteOpts): Route<U>;
+    route(path: string, key?: string): Route<U>;
+    route(path: string, opts?: RouteOpts): Route<U>;
+    route(path: string, key?: string, opts?: RouteOpts): Route<U>;
     call(message: {
         path: string;
         key?: string;
@@ -541,7 +570,9 @@ declare class App<T = {}> {
         data: any;
         message: any;
     }>;
-    exportRoutes(): Route[];
+    exportRoutes(): Route<{
+        [key: string]: any;
+    }>[];
     importRoutes(routes: any[]): void;
     importApp(app: App): void;
     throw(code?: number | string, message?: string, tips?: string): void;

package/dist/router.js

@@ -22,7 +22,7 @@ function fillPool(bytes) {
   poolOffset += bytes;
 }
 function nanoid(size = 21) {
-  fillPool((size -= 0));
+  fillPool((size |= 0));
   let id = '';
   for (let i = poolOffset - size; i < poolOffset; i++) {
     id += urlAlphabet[pool[i] & 63];
@@ -5921,15 +5921,20 @@ class QueryRouter {
         });
     }
     getHandle(router, wrapperFn, ctx) {
-        return async (msg) => {
-            const context = { ...ctx };
-            const res = await router.parse(msg, context);
-            if (wrapperFn) {
-                res.data = res.body;
-                return wrapperFn(res, context);
-            }
-            const { code, body, message } = res;
-            return { code, data: body, message };
+        return async (msg, handleContext) => {
+            try {
+                const context = { ...ctx, ...handleContext };
+                const res = await router.parse(msg, context);
+                if (wrapperFn) {
+                    res.data = res.body;
+                    return wrapperFn(res, context);
+                }
+                const { code, body, message } = res;
+                return { code, data: body, message };
+            }
+            catch (e) {
+                return { code: 500, message: e.message };
+            }
         };
     }
     exportRoutes() {
@@ -6120,9 +6125,16 @@ const handleServer = async (req, res) => {
     const parsedUrl = url.parse(req.url, true);
     // 获取token
     let token = req.headers['authorization'] || '';
+    const handle = createHandleCtx(req, res);
+    const cookies = handle.req.cookies;
+    if (!token) {
+        token = cookies.token;
+    }
     if (token) {
         token = token.replace('Bearer ', '');
     }
+    //@ts-ignore
+    console.log('token', req.cookies, res.cookie);
     // 获取查询参数
     const param = parsedUrl.query;
     let body;
@@ -6142,10 +6154,287 @@ const handleServer = async (req, res) => {
         token,
         ...param,
         ...body,
+        cookies,
     };
     return data;
 };
 
+var dist = {};
+
+var hasRequiredDist;
+
+function requireDist () {
+	if (hasRequiredDist) return dist;
+	hasRequiredDist = 1;
+	Object.defineProperty(dist, "__esModule", { value: true });
+	dist.parse = parse;
+	dist.serialize = serialize;
+	/**
+	 * RegExp to match cookie-name in RFC 6265 sec 4.1.1
+	 * This refers out to the obsoleted definition of token in RFC 2616 sec 2.2
+	 * which has been replaced by the token definition in RFC 7230 appendix B.
+	 *
+	 * cookie-name       = token
+	 * token             = 1*tchar
+	 * tchar             = "!" / "#" / "$" / "%" / "&" / "'" /
+	 *                     "*" / "+" / "-" / "." / "^" / "_" /
+	 *                     "`" / "|" / "~" / DIGIT / ALPHA
+	 *
+	 * Note: Allowing more characters - https://github.com/jshttp/cookie/issues/191
+	 * Allow same range as cookie value, except `=`, which delimits end of name.
+	 */
+	const cookieNameRegExp = /^[\u0021-\u003A\u003C\u003E-\u007E]+$/;
+	/**
+	 * RegExp to match cookie-value in RFC 6265 sec 4.1.1
+	 *
+	 * cookie-value      = *cookie-octet / ( DQUOTE *cookie-octet DQUOTE )
+	 * cookie-octet      = %x21 / %x23-2B / %x2D-3A / %x3C-5B / %x5D-7E
+	 *                     ; US-ASCII characters excluding CTLs,
+	 *                     ; whitespace DQUOTE, comma, semicolon,
+	 *                     ; and backslash
+	 *
+	 * Allowing more characters: https://github.com/jshttp/cookie/issues/191
+	 * Comma, backslash, and DQUOTE are not part of the parsing algorithm.
+	 */
+	const cookieValueRegExp = /^[\u0021-\u003A\u003C-\u007E]*$/;
+	/**
+	 * RegExp to match domain-value in RFC 6265 sec 4.1.1
+	 *
+	 * domain-value      = <subdomain>
+	 *                     ; defined in [RFC1034], Section 3.5, as
+	 *                     ; enhanced by [RFC1123], Section 2.1
+	 * <subdomain>       = <label> | <subdomain> "." <label>
+	 * <label>           = <let-dig> [ [ <ldh-str> ] <let-dig> ]
+	 *                     Labels must be 63 characters or less.
+	 *                     'let-dig' not 'letter' in the first char, per RFC1123
+	 * <ldh-str>         = <let-dig-hyp> | <let-dig-hyp> <ldh-str>
+	 * <let-dig-hyp>     = <let-dig> | "-"
+	 * <let-dig>         = <letter> | <digit>
+	 * <letter>          = any one of the 52 alphabetic characters A through Z in
+	 *                     upper case and a through z in lower case
+	 * <digit>           = any one of the ten digits 0 through 9
+	 *
+	 * Keep support for leading dot: https://github.com/jshttp/cookie/issues/173
+	 *
+	 * > (Note that a leading %x2E ("."), if present, is ignored even though that
+	 * character is not permitted, but a trailing %x2E ("."), if present, will
+	 * cause the user agent to ignore the attribute.)
+	 */
+	const domainValueRegExp = /^([.]?[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?)([.][a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?)*$/i;
+	/**
+	 * RegExp to match path-value in RFC 6265 sec 4.1.1
+	 *
+	 * path-value        = <any CHAR except CTLs or ";">
+	 * CHAR              = %x01-7F
+	 *                     ; defined in RFC 5234 appendix B.1
+	 */
+	const pathValueRegExp = /^[\u0020-\u003A\u003D-\u007E]*$/;
+	const __toString = Object.prototype.toString;
+	const NullObject = /* @__PURE__ */ (() => {
+	    const C = function () { };
+	    C.prototype = Object.create(null);
+	    return C;
+	})();
+	/**
+	 * Parse a cookie header.
+	 *
+	 * Parse the given cookie header string into an object
+	 * The object has the various cookies as keys(names) => values
+	 */
+	function parse(str, options) {
+	    const obj = new NullObject();
+	    const len = str.length;
+	    // RFC 6265 sec 4.1.1, RFC 2616 2.2 defines a cookie name consists of one char minimum, plus '='.
+	    if (len < 2)
+	        return obj;
+	    const dec = options?.decode || decode;
+	    let index = 0;
+	    do {
+	        const eqIdx = str.indexOf("=", index);
+	        if (eqIdx === -1)
+	            break; // No more cookie pairs.
+	        const colonIdx = str.indexOf(";", index);
+	        const endIdx = colonIdx === -1 ? len : colonIdx;
+	        if (eqIdx > endIdx) {
+	            // backtrack on prior semicolon
+	            index = str.lastIndexOf(";", eqIdx - 1) + 1;
+	            continue;
+	        }
+	        const keyStartIdx = startIndex(str, index, eqIdx);
+	        const keyEndIdx = endIndex(str, eqIdx, keyStartIdx);
+	        const key = str.slice(keyStartIdx, keyEndIdx);
+	        // only assign once
+	        if (obj[key] === undefined) {
+	            let valStartIdx = startIndex(str, eqIdx + 1, endIdx);
+	            let valEndIdx = endIndex(str, endIdx, valStartIdx);
+	            const value = dec(str.slice(valStartIdx, valEndIdx));
+	            obj[key] = value;
+	        }
+	        index = endIdx + 1;
+	    } while (index < len);
+	    return obj;
+	}
+	function startIndex(str, index, max) {
+	    do {
+	        const code = str.charCodeAt(index);
+	        if (code !== 0x20 /*   */ && code !== 0x09 /* \t */)
+	            return index;
+	    } while (++index < max);
+	    return max;
+	}
+	function endIndex(str, index, min) {
+	    while (index > min) {
+	        const code = str.charCodeAt(--index);
+	        if (code !== 0x20 /*   */ && code !== 0x09 /* \t */)
+	            return index + 1;
+	    }
+	    return min;
+	}
+	/**
+	 * Serialize data into a cookie header.
+	 *
+	 * Serialize a name value pair into a cookie string suitable for
+	 * http headers. An optional options object specifies cookie parameters.
+	 *
+	 * serialize('foo', 'bar', { httpOnly: true })
+	 *   => "foo=bar; httpOnly"
+	 */
+	function serialize(name, val, options) {
+	    const enc = options?.encode || encodeURIComponent;
+	    if (!cookieNameRegExp.test(name)) {
+	        throw new TypeError(`argument name is invalid: ${name}`);
+	    }
+	    const value = enc(val);
+	    if (!cookieValueRegExp.test(value)) {
+	        throw new TypeError(`argument val is invalid: ${val}`);
+	    }
+	    let str = name + "=" + value;
+	    if (!options)
+	        return str;
+	    if (options.maxAge !== undefined) {
+	        if (!Number.isInteger(options.maxAge)) {
+	            throw new TypeError(`option maxAge is invalid: ${options.maxAge}`);
+	        }
+	        str += "; Max-Age=" + options.maxAge;
+	    }
+	    if (options.domain) {
+	        if (!domainValueRegExp.test(options.domain)) {
+	            throw new TypeError(`option domain is invalid: ${options.domain}`);
+	        }
+	        str += "; Domain=" + options.domain;
+	    }
+	    if (options.path) {
+	        if (!pathValueRegExp.test(options.path)) {
+	            throw new TypeError(`option path is invalid: ${options.path}`);
+	        }
+	        str += "; Path=" + options.path;
+	    }
+	    if (options.expires) {
+	        if (!isDate(options.expires) ||
+	            !Number.isFinite(options.expires.valueOf())) {
+	            throw new TypeError(`option expires is invalid: ${options.expires}`);
+	        }
+	        str += "; Expires=" + options.expires.toUTCString();
+	    }
+	    if (options.httpOnly) {
+	        str += "; HttpOnly";
+	    }
+	    if (options.secure) {
+	        str += "; Secure";
+	    }
+	    if (options.partitioned) {
+	        str += "; Partitioned";
+	    }
+	    if (options.priority) {
+	        const priority = typeof options.priority === "string"
+	            ? options.priority.toLowerCase()
+	            : undefined;
+	        switch (priority) {
+	            case "low":
+	                str += "; Priority=Low";
+	                break;
+	            case "medium":
+	                str += "; Priority=Medium";
+	                break;
+	            case "high":
+	                str += "; Priority=High";
+	                break;
+	            default:
+	                throw new TypeError(`option priority is invalid: ${options.priority}`);
+	        }
+	    }
+	    if (options.sameSite) {
+	        const sameSite = typeof options.sameSite === "string"
+	            ? options.sameSite.toLowerCase()
+	            : options.sameSite;
+	        switch (sameSite) {
+	            case true:
+	            case "strict":
+	                str += "; SameSite=Strict";
+	                break;
+	            case "lax":
+	                str += "; SameSite=Lax";
+	                break;
+	            case "none":
+	                str += "; SameSite=None";
+	                break;
+	            default:
+	                throw new TypeError(`option sameSite is invalid: ${options.sameSite}`);
+	        }
+	    }
+	    return str;
+	}
+	/**
+	 * URL-decode string value. Optimized to skip native call when no %.
+	 */
+	function decode(str) {
+	    if (str.indexOf("%") === -1)
+	        return str;
+	    try {
+	        return decodeURIComponent(str);
+	    }
+	    catch (e) {
+	        return str;
+	    }
+	}
+	/**
+	 * Determine if value is a Date.
+	 */
+	function isDate(val) {
+	    return __toString.call(val) === "[object Date]";
+	}
+	
+	return dist;
+}
+
+var distExports = requireDist();
+
+// 实现函数
+function createHandleCtx(req, res) {
+    // 用于存储所有的 Set-Cookie 字符串
+    const cookies = [];
+    let handReq = req;
+    let handRes = res;
+    // 扩展 res.cookie 方法
+    const cookieFn = (name, value, options = {}, end = true) => {
+        // 序列化新的 Cookie
+        const serializedCookie = distExports.serialize(name, value, options);
+        cookies.push(serializedCookie); // 将新的 Cookie 添加到数组
+        if (end) {
+            // 如果设置了 end 参数，则立即设置到响应头
+            res.setHeader('Set-Cookie', cookies);
+        }
+    };
+    // 解析请求中的现有 Cookie
+    const parsedCookies = distExports.parse(req.headers.cookie || '');
+    handReq.cookies = parsedCookies;
+    handRes.cookie = cookieFn;
+    // 返回扩展的上下文
+    return {
+        req: handReq,
+        res: handRes,
+    };
+}
 const resultError = (error, code = 500) => {
     const r = {
         code: code,
@@ -6250,19 +6539,22 @@ class Server {
                     return;
                 }
             }
-            res.writeHead(200); // 设置响应头，给予其他任何listen 知道headersSent，它已经被响应了
+            // res.writeHead(200); // 设置响应头，给予其他任何listen 知道headersSent，它已经被响应了
             const url = req.url;
             if (!url.startsWith(path)) {
                 res.end(resultError(`not path:[${path}]`));
                 return;
             }
-            const messages = await handleServer(req);
+            const messages = await handleServer(req, res);
             if (!handle) {
                 res.end(resultError('no handle'));
                 return;
             }
             try {
-                const end = await handle(messages);
+                const end = await handle(messages, { req, res });
+                if (res.writableEnded) {
+                    return;
+                }
                 if (typeof end === 'string') {
                     res.end(end);
                 }
@@ -6468,6 +6760,9 @@ class WsServer extends WsServerBase {
     }
 }
 
+/**
+ *  封装了 Router 和 Server 的 App 模块，处理http的请求和响应，内置了 Cookie 和 Token 和 res 的处理
+ */
 class App {
     router;
     server;

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.6-alpha-2",
+  "version": "0.0.6-alpha-4",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -26,6 +26,7 @@
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.8.6",
     "@types/ws": "^8.5.13",
+    "cookie": "^1.0.2",
     "lodash-es": "^4.17.21",
     "nanoid": "^5.0.8",
     "rollup": "^4.24.3",