pty-shell 1.3.0 → 1.5.0

package/dist/index.d.ts

@@ -82,6 +82,9 @@ export declare class PtyShell implements PtyShellUserMethod {
     private history_line;
     private history_line_index;
     private history_line_max;
+    private _not_write;
+    get not_write(): boolean;
+    set not_write(value: boolean);
     /**
      * public method
      */
@@ -119,6 +122,15 @@ export declare class PtyShell implements PtyShellUserMethod {
     private push_history_line;
     private exec_end_call;
     private parse_exec;
+    /**
+     * 解析组合命令，按 ; && || 分隔，返回命令列表
+     * 支持引号内的分隔符不被拆分
+     */
+    private parse_combined_commands;
+    /**
+     * 同步方式执行子进程（用于组合命令），返回退出码
+     */
+    private spawn_sync;
     private multiple_line;
     private spawn_write;
     private spawn;

package/dist/index.js

@@ -138,6 +138,7 @@ class PtyShell {
         this.history_line = [];
         this.history_line_index = -1;
         this.history_line_max = 20;
+        this._not_write = false;
         this.next_not_enter = false;
         this.reset_option(param);
         this.on_call(this.raw_prompt);
@@ -149,6 +150,7 @@ class PtyShell {
             const p = path.isAbsolute(params[0]) ? params[0] : path.join(this.cwd, params[0]);
             if (!fs.existsSync(p)) {
                 this.send_and_enter(`not directory ${p}`);
+                return;
             }
             this.cwd = p;
             this.send_and_enter(``);
@@ -178,6 +180,12 @@ class PtyShell {
         }
         return v;
     }
+    get not_write() {
+        return this._not_write;
+    }
+    set not_write(value) {
+        this._not_write = value;
+    }
     /**
      * public method
      */
@@ -252,8 +260,10 @@ class PtyShell {
      */
     write(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.have_child()) {
-                // 终端shell 完全 托管给 别的程序
+            if (this._not_write)
+                return;
+            if (this.node_pty_child != null) {
+                // 终端shell 完全 托管给 别的程序 只有 pty 的子程序可以 其他 需要pty-shell充当编辑器
                 this.spawn_write(data);
                 return;
             }
@@ -362,6 +372,7 @@ class PtyShell {
     }
     send_and_enter(str, send_prompt = false) {
         try {
+            const have_child = this.have_child();
             if (typeof str == "string") {
                 const list = [];
                 let i = 0;
@@ -381,7 +392,7 @@ class PtyShell {
                 }
                 if (i === 0 || i !== last_i)
                     list.push(str.substring(i));
-                if (this.have_child()) {
+                if (have_child) {
                     // 添加子进程的提示换行
                     this.child_now_line = list[list.length - 1];
                 }
@@ -396,7 +407,7 @@ class PtyShell {
                 }
                 this.next_not_enter = str.endsWith('\n\r') || str.endsWith('\r\n'); // 下一次不用换行了
             }
-            if (!this.have_child() || send_prompt) {
+            if (!have_child || send_prompt) {
                 this.on_call(`${this.enter_prompt}`);
             }
             this.clear_line();
@@ -408,8 +419,9 @@ class PtyShell {
     // 重新更新显示本行 也许可以更节省的更新 文本 powershell 这样的每次都是全部更新 暂时和他一样
     update_line(param) {
         var _a, _b;
-        const prompt = !this.child ? this.raw_prompt : this.child_now_line;
-        let len = (!this.child ? this.prompt_call_len : char_util_1.CharUtil.get_full_char_num(prompt)) + this.line_char_index; // 字符串前面的字符数量
+        const have_child = this.have_child();
+        const prompt = !have_child ? this.raw_prompt : this.child_now_line;
+        let len = (!have_child ? this.prompt_call_len : char_util_1.CharUtil.get_full_char_num(prompt)) + this.line_char_index; // 字符串前面的字符数量
         if (param && param.line_add_num) {
             len += param.line_add_num;
         }
@@ -566,7 +578,7 @@ class PtyShell {
                         this.cancel_selected();
                         this.update_line({ line_add_num: 1 });
                     }
-                    else if (this.child) {
+                    else if (this.have_child()) {
                         this.close_child(0);
                         return;
                     }
@@ -741,6 +753,7 @@ class PtyShell {
     // 解析和执行命令 执行完会自动换行的
     parse_exec() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             // const line = this.delete_all_enter(this.line);
             if (!this.line && !this.have_child()) {
                 this.send_and_enter("");
@@ -748,61 +761,227 @@ class PtyShell {
                 return;
             }
             this.push_history_line(this.line);
-            let { exe, params } = this.get_exec(this.line);
+            if (this.have_child()) {
+                // 把数据给正在运行的别的程序 但是肯定不是 pty 的pty 不需要pty-shell 做命令编辑器
+                this.spawn_write(`${this.line}\n`);
+                this.clear_line();
+                return;
+            }
             this.history_line_index = -1;
-            try {
+            // 解析组合命令（支持 ; && ||），解析出的 exe_cmd/params 来自 get_exec
+            const commands = this.parse_combined_commands(this.line);
+            if (commands.length === 0) {
+                this.send_and_enter("");
+                this.clear_line();
+                return;
+            }
+            const resolved_list = [];
+            for (const cmd of commands) {
+                let { exe_cmd, params } = cmd;
                 let use_noe_pty = false;
+                // 1. check_exe_cmd（只调一次）
                 if (this.check_exe_cmd) {
-                    // 检查外部自定义的 是否能执行某个命令
-                    const v = yield this.check_exe_cmd(exe, params);
-                    switch (v) {
-                        case exec_type.not:
-                            this.send_and_enter(`not have permission to execute ${exe}`);
-                            this.clear_line();
-                            this.exec_end_call(-1);
-                            return;
-                        case exec_type.auto_child_process:
-                            break;
-                        case exec_type.not_pty:
-                            use_noe_pty = true;
-                            break;
-                        default:
-                            // 未知的不报错也不执行
-                            this.exec_end_call(0);
-                            return;
+                    const v = yield this.check_exe_cmd(exe_cmd, params);
+                    if (v === exec_type.not) {
+                        this.send_and_enter(`not have permission to execute ${exe_cmd}`);
+                        this.clear_line();
+                        this.exec_end_call(-1);
+                        return;
+                    }
+                    if (v === exec_type.not_pty) {
+                        use_noe_pty = true;
                     }
                 }
+                // 2. cmd_replace（只调一次）
                 if (this.cmd_replace) {
-                    const r = yield this.cmd_replace(exe, params);
-                    exe = r.exe_cmd;
+                    const r = yield this.cmd_replace(exe_cmd, params);
+                    exe_cmd = r.exe_cmd;
                     params = r.params;
                 }
-                if (this.cmd_exec_map.has(exe)) {
-                    // 检测某个已经有预处理的命令 包括用户自定义的
-                    yield this.exec_cmd(exe, params);
-                    // 不用再继续了
-                    this.clear_line();
-                    this.exec_end_call(0);
-                    return;
+                resolved_list.push({
+                    exe_cmd,
+                    params,
+                    separator: cmd.separator,
+                    use_noe_pty,
+                });
+            }
+            // 全部校验通过，按分隔符语义串行执行
+            let lastExitCode = 0;
+            for (let i = 0; i < resolved_list.length; i++) {
+                const cmd = resolved_list[i];
+                // 根据前一个命令的退出码和分隔符决定是否跳过当前命令
+                if (i > 0) {
+                    const prevSep = resolved_list[i - 1].separator;
+                    if (prevSep === '&&' && lastExitCode !== 0)
+                        continue; // 前面失败，跳过
+                    if (prevSep === '||' && lastExitCode === 0)
+                        continue; // 前面成功，跳过
+                }
+                try {
+                    if (this.cmd_exec_map.has(cmd.exe_cmd)) {
+                        yield this.exec_cmd(cmd.exe_cmd, cmd.params);
+                        lastExitCode = 0;
+                    }
+                    else if (this.js_child_map.has(cmd.exe_cmd)) {
+                        // js_child 异步模式，不支持在组合命令中等待
+                        if (resolved_list.length > 1) {
+                            this.send_and_enter(`\x1b[31mjs_child not supported in combined commands: ${cmd.exe_cmd}\x1b[0m`);
+                            lastExitCode = -1;
+                            continue;
+                        }
+                        const c_ = this.js_child_map.get(cmd.exe_cmd);
+                        this.js_func_child = new c_(this, () => {
+                            this.send_and_enter("", true);
+                            this.next_not_enter = false;
+                            this.close_child();
+                        }, (str) => {
+                            this.send_and_enter(str);
+                        }, cmd.params);
+                        this.js_func_child.init();
+                        this.clear_line();
+                        return;
+                    }
+                    else {
+                        // 子进程：组合命令需要同步等待，单命令走原有异步
+                        if (resolved_list.length > 1) {
+                            lastExitCode = yield this.spawn_sync(cmd.exe_cmd, cmd.params, cmd.use_noe_pty);
+                        }
+                        else {
+                            this.spawn(cmd.exe_cmd, cmd.params, cmd.use_noe_pty);
+                        }
+                    }
+                }
+                catch (e) {
+                    this.send_and_enter((_a = e.message) !== null && _a !== void 0 ? _a : e);
+                    lastExitCode = -1;
                 }
-                if (this.js_child_map.has(exe)) {
-                    const c_ = this.js_child_map.get(exe);
-                    this.js_func_child = new c_(() => {
-                        this.send_and_enter("");
-                        this.next_not_enter = false; // 下一次的换行输出 上一次没有换行
-                        this.close_child();
-                    }, (str) => {
-                        this.on_call(str);
-                    }, params);
-                    return;
+            }
+            this.clear_line();
+            if (commands.length === 1) {
+                this.exec_end_call(lastExitCode === 0 ? 0 : -1);
+            }
+        });
+    }
+    /**
+     * 解析组合命令，按 ; && || 分隔，返回命令列表
+     * 支持引号内的分隔符不被拆分
+     */
+    parse_combined_commands(line) {
+        const result = [];
+        let current = '';
+        let quote = null;
+        let i = 0;
+        while (i < line.length) {
+            const ch = line[i];
+            if (ch === '"' || ch === "'") {
+                if (quote === null) {
+                    quote = ch;
                 }
-                this.spawn(exe, params, use_noe_pty);
-                this.clear_line();
+                else if (quote === ch) {
+                    quote = null;
+                }
+                current += ch;
+                i++;
+                continue;
             }
-            catch (e) {
-                // console.log("子线程执行异常", e);
-                this.send_and_enter(e.message);
-                this.exec_end_call(-1);
+            if (quote !== null) {
+                current += ch;
+                i++;
+                continue;
+            }
+            // &&
+            if (ch === '&' && i + 1 < line.length && line[i + 1] === '&') {
+                if (current.trim()) {
+                    const r = this.get_exec(current.trim());
+                    result.push({ exe_cmd: r.exe, params: r.params, separator: '&&' });
+                    current = '';
+                }
+                i += 2;
+                continue;
+            }
+            // ||
+            if (ch === '|' && i + 1 < line.length && line[i + 1] === '|') {
+                if (current.trim()) {
+                    const r = this.get_exec(current.trim());
+                    result.push({ exe_cmd: r.exe, params: r.params, separator: '||' });
+                    current = '';
+                }
+                i += 2;
+                continue;
+            }
+            // ;
+            if (ch === ';') {
+                if (current.trim()) {
+                    const r = this.get_exec(current.trim());
+                    result.push({ exe_cmd: r.exe, params: r.params, separator: ';' });
+                    current = '';
+                }
+                i++;
+                continue;
+            }
+            current += ch;
+            i++;
+        }
+        if (current.trim()) {
+            const r = this.get_exec(current.trim());
+            result.push({ exe_cmd: r.exe, params: r.params, separator: '' });
+        }
+        return result;
+    }
+    /**
+     * 同步方式执行子进程（用于组合命令），返回退出码
+     */
+    spawn_sync(exe, params, use_noe_pty = false) {
+        return new Promise((resolve) => {
+            var _a, _b;
+            if ((use_noe_pty || ((_a = this.shell_set) === null || _a === void 0 ? void 0 : _a.has("*")) || ((_b = this.shell_set) === null || _b === void 0 ? void 0 : _b.has(exe))) && this.node_pty) {
+                this.on_call(`\n\r`);
+                this.node_pty_child = this.node_pty.spawn(exe, params, {
+                    name: 'xterm-color',
+                    cols: this.cols,
+                    rows: this.rows,
+                    cwd: this.cwd,
+                    useConptyDll: false,
+                    useConpty: process.env.NODE_ENV !== "production" ? false : undefined,
+                    env: Object.assign(Object.assign({}, process.env), this.env),
+                });
+                this.node_pty_child.onData((data) => {
+                    this.on_call(data.toString());
+                    if (this.on_call_child_raw) {
+                        this.on_call_child_raw(data);
+                    }
+                });
+                this.node_pty_child.onExit(({ exitCode, signal }) => {
+                    this.node_pty_child = null;
+                    resolve(exitCode !== null && exitCode !== void 0 ? exitCode : -1);
+                });
+            }
+            else {
+                const child = child_process.spawn(exe, params, {
+                    cwd: this.cwd,
+                    env: Object.assign(Object.assign({}, process.env), this.env),
+                });
+                child.stdout.setEncoding('utf8');
+                child.stdout.on('data', (data) => {
+                    this.send_and_enter(data.toString());
+                    if (this.on_call_child_raw) {
+                        this.on_call_child_raw(data);
+                    }
+                });
+                child.stderr.on('data', (data) => {
+                    this.send_and_enter(data.toString());
+                    this.next_not_enter = false;
+                    if (this.on_call_child_raw) {
+                        this.on_call_child_raw(data);
+                    }
+                });
+                child.on('exit', (code) => {
+                    resolve(code !== null && code !== void 0 ? code : -1);
+                });
+                child.on('error', (error) => {
+                    this.send_and_enter(error.message);
+                    resolve(-1);
+                });
             }
         });
     }

package/dist/type.d.ts

@@ -1,5 +1,7 @@
+import { PtyShell } from "./index";
 export interface child_func_type {
     write(str: string): void;
     kill(): void;
+    init(): void;
 }
-export type child_func_constructor = new (exit_on: () => void, send: (str: string) => void, params: string[]) => child_func_type;
+export type child_func_constructor = new (pty_shell: PtyShell, exit_on: () => void, send: (str: string) => void, params: string[]) => child_func_type;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pty-shell",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "a virtual PTY shell for javaScript",
   "author": "xiaobaidadada",
   "main": "dist/index.js",