@lydell/node-pty-win32-x64 1.2.0-beta.6 → 1.2.0-beta.7

package/lib/windowsPtyAgent.js

@@ -7,14 +7,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.argsToCommandLine = exports.WindowsPtyAgent = void 0;
 var fs = require("fs");
-var os = require("os");
 var path = require("path");
 var child_process_1 = require("child_process");
 var net_1 = require("net");
 var windowsConoutConnection_1 = require("./windowsConoutConnection");
 var utils_1 = require("./utils");
 var conptyNative;
-var winptyNative;
 /**
  * The amount of time to wait for additional data after the conpty shell process has exited before
  * shutting down the socket. The timer will be reset if a new data event comes in after the timer
@@ -22,46 +20,25 @@ var winptyNative;
  */
 var FLUSH_DATA_INTERVAL = 1000;
 /**
- * This agent sits between the WindowsTerminal class and provides a common interface for both conpty
- * and winpty.
+ * This agent sits between the WindowsTerminal class and provides an interface for conpty.
  */
 var WindowsPtyAgent = /** @class */ (function () {
-    function WindowsPtyAgent(file, args, env, cwd, cols, rows, debug, _useConpty, _useConptyDll, conptyInheritCursor) {
+    function WindowsPtyAgent(file, args, env, cwd, cols, rows, debug, _useConptyDll, conptyInheritCursor) {
         var _this = this;
         if (_useConptyDll === void 0) { _useConptyDll = false; }
         if (conptyInheritCursor === void 0) { conptyInheritCursor = false; }
-        this._useConpty = _useConpty;
         this._useConptyDll = _useConptyDll;
-        this._pid = 0;
         this._innerPid = 0;
-        if (this._useConpty === undefined || this._useConpty === true) {
-            this._useConpty = this._getWindowsBuildNumber() >= 18309;
+        if (!conptyNative) {
+            conptyNative = utils_1.loadNativeModule('conpty').module;
         }
-        if (this._useConpty) {
-            if (!conptyNative) {
-                conptyNative = utils_1.loadNativeModule('conpty').module;
-            }
-        }
-        else {
-            if (!winptyNative) {
-                winptyNative = utils_1.loadNativeModule('pty').module;
-            }
-        }
-        this._ptyNative = this._useConpty ? conptyNative : winptyNative;
+        this._ptyNative = conptyNative;
         // Sanitize input variable.
         cwd = path.resolve(cwd);
         // Compose command line
         var commandLine = argsToCommandLine(file, args);
         // Open pty session.
-        var term;
-        if (this._useConpty) {
-            term = this._ptyNative.startProcess(file, cols, rows, debug, this._generatePipeName(), conptyInheritCursor, this._useConptyDll);
-        }
-        else {
-            term = this._ptyNative.startProcess(file, commandLine, env, cwd, cols, rows, debug);
-            this._pid = term.pid;
-            this._innerPid = term.innerPid;
-        }
+        var term = conptyNative.startProcess(file, cols, rows, debug, this._generatePipeName(), conptyInheritCursor, this._useConptyDll);
         // Not available on windows.
         this._fd = term.fd;
         // Generated incremental number that has no real purpose besides  using it
@@ -85,10 +62,8 @@ var WindowsPtyAgent = /** @class */ (function () {
             writable: true
         });
         this._inSocket.setEncoding('utf8');
-        if (this._useConpty) {
-            var connect = this._ptyNative.connect(this._pty, commandLine, cwd, env, this._useConptyDll, function (c) { return _this._$onProcessExit(c); });
-            this._innerPid = connect.pid;
-        }
+        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; },
@@ -116,65 +91,39 @@ var WindowsPtyAgent = /** @class */ (function () {
         configurable: true
     });
     WindowsPtyAgent.prototype.resize = function (cols, rows) {
-        if (this._useConpty) {
-            if (this._exitCode !== undefined) {
-                throw new Error('Cannot resize a pty that has already exited');
-            }
-            this._ptyNative.resize(this._pty, cols, rows, this._useConptyDll);
-            return;
+        if (this._exitCode !== undefined) {
+            throw new Error('Cannot resize a pty that has already exited');
         }
-        this._ptyNative.resize(this._pid, cols, rows);
+        this._ptyNative.resize(this._pty, cols, rows, this._useConptyDll);
     };
     WindowsPtyAgent.prototype.clear = function () {
-        if (this._useConpty) {
-            this._ptyNative.clear(this._pty, this._useConptyDll);
-        }
+        this._ptyNative.clear(this._pty, this._useConptyDll);
     };
     WindowsPtyAgent.prototype.kill = function () {
         var _this = this;
         // Tell the agent to kill the pty, this releases handles to the process
-        if (this._useConpty) {
-            if (!this._useConptyDll) {
-                this._inSocket.readable = false;
-                this._outSocket.readable = false;
-                this._getConsoleProcessList().then(function (consoleProcessList) {
-                    consoleProcessList.forEach(function (pid) {
-                        try {
-                            process.kill(pid);
-                        }
-                        catch (e) {
-                            // Ignore if process cannot be found (kill ESRCH error)
-                        }
-                    });
-                });
-                this._ptyNative.kill(this._pty, this._useConptyDll);
-                this._conoutSocketWorker.dispose();
-            }
-            else {
-                // Close the input write handle to signal the end of session.
-                this._inSocket.destroy();
-                this._ptyNative.kill(this._pty, this._useConptyDll);
-                this._outSocket.on('data', function () {
-                    _this._conoutSocketWorker.dispose();
+        if (!this._useConptyDll) {
+            this._inSocket.readable = false;
+            this._outSocket.readable = false;
+            this._getConsoleProcessList().then(function (consoleProcessList) {
+                consoleProcessList.forEach(function (pid) {
+                    try {
+                        process.kill(pid);
+                    }
+                    catch (e) {
+                        // Ignore if process cannot be found (kill ESRCH error)
+                    }
                 });
-            }
+            });
+            this._ptyNative.kill(this._pty, this._useConptyDll);
+            this._conoutSocketWorker.dispose();
         }
         else {
-            // Because pty.kill closes the handle, it will kill most processes by itself.
-            // Process IDs can be reused as soon as all handles to them are
-            // dropped, so we want to immediately kill the entire console process list.
-            // If we do not force kill all processes here, node servers in particular
-            // seem to become detached and remain running (see
-            // Microsoft/vscode#26807).
-            var processList = this._ptyNative.getProcessList(this._pid);
-            this._ptyNative.kill(this._pid, this._innerPid);
-            processList.forEach(function (pid) {
-                try {
-                    process.kill(pid);
-                }
-                catch (e) {
-                    // Ignore if process cannot be found (kill ESRCH error)
-                }
+            // Close the input write handle to signal the end of session.
+            this._inSocket.destroy();
+            this._ptyNative.kill(this._pty, this._useConptyDll);
+            this._outSocket.on('data', function () {
+                _this._conoutSocketWorker.dispose();
             });
         }
     };
@@ -195,23 +144,11 @@ var WindowsPtyAgent = /** @class */ (function () {
     };
     Object.defineProperty(WindowsPtyAgent.prototype, "exitCode", {
         get: function () {
-            if (this._useConpty) {
-                return this._exitCode;
-            }
-            var winptyExitCode = this._ptyNative.getExitCode(this._innerPid);
-            return winptyExitCode === -1 ? undefined : winptyExitCode;
+            return this._exitCode;
         },
         enumerable: false,
         configurable: true
     });
-    WindowsPtyAgent.prototype._getWindowsBuildNumber = function () {
-        var osVersion = (/(\d+)\.(\d+)\.(\d+)/g).exec(os.release());
-        var buildNumber = 0;
-        if (osVersion && osVersion.length === 4) {
-            buildNumber = parseInt(osVersion[3]);
-        }
-        return buildNumber;
-    };
     WindowsPtyAgent.prototype._generatePipeName = function () {
         return "conpty-" + Math.random() * 10000000;
     };

package/lib/windowsTerminal.js

@@ -48,7 +48,7 @@ var WindowsTerminal = /** @class */ (function (_super) {
         // Functions that need to run after `ready` event is emitted.
         _this._deferreds = [];
         // Create new termal.
-        _this._agent = new windowsPtyAgent_1.WindowsPtyAgent(file, args, parsedEnv, cwd, _this._cols, _this._rows, false, opt.useConpty, opt.useConptyDll, opt.conptyInheritCursor);
+        _this._agent = new windowsPtyAgent_1.WindowsPtyAgent(file, args, parsedEnv, cwd, _this._cols, _this._rows, false, opt.useConptyDll, opt.conptyInheritCursor);
         _this._socket = _this._agent.outSocket;
         // Not available until `ready` event emitted.
         _this._pid = _this._agent.innerPid;

package/package.json

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