pty-shell 1.2.2 → 1.4.0

package/README.md

@@ -1,7 +1,7 @@
 # pty-shell
 This is a virtual PTY shell that can be used to filter or log executable commands. It can also be used in a browser environment. Currently, it does not support features like piping. It supports the use of `node-pty`. For more usage examples, you can refer to the code in the [filecat](https://github.com/xiaobaidadada/filecat) project.
 It needs to be used in combination with projects similar to xterm.js.
-这是一个虚拟的pty shell ，可以用来过滤或者记录可执行命令， 并可以用于浏览器环境， 目前并不支持管道等功能，支持使用 node-pty ，更多使用例子目前可以参考 filecat(https://github.com/xiaobaidadada/filecat)项目中的代码 。 
+这是一个虚拟的pty shell ，可以用来过滤或者记录可执行命令， 只支持node环境，不支持浏览器， 目前并不支持管道等功能，支持使用 node-pty ，更多使用例子目前可以参考 filecat(https://github.com/xiaobaidadada/filecat)项目中的代码 。 
 需要配合  xterm.js 类似的项目组合使用
 # Sample Example
 ```js

package/dist/char.util.d.ts

@@ -0,0 +1,5 @@
+export declare class CharUtil {
+    static isFullCharWidth(char: any): boolean;
+    static readFullCharIndex(str: string, start_index: number, len: number): number;
+    static get_full_char_num(str: string): number;
+}

package/dist/char.util.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CharUtil = void 0;
+class CharUtil {
+    // 判断一个字符是全角还是半角
+    static isFullCharWidth(char) {
+        // 计算字符的 UTF-8 编码字节长度
+        const byteLength = Buffer.byteLength(char, 'utf8');
+        // 如果字符的字节长度大于 1，说明是全角字符
+        return byteLength > 1;
+    }
+    // 从start_index往前多少个位置获取指定数量的 半角 字符(宽字符算两个)
+    static readFullCharIndex(str, start_index, len) {
+        if (!str)
+            return 0;
+        if (start_index >= str.length)
+            return 0;
+        let num = 0;
+        let char_num = 0;
+        for (let i = start_index; i < str.length; i++) {
+            if (this.isFullCharWidth(str[i])) {
+                num += 2;
+            }
+            else {
+                num++;
+            }
+            char_num++;
+            if (num >= len)
+                return char_num;
+        }
+        return char_num;
+    }
+    // 获取字符串中有多少个 字符（将宽字符统计成两个)
+    static get_full_char_num(str) {
+        if (!str)
+            return 0;
+        let char_num = 0;
+        for (let i = 0; i < str.length; i++) {
+            if (this.isFullCharWidth(str[i])) {
+                char_num += 2;
+            }
+            else {
+                char_num++;
+            }
+        }
+        return char_num;
+    }
+}
+exports.CharUtil = CharUtil;

package/dist/index.d.ts

@@ -8,6 +8,7 @@
  * 读取输出与写入输入：捕获输出并发送输入，模拟用户交互。
  * 信号和控制字符支持：处理回车、换行等控制字符，并支持信号转发。
  */
+import { child_func_constructor } from "./type";
 export declare enum exec_type {
     not = -1,// 不能执行
     auto_child_process = 0,// 使用内置子线程执行(除了cd命令)
@@ -32,7 +33,6 @@ interface PtyShellUserMethod {
 }
 interface Param extends Partial<PtyShellUserMethod> {
     cwd: string;
-    not_use_node_pre_cmd_exec?: boolean;
     node_pty?: any;
     cols?: number;
     rows?: number;
@@ -41,7 +41,7 @@ interface Param extends Partial<PtyShellUserMethod> {
     history_line?: string[];
     history_line_max?: number;
 }
-type CmdHandler = (params: string[], send_prompt?: (data: string) => void) => Promise<void>;
+type CmdHandler = (params: string[], send_prompt?: (str: string, send_prompt?: boolean) => void) => Promise<void>;
 export declare class PtyShell implements PtyShellUserMethod {
     rows: number;
     cols: number;
@@ -49,7 +49,7 @@ export declare class PtyShell implements PtyShellUserMethod {
     env: {};
     constructor(param: Param);
     cmd_params_auto_completion(param_str: any): string | undefined;
-    cmd_exe_auto_completion: any;
+    cmd_exe_auto_completion: (str: string) => string;
     on_prompt_call: (cwd: any) => {
         str: string;
         char_num: number;
@@ -63,18 +63,17 @@ export declare class PtyShell implements PtyShellUserMethod {
         exe_cmd: string;
         params: string[];
     }>;
-    private cmd_set;
     private shell_set;
-    private node_require;
-    private not_use_node_pre_cmd_exec;
     private cmd_exec_map;
+    private js_child_map;
     private prompt_call_len;
     private is_running;
     private child_now_line;
     private word_detection;
     private node_pty;
     private child;
-    private is_pty;
+    private node_pty_child;
+    private js_func_child;
     private line;
     private line_index;
     private select_line;
@@ -83,11 +82,15 @@ 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
      */
     reset_option(param: Param): void;
     add_cmd_handle(exe_cmd: string, handle: CmdHandler): void;
+    add_js_child(name: string, child: child_func_constructor): void;
     close(): void;
     kill(): void;
     /**
@@ -100,12 +103,6 @@ export declare class PtyShell implements PtyShellUserMethod {
      * @param data
      */
     write(data: string): Promise<void>;
-    /**
-     *  static method
-     */
-    static isFullCharWidth(char: any): boolean;
-    static readFullCharIndex(str: string, start_index: number, len: number): number;
-    static get_full_char_num(str: string): number;
     /**
      * private method
      */
@@ -116,6 +113,7 @@ export declare class PtyShell implements PtyShellUserMethod {
     private insert_line;
     private close_child;
     private next_not_enter;
+    private have_child;
     private send_and_enter;
     private update_line;
     private cancel_selected;
@@ -139,4 +137,7 @@ export declare class PtyShell implements PtyShellUserMethod {
     private removeCharacterAt;
     private delete_all_enter;
 }
-export {};
+export * from "./type";
+export * from "./char.util";
+export * from "./path_util";
+export * from "./word_detection_js";

package/dist/index.js

@@ -9,6 +9,42 @@
  * 读取输出与写入输入：捕获输出并发送输入，模拟用户交互。
  * 信号和控制字符支持：处理回车、换行等控制字符，并支持信号转发。
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -22,6 +58,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PtyShell = exports.exec_cmd_type = exports.exec_type = void 0;
 const word_detection_js_1 = require("./word_detection_js");
 const path_util_1 = require("./path_util");
+const char_util_1 = require("./char.util");
+const child_process = __importStar(require("node:child_process"));
+const fs = require("fs");
+const path = require("path");
+// const child_process = require("child_process");
 // import {SystemUtil} from "../sys/sys.utl";
 /**
  * 功能说明：
@@ -32,7 +73,7 @@ const path_util_1 = require("./path_util");
  * 5. 对于特殊的 shell 命令 会使用  node-pty 来执行 并让shell托管所有的输入输出数据
  * 6. 使用了shell: true 参数 系统的默认shell可以支持管道等操作，还可以支持程序路劲查找的功能 但是这样无法支持 | 这样左边命令的校验了， todo 暂时取消这个功能。以后再添加 不能使用原生的shell因为不知道会有什么特殊语法从而跳过命令校验
  */
-const cmd_list = ['ls', 'cd', 'pwd']; // 仅支持这三个内置命令 cd 命令是唯一支持参数的
+// const cmd_list = ['ls', 'cd', 'pwd']; // 仅支持这三个内置命令 cd 命令是唯一支持参数的
 /**
  *  \r 是回车 光标移动到最右边 \n 是换行，当前位置下一行 和\x1b[1B 作用一样
  *  \x1b 是  ESC 后面跟着控制字符
@@ -79,19 +120,16 @@ class PtyShell {
         this.env = {};
         this.on_prompt_call = (cwd) => {
             const str = `${cwd}:# `;
-            return { str, char_num: PtyShell.get_full_char_num(str) };
+            return { str, char_num: char_util_1.CharUtil.get_full_char_num(str) };
         };
         this.on_call = (data) => {
         };
         this.on_control_cmd = (type, data) => {
         };
-        this.cmd_set = new Set(cmd_list);
-        this.node_require = {};
-        this.not_use_node_pre_cmd_exec = false;
         this.cmd_exec_map = new Map();
+        this.js_child_map = new Map();
         this.is_running = true;
         this.child_now_line = '';
-        this.is_pty = false;
         this.line = "";
         this.line_index = -1; // 当前指针在 某个字符（后面)
         this.select_line = "";
@@ -100,22 +138,34 @@ 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);
-        if (!this.not_use_node_pre_cmd_exec) {
-            this.node_require.fs = require("fs");
-            this.node_require.path = require("path");
-            this.node_require.child_process = require('child_process');
-        }
         this.on_call(this.raw_prompt);
+        // 添加自定义处理方法
+        this.add_cmd_handle("pwd", (params, send) => __awaiter(this, void 0, void 0, function* () {
+            this.send_and_enter(`${this.cwd}`);
+        }));
+        this.add_cmd_handle("cd", (params, send) => __awaiter(this, void 0, void 0, function* () {
+            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(``);
+            this.word_detection = undefined; // 清空检测器
+        }));
+        this.add_cmd_handle("ls", (params, send) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const items = fs.readdirSync((_a = params === null || params === void 0 ? void 0 : params[0]) !== null && _a !== void 0 ? _a : this.cwd); // 读取目录内容
+            const v = this.cols_handle(" " + items.join("  "));
+            this.send_and_enter(v);
+        }));
     }
     // cmd 命令 参数预测 只要是参数都可能是本目录下的文件名所以可以检测一下
     cmd_params_auto_completion(param_str) {
-        // 这里的默认实现是开启了使用 node
-        if (this.not_use_node_pre_cmd_exec) {
-            return;
-        }
-        const items = this.node_require.fs.readdirSync(this.cwd); // 读取目录内容
+        const items = fs.readdirSync(this.cwd); // 读取目录内容
         if (!this.word_detection) {
             this.word_detection = new word_detection_js_1.word_detection_js();
             for (const item of items) {
@@ -130,6 +180,12 @@ class PtyShell {
         }
         return v;
     }
+    get not_write() {
+        return this._not_write;
+    }
+    set not_write(value) {
+        this._not_write = value;
+    }
     /**
      * public method
      */
@@ -143,7 +199,9 @@ class PtyShell {
     }
     add_cmd_handle(exe_cmd, handle) {
         this.cmd_exec_map.set(exe_cmd, handle);
-        this.cmd_set.add(exe_cmd);
+    }
+    add_js_child(name, child) {
+        this.js_child_map.set(name, child);
     }
     close() {
         this.is_running = false;
@@ -162,7 +220,7 @@ class PtyShell {
         const max_index = str.length - 1;
         const list = [];
         let last_index = 0; // 上一次位置
-        let index = PtyShell.readFullCharIndex(str, 0, this.cols);
+        let index = char_util_1.CharUtil.readFullCharIndex(str, 0, this.cols);
         let count = 0;
         while (index < max_index) {
             if (count > max_index)
@@ -174,21 +232,21 @@ class PtyShell {
                     if (this.is_empty(str[f])) {
                         list.push(str.substring(last_index, f + 1));
                         last_index = f + 1;
-                        index = f + 1 + PtyShell.readFullCharIndex(str, f + 1, this.cols);
+                        index = f + 1 + char_util_1.CharUtil.readFullCharIndex(str, f + 1, this.cols);
                         continue;
                     }
                     if (f === last_index) {
                         // 最后一位 直接把本行全部添加进去
                         list.push(str.substring(last_index, index));
                         last_index = index;
-                        index = index + PtyShell.readFullCharIndex(str, index, this.cols);
+                        index = index + char_util_1.CharUtil.readFullCharIndex(str, index, this.cols);
                     }
                 }
             }
             else {
                 list.push(str.substring(last_index, index));
                 last_index = index;
-                index = index + PtyShell.readFullCharIndex(str, index + 1, this.cols);
+                index = index + char_util_1.CharUtil.readFullCharIndex(str, index + 1, this.cols);
             }
         }
         if (index >= max_index) {
@@ -202,8 +260,10 @@ class PtyShell {
      */
     write(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.child && this.is_pty) {
-                // 终端shell 完全 托管给 别的程序
+            if (this._not_write)
+                return;
+            if (this.node_pty_child != null) {
+                // 终端shell 完全 托管给 别的程序 只有 pty 的子程序可以 其他 需要pty-shell充当编辑器
                 this.spawn_write(data);
                 return;
             }
@@ -252,52 +312,6 @@ class PtyShell {
             }
         });
     }
-    /**
-     *  static method
-     */
-    // 判断一个字符是全角还是半角
-    static isFullCharWidth(char) {
-        // 计算字符的 UTF-8 编码字节长度
-        const byteLength = Buffer.byteLength(char, 'utf8');
-        // 如果字符的字节长度大于 1，说明是全角字符
-        return byteLength > 1;
-    }
-    // 从start_index往前多少个位置获取指定数量的 半角 字符(宽字符算两个)
-    static readFullCharIndex(str, start_index, len) {
-        if (!str)
-            return 0;
-        if (start_index >= str.length)
-            return 0;
-        let num = 0;
-        let char_num = 0;
-        for (let i = start_index; i < str.length; i++) {
-            if (this.isFullCharWidth(str[i])) {
-                num += 2;
-            }
-            else {
-                num++;
-            }
-            char_num++;
-            if (num >= len)
-                return char_num;
-        }
-        return char_num;
-    }
-    // 获取字符串中有多少个 字符（将宽字符统计成两个)
-    static get_full_char_num(str) {
-        if (!str)
-            return 0;
-        let char_num = 0;
-        for (let i = 0; i < str.length; i++) {
-            if (this.isFullCharWidth(str[i])) {
-                char_num += 2;
-            }
-            else {
-                char_num++;
-            }
-        }
-        return char_num;
-    }
     /**
      * private method
      */
@@ -332,20 +346,33 @@ class PtyShell {
     }
     close_child(code) {
         this.child_now_line = '';
-        if (this.child) {
+        let child = this.child;
+        if (this.node_pty_child) {
+            child = this.node_pty_child;
+        }
+        if (child) {
             // SystemUtil.killProcess(this.child.pid);
-            const pid = this.child.pid;
+            const pid = child.pid;
             if (this.on_child_kill) {
                 this.exec_end_call(code, pid);
             }
             else {
-                this.child.kill(); // 不同平台信号不同 win 默认 SIGHUP
+                child.kill(); // 不同平台信号不同 win 默认 SIGHUP
             }
-            this.child = undefined;
         }
+        if (this.js_func_child) {
+            this.js_func_child.kill();
+        }
+        this.child = undefined;
+        this.node_pty_child = null;
+        this.js_func_child = null;
+    }
+    have_child() {
+        return this.child != null || this.node_pty_child != null || this.js_func_child != null;
     }
     send_and_enter(str, send_prompt = false) {
         try {
+            const have_child = this.have_child();
             if (typeof str == "string") {
                 const list = [];
                 let i = 0;
@@ -365,7 +392,7 @@ class PtyShell {
                 }
                 if (i === 0 || i !== last_i)
                     list.push(str.substring(i));
-                if (this.child) {
+                if (have_child) {
                     // 添加子进程的提示换行
                     this.child_now_line = list[list.length - 1];
                 }
@@ -380,7 +407,7 @@ class PtyShell {
                 }
                 this.next_not_enter = str.endsWith('\n\r') || str.endsWith('\r\n'); // 下一次不用换行了
             }
-            if (!this.child || send_prompt) {
+            if (!have_child || send_prompt) {
                 this.on_call(`${this.enter_prompt}`);
             }
             this.clear_line();
@@ -392,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 : PtyShell.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;
         }
@@ -421,7 +449,7 @@ class PtyShell {
     get line_char_index() {
         if (this.line_index === -1)
             return 0;
-        return PtyShell.get_full_char_num(this.line.substring(0, this.line_index + 1));
+        return char_util_1.CharUtil.get_full_char_num(this.line.substring(0, this.line_index + 1));
     }
     ctrl_exec(str) {
         let cancel_selected = true; // 取消选中
@@ -483,7 +511,7 @@ class PtyShell {
                         break;
                     }
                     this.line_index++;
-                    const len = PtyShell.get_full_char_num(this.line[this.line_index]);
+                    const len = char_util_1.CharUtil.get_full_char_num(this.line[this.line_index]);
                     if (this.select_line) {
                         this.update_line({ line_add_num: 1 });
                         break;
@@ -497,7 +525,7 @@ class PtyShell {
                     if (this.line_index === -1) {
                         break;
                     }
-                    const len = PtyShell.get_full_char_num(this.line[this.line_index]);
+                    const len = char_util_1.CharUtil.get_full_char_num(this.line[this.line_index]);
                     this.line_index--;
                     if (this.select_line) {
                         this.update_line({ line_add_num: 1 });
@@ -550,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;
                     }
@@ -725,20 +753,16 @@ 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.child) {
+            if (!this.line && !this.have_child()) {
                 this.send_and_enter("");
                 this.clear_line();
                 return;
             }
             this.push_history_line(this.line);
-            if (this.child && this.is_pty) {
-                // 终端shell 完全 托管给 别的程序
-                this.spawn_write(`${this.line}\r`);
-                return;
-            }
-            else if (this.child) {
-                // 把数据给正在运行的别的程序
+            if (this.have_child()) {
+                // 把数据给正在运行的别的程序 但是肯定不是 pty 的pty 不需要pty-shell 做命令编辑器
                 this.spawn_write(`${this.line}\n`);
                 this.clear_line();
                 return;
@@ -772,7 +796,7 @@ class PtyShell {
                     exe = r.exe_cmd;
                     params = r.params;
                 }
-                if (this.cmd_set.has(exe)) {
+                if (this.cmd_exec_map.has(exe)) {
                     // 检测某个已经有预处理的命令 包括用户自定义的
                     yield this.exec_cmd(exe, params);
                     // 不用再继续了
@@ -780,12 +804,26 @@ class PtyShell {
                     this.exec_end_call(0);
                     return;
                 }
-                this.spawn(exe, params, use_noe_pty);
+                if (this.js_child_map.has(exe)) {
+                    const c_ = this.js_child_map.get(exe);
+                    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);
+                    }, params);
+                    this.js_func_child.init();
+                    return;
+                }
+                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);
             }
         });
@@ -813,18 +851,22 @@ class PtyShell {
         });
     }
     spawn_write(str) {
-        if (this.is_pty) {
-            this.child.write(str);
+        if (this.node_pty_child) {
+            this.node_pty_child.write(str);
+            // this.child.write(str);
         }
-        else {
+        else if (this.child) {
             this.child.stdin.write(str);
         }
-    }
-    spawn(exe, params, use_noe_pty = true, spawn_option) {
-        if (this.not_use_node_pre_cmd_exec) {
-            this.send_and_enter(`not_use_node_pre_cmd_exec is true`);
-            return;
+        else if (this.js_func_child) {
+            this.js_func_child.write(str);
         }
+    }
+    spawn(exe, params, use_noe_pty = true) {
+        // if (this.not_use_node_pre_cmd_exec) {
+        //     this.send_and_enter(`not_use_node_pre_cmd_exec is true`);
+        //     return;
+        // }
         // this.send_and_enter(""); //
         // if (!this.child) {
         //     this.on_call(`\n\r`); // 先换个行
@@ -834,30 +876,40 @@ class PtyShell {
             //     exe += '.exe';
             // }
             this.on_call(`\n\r`); // 先换个行
-            this.child = this.node_pty.spawn(exe, params, Object.assign({ 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) }, spawn_option));
-            this.child.onData((data) => {
+            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, // conpty 可以支持 bash 等命令 从 Windows 10 版本 1809 开始提供 ， 但是如果使用了 powershell 这个也就没有必要了，而且设置为false才能使用debug模式运行
+                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.child.onExit(({ exitCode, signal }) => {
+            this.node_pty_child.onExit(({ exitCode, signal }) => {
                 this.close_child(exitCode);
                 this.send_and_enter("");
                 // this.send_and_enter(`pty with ${exitCode}`);
                 this.next_not_enter = false; // 下一次的换行输出 上一次没有换行
             });
-            this.is_pty = true;
+            // this.is_pty = true;
         }
         else {
-            this.is_pty = false;
+            // this.is_pty = false;
             // 其他的没有必要再创建一个 tty 都是资源消耗
-            this.child = this.node_require.child_process.spawn(exe, params, Object.assign({ 
+            this.child = child_process.spawn(exe, params, {
                 // shell:getShell(),
-                cwd: this.cwd, env: Object.assign(Object.assign(Object.assign({}, process.env), this.env), { LANG: 'en_US.UTF-8' }), 
+                cwd: this.cwd, // 设置子进程的工作目录
+                env: Object.assign(Object.assign(Object.assign({}, process.env), this.env), { LANG: 'en_US.UTF-8' }), // 传递环境变量
                 // stdio: 'inherit'  // 让子进程的输入输出与父进程共享 pipe ignore inherit
                 // timeout: 5000,      // 设置超时为 5 秒
-                maxBuffer: 1024 * 1024 * 10 }, spawn_option));
+                // maxBuffer: 1024 * 1024 * 10// 设置缓冲区为 10 MB
+            });
             // 设置编码为 'utf8'，确保输出按 UTF-8 编码解析
             this.child.stdout.setEncoding('utf8');
             this.child.stdout.on('data', (data) => {
@@ -893,58 +945,20 @@ class PtyShell {
     }
     exec_cmd(exe, params) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             try {
                 const handle = this.cmd_exec_map.get(exe);
-                if (exe !== 'cd' && handle) {
-                    // 如果用户有了就用用户的 不用系统自己的 但是 cd 命令排除在外
-                    yield handle(params, (data) => {
-                        this.send_and_enter(data, true);
+                if (handle) {
+                    // 如果用户有了就用用户的 不用系统自己的
+                    yield handle(params, (data, enter) => {
+                        this.send_and_enter(data, enter);
                     });
                     return true;
                 }
-                switch (exe) {
-                    case 'pwd':
-                        {
-                            this.send_and_enter(`${this.cwd}`);
-                        }
-                        return true;
-                    case 'cd':
-                        {
-                            let p;
-                            if (!this.not_use_node_pre_cmd_exec) {
-                                // 有node环境可以检测一下
-                                p = this.node_require.path.isAbsolute(params[0]) ? params[0] : this.node_require.path.join(this.cwd, params[0]);
-                                if (!this.node_require.fs.existsSync(p)) {
-                                    this.send_and_enter(`not directory ${p}`);
-                                }
-                            }
-                            else {
-                                // 没有node环境只能这样了 todo 对于 .. 路径有问题
-                                p = (0, path_util_1.path_join)(this.cwd, params[0]);
-                            }
-                            this.cwd = p;
-                            this.send_and_enter(``);
-                            this.word_detection = undefined; // 清空检测器
-                        }
-                        return true;
-                    case 'ls':
-                        {
-                            if (this.not_use_node_pre_cmd_exec) {
-                                return false; // 让其它方式处理
-                            }
-                            const items = this.node_require.fs.readdirSync(this.cwd); // 读取目录内容
-                            const v = this.cols_handle(" " + items.join("  "));
-                            this.send_and_enter(v);
-                        }
-                        return true;
-                    default:
-                        return false; // 让其它方式处理
-                }
             }
             catch (e) {
-                this.send_and_enter(JSON.stringify(e));
+                this.send_and_enter((_a = e === null || e === void 0 ? void 0 : e.message) !== null && _a !== void 0 ? _a : e);
             }
-            return false; // 让其它方式处理
         });
     }
     // 解析命令与参数
@@ -1062,3 +1076,7 @@ class PtyShell {
     }
 }
 exports.PtyShell = PtyShell;
+__exportStar(require("./type"), exports);
+__exportStar(require("./char.util"), exports);
+__exportStar(require("./path_util"), exports);
+__exportStar(require("./word_detection_js"), exports);

package/dist/type.d.ts

@@ -0,0 +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 (pty_shell: PtyShell, exit_on: () => void, send: (str: string) => void, params: string[]) => child_func_type;

package/dist/type.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

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