npm - xshell - Versions diffs - 1.2.50 → 1.2.53 - Mend

xshell 1.2.50 → 1.2.53

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/builder.js CHANGED Viewed

@@ -2,7 +2,7 @@ import { fileURLToPath } from 'url';
 import { not_empty } from "./prototype.js";
 import { noprint } from "./process.js";
 import { Lock, filter_values } from "./utils.js";
-import { fcopy, fmkdir, fwrite, fread } from "./file.js";
+import { fcopy, fmkdir, fwrite, fread, print_info } from "./file.js";
 import { path } from "./path.js";
 const monaco_files = [
     'loader.js',
@@ -563,7 +563,7 @@ export class Bundler {
         await this.build(print);
         await this.close();
     }
-    async build_htmls(print = { info: true, files: false }) {
+    async build_htmls(print = print_info) {
         await Promise.all(Object.entries(this.htmls).map(async ([fp_html, { entry = 'index.js', device_viewport: device_width = false, icon, manifest, dependencies: _dependencies = [], title, scripts, mscripts, notice = false, heads, }]) => {
             const html_template = '<!doctype html>\n' +
                 '<html>\n' +
@@ -606,7 +606,7 @@ export class Bundler {
         if (print.files)
             console.log(`${this.name} 的所有 html 页面构建完成`);
     }
-    async build_single_js(print = { info: true, files: false }) {
+    async build_single_js(print = print_info) {
         const { js, entry } = this.single_js;
         await fwrite(`${this.fpd_out}${js}`, [
             ...this.resolve_dependency_assets(this.dependencies, false, { production: this.production })
@@ -643,7 +643,7 @@ export class Bundler {
             ];
         }).flat();
     }
-    async copy_files({ dependencies: _dependencies = this.dependencies, production = this.production, assets = this.assets, fpd_root = this.fpd_root, fpd_out = this.fpd_out, print = { info: true, files: false } } = {}) {
+    async copy_files({ dependencies: _dependencies = this.dependencies, production = this.production, assets = this.assets, fpd_root = this.fpd_root, fpd_out = this.fpd_out, print = print_info } = {}) {
         if (print.files)
             console.log(`复制 ${this.name} 的依赖文件到 ${this.fpd_out}`);
         if (_dependencies.length)

package/file.d.ts CHANGED Viewed

@@ -6,6 +6,20 @@ export type FileHandle = fsp.FileHandle & {
     fp: string;
 };
 export declare const encodings: readonly ["utf-8", "gb18030", "shift-jis", "utf-16le"];
+export declare const print_files: {
+    readonly info: true;
+    readonly files: true;
+};
+export declare const print_info: {
+    readonly info: true;
+    readonly files: false;
+};
+export declare const print_info_options: {
+    readonly print: {
+        readonly info: true;
+        readonly files: false;
+    };
+};
 export declare const ramdisk: boolean;
 /** fp 所指向的 文件/ 文件夹 是否存在
     Does the file/folder pointed to by fp exist?  */
@@ -19,7 +33,8 @@ export declare function fexists(fp: string, { print }?: {
     - flags: `'r'`  https://nodejs.org/docs/latest/api/fs.html#file-system-flags
     - options?:
-        - mode?: `'0o666'` Sets the file mode (permission and sticky bits) if the file is created. */
+        - mode?: `'0o666'` Sets the file mode (permission and sticky bits) if the file is created.
+        - print?: `false` */
 export declare function fopen(fp: string, flags?: string | number, { mode, print }?: {
     mode?: fs.Mode;
     print?: boolean;
@@ -61,11 +76,11 @@ export interface FWriteOptions {
     print?: boolean;
     mtime?: number;
 }
-/** 写入 data 到 fp 路径所指的文件
+/** 写入 data 到 fp 路径或句柄所指的文件
     会在因不存在父文件夹导致写入失败时，自动创建父文件夹，并再次尝试写入
     最好预先创建父文件夹，减少文件系统操作，提升性能
     返回写入的文件路径
-    - fp: 目标文件完整路径
+    - fp: 目标文件完整路径或句柄
     - data: 支持下面几种类型
         - string: 写入文本
         - Uint8Array, Buffer: 写入二进制 buffer
@@ -268,4 +283,24 @@ export declare function ftail(fp: string, handler: (lines: string[]) => void | P
 export declare function freplace(fp: string, pattern: string | RegExp, replacement: string, { print }?: {
     print?: boolean;
 }): Promise<void>;
+interface FSyncOptions {
+    print?: {
+        info: boolean;
+        files: boolean;
+    };
+    delete?: boolean;
+}
+/** 同步文件或文件夹 fp_src 到 fp_dst ，返回 fp_dst
+    - fp_src: 源文件或文件夹
+    - fp_dst: 目标文件或文件夹
+    - options?:
+        - print?: `print_info`
+        - delete?: `false` */
+export declare function fsync(fp_src: string, fp_dst: string, { print, delete: _delete }?: FSyncOptions): Promise<string>;
+/** 根据对象的 fp 属性进行字典序排序 */
+export declare function fp_sorter(l: {
+    fp: string;
+}, r: {
+    fp: string;
+}): 0 | 1 | -1;
 export declare function log_action(action: string, fp_src: string, fp_dst: string, sep?: string): void;

package/file.js CHANGED Viewed

@@ -4,10 +4,13 @@ import { t } from "./i18n/instance.js";
 import { noop, to_json } from "./prototype.js";
 import { pack, parse } from "./io.js";
 import { path } from "./path.js";
-import { check, Lock, WritableMemoryStream, url_width, throttle, decode } from "./utils.js";
+import { check, Lock, WritableMemoryStream, url_width, throttle, decode, strcmp } from "./utils.js";
 import { noprint } from "./process.js";
 export { fsp };
 export const encodings = ['utf-8', 'gb18030', 'shift-jis', 'utf-16le'];
+export const print_files = { info: true, files: true };
+export const print_info = { info: true, files: false };
+export const print_info_options = { print: print_info };
 export const ramdisk = fexists('T:/TEMP/', noprint);
 /** fp 所指向的 文件/ 文件夹 是否存在
     Does the file/folder pointed to by fp exist?  */
@@ -24,7 +27,8 @@ export function fexists(fp, { print = true } = {}) {
     - flags: `'r'`  https://nodejs.org/docs/latest/api/fs.html#file-system-flags
     - options?:
-        - mode?: `'0o666'` Sets the file mode (permission and sticky bits) if the file is created. */
+        - mode?: `'0o666'` Sets the file mode (permission and sticky bits) if the file is created.
+        - print?: `false` */
 export async function fopen(fp, flags = 'r', { mode, print } = {}) {
     if (print)
         console.log(t('打开文件'), fp);
@@ -824,6 +828,109 @@ export async function freplace(fp, pattern, replacement, { print = true } = {})
     await fwrite(fp, (await fread(fp, { print }))
         .replaceAll(pattern, replacement), { print });
 }
+/** 同步文件或文件夹 fp_src 到 fp_dst ，返回 fp_dst
+    - fp_src: 源文件或文件夹
+    - fp_dst: 目标文件或文件夹
+    - options?:
+        - print?: `print_info`
+        - delete?: `false` */
+export async function fsync(fp_src, fp_dst, { print = print_files, delete: _delete = false } = {}) {
+    if (print.info)
+        log_action('同步', fp_src, fp_dst);
+    if (fp_src.isdir) {
+        let dst_stats;
+        try {
+            dst_stats = (await flist(fp_dst, { stats: true, deep: true, print: false })).sort(fp_sorter);
+        }
+        catch (error) {
+            if (error.code === 'ENOENT')
+                return fcopy(fp_src, fp_dst, { print: print.info });
+            else
+                throw error;
+        }
+        const src_stats = (await flist(fp_src, { deep: true, print: false, stats: true }))
+            .sort(fp_sorter);
+        let p = 0, q = 0;
+        let tasks = [];
+        let fpd_changeds = [];
+        let fpd_deleteds = [];
+        const sync_change = ({ fp }, modify) => {
+            if (fpd_changeds.some(fpd_created => fp.startsWith(fpd_created)))
+                return;
+            if (fp.isdir)
+                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));
+        };
+        const sync_delete = ({ fp }) => {
+            if (fpd_deleteds.some(fpd_deleted => fp.startsWith(fpd_deleted)))
+                return;
+            if (fp.isdir)
+                fpd_deleteds.push(fp);
+            if (print.files)
+                console.log('同步删除', `${fp_dst}${fp}`);
+            tasks.push(fdelete(`${fp_dst}${fp}`, noprint));
+        };
+        for (; p < src_stats.length && q < dst_stats.length;) {
+            const src = src_stats[p];
+            const dst = dst_stats[q];
+            if (src.fp === dst.fp) {
+                if (!src.fp.isdir && !compare_stat(src, dst))
+                    sync_change(src, true);
+                ++p;
+                ++q;
+            }
+            else if (src.fp < dst.fp) { // dst 缺少了文件 / 文件夹
+                sync_change(src, false);
+                ++p;
+            }
+            else { // dst 多了文件 / 文件夹
+                if (_delete)
+                    sync_delete(dst);
+                ++q;
+            }
+        }
+        for (; p < src_stats.length; ++p)
+            sync_change(src_stats[p], false);
+        if (_delete)
+            for (; q < dst_stats.length; ++q)
+                sync_delete(dst_stats[q]);
+        await Promise.all(tasks);
+    }
+    else {
+        let same = true;
+        const [src_stat, dst_stat] = await Promise.all([
+            fstat(fp_src),
+            (async () => {
+                try {
+                    return await fstat(fp_dst);
+                }
+                catch (error) {
+                    if (error.code === 'ENOENT')
+                        same = false;
+                    else
+                        throw error;
+                }
+            })()
+        ]);
+        if (same)
+            same = compare_stat(src_stat, dst_stat);
+        if (same)
+            log_action('跳过相同', fp_src, fp_dst);
+        else
+            await fcopy(fp_src, fp_dst, { print: print.info });
+    }
+    return fp_dst;
+}
+/** 根据对象的 fp 属性进行字典序排序 */
+export function fp_sorter(l, r) {
+    return strcmp(l.fp, r.fp);
+}
+/** 返回修改时间与大小是否相同 */
+function compare_stat(src, dst) {
+    return src.size === dst.size && Math.abs(Number(src.mtimeMs) - Number(dst.mtimeMs)) <= 1;
+}
 export function log_action(action, fp_src, fp_dst, sep = '->') {
     console.log(`${`${action}  ${fp_src}`.pad(url_width)}  ${sep}  ${fp_dst}`);
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.2.50",
+    "version": "1.2.53",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -53,13 +53,13 @@
         "@babel/parser": "^7.27.7",
         "@babel/traverse": "^7.27.7",
         "@koa/cors": "^5.0.0",
-        "@stylistic/eslint-plugin": "^5.0.0",
+        "@stylistic/eslint-plugin": "^5.1.0",
         "@svgr/webpack": "^8.1.0",
         "@types/sass-loader": "^8.0.9",
         "@types/ws": "^8.18.1",
-        "@typescript-eslint/eslint-plugin": "^8.35.0",
-        "@typescript-eslint/parser": "^8.35.0",
-        "@typescript-eslint/utils": "^8.35.0",
+        "@typescript-eslint/eslint-plugin": "^8.35.1",
+        "@typescript-eslint/parser": "^8.35.1",
+        "@typescript-eslint/utils": "^8.35.1",
         "archiver": "^7.0.1",
         "chalk": "^5.4.1",
         "commander": "^14.0.0",
@@ -69,7 +69,7 @@
         "eslint-plugin-import": "^2.32.0",
         "eslint-plugin-react": "^7.37.5",
         "https-proxy-agent": "^7.0.6",
-        "i18next": "^25.2.1",
+        "i18next": "^25.3.0",
         "i18next-scanner": "^4.6.0",
         "koa": "^3.0.0",
         "koa-compress": "^5.1.1",
@@ -92,7 +92,7 @@
         "undici": "^7.11.0",
         "webpack": "^5.99.9",
         "webpack-bundle-analyzer": "^4.10.2",
-        "ws": "^8.18.2"
+        "ws": "^8.18.3"
     },
     "devDependencies": {
         "@babel/types": "^7.27.7",
@@ -103,7 +103,7 @@
         "@types/koa": "^2.15.0",
         "@types/koa-compress": "^4.0.6",
         "@types/mime-types": "^3.0.1",
-        "@types/node": "^24.0.6",
+        "@types/node": "^24.0.8",
         "@types/react": "^19.1.8",
         "@types/tough-cookie": "^4.0.5",
         "@types/ua-parser-js": "^0.7.39",

package/prototype.browser.d.ts CHANGED Viewed

@@ -224,6 +224,7 @@ 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 declare function to_snake_case(str: string): string;
 export declare function to_method_property_descriptors(methods: {
     [name: string]: Function;
 }): PropertyDescriptorMap;

package/prototype.browser.js CHANGED Viewed

@@ -13,6 +13,12 @@ export const is_key_type = ((key) => key_types.includes(typeof key));
 export function rethrow(error) {
     throw error;
 }
+export function to_snake_case(str) {
+    return str.replace(/([A-Z])/g, '_$1')
+        .toLowerCase()
+        .replace('-', '_')
+        .strip_if_start('_');
+}
 export function to_method_property_descriptors(methods) {
     return Object.fromEntries(Object.entries(methods)
         .map(([name, value]) => ([name, {
@@ -120,10 +126,7 @@ Object.defineProperties(String.prototype, {
             return new RegExp(this.replace(new RegExp(`[${replace_chars}]`, 'g'), '\\$&'), flags);
         },
         to_snake_case() {
-            return this.replace(/([A-Z])/g, '_$1')
-                .toLowerCase()
-                .replace('-', '_')
-                .replace(/^_+/, '');
+            return to_snake_case(this);
         },
         refmt(pattern, pattern_, preservations = '', flags = '', transformer = (name, value) => value || '', pattern_placeholder = /\{.*?\}/g) {
             // --- 转换 pattern 为 pattern_regx

package/prototype.d.ts CHANGED Viewed

@@ -254,6 +254,7 @@ 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 declare function to_snake_case(str: string): string;
 export declare function to_method_property_descriptors(methods: {
     [name: string]: Function;
 }): PropertyDescriptorMap;

package/prototype.js CHANGED Viewed

@@ -14,6 +14,12 @@ export const is_key_type = ((key) => key_types.includes(typeof key));
 export function rethrow(error) {
     throw error;
 }
+export function to_snake_case(str) {
+    return str.replace(/([A-Z])/g, '_$1')
+        .toLowerCase()
+        .replace('-', '_')
+        .strip_if_start('_');
+}
 export function to_method_property_descriptors(methods) {
     return Object.fromEntries(Object.entries(methods)
         .map(([name, value]) => ([name, {
@@ -124,10 +130,7 @@ if (!globalThis.my_prototype_defined) {
                 return new RegExp(this.replace(new RegExp(`[${replace_chars}]`, 'g'), '\\$&'), flags);
             },
             to_snake_case() {
-                return this.replace(/([A-Z])/g, '_$1')
-                    .toLowerCase()
-                    .replace('-', '_')
-                    .replace(/^_+/, '');
+                return to_snake_case(this);
             },
             refmt(pattern, pattern_, preservations = '', flags = '', transformer = (name, value) => value || '', pattern_placeholder = /\{.*?\}/g) {
                 // --- 转换 pattern 为 pattern_regx

package/utils.browser.d.ts CHANGED Viewed

@@ -16,6 +16,10 @@ export declare function unique<TObj>(iterable: TObj[] | Iterable<TObj>, mapper?:
 export declare function seq<T = number>(n: number, generator?: (index: number) => T): T[];
 /** 将 keys, values 数组按对应的顺序组合成一个对象 */
 export declare function zip_object<TValue>(keys: (string | number)[], values: TValue[]): Record<string, TValue>;
+/** 映射对象中的 keys, 返回新对象
+    - obj: 对象
+    - mapper?: `to_snake_case` (key: string) => string 或者 Record<string, string> */
+export declare function map_keys<TReturn>(obj: any, mapper?: ((key: string) => string) | Record<string, string>): TReturn;
 /** 过滤对象中的 values, 返回新对象
     - obj
     - filter?: `not_empty` */

package/utils.browser.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { is_key_type, select, not_empty, ident } from "./prototype.browser.js";
+import { is_key_type, select, not_empty, ident, to_snake_case } from "./prototype.browser.js";
 import { t } from "./i18n/instance.js";
 export function assert(assertion, message) {
     if (!assertion) {
@@ -54,6 +54,16 @@ export function zip_object(keys, values) {
         return obj;
     }, {});
 }
+/** 映射对象中的 keys, 返回新对象
+    - obj: 对象
+    - mapper?: `to_snake_case` (key: string) => string 或者 Record<string, string> */
+export function map_keys(obj, mapper = to_snake_case) {
+    return Object.fromEntries(Object.entries(obj)
+        .map(typeof mapper === 'function' ?
+        ([key, value]) => [mapper(key), value]
+        :
+            ([key, value]) => [mapper[key] || key, value]));
+}
 /** 过滤对象中的 values, 返回新对象
     - obj
     - filter?: `not_empty` */

package/utils.d.ts CHANGED Viewed

@@ -25,8 +25,10 @@ export declare function seq<T = number>(n: number, generator?: (index: number) =
 export declare function sort_keys<TObj>(obj: TObj): TObj;
 /** 将 keys, values 数组按对应的顺序组合成一个对象 */
 export declare function zip_object<TValue>(keys: (string | number)[], values: TValue[]): Record<string, TValue>;
-/** 映射对象中的 keys, 返回新对象 */
-export declare function map_keys<TObj>(obj: TObj, mapper: (key: string) => string): TObj;
+/** 映射对象中的 keys, 返回新对象
+    - obj: 对象
+    - mapper?: `to_snake_case` (key: string) => string 或者 Record<string, string> */
+export declare function map_keys<TReturn>(obj: any, mapper?: ((key: string) => string) | Record<string, string>): TReturn;
 /** 映射对象中的 values, 返回新对象 */
 export declare function map_values<TValue, TNewValue>(obj: {
     [key: string]: TValue;

package/utils.js CHANGED Viewed

@@ -2,7 +2,7 @@ import { Stream, Writable, Transform } from 'stream';
 import util from 'util';
 import timers from 'timers/promises';
 import { t } from "./i18n/instance.js";
-import { select, not_empty, is_key_type, noop, ident } from "./prototype.js";
+import { select, not_empty, is_key_type, noop, ident, to_snake_case } from "./prototype.js";
 /** `180` 输出字符宽度 */
 export const output_width = 180;
 export const url_width = 52;
@@ -81,10 +81,15 @@ export function zip_object(keys, values) {
         return obj;
     }, {});
 }
-/** 映射对象中的 keys, 返回新对象 */
-export function map_keys(obj, mapper) {
+/** 映射对象中的 keys, 返回新对象
+    - obj: 对象
+    - mapper?: `to_snake_case` (key: string) => string 或者 Record<string, string> */
+export function map_keys(obj, mapper = to_snake_case) {
     return Object.fromEntries(Object.entries(obj)
-        .map(([key, value]) => [mapper(key), value]));
+        .map(typeof mapper === 'function' ?
+        ([key, value]) => [mapper(key), value]
+        :
+            ([key, value]) => [mapper[key] || key, value]));
 }
 /** 映射对象中的 values, 返回新对象 */
 export function map_values(obj, mapper) {