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

package/dist/router.d.ts

@@ -2,6 +2,7 @@ import { Schema } from 'zod';
 export { Schema } from 'zod';
 import http, { IncomingMessage, ServerResponse } from 'http';
 import https from 'https';
+import http2 from 'http2';
 import { WebSocketServer, WebSocket } from 'ws';
 
 type BaseRule = {
@@ -378,7 +379,7 @@ type ServerOpts = {
         [key: string]: any;
     }) => any;
     cors?: Cors;
-    isHTTPS?: boolean;
+    httpType?: 'http' | 'https' | 'http2';
     httpsKey?: string;
     httpsCert?: string;
 };
@@ -389,7 +390,7 @@ declare class Server {
     private _callback;
     private cors;
     private hasOn;
-    private isHTTPS;
+    private httpType;
     private options;
     constructor(opts?: ServerOpts);
     listen(port: number, hostname?: string, backlog?: number, listeningListener?: () => void): void;
@@ -400,7 +401,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>;
+    createServer(): http.Server<typeof http.IncomingMessage, typeof http.ServerResponse> | https.Server<typeof http.IncomingMessage, typeof http.ServerResponse> | http2.Http2SecureServer<typeof http.IncomingMessage, typeof http.ServerResponse, typeof http2.Http2ServerRequest, typeof http2.Http2ServerResponse>;
     setHandle(handle?: any): void;
     /**
      * get callback
@@ -416,7 +417,7 @@ declare class Server {
      */
     on(listener: Listener | Listener[]): void;
     get callback(): any;
-    get server(): http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
+    get server(): http.Server<typeof http.IncomingMessage, typeof http.ServerResponse> | https.Server<typeof http.IncomingMessage, typeof http.ServerResponse> | http2.Http2SecureServer<typeof http.IncomingMessage, typeof http.ServerResponse, typeof http2.Http2ServerRequest, typeof http2.Http2ServerResponse>;
 }
 
 /**
@@ -497,14 +498,7 @@ type AppOptions<T = {}> = {
     /** handle msg 关联 */
     routerHandle?: RouterHandle;
     routerContext?: RouteContext<T>;
-    serverOptions?: {
-        path?: string;
-        cors?: Cors;
-        handle?: any;
-        isHTTPS?: boolean;
-        httpsKey?: string;
-        httpsCert?: string;
-    };
+    serverOptions?: ServerOpts;
     io?: boolean;
     ioOpts?: {
         routerHandle?: RouterHandle;

package/dist/router.js

@@ -1,6 +1,7 @@
 import { webcrypto } from 'node:crypto';
 import http from 'http';
 import https from 'https';
+import http2 from 'http2';
 import url from 'url';
 import { WebSocketServer } from 'ws';
 
@@ -6159,7 +6160,7 @@ class Server {
     _callback;
     cors;
     hasOn = false;
-    isHTTPS = false;
+    httpType = 'http';
     options = {
         key: '',
         cert: '',
@@ -6168,7 +6169,7 @@ class Server {
         this.path = opts?.path || '/api/router';
         this.handle = opts?.handle;
         this.cors = opts?.cors;
-        this.isHTTPS = opts?.isHTTPS || false;
+        this.httpType = opts?.httpType || 'http';
         this.options = {
             key: opts?.httpsKey || '',
             cert: opts?.httpsCert || '',
@@ -6182,13 +6183,26 @@ class Server {
     }
     createServer() {
         let server;
-        if (this.isHTTPS) {
+        const httpType = this.httpType;
+        if (httpType === 'https') {
             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');
+            }
+        }
+        else if (httpType === 'http2') {
+            if (this.options.key && this.options.cert) {
+                server = http2.createSecureServer({
+                    key: this.options.key,
+                    cert: this.options.cert,
+                });
                 return server;
             }
             else {
@@ -6211,6 +6225,7 @@ class Server {
         const handle = this.handle;
         const cors = this.cors;
         const _callback = async (req, res) => {
+            // only handle /api/router
             if (req.url === '/favicon.ico') {
                 return;
             }
@@ -6235,7 +6250,7 @@ class Server {
                     return;
                 }
             }
-            res.writeHead(200); // 设置响应头，给予其他api知道headersSent，它已经被响应了
+            res.writeHead(200); // 设置响应头，给予其他任何listen 知道headersSent，它已经被响应了
             const url = req.url;
             if (!url.startsWith(path)) {
                 res.end(resultError(`not path:[${path}]`));

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.6-alpha-1",
+  "version": "0.0.6-alpha-2",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",