xshell 1.1.3 → 1.1.5

package/package.json

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

package/server.d.ts

@@ -27,6 +27,11 @@ export declare class Server {
     /** proxy 时需要丢弃的 resposne headers */
     static drop_response_headers: Set<string>;
     name: string;
+    print: {
+        info: boolean;
+        logs: boolean;
+        errors: boolean;
+    };
     /** sea 下最后修改时间，用于 http 资源缓存 */
     last_modified_str?: string;
     UAParser: typeof UAParser;
@@ -61,8 +66,13 @@ export declare class Server {
     /** 原始 process.stdout.write 函数 bind 后的备份 */
     stdout_write: Function;
     stderr_write: Function;
-    constructor({ name, http, http2, http_port, http2_port, fpd_certs, default_hostnames, remote, funcs, stdio_subscribable, log_date }: {
+    constructor({ name, print, http, http2, http_port, http2_port, fpd_certs, default_hostnames, remote, funcs, stdio_subscribable, log_date }: {
         name: string;
+        print?: boolean | {
+            info?: boolean;
+            logs?: boolean;
+            errors: boolean;
+        };
         http?: boolean;
         http2?: boolean;
         http_port?: number;

package/server.js

@@ -24,6 +24,11 @@ export class Server {
         'x-powered-by'
     ]);
     name;
+    print = {
+        info: true,
+        logs: true,
+        errors: true
+    };
     /** sea 下最后修改时间，用于 http 资源缓存 */
     last_modified_str;
     UAParser;
@@ -55,8 +60,13 @@ export class Server {
     /** 原始 process.stdout.write 函数 bind 后的备份 */
     stdout_write;
     stderr_write;
-    constructor({ name, http, http2, http_port, http2_port, fpd_certs, default_hostnames, remote, funcs, stdio_subscribable, log_date }) {
+    constructor({ name, print, http, http2, http_port, http2_port, fpd_certs, default_hostnames, remote, funcs, stdio_subscribable, log_date }) {
         this.name = name;
+        if (print !== undefined) {
+            if (typeof print === 'boolean')
+                print = { info: print, logs: print, errors: print };
+            this.print = print;
+        }
         if (http)
             this.http = http;
         if (http2)
@@ -75,7 +85,7 @@ export class Server {
         if (remote)
             this.remote = remote;
         else if (funcs)
-            this.remote = new Remote({ funcs });
+            this.remote = new Remote({ funcs, print: this.print.errors });
         if (stdio_subscribable !== undefined) {
             check(remote || funcs);
             this.stdio_subscribable = stdio_subscribable;
@@ -236,13 +246,14 @@ export class Server {
                 this.http2_server.listen(this.http2_port, resolve);
             }),
         ]);
-        console.log(t('{{name}} 启动成功，正在监听 {{ports}} 端口', {
-            name: this.name,
-            ports: [
-                ...http ? [this.http_port] : [],
-                ...http2 ? [this.http2_port] : []
-            ].join(', ')
-        }));
+        if (this.print.info)
+            console.log(t('{{name}} 启动成功，正在监听 {{ports}} 端口', {
+                name: this.name,
+                ports: [
+                    ...http ? [this.http_port] : [],
+                    ...http2 ? [this.http2_port] : []
+                ].join(', ')
+            }));
     }
     stop() {
         this.http_server.close();
@@ -251,34 +262,38 @@ export class Server {
     }
     /** 可被子类重写定义错误处理逻辑 */
     on_error(error, ctx) {
-        const code = error?.code;
-        if (code === 'EPIPE' || code === 'ECONNRESET')
-            console.log(`${error.code}:`, ctx?.request?.url);
-        else {
-            console.error(error);
-            if (ctx)
-                console.log('ctx:', ctx);
+        if (this.print.errors) {
+            const code = error?.code;
+            if (code === 'EPIPE' || code === 'ECONNRESET')
+                console.log(`${error.code}:`, ctx?.request?.url);
+            else {
+                console.error(error);
+                if (ctx)
+                    console.log('ctx:', ctx);
+            }
         }
     }
     on_upgrade(request, socket, head) {
         // url 只有路径部分
         const { url, headers, headers: { host = '' }, } = request;
-        const ip = request.socket.remoteAddress.replace(/^::ffff:/, '');
-        console.log(
-        // 时间
-        `${this.log_date ? new Date().to_str() : new Date().to_time_str()}  ` +
-            // ip（位置）
-            (ip || '').limit(40) + '  ' +
-            // ua
-            this.format_ua(headers).limit(56) + '  ' +
-            // https／2.0
-            `${this.colors ? 'websocket'.limit(10).magenta : 'websocket'.limit(10)}  ` +
-            // method
-            ''.limit(6) + ' ' +
-            // host
-            `${host.limit(24)}  ` +
-            // path
-            (this.colors ? url.yellow : url));
+        if (this.print.logs) {
+            const ip = request.socket.remoteAddress.replace(/^::ffff:/, '');
+            console.log(
+            // 时间
+            `${this.log_date ? new Date().to_str() : new Date().to_time_str()}  ` +
+                // ip（位置）
+                (ip || '').limit(40) + '  ' +
+                // ua
+                this.format_ua(headers).limit(56) + '  ' +
+                // https／2.0
+                `${this.colors ? 'websocket'.limit(10).magenta : 'websocket'.limit(10)}  ` +
+                // method
+                ''.limit(6) + ' ' +
+                // host
+                `${host.limit(24)}  ` +
+                // path
+                (this.colors ? url.yellow : url));
+        }
         switch (url) {
             case '/':
                 this.websocket_server.handleUpgrade(request, socket, head, ws => {
@@ -287,7 +302,8 @@ export class Server {
                 });
                 return;
             default:
-                console.log(`${' '.repeat(13)}    connect 404: ${url}`.red);
+                if (this.print.logs)
+                    console.log(`${' '.repeat(13)}    connect 404: ${url}`.red);
                 socket.destroy();
         }
     }
@@ -339,7 +355,8 @@ export class Server {
             writable: true
         });
         // ------------ log
-        this.logger(ctx);
+        if (this.print.logs)
+            this.logger(ctx);
         // ------------ repl_router hook
         if (await globalThis.repl_router?.(ctx))
             return;
@@ -358,7 +375,8 @@ export class Server {
         let { response } = ctx;
         response.redirect(url);
         response.status = code;
-        console.log(`${code} 重定向  ${_path} -> ${url}`.yellow);
+        if (this.print.logs)
+            console.log(`${code} 重定向  ${_path} -> ${url}`.yellow);
         return true;
     }
     logger(ctx) {
@@ -512,20 +530,22 @@ export class Server {
         catch (error) {
             if (throw_error)
                 throw error;
-            if (error.response?.status !== 404)
+            if (error.response?.status !== 404 && this.print.errors)
                 console.log(error);
             if (error.response) {
                 const { status, headers, body } = error.response;
-                if (status === 404)
-                    console.log(method, '404:', path_url);
-                else
-                    console.log(error);
+                if (this.print.errors)
+                    if (status === 404)
+                        console.log(method, '404:', path_url);
+                    else
+                        console.log(error);
                 response.status = status;
                 response.set(Server.filter_response_headers(headers));
                 response.body = body;
             }
             else {
-                console.log(error);
+                if (this.print.errors)
+                    console.log(error);
                 response.status = 500;
                 response.body = inspect(error, { colors: false });
             }
@@ -559,7 +579,7 @@ export class Server {
         catch (error) {
             if (error.status !== 404)
                 throw error;
-            if (log_404) {
+            if (log_404 && this.print.logs) {
                 let s = `${' '.repeat(11)}    ${method.toLowerCase()} 404: ${path}`;
                 if (_path !== path)
                     s += ` ${_path.bracket()}`;