pty-shell 1.3.0 → 1.4.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
      */

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,6 +761,12 @@ class PtyShell {
                 return;
             }
             this.push_history_line(this.line);
+            if (this.have_child()) {
+                // 把数据给正在运行的别的程序 但是肯定不是 pty 的pty 不需要pty-shell 做命令编辑器
+                this.spawn_write(`${this.line}\n`);
+                this.clear_line();
+                return;
+            }
             let { exe, params } = this.get_exec(this.line);
             this.history_line_index = -1;
             try {
@@ -787,21 +806,24 @@ class PtyShell {
                 }
                 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.js_func_child = new c_(this, () => {
+                        this.send_and_enter("", true);
                         this.next_not_enter = false; // 下一次的换行输出 上一次没有换行
                         this.close_child();
                     }, (str) => {
-                        this.on_call(str);
+                        this.send_and_enter(str);
                     }, params);
+                    this.js_func_child.init();
                     return;
                 }
-                this.spawn(exe, params, use_noe_pty);
+                else {
+                    this.spawn(exe, params, use_noe_pty);
+                }
                 this.clear_line();
             }
             catch (e) {
                 // console.log("子线程执行异常", e);
-                this.send_and_enter(e.message);
+                this.send_and_enter((_a = e.message) !== null && _a !== void 0 ? _a : e);
                 this.exec_end_call(-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.4.0",
   "description": "a virtual PTY shell for javaScript",
   "author": "xiaobaidadada",
   "main": "dist/index.js",