xshell 1.0.183 → 1.0.185

package/file.d.ts

@@ -1,9 +1,9 @@
 import { promises as fsp, default as fs } from 'fs';
-type FileHandle = fsp.FileHandle & {
-    fp: string;
-};
 export { fsp };
 export type Encoding = 'utf-8' | 'gb18030' | 'shift-jis' | 'utf-16le';
+export type FileHandle = fsp.FileHandle & {
+    fp: string;
+};
 export declare const encodings: readonly ["utf-8", "gb18030", "shift-jis", "utf-16le"];
 export declare const ramdisk: boolean;
 /** fp 所指向的 文件/ 文件夹 是否存在
@@ -17,7 +17,7 @@ export declare function fexists(fp: string, { print }?: {
     by [Naming Files, Paths, and Namespaces](https://docs.microsoft.com/en-us/windows/desktop/FileIO/naming-a-file). Under NTFS, if the filename contains
     a colon, Node.js will open a file system stream, as described by [this MSDN page](https://docs.microsoft.com/en-us/windows/desktop/FileIO/using-streams).
     
-    - flags: `'r'`
+    - 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. */
 export declare function fopen(fp: string, flags?: string | number, { mode, print }?: {

package/file.js

@@ -21,7 +21,7 @@ export function fexists(fp, { print = true } = {}) {
     by [Naming Files, Paths, and Namespaces](https://docs.microsoft.com/en-us/windows/desktop/FileIO/naming-a-file). Under NTFS, if the filename contains
     a colon, Node.js will open a file system stream, as described by [this MSDN page](https://docs.microsoft.com/en-us/windows/desktop/FileIO/using-streams).
     
-    - flags: `'r'`
+    - 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. */
 export async function fopen(fp, flags = 'r', { mode, print } = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.183",
+    "version": "1.0.185",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -94,7 +94,7 @@
         "react-i18next": "^15.0.3",
         "react-object-model": "^1.2.13",
         "resolve-path": "^1.4.0",
-        "sass": "^1.79.5",
+        "sass": "^1.80.1",
         "sass-loader": "^16.0.2",
         "source-map-loader": "^5.0.0",
         "strip-ansi": "^7.1.0",
@@ -102,7 +102,7 @@
         "through2": "^4.0.2",
         "tough-cookie": "^5.0.0-rc.4",
         "ts-loader": "^9.5.1",
-        "tslib": "^2.7.0",
+        "tslib": "^2.8.0",
         "typescript": "^5.6.3",
         "ua-parser-js": "^2.0.0-beta.3",
         "undici": "^6.20.1",
@@ -126,7 +126,7 @@
         "@types/koa-compress": "^4.0.6",
         "@types/lodash": "^4.17.10",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^22.7.5",
+        "@types/node": "^22.7.6",
         "@types/react": "^18.3.11",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",

package/process.d.ts

@@ -1,6 +1,6 @@
 import { type ChildProcess } from 'child_process';
 import './prototype.js';
-import { Encoding } from './file.js';
+import type { Encoding } from './file.js';
 import type { MyProxy } from './net.js';
 import { inspect } from './utils.js';
 export declare const exe_nodejs: string;
@@ -17,6 +17,7 @@ export declare const print_no_command: {
         readonly stderr: true;
     };
 };
+type StdioType = 'pipe' | 'ignore' | 'inherit' | number;
 interface StartOptions {
     /** `继承当前工作目录 process.cwd()` 子进程的工作目录  `inherit the cwd` cwd of the child process. */
     cwd?: string;
@@ -34,8 +35,16 @@ interface StartOptions {
         /** 进程执行成功的消息 */
         code: boolean;
     };
-    /** `'pipe'` 设置为 'ignore' 时忽略 stdio 处理  when 'ignore' then ignore stdio processing */
-    stdio?: 'pipe' | 'ignore' | ['pipe' | 'ignore' | 'inherit', 'pipe' | 'ignore' | 'inherit', 'pipe' | 'ignore' | 'inherit'];
+    /** `'pipe'` 设置为 'ignore' 时忽略 stdio 处理 */
+    stdio?: 'pipe' | 'ignore' | [StdioType, StdioType, StdioType];
+    /** 启动子进程之后写入到子进程 stdin 中的内容，写完后关闭子进程 stdin (pty 不关闭) */
+    input?: string;
+    /** 使用文件作为标准输入 */
+    fp_stdin?: string;
+    /** 使用文件作为标准输出 */
+    fp_stdout?: string;
+    /** 使用文件作为标准错误 */
+    fp_stderr?: string;
     /** `false` 是否断开和 child 的关系 (ignore stdio, unref)  whether to break the connection with child (ignore stdio, unref) */
     detached?: boolean;
     /** 为 true 时会设置 UV_PROCESS_WINDOWS_HIDE
@@ -59,8 +68,12 @@ interface StartOptions {
         - encoding?: `'utf-8'` 子进程输出编码  child output encoding
         - print?: `true` print 选项，支持设置细项  print option (with details)
         - stdio?: `'pipe'` 设置为 'ignore' 时忽略 stdio 处理  when 'ignore' then ignore stdio processing
+        - input?: string, 启动子进程之后写入到子进程 stdin 中的内容，写完后关闭子进程 stdin (pty 不关闭)
+        - fp_stdin?: 使用文件作为标准输入，设置 stdio 中选项为对应的值
+        - fp_stdout?: 使用文件作为标准输出，设置 stdio 中选项为对应的值
+        - fp_stderr?: 使用文件作为标准错误，设置 stdio 中选项为对应的值
         - detached?: `false` 是否断开和 child 的关系 (ignore stdio, unref)  whether to break the connection with child (ignore stdio, unref) */
-export declare function start(exe: string, args?: string[], { cwd, encoding, print, stdio, detached, envs, window: _window, proxy, }?: StartOptions): Promise<ChildProcess>;
+export declare function start(exe: string, args?: string[], options?: StartOptions): Promise<ChildProcess>;
 export declare function start_nodejs(js: string, args?: string[], options?: StartOptions): Promise<ChildProcess>;
 export interface CallOptions extends StartOptions {
     throw_code?: boolean;

package/process.js

@@ -2,7 +2,7 @@ import { spawn } from 'child_process';
 import os from 'os';
 import { t } from './i18n/instance.js';
 import './prototype.js';
-import { inspect, DecoderStream, filter_values } from './utils.js';
+import { inspect, DecoderStream, filter_values, assert } from './utils.js';
 export const exe_nodejs = process.execPath.fp;
 export const platform = os.platform();
 export const username = os.userInfo().username;
@@ -17,16 +17,38 @@ export const print_no_command = { print: { command: false, code: false, stdout:
         - encoding?: `'utf-8'` 子进程输出编码  child output encoding
         - print?: `true` print 选项，支持设置细项  print option (with details)
         - stdio?: `'pipe'` 设置为 'ignore' 时忽略 stdio 处理  when 'ignore' then ignore stdio processing
+        - input?: string, 启动子进程之后写入到子进程 stdin 中的内容，写完后关闭子进程 stdin (pty 不关闭)
+        - fp_stdin?: 使用文件作为标准输入，设置 stdio 中选项为对应的值
+        - fp_stdout?: 使用文件作为标准输出，设置 stdio 中选项为对应的值
+        - fp_stderr?: 使用文件作为标准错误，设置 stdio 中选项为对应的值
         - detached?: `false` 是否断开和 child 的关系 (ignore stdio, unref)  whether to break the connection with child (ignore stdio, unref) */
-export async function start(exe, args = [], { cwd, encoding = 'utf-8', print = true, stdio = 'pipe', detached = false, envs, window: _window = true, proxy, } = {}) {
+export async function start(exe, args = [], options = {}) {
+    const { cwd, encoding = 'utf-8', detached = false, window: _window = true, envs, input, fp_stdin, fp_stdout, fp_stderr } = options;
+    let { print = true, stdio = detached ? 'ignore' : 'pipe', proxy } = options;
     if (proxy === true) {
         const { MyProxy } = await import('./net.js');
         proxy = MyProxy.socks5;
     }
-    const options = {
+    if (typeof stdio === 'string')
+        stdio = [stdio, stdio, stdio];
+    if (input)
+        assert(!fp_stdin, 'input 和 fp_stdin 不能同时设置');
+    if (fp_stdin || fp_stdout || fp_stderr) {
+        const { fopen } = await import('./file.js');
+        if (fp_stdin)
+            stdio[0] = (await fopen(fp_stdin, 'r')).fd;
+        if (fp_stdout)
+            stdio[1] = (await fopen(fp_stdout, 'w')).fd;
+        if (fp_stderr)
+            stdio[2] = fp_stderr === fp_stdout
+                ? stdio[1]
+                : (await fopen(fp_stderr, 'w')).fd;
+    }
+    const options_ = {
         cwd,
         shell: false,
         windowsHide: !_window,
+        detached,
         stdio,
         ...envs || proxy ? {
             env: filter_values({
@@ -47,8 +69,6 @@ export async function start(exe, args = [], { cwd, encoding = 'utf-8', print = t
             command: print,
             code: print,
         };
-    if (typeof stdio === 'string')
-        stdio = [stdio, stdio, stdio];
     if (print.command)
         console.log(((short_exe_names[exe] || exe.quote_if_space()) +
             (args.length ?
@@ -58,23 +78,18 @@ export async function start(exe, args = [], { cwd, encoding = 'utf-8', print = t
                 :
                     '')).blue);
     if (detached) {
-        let child = spawn(exe, args, {
-            ...options,
-            stdio: 'ignore',
-            detached: true,
-        });
+        assert(stdio.every(x => x === 'ignore' || typeof x === 'number'), '调用 start({ detached: true }) 时 stdio 只能是 fd 或者 ignore');
+        let child = spawn(exe, args, options_);
         child.unref();
         return child;
     }
-    let child = spawn(exe, args, options);
+    let child = spawn(exe, args, options_);
     // 防止 child spawn 失败时 crash nodejs 进程
     child.on('error', error => {
         console.error(error);
     });
     if (stdio[0] === 'pipe')
         child.stdin.setDefaultEncoding('utf8');
-    if (stdio.every(s => s === 'ignore'))
-        return child;
     if (encoding !== 'binary') {
         if (stdio[1] === 'pipe') {
             if (encoding === 'utf-8')
@@ -93,13 +108,15 @@ export async function start(exe, args = [], { cwd, encoding = 'utf-8', print = t
                 child.stderr.pipe(process.stderr, { end: false });
         }
     }
+    if (input)
+        child.stdin.end(input);
     return child;
 }
 export async function start_nodejs(js, args = [], options) {
     return start(exe_nodejs, [js, ...args], options);
 }
 export async function call(exe, args = [], options = {}) {
-    const { encoding = 'utf-8', throw_code = true, input, printers } = options;
+    const { encoding = 'utf-8', throw_code = true, printers } = options;
     let { stdio = 'pipe', print = true } = options;
     if (typeof print === 'boolean')
         print = {
@@ -121,8 +138,6 @@ export async function call(exe, args = [], options = {}) {
         ...options,
         print: false,
     });
-    if (input)
-        child.stdin.end(input);
     // --- collect output
     let stdouts = [];
     let stderrs = [];

package/prototype.browser.d.ts

@@ -88,11 +88,15 @@ declare global {
         /** 返回去掉 suffix 结尾的字符串，如果没有以 suffix 结尾则返回原字符串 */
         strip_if_end(this: string, suffix: string): string;
         /** 从 search 字符串出现的位置开始截取到最后
-            - include?: `false` 传 true 时包括 search 部分 */
-        slice_from(this: string, search: string, include?: boolean): string;
-        /** 从 search 字符串出现的位置开始截断，去掉尾部
-            - include?: `false` 传 true 时包括 search 部分 */
-        slice_to(this: string, search: string, include?: boolean): string;
+            - options?:
+                - include?: `false` 传 true 时包括 search 部分
+                - last?: `false` true 时从最后一次出现的地方开始截取，否则默认从第一次出现的地方开始截取 */
+        slice_from(this: string, search: string, options?: SliceOptions): string;
+        /** 从 search 字符串最后出现的位置开始截断，去掉尾部
+            - options?:
+                - include?: `false` 传 true 时包括 search 部分
+                - last?: `false` true 时截取到最后一次出现的地方，否则默认截取到第一次出现的地方 */
+        slice_to(this: string, search: string, options?: SliceOptions): string;
         /** 等价于 .endsWith('/') */
         isdir: boolean;
         /** 以 `/` 分割的路径，可能以 / 结尾 */
@@ -161,6 +165,10 @@ declare global {
         map<TResult>(mapfn: (value: T, index: number) => TResult): TResult[];
     }
 }
+interface SliceOptions {
+    include?: boolean;
+    last?: boolean;
+}
 export declare const emoji_regex: RegExp;
 export declare function to_method_property_descriptors(methods: {
     [name: string]: Function;
@@ -185,3 +193,4 @@ export declare const brackets: {
 };
 export declare function to_json(obj: any, replacer?: any): string;
 export declare function is_codepoint_fullwidth(codepoint: number): boolean;
+export {};

package/prototype.browser.js

@@ -275,15 +275,15 @@ Object.defineProperties(String.prototype, {
         strip_if_end(suffix) {
             return this.endsWith(suffix) ? this.slice(0, -suffix.length) : this;
         },
-        slice_from(search, include = false) {
-            const i = this.indexOf(search);
+        slice_from(search, { include = false, last = false } = {}) {
+            const i = last ? this.lastIndexOf(search) : this.indexOf(search);
             if (i === -1)
                 throw new Error(`slice_from 在字符串 ${this} 中找不到 search: ${search}`);
             else
                 return this.slice(include ? i : i + search.length);
         },
-        slice_to(search, include) {
-            const i = this.lastIndexOf(search);
+        slice_to(search, { include = false, last = false } = {}) {
+            const i = last ? this.lastIndexOf(search) : this.indexOf(search);
             if (i === -1)
                 throw new Error(`slice_to 在字符串 ${this} 中找不到 search: ${search}`);
             else

package/prototype.d.ts

@@ -110,11 +110,15 @@ declare global {
         /** 返回去掉 suffix 结尾的字符串，如果没有以 suffix 结尾则返回原字符串 */
         strip_if_end(this: string, suffix: string): string;
         /** 从 search 字符串出现的位置开始截取到最后
-            - include?: `false` 传 true 时包括 search 部分 */
-        slice_from(this: string, search: string, include?: boolean): string;
-        /** 从 search 字符串出现的位置开始截断，去掉尾部
-            - include?: `false` 传 true 时包括 search 部分 */
-        slice_to(this: string, search: string, include?: boolean): string;
+            - options?:
+                - include?: `false` 传 true 时包括 search 部分
+                - last?: `false` true 时从最后一次出现的地方开始截取，否则默认从第一次出现的地方开始截取 */
+        slice_from(this: string, search: string, options?: SliceOptions): string;
+        /** 从 search 字符串最后出现的位置开始截断，去掉尾部
+            - options?:
+                - include?: `false` 传 true 时包括 search 部分
+                - last?: `false` true 时截取到最后一次出现的地方，否则默认截取到第一次出现的地方 */
+        slice_to(this: string, search: string, options?: SliceOptions): string;
         /** 等价于 .endsWith('/') */
         isdir: boolean;
         /** 以 `/` 分割的路径，可能以 / 结尾 */
@@ -191,6 +195,10 @@ declare global {
         map<TResult>(mapfn: (value: T, index: number) => TResult): TResult[];
     }
 }
+interface SliceOptions {
+    include?: boolean;
+    last?: boolean;
+}
 import chalk from 'chalk';
 export declare const emoji_regex: RegExp;
 export { chalk };

package/prototype.js

@@ -294,15 +294,15 @@ if (!globalThis.my_prototype_defined) {
             strip_if_end(suffix) {
                 return this.endsWith(suffix) ? this.slice(0, -suffix.length) : this;
             },
-            slice_from(search, include = false) {
-                const i = this.indexOf(search);
+            slice_from(search, { include = false, last = false } = {}) {
+                const i = last ? this.lastIndexOf(search) : this.indexOf(search);
                 if (i === -1)
                     throw new Error(`slice_from 在字符串 ${this} 中找不到 search: ${search}`);
                 else
                     return this.slice(include ? i : i + search.length);
             },
-            slice_to(search, include) {
-                const i = this.lastIndexOf(search);
+            slice_to(search, { include = false, last = false } = {}) {
+                const i = last ? this.lastIndexOf(search) : this.indexOf(search);
                 if (i === -1)
                     throw new Error(`slice_to 在字符串 ${this} 中找不到 search: ${search}`);
                 else

package/utils.browser.d.ts

@@ -75,7 +75,7 @@ export declare function encode(str: string): Uint8Array;
     在流式处理 (buffer 可能不完整) 时，应使用独立的 TextDecoder 实例调用 decode(buffer, { stream: true }) */
 export declare function decode(buffer: Uint8Array): string;
 /** 字符串字典序比较 */
-export declare function strcmp(l: string, r: string): 0 | 1 | -1;
+export declare function strcmp(l: string, r: string): 1 | 0 | -1;
 /** 比较 1.10.02 这种版本号
     - l, r: 两个版本号字符串
     - loose?: 宽松模式，允许两个版本号格式（位数）不一致 */

package/utils.d.ts

@@ -42,7 +42,7 @@ export declare function filter_values<TObj extends Record<string, any>>(obj: TOb
 /** 忽略对象中的 keys, 返回新对象 */
 export declare function omit<TObj>(obj: TObj, omit_keys: string[]): TObj;
 /** 字符串字典序比较 */
-export declare function strcmp(l: string, r: string): 0 | 1 | -1;
+export declare function strcmp(l: string, r: string): 1 | 0 | -1;
 /** 比较 1.10.02 这种版本号
     - l, r: 两个版本号字符串
     - loose?: 宽松模式，允许两个版本号格式（位数）不一致 */