xshell 1.0.96 → 1.0.98

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.96",
+    "version": "1.0.98",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -71,19 +71,19 @@
         "colors": "^1.4.0",
         "commander": "^12.0.0",
         "emoji-regex": "^10.3.0",
-        "eslint": "^9.1.1",
+        "eslint": "^9.2.0",
         "eslint-plugin-import": "^2.29.1",
         "eslint-plugin-react": "^7.34.1",
         "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",
@@ -95,8 +95,8 @@
         "tough-cookie": "^4.1.4",
         "tslib": "^2.6.2",
         "typescript": "^5.4.5",
-        "ua-parser-js": "2.0.0-alpha.2",
-        "undici": "^6.15.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",
@@ -118,15 +118,15 @@
         "@types/js-cookie": "^3.0.6",
         "@types/koa": "^2.15.0",
         "@types/koa-compress": "^4.0.6",
-        "@types/lodash": "^4.17.0",
+        "@types/lodash": "^4.17.1",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^20.12.7",
-        "@types/react": "^18.3.1",
+        "@types/node": "^20.12.11",
+        "@types/react": "^18.3.2",
         "@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.88.0"
+        "@types/vscode": "^1.89.0"
     },
     "pnpm": {
         "patchedDependencies": {

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

@@ -6,8 +6,13 @@ export declare function log<T>(obj: T): T;
 /** 生成 0, 1, ..., n - 1 (不包括 n) 的数组，支持传入 generator 函数，通过 index 生成各个元素
     @example seq(10, i => `item-${i}`) */
 export declare function seq<T = number>(n: number, generator?: (index: number) => T): T[];
+/** 将 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;
@@ -58,7 +63,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): 1 | 0 | -1;
+export declare function strcmp(l: string, r: string): 0 | 1 | -1;
 /** 比较 1.10.02 这种版本号 */
 export declare function vercmp(l: string, r: string): number;
 export declare function get<TReturn = any>(obj: any, keypath: string): TReturn;

package/utils.browser.js

@@ -20,15 +20,30 @@ export function seq(n, generator) {
         a[i] = generator ? generator(i) : i;
     return a;
 }
+/** 将 keys, values 数组按对应的顺序组合成一个对象 */
+export function zip_object(keys, values) {
+    return keys.reduce((obj, key, i) => {
+        obj[key] = values[i];
+        return obj;
+    }, {});
+}
 export async function delay(milliseconds) {
     return new Promise(resolve => {
         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

@@ -16,13 +16,14 @@ export declare function log<T>(obj: T): T;
 /** 生成 0, 1, ..., n - 1 (不包括 n) 的数组，支持传入 generator 函数，通过 index 生成各个元素
     @example seq(10, i => `item-${i}`) */
 export declare function seq<T = number>(n: number, generator?: (index: number) => T): T[];
-export declare function dedent(templ: TemplateStringsArray | string, ...values: any[]): string;
 /** 数组或 iterable 去重（可按 selector 去重）
     - selector?: 可以是 key (string) 或 (obj: any) => any
 */
 export declare function unique<T>(iterable: T[] | Iterable<T>, selector?: string | ((obj: T) => any)): any[];
 /** 排序对象中 keys 的顺序，返回新的对象 */
 export declare function sort_keys<TObj>(obj: TObj): TObj;
+/** 将 keys, values 数组按对应的顺序组合成一个对象 */
+export declare function zip_object<TValue>(keys: (string | number)[], values: TValue[]): Record<string, TValue>;
 /** 映射对象中的 keys, 返回新对象 */
 export declare function map_keys<TObj>(obj: TObj, mapper: (key: string) => string): TObj;
 /** 映射对象中的 values, 返回新对象 */
@@ -38,7 +39,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): 1 | 0 | -1;
+export declare function strcmp(l: string, r: string): 0 | 1 | -1;
 /** 比较 1.10.02 这种版本号 */
 export declare function vercmp(l: string, r: string): number;
 export declare function get<TReturn = any>(obj: any, keypath: string): TReturn;
@@ -66,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

@@ -41,32 +41,6 @@ export function seq(n, generator) {
         a[i] = generator ? generator(i) : i;
     return a;
 }
-export function dedent(templ, ...values) {
-    let strings = Array.from(typeof templ === 'string' ? [templ] : templ.raw);
-    // 1. remove trailing whitespace
-    strings[strings.length - 1] = strings[strings.length - 1].replace(/\r?\n([\t ]*)$/, '');
-    // 2. find all line breaks to determine the highest common indentation level
-    const indent_lengths = strings.reduce((arr, str) => {
-        const matches = str.match(/\n[\t ]+/g);
-        if (matches)
-            return arr.concat(matches.map(match => match.length - 1));
-        return arr;
-    }, []);
-    // 3. remove the common indentation from all strings
-    if (indent_lengths.length) {
-        const pattern = new RegExp(`\n[\t ]{${Math.min(...indent_lengths)}}`, 'g');
-        strings = strings.map(str => str.replace(pattern, '\n'));
-    }
-    // 4. remove leading whitespace
-    strings[0] = strings[0].replace(/^\r?\n/, '');
-    // 5. perform interpolation
-    let string = strings[0];
-    values.forEach((value, i) => {
-        string += value + strings[i + 1];
-    });
-    string += '\n';
-    return string;
-}
 /** 数组或 iterable 去重（可按 selector 去重）
     - selector?: 可以是 key (string) 或 (obj: any) => any
 */
@@ -84,6 +58,13 @@ export function sort_keys(obj) {
     return Object.fromEntries(Object.entries(obj)
         .sort(([key_l], [key_r]) => strcmp(key_l, key_r)));
 }
+/** 将 keys, values 数组按对应的顺序组合成一个对象 */
+export function zip_object(keys, values) {
+    return keys.reduce((obj, key, i) => {
+        obj[key] = values[i];
+        return obj;
+    }, {});
+}
 /** 映射对象中的 keys, 返回新对象 */
 export function map_keys(obj, mapper) {
     return Object.fromEntries(Object.entries(obj)
@@ -218,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 状态