xshell 1.0.97 → 1.0.99

package/net.browser.js

@@ -424,10 +424,8 @@ export class Remote {
                 if (data)
                     await this.send({ id, data }, websocket);
             }
-            else if (message.error)
-                throw message.error;
             else
-                throw new Error(`${t('找不到 rpc handler')}: ${func ? `func: ${func.quote()}` : `id: ${id}`}`);
+                throw message.error || new Error(`${t('找不到 rpc handler')}: ${func ? `func: ${func.quote()}` : `id: ${id}`}`);
         }
         catch (error) {
             // handler 出错并不意味着 rpc 一定会结束，可能 error 是运行中的正常数据，所以不能清理 handler

package/net.js

@@ -632,10 +632,8 @@ export class Remote {
                 if (data)
                     await this.send({ id, data }, websocket);
             }
-            else if (message.error)
-                throw message.error;
             else
-                throw new Error(`${t('找不到 rpc handler')}: ${func ? `func: ${func.quote()}` : `id: ${id}`}`);
+                throw message.error || new Error(`${t('找不到 rpc handler')}: ${func ? `func: ${func.quote()}` : `id: ${id}`}`);
         }
         catch (error) {
             // handler 出错并不意味着 rpc 一定会结束，可能 error 是运行中的正常数据，所以不能清理 handler

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.97",
+    "version": "1.0.99",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -77,26 +77,26 @@
         "gulp-sort": "^2.0.0",
         "hash-string": "^1.0.0",
         "https-proxy-agent": "^7.0.4",
-        "i18next": "^23.11.3",
+        "i18next": "^23.11.4",
         "i18next-scanner": "^4.4.0",
         "js-cookie": "^3.0.5",
         "koa": "^2.15.3",
         "koa-compress": "^5.1.1",
         "lodash": "^4.17.21",
-        "map-stream": "0.0.7",
+        "map-stream": "^0.0.7",
         "mime-types": "^2.1.35",
         "ora": "^8.0.1",
         "react": "^18.3.1",
         "react-i18next": "^14.1.1",
-        "react-object-model": "^1.2.4",
+        "react-object-model": "^1.2.5",
         "resolve-path": "^1.4.0",
         "strip-ansi": "^7.1.0",
         "through2": "^4.0.2",
         "tough-cookie": "^4.1.4",
         "tslib": "^2.6.2",
         "typescript": "^5.4.5",
-        "ua-parser-js": "2.0.0-alpha.2",
-        "undici": "^6.16.0",
+        "ua-parser-js": "^2.0.0-beta.2",
+        "undici": "^6.16.1",
         "vinyl": "^3.0.0",
         "vinyl-fs": "^4.0.0",
         "ws": "^8.17.0",
@@ -114,14 +114,14 @@
         "@types/chardet": "^0.8.3",
         "@types/eslint": "^8.56.10",
         "@types/estree": "^1.0.5",
-        "@types/gulp-sort": "2.0.4",
+        "@types/gulp-sort": "^2.0.4",
         "@types/js-cookie": "^3.0.6",
         "@types/koa": "^2.15.0",
         "@types/koa-compress": "^4.0.6",
         "@types/lodash": "^4.17.1",
         "@types/mime-types": "^2.1.4",
         "@types/node": "^20.12.11",
-        "@types/react": "^18.3.1",
+        "@types/react": "^18.3.2",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",
         "@types/ua-parser-js": "^0.7.39",

package/prototype.browser.d.ts

@@ -121,6 +121,8 @@ declare global {
         to_oct_str(this: number): string;
     }
     interface Array<T> {
+        /** 等价于 .at(-1) */
+        last: T;
         indent(this: string[], width: number, c?: string): string[];
         /**
             - trim_line?: `true`

package/prototype.browser.js

@@ -406,6 +406,11 @@ Object.defineProperties(Number.prototype, to_method_property_descriptors({
 }));
 // ------------------------------------ Array.prototype
 Object.defineProperties(Array.prototype, {
+    ...to_getter_property_descriptors({
+        last() {
+            return this.at(-1);
+        }
+    }),
     // --- 文本处理工具方法
     ...to_method_property_descriptors({
         trim_lines({ trim_line = true, rm_empty_lines = true, rm_last_empty_lines = false } = {}) {

package/prototype.d.ts

@@ -145,6 +145,8 @@ declare global {
         to_oct_str(this: number): string;
     }
     interface Array<T> {
+        /** 等价于 .at(-1) */
+        last: T;
         log(this: string[], limit?: number): void;
         indent(this: string[], width: number, c?: string): string[];
         indent2to4(this: string[]): string[];

package/prototype.js

@@ -435,6 +435,11 @@ if (!globalThis.my_prototype_defined) {
     }));
     // ------------------------------------ Array.prototype
     Object.defineProperties(Array.prototype, {
+        ...to_getter_property_descriptors({
+            last() {
+                return this.at(-1);
+            }
+        }),
         // --- 文本处理工具方法
         ...to_method_property_descriptors({
             log(limit = 10000) {

package/utils.browser.d.ts

@@ -9,7 +9,10 @@ export declare function seq<T = number>(n: number, generator?: (index: number) =
 /** 将 keys, values 数组按对应的顺序组合成一个对象 */
 export declare function zip_object<TValue>(keys: (string | number)[], values: TValue[]): Record<string, TValue>;
 export declare function delay(milliseconds: number): Promise<void>;
-export declare function timeout(milliseconds: number): Promise<void>;
+export declare class TimeoutError extends Error {
+    constructor(message?: string, options?: ErrorOptions);
+}
+export declare function timeout<TReturn>(milliseconds: number, action: () => Promise<TReturn>): Promise<TReturn>;
 /** https://stackoverflow.com/questions/63297164/how-to-only-accept-arraybuffer-as-parameter */
 export type StrictArrayBuffer = ArrayBuffer & {
     buffer?: undefined;

package/utils.browser.js

@@ -32,10 +32,18 @@ export async function delay(milliseconds) {
         setTimeout(resolve, milliseconds);
     });
 }
-export async function timeout(milliseconds) {
-    const error = new Error(t('超时错误'));
-    await delay(milliseconds);
-    throw error;
+export class TimeoutError extends Error {
+    constructor(message, options) {
+        super(message, options);
+        this.name = this.constructor.name;
+    }
+}
+export async function timeout(milliseconds, action) {
+    const error = new TimeoutError();
+    return new Promise((resolve, reject) => {
+        delay(milliseconds).then(() => { reject(error); });
+        action().then(resolve, reject);
+    });
 }
 /** 创建一个 promise，后续可调用 promise.resolve, promise.reject 方法设置其状态和值
     - initial?: `undefined` 传入非 undefined 值（包括 null）时直接设置为 resolved 状态

package/utils.d.ts

@@ -67,7 +67,10 @@ export declare class Timer {
 }
 export declare function log_line(): void;
 export declare function delay(milliseconds: number): Promise<void>;
-export declare function timeout(milliseconds: number): Promise<void>;
+export declare class TimeoutError extends Error {
+    constructor(message?: string, options?: ErrorOptions);
+}
+export declare function timeout<TReturn>(milliseconds: number, action: () => Promise<TReturn>): Promise<TReturn>;
 /** https://stackoverflow.com/questions/63297164/how-to-only-accept-arraybuffer-as-parameter */
 export type StrictArrayBuffer = ArrayBuffer & {
     buffer?: undefined;

package/utils.js

@@ -199,10 +199,18 @@ export async function delay(milliseconds) {
         setTimeout(resolve, milliseconds);
     });
 }
-export async function timeout(milliseconds) {
-    const error = new Error(t('超时错误'));
-    await delay(milliseconds);
-    throw error;
+export class TimeoutError extends Error {
+    constructor(message, options) {
+        super(message, options);
+        this.name = this.constructor.name;
+    }
+}
+export async function timeout(milliseconds, action) {
+    const error = new TimeoutError();
+    return new Promise((resolve, reject) => {
+        delay(milliseconds).then(() => { reject(error); });
+        action().then(resolve, reject);
+    });
 }
 /** 创建一个 promise，后续可调用 promise.resolve, promise.reject 方法设置其状态和值
     - initial?: `undefined` 传入非 undefined 值（包括 null）时直接设置为 resolved 状态