查找全部子进程todo

Author: xiaobaidadada

README.md

@@ -1,6 +1,9 @@
 # node-pty-prebuilt
-spawn函数的opt选项添加了agentExePath，可以指定 agentExePath的位置.
+在windwos下spawn函数的opt选项添加了exePath，可以指定 exePath的位置.
 
 The spawn function's opt option has been added with agentExePath, which allows specifying the location of the agent executable.
 
 https://github.com/microsoft/node-pty
+
+1. 在windows下useConpty如果开启，不能在debug模式下运行，useConptyDll如果开启了，你依然可以用exePath参数来指定它所需要的dll位置，不提供会使用项目默认的。
+2. 已经适配webpack打包

package.json

@@ -4,7 +4,7 @@
   "author": {
     "name": "xiaobaidadada"
   },
-  "version": "1.0.2",
+  "version": "1.0.3",
   "license": "MIT",
   "main": "./lib/index.js",
   "types": "./typings/node-pty.d.ts",

src/win/conpty_console_list.cc

@@ -6,34 +6,44 @@
 #include <napi.h>
 #include <windows.h>
 
-static Napi::Value ApiConsoleProcessList(const Napi::CallbackInfo& info) {
+static Napi::Promise  ApiConsoleProcessList(const Napi::CallbackInfo& info) {
   Napi::Env env(info.Env());
   if (info.Length() != 1 ||
       !info[0].IsNumber()) {
     throw Napi::Error::New(env, "Usage: getConsoleProcessList(shellPid)");
   }
 
   const DWORD pid = info[0].As<Napi::Number>().Uint32Value();
-
+  // 创建一个 Promise 对象
+  Napi::Promise::Deferred deferred = Napi::Promise::Deferred::New(env);
   if (!FreeConsole()) {
-    throw Napi::Error::New(env, "FreeConsole failed");
-  }
-  if (!AttachConsole(pid)) {
-    throw Napi::Error::New(env, "AttachConsole failed");
+            deferred.Reject(Napi::String::New(deferred.Env(),"FreeConsole failed"));
   }
-  auto processList = std::vector<DWORD>(64);
-  auto processCount = GetConsoleProcessList(&processList[0], static_cast<DWORD>(processList.size()));
-  if (processList.size() < processCount) {
-      processList.resize(processCount);
-      processCount = GetConsoleProcessList(&processList[0], static_cast<DWORD>(processList.size()));
+  if (!AttachConsole(pid)) { // todo 这都是操当前的，不太行
+            deferred.Reject(Napi::String::New(deferred.Env(),"AttachConsole failed"));
   }
-  FreeConsole();
+  std::thread([pid,deferred]() mutable {
+        // 执行耗时任务
+        try {
 
-  Napi::Array result = Napi::Array::New(env);
-  for (DWORD i = 0; i < processCount; i++) {
-    result.Set(i, Napi::Number::New(env, processList[i]));
-  }
-  return result;
+
+          auto processList = std::vector<DWORD>(64);
+          auto processCount = GetConsoleProcessList(&processList[0], static_cast<DWORD>(processList.size()));
+          if (processList.size() < processCount) {
+             processList.resize(processCount);
+             processCount = GetConsoleProcessList(&processList[0], static_cast<DWORD>(processList.size()));
+          }
+          FreeConsole();
+          Napi::Array result = Napi::Array::New(deferred.Env());
+          for (DWORD i = 0; i < processCount; i++) {
+           result.Set(i, Napi::Number::New(deferred.Env(), processList[i]));
+          }
+          deferred.Resolve(result);
+        } catch (const std::exception& e) {
+            deferred.Reject(Napi::String::New(deferred.Env(), e.what()));
+        }
+    }).detach(); // 分离线程，这样线程会在后台运行
+  return deferred.Promise();
 }
 
 Napi::Object init(Napi::Env env, Napi::Object exports) {

src/windowsPtyAgent.ts

@@ -194,16 +194,29 @@ export class WindowsPtyAgent {
     this._conoutSocketWorker.dispose();
   }
 
+  getConsoleProcessList: any;
   private _getConsoleProcessList(): Promise<number[]> {
+    try {
+      if (!this.getConsoleProcessList) {
+        this.getConsoleProcessList = __non_webpack_require__('../build/Release/conpty_console_list.node').getConsoleProcessList;
+      }
+    } catch (err) {
+      this.getConsoleProcessList = __non_webpack_require__('../build/Debug/conpty_console_list.node').getConsoleProcessList;
+    }
     return new Promise<number[]>(resolve => {
-      const agent = fork(path.join(__dirname, 'conpty_console_list_agent'), [ this._innerPid.toString() ]);
-      agent.on('message', message => {
+      // const agent = fork(path.join(__dirname, 'conpty_console_list_agent'), [ this._innerPid.toString() ]);
+      // agent.on('message', message => {
+      //   clearTimeout(timeout);
+      //   resolve(message.consoleProcessList);
+      // });
+      this.getConsoleProcessList(this._innerPid).then((consoleProcessList: number[] | PromiseLike<number[]> | undefined) => {
         clearTimeout(timeout);
-        resolve(message.consoleProcessList);
+        resolve(consoleProcessList);
+      }).catch((error: any) => {
+        console.error('Error:', error);   // 如果发生错误，会打印出来
+        resolve([ this._innerPid ]);
       });
       const timeout = setTimeout(() => {
-        // Something went wrong, just send back the shell PID
-        agent.kill();
         resolve([ this._innerPid ]);
       }, 5000);
     });