@lydell/node-pty-win32-x64 1.2.0-beta.10 → 1.2.0-beta.12

package/lib/conpty_console_list_agent.js

@@ -10,7 +10,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var utils_1 = require("./utils");
 var getConsoleProcessList = utils_1.loadNativeModule('conpty_console_list').module.getConsoleProcessList;
 var shellPid = parseInt(process.argv[2], 10);
-var consoleProcessList = getConsoleProcessList(shellPid);
+var consoleProcessList = [];
+if (shellPid > 0) {
+    try {
+        consoleProcessList = getConsoleProcessList(shellPid);
+    }
+    catch (_a) {
+        // AttachConsole can fail if the process already exited or is invalid.
+        consoleProcessList = [];
+    }
+}
 process.send({ consoleProcessList: consoleProcessList });
 process.exit(0);
 //# sourceMappingURL=conpty_console_list_agent.js.map

package/lib/windowsPtyAgent.js

@@ -48,9 +48,26 @@ var WindowsPtyAgent = /** @class */ (function () {
         this._outSocket = new net_1.Socket();
         this._outSocket.setEncoding('utf8');
         // The conout socket must be ready out on another thread to avoid deadlocks
+        // We must wait for the worker to connect before calling conptyNative.connect()
+        // to avoid blocking the Node.js event loop in ConnectNamedPipe.
+        // See https://github.com/microsoft/node-pty/issues/763
         this._conoutSocketWorker = new windowsConoutConnection_1.ConoutConnection(term.conout, this._useConptyDll);
+        // Store pending connection info - we'll complete the connection when worker is ready
+        this._pendingPtyInfo = { pty: this._pty, commandLine: commandLine, cwd: cwd, env: env };
+        // Timeout to ensure connection completes even if worker fails to signal ready
+        var connectionTimeout = setTimeout(function () {
+            if (_this._pendingPtyInfo) {
+                // Worker never signaled ready - complete connection anyway to avoid zombie state
+                _this._completePtyConnection();
+            }
+        }, 5000);
         this._conoutSocketWorker.onReady(function () {
+            clearTimeout(connectionTimeout);
             _this._conoutSocketWorker.connectSocket(_this._outSocket);
+            // Now that the worker has connected to the output pipe, we can safely call
+            // conptyNative.connect() which calls ConnectNamedPipe - it won't block because
+            // the client (worker) is already connected
+            _this._completePtyConnection();
         });
         this._outSocket.on('connect', function () {
             _this._outSocket.emit('ready_datapipe');
@@ -62,8 +79,6 @@ var WindowsPtyAgent = /** @class */ (function () {
             writable: true
         });
         this._inSocket.setEncoding('utf8');
-        var connect = conptyNative.connect(this._pty, commandLine, cwd, env, this._useConptyDll, function (c) { return _this._$onProcessExit(c); });
-        this._innerPid = connect.pid;
     }
     Object.defineProperty(WindowsPtyAgent.prototype, "inSocket", {
         get: function () { return this._inSocket; },
@@ -90,6 +105,16 @@ var WindowsPtyAgent = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    WindowsPtyAgent.prototype._completePtyConnection = function () {
+        var _this = this;
+        if (!this._pendingPtyInfo) {
+            return;
+        }
+        var _a = this._pendingPtyInfo, pty = _a.pty, commandLine = _a.commandLine, cwd = _a.cwd, env = _a.env;
+        this._pendingPtyInfo = undefined;
+        var connect = conptyNative.connect(pty, commandLine, cwd, env, this._useConptyDll, function (c) { return _this._$onProcessExit(c); });
+        this._innerPid = connect.pid;
+    };
     WindowsPtyAgent.prototype.resize = function (cols, rows) {
         if (this._exitCode !== undefined) {
             throw new Error('Cannot resize a pty that has already exited');
@@ -101,6 +126,8 @@ var WindowsPtyAgent = /** @class */ (function () {
     };
     WindowsPtyAgent.prototype.kill = function () {
         var _this = this;
+        // Prevent deferred connection from completing after kill
+        this._pendingPtyInfo = undefined;
         // Tell the agent to kill the pty, this releases handles to the process
         if (!this._useConptyDll) {
             this._inSocket.readable = false;
@@ -129,6 +156,9 @@ var WindowsPtyAgent = /** @class */ (function () {
     };
     WindowsPtyAgent.prototype._getConsoleProcessList = function () {
         var _this = this;
+        if (this._innerPid <= 0) {
+            return Promise.resolve([]);
+        }
         return new Promise(function (resolve) {
             var agent = child_process_1.fork(path.join(__dirname, 'conpty_console_list_agent'), [_this._innerPid.toString()]);
             agent.on('message', function (message) {

package/lib/windowsTerminal.js

@@ -57,6 +57,8 @@ var WindowsTerminal = /** @class */ (function (_super) {
         // The forked windows terminal is not available until `ready` event is
         // emitted.
         _this._socket.on('ready_datapipe', function () {
+            // Update pid now that the agent has connected
+            _this._pid = _this._agent.innerPid;
             // Run deferreds and set ready state once the first data event is received.
             _this._socket.once('data', function () {
                 // Wait until the first data event is fired then we can run deferreds.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lydell/node-pty-win32-x64",
-  "version": "1.2.0-beta.10",
+  "version": "1.2.0-beta.12",
   "description": "The node-pty package, stripped down only for win32-x64.",
   "repository": {
     "type": "git",