xshell 1.0.204 → 1.0.206

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.204",
+    "version": "1.0.206",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -57,9 +57,9 @@
         "@svgr/webpack": "^8.1.0",
         "@types/sass-loader": "^8.0.9",
         "@types/ws": "^8.5.13",
-        "@typescript-eslint/eslint-plugin": "^8.16.0",
-        "@typescript-eslint/parser": "^8.16.0",
-        "@typescript-eslint/utils": "^8.16.0",
+        "@typescript-eslint/eslint-plugin": "^8.17.0",
+        "@typescript-eslint/parser": "^8.17.0",
+        "@typescript-eslint/utils": "^8.17.0",
         "@xterm/addon-fit": "^0.10.0",
         "@xterm/addon-web-links": "^0.11.0",
         "@xterm/addon-webgl": "^0.18.0",
@@ -75,13 +75,13 @@
         "commander": "^12.1.0",
         "css-loader": "^7.1.2",
         "emoji-regex": "^10.4.0",
-        "eslint": "^9.15.0",
+        "eslint": "^9.16.0",
         "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-react": "^7.37.2",
         "gulp-sort": "^2.0.0",
         "hash-string": "^1.0.0",
         "https-proxy-agent": "^7.0.5",
-        "i18next": "^24.0.2",
+        "i18next": "^24.0.5",
         "i18next-scanner": "^4.6.0",
         "koa": "^2.15.3",
         "koa-compress": "^5.1.1",
@@ -91,10 +91,10 @@
         "mime-types": "^2.1.35",
         "ora": "^8.1.1",
         "react": "^18.3.1",
-        "react-i18next": "^15.1.2",
+        "react-i18next": "^15.1.3",
         "react-object-model": "^1.2.18",
         "resolve-path": "^1.4.0",
-        "sass": "^1.81.0",
+        "sass": "^1.81.1",
         "sass-loader": "^16.0.3",
         "source-map-loader": "^5.0.0",
         "strip-ansi": "^7.1.0",

package/process.js

@@ -7,6 +7,12 @@ export const platform = os.platform();
 export const username = os.userInfo().username;
 export const noprint = { print: false };
 export const print_no_command = { print: { command: false, code: false, stdout: true, stderr: true } };
+function get_command(exe, args) {
+    return (short_exe_names[exe] || exe.quote_if_space()) +
+        (args.length
+            ? ' ' + args.map(arg => arg.quote_if_space()).join(' ')
+            : '');
+}
 async function prepare_spawn(detached, exe, args, { cwd, window: _window = true, envs, 
 // @ts-ignore
 input, fp_stdin, fp_stdout, fp_stderr, print = true, proxy, 
@@ -78,13 +84,7 @@ stdio }) {
         };
     let command;
     if (print.command)
-        console.log((command =
-            (short_exe_names[exe] || exe.quote_if_space()) +
-                (args.length
-                    ? ' ' + args
-                        .map(arg => arg.quote_if_space())
-                        .join(' ')
-                    : '')).blue);
+        console.log((command = get_command(exe, args)).blue);
     return {
         print,
         command,
@@ -193,7 +193,7 @@ export async function call(exe, args = [], options = {}) {
     let message;
     const code_error = throw_code && (code || signal);
     if (print.code || code_error) {
-        message = `进程 ${command} ` + (code
+        message = `进程 ${command || get_command(exe, args)} ` + (code
             ? `${throw_code ? '异常' : ''}结束，退出码: ${code}${signal ? `，信号: ${signal}` : ''}`
             : '正常结束');
         console.log(message[code_error ? 'red' : 'blue']);

package/server.js

@@ -148,8 +148,16 @@ export class Server {
                 maxPayload: 2 ** 30 // 1 GB
             });
             this.websocket_server.on('connection', (ws, request) => {
-                ws.addEventListener('message', ({ data }) => {
-                    this.remote.handle(new Uint8Array(data), ws);
+                ws.addEventListener('message', async ({ data }) => {
+                    // 处理 funcs 中已经注册的 handlers
+                    try {
+                        await this.remote.handle(new Uint8Array(data), ws);
+                    }
+                    catch (error) {
+                        this.on_error(error);
+                        // 这里再往上扔会成为 uncaughtException 使进程退出，
+                        // 通过上面的处理应该足够了
+                    }
                 });
             });
             const on_upgrade = this.on_upgrade.bind(this);
@@ -248,11 +256,12 @@ export class Server {
     }
     /** 可被子类重写定义错误处理逻辑 */
     on_error(error, ctx) {
-        if (error.code === 'EPIPE' || error.code === 'ECONNRESET')
+        const code = error?.code;
+        if (code === 'EPIPE' || code === 'ECONNRESET')
             console.log(`${error.code}:`, ctx?.request?.url);
         else {
             console.error(error);
-            console.log(ctx);
+            console.log('ctx:', ctx);
         }
     }
     on_upgrade(request, socket, head) {
@@ -359,7 +368,7 @@ export class Server {
     logger(ctx) {
         const { colors } = this;
         const { request } = ctx;
-        const { query, body, path, _path, protocol, host, req: { httpVersion: http_version }, ip, headers, } = request;
+        const { query: queries, body, path, _path, protocol, host, req: { httpVersion: http_version }, ip, headers, } = request;
         let { method } = request;
         let s = '';
         // 时间
@@ -396,9 +405,9 @@ export class Server {
                 end = Number(end).to_fsize_str();
             s += ` (${start} - ${end || ''})`;
         }
-        // query
-        if (Object.keys(query).length) {
-            let t = inspect(query, { compact: true })
+        // queries
+        if (Object.keys(queries).length) {
+            let t = inspect(queries, { compact: true })
                 .replace('[Object: null prototype] ', '')
                 .strip_if_end('\n');
             s += (s + t).width > output_width ? '\n' : '    ';
@@ -468,15 +477,15 @@ export class Server {
             - timeout?: `1000 * 5` 请求超时时间，可以传入 0 禁用超时
             - throw_error?: `false` 在遇到 request 请求错误时直接 throw 出来，而不是自动设置到 response */
     async request(ctx, path_url, { headers: headers_, redirect = 'manual', queries, timeout, throw_error } = {}) {
-        const { request: { method, headers, query, body, ip } } = ctx;
+        const { request: { method, headers, query: _queries, body, ip } } = ctx;
         let { response } = ctx;
         const x_forwarded_for = headers['x-forwarded-for'] ? `${headers['x-forwarded-for']}, ${ip}` : ip;
         try {
             const response_ = await _request(path_url, {
                 method: method,
                 queries: queries
-                    ? filter_values({ ...query, ...queries })
-                    : query,
+                    ? filter_values({ ..._queries, ...queries })
+                    : _queries,
                 body,
                 headers: (headers_
                     ? filter_values({