xshell 1.0.63 → 1.0.65

package/package.json

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

package/server.d.ts

@@ -1,8 +1,10 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
-import { type Server as HttpServer, type IncomingHttpHeaders } from 'http';
+/// <reference types="node" resolution-mode="require"/>
+import { type Server as HttpServer, type IncomingHttpHeaders, type IncomingMessage } from 'http';
 import { type Http2SecureServer, type IncomingHttpHeaders as IncomingHttp2Headers } from 'http2';
+import { type Duplex } from 'stream';
 import type { WebSocketServer } from 'ws';
 import type { default as Koa, Context, Next } from 'koa';
 declare module 'koa' {
@@ -70,6 +72,7 @@ export declare class Server {
     on_error(error: Error & {
         code?: string;
     }, ctx?: Context): void;
+    on_upgrade(request: IncomingMessage, socket: Duplex, head: Buffer): void;
     /** 可被子类重写添加额外的中间件，在 start 时被调用 */
     init_app(app: Koa): Promise<void>;
     entry(ctx: Context, next: Next): Promise<void>;

package/server.js

@@ -1,4 +1,4 @@
-import { createServer as http_create_server } from 'http';
+import { createServer as http_create_server, } from 'http';
 import { createSecureServer as http2_create_server } from 'http2';
 import { createSecureContext } from 'tls';
 import zlib from 'zlib';
@@ -39,7 +39,7 @@ export class Server {
     colors = util.inspect.defaultOptions.colors;
     /** 启用后增加 stdio 订阅相关的 remote.funcs */
     stdio_subscribable;
-    stdio_subscribers;
+    stdio_subscribers = [];
     /** 原始 process.stdout.write 函数 bind 后的备份 */
     stdout_write;
     stderr_write;
@@ -128,37 +128,9 @@ export class Server {
                     this.remote.handle(new Uint8Array(data), ws);
                 });
             });
-            this.http_server.on('upgrade', (request, socket, head) => {
-                // url 只有路径部分
-                const { url, headers, headers: { host = '' }, } = request;
-                const ip = request.socket.remoteAddress.replace(/^::ffff:/, '');
-                console.log(
-                // 时间
-                `${new Date().to_time_str()}  ` +
-                    // ip（位置）
-                    (ip || '').limit(60) + '  ' +
-                    // 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 => {
-                            ws.binaryType = 'arraybuffer';
-                            this.websocket_server.emit('connection', ws, request);
-                        });
-                        return;
-                    default:
-                        console.log(`${' '.repeat(13)}    connect 404: ${url}`.red);
-                        socket.destroy();
-                }
-            });
+            const on_upgrade = this.on_upgrade.bind(this);
+            this.http_server.on('upgrade', on_upgrade);
+            this.http2_server?.on('upgrade', on_upgrade);
             // 将输出到 stdout, stderr 的内容 copy 一份通过 websocket 发到 web shell
             if (this.stdio_subscribable) {
                 this.remote.funcs = {
@@ -246,6 +218,37 @@ export class Server {
             console.log(ctx);
         }
     }
+    on_upgrade(request, socket, head) {
+        // url 只有路径部分
+        const { url, headers, headers: { host = '' }, } = request;
+        const ip = request.socket.remoteAddress.replace(/^::ffff:/, '');
+        console.log(
+        // 时间
+        `${new Date().to_time_str()}  ` +
+            // ip（位置）
+            (ip || '').limit(60) + '  ' +
+            // 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 => {
+                    ws.binaryType = 'arraybuffer';
+                    this.websocket_server.emit('connection', ws, request);
+                });
+                return;
+            default:
+                console.log(`${' '.repeat(13)}    connect 404: ${url}`.red);
+                socket.destroy();
+        }
+    }
     /** 可被子类重写添加额外的中间件，在 start 时被调用 */
     async init_app(app) {
     }