xshell 1.2.35 → 1.2.39

package/file.d.ts

@@ -175,8 +175,6 @@ export declare function frename(fp: string, fp_: string, { fpd, print, overwrite
 }): 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
@@ -184,9 +182,8 @@ export interface FMkdirOptions {
     
     - fpd: 文件夹完整路径  Folder full path
     - options?:
-        - print?: `true`
-        - mode?: `'0o777'` */
-export declare function fmkdir(fpd: string, { print, mode }?: FMkdirOptions): Promise<string>;
+        - print?: `true` */
+export declare function fmkdir(fpd: string, { print }?: FMkdirOptions): Promise<string>;
 /** 创建软链接
     - fp_real: 现在真实文件/文件夹的路径
     - fp_link: 目标链接文件/文件夹的路径 */

package/file.js

@@ -119,8 +119,10 @@ export async function fwrite(fp, data, { print = true, mtime } = {}) {
         else
             throw error;
     }
-    if (mtime !== undefined)
-        await fp.utimes(mtime, mtime);
+    if (mtime !== undefined) {
+        const mseconds = mtime / 1000;
+        await fp.utimes(mseconds, mseconds);
+    }
     return fp;
 }
 export async function fpack(fp, data, options) {
@@ -422,9 +424,8 @@ export async function frename(fp, fp_, { fpd, print = true, overwrite = true } =
     
     - fpd: 文件夹完整路径  Folder full path
     - options?:
-        - print?: `true`
-        - mode?: `'0o777'` */
-export async function fmkdir(fpd, { print = true, mode } = {}) {
+        - print?: `true` */
+export async function fmkdir(fpd, { print = true } = {}) {
     check(path.isAbsolute(fpd), `fpd 必须是绝对路径: ${fpd}`);
     check(fpd.isdir, `fpd 必须以 / 结尾: ${fpd}`);
     // 类似 D:/ 这样的根路径，调用 fsp.mkdir 会报错无权限
@@ -438,7 +439,7 @@ export async function fmkdir(fpd, { print = true, mode } = {}) {
         else
             throw new Error(t('不存在且无法创建文件夹 {{fpd}}', { fpd }));
     // Calling fs.promises.mkdir() when path is a directory that exists results in a rejection only when recursive is false.
-    const fpd_ = (await fsp.mkdir(fpd, { recursive: true, mode }))?.fpd;
+    const fpd_ = (await fsp.mkdir(fpd, { recursive: true }))?.fpd;
     if (fpd_) {
         if (print)
             console.log(t('已创建文件夹'), fpd);

package/net.browser.d.ts

@@ -1,4 +1,3 @@
-import './prototype.browser.ts';
 import { type Message } from './io.browser.ts';
 import { Lock } from './utils.browser.ts';
 export interface FullResponse<TBody extends ArrayBuffer | string> {
@@ -208,4 +207,18 @@ export declare class Remote {
         作为 websocket 连接发起方，不需要传入 websocket
         作为 websocket 连接接收方，必传 websocket 参数  */
     call<TReturn = any>(func: string, args?: any[], websocket?: WebSocket): Promise<TReturn>;
+    /** 调用对端 remote 中的 func, 开始订阅并接收连续的消息 (订阅流)
+        - func: 订阅处理函数
+        - on_data: 接收开始订阅后的数据
+        - options?:
+            - on_error?: 处理开始订阅后的错误
+            - websocket?: 作为 websocket 连接接收方，必传 websocket 参数 */
+    subscribe<TData, TSubscribed = void>(func: string, on_data: (data: TData) => void, { on_error, websocket }?: RemoteSubscribeOptions): Promise<{
+        id: number;
+        data: TSubscribed;
+    }>;
+}
+export interface RemoteSubscribeOptions {
+    on_error?(error: Error): void;
+    websocket?: WebSocket;
 }

package/net.browser.js

@@ -1,5 +1,5 @@
 import { t } from "./i18n/instance.js";
-import "./prototype.browser.js"; // to_time_str()
+import { rethrow } from "./prototype.browser.js"; // to_time_str()
 import { message_symbol, pack, parse } from "./io.browser.js";
 import { assert, genid, delay, Lock, timeout, check } from "./utils.browser.js";
 const drop_request_headers = new Set([
@@ -518,5 +518,43 @@ export class Remote {
             }
         });
     }
+    /** 调用对端 remote 中的 func, 开始订阅并接收连续的消息 (订阅流)
+        - func: 订阅处理函数
+        - on_data: 接收开始订阅后的数据
+        - options?:
+            - on_error?: 处理开始订阅后的错误
+            - websocket?: 作为 websocket 连接接收方，必传 websocket 参数 */
+    async subscribe(func, on_data, { on_error = rethrow, websocket } = {}) {
+        const id = genid();
+        let psubscribed = new Promise((resolve, reject) => {
+            let first = true;
+            this.handlers.set(id, ({ error, data }) => {
+                if (error) {
+                    if (first) {
+                        first = false;
+                        this.handlers.delete(id);
+                        reject(error);
+                    }
+                    else
+                        on_error(error);
+                    return;
+                }
+                if (first) {
+                    first = false;
+                    resolve({ id, data: data });
+                    return;
+                }
+                on_data(data);
+            });
+        });
+        try {
+            await this.send({ id, func }, websocket);
+        }
+        catch (error) {
+            this.handlers.delete(id);
+            throw error;
+        }
+        return psubscribed;
+    }
 }
 //# sourceMappingURL=net.browser.js.map

package/net.d.ts

@@ -2,7 +2,6 @@ import { type Readable } from 'stream';
 import type { FormData } from 'undici';
 import type { WebSocket, CloseEvent, ErrorEvent } from 'ws';
 import type { Cookie, CookieJar, MemoryCookieStore } from 'tough-cookie';
-import './prototype.ts';
 import { type Message } from './io.ts';
 import type { Encoding } from './file.ts';
 import { inspect, Lock } from './utils.ts';
@@ -271,6 +270,20 @@ export declare class Remote {
         作为 websocket 连接发起方，不需要传入 websocket
         作为 websocket 连接接收方，必传 websocket 参数  */
     call<TReturn = any>(func: string, args?: any[], websocket?: WebSocket): Promise<TReturn>;
+    /** 调用对端 remote 中的 func, 开始订阅并接收连续的消息 (订阅流)
+        - func: 订阅处理函数
+        - on_data: 接收开始订阅后的数据
+        - options?:
+            - on_error?: 处理开始订阅后的错误
+            - websocket?: 作为 websocket 连接接收方，必传 websocket 参数 */
+    subscribe<TData, TSubscribed = void>(func: string, on_data: (data: TData) => void, { on_error, websocket }?: RemoteSubscribeOptions): Promise<{
+        id: number;
+        data: TSubscribed;
+    }>;
+}
+export interface RemoteSubscribeOptions {
+    on_error?(error: Error): void;
+    websocket?: WebSocket;
 }
 /** 为连接到 server 的 client 创建 RemoteClient，以便后续调用 client 中方法 */
 export declare class RemoteClient {
@@ -285,5 +298,5 @@ export declare class RemoteClient {
     [inspect.custom](): {
         remote: string;
         websocket: string;
-    } & Omit<this, "call" | "websocket" | typeof import("util").inspect.custom | "remote" | "send">;
+    } & Omit<this, "websocket" | typeof import("util").inspect.custom | "remote" | "call" | "send">;
 }

package/net.js

@@ -2,7 +2,7 @@ import zlib from 'zlib';
 import { buffer as stream_to_buffer, text as stream_to_text } from 'stream/consumers';
 import { isReadable } from 'stream';
 import { t } from "./i18n/instance.js";
-import "./prototype.js";
+import { rethrow } from "./prototype.js";
 import { message_symbol, pack, parse } from "./io.js";
 import { inspect, assert, genid, delay, Lock, pipe_with_error, map_values, unique, timeout, check, colored } from "./utils.js";
 export const WebSocketConnecting = 0;
@@ -706,6 +706,44 @@ export class Remote {
             }
         });
     }
+    /** 调用对端 remote 中的 func, 开始订阅并接收连续的消息 (订阅流)
+        - func: 订阅处理函数
+        - on_data: 接收开始订阅后的数据
+        - options?:
+            - on_error?: 处理开始订阅后的错误
+            - websocket?: 作为 websocket 连接接收方，必传 websocket 参数 */
+    async subscribe(func, on_data, { on_error = rethrow, websocket } = {}) {
+        const id = genid();
+        let psubscribed = new Promise((resolve, reject) => {
+            let first = true;
+            this.handlers.set(id, ({ error, data }) => {
+                if (error) {
+                    if (first) {
+                        first = false;
+                        this.handlers.delete(id);
+                        reject(error);
+                    }
+                    else
+                        on_error(error);
+                    return;
+                }
+                if (first) {
+                    first = false;
+                    resolve({ id, data: data });
+                    return;
+                }
+                on_data(data);
+            });
+        });
+        try {
+            await this.send({ id, func }, websocket);
+        }
+        catch (error) {
+            this.handlers.delete(id);
+            throw error;
+        }
+        return psubscribed;
+    }
 }
 /** 为连接到 server 的 client 创建 RemoteClient，以便后续调用 client 中方法 */
 export class RemoteClient {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.2.35",
+    "version": "1.2.39",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -95,7 +95,7 @@
         "tslib": "^2.8.1",
         "typescript": "^5.8.3",
         "ua-parser-js": "^2.0.3",
-        "undici": "^7.7.0",
+        "undici": "^7.8.0",
         "vinyl": "^3.0.0",
         "vinyl-fs": "^4.0.0",
         "webpack": "^5.99.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/process.d.ts

@@ -194,7 +194,7 @@ export interface NodeJsOptions {
 export interface CallNodeJsOptions extends CallOptions, NodeJsOptions {
 }
 /** 调用 node <js> 并等待结果
-    - js: .js 路径 (相对路径根据 cwd 解析)
+    - fp_script: .js/.ts 路径 (相对路径根据 cwd 解析)
     - args?: `[ ]` 参数列表
     - options?: {@link CallNodeJsOptions} 继承自 {@link CallOptions} 和 {@link NodeJsOptions}
         - cwd?: `'T:/'`
@@ -206,7 +206,7 @@ export interface CallNodeJsOptions extends CallOptions, NodeJsOptions {
         - inspect?: nodejs debugger port, 填 9229 端口 (或者传 true) 可以用临时配置来调试
         - break?: break at first line
         - host?: 指定 inspect 监听的 host (默认监听 localhost) */
-export declare function call_nodejs(js: string, args?: string[], options?: CallNodeJsOptions): Promise<CallResult<string>>;
+export declare function call_nodejs(fp_script: string, args?: string[], options?: CallNodeJsOptions): Promise<CallResult<string>>;
 export interface StartNodeJsOptions extends StartOptions, NodeJsOptions {
 }
 /** 启动独立的 node.js 进程 (detached)，执行某个 js 文件

package/process.js

@@ -300,7 +300,7 @@ export async function launch(exe, args, options) {
     });
 }
 /** 调用 node <js> 并等待结果
-    - js: .js 路径 (相对路径根据 cwd 解析)
+    - fp_script: .js/.ts 路径 (相对路径根据 cwd 解析)
     - args?: `[ ]` 参数列表
     - options?: {@link CallNodeJsOptions} 继承自 {@link CallOptions} 和 {@link NodeJsOptions}
         - cwd?: `'T:/'`
@@ -312,8 +312,8 @@ export async function launch(exe, args, options) {
         - inspect?: nodejs debugger port, 填 9229 端口 (或者传 true) 可以用临时配置来调试
         - 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);
+export async function call_nodejs(fp_script, args, options) {
+    return call(exe_nodejs, get_nodejs_args(fp_script, args, options), options);
 }
 /** 启动独立的 node.js 进程 (detached)，执行某个 js 文件
     - js: .js 路径 (相对路径根据 cwd 解析)

package/prototype.browser.d.ts

@@ -221,6 +221,7 @@ export declare const not_empty: (value: any) => boolean;
 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_method_property_descriptors(methods: {
     [name: string]: Function;
 }): PropertyDescriptorMap;

package/prototype.browser.js

@@ -10,6 +10,9 @@ export const not_empty = (value) => value !== null && value !== undefined;
 export const empty = (value) => value === undefined || value === null;
 const key_types = ['string', 'number', 'symbol'];
 export const is_key_type = ((key) => key_types.includes(typeof key));
+export function rethrow(error) {
+    throw error;
+}
 export function to_method_property_descriptors(methods) {
     return Object.fromEntries(Object.entries(methods)
         .map(([name, value]) => ([name, {

package/prototype.d.ts

@@ -251,6 +251,7 @@ export declare const not_empty: (value: any) => boolean;
 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_method_property_descriptors(methods: {
     [name: string]: Function;
 }): PropertyDescriptorMap;

package/prototype.js

@@ -11,6 +11,9 @@ export const not_empty = (value) => value !== null && value !== undefined;
 export const empty = (value) => value === undefined || value === null;
 const key_types = ['string', 'number', 'symbol'];
 export const is_key_type = ((key) => key_types.includes(typeof key));
+export function rethrow(error) {
+    throw error;
+}
 export function to_method_property_descriptors(methods) {
     return Object.fromEntries(Object.entries(methods)
         .map(([name, value]) => ([name, {