xshell 1.2.28 → 1.2.30

package/apps.d.ts

@@ -5,13 +5,11 @@ export declare let npm: {
     /** node.exe E:/sdk/nodejs/node_modules/corepack/dist/pnpm.js install
         - cwd
         - pkgs?: `[ ]` */
-    install(cwd: string, pkgs?: string[], { save_dev, save_peer, legacy, force, term, inspect, break: _break, }?: {
+    install(cwd: string, pkgs?: string[], { save_dev, save_peer, legacy, force, break: _break, }?: {
         save_dev?: boolean;
         save_peer?: boolean;
         legacy?: boolean;
         force?: boolean;
-        term?: boolean;
-        inspect?: boolean;
         break?: boolean;
     }): Promise<void>;
 };

package/apps.js

@@ -8,7 +8,7 @@ export let npm = {
     /** node.exe E:/sdk/nodejs/node_modules/corepack/dist/pnpm.js install
         - cwd
         - pkgs?: `[ ]` */
-    async install(cwd, pkgs = [], { save_dev = false, save_peer = false, legacy = false, force = false, term = false, inspect = false, break: _break = false, } = {}) {
+    async install(cwd, pkgs = [], { save_dev = false, save_peer = false, legacy = false, force = false, break: _break = false, } = {}) {
         const args = [
             'install',
             ...util.inspect.defaultOptions.colors ? ['--color'] : [],
@@ -19,6 +19,6 @@ export let npm = {
             ...pkgs || []
         ];
         await this.call(cwd, this.bin, args);
-    },
+    }
 };
 //# sourceMappingURL=apps.js.map

package/file.d.ts

@@ -27,14 +27,16 @@ export declare function fopen(fp: string, flags?: string | number, { mode, print
     flags: string | number;
     mode: fs.Mode;
 }>;
-export declare function fread(fp: string): Promise<string>;
-export declare function fread(fp: string, options?: {
-    encoding: 'binary';
+export interface FReadOptions {
+    encoding?: Encoding | 'binary';
     print?: boolean;
+}
+export declare function fread(fp: string | FileHandle): Promise<string>;
+export declare function fread(fp: string | FileHandle, options?: FReadOptions & {
+    encoding: 'binary';
 }): Promise<Buffer>;
-export declare function fread(fp: string, options?: {
+export declare function fread(fp: string | FileHandle, options?: FReadOptions & {
     encoding?: Encoding;
-    print?: boolean;
 }): Promise<string>;
 /** 读取文件，划分为行，并去掉最后一个 \n 之后的 '' */
 export declare function fread_lines(fp: string, options?: {
@@ -56,6 +58,7 @@ export declare function fequals(fp_left: string, fp_right: string, { print }?: {
 }): Promise<boolean>;
 export interface FWriteOptions {
     print?: boolean;
+    mtime?: number;
 }
 /** 写入 data 到 fp 路径所指的文件
     会在因不存在父文件夹导致写入失败时，自动创建父文件夹，并再次尝试写入
@@ -67,8 +70,8 @@ export interface FWriteOptions {
         - Uint8Array, Buffer: 写入二进制 buffer
         - any: 通过 JSON.stringify 转为文本后写入文件
     - options?:
-        - dir?: 文件夹
-        - print?: `true` */
+        - print?: `true`
+        - mtime?: 在写入后设置修改时间 (utc 毫秒数) */
 export declare function fwrite(fp: string, data: string | Uint8Array | any, options?: FWriteOptions): Promise<string>;
 export declare function fwrite(fp: FileHandle, data: string | Uint8Array | any, options?: FWriteOptions): Promise<FileHandle>;
 export declare function fwrite(fp: string | FileHandle, data: string | Uint8Array | any, options?: FWriteOptions): Promise<string | FileHandle>;
@@ -104,7 +107,7 @@ export declare function flist(fpd: string, options?: FListOptions & {
     stats: true;
 }): Promise<FStats[]>;
 export declare function flist(fpd: string, options?: FListOptions): Promise<string[]>;
-export declare function fstat(fp: string): Promise<FStats>;
+export declare function fstat(fp: string | FileHandle): Promise<FStats>;
 export declare function flstat(fp: string): Promise<FStats>;
 export declare function ffstat(handle: fsp.FileHandle): Promise<fs.BigIntStats>;
 /** 删除文件或文件夹，返回是否实际进行了删除操作
@@ -140,7 +143,7 @@ export interface FCopyOptions {
         
     @example
     fcopy('D:/temp/camera/', 'D:/camera/') */
-export declare function fcopy(fp_src: string, fp_dst: string, { print, overwrite, filter, }?: FCopyOptions): Promise<void>;
+export declare function fcopy(fp_src: string, fp_dst: string, { print, overwrite, filter, }?: FCopyOptions): Promise<string>;
 export interface FMoveOptions {
     overwrite?: boolean;
     print?: boolean;
@@ -155,7 +158,7 @@ export interface FMoveOptions {
     
     @example
     fmove('D:/temp/camera/', 'D:/camera/') */
-export declare function fmove(fp_src: string, fp_dst: string, { overwrite, print }?: FMoveOptions): Promise<void>;
+export declare function fmove(fp_src: string, fp_dst: string, { overwrite, print }?: FMoveOptions): Promise<string>;
 /** 重命名文件  rename file
     - fp:  当前文件名／路径  current filename/path
     - fp_: 新的文件名／路径  new filename/path
@@ -168,6 +171,11 @@ export declare function frename(fp: string, fp_: string, { fpd, print, overwrite
     print?: boolean;
     overwrite?: boolean;
 }): Promise<void>;
+export interface FMkdirOptions {
+    print?: boolean;
+    /** `0o777` A file mode. If a string is passed, it is parsed as an octal integer. */
+    mode?: string | number;
+}
 /**
     递归创建文件夹，确保 fpd 指向的文件夹存在  Create folders recursively, make sure the folder pointed to by fpd exists
     返回首个创建的文件夹或 undefined  Returns the first created folder or undefined
@@ -176,11 +184,7 @@ export declare function frename(fp: string, fp_: string, { fpd, print, overwrite
     - options?:
         - print?: `true`
         - mode?: `'0o777'` */
-export declare function fmkdir(fpd: string, { print, mode, }?: {
-    print?: boolean;
-    /** `0o777` A file mode. If a string is passed, it is parsed as an octal integer. */
-    mode?: string | number;
-}): Promise<string>;
+export declare function fmkdir(fpd: string, { print, mode }?: FMkdirOptions): Promise<string>;
 /** 创建软链接
     - fp_real: 现在真实文件/文件夹的路径
     - fp_link: 目标链接文件/文件夹的路径 */
@@ -225,3 +229,4 @@ 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>;
+export declare function log_action(action: string, fp_src: string, fp_dst: string, sep?: string): void;

package/file.js

@@ -5,9 +5,10 @@ import { to_json } from "./prototype.js";
 import { pack, parse } from "./io.js";
 import { path } from "./path.js";
 import { check, Lock, WritableMemoryStream, url_width, throttle } from "./utils.js";
+import { noprint } from "./process.js";
 export { fsp };
 export const encodings = ['utf-8', 'gb18030', 'shift-jis', 'utf-16le'];
-export const ramdisk = fexists('T:/TEMP/', { print: false });
+export const ramdisk = fexists('T:/TEMP/', noprint);
 /** fp 所指向的 文件/ 文件夹 是否存在
     Does the file/folder pointed to by fp exist?  */
 export function fexists(fp, { print = true } = {}) {
@@ -27,15 +28,21 @@ export function fexists(fp, { print = true } = {}) {
 export async function fopen(fp, flags = 'r', { mode, print } = {}) {
     if (print)
         console.log(t('打开文件'), fp);
-    await fmkdir(fp.fdir, { print: false });
+    await fmkdir(fp.fdir, noprint);
     return Object.assign(await fsp.open(fp, flags, mode), { fp, flags, mode });
 }
 export async function fread(fp, { encoding = 'utf-8', print = true } = {}) {
-    check(!fp.isdir, t('fp 必须是文件，不能以 / 结尾'));
-    check(path.isAbsolute(fp), `${t('fp 必须是绝对路径:')} ${fp}`);
-    check(encoding !== 'auto');
-    if (print)
-        console.log(t('读取'), fp);
+    const is_handle = typeof fp === 'object' && fp && 'fd' in fp;
+    if (is_handle) {
+        if (print && fp.fp)
+            console.log('读取', fp);
+    }
+    else {
+        check(!fp.isdir, 'fp 必须是文件，不能以 / 结尾');
+        check(path.isAbsolute(fp), `fp 必须是绝对路径: ${fp}`);
+        if (print)
+            console.log('读取', fp);
+    }
     switch (encoding) {
         case 'utf-8':
             return fsp.readFile(fp, { encoding: 'utf-8' });
@@ -75,30 +82,45 @@ export async function fequals(fp_left, fp_right, { print = true } = {}) {
         return false;
     }
 }
-export async function fwrite(fp, data, { print = true } = {}) {
+export async function fwrite(fp, data, { print = true, mtime } = {}) {
     const is_handle = typeof fp === 'object' && fp && 'fd' in fp;
     if (is_handle) {
         if (print)
-            console.log(t('写入'), fp.fp);
+            console.log('写入', fp.fp);
     }
     else {
-        check(path.isAbsolute(fp), `${t('fp 必须是绝对路径，当前为:')} ${fp}`);
+        check(path.isAbsolute(fp), `fp 必须是绝对路径，当前为: ${fp}`);
         if (print)
-            console.log(t('写入'), fp);
+            console.log('写入', fp);
     }
     if (!isUint8Array(data) && typeof data !== 'string')
         data = to_json(data);
+    // 需要设置修改时间，先打开文件再写入
+    if (mtime !== undefined && !is_handle) {
+        let handle = await fopen(fp, 'w', noprint);
+        try {
+            await handle.write(data, 0);
+            const mseconds = mtime / 1000;
+            await handle.utimes(mseconds, mseconds);
+        }
+        finally {
+            await handle.close();
+        }
+        return fp;
+    }
     try {
         await fsp.writeFile(fp, data);
     }
     catch (error) {
         if (error.code === 'ENOENT' && !is_handle) {
-            await fmkdir(fp.fdir, { print: false });
+            await fmkdir(fp.fdir, noprint);
             await fsp.writeFile(fp, data);
         }
         else
             throw error;
     }
+    if (mtime !== undefined)
+        await fp.utimes(mtime, mtime);
     return fp;
 }
 export async function fpack(fp, data, options) {
@@ -115,7 +137,7 @@ export async function fappend(fp, data, { print = true } = {}) {
     }
     catch (error) {
         if (error.code === 'ENOENT') {
-            await fmkdir(fp.fdir, { print: false });
+            await fmkdir(fp.fdir, noprint);
             await fsp.appendFile(fp, data);
         }
         else
@@ -213,9 +235,17 @@ export async function flist(fpd, options = {}) {
         return fps;
 }
 export async function fstat(fp) {
-    check(path.isAbsolute(fp), t("fstat: 参数 fp: '{{fp}}' 必须是绝对路径", { fp }));
-    let stat = await fsp.stat(fp, { bigint: true });
-    stat.fp = fp;
+    let stat;
+    if (typeof fp === 'object' && fp && 'fd' in fp) {
+        stat = await fp.stat({ bigint: true });
+        if (fp.fp)
+            stat.fp = fp.fp;
+    }
+    else {
+        check(path.isAbsolute(fp), `fstat: 参数 fp: '${fp}' 必须是绝对路径`);
+        stat = await fsp.stat(fp, { bigint: true });
+        stat.fp = fp;
+    }
     return stat;
 }
 export async function flstat(fp) {
@@ -259,8 +289,8 @@ export async function fdelete(fp, { print = true } = {}) {
 }
 /** 清空文件夹中的内容，实际为删除该文件夹后新建 */
 export async function fdclear(fpd, { print = true } = {}) {
-    await fdelete(fpd, { print: false });
-    await fmkdir(fpd, { print: false });
+    await fdelete(fpd, noprint);
+    await fmkdir(fpd, noprint);
     if (print)
         console.log(`清空了文件夹 ${fpd}`);
 }
@@ -319,6 +349,7 @@ export async function fcopy(fp_src, fp_dst, { print = true, overwrite = true, fi
             else
                 throw error;
         }
+    return fp_dst;
 }
 /** 移动文件或文件夹
     相同分区 / 文件系统下使用 rename, 否则 fallback 到复制后删除源文件
@@ -335,12 +366,12 @@ export async function fmove(fp_src, fp_dst, { overwrite = false, print = true }
     check(path.isAbsolute(fp_src) && path.isAbsolute(fp_dst), t('fp_src 和 fp_dst 必须为完整路径'));
     if (print)
         log_action('移动', fp_src, fp_dst);
-    if (!overwrite && fexists(fp_dst, { print: false }))
+    if (!overwrite && fexists(fp_dst, noprint))
         throw new Error(`${t('已存在')} ${fp_dst}`);
-    await fmkdir(fp_dst.fdir, { print: false });
+    await fmkdir(fp_dst.fdir, noprint);
     async function copy_and_delete() {
         await fcopy(fp_src, fp_dst, { overwrite, print: false });
-        await fdelete(fp_src, { print: false });
+        await fdelete(fp_src, noprint);
     }
     if (fp_src[0] !== fp_dst[0] || overwrite)
         await copy_and_delete();
@@ -354,6 +385,7 @@ export async function fmove(fp_src, fp_dst, { overwrite = false, print = true }
             else
                 throw error;
         }
+    return fp_dst;
 }
 /** 重命名文件  rename file
     - fp:  当前文件名／路径  current filename/path
@@ -371,7 +403,7 @@ export async function frename(fp, fp_, { fpd, print = true, overwrite = true } =
     check(path.isAbsolute(fp) && path.isAbsolute(fp_), t('fp 和 fp_ 必须是绝对路径'));
     if (print)
         log_action('重命名', fp, fp_);
-    if (!overwrite && fexists(fp_, { print: false }))
+    if (!overwrite && fexists(fp_, noprint))
         throw new Error(`${t('已存在')} ${fp}`);
     await fsp.rename(fp, fp_);
 }
@@ -383,13 +415,13 @@ export async function frename(fp, fp_, { fpd, print = true, overwrite = true } =
     - options?:
         - print?: `true`
         - mode?: `'0o777'` */
-export async function fmkdir(fpd, { print = true, mode, } = {}) {
-    check(path.isAbsolute(fpd), t('fpd 必须是绝对路径: ') + fpd);
-    check(fpd.isdir, t('fpd 必须以 / 结尾: ') + fpd);
+export async function fmkdir(fpd, { print = true, mode } = {}) {
+    check(path.isAbsolute(fpd), `fpd 必须是绝对路径: ${fpd}`);
+    check(fpd.isdir, `fpd 必须以 / 结尾: ${fpd}`);
     // 类似 D:/ 这样的根路径，调用 fsp.mkdir 会报错无权限
     if (fpd.length === 3 &&
         'A' <= fpd[0] && fpd[0] <= 'Z' && fpd[1] === ':' && fpd[2] === '/')
-        if (fexists(fpd)) {
+        if (fexists(fpd, noprint)) {
             if (print)
                 console.log(t('已存在文件夹'), fpd);
             return fpd;
@@ -414,7 +446,7 @@ export async function flink(fp_real, fp_link, { junction = false, print = true,
     const is_fpd_real = fp_real.isdir;
     const is_fpd_link = fp_link.isdir;
     check(is_fpd_real === is_fpd_link, 'fp_real 和 fp_link 必须同为文件路径或文件夹路径');
-    if (fexists(fp_link, { print: false }))
+    if (fexists(fp_link, noprint))
         if (!skip_existing)
             throw new Error(`存在同名${is_fpd_link ? '文件夹' : '文件'}: ${fp_link}，无法创建链接`);
         else {
@@ -464,7 +496,7 @@ async function _zip(data, fp_zip, { dirname, print = { files: true, info: true }
             dirname = fpd_src.fname;
         if (!dirname.isdir)
             throw new Error('dirname 需要以 / 结尾');
-        entries = Object.fromEntries((await flist(fpd_src, { print: false }))
+        entries = Object.fromEntries((await flist(fpd_src, noprint))
             .map(fp => ([dirname + fp, fpd_src + fp])));
     }
     else {
@@ -565,7 +597,7 @@ export async function freplace(fp, pattern, replacement, { print = true } = {})
     await fwrite(fp, (await fread(fp, { print }))
         .replaceAll(pattern, replacement), { print });
 }
-function log_action(action, fp_src, fp_dst, sep = '->') {
+export function log_action(action, fp_src, fp_dst, sep = '->') {
     console.log(`${`${action}  ${fp_src}`.pad(url_width)}  ${sep}  ${fp_dst}`);
 }
 //# sourceMappingURL=file.js.map

package/git.d.ts

@@ -27,6 +27,7 @@ export declare class Git {
         hash: string;
         message: string;
     }[]>;
+    get_last_commit_hash(short?: boolean): Promise<string>;
     fetch({ print, remote }?: {
         print?: boolean;
         remote?: string;

package/git.js

@@ -1,4 +1,4 @@
-import { call, print_no_command } from "./process.js";
+import { call, noprint, print_no_command } from "./process.js";
 import { fread, fmkdir } from "./file.js";
 export class Git {
     static exe = 'git';
@@ -86,6 +86,11 @@ export class Git {
             };
         });
     }
+    async get_last_commit_hash(short = true) {
+        const hash = (await fread(`${this.cwd}.git/refs/heads/${await this.get_branch()}`, noprint))
+            .trim();
+        return short ? hash.slice(0, 6) : hash;
+    }
     async fetch({ print = true, remote } = {}) {
         await this.call([
             'fetch',

package/net.js

@@ -108,7 +108,7 @@ export async function request(url, options = {}) {
     let headers = {
         'accept-language': 'zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7,ja-JP;q=0.6,ja;q=0.5',
         'accept-encoding': 'gzip, deflate, br',
-        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36',
+        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36',
         'sec-ch-ua-platform': '"Windows"',
         'sec-ch-ua-platform-version': '"15.0.0"',
     };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.2.28",
+    "version": "1.2.30",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -56,10 +56,10 @@
         "@stylistic/eslint-plugin": "^4.2.0",
         "@svgr/webpack": "^8.1.0",
         "@types/sass-loader": "^8.0.9",
-        "@types/ws": "^8.18.0",
-        "@typescript-eslint/eslint-plugin": "^8.28.0",
-        "@typescript-eslint/parser": "^8.28.0",
-        "@typescript-eslint/utils": "^8.28.0",
+        "@types/ws": "^8.18.1",
+        "@typescript-eslint/eslint-plugin": "^8.29.0",
+        "@typescript-eslint/parser": "^8.29.0",
+        "@typescript-eslint/utils": "^8.29.0",
         "archiver": "^7.0.1",
         "chalk": "^5.4.1",
         "cli-table3": "^0.6.5",
@@ -80,11 +80,11 @@
         "map-stream": "^0.0.7",
         "mime-types": "^3.0.1",
         "ora": "^8.2.0",
-        "react": "^19.0.0",
+        "react": "^19.1.0",
         "react-i18next": "^15.4.1",
         "react-object-model": "^1.2.23",
         "resolve-path": "^1.4.0",
-        "sass": "^1.86.0",
+        "sass": "^1.86.2",
         "sass-loader": "^16.0.5",
         "source-map-loader": "^5.0.0",
         "strip-ansi": "^7.1.0",
@@ -95,7 +95,7 @@
         "tslib": "^2.8.1",
         "typescript": "^5.8.2",
         "ua-parser-js": "^2.0.3",
-        "undici": "^7.5.0",
+        "undici": "^7.7.0",
         "vinyl": "^3.0.0",
         "vinyl-fs": "^4.0.0",
         "webpack": "^5.98.0",
@@ -112,8 +112,8 @@
         "@types/koa": "^2.15.0",
         "@types/koa-compress": "^4.0.6",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^22.13.14",
-        "@types/react": "^19.0.12",
+        "@types/node": "^22.14.0",
+        "@types/react": "^19.1.0",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",
         "@types/ua-parser-js": "^0.7.39",

package/process.d.ts

@@ -189,6 +189,7 @@ export declare function launch(exe: string, args?: string[], options?: CallOptio
 export interface NodeJsOptions {
     inspect?: number | true;
     break?: boolean;
+    host?: string;
 }
 export interface CallNodeJsOptions extends CallOptions, NodeJsOptions {
 }
@@ -203,7 +204,8 @@ export interface CallNodeJsOptions extends CallOptions, NodeJsOptions {
         - stdio?: `'pipe'` 设置为 'ignore' 时忽略 stdio 处理
         - throw_code?: `true` code 不为 0 时是否抛出异常
         - inspect?: nodejs debugger port, 填 9229 端口 (或者传 true) 可以用临时配置来调试
-        - break?: break at first line */
+        - break?: break at first line
+        - host?: 指定 inspect 监听的 host (默认监听 localhost) */
 export declare function call_nodejs(js: string, args?: string[], options?: CallNodeJsOptions): Promise<CallResult<string>>;
 export interface StartNodeJsOptions extends StartOptions, NodeJsOptions {
 }
@@ -222,6 +224,7 @@ export declare function start_nodejs(js: string, args?: string[], options?: Star
         - inspect?: nodejs debugger port, 填 9229 端口 (或者传 true) 可以用临时配置来调试
         - break?: 在第一行停止 */
 export declare function launch_nodejs(js: string, args?: string[], options?: CallNodeJsOptions): Promise<SubProcess<string>>;
+export declare function get_nodejs_args(js: string, args?: string[], { inspect, break: _break, host }?: NodeJsOptions): string[];
 /** 可选的向子进程输入内容，并等待子进程输出特定的内容，类似一次无返回值，仅有完成状态的 rpc 调用
     根据文本内容匹配其实不太好，实在是没有别的 rpc 方法再使用吧
     - ps: 子进程

package/process.js

@@ -310,7 +310,8 @@ export async function launch(exe, args, options) {
         - stdio?: `'pipe'` 设置为 'ignore' 时忽略 stdio 处理
         - throw_code?: `true` code 不为 0 时是否抛出异常
         - inspect?: nodejs debugger port, 填 9229 端口 (或者传 true) 可以用临时配置来调试
-        - break?: break at first line */
+        - break?: break at first line
+        - host?: 指定 inspect 监听的 host (默认监听 localhost) */
 export async function call_nodejs(js, args, options) {
     return call(exe_nodejs, get_nodejs_args(js, args, options), options);
 }
@@ -333,10 +334,10 @@ export async function start_nodejs(js, args, options) {
 export async function launch_nodejs(js, args, options) {
     return launch(exe_nodejs, get_nodejs_args(js, args, options), options);
 }
-function get_nodejs_args(js, args = [], { inspect, break: _break } = {}) {
+export function get_nodejs_args(js, args = [], { inspect, break: _break, host = 'localhost' } = {}) {
     return [
         '--enable-source-maps',
-        ...inspect ? [`--inspect${_break ? '-brk' : ''}=localhost:${inspect === true ? 9229 : inspect}`] : [],
+        ...inspect ? [`--inspect${_break ? '-brk' : ''}=${host}:${inspect === true ? 9229 : inspect}`] : [],
         js,
         ...args
     ];