xshell 1.0.54 → 1.0.56

package/file.d.ts

@@ -51,15 +51,19 @@ export declare function fread_json<T = any>(fp: string, options?: {
     print?: boolean;
 }): Promise<T>;
 /** 写入 data 到 fp 路径所指的文件
+    会在因不存在父文件夹导致写入失败时，自动创建父文件夹，并再次尝试写入
+    最好预先创建父文件夹，减少文件系统操作，提升性能
     - fp: 目标文件完整路径
     - data: 支持下面几种类型
         - string: 写入文本
         - Uint8Array, Buffer: 写入二进制 buffer
-        - any: 通过 JSON.stringify 转为文本后写入文件 */
-export declare function fwrite(fp: string | FileHandle, data: string | Uint8Array | any, { dir, print, mkdir, }?: {
+        - any: 通过 JSON.stringify 转为文本后写入文件
+    - options?:
+        - dir?: 文件夹
+        - print?: `true` */
+export declare function fwrite(fp: string | FileHandle, data: string | Uint8Array | any, { dir, print, }?: {
     dir?: string;
     print?: boolean;
-    mkdir?: boolean;
 }): Promise<void>;
 export declare function fappend(fp: string, data: string | Uint8Array, { dir, print }?: {
     dir?: string;
@@ -103,9 +107,11 @@ export declare function ffstat(handle: fsp.FileHandle): Promise<fs.BigIntStats>;
 export declare function fdelete(fp: string, { print }?: {
     print?: boolean;
 }): Promise<boolean>;
-/** 复制文件或文件夹  copy file or direcotry
-    - fp_src: 源 文件/文件夹 完整路径  src file/directory absolute path
-    - fp_dst: 目标 文件/文件夹 完整路径  dst file/directory absolute path
+/** 复制文件或文件夹
+    会在因不存在父文件夹导致复制失败时，自动创建父文件夹，并再次尝试复制
+    最好预先创建父文件夹，减少文件系统操作，提升性能
+    - fp_src: 源 文件/文件夹 完整路径
+    - fp_dst: 目标 文件/文件夹 完整路径
     - options?:
         - print?: `true`
         - overwrite?: `true`
@@ -117,6 +123,7 @@ export declare function fcopy(fp_src: string, fp_dst: string, { print, overwrite
     overwrite?: boolean;
 }): Promise<void>;
 /** 移动文件或文件夹
+    相同分区 / 文件系统下使用 rename, 否则 fallback 到复制后删除源文件
     - src: 源 文件/文件夹 完整路径
     - dst: 目标 文件/文件夹 完整路径
     - options?:

package/file.js

@@ -55,12 +55,17 @@ export async function fread_json(fp, options = {}) {
     return JSON.parse(await fread(fp, options));
 }
 /** 写入 data 到 fp 路径所指的文件
+    会在因不存在父文件夹导致写入失败时，自动创建父文件夹，并再次尝试写入
+    最好预先创建父文件夹，减少文件系统操作，提升性能
     - fp: 目标文件完整路径
     - data: 支持下面几种类型
         - string: 写入文本
         - Uint8Array, Buffer: 写入二进制 buffer
-        - any: 通过 JSON.stringify 转为文本后写入文件 */
-export async function fwrite(fp, data, { dir, print = true, mkdir = false, } = {}) {
+        - any: 通过 JSON.stringify 转为文本后写入文件
+    - options?:
+        - dir?: 文件夹
+        - print?: `true` */
+export async function fwrite(fp, data, { dir, print = true, } = {}) {
     const is_handle = typeof fp === 'object' && fp && 'fd' in fp;
     if (is_handle) {
         if (print)
@@ -81,10 +86,12 @@ export async function fwrite(fp, data, { dir, print = true, mkdir = false, } = {
         await fsp.writeFile(fp, data);
     }
     catch (error) {
-        if (!mkdir || error.code !== 'ENOENT' || is_handle)
+        if (error.code === 'ENOENT' && !is_handle) {
+            await fmkdir(fp.fdir, { print: false });
+            await fsp.writeFile(fp, data);
+        }
+        else
             throw error;
-        await fmkdir(fp.fdir);
-        await fsp.writeFile(fp, data);
     }
 }
 export async function fappend(fp, data, { dir, print = true } = {}) {
@@ -210,9 +217,11 @@ export async function fdelete(fp, { print = true } = {}) {
         throw error;
     }
 }
-/** 复制文件或文件夹  copy file or direcotry
-    - fp_src: 源 文件/文件夹 完整路径  src file/directory absolute path
-    - fp_dst: 目标 文件/文件夹 完整路径  dst file/directory absolute path
+/** 复制文件或文件夹
+    会在因不存在父文件夹导致复制失败时，自动创建父文件夹，并再次尝试复制
+    最好预先创建父文件夹，减少文件系统操作，提升性能
+    - fp_src: 源 文件/文件夹 完整路径
+    - fp_dst: 目标 文件/文件夹 完整路径
     - options?:
         - print?: `true`
         - overwrite?: `true`
@@ -232,12 +241,21 @@ export async function fcopy(fp_src, fp_dst, { print = true, overwrite = true, }
             errorOnExist: !overwrite,
             mode: overwrite ? 0 : fs.constants.COPYFILE_EXCL,
         });
-    else {
-        await fmkdir(fp_dst.fdir, { print: false });
-        await fsp.copyFile(fp_src, fp_dst, overwrite ? 0 : fs.constants.COPYFILE_EXCL);
-    }
+    else
+        try {
+            await fsp.copyFile(fp_src, fp_dst, overwrite ? 0 : fs.constants.COPYFILE_EXCL);
+        }
+        catch (error) {
+            if (error.code === 'ENOENT') {
+                await fmkdir(fp_dst.fdir, { print });
+                await fsp.copyFile(fp_src, fp_dst, overwrite ? 0 : fs.constants.COPYFILE_EXCL);
+            }
+            else
+                throw error;
+        }
 }
 /** 移动文件或文件夹
+    相同分区 / 文件系统下使用 rename, 否则 fallback 到复制后删除源文件
     - src: 源 文件/文件夹 完整路径
     - dst: 目标 文件/文件夹 完整路径
     - options?:

package/net.browser.d.ts

@@ -63,12 +63,14 @@ export declare function request(url: string | URL, options: RequestOptions): Pro
 export declare function request_json<T = any>(url: string, options?: RequestOptions): Promise<T>;
 export declare class WebSocketConnectionError extends Error {
     name: string;
+    url: string;
+    protocols?: string[];
     websocket: WebSocket;
     event: CloseEvent | /* error 事件时的 event，没有 event.error */ Event;
     type: 'close' | 'error';
     code?: number;
     reason?: string;
-    constructor(websocket: WebSocket, event: CloseEvent | Event, message?: string);
+    constructor(url: string, protocols: string[] | undefined, event: CloseEvent | Event, message?: string);
 }
 /** 连接 websocket url, 设置各种事件监听器。在 open 事件后 resolve, 返回 websocket
     遇到 error 时会创建 WebSocketConnectionError:
@@ -86,7 +88,7 @@ export declare class WebSocketConnectionError extends Error {
         - on_close?: 和 websocket 的 'close' 事件不相同，只在正常关闭 (close code 为 1000) 时才调用，否则都会调用 on_error
             https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent#Status_codes  */
 export declare function connect_websocket(url: string | URL, { protocols, on_message, on_error, on_close, }: {
-    protocols?: string | string[];
+    protocols?: string[];
     on_message(data: ArrayBuffer | string, websocket: WebSocket): any;
     on_error?(error: WebSocketConnectionError, websocket: WebSocket): any;
     on_close?(event: CloseEvent, websocket: WebSocket): any;

package/net.browser.js

@@ -147,14 +147,18 @@ let decoder = new TextDecoder();
 let encoder = new TextEncoder();
 export class WebSocketConnectionError extends Error {
     name = 'WebSocketConnectionError';
+    // 这里不保留 websocket 引用，防止循环引用导致 JSON 序列化失败
+    url;
+    protocols;
     websocket;
     event;
     type;
     code;
     reason;
-    constructor(websocket, event, message) {
-        super(`${websocket.url} ${t('连接出错了')}. ${message || ''}`);
-        this.websocket = websocket;
+    constructor(url, protocols, event, message) {
+        super(`${url}${protocols ? ' ' + protocols.join(', ').bracket() : ''} ${t('连接出错了')}. ${message || ''}`);
+        this.url = url;
+        this.protocols = protocols;
         this.event = event;
         this.type = event.type;
         if (this.type === 'close') {
@@ -186,10 +190,7 @@ export async function connect_websocket(url, { protocols, on_message, on_error,
         let settled = false;
         websocket.addEventListener('open', event => {
             console.log(websocket.url +
-                (protocols ?
-                    ' ' + (typeof protocols === 'string' ? protocols : protocols.join(', ').bracket('square')).bracket()
-                    :
-                        '') +
+                (websocket.protocol ? ' ' + websocket.protocol.bracket() : '') +
                 t(' 已连接'));
             settled = true;
             resolve(websocket);
@@ -201,7 +202,7 @@ export async function connect_websocket(url, { protocols, on_message, on_error,
                 else
                     console.log(`${websocket.url} ${t('已正常关闭')}`);
             else { // 异常关闭，认为发生了错误，进行错误处理
-                const error = new WebSocketConnectionError(websocket, event, `${t('连接被关闭')}, code: ${event.code}${event.reason ? `, ${t('原因')}: ${event.reason}` : ''}`);
+                const error = new WebSocketConnectionError(websocket.url, protocols, event, `${t('连接被关闭')}, code: ${event.code}${event.reason ? `, ${t('原因')}: ${event.reason}` : ''}`);
                 if (settled)
                     if (on_error)
                         on_error(error, websocket);
@@ -214,7 +215,7 @@ export async function connect_websocket(url, { protocols, on_message, on_error,
             }
         });
         websocket.addEventListener('error', event => {
-            const error = new WebSocketConnectionError(websocket, event);
+            const error = new WebSocketConnectionError(websocket.url, protocols, event);
             // https://blog.insiderattack.net/promises-next-ticks-and-immediates-nodejs-event-loop-part-3-9226cbe7a6aa
             // close 的错误信息比较多，这里延后触发 error 事件，放到微任务队列之后的 timers 队列中
             setTimeout(() => {

package/net.d.ts

@@ -25,7 +25,7 @@ export declare const cookies: {
     init(): Promise<void>;
     get(domain_or_url: string, str?: boolean): Cookie[] | Promise<Cookie[] | string>;
 };
-export { Cookie };
+export type { Cookie };
 export interface BasicAuth {
     type: 'basic';
     username: string;
@@ -107,7 +107,8 @@ export declare function rpc(func: string, args?: any[], { url, async: _async, ig
 }): Promise<any>;
 export declare class WebSocketConnectionError extends Error {
     name: string;
-    websocket: WebSocket;
+    url: string;
+    protocols?: string[];
     event: CloseEvent | ErrorEvent;
     type: 'close' | 'error';
     address?: string;
@@ -117,7 +118,7 @@ export declare class WebSocketConnectionError extends Error {
     /** close 事件时为 close code, error 事件为 error code */
     code?: string | number;
     reason?: string;
-    constructor(websocket: WebSocket, event: CloseEvent | ErrorEvent, message?: string);
+    constructor(url: string, protocols: string[] | undefined, event: CloseEvent | ErrorEvent, message?: string);
 }
 /** 连接 websocket url, 设置各种事件监听器。在 open 事件后 resolve, 返回 websocket
     遇到 error 时会创建 WebSocketConnectionError:
@@ -137,7 +138,7 @@ export declare class WebSocketConnectionError extends Error {
             https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent#Status_codes  */
 export declare function connect_websocket(url: string | URL, { protocols, max_payload, // 8 GB
 on_message, on_error, on_close }: {
-    protocols?: string | string[];
+    protocols?: string[];
     max_payload?: number;
     on_message(data: ArrayBuffer | string, websocket: WebSocket): any;
     on_error?(error: WebSocketConnectionError, websocket: WebSocket): any;

package/net.js

@@ -290,7 +290,9 @@ let decoder = new TextDecoder();
 let encoder = new TextEncoder();
 export class WebSocketConnectionError extends Error {
     name = 'WebSocketConnectionError';
-    websocket;
+    // 这里不保留 websocket 引用，防止循环引用导致 JSON 序列化失败
+    url;
+    protocols;
     event;
     type;
     address;
@@ -300,9 +302,10 @@ export class WebSocketConnectionError extends Error {
     /** close 事件时为 close code, error 事件为 error code */
     code;
     reason;
-    constructor(websocket, event, message = '') {
-        super(`${websocket.url} ${t('连接出错了')}. ${message}`);
-        this.websocket = websocket;
+    constructor(url, protocols, event, message = '') {
+        super(`${url}${protocols ? ' ' + protocols.join(', ').bracket() : ''} ${t('连接出错了')}. ${message}`);
+        this.url = url;
+        this.protocols = protocols;
         this.event = event;
         this.type = event.type;
         if (this.type === 'error') {
@@ -351,10 +354,7 @@ on_message, on_error, on_close }) {
         let settled = false;
         websocket.addEventListener('open', event => {
             console.log(websocket.url +
-                (protocols ?
-                    ' ' + (typeof protocols === 'string' ? protocols : protocols.join(', ').bracket('square')).bracket()
-                    :
-                        '') +
+                (websocket.protocol ? ' ' + websocket.protocol.bracket() : '') +
                 t(' 已连接'));
             settled = true;
             resolve(websocket);
@@ -372,7 +372,7 @@ on_message, on_error, on_close }) {
                         console.log(`${websocket.url} ${t('已正常关闭')}`);
                 else { // 异常关闭，认为发生了错误，进行错误处理
                     assert(settled, t('websocket close 事件时应该已经 settled'));
-                    const error = new WebSocketConnectionError(websocket, event, `${t('连接被关闭')}, code: ${event.code}${event.reason ? `, ${t('原因')}: ${event.reason}` : ''}`);
+                    const error = new WebSocketConnectionError(websocket.url, protocols, event, `${t('连接被关闭')}, code: ${event.code}${event.reason ? `, ${t('原因')}: ${event.reason}` : ''}`);
                     if (on_error)
                         on_error(error, websocket);
                     else // 既然用户不传 on_error, 就当 unhandled error 抛出来
@@ -381,7 +381,7 @@ on_message, on_error, on_close }) {
             });
         });
         websocket.addEventListener('error', event => {
-            const error = new WebSocketConnectionError(websocket, event, event.error?.message);
+            const error = new WebSocketConnectionError(websocket.url, protocols, event, event.error?.message);
             if (settled)
                 if (on_error)
                     on_error(error, websocket);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xshell",
-  "version": "1.0.54",
+  "version": "1.0.56",
   "type": "module",
   "main": "./index.js",
   "bin": {
@@ -45,9 +45,9 @@
     ]
   },
   "dependencies": {
-    "@babel/core": "^7.22.10",
-    "@babel/parser": "^7.22.10",
-    "@babel/traverse": "^7.22.10",
+    "@babel/core": "^7.22.11",
+    "@babel/parser": "^7.22.11",
+    "@babel/traverse": "^7.22.11",
     "@koa/cors": "^4.0.0",
     "@types/ws": "^8.5.5",
     "byte-size": "^8.1.1",
@@ -61,8 +61,8 @@
     "fetch-cookie": "^2.1.0",
     "gulp-sort": "^2.0.0",
     "hash-string": "^1.0.0",
-    "i18next": "^23.4.5",
-    "i18next-scanner": "^4.3.0",
+    "i18next": "^23.4.6",
+    "i18next-scanner": "^4.4.0",
     "js-cookie": "^3.0.5",
     "koa": "^2.14.2",
     "koa-compress": "^5.1.1",
@@ -77,7 +77,7 @@
     "through2": "^4.0.2",
     "tough-cookie": "^4.1.3",
     "tslib": "^2.6.2",
-    "typescript": "^5.1.6",
+    "typescript": "^5.2.2",
     "ua-parser-js": "2.0.0-alpha.2",
     "undici": "^5.23.0",
     "vinyl": "^3.0.0",
@@ -85,7 +85,7 @@
     "ws": "^8.13.0"
   },
   "devDependencies": {
-    "@babel/types": "^7.22.10",
+    "@babel/types": "^7.22.11",
     "@types/babel__traverse": "^7.20.1",
     "@types/byte-size": "^8.1.0",
     "@types/chardet": "^0.8.1",
@@ -95,7 +95,7 @@
     "@types/koa-compress": "^4.0.3",
     "@types/lodash": "^4.14.197",
     "@types/mime-types": "^2.1.1",
-    "@types/node": "^20.5.3",
+    "@types/node": "^20.5.7",
     "@types/react": "^18.2.21",
     "@types/through2": "^2.0.38",
     "@types/tough-cookie": "^4.0.2",
@@ -104,9 +104,9 @@
     "@types/vscode": "^1.81.0",
     "@typescript-eslint/eslint-plugin": "^6.4.1",
     "@typescript-eslint/parser": "^6.4.1",
-    "eslint": "^8.47.0",
+    "eslint": "^8.48.0",
     "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-xlint": "^1.0.7"
+    "eslint-plugin-xlint": "^1.0.8"
   },
   "scripts": {
     "start": "node --title=xshell --inspect=0.0.0.0:8420 ./xshell.js",

package/prototype.browser.d.ts

@@ -10,8 +10,7 @@ declare global {
         truncate(this: string, width: number): string;
         /** pad string to `<width>`
             - character?: `' '`
-            - position?: `'right'`
-         */
+            - position?: `'right'` */
         pad(this: string, width: number, { character, position }?: {
             character?: string;
             position?: 'left' | 'right';

package/prototype.browser.js

@@ -149,7 +149,7 @@ Object.defineProperties(String.prototype, {
             add_part(last_end);
             // 最后一个 (.*?) 改为贪心匹配，满足 .{suffix} 的需要
             regx_parts = regx_parts.filter(part => part);
-            if (regx_parts.last === '(.*?)')
+            if (regx_parts[regx_parts.length - 1] === '(.*?)')
                 regx_parts[regx_parts.length - 1] = '(.*)';
             const pattern_regx = new RegExp(regx_parts.join(''), flags);
             // --- 根据 pattern_regx 去匹配原有字符串，获取匹配结果，生成 placeholders 词典
@@ -240,7 +240,7 @@ Object.defineProperties(String.prototype, {
         },
         split_lines(delimiter = /\r?\n/) {
             let lines = this.split(delimiter);
-            if (lines.last === '')
+            if (lines[lines.length - 1] === '')
                 lines.pop();
             return lines;
         },

package/prototype.d.ts

@@ -128,7 +128,6 @@ declare global {
         to_oct_str(this: number): string;
     }
     interface Array<T> {
-        last: T;
         log(this: string[], limit?: number): void;
         indent(this: string[], width: number, c?: string): string[];
         indent2to4(this: string[]): string[];

package/prototype.js

@@ -147,7 +147,7 @@ if (!globalThis.my_prototype_defined) {
                 add_part(last_end);
                 // 最后一个 (.*?) 改为贪心匹配，满足 .{suffix} 的需要
                 regx_parts = regx_parts.filter(part => part);
-                if (regx_parts.last === '(.*?)')
+                if (regx_parts.at(-1) === '(.*?)')
                     regx_parts[regx_parts.length - 1] = '(.*)';
                 const pattern_regx = new RegExp(regx_parts.join(''), flags);
                 // --- 根据 pattern_regx 去匹配原有字符串，获取匹配结果，生成 placeholders 词典
@@ -204,7 +204,7 @@ if (!globalThis.my_prototype_defined) {
                 add_part(last_end);
                 // 最后一个 (.*?) 改为贪心匹配，满足 .{suffix} 的需要
                 regx_parts = regx_parts.filter(part => part);
-                if (regx_parts[regx_parts.length - 1] === '(.*?)')
+                if (regx_parts.at(-1) === '(.*?)')
                     regx_parts[regx_parts.length - 1] = '(.*)';
                 const pattern_regx = new RegExp(regx_parts.join(''), flags);
                 // --- 根据 pattern_regx 去匹配原有字符串，获取匹配结果，生成 placeholders 词典
@@ -241,7 +241,7 @@ if (!globalThis.my_prototype_defined) {
             },
             split_lines(delimiter = /\r?\n/) {
                 let lines = this.split(delimiter);
-                if (lines.last === '')
+                if (lines.at(-1) === '')
                     lines.pop();
                 return lines;
             },
@@ -408,11 +408,6 @@ if (!globalThis.my_prototype_defined) {
     }));
     // ------------------------------------ Array.prototype
     Object.defineProperties(Array.prototype, {
-        ...to_getter_property_descriptors({
-            last() {
-                return this[this.length - 1];
-            }
-        }),
         // --- 文本处理工具方法
         ...to_method_property_descriptors({
             log(limit = 10000) {