xshell 1.2.62 → 1.2.64

package/file.js

@@ -861,7 +861,7 @@ export async function fsync(fp_src, fp_dst, { print = print_files, delete: _dele
                 fpd_changeds.push(fp);
             if (print.files)
                 log_action(`同步${modify ? '修改' : '新增'}`, `${fp_src}${fp}`, `${fp_dst}${fp}`);
-            tasks.push(fcopy(`${fp_src}${fp}`, `${fp_dst}${fp}`, noprint));
+            tasks.push(['fcopy', `${fp_src}${fp}`, `${fp_dst}${fp}`]);
         };
         const sync_delete = ({ fp }) => {
             if (fpd_deleteds.some(fpd_deleted => fp.startsWith(fpd_deleted)))
@@ -870,7 +870,7 @@ export async function fsync(fp_src, fp_dst, { print = print_files, delete: _dele
                 fpd_deleteds.push(fp);
             if (print.files)
                 console.log('同步删除', `${fp_dst}${fp}`);
-            tasks.push(fdelete(`${fp_dst}${fp}`, noprint));
+            tasks.push(['fdelete', `${fp_dst}${fp}`]);
         };
         for (; p < src_stats.length && q < dst_stats.length;) {
             const src = src_stats[p];
@@ -896,7 +896,13 @@ export async function fsync(fp_src, fp_dst, { print = print_files, delete: _dele
         if (_delete)
             for (; q < dst_stats.length; ++q)
                 sync_delete(dst_stats[q]);
-        await Promise.all(tasks);
+        const { default: pmap } = await import('p-map');
+        await pmap(tasks, async ([task, arg0, arg1]) => {
+            if (task === 'fcopy')
+                await fcopy(arg0, arg1, noprint);
+            else
+                await fdelete(arg0, noprint);
+        }, { concurrency: 2 });
     }
     else {
         let same = true;
@@ -929,7 +935,8 @@ export function fp_sorter(l, r) {
 }
 /** 返回修改时间与大小是否相同 */
 function compare_stat(src, dst) {
-    return src.size === dst.size && Math.abs(Number(src.mtimeMs) - Number(dst.mtimeMs)) <= 1;
+    // exfat 时间精度为 2s
+    return src.size === dst.size && Math.abs(Number(src.mtimeMs) - Number(dst.mtimeMs)) <= 2000;
 }
 export function log_action(action, fp_src, fp_dst, sep = '->') {
     console.log(`${`${action}  ${fp_src}`.pad(url_width)}  ${sep}  ${fp_dst}`);

package/net.d.ts

@@ -15,7 +15,9 @@ export declare const websocket_states: readonly ["connecting", "open", "closing"
 export declare enum MyProxy {
     socks5 = "http://127.0.0.1:10080",
     whistle = "http://localhost:8899",
-    work = "http://localhost:10090"
+    work = "http://localhost:10090",
+    /** 需要先启动 server.start_tunnel_server('ddb.test.proxy') */
+    test = "http://localhost:10091"
 }
 export declare const byproxy: {
     readonly proxy: true;
@@ -276,5 +278,5 @@ export declare class RemoteClient {
     [inspect.custom](): {
         remote: string;
         websocket: string;
-    } & Omit<this, typeof import("util").inspect.custom | "call" | "websocket" | "remote" | "send">;
+    } & Omit<this, "call" | typeof import("util").inspect.custom | "websocket" | "remote" | "send">;
 }

package/net.js

@@ -17,6 +17,8 @@ export var MyProxy;
     MyProxy["socks5"] = "http://127.0.0.1:10080";
     MyProxy["whistle"] = "http://localhost:8899";
     MyProxy["work"] = "http://localhost:10090";
+    /** 需要先启动 server.start_tunnel_server('ddb.test.proxy') */
+    MyProxy["test"] = "http://localhost:10091";
 })(MyProxy || (MyProxy = {}));
 export const byproxy = { proxy: true };
 // ------------------------------------ fetch, request

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.2.62",
+    "version": "1.2.64",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -53,13 +53,13 @@
         "@babel/parser": "^7.28.0",
         "@babel/traverse": "^7.28.0",
         "@koa/cors": "^5.0.0",
-        "@stylistic/eslint-plugin": "^5.2.0",
+        "@stylistic/eslint-plugin": "^5.2.2",
         "@svgr/webpack": "^8.1.0",
         "@types/sass-loader": "^8.0.9",
         "@types/ws": "^8.18.1",
-        "@typescript-eslint/eslint-plugin": "^8.37.0",
-        "@typescript-eslint/parser": "^8.37.0",
-        "@typescript-eslint/utils": "^8.37.0",
+        "@typescript-eslint/eslint-plugin": "^8.38.0",
+        "@typescript-eslint/parser": "^8.38.0",
+        "@typescript-eslint/utils": "^8.38.0",
         "archiver": "^7.0.1",
         "chalk": "^5.4.1",
         "commander": "^14.0.0",
@@ -76,8 +76,9 @@
         "license-webpack-plugin": "^4.0.2",
         "map-stream": "^0.0.7",
         "mime-types": "^3.0.1",
+        "p-map": "^7.0.3",
         "react": "^19.1.0",
-        "react-i18next": "^15.6.0",
+        "react-i18next": "^15.6.1",
         "resolve-path": "^1.4.0",
         "sass": "^1.89.2",
         "sass-loader": "^16.0.5",

package/path.d.ts

@@ -54,7 +54,7 @@ export declare function extname(path: string): string;
 /** `/` */
 export declare const sep = "/";
 /** The platform-specific file delimiter. ';' or ':'. */
-export declare const delimiter: ":" | ";";
+export declare const delimiter: ";" | ":";
 /** Returns an object from a path string - the opposite of format().
     @param path path to evaluate.
     @throws {TypeError} if `path` is not a string. */
@@ -81,7 +81,7 @@ export declare let path: {
     basename: typeof basename;
     extname: typeof extname;
     sep: string;
-    delimiter: ":" | ";";
+    delimiter: ";" | ":";
     parse: typeof parse;
     format: typeof format;
     toNamespacedPath: typeof toNamespacedPath;

package/utils.common.d.ts

@@ -46,7 +46,7 @@ export declare function filter_keys<TObj>(obj: TObj, filter: (key: string) => an
     - filter?: `not_empty` */
 export declare function filter_values<TObj extends Record<string, any>>(obj: TObj, filter?: (value: TObj[string]) => any): TObj;
 /** 简单选择对象中的部分 keys, 返回新对象 */
-export declare function pick<TObject>(obj: TObject, keys: string[]): Partial<TObject>;
+export declare function pick<TObject = any>(obj: TObject, keys: (keyof TObject)[]): Partial<TObject>;
 /** 忽略对象中的 keys, 返回新对象 */
 export declare function omit<TObj>(obj: TObj, omit_keys: string[]): TObj;
 /** 模糊过滤字符串列表或对象列表，常用于根据用户输入补全或搜索过滤
@@ -141,4 +141,4 @@ export declare function ceil2(n: number): number;
 export declare function throttle(duration: number, func: Function, delay_first?: boolean): (this: any, ...args: any[]) => void;
 /** 防抖，间隔一段时间不再触发时调用 */
 export declare function debounce(duration: number, func: Function): (this: any, ...args: any[]) => void;
-export declare function tomorrow(date?: Date | string): Date;
+export declare function tomorrow(date?: Date | string | number): Date;