xshell 1.0.31 → 1.0.33

package/package.json

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

package/server.d.ts

@@ -35,6 +35,7 @@ export declare class Server {
     server_http: HttpServer;
     server_ws?: WebSocketServer;
     remote?: Remote;
+    colors: boolean;
     constructor({ port, remote }?: {
         port?: number;
         remote?: Remote;

package/server.js

@@ -2,6 +2,7 @@ import { createServer as http_create_server } from 'http';
 import zlib from 'zlib';
 import { createReadStream } from 'fs';
 import { Readable } from 'stream';
+import util from 'util';
 // --- 3rd party
 import upath from 'upath';
 import qs from 'qs';
@@ -33,6 +34,7 @@ export class Server {
     server_http;
     server_ws;
     remote;
+    colors = util.inspect.defaultOptions.colors;
     constructor({ port, remote } = {}) {
         if (port !== undefined)
             this.port = port;
@@ -162,6 +164,7 @@ export class Server {
         return false;
     }
     logger(ctx) {
+        const { colors } = this;
         const { request } = ctx;
         const { query, body, path, _path, protocol, host, req: { httpVersion: http_version }, ip, } = request;
         let { method } = request;
@@ -179,7 +182,7 @@ export class Server {
             if (ua.isDesktop)
                 t += 'desktop';
             if (ua.isBot)
-                t += `${t ? ' ' : ''}${'robot'.blue}`;
+                t += `${t ? ' ' : ''}${colors ? 'robot'.blue : 'robot'}`;
             if (ua.platform !== 'unknown' && !ua.os.startsWith('Windows'))
                 t += '／' + ua.platform.toLowerCase().replace('apple mac', 'mac');
             if (ua.os !== 'unknown' && ua.platform !== 'Android')
@@ -196,7 +199,7 @@ export class Server {
         s += `${`${protocol.pad(5)}／${http_version}`.pad(10)}    `;
         // --- method
         method = method.toLowerCase();
-        s += method === 'get' ? method.pad(10) : method.pad(10).yellow;
+        s += (method === 'get' || !colors) ? method.pad(10) : method.pad(10).yellow;
         // --- host
         s += `${host.pad(20)}  `;
         // --- path
@@ -204,7 +207,7 @@ export class Server {
             if (path.toLowerCase() !== _path.toLowerCase())
                 return `${_path.blue} → ${path}`;
             if (!path.includes('.'))
-                return path.yellow;
+                return colors ? path.yellow : path;
             return path;
         })();
         // --- query
@@ -241,7 +244,8 @@ export class Server {
             response.body = Readable.fromWeb(response_.body);
         }
         catch (error) {
-            console.log(error);
+            if (error.status !== 404)
+                console.log(error);
             if (error.response) {
                 const { status, headers, text } = error.response;
                 response.status = status;