xshell 1.0.53 → 1.0.55

package/file.d.ts

@@ -55,7 +55,11 @@ export declare function fread_json<T = any>(fp: string, options?: {
     - data: 支持下面几种类型
         - string: 写入文本
         - Uint8Array, Buffer: 写入二进制 buffer
-        - any: 通过 JSON.stringify 转为文本后写入文件 */
+        - any: 通过 JSON.stringify 转为文本后写入文件
+    - options?:
+        - dir?: 文件夹
+        - print?
+        - mkdir: `false` 自动创建 fp 所在的文件夹 */
 export declare function fwrite(fp: string | FileHandle, data: string | Uint8Array | any, { dir, print, mkdir, }?: {
     dir?: string;
     print?: boolean;
@@ -104,6 +108,7 @@ 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
     - options?:
@@ -116,12 +121,16 @@ export declare function fcopy(fp_src: string, fp_dst: string, { print, overwrite
     print?: boolean;
     overwrite?: boolean;
 }): Promise<void>;
-/** 移动文件或文件夹  move file or direcotry
-    - src: 源 文件/文件夹 完整路径  src file/directory absolute path
-    - dst: 目标 文件/文件夹 完整路径  dst file/directory absolute path
+/** 移动文件或文件夹
+    - src: 源 文件/文件夹 完整路径
+    - dst: 目标 文件/文件夹 完整路径
+    - options?:
+        - print?: `true`
+        - overwrite?: `false`
+    
     @example
     fmove('D:/temp/camera/', 'D:/camera/') */
-export declare function fmove(src: string, dst: string, { overwrite, print }?: {
+export declare function fmove(fp_src: string, fp_dst: string, { overwrite, print }?: {
     overwrite?: boolean;
     print?: boolean;
 }): Promise<void>;

package/file.js

@@ -59,7 +59,11 @@ export async function fread_json(fp, options = {}) {
     - data: 支持下面几种类型
         - string: 写入文本
         - Uint8Array, Buffer: 写入二进制 buffer
-        - any: 通过 JSON.stringify 转为文本后写入文件 */
+        - any: 通过 JSON.stringify 转为文本后写入文件
+    - options?:
+        - dir?: 文件夹
+        - print?
+        - mkdir: `false` 自动创建 fp 所在的文件夹 */
 export async function fwrite(fp, data, { dir, print = true, mkdir = false, } = {}) {
     const is_handle = typeof fp === 'object' && fp && 'fd' in fp;
     if (is_handle) {
@@ -81,10 +85,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 (mkdir && error.code === 'ENOENT' && !is_handle) {
+            await fmkdir(fp.fdir);
+            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 } = {}) {
@@ -211,6 +217,7 @@ export async function fdelete(fp, { print = true } = {}) {
     }
 }
 /** 复制文件或文件夹  copy file or direcotry
+    会自动创建目标路径所在的文件夹
     - fp_src: 源 文件/文件夹 完整路径  src file/directory absolute path
     - fp_dst: 目标 文件/文件夹 完整路径  dst file/directory absolute path
     - options?:
@@ -220,27 +227,56 @@ export async function fdelete(fp, { print = true } = {}) {
     @example
     fcopy('D:/temp/camera/', 'D:/camera/') */
 export async function fcopy(fp_src, fp_dst, { print = true, overwrite = true, } = {}) {
-    assert(fp_src.isdir === fp_dst.isdir, t('fp_src 和 fp_dst 必须同为文件路径或文件夹路径'));
+    const { isdir } = fp_src;
+    assert(isdir === fp_dst.isdir, t('fp_src 和 fp_dst 必须同为文件路径或文件夹路径'));
     assert(path.isAbsolute(fp_src) && path.isAbsolute(fp_dst), t('fp_src 和 fp_dst 必须为完整路径'));
     if (print)
         console.log(t('复制'), fp_src, '->', fp_dst);
-    const { copy } = await import('fs-extra');
-    await copy(fp_src, fp_dst, { overwrite, errorOnExist: true });
+    if (isdir)
+        await fsp.cp(fp_src, fp_dst, {
+            recursive: true,
+            force: overwrite,
+            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);
+    }
 }
-/** 移动文件或文件夹  move file or direcotry
-    - src: 源 文件/文件夹 完整路径  src file/directory absolute path
-    - dst: 目标 文件/文件夹 完整路径  dst file/directory absolute path
+/** 移动文件或文件夹
+    - src: 源 文件/文件夹 完整路径
+    - dst: 目标 文件/文件夹 完整路径
+    - options?:
+        - print?: `true`
+        - overwrite?: `false`
+    
     @example
     fmove('D:/temp/camera/', 'D:/camera/') */
-export async function fmove(src, dst, { overwrite = false, print = true } = {}) {
-    if (src.isdir !== dst.isdir)
-        throw new Error(t('src 和 dst 必须同为文件路径或文件夹路径'));
-    if (!path.isAbsolute(src) || !path.isAbsolute(dst))
-        throw new Error(t('src 和 dst 必须为完整路径'));
+export async function fmove(fp_src, fp_dst, { overwrite = false, print = true } = {}) {
+    assert(fp_src.isdir === fp_dst.isdir, t('fp_src 和 fp_dst 必须同为文件路径或文件夹路径'));
+    assert(path.isAbsolute(fp_src) && path.isAbsolute(fp_dst), t('fp_src 和 fp_dst 必须为完整路径'));
     if (print)
-        console.log(t('移动'), src, '->', dst);
-    const { move } = await import('fs-extra');
-    await move(src, dst, { overwrite });
+        console.log(t('移动'), fp_src, '->', fp_dst);
+    if (!overwrite && fexists(fp_dst))
+        throw new Error(`${t('已存在')} ${fp_dst}`);
+    await fmkdir(fp_dst.fdir, { print: false });
+    async function copy_and_delete() {
+        await fcopy(fp_src, fp_dst, { overwrite, print });
+        await fdelete(fp_src, { print });
+    }
+    if (fp_src[0] !== fp_dst[0])
+        await copy_and_delete();
+    else
+        try {
+            await fsp.rename(fp_src, fp_dst);
+        }
+        catch (error) {
+            if (error.code === 'EXDEV')
+                await copy_and_delete();
+            else
+                throw error;
+        }
 }
 /** 重命名文件  rename file
     - fp:  当前文件名／路径  current filename/path
@@ -259,7 +295,7 @@ export async function frename(fp, fp_, { fpd, print = true, overwrite = true } =
     if (print)
         console.log(t('重命名'), fp, '->', fp_);
     if (!overwrite && fexists(fp_))
-        throw new Error(t('文件已存在：') + fp_);
+        throw new Error(`${t('已存在')} ${fp}`);
     await fsp.rename(fp, fp_);
 }
 /**

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

@@ -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.53",
+  "version": "1.0.55",
   "type": "module",
   "main": "./index.js",
   "bin": {
@@ -59,10 +59,9 @@
     "commander": "^11.0.0",
     "emoji-regex": "^10.2.1",
     "fetch-cookie": "^2.1.0",
-    "fs-extra": "^11.1.1",
     "gulp-sort": "^2.0.0",
     "hash-string": "^1.0.0",
-    "i18next": "^23.4.4",
+    "i18next": "^23.4.5",
     "i18next-scanner": "^4.3.0",
     "js-cookie": "^3.0.5",
     "koa": "^2.14.2",
@@ -72,7 +71,7 @@
     "mime-types": "^2.1.35",
     "ora": "^7.0.1",
     "react": "^18.2.0",
-    "react-i18next": "^13.1.2",
+    "react-i18next": "^13.2.0",
     "resolve-path": "^1.4.0",
     "strip-ansi": "^7.1.0",
     "through2": "^4.0.2",
@@ -90,22 +89,21 @@
     "@types/babel__traverse": "^7.20.1",
     "@types/byte-size": "^8.1.0",
     "@types/chardet": "^0.8.1",
-    "@types/fs-extra": "^11.0.1",
     "@types/gulp-sort": "2.0.1",
     "@types/js-cookie": "^3.0.3",
     "@types/koa": "^2.13.8",
     "@types/koa-compress": "^4.0.3",
     "@types/lodash": "^4.14.197",
     "@types/mime-types": "^2.1.1",
-    "@types/node": "^20.5.1",
-    "@types/react": "^18.2.20",
+    "@types/node": "^20.5.4",
+    "@types/react": "^18.2.21",
     "@types/through2": "^2.0.38",
     "@types/tough-cookie": "^4.0.2",
     "@types/ua-parser-js": "^0.7.36",
     "@types/vinyl-fs": "^3.0.2",
     "@types/vscode": "^1.81.0",
-    "@typescript-eslint/eslint-plugin": "^6.4.0",
-    "@typescript-eslint/parser": "^6.4.0",
+    "@typescript-eslint/eslint-plugin": "^6.4.1",
+    "@typescript-eslint/parser": "^6.4.1",
     "eslint": "^8.47.0",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-xlint": "^1.0.7"

package/process.d.ts

@@ -40,7 +40,7 @@ interface StartOptions {
     - exe: .exe 路径或文件名 (建议使用完整路径，跳过 path 搜索，性能更高)  path or filename (full path is recommanded to skip path searching for better perf)
     - args: `[]` 参数列表  arguments list
     - options
-        - cwd?: `fp_root`
+        - cwd?: `继承当前工作目录 process.cwd()` 子进程的工作目录  `inherit the cwd` cwd of the child process.
         - env?: `process.env` 覆盖／添加到 process.env 的环境变量  overwrite/add to process.env
         - encoding?: `'utf-8'` 子进程输出编码  child output encoding
         - print?: `true` print 选项，支持设置细项  print option (with details)

package/process.js

@@ -8,7 +8,7 @@ export const exe_nodejs = process.execPath.fp;
     - exe: .exe 路径或文件名 (建议使用完整路径，跳过 path 搜索，性能更高)  path or filename (full path is recommanded to skip path searching for better perf)
     - args: `[]` 参数列表  arguments list
     - options
-        - cwd?: `fp_root`
+        - cwd?: `继承当前工作目录 process.cwd()` 子进程的工作目录  `inherit the cwd` cwd of the child process.
         - env?: `process.env` 覆盖／添加到 process.env 的环境变量  overwrite/add to process.env
         - encoding?: `'utf-8'` 子进程输出编码  child output encoding
         - print?: `true` print 选项，支持设置细项  print option (with details)
@@ -184,7 +184,7 @@ export const exe_winterm = `C:/Users/${userInfo().username}/AppData/Local/Micros
     - args: 调用参数  call parameter
     - options?: WinTermOptions
 */
-export async function term(exe, args = [], { cwd = process.cwd().fp, print = true, title,
+export async function term(exe, args = [], { cwd = process.cwd().fpd, print = true, title,
 // env
  } = {}) {
     return start(exe_winterm, [

package/server.js

@@ -263,7 +263,7 @@ export class Server {
         return s;
     }
     async proxy(ctx, url, headers_ = {}) {
-        const { request: { method, headers, query, body } } = ctx;
+        const { request: { method, headers, query, body, ip } } = ctx;
         let { response } = ctx;
         try {
             const response_ = await _request(url, {
@@ -272,6 +272,7 @@ export class Server {
                 body,
                 headers: {
                     ...headers,
+                    'x-forwarded-for': headers['x-forwarded-for'] ? `${headers['x-forwarded-for']}, ${ip}` : ip,
                     ...headers_
                 },
                 raw: true,