xshell 1.2.12 → 1.2.14

package/net.browser.js

@@ -315,9 +315,9 @@ export class Remote {
         if (keeper) {
             check(this.initiator && url);
             this.keeper = {
-                reconnect_interval: 1000 * 5,
+                reconnect_interval: 5000,
                 heartbeat_interval: 1000 * 60,
-                error_delay: 1000 * 2,
+                error_delay: 2000,
                 ...keeper
             };
         }
@@ -377,19 +377,20 @@ export class Remote {
                 await this.lwebsocket.request(async (websocket) => {
                     // 保存的 rpc 状态在 this.handlers, 与 websocket 无关，因此即使断开重连也不影响 rpc 的运行，即
                     // 底层连接断开后自动重连对上层应该是无感知的，除非再次连接时失败
-                    if (websocket?.readyState !== WebSocket.OPEN) { // 重连
-                        try {
-                            this.lwebsocket.resource = await connect_websocket(this.url, {
-                                on_message: this._on_message,
-                                on_error: this._on_error,
-                                print: this.print
-                            });
-                            reconnected = true;
-                        }
-                        catch (error) {
-                            this._on_error(error);
-                            throw error;
-                        }
+                    if (websocket?.readyState === WebSocket.OPEN)
+                        return;
+                    // 重连
+                    try {
+                        this.lwebsocket.resource = await connect_websocket(this.url, {
+                            on_message: this._on_message,
+                            on_error: this._on_error,
+                            print: this.print
+                        });
+                        reconnected = true;
+                    }
+                    catch (error) {
+                        this._on_error(error);
+                        throw error;
                     }
                 });
                 if (this.keeper) {
@@ -502,8 +503,7 @@ export class Remote {
     async call(func, args, websocket) {
         return new Promise(async (resolve, reject) => {
             const id = genid();
-            this.handlers.set(id, (message) => {
-                const { error, data } = message;
+            this.handlers.set(id, ({ error, data }) => {
                 if (error)
                     reject(error);
                 else

package/net.d.ts

@@ -11,6 +11,7 @@ export declare const WebSocketConnecting = 0;
 export declare const WebSocketOpen = 1;
 export declare const WebSocketClosing = 2;
 export declare const WebSocketClosed = 3;
+export declare const websocket_states: readonly ["connecting", "open", "closing", "closed"];
 export declare enum MyProxy {
     socks5 = "http://127.0.0.1:10080",
     whistle = "http://localhost:8899",
@@ -281,4 +282,8 @@ export declare class RemoteClient {
     /** 发送 message 到 client
         发送或连接出错时自动清理 message.id 对应的 handler */
     send(message: Message): Promise<void>;
+    [inspect.custom](): {
+        remote: string;
+        websocket: string;
+    } & Omit<this, "websocket" | typeof import("util").inspect.custom | "call" | "remote" | "send">;
 }

package/net.js

@@ -9,6 +9,7 @@ export const WebSocketConnecting = 0;
 export const WebSocketOpen = 1;
 export const WebSocketClosing = 2;
 export const WebSocketClosed = 3;
+export const websocket_states = ['connecting', 'open', 'closing', 'closed'];
 export var MyProxy;
 (function (MyProxy) {
     MyProxy["socks5"] = "http://127.0.0.1:10080";
@@ -107,7 +108,7 @@ export async function request(url, options = {}) {
     let headers = {
         'accept-language': 'zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7,ja-JP;q=0.6,ja;q=0.5',
         'accept-encoding': 'gzip, deflate, br',
-        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36',
         'sec-ch-ua-platform': '"Windows"',
         'sec-ch-ua-platform-version': '"15.0.0"',
     };
@@ -502,9 +503,9 @@ export class Remote {
         if (keeper) {
             check(this.initiator && url);
             this.keeper = {
-                reconnect_interval: 1000 * 5,
+                reconnect_interval: 5000,
                 heartbeat_interval: 1000 * 60,
-                error_delay: 1000 * 2,
+                error_delay: 2000,
                 ...keeper
             };
         }
@@ -564,19 +565,20 @@ export class Remote {
                 await this.lwebsocket.request(async (websocket) => {
                     // 保存的 rpc 状态在 this.handlers, 与 websocket 无关，因此即使断开重连也不影响 rpc 的运行，即
                     // 底层连接断开后自动重连对上层应该是无感知的，除非再次连接时失败
-                    if (websocket?.readyState !== WebSocketOpen) { // 重连
-                        try {
-                            this.lwebsocket.resource = await connect_websocket(this.url, {
-                                on_message: this._on_message,
-                                on_error: this._on_error,
-                                print: this.print
-                            });
-                            reconnected = true;
-                        }
-                        catch (error) {
-                            this._on_error(error);
-                            throw error;
-                        }
+                    if (websocket?.readyState === WebSocketOpen)
+                        return;
+                    // 重连
+                    try {
+                        this.lwebsocket.resource = await connect_websocket(this.url, {
+                            on_message: this._on_message,
+                            on_error: this._on_error,
+                            print: this.print
+                        });
+                        reconnected = true;
+                    }
+                    catch (error) {
+                        this._on_error(error);
+                        throw error;
                     }
                 });
                 if (this.keeper) {
@@ -689,8 +691,7 @@ export class Remote {
     async call(func, args, websocket) {
         return new Promise(async (resolve, reject) => {
             const id = genid();
-            this.handlers.set(id, (message) => {
-                const { error, data } = message;
+            this.handlers.set(id, ({ error, data }) => {
                 if (error)
                     reject(error);
                 else
@@ -723,5 +724,13 @@ export class RemoteClient {
     async send(message) {
         return this.remote.send(message, this.websocket);
     }
+    [inspect.custom]() {
+        const { [inspect.custom]: _inspect, websocket, remote, ...others } = this;
+        return {
+            remote: '<Remote(receiver)>',
+            websocket: `<WebSocket(${websocket_states[websocket.readyState]})>`,
+            ...others
+        };
+    }
 }
 //# sourceMappingURL=net.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.2.12",
+    "version": "1.2.14",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -49,17 +49,17 @@
         ]
     },
     "dependencies": {
-        "@babel/core": "^7.26.7",
-        "@babel/parser": "^7.26.7",
-        "@babel/traverse": "^7.26.7",
+        "@babel/core": "^7.26.8",
+        "@babel/parser": "^7.26.8",
+        "@babel/traverse": "^7.26.8",
         "@koa/cors": "^5.0.0",
-        "@stylistic/eslint-plugin": "^3.0.0",
+        "@stylistic/eslint-plugin": "^3.1.0",
         "@svgr/webpack": "^8.1.0",
         "@types/sass-loader": "^8.0.9",
         "@types/ws": "^8.5.14",
-        "@typescript-eslint/eslint-plugin": "^8.21.0",
-        "@typescript-eslint/parser": "^8.21.0",
-        "@typescript-eslint/utils": "^8.21.0",
+        "@typescript-eslint/eslint-plugin": "^8.24.0",
+        "@typescript-eslint/parser": "^8.24.0",
+        "@typescript-eslint/utils": "^8.24.0",
         "archiver": "^7.0.1",
         "chalk": "^5.4.1",
         "cli-table3": "^0.6.5",
@@ -67,35 +67,35 @@
         "commander": "^13.1.0",
         "css-loader": "^7.1.2",
         "emoji-regex": "^10.4.0",
-        "eslint": "^9.19.0",
+        "eslint": "^9.20.1",
         "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-react": "^7.37.4",
         "gulp-sort": "^2.0.0",
         "https-proxy-agent": "^7.0.6",
         "i18next": "^24.2.2",
         "i18next-scanner": "^4.6.0",
-        "koa": "^2.15.3",
+        "koa": "^2.15.4",
         "koa-compress": "^5.1.1",
         "license-webpack-plugin": "^4.0.2",
         "lodash": "^4.17.21",
         "map-stream": "^0.0.7",
         "mime-types": "^2.1.35",
-        "ora": "^8.1.1",
+        "ora": "^8.2.0",
         "react": "^19.0.0",
         "react-i18next": "^15.4.0",
-        "react-object-model": "^1.2.22",
+        "react-object-model": "^1.2.23",
         "resolve-path": "^1.4.0",
-        "sass": "^1.83.4",
+        "sass": "^1.84.0",
         "sass-loader": "^16.0.4",
         "source-map-loader": "^5.0.0",
         "strip-ansi": "^7.1.0",
         "style-loader": "^4.0.0",
         "through2": "^4.0.2",
-        "tough-cookie": "^5.1.0",
+        "tough-cookie": "^5.1.1",
         "ts-loader": "^9.5.2",
         "tslib": "^2.8.1",
         "typescript": "^5.7.3",
-        "ua-parser-js": "^2.0.0",
+        "ua-parser-js": "^2.0.2",
         "undici": "^7.3.0",
         "vinyl": "^3.0.0",
         "vinyl-fs": "^4.0.0",
@@ -104,7 +104,7 @@
         "ws": "^8.18.0"
     },
     "devDependencies": {
-        "@babel/types": "^7.26.7",
+        "@babel/types": "^7.26.8",
         "@types/archiver": "^6.0.3",
         "@types/babel__traverse": "^7.20.6",
         "@types/eslint": "^9.6.1",
@@ -112,20 +112,20 @@
         "@types/gulp-sort": "^2.0.4",
         "@types/koa": "^2.15.0",
         "@types/koa-compress": "^4.0.6",
-        "@types/lodash": "^4.17.14",
+        "@types/lodash": "^4.17.15",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^22.10.10",
+        "@types/node": "^22.13.1",
         "@types/react": "^19.0.8",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",
         "@types/ua-parser-js": "^0.7.39",
         "@types/vinyl-fs": "^3.0.5",
-        "@types/vscode": "^1.96.0",
+        "@types/vscode": "^1.97.0",
         "@types/webpack-bundle-analyzer": "^4.7.0"
     },
     "pnpm": {
         "patchedDependencies": {
-            "koa@2.15.3": "patches/koa@2.15.3.patch"
+            "koa@2.15.4": "patches/koa@2.15.4.patch"
         }
     }
 }

package/process.js

@@ -252,7 +252,7 @@ export async function call(exe, args = [], options = {}) {
         });
     });
     const message = `进程 ${command} ` + (code
-        ? `${throw_code ? '异常' : ''}结束，退出码: ${code}${signal ? `，信号: ${signal}` : ''}`
+        ? `${throw_code ? '异常' : ''}结束，退出码: ${code} (${code.to_hex_str()})${signal ? `，信号: ${signal}` : ''}`
         : '正常结束');
     if (print.code && !code)
         console.log(message.blue);

package/server.d.ts

@@ -136,6 +136,7 @@ export declare class Server {
         sea?: boolean;
         log_404?: boolean;
     }): Promise<boolean>;
+    log_404(ctx: Context): void;
     /** 将 body 设置为 fp 所指文件的 ReadStream
         检查 fp 是否合法，设置对应的 content-type，支持缓存，支持分块下载
         - ctx: Koa.Context

package/server.js

@@ -572,7 +572,7 @@ export class Server {
             return
         } */
     async try_send(ctx, fp, { fpd_root, assets_root, sea: _sea = sea, log_404 = true, } = {}) {
-        const { request: { _path, path, method }, response, } = ctx;
+        const { request: { method }, response, } = ctx;
         if (response.body !== undefined || response.status !== 404)
             return true;
         if (method !== 'HEAD' && method !== 'GET')
@@ -584,15 +584,15 @@ export class Server {
         catch (error) {
             if (error.status !== 404)
                 throw error;
-            if (log_404 && this.print.logs) {
-                let s = `${' '.repeat(11)}    ${method.toLowerCase()} 404: ${path}`;
-                if (_path !== path)
-                    s += ` ${_path.bracket()}`;
-                console.log(s.red);
-            }
+            if (log_404 && this.print.logs)
+                this.log_404(ctx);
             return false;
         }
     }
+    log_404(ctx) {
+        const { request: { _path, path, method } } = ctx;
+        console.log(`${' '.repeat(15)}${method.toLowerCase()} 404: ${path}${_path === path ? '' : ` ${_path.bracket()}`}`.red);
+    }
     /** 将 body 设置为 fp 所指文件的 ReadStream
         检查 fp 是否合法，设置对应的 content-type，支持缓存，支持分块下载
         - ctx: Koa.Context

package/utils.browser.js

@@ -211,9 +211,6 @@ export class Lock {
                         reject(error);
                     }
                 // 下面开始释放锁
-                // assert(this.locked)
-                if (!this.locked)
-                    reject(new Error(t('尝试释放未锁定的锁，这不应该发生')));
                 this.locked = false;
                 pcurrent.resolve();
             });

package/utils.js

@@ -415,9 +415,6 @@ export class Lock {
                         reject(error);
                     }
                 // 下面开始释放锁
-                // assert(this.locked)
-                if (!this.locked)
-                    reject(new Error(t('尝试释放未锁定的锁，这不应该发生')));
                 this.locked = false;
                 pcurrent.resolve();
             });