node-pty 0.11.0-beta1 → 0.11.0-beta13

package/src/windowsConoutConnection.ts

@@ -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

@@ -4,6 +4,7 @@
  * Copyright (c) 2018, Microsoft Corporation (MIT License).
  */
 
+import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
 import { Socket } from 'net';
@@ -126,9 +127,13 @@ export class WindowsPtyAgent {
       this._outSocket.emit('ready_datapipe');
     });
 
-    this._inSocket = new Socket();
+    const inSocketFD = fs.openSync(term.conin, 'w');
+    this._inSocket = new Socket({
+      fd: inSocketFD,
+      readable: false,
+      writable: true
+    });
     this._inSocket.setEncoding('utf8');
-    this._inSocket.connect(term.conin);
 
     if (this._useConpty) {
       const connect = (this._ptyNative as IConptyNative).connect(this._pty, commandLine, cwd, env, c => this._$onProcessExit(c));

package/src/windowsTerminal.test.ts

@@ -201,5 +201,15 @@ if (process.platform === 'win32') {
         });
       });
     });
+
+    describe('winpty', () => {
+      it('should accept input', (done) => {
+        const term = new WindowsTerminal('cmd.exe', '', { useConpty: false });
+        term.write('exit\r');
+        term.on('exit', () => {
+          done();
+        });
+      });
+    });
   });
 }

package/typings/node-pty.d.ts

@@ -42,7 +42,7 @@ declare module 'node-pty' {
     /**
      * Environment to be set for the child program.
      */
-    env?: { [key: string]: string };
+    env?: { [key: string]: string | undefined };
 
     /**
      * String encoding of the underlying pty.
@@ -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 {