xshell 1.0.52 → 1.0.54

package/file.d.ts

@@ -116,12 +116,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

@@ -220,27 +220,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 +288,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

@@ -205,10 +205,11 @@ export declare class Remote {
         - duration?: `1000 * 30` 首次重连失败后的后续尝试间隔 (单位: ms)
         - first_delay?: `0` 调用函数后是否立即连接，还是在 first_delay 后重连 (单位: ms)
         - on_error?: 接收每次尝试连接的错误 */
-    start_reconnecting({ func, interval, first_delay, on_error, }?: RemoteReconnectingOptions): Promise<void>;
+    start_reconnecting({ func, args, interval, first_delay, on_error, }?: RemoteReconnectingOptions): Promise<void>;
 }
 export interface RemoteReconnectingOptions {
     func?: string;
+    args?: any[];
     interval?: number;
     first_delay?: number;
     on_error?(error: Error): void;

package/net.browser.js

@@ -460,7 +460,7 @@ export class Remote {
         - duration?: `1000 * 30` 首次重连失败后的后续尝试间隔 (单位: ms)
         - first_delay?: `0` 调用函数后是否立即连接，还是在 first_delay 后重连 (单位: ms)
         - on_error?: 接收每次尝试连接的错误 */
-    async start_reconnecting({ func, interval = 1000 * 10, first_delay = 0, on_error, } = {}) {
+    async start_reconnecting({ func, args, interval = 1000 * 10, first_delay = 0, on_error, } = {}) {
         assert(this.url);
         if (this.reconnecting)
             return;
@@ -471,7 +471,7 @@ export class Remote {
             if (this.lwebsocket.resource?.readyState !== WebSocket.OPEN)
                 try {
                     if (func)
-                        await this.call(func);
+                        await this.call(func, args);
                     else
                         await this.connect();
                     this.reconnecting = false;

package/net.d.ts

@@ -257,7 +257,7 @@ export declare class Remote {
         - duration?: `1000 * 30` 首次重连失败后的后续尝试间隔 (单位: ms)
         - first_delay?: `0` 调用函数后是否立即连接，还是在 first_delay 后重连 (单位: ms)
         - on_error?: 接收每次尝试连接的错误 */
-    start_reconnecting({ func, interval, first_delay, on_error, }?: RemoteReconnectingOptions): Promise<void>;
+    start_reconnecting({ func, args, interval, first_delay, on_error, }?: RemoteReconnectingOptions): Promise<void>;
 }
 /** 为连接到 server 的 client 创建 RemoteClient，以便后续调用 client 中方法 */
 export declare class RemoteClient {
@@ -272,6 +272,7 @@ export declare class RemoteClient {
 }
 export interface RemoteReconnectingOptions {
     func?: string;
+    args?: any[];
     interval?: number;
     first_delay?: number;
     on_error?(error: Error): void;

package/net.js

@@ -623,7 +623,7 @@ export class Remote {
         - duration?: `1000 * 30` 首次重连失败后的后续尝试间隔 (单位: ms)
         - first_delay?: `0` 调用函数后是否立即连接，还是在 first_delay 后重连 (单位: ms)
         - on_error?: 接收每次尝试连接的错误 */
-    async start_reconnecting({ func, interval = 1000 * 10, first_delay = 0, on_error, } = {}) {
+    async start_reconnecting({ func, args, interval = 1000 * 10, first_delay = 0, on_error, } = {}) {
         assert(this.url);
         if (this.reconnecting)
             return;
@@ -634,7 +634,7 @@ export class Remote {
             if (this.lwebsocket.resource?.readyState !== WebSocketOpen)
                 try {
                     if (func)
-                        await this.call(func);
+                        await this.call(func, args);
                     else
                         await this.connect();
                     this.reconnecting = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xshell",
-  "version": "1.0.52",
+  "version": "1.0.54",
   "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.3",
+    "@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,