xshell 1.0.189 → 1.0.191

package/file.js

@@ -384,7 +384,8 @@ export async function flink(fp_real, fp_link, { junction = false, print = true,
         if (!skip_existing)
             throw new Error(`存在同名${is_fpd_link ? '文件夹' : '文件'}: ${fp_link}，无法创建链接`);
         else {
-            console.log('跳过已存在: ', fp_link);
+            if (print)
+                console.log('跳过已存在:', fp_link);
             return;
         }
     if (print)

package/git.d.ts

@@ -5,10 +5,11 @@ export declare class Git {
     constructor(cwd: string);
     static init(cwd: string, print?: boolean): Promise<Git>;
     static clone(repo: string, fpd: string, shallow?: boolean | string): Promise<void>;
-    call(args?: any[], { color, print, printers }?: {
+    call(args?: any[], { color, print, printers, throw_code, }?: {
         color?: boolean;
         print?: CallOptions['print'];
         printers?: CallOptions['printers'];
+        throw_code?: CallOptions['throw_code'];
     }): Promise<import("./process.ts").CallResult<string>>;
     get_branch(): Promise<string>;
     /** - print: `true` */

package/git.js

@@ -22,7 +22,7 @@ export class Git {
             '.'
         ]);
     }
-    async call(args = [], { color = true, print, printers } = {}) {
+    async call(args = [], { color = true, print, printers, throw_code, } = {}) {
         return call(Git.exe, [
             ...color ? [] : [
                 '-c', 'color.status=false',
@@ -34,7 +34,8 @@ export class Git {
         ], {
             cwd: this.cwd,
             print,
-            printers
+            printers,
+            throw_code
         });
     }
     async get_branch() {
@@ -89,7 +90,7 @@ export class Git {
             'fetch',
             remote || '--all',
             '--prune'
-        ], { print: { code: false, command: false, stdout: true, stderr: true } });
+        ], print_stdout);
         if (print)
             console.log('更新远程分支成功');
     }
@@ -129,4 +130,5 @@ export class Git {
         };
     }
 }
+const print_stdout = { print: { code: false, command: false, stdout: true, stderr: true } };
 //# sourceMappingURL=git.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.189",
+    "version": "1.0.191",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -49,8 +49,8 @@
         ]
     },
     "dependencies": {
-        "@babel/core": "^7.25.9",
-        "@babel/parser": "^7.25.9",
+        "@babel/core": "^7.26.0",
+        "@babel/parser": "^7.26.1",
         "@babel/traverse": "^7.25.9",
         "@koa/cors": "^5.0.0",
         "@stylistic/eslint-plugin": "^2.9.0",
@@ -81,7 +81,7 @@
         "gulp-sort": "^2.0.0",
         "hash-string": "^1.0.0",
         "https-proxy-agent": "^7.0.5",
-        "i18next": "^23.16.2",
+        "i18next": "^23.16.4",
         "i18next-scanner": "^4.6.0",
         "koa": "^2.15.3",
         "koa-compress": "^5.1.1",
@@ -92,9 +92,9 @@
         "ora": "^8.1.0",
         "react": "^18.3.1",
         "react-i18next": "^15.1.0",
-        "react-object-model": "^1.2.14",
+        "react-object-model": "^1.2.15",
         "resolve-path": "^1.4.0",
-        "sass": "^1.80.3",
+        "sass": "^1.80.4",
         "sass-loader": "^16.0.2",
         "source-map-loader": "^5.0.0",
         "strip-ansi": "^7.1.0",
@@ -113,9 +113,9 @@
         "ws": "^8.18.0"
     },
     "devDependencies": {
-        "@babel/types": "^7.25.9",
+        "@babel/types": "^7.26.0",
         "@types/ali-oss": "^6.16.11",
-        "@types/archiver": "^6.0.2",
+        "@types/archiver": "^6.0.3",
         "@types/babel__traverse": "^7.20.6",
         "@types/byte-size": "^8.1.2",
         "@types/chardet": "^0.8.3",
@@ -126,8 +126,8 @@
         "@types/koa-compress": "^4.0.6",
         "@types/lodash": "^4.17.12",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^22.7.8",
-        "@types/react": "^18.3.11",
+        "@types/node": "^22.8.1",
+        "@types/react": "^18.3.12",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",
         "@types/ua-parser-js": "^0.7.39",

package/prototype.browser.d.ts

@@ -92,7 +92,7 @@ declare global {
                 - include?: `false` 传 true 时包括 search 部分
                 - last?: `false` true 时从最后一次出现的地方开始截取，否则默认从第一次出现的地方开始截取 */
         slice_from(this: string, search: string, options?: SliceOptions): string;
-        /** 从 search 字符串最后出现的位置开始截断，去掉尾部
+        /** 从 search 字符串出现的位置开始截断，去掉尾部
             - options?:
                 - include?: `false` 传 true 时包括 search 部分
                 - last?: `false` true 时截取到最后一次出现的地方，否则默认截取到第一次出现的地方 */

package/prototype.d.ts

@@ -114,7 +114,7 @@ declare global {
                 - include?: `false` 传 true 时包括 search 部分
                 - last?: `false` true 时从最后一次出现的地方开始截取，否则默认从第一次出现的地方开始截取 */
         slice_from(this: string, search: string, options?: SliceOptions): string;
-        /** 从 search 字符串最后出现的位置开始截断，去掉尾部
+        /** 从 search 字符串出现的位置开始截断，去掉尾部
             - options?:
                 - include?: `false` 传 true 时包括 search 部分
                 - last?: `false` true 时截取到最后一次出现的地方，否则默认截取到第一次出现的地方 */

package/server.js

@@ -303,8 +303,8 @@ export class Server {
             if (error.status !== 404)
                 console.error(error);
             response.status = error.status || 500;
+            response.set('content-type', 'text/plain; charset=utf-8');
             response.body = inspect(error, { colors: false });
-            response.type = 'text/plain';
         }
     }
     /** 解析 req.body to request.body

package/utils.browser.d.ts

@@ -24,7 +24,10 @@ export declare function delay(milliseconds: number, { signal }?: {
 export declare class TimeoutError extends Error {
     constructor(message?: string, options?: ErrorOptions);
 }
-export declare function timeout<TReturn>(milliseconds: number, action: () => Promise<TReturn>): Promise<TReturn>;
+/** 在指定的时间 (milliseconds) 内运行某个任务，超时之后
+    - 如果传入了 on_timeout 参数: 调用 on_timeout，返回 null
+    - 如果没传入 on_timeout 参数: 抛出 TimeoutError */
+export declare function timeout<TReturn>(milliseconds: number, action: () => Promise<TReturn>, on_timeout?: () => void | Promise<void>): Promise<TReturn>;
 /** https://stackoverflow.com/questions/63297164/how-to-only-accept-arraybuffer-as-parameter */
 export type StrictArrayBuffer = ArrayBuffer & {
     buffer?: undefined;
@@ -75,7 +78,7 @@ export declare function encode(str: string): Uint8Array;
     在流式处理 (buffer 可能不完整) 时，应使用独立的 TextDecoder 实例调用 decode(buffer, { stream: true }) */
 export declare function decode(buffer: Uint8Array): string;
 /** 字符串字典序比较 */
-export declare function strcmp(l: string, r: string): 0 | 1 | -1;
+export declare function strcmp(l: string, r: string): 1 | 0 | -1;
 /** 比较 1.10.02 这种版本号
     - l, r: 两个版本号字符串
     - loose?: 宽松模式，允许两个版本号格式（位数）不一致 */

package/utils.browser.js

@@ -71,11 +71,51 @@ export class TimeoutError extends Error {
         this.name = this.constructor.name;
     }
 }
-export async function timeout(milliseconds, action) {
+/** 在指定的时间 (milliseconds) 内运行某个任务，超时之后
+    - 如果传入了 on_timeout 参数: 调用 on_timeout，返回 null
+    - 如果没传入 on_timeout 参数: 抛出 TimeoutError */
+export async function timeout(milliseconds, action, on_timeout) {
     const error = new TimeoutError();
     return new Promise((resolve, reject) => {
-        delay(milliseconds).then(() => { reject(error); });
-        action().then(resolve, reject);
+        let done = false;
+        let rejected = false;
+        (async () => {
+            await delay(milliseconds);
+            if (!done)
+                if (on_timeout)
+                    try {
+                        await on_timeout();
+                        resolve(null);
+                    }
+                    catch (error) {
+                        if (rejected)
+                            throw error; // 会成为 unhandled rejection
+                        else {
+                            rejected = true;
+                            reject(error);
+                        }
+                    }
+                else {
+                    rejected = true;
+                    reject(error);
+                }
+        })();
+        (async () => {
+            try {
+                resolve(await action());
+            }
+            catch (error) {
+                if (rejected)
+                    console.log(`已超时任务的错误: ${error.message}`);
+                else {
+                    rejected = true;
+                    reject(error);
+                }
+            }
+            finally {
+                done = true;
+            }
+        })();
     });
 }
 /** 创建一个 promise，后续可调用 promise.resolve, promise.reject 方法设置其状态和值

package/utils.d.ts

@@ -42,7 +42,7 @@ export declare function filter_values<TObj extends Record<string, any>>(obj: TOb
 /** 忽略对象中的 keys, 返回新对象 */
 export declare function omit<TObj>(obj: TObj, omit_keys: string[]): TObj;
 /** 字符串字典序比较 */
-export declare function strcmp(l: string, r: string): 0 | 1 | -1;
+export declare function strcmp(l: string, r: string): 1 | 0 | -1;
 /** 比较 1.10.02 这种版本号
     - l, r: 两个版本号字符串
     - loose?: 宽松模式，允许两个版本号格式（位数）不一致 */
@@ -85,7 +85,10 @@ export declare function delay(milliseconds: number, options?: TimerOptions): Pro
 export declare class TimeoutError extends Error {
     constructor(message?: string, options?: ErrorOptions);
 }
-export declare function timeout<TReturn>(milliseconds: number, action: () => Promise<TReturn>): Promise<TReturn>;
+/** 在指定的时间 (milliseconds) 内运行某个任务，超时之后
+    - 如果传入了 on_timeout 参数: 调用 on_timeout，返回 null
+    - 如果没传入 on_timeout 参数: 抛出 TimeoutError */
+export declare function timeout<TReturn>(milliseconds: number, action: () => Promise<TReturn>, on_timeout?: () => void | Promise<void>): Promise<TReturn>;
 /** https://stackoverflow.com/questions/63297164/how-to-only-accept-arraybuffer-as-parameter */
 export type StrictArrayBuffer = ArrayBuffer & {
     buffer?: undefined;

package/utils.js

@@ -242,11 +242,51 @@ export class TimeoutError extends Error {
         this.name = this.constructor.name;
     }
 }
-export async function timeout(milliseconds, action) {
+/** 在指定的时间 (milliseconds) 内运行某个任务，超时之后
+    - 如果传入了 on_timeout 参数: 调用 on_timeout，返回 null
+    - 如果没传入 on_timeout 参数: 抛出 TimeoutError */
+export async function timeout(milliseconds, action, on_timeout) {
     const error = new TimeoutError();
     return new Promise((resolve, reject) => {
-        delay(milliseconds).then(() => { reject(error); });
-        action().then(resolve, reject);
+        let done = false;
+        let rejected = false;
+        (async () => {
+            await delay(milliseconds);
+            if (!done)
+                if (on_timeout)
+                    try {
+                        await on_timeout();
+                        resolve(null);
+                    }
+                    catch (error) {
+                        if (rejected)
+                            throw error; // 会成为 unhandled rejection
+                        else {
+                            rejected = true;
+                            reject(error);
+                        }
+                    }
+                else {
+                    rejected = true;
+                    reject(error);
+                }
+        })();
+        (async () => {
+            try {
+                resolve(await action());
+            }
+            catch (error) {
+                if (rejected)
+                    console.log(`已超时任务的错误: ${error.message}`);
+                else {
+                    rejected = true;
+                    reject(error);
+                }
+            }
+            finally {
+                done = true;
+            }
+        })();
     });
 }
 /** 创建一个 promise，后续可调用 promise.resolve, promise.reject 方法设置其状态和值

package/xlint.js

@@ -587,7 +587,9 @@ export const xlint_plugin = {
                     },
                     FunctionExpression(node) {
                         stack.push(false);
-                        if (node.parent.type === 'VariableDeclarator')
+                        if (node.parent.type === 'VariableDeclarator' &&
+                            // 忽略 let a = 1, b = function () { } 这样的情况
+                            node.parent.parent.declarations.length === 1)
                             context.report({
                                 node: node.parent.parent,
                                 message: '函数应该使用 function foo { } 这样来声明而不是 const foo = function () { }',
@@ -607,9 +609,11 @@ export const xlint_plugin = {
                     },
                     'ArrowFunctionExpression:exit'(node) {
                         if (!stack.pop() && // not has this expr
-                            node.parent.type === 'VariableDeclarator' &&
-                            node.body.type === 'BlockStatement' && node.body.body.length // 多条语句才转换
-                        )
+                            (node.parent.type === 'VariableDeclarator' &&
+                                // 忽略 let a = 1, b = () => { } 这样的情况
+                                node.parent.parent.declarations.length === 1) &&
+                            // 多条语句才转换
+                            node.body.type === 'BlockStatement' && node.body.body.length)
                             context.report({
                                 node: node.parent.parent,
                                 message: '多条语句的函数应该使用 function foo { } 这样来声明而不是 const foo = () => { }',