xshell 1.2.15 → 1.2.17

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.2.15",
+    "version": "1.2.17",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -53,7 +53,7 @@
         "@babel/parser": "^7.26.9",
         "@babel/traverse": "^7.26.9",
         "@koa/cors": "^5.0.0",
-        "@stylistic/eslint-plugin": "^4.0.0",
+        "@stylistic/eslint-plugin": "^4.0.1",
         "@svgr/webpack": "^8.1.0",
         "@types/sass-loader": "^8.0.9",
         "@types/ws": "^8.5.14",
@@ -67,7 +67,7 @@
         "commander": "^13.1.0",
         "css-loader": "^7.1.2",
         "emoji-regex": "^10.4.0",
-        "eslint": "^9.20.1",
+        "eslint": "^9.21.0",
         "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-react": "^7.37.4",
         "gulp-sort": "^2.0.0",
@@ -100,7 +100,7 @@
         "vinyl-fs": "^4.0.0",
         "webpack": "^5.98.0",
         "webpack-bundle-analyzer": "^4.10.2",
-        "ws": "^8.18.0"
+        "ws": "^8.18.1"
     },
     "devDependencies": {
         "@babel/types": "^7.26.9",
@@ -112,7 +112,7 @@
         "@types/koa": "^2.15.0",
         "@types/koa-compress": "^4.0.6",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^22.13.4",
+        "@types/node": "^22.13.5",
         "@types/react": "^19.0.10",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",

package/process.d.ts

@@ -68,6 +68,8 @@ export interface StartOptions extends BaseOptions {
     print?: boolean;
 }
 export declare function get_command(exe: string, args?: string[]): string;
+/** 处理 print 选项 */
+export declare function get_print_options(print?: boolean | Partial<FullPrintOptions>, stdout?: string | boolean, stderr?: string | boolean): FullPrintOptions;
 export interface SubProcess<TOutput extends string | Buffer = string> extends ChildProcess {
     /** 由创建进程的调用者设置的，用于区分、识别、记忆的可选名称 */
     title?: string;
@@ -134,12 +136,11 @@ export interface CallError<TOutput extends string | Buffer = string> extends Err
     code: number;
     signal: NodeJS.Signals;
     command: string;
-    child: SubProcess<TOutput>;
     print: FullPrintOptions;
 }
 export declare class CallError<TOutput extends string | Buffer = string> extends Error {
     name: "CallError";
-    constructor({ message, pid, stdout, stderr, code, signal, command, child, print }: CallResult<TOutput>);
+    constructor({ message, pid, stdout, stderr, code, signal, command, print }: CallResult<TOutput>);
     [inspect.custom](depth: number, options: InspectOptions, inspect: Function): string;
 }
 /** 调用 exe 启动子进程，等待并获取返回结果，错误时抛出 CallError

package/process.js

@@ -16,6 +16,22 @@ export function get_command(exe, args) {
             ? ` ${args.map(arg => arg.quote_if_space()).join(' ')}`
             : '');
 }
+/** 处理 print 选项 */
+export function get_print_options(print = true, stdout = true, stderr = true) {
+    if (typeof print === 'boolean')
+        print = {
+            command: print,
+            code: print,
+            stdout: print,
+            stderr: print
+        };
+    return {
+        command: print.command ?? true,
+        code: print.code ?? true,
+        stdout: stdout === true && (print.stdout ?? true),
+        stderr: stderr === true && (print.stderr ?? true)
+    };
+}
 async function prepare_spawn(detached, exe, args, { cwd, window: _window = false, envs, 
 // @ts-ignore
 input, stdin = Boolean(input), stdout = !detached, stderr = stdout, print = true, proxy, }) {
@@ -70,20 +86,8 @@ input, stdin = Boolean(input), stdout = !detached, stderr = stdout, print = true
         await close_all_handles();
         throw error;
     }
-    // --- 处理 print
-    if (typeof print === 'boolean')
-        print = {
-            command: print,
-            code: print,
-            stdout: print,
-            stderr: print
-        };
-    print = {
-        command: print.command ?? true,
-        code: print.code ?? true,
-        stdout: stdout && (print.stdout ?? true),
-        stderr: stderr && (print.stderr ?? true)
-    };
+    // 处理 print
+    print = get_print_options(print, stdout, stderr);
     const command = get_command(exe, args);
     if (print.command)
         console.log(command.blue);
@@ -163,7 +167,7 @@ export async function start(exe, args = [], options = {}) {
 }
 export class CallError extends Error {
     name = 'CallError';
-    constructor({ message, pid, stdout, stderr, code, signal, command, child, print }) {
+    constructor({ message, pid, stdout, stderr, code, signal, command, print }) {
         super(message);
         // defineProperty 默认 enumerable: false，不会在 inspect 中显示
         Object.defineProperties(this, {
@@ -173,7 +177,6 @@ export class CallError extends Error {
             code: { value: code },
             signal: { value: signal },
             command: { value: command },
-            child: { value: child },
             print: { value: print }
         });
     }