xshell 1.0.70 → 1.0.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xshell",
-  "version": "1.0.70",
+  "version": "1.0.71",
   "type": "module",
   "main": "./index.js",
   "bin": {

package/repl.js

@@ -31,6 +31,7 @@ export async function start_repl() {
             let { Server } = await import('./server.js');
             server = new Server({
                 name: 'repl',
+                http: true,
                 http_port: 8421,
                 funcs: {
                     echo({ data: [data] }) {

package/server.d.ts

@@ -35,6 +35,10 @@ export declare class Server {
     js_exts: Set<string>;
     app: Koa;
     handler: ReturnType<Koa['callback']>;
+    /** 启用 http server */
+    http: boolean;
+    /** 启用 http2 server */
+    http2: boolean;
     http_port: number;
     http2_port: number;
     /** http2 server 证书文件夹路径，设置后才会启用 http2 server */
@@ -55,8 +59,10 @@ export declare class Server {
     stdout_write: Function;
     stderr_write: Function;
     encoder: TextEncoder;
-    constructor({ name, http_port, http2_port, fpd_certs, default_hostnames, remote, funcs, stdio_subscribable, }: {
+    constructor({ name, http, http2, http_port, http2_port, fpd_certs, default_hostnames, remote, funcs, stdio_subscribable, }: {
         name: string;
+        http?: boolean;
+        http2?: boolean;
         http_port?: number;
         http2_port?: number;
         fpd_certs?: string;

package/server.js

@@ -26,6 +26,10 @@ export class Server {
     js_exts = new Set(['.js', '.mjs', '.cjs']);
     app;
     handler;
+    /** 启用 http server */
+    http = false;
+    /** 启用 http2 server */
+    http2 = false;
     http_port = 80;
     http2_port = 443;
     /** http2 server 证书文件夹路径，设置后才会启用 http2 server */
@@ -44,8 +48,13 @@ export class Server {
     stdout_write;
     stderr_write;
     encoder = new TextEncoder();
-    constructor({ name, http_port, http2_port, fpd_certs, default_hostnames, remote, funcs, stdio_subscribable, }) {
+    constructor({ name, http, http2, http_port, http2_port, fpd_certs, default_hostnames, remote, funcs, stdio_subscribable, }) {
         this.name = name;
+        if (http)
+            this.http = http;
+        if (http2)
+            this.http2 = http2;
+        assert(this.http || this.http2, 'http 和 http2 至少启用一个');
         if (http_port !== undefined)
             this.http_port = http_port;
         if (http2_port !== undefined)
@@ -95,8 +104,9 @@ export class Server {
         this.app = app;
         this.handler = this.app.callback();
         this.http_server = http_create_server(this.handler);
-        const { fpd_certs } = this;
-        if (fpd_certs) {
+        const { http, http2 } = this;
+        if (http2) {
+            const { fpd_certs } = this;
             let lazy_secure_ctxs = Object.fromEntries(await Promise.all(
             // fpd_certs 文件夹下面的每个 .key 对应一个证书及域名
             (await flist(fpd_certs, { print: false, filter: /\.key$/ }))
@@ -196,16 +206,19 @@ export class Server {
             }
         }
         await Promise.all([
-            new Promise(resolve => {
+            http && new Promise(resolve => {
                 this.http_server.listen(this.http_port, resolve);
             }),
-            fpd_certs && new Promise(resolve => {
+            http2 && new Promise(resolve => {
                 this.http2_server.listen(this.http2_port, resolve);
             }),
         ]);
         console.log(t('{{name}} 启动成功，正在监听 {{ports}} 端口', {
             name: this.name,
-            ports: `${this.http_port}${fpd_certs ? `, ${this.http2_port}` : ''}`
+            ports: [
+                ...http ? [this.http_port] : [],
+                ...http2 ? [this.http2_port] : []
+            ].join(', ')
         }));
     }
     stop() {

package/utils.browser.d.ts

@@ -51,7 +51,7 @@ export declare class Lock<TResource = void> {
 }
 export declare function pause(milliseconds?: number): Promise<void>;
 /** 字符串字典序比较 */
-export declare function strcmp(l: string, r: string): 1 | 0 | -1;
+export declare function strcmp(l: string, r: string): 0 | 1 | -1;
 /** 比较 1.10.02 这种版本号 */
 export declare function vercmp(l: string, r: string): number;
 export declare function get<TReturn = any>(obj: any, keypath: string): TReturn;

package/utils.d.ts

@@ -22,7 +22,7 @@ export declare function unique<T>(iterable: T[] | Iterable<T>, selector?: string
 /** 排序对象中 key 的顺序，返回新的对象 */
 export declare function sort_keys<T>(obj: T): T;
 /** 字符串字典序比较 */
-export declare function strcmp(l: string, r: string): 1 | 0 | -1;
+export declare function strcmp(l: string, r: string): 0 | 1 | -1;
 /** 比较 1.10.02 这种版本号 */
 export declare function vercmp(l: string, r: string): number;
 export declare function get<TReturn = any>(obj: any, keypath: string): TReturn;