node-pty 1.1.0-beta3 → 1.1.0-beta31

package/src/unixTerminal.test.ts

@@ -272,10 +272,9 @@ if (process.platform !== 'win32') {
           ptyProcess.on('data', function (data) {
             if (ptyProcess.process === 'Python') {
               console.log('title', ptyProcess.process);
+              console.log('ready', ptyProcess.pid);
             }
           });
-          setTimeout(() => null, 500);
-          console.log('ready', ptyProcess.pid);
           `;
           const p = cp.spawn('node', ['-e', data]);
           let sub = '';
@@ -283,12 +282,10 @@ if (process.platform !== 'win32') {
           p.stdout.on('data', (data) => {
             if (!data.toString().indexOf('title')) {
               sub = data.toString().split(' ')[1].slice(0, -1);
-              setTimeout(() => {
-                process.kill(parseInt(pid), 'SIGINT');
-                p.kill('SIGINT');
-              }, 200);
             } else if (!data.toString().indexOf('ready')) {
               pid = data.toString().split(' ')[1].slice(0, -1);
+              process.kill(parseInt(pid), 'SIGINT');
+              p.kill('SIGINT');
             }
           });
           p.on('exit', () => {

package/src/unixTerminal.ts

@@ -5,6 +5,7 @@
  */
 import * as net from 'net';
 import * as path from 'path';
+import * as tty from 'tty';
 import { Terminal, DEFAULT_COLS, DEFAULT_ROWS } from './terminal';
 import { IProcessEnv, IPtyForkOptions, IPtyOpenOptions } from './interfaces';
 import { ArgvOrCommandLine } from './types';
@@ -113,7 +114,7 @@ export class UnixTerminal extends Terminal {
     // fork
     const term = pty.fork(file, args, parsedEnv, cwd, this._cols, this._rows, uid, gid, (encoding === 'utf8'), helperPath, onexit);
 
-    this._socket = new PipeSocket(term.fd);
+    this._socket = new tty.ReadStream(term.fd);
     if (encoding !== null) {
       this._socket.setEncoding(encoding);
     }
@@ -203,13 +204,13 @@ export class UnixTerminal extends Terminal {
     // open
     const term: IUnixOpenProcess = pty.open(cols, rows);
 
-    self._master = new PipeSocket(<number>term.master);
+    self._master = new tty.ReadStream(term.master);
     if (encoding !== null) {
       self._master.setEncoding(encoding);
     }
     self._master.resume();
 
-    self._slave = new PipeSocket(term.slave);
+    self._slave = new tty.ReadStream(term.slave);
     if (encoding !== null) {
       self._slave.setEncoding(encoding);
     }
@@ -304,18 +305,3 @@ export class UnixTerminal extends Terminal {
     delete env['LINES'];
   }
 }
-
-/**
- * Wraps net.Socket to force the handle type "PIPE" by temporarily overwriting
- * tty_wrap.guessHandleType.
- * See: https://github.com/chjj/pty.js/issues/103
- */
-class PipeSocket extends net.Socket {
-  constructor(fd: number) {
-    const pipeWrap = (<any>process).binding('pipe_wrap'); // tslint:disable-line
-    // @types/node has fd as string? https://github.com/DefinitelyTyped/DefinitelyTyped/pull/18275
-    const handle = new pipeWrap.Pipe(pipeWrap.constants.SOCKET);
-    handle.open(fd);
-    super(<any>{ handle });
-  }
-}