@kevisual/router 0.0.4-alpha-7 → 0.0.4

package/dist/router.d.ts

@@ -1,6 +1,7 @@
 import { Schema } from 'zod';
 export { Schema } from 'zod';
 import http, { IncomingMessage, ServerResponse } from 'http';
+import https from 'https';
 import { WebSocketServer, WebSocket } from 'ws';
 
 type BaseRule = {
@@ -190,6 +191,7 @@ declare class Route {
 declare class QueryRouter {
     routes: Route[];
     maxNextRoute: number;
+    context?: RouteContext;
     constructor();
     add(route: Route): void;
     /**
@@ -233,6 +235,7 @@ declare class QueryRouter {
     }, ctx?: RouteContext & {
         [key: string]: any;
     }): Promise<any>;
+    setContext(ctx: RouteContext): Promise<void>;
     getList(): RouteInfo[];
     getHandle<T = any>(router: QueryRouter, wrapperFn?: HandleFn<T>, ctx?: RouteContext): (msg: {
         path: string;
@@ -345,6 +348,9 @@ type ServerOpts = {
         [key: string]: any;
     }) => any;
     cors?: Cors;
+    isHTTPS?: boolean;
+    httpsKey?: string;
+    httpsCert?: string;
 };
 declare class Server {
     path: string;
@@ -353,6 +359,8 @@ declare class Server {
     private _callback;
     private cors;
     private hasOn;
+    private isHTTPS;
+    private options;
     constructor(opts?: ServerOpts);
     listen(port: number, hostname?: string, backlog?: number, listeningListener?: () => void): void;
     listen(port: number, hostname?: string, listeningListener?: () => void): void;
@@ -362,6 +370,7 @@ declare class Server {
     listen(path: string, listeningListener?: () => void): void;
     listen(handle: any, backlog?: number, listeningListener?: () => void): void;
     listen(handle: any, listeningListener?: () => void): void;
+    createServer(): http.Server<typeof http.IncomingMessage, typeof http.ServerResponse> | https.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
     setHandle(handle?: any): void;
     /**
      * get callback
@@ -462,6 +471,9 @@ type AppOptions<T = {}> = {
         path?: string;
         cors?: Cors;
         handle?: any;
+        isHTTPS?: boolean;
+        httpsKey?: string;
+        httpsCert?: string;
     };
     io?: boolean;
     ioOpts?: {

package/dist/router.js

@@ -1,5 +1,6 @@
 import { webcrypto } from 'node:crypto';
 import http from 'http';
+import https from 'https';
 import url from 'url';
 import { WebSocketServer } from 'ws';
 
@@ -5659,6 +5660,7 @@ class Route {
 class QueryRouter {
     routes;
     maxNextRoute = 40;
+    context = {}; // default context for call
     constructor() {
         this.routes = [];
     }
@@ -5885,7 +5887,10 @@ class QueryRouter {
         return await this.runRoute(path, key, ctx);
     }
     async call(message, ctx) {
-        return await this.parse(message, ctx);
+        return await this.parse(message, { ...this.context, ...ctx });
+    }
+    async setContext(ctx) {
+        this.context = ctx;
     }
     getList() {
         return this.routes.map((r) => {
@@ -5930,6 +5935,7 @@ class QueryRouterServer extends QueryRouter {
     constructor(opts) {
         super();
         this.handle = this.getHandle(this, opts?.handleFn, opts?.context);
+        this.setContext(opts?.context);
     }
     setHandle(wrapperFn, ctx) {
         this.handle = this.getHandle(this, wrapperFn, ctx);
@@ -6129,17 +6135,46 @@ class Server {
     _callback;
     cors;
     hasOn = false;
+    isHTTPS = false;
+    options = {
+        key: '',
+        cert: '',
+    };
     constructor(opts) {
         this.path = opts?.path || '/api/router';
         this.handle = opts?.handle;
         this.cors = opts?.cors;
+        this.isHTTPS = opts?.isHTTPS || false;
+        this.options = {
+            key: opts?.httpsKey || '',
+            cert: opts?.httpsCert || '',
+        };
     }
     listen(...args) {
-        this._server = http.createServer();
+        this._server = this.createServer();
         const callback = this.createCallback();
         this._server.on('request', callback);
         this._server.listen(...args);
     }
+    createServer() {
+        let server;
+        if (this.isHTTPS) {
+            if (this.options.key && this.options.cert) {
+                server = https.createServer({
+                    key: this.options.key,
+                    cert: this.options.cert,
+                });
+                console.log('https server');
+                return server;
+            }
+            else {
+                console.error('https key and cert is required');
+                console.log('downgrade to http');
+            }
+        }
+        server = http.createServer();
+        return server;
+    }
     setHandle(handle) {
         this.handle = handle;
     }
@@ -6221,7 +6256,7 @@ class Server {
      * @param listener
      */
     on(listener) {
-        this._server = this._server || http.createServer();
+        this._server = this._server || this.createServer();
         this._server.removeAllListeners('request');
         this.hasOn = true;
         if (Array.isArray(listener)) {
@@ -6402,6 +6437,7 @@ class App {
         const router = opts?.router || new QueryRouter();
         const server = opts?.server || new Server(opts?.serverOptions || {});
         server.setHandle(router.getHandle(router, opts?.routerHandle, opts?.routerContext));
+        router.setContext(opts?.routerContext);
         this.router = router;
         this.server = server;
         if (opts?.io) {
@@ -6443,7 +6479,7 @@ class App {
     }
     async call(message, ctx) {
         const router = this.router;
-        return await router.parse(message, ctx);
+        return await router.call(message, ctx);
     }
     exportRoutes() {
         return this.router.exportRoutes();

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.4-alpha-7",
+  "version": "0.0.4",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -41,6 +41,7 @@
     "url": "git+https://github.com/abearxiong/kevisual-router.git"
   },
   "dependencies": {
+    "selfsigned": "^2.4.1",
     "ws": "^8.18.0"
   },
   "publishConfig": {
@@ -54,6 +55,10 @@
     "./browser": {
       "import": "./dist/router-browser.js",
       "require": "./dist/router-browser.js"
+    },
+    "./sign": {
+      "import": "./dist/router-sign.js",
+      "require": "./dist/router-sign.js"
     }
   }
-}
+}