node-pty 0.11.0-beta3 → 0.11.0-beta30

package/src/unixTerminal.test.ts

@@ -7,6 +7,9 @@ import { UnixTerminal } from './unixTerminal';
 import * as assert from 'assert';
 import * as cp from 'child_process';
 import * as path from 'path';
+import * as tty from 'tty';
+import * as fs from 'fs';
+import { constants } from 'os';
 import { pollUntil } from './testUtils.test';
 
 const FIXTURES_PATH = path.normalize(path.join(__dirname, '..', 'fixtures', 'utf8-character.txt'));
@@ -16,7 +19,7 @@ if (process.platform !== 'win32') {
     describe('Constructor', () => {
       it('should set a valid pts name', () => {
         const term = new UnixTerminal('/bin/bash', [], {});
-        let regExp: RegExp;
+        let regExp: RegExp | undefined;
         if (process.platform === 'linux') {
           // https://linux.die.net/man/4/pts
           regExp = /^\/dev\/pts\/\d+$/;
@@ -26,8 +29,9 @@ if (process.platform !== 'win32') {
           regExp = /^\/dev\/tty[p-sP-S][a-z0-9]+$/;
         }
         if (regExp) {
-          assert.ok(regExp.test((<any>term)._pty), '"' + (<any>term)._pty + '" should match ' + regExp.toString());
+          assert.ok(regExp.test(term.ptsName), '"' + term.ptsName + '" should match ' + regExp.toString());
         }
+        assert.ok(tty.isatty(term.fd));
       });
     });
 
@@ -35,8 +39,8 @@ if (process.platform !== 'win32') {
       it('should default to utf8', (done) => {
         const term = new UnixTerminal('/bin/bash', [ '-c', `cat "${FIXTURES_PATH}"` ]);
         term.on('data', (data) => {
-          assert.equal(typeof data, 'string');
-          assert.equal(data, '\u00E6');
+          assert.strictEqual(typeof data, 'string');
+          assert.strictEqual(data, '\u00E6');
           done();
         });
       });
@@ -45,25 +49,25 @@ if (process.platform !== 'win32') {
           encoding: null
         });
         term.on('data', (data) => {
-          assert.equal(typeof data, 'object');
+          assert.strictEqual(typeof data, 'object');
           assert.ok(data instanceof Buffer);
-          assert.equal(0xC3, data[0]);
-          assert.equal(0xA6, data[1]);
+          assert.strictEqual(0xC3, data[0]);
+          assert.strictEqual(0xA6, data[1]);
           done();
         });
       });
       it('should support other encodings', (done) => {
         const text = 'test æ!';
-        const term = new UnixTerminal(null, ['-c', 'echo "' + text + '"'], {
+        const term = new UnixTerminal(undefined, ['-c', 'echo "' + text + '"'], {
           encoding: 'base64'
         });
         let buffer = '';
-        term.on('data', (data) => {
-          assert.equal(typeof data, 'string');
+        term.onData((data) => {
+          assert.strictEqual(typeof data, 'string');
           buffer += data;
         });
-        term.on('exit', () => {
-          assert.equal(Buffer.alloc(8, buffer, 'base64').toString().replace('\r', '').replace('\n', ''), text);
+        term.onExit(() => {
+          assert.strictEqual(Buffer.alloc(8, buffer, 'base64').toString().replace('\r', '').replace('\n', ''), text);
           done();
         });
       });
@@ -74,8 +78,8 @@ if (process.platform !== 'win32') {
 
       afterEach(() => {
         if (term) {
-          term.slave.destroy();
-          term.master.destroy();
+          term.slave!.destroy();
+          term.master!.destroy();
         }
       });
 
@@ -83,12 +87,12 @@ if (process.platform !== 'win32') {
         term = UnixTerminal.open({});
 
         let slavebuf = '';
-        term.slave.on('data', (data) => {
+        term.slave!.on('data', (data) => {
           slavebuf += data;
         });
 
         let masterbuf = '';
-        term.master.on('data', (data) => {
+        term.master!.on('data', (data) => {
           masterbuf += data;
         });
 
@@ -100,8 +104,19 @@ if (process.platform !== 'win32') {
           return false;
         }, 200, 10);
 
-        term.slave.write('slave\n');
-        term.master.write('master\n');
+        term.slave!.write('slave\n');
+        term.master!.write('master\n');
+      });
+    });
+    describe('close', () => {
+      const term = new UnixTerminal('node');
+      it('should exit when terminal is destroyed programmatically', (done) => {
+        term.on('exit', (code, signal) => {
+          assert.strictEqual(code, 0);
+          assert.strictEqual(signal, constants.signals.SIGHUP);
+          done();
+        });
+        term.destroy();
       });
     });
     describe('signals in parent and child', () => {
@@ -140,8 +155,8 @@ if (process.platform !== 'win32') {
         });
         p.on('close', () => {
           // handlers in parent and child should have been triggered
-          assert.equal(buffer.indexOf('SIGINT in child') !== -1, true);
-          assert.equal(buffer.indexOf('SIGINT in parent') !== -1, true);
+          assert.strictEqual(buffer.indexOf('SIGINT in child') !== -1, true);
+          assert.strictEqual(buffer.indexOf('SIGINT in parent') !== -1, true);
           done();
         });
       });
@@ -181,8 +196,8 @@ if (process.platform !== 'win32') {
         });
         p.on('close', () => {
           // handlers in parent and child should have been triggered
-          assert.equal(buffer.indexOf('should not be printed') !== -1, false);
-          assert.equal(buffer.indexOf('SIGINT in parent') !== -1, true);
+          assert.strictEqual(buffer.indexOf('should not be printed') !== -1, false);
+          assert.strictEqual(buffer.indexOf('SIGINT in parent') !== -1, true);
           done();
         });
       });
@@ -201,7 +216,7 @@ if (process.platform !== 'win32') {
         });
         term.on('exit', () => {
           // no timeout in buffer
-          assert.equal(buffer, '');
+          assert.strictEqual(buffer, '');
           done();
         });
       });
@@ -233,11 +248,116 @@ if (process.platform !== 'win32') {
         });
         term.on('exit', () => {
           // should have called both handlers and only once
-          assert.equal(pHandlerCalled, 1);
-          assert.equal(buffer, 'SIGUSR1 in child\r\n');
+          assert.strictEqual(pHandlerCalled, 1);
+          assert.strictEqual(buffer, 'SIGUSR1 in child\r\n');
           done();
         });
       });
     });
+    describe('spawn', () => {
+      it('should handle exec() errors', (done) => {
+        try {
+          new UnixTerminal('/bin/bogus.exe', []);
+          done(new Error('should have failed'));
+        } catch {
+          done();
+        }
+      });
+      it('should handle chdir() errors', (done) => {
+        try {
+          new UnixTerminal('/bin/echo', [], { cwd: '/nowhere' });
+          done(new Error('should have failed'));
+        } catch (e) {
+          assert.strictEqual((e as any).toString(), 'Error: chdir() failed: No such file or directory');
+          done();
+        }
+      });
+      it('should handle setuid() errors', (done) => {
+        try {
+          new UnixTerminal('/bin/echo', [], { uid: 999999 });
+          done(new Error('should have failed'));
+        } catch (e) {
+          assert.strictEqual((e as any).toString(), 'Error: setuid() failed: Operation not permitted');
+          done();
+        }
+      });
+      if (process.platform === 'linux') {
+        it('should not close on exec when closeFDs is not defined', (done) => {
+          const data = `
+          var pty = require('./lib/index');
+          var ptyProcess = pty.spawn('node', ['-e', 'setTimeout(() => console.log("hello from terminal"), 300);']);
+          ptyProcess.on('data', function (data) {
+            console.log(data);
+          });
+          setTimeout(() => null, 500);
+          console.log('ready', ptyProcess.pid);
+          `;
+          const buffer: string[] = [];
+          const readFd = fs.openSync(FIXTURES_PATH, 'r');
+          const p = cp.spawn('node', ['-e', data], {
+            stdio: ['ignore', 'pipe', 'pipe', readFd]
+          });
+          let sub = '';
+          p.stdout!.on('data', (data) => {
+            if (!data.toString().indexOf('ready')) {
+              sub = data.toString().split(' ')[1].slice(0, -1);
+              try {
+                fs.statSync(`/proc/${sub}/fd/${readFd}`);
+              } catch (_) {
+                done('not reachable');
+              }
+              setTimeout(() => {
+                process.kill(parseInt(sub), 'SIGINT');  // SIGINT to child
+                p.kill('SIGINT');                       // SIGINT to parent
+              }, 200);
+            } else {
+              buffer.push(data.toString().replace(/^\s+|\s+$/g, ''));
+            }
+          });
+          p.on('close', () => {
+            done();
+          });
+        });
+        it('should close on exec when closeFDs is true', (done) => {
+          const data = `
+          var pty = require('./lib/index');
+          var ptyProcess = pty.spawn('node', ['-e', 'setTimeout(() => console.log("hello from terminal"), 300);'], {
+            closeFDs: true
+          });
+          ptyProcess.on('data', function (data) {
+            console.log(data);
+          });
+          setTimeout(() => null, 500);
+          console.log('ready', ptyProcess.pid);
+          `;
+          const buffer: string[] = [];
+          const readFd = fs.openSync(FIXTURES_PATH, 'r');
+          const p = cp.spawn('node', ['-e', data], {
+            stdio: ['ignore', 'pipe', 'pipe', readFd]
+          });
+          let sub = '';
+          p.stdout!.on('data', (data) => {
+            if (!data.toString().indexOf('ready')) {
+              sub = data.toString().split(' ')[1].slice(0, -1);
+              try {
+                fs.statSync(`/proc/${sub}/fd/${readFd}`);
+                done('not reachable');
+              } catch (error) {
+                assert.notStrictEqual(error.message.indexOf('ENOENT'), -1);
+              }
+              setTimeout(() => {
+                process.kill(parseInt(sub), 'SIGINT');  // SIGINT to child
+                p.kill('SIGINT');                       // SIGINT to parent
+              }, 200);
+            } else {
+              buffer.push(data.toString().replace(/^\s+|\s+$/g, ''));
+            }
+          });
+          p.on('close', () => {
+            done();
+          });
+        });
+      }
+    });
   });
 }

package/src/unixTerminal.ts

@@ -4,17 +4,21 @@
  * Copyright (c) 2018, Microsoft Corporation (MIT License).
  */
 import * as net from 'net';
+import * as path from 'path';
 import { Terminal, DEFAULT_COLS, DEFAULT_ROWS } from './terminal';
 import { IProcessEnv, IPtyForkOptions, IPtyOpenOptions } from './interfaces';
 import { ArgvOrCommandLine } from './types';
 import { assign } from './utils';
 
 let pty: IUnixNative;
+let helperPath: string;
 try {
   pty = require('../build/Release/pty.node');
+  helperPath = '../build/Release/spawn-helper';
 } catch (outerError) {
   try {
     pty = require('../build/Debug/pty.node');
+    helperPath = '../build/Debug/spawn-helper';
   } catch (innerError) {
     console.error('innerError', innerError);
     // Re-throw the exception from the Release require if the Debug require fails as well
@@ -22,6 +26,10 @@ try {
   }
 }
 
+helperPath = path.resolve(__dirname, helperPath);
+helperPath = helperPath.replace('app.asar', 'app.asar.unpacked');
+helperPath = helperPath.replace('node_modules.asar', 'node_modules.asar.unpacked');
+
 const DEFAULT_FILE = 'sh';
 const DEFAULT_NAME = 'xterm';
 const DESTROY_SOCKET_TIMEOUT_MS = 200;
@@ -36,13 +44,13 @@ export class UnixTerminal extends Terminal {
   protected _readable: boolean;
   protected _writable: boolean;
 
-  private _boundClose: boolean;
-  private _emittedClose: boolean;
-  private _master: net.Socket;
-  private _slave: net.Socket;
+  private _boundClose: boolean = false;
+  private _emittedClose: boolean = false;
+  private _master: net.Socket | undefined;
+  private _slave: net.Socket | undefined;
 
-  public get master(): net.Socket { return this._master; }
-  public get slave(): net.Socket { return this._slave; }
+  public get master(): net.Socket | undefined { return this._master; }
+  public get slave(): net.Socket | undefined { return this._slave; }
 
   constructor(file?: string, args?: ArgvOrCommandLine, opt?: IPtyForkOptions) {
     super(opt);
@@ -59,8 +67,9 @@ export class UnixTerminal extends Terminal {
 
     this._cols = opt.cols || DEFAULT_COLS;
     this._rows = opt.rows || DEFAULT_ROWS;
-    const uid = opt.uid || -1;
-    const gid = opt.gid || -1;
+    const uid = opt.uid ?? -1;
+    const gid = opt.gid ?? -1;
+    const closeFDs = opt.closeFDs || false;
     const env: IProcessEnv = assign({}, opt.env);
 
     if (opt.env === process.env) {
@@ -86,7 +95,7 @@ export class UnixTerminal extends Terminal {
         // From macOS High Sierra 10.13.2 sometimes the socket never gets
         // closed. A timeout is applied here to avoid the terminal never being
         // destroyed when this occurs.
-        let timeout = setTimeout(() => {
+        let timeout: NodeJS.Timeout | null = setTimeout(() => {
           timeout = null;
           // Destroying the socket now will cause the close event to fire
           this._socket.destroy();
@@ -103,7 +112,7 @@ export class UnixTerminal extends Terminal {
     };
 
     // fork
-    const term = pty.fork(file, args, parsedEnv, cwd, this._cols, this._rows, uid, gid, (encoding === 'utf8'), onexit);
+    const term = pty.fork(file, args, parsedEnv, cwd, this._cols, this._rows, uid, gid, (encoding === 'utf8'), closeFDs, onexit, helperPath);
 
     this._socket = new PipeSocket(term.fd);
     if (encoding !== null) {
@@ -169,6 +178,10 @@ export class UnixTerminal extends Terminal {
     this._socket.write(data);
   }
 
+  /* Accessors */
+  get fd(): number { return this._fd; }
+  get ptsName(): string { return this._pty; }
+
   /**
    * openpty
    */
@@ -204,7 +217,7 @@ export class UnixTerminal extends Terminal {
     self._slave.resume();
 
     self._socket = self._master;
-    self._pid = null;
+    self._pid = -1;
     self._fd = term.master;
     self._pty = term.pty;
 

package/src/win/conpty.cc

@@ -289,6 +289,13 @@ static NAN_METHOD(PtyConnect) {
   const v8::Local<v8::Array> envValues = info[3].As<v8::Array>();
   const v8::Local<v8::Function> exitCallback = v8::Local<v8::Function>::Cast(info[4]);
 
+  // Fetch pty handle from ID and start process
+  pty_baton* handle = get_pty_baton(id);
+  if (!handle) {
+    Nan::ThrowError("Invalid pty handle");
+    return;
+  }
+
   // Prepare command line
   std::unique_ptr<wchar_t[]> mutableCommandline = std::make_unique<wchar_t[]>(cmdline.length() + 1);
   HRESULT hr = StringCchCopyW(mutableCommandline.get(), cmdline.length() + 1, cmdline.c_str());
@@ -311,11 +318,8 @@ static NAN_METHOD(PtyConnect) {
   auto envV = vectorFromString(env);
   LPWSTR envArg = envV.empty() ? nullptr : envV.data();
 
-  // Fetch pty handle from ID and start process
-  pty_baton* handle = get_pty_baton(id);
-
-  BOOL success = ConnectNamedPipe(handle->hIn, nullptr);
-  success = ConnectNamedPipe(handle->hOut, nullptr);
+  ConnectNamedPipe(handle->hIn, nullptr);
+  ConnectNamedPipe(handle->hOut, nullptr);
 
   // Attach the pseudoconsole to the client application we're creating
   STARTUPINFOEXW siEx{0};
@@ -396,15 +400,17 @@ static NAN_METHOD(PtyResize) {
 
   const pty_baton* handle = get_pty_baton(id);
 
-  HANDLE hLibrary = LoadLibraryExW(L"kernel32.dll", 0, 0);
-  bool fLoadedDll = hLibrary != nullptr;
-  if (fLoadedDll)
-  {
-    PFNRESIZEPSEUDOCONSOLE const pfnResizePseudoConsole = (PFNRESIZEPSEUDOCONSOLE)GetProcAddress((HMODULE)hLibrary, "ResizePseudoConsole");
-    if (pfnResizePseudoConsole)
+  if (handle != nullptr) {
+    HANDLE hLibrary = LoadLibraryExW(L"kernel32.dll", 0, 0);
+    bool fLoadedDll = hLibrary != nullptr;
+    if (fLoadedDll)
     {
-      COORD size = {cols, rows};
-      pfnResizePseudoConsole(handle->hpc, size);
+      PFNRESIZEPSEUDOCONSOLE const pfnResizePseudoConsole = (PFNRESIZEPSEUDOCONSOLE)GetProcAddress((HMODULE)hLibrary, "ResizePseudoConsole");
+      if (pfnResizePseudoConsole)
+      {
+        COORD size = {cols, rows};
+        pfnResizePseudoConsole(handle->hpc, size);
+      }
     }
   }
 
@@ -424,18 +430,24 @@ static NAN_METHOD(PtyKill) {
 
   const pty_baton* handle = get_pty_baton(id);
 
-  HANDLE hLibrary = LoadLibraryExW(L"kernel32.dll", 0, 0);
-  bool fLoadedDll = hLibrary != nullptr;
-  if (fLoadedDll)
-  {
-    PFNCLOSEPSEUDOCONSOLE const pfnClosePseudoConsole = (PFNCLOSEPSEUDOCONSOLE)GetProcAddress((HMODULE)hLibrary, "ClosePseudoConsole");
-    if (pfnClosePseudoConsole)
+  if (handle != nullptr) {
+    HANDLE hLibrary = LoadLibraryExW(L"kernel32.dll", 0, 0);
+    bool fLoadedDll = hLibrary != nullptr;
+    if (fLoadedDll)
     {
-      pfnClosePseudoConsole(handle->hpc);
+      PFNCLOSEPSEUDOCONSOLE const pfnClosePseudoConsole = (PFNCLOSEPSEUDOCONSOLE)GetProcAddress((HMODULE)hLibrary, "ClosePseudoConsole");
+      if (pfnClosePseudoConsole)
+      {
+        pfnClosePseudoConsole(handle->hpc);
+      }
     }
-  }
 
-  CloseHandle(handle->hShell);
+    DisconnectNamedPipe(handle->hIn);
+    DisconnectNamedPipe(handle->hOut);
+    CloseHandle(handle->hIn);
+    CloseHandle(handle->hOut);
+    CloseHandle(handle->hShell);
+  }
 
   return info.GetReturnValue().SetUndefined();
 }

package/src/win/path_util.cc

@@ -52,7 +52,7 @@ std::wstring get_shell_path(std::wstring filename) {
 
   const wchar_t *filename_ = filename.c_str();
 
-  for (int i = 0; i < paths.size(); ++i) {
+  for (size_t i = 0; i < paths.size(); ++i) {
     std::wstring path = paths[i];
     wchar_t searchPath[MAX_PATH];
     ::PathCombineW(searchPath, const_cast<wchar_t*>(path.c_str()), filename_);

package/src/windowsConoutConnection.ts

@@ -30,7 +30,7 @@ const FLUSH_DATA_INTERVAL = 1000;
  */
 export class ConoutConnection implements IDisposable {
   private _worker: Worker;
-  private _drainTimeout: NodeJS.Timeout;
+  private _drainTimeout: NodeJS.Timeout | undefined;
   private _isDisposed: boolean = false;
 
   private _onReady = new EventEmitter2<void>();
@@ -40,7 +40,8 @@ export class ConoutConnection implements IDisposable {
     private _conoutPipeName: string
   ) {
     const workerData: IWorkerData = { conoutPipeName: _conoutPipeName };
-    this._worker = new Worker(join(__dirname, 'worker/conoutSocketWorker.js'), { workerData });
+    const scriptPath = __dirname.replace('node_modules.asar', 'node_modules.asar.unpacked');
+    this._worker = new Worker(join(scriptPath, 'worker/conoutSocketWorker.js'), { workerData });
     this._worker.on('message', (message: ConoutWorkerMessage) => {
       switch (message) {
         case ConoutWorkerMessage.READY:

package/src/windowsPtyAgent.ts

@@ -29,10 +29,10 @@ const FLUSH_DATA_INTERVAL = 1000;
 export class WindowsPtyAgent {
   private _inSocket: Socket;
   private _outSocket: Socket;
-  private _pid: number;
-  private _innerPid: number;
-  private _innerPidHandle: number;
-  private _closeTimeout: NodeJS.Timer;
+  private _pid: number = 0;
+  private _innerPid: number = 0;
+  private _innerPidHandle: number = 0;
+  private _closeTimeout: NodeJS.Timer | undefined;
   private _exitCode: number | undefined;
   private _conoutSocketWorker: ConoutConnection;
 
@@ -202,7 +202,7 @@ export class WindowsPtyAgent {
     });
   }
 
-  public get exitCode(): number {
+  public get exitCode(): number | undefined {
     if (this._useConpty) {
       return this._exitCode;
     }

package/src/windowsTerminal.test.ts

@@ -65,7 +65,7 @@ function pollForProcessTreeSize(pid: number, size: number, intervalMs: number =
         })[0]);
         const list: IWindowsProcessTreeResult[] = [];
         while (openList.length) {
-          const current = openList.shift();
+          const current = openList.shift()!;
           ps.filter(p => p.ppid === current.pid).map(p => {
             return { name: p.name, pid: p.pid };
           }).forEach(p => openList.push(p));
@@ -81,7 +81,6 @@ function pollForProcessTreeSize(pid: number, size: number, intervalMs: number =
         if (tries * intervalMs >= timeoutMs) {
           clearInterval(interval);
           assert.fail(`Bad process state, expected: ${size}, actual: ${list.length}`);
-          resolve();
         }
       });
     }, intervalMs);
@@ -105,10 +104,10 @@ if (process.platform === 'win32') {
         term.write('notepad.exe\r');
         term.write('node.exe\r');
         pollForProcessTreeSize(term.pid, 4, 500, 5000).then(list => {
-          assert.equal(list[0].name, 'cmd.exe');
-          assert.equal(list[1].name, 'powershell.exe');
-          assert.equal(list[2].name, 'notepad.exe');
-          assert.equal(list[3].name, 'node.exe');
+          assert.strictEqual(list[0].name.toLowerCase(), 'cmd.exe');
+          assert.strictEqual(list[1].name.toLowerCase(), 'powershell.exe');
+          assert.strictEqual(list[2].name.toLowerCase(), 'notepad.exe');
+          assert.strictEqual(list[3].name.toLowerCase(), 'node.exe');
           term.kill();
           const desiredState: IProcessState = {};
           desiredState[list[0].pid] = false;

package/src/windowsTerminal.ts

@@ -147,7 +147,7 @@ export class WindowsTerminal extends Terminal {
     if (cols <= 0 || rows <= 0 || isNaN(cols) || isNaN(rows) || cols === Infinity || rows === Infinity) {
       throw new Error('resizing must be done using positive cols and rows');
     }
-    this._defer(() => {
+    this._deferNoArgs(() => {
       this._agent.resize(cols, rows);
       this._cols = cols;
       this._rows = rows;
@@ -155,13 +155,13 @@ export class WindowsTerminal extends Terminal {
   }
 
   public destroy(): void {
-    this._defer(() => {
+    this._deferNoArgs(() => {
       this.kill();
     });
   }
 
   public kill(signal?: string): void {
-    this._defer(() => {
+    this._deferNoArgs(() => {
       if (signal) {
         throw new Error('Signals not supported on windows.');
       }
@@ -170,7 +170,20 @@ export class WindowsTerminal extends Terminal {
     });
   }
 
-  private _defer<A extends any>(deferredFn: (arg?: A) => void, arg?: A): void {
+  private _deferNoArgs<A>(deferredFn: () => void): void {
+    // If the terminal is ready, execute.
+    if (this._isReady) {
+      deferredFn.call(this);
+      return;
+    }
+
+    // Queue until terminal is ready.
+    this._deferreds.push({
+      run: () => deferredFn.call(this)
+    });
+  }
+
+  private _defer<A>(deferredFn: (arg: A) => void, arg: A): void {
     // If the terminal is ready, execute.
     if (this._isReady) {
       deferredFn.call(this, arg);

package/src/worker/conoutSocketWorker.ts

@@ -14,5 +14,9 @@ conoutSocket.connect(conoutPipeName, () => {
     conoutSocket.pipe(workerSocket);
   });
   server.listen(getWorkerPipeName(conoutPipeName));
+
+  if (!parentPort) {
+    throw new Error('worker_threads parentPort is null');
+  }
   parentPort.postMessage(ConoutWorkerMessage.READY);
 });

package/typings/node-pty.d.ts

@@ -78,11 +78,17 @@ declare module 'node-pty' {
 
   export interface IPtyForkOptions extends IBasePtyForkOptions {
     /**
-     * Security warning: use this option with great caution, as opened file descriptors
-     * with higher privileges might leak to the child program.
+     * Security warning: use this option with great caution unless `closeFDs` is also set,
+     * as opened file descriptors with higher privileges might leak to the child program.
      */
     uid?: number;
     gid?: number;
+
+    /**
+     * Close all open file after spawning the child process (UNIX only).
+     * Carries a performance penalty on Linux.
+     */
+    closeFDs?: boolean;
   }
 
   export interface IWindowsPtyForkOptions extends IBasePtyForkOptions {
@@ -165,7 +171,7 @@ declare module 'node-pty' {
 
     /**
      * Resizes the dimensions of the pty.
-     * @param columns THe number of columns to use.
+     * @param columns The number of columns to use.
      * @param rows The number of rows to use.
      */
     resize(columns: number, rows: number): void;

package/deps/winpty/.gitignore

@@ -1,15 +0,0 @@
-*.sln
-*.suo
-*.vcxproj
-*.vcxproj.filters
-*.pyc
-winpty.sdf
-winpty.opensdf
-/config.mk
-/build
-/build-gyp
-/build-libpty
-/ship/packages
-/src/Default
-/src/Release
-/src/gen

package/deps/winpty/misc/.gitignore

@@ -1,2 +0,0 @@
-*.exe
-UnixEcho

package/scripts/install.js

@@ -1,18 +0,0 @@
-'use strict'
-
-const os = require('os');
-const path = require('path');
-const spawn = require('child_process').spawn;
-
-const gypArgs = ['rebuild'];
-if (process.env.NODE_PTY_DEBUG) {
-  gypArgs.push('--debug');
-}
-const gypProcess = spawn(os.platform() === 'win32' ? 'node-gyp.cmd' : 'node-gyp', gypArgs, {
-  cwd: path.join(__dirname, '..'),
-  stdio: 'inherit'
-});
-
-gypProcess.on('exit', function (code) {
-  process.exit(code);
-});