xshell 1.3.29 → 1.3.31

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.3.29",
+    "version": "1.3.31",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -49,16 +49,16 @@
         ]
     },
     "dependencies": {
-        "@babel/core": "^7.28.5",
-        "@babel/parser": "^7.28.5",
-        "@babel/traverse": "^7.28.5",
+        "@babel/core": "^7.28.6",
+        "@babel/parser": "^7.28.6",
+        "@babel/traverse": "^7.28.6",
         "@koa/cors": "^5.0.0",
-        "@stylistic/eslint-plugin": "^5.6.1",
+        "@stylistic/eslint-plugin": "^5.7.0",
         "@svgr/webpack": "^8.1.0",
         "@types/sass-loader": "^8.0.10",
-        "@typescript-eslint/eslint-plugin": "^8.52.0",
-        "@typescript-eslint/parser": "^8.52.0",
-        "@typescript-eslint/utils": "^8.52.0",
+        "@typescript-eslint/eslint-plugin": "^8.53.1",
+        "@typescript-eslint/parser": "^8.53.1",
+        "@typescript-eslint/utils": "^8.53.1",
         "archiver": "^7.0.1",
         "chalk": "^5.6.2",
         "commander": "^14.0.2",
@@ -68,7 +68,7 @@
         "eslint-plugin-import": "^2.32.0",
         "eslint-plugin-react": "^7.37.5",
         "https-proxy-agent": "^7.0.6",
-        "i18next": "^25.7.3",
+        "i18next": "^25.7.4",
         "i18next-scanner": "^4.6.0",
         "koa": "^3.1.1",
         "koa-compress": "^5.1.1",
@@ -76,7 +76,7 @@
         "mime-types": "^3.0.2",
         "p-map": "^7.0.4",
         "react": "^19.2.3",
-        "react-i18next": "^16.5.1",
+        "react-i18next": "^16.5.3",
         "resolve-path": "^1.4.0",
         "sass": "^1.97.2",
         "sass-loader": "^16.0.6",
@@ -89,11 +89,11 @@
         "typescript": "^5.9.3",
         "undici": "^7.18.2",
         "webpack": "^5.104.1",
-        "webpack-bundle-analyzer": "^5.1.0",
+        "webpack-bundle-analyzer": "^5.1.1",
         "ws": "^8.19.0"
     },
     "devDependencies": {
-        "@babel/types": "^7.28.5",
+        "@babel/types": "^7.28.6",
         "@types/archiver": "^7.0.0",
         "@types/babel__traverse": "^7.28.0",
         "@types/eslint": "^9.6.1",
@@ -101,10 +101,10 @@
         "@types/koa": "^3.0.1",
         "@types/koa-compress": "^4.0.7",
         "@types/mime-types": "^3.0.1",
-        "@types/node": "^25.0.3",
-        "@types/react": "^19.2.7",
+        "@types/node": "^25.0.9",
+        "@types/react": "^19.2.8",
         "@types/tough-cookie": "^4.0.5",
-        "@types/vscode": "^1.107.0",
+        "@types/vscode": "^1.108.1",
         "@types/webpack-bundle-analyzer": "^4.7.0",
         "@types/ws": "^8.18.1"
     }

package/prototype.common.d.ts

@@ -179,10 +179,10 @@ declare global {
         sum<TKey extends keyof T>(this: T[], zero: T[TKey], mapper: TKey): T[TKey];
         sum<TMapper extends Mapper<T>>(this: T[], zero: ReturnType<TMapper>, mapper: TMapper): ReturnType<TMapper>;
         sum<TReturn = T>(this: T[], zero: TReturn, mapper?: keyof T | Mapper<T>): TReturn;
-        /** 查找数组中最大的元素，可传入 mapper 计算出某个值，用作大小比较 */
-        max(this: T[], mapper?: keyof T | Mapper<T>): T;
-        /** 查找数组中最小的元素，可传入 mapper 计算出某个值，用作大小比较 */
-        min(this: T[], mapper?: keyof T | Mapper<T>): T;
+        /** 查找数组中最大的元素，可传入 mapper 计算出某个值，用作大小比较，可传 greater 定义大于逻辑 (计算之后的值) */
+        max(this: T[], mapper?: keyof T | Mapper<T>, greater?: Greater): T;
+        /** 查找数组中最小的元素，可传入 mapper 计算出某个值，用作大小比较，可设置 less 定义小于逻辑 (计算之后的值)  */
+        min(this: T[], mapper?: keyof T | Mapper<T>, less?: Less): T;
         /** 去除重复元素（可按 mapper 选择或计算某个值来去重），重复值保留最后出现的那个
             - mapper?: 可以是 key (string, number, symbol) 或 (obj: any) => any */
         unique(this: T[], mapper?: keyof T | Mapper<T>): T[];
@@ -232,6 +232,10 @@ export declare const empty: (value: any) => boolean;
 export declare const is_key_type: IsKeyType;
 type IsKeyType = (key: any) => key is string | number | symbol;
 export declare function rethrow(error: Error): void;
+export type Greater<T = any> = (a: T, b: T) => boolean;
+export declare const greater: Greater;
+export type Less = Greater;
+export declare const less: Less;
 export declare function to_snake_case(str: string): string;
 export declare function to_space_case(str: string): string;
 export declare function to_method_property_descriptors(methods: {

package/prototype.common.js

@@ -14,6 +14,8 @@ export const is_key_type = ((key) => key_types.includes(typeof key));
 export function rethrow(error) {
     throw error;
 }
+export const greater = (a, b) => a > b;
+export const less = (a, b) => a < b;
 export function to_snake_case(str) {
     return str.replace(/([A-Z])/g, '_$1')
         .toLowerCase()
@@ -532,32 +534,32 @@ if (!globalThis.my_prototype_defined) {
                 mapper ??= ident;
                 return this.reduce((acc, x) => acc + mapper(x), zero);
             },
-            max(mapper = ident) {
+            max(mapper = ident, _greater = greater) {
                 if (!this.length)
                     return undefined;
                 if (is_key_type(mapper))
                     mapper = select(mapper);
                 let max = mapper(this[0]);
                 let imax = 0;
-                for (let i = 0; i < this.length; i++) {
+                for (let i = 1; i < this.length; i++) {
                     const value = mapper(this[i]);
-                    if (value > max) {
+                    if (_greater(value, max)) {
                         max = value;
                         imax = i;
                     }
                 }
                 return this[imax];
             },
-            min(mapper = ident) {
+            min(mapper = ident, _less = less) {
                 if (!this.length)
                     return undefined;
                 if (is_key_type(mapper))
                     mapper = select(mapper);
                 let min = mapper(this[0]);
                 let imin = 0;
-                for (let i = 0; i < this.length; i++) {
+                for (let i = 1; i < this.length; i++) {
                     const value = mapper(this[i]);
-                    if (value < min) {
+                    if (_less(value, min)) {
                         min = value;
                         imin = i;
                     }

package/server.d.ts

@@ -46,6 +46,7 @@ export declare class Server {
         /** platform_version (1 ~ 8) - 1 作为索引下标 */
         win10: string[];
     };
+    static ignore_error_codes: Set<string>;
     app: Koa;
     handler: ReturnType<Koa['callback']>;
     /** 启用 http server */

package/server.js

@@ -57,6 +57,7 @@ export class Server {
             'win10 1909',
         ]
     };
+    static ignore_error_codes = new Set(['ERR_STREAM_PREMATURE_CLOSE', 'EPIPE', 'ECONNRESET']);
     app;
     handler;
     /** 启用 http server */
@@ -260,14 +261,11 @@ export class Server {
     on_error(error, ctx) {
         if (!this.print.errors)
             return;
-        const code = error?.code;
-        if (code === 'EPIPE' || code === 'ECONNRESET')
-            console.log(`${error.code}:`, ctx?.request?.url);
-        else {
-            console.error(error);
-            if (ctx)
-                console.log('ctx:', ctx);
-        }
+        if (Server.ignore_error_codes.has(error?.code))
+            return;
+        console.error(error);
+        if (ctx)
+            console.log('ctx:', ctx);
     }
     on_upgrade(request, socket, head) {
         // url 只有路径部分
@@ -441,12 +439,9 @@ export class Server {
         const { 'user-agent': user_agent, 'sec-ch-ua': ua, 'sec-ch-ua-mobile': mobile, 'sec-ch-ua-model': _model, 'sec-ch-ua-platform': _platform, 'sec-ch-ua-platform-version': _platform_version } = headers;
         // --- client hints
         let model = _model?.slice(1, -1).toLowerCase();
-        if (model === '22127rk46c')
-            model = 'redmi k60 pro';
-        else if (model === '23013rk75c')
-            model = 'redmi k60';
-        else if (model === '24129pn74c')
-            model = 'xiaomi 15';
+        const km = known_models[model];
+        if (km)
+            model = km;
         const ch_platform = [
             model,
             mobile === '?1' ? 'mobile' : '',
@@ -516,12 +511,12 @@ export class Server {
             if (part0 && part0.startsWith('Mozilla/5.0 (') && part0.endsWith(')')) {
                 // 只取括号中间的
                 ua_platform = part0.slice(13, -1).toLowerCase()
-                    .replace('22127rk46c', 'redmi k60 pro')
-                    .replace('23013rk75c', 'redmi k60')
-                    .replace('24129pn74c', 'xiaomi 15')
                     .replace('macintosh', 'mac')
                     .replace('linux; android', 'android')
-                    .replace(' build/tkq1.220905.001', '');
+                    .replace(' build/tkq1.220905.001', '')
+                    .replace(' build/bp2a.250605.031.a3', '');
+                for (const k in known_models)
+                    ua_platform = ua_platform.replace(k, known_models[k]);
                 // 没有多余的信息，屏蔽
                 if (ua_platform === 'windows nt 10.0; win64; x64' && ch_platform.includes('win1'))
                     ua_platform = '';
@@ -822,6 +817,13 @@ export class Server {
 }
 export const text_plain = 'text/plain; charset=utf-8';
 const devtools_trash = '/.well-known/appspecific/com.chrome.devtools.json';
+const known_models = {
+    '25128pna1c': 'xiaomi 17 ultra leica',
+    '2512bpndac': 'xiaomi 17 ultra',
+    '22127rk46c': 'redmi k60 pro',
+    '23013rk75c': 'redmi k60',
+    '24129pn74c': 'xiaomi 15'
+};
 function listen_http_server(server, port) {
     let plisten = defer2();
     server.once('error', plisten.reject);

package/utils.common.d.ts

@@ -82,6 +82,10 @@ export declare function timeout<TReturn>(milliseconds: number, action: Promise<T
     action 返回 trusy 值时认为成功，返回 action 的结果
     如果次数用尽仍然失败，返回 null */
 export declare function poll<TResult>(duration: number, times: number, action: (breaker: () => void) => Promise<TResult>): Promise<TResult>;
+/** 每天在固定时间执行操作
+    - hour: 0 - 23 之间的整数，在这个点执行
+    - action */
+export declare function schedule_everyday(hour: number, minute: number, action: () => void | Promise<void>): Promise<void>;
 /** 模糊过滤字符串列表或对象列表，常用于根据用户输入补全或搜索过滤
     如果有完全匹配关键词的，只返回完全匹配关键词的候选项
     - query: 查询字符串，要求为全小写

package/utils.common.js

@@ -255,6 +255,30 @@ export async function poll(duration, times, action) {
     }
     return null;
 }
+/** 每天在固定时间执行操作
+    - hour: 0 - 23 之间的整数，在这个点执行
+    - action */
+export async function schedule_everyday(hour, minute, action) {
+    const now = Date.now();
+    let target = new Date();
+    target.setHours(hour, minute, 0, 0);
+    // 如果目标时间已过，设定为明天的时间
+    if (now > target.getTime())
+        target.setDate(target.getDate() + 1);
+    // 等时间到
+    await delay(target.getTime() - now);
+    for (;;) {
+        try {
+            await action();
+        }
+        catch (error) {
+            // 往上抛没什么意义，打印个日志算了
+            console.error(error);
+        }
+        // 等一天
+        await delay(1000 * 60 * 60 * 24);
+    }
+}
 /** 模糊过滤字符串列表或对象列表，常用于根据用户输入补全或搜索过滤
     如果有完全匹配关键词的，只返回完全匹配关键词的候选项
     - query: 查询字符串，要求为全小写

package/utils.d.ts

@@ -8,10 +8,6 @@ export declare const output_width = 180;
 export declare const url_width = 52;
 export declare function set_inspect_options(colors?: boolean): void;
 export declare function typed_array_to_buffer(view: ArrayBufferView): Buffer<ArrayBufferLike>;
-/** 每天在固定时间执行操作
-    - hour: 0 - 23 之间的整数，在这个点执行
-    - action */
-export declare function schedule_everyday(hour: number, minute: number, action: () => Promise<void>): Promise<void>;
 export declare function log_line(): void;
 export declare function sha256(data: string | Uint8Array): string;
 export declare function sha1(data: string | Uint8Array): string;

package/utils.js

@@ -3,7 +3,7 @@ import util from 'node:util';
 import ncrypto from 'node:crypto';
 import "./prototype.js";
 import "./platform.js";
-import { assert, decode, defer, delay } from "./utils.common.js";
+import { assert, decode, defer } from "./utils.common.js";
 export * from "./utils.common.js";
 /** `180` 输出字符宽度 */
 export const output_width = 180;
@@ -27,30 +27,6 @@ export function set_inspect_options(colors = true) {
 export function typed_array_to_buffer(view) {
     return Buffer.from(view.buffer, view.byteOffset, view.byteLength);
 }
-/** 每天在固定时间执行操作
-    - hour: 0 - 23 之间的整数，在这个点执行
-    - action */
-export async function schedule_everyday(hour, minute, action) {
-    const now = Date.now();
-    let target = new Date();
-    target.setHours(hour, minute, 0, 0);
-    // 如果目标时间已过，设定为明天的时间
-    if (now > target.getTime())
-        target.setDate(target.getDate() + 1);
-    // 等时间到
-    await delay(target.getTime() - now);
-    for (;;) {
-        try {
-            await action();
-        }
-        catch (error) {
-            // 往上抛没什么意义，打印个日志算了
-            console.error(error);
-        }
-        // 等一天
-        await delay(1000 * 60 * 60 * 24);
-    }
-}
 export function log_line() {
     console.log('---');
 }