Update with Node

.gitignore

@@ -17,4 +17,5 @@ Makefile.gyp
 *.filters
 *.user
 *.project
-test.js
+.idea
+test.js

lib/pty.js

@@ -5,9 +5,11 @@
  */
 
 var extend = require('extend');
+var EventEmitter = require('events').EventEmitter;
 var pty = require('../build/Release/pty.node');
 var net = require('net');
 var tty = require('tty');
+var nextTick = global.setImmediate || process.nextTick;
 
 var version = process.versions.node.split('.').map(function(n) {
   return +(n + '').split('-')[0];
@@ -37,6 +39,8 @@ function Terminal(file, args, opt) {
     , name
     , cols
     , rows
+    , uid
+    , gid
     , term;
 
   // backward compatibility
@@ -50,6 +54,9 @@ function Terminal(file, args, opt) {
     args = [];
   }
 
+  // for 'close'
+  this._internalee = new EventEmitter;
+
   // arguments
   args = args || [];
   file = file || 'sh';
@@ -58,6 +65,9 @@ function Terminal(file, args, opt) {
   cols = opt.cols || 80;
   rows = opt.rows || 24;
 
+  uid = opt.uid != null ? opt.uid : -1;
+  gid = opt.gid != null ? opt.gid : -1;
+
   opt.env = opt.env || process.env;
   env = extend({}, opt.env);
 
@@ -88,19 +98,35 @@ function Terminal(file, args, opt) {
   cwd = opt.cwd || process.cwd();
   name = opt.name || env.TERM || 'xterm';
   env.TERM = name;
-  env.LINES = rows + '';
-  env.COLUMNS = cols + '';
+  // XXX Shouldn't be necessary:
+  // env.LINES = rows + '';
+  // env.COLUMNS = cols + '';
 
   env = environ(env);
 
+  function onexit(code, signal) {
+    // XXX Sometimes a data event is emitted
+    // after exit. Wait til socket is destroyed.
+    if (!self._emittedClose) {
+      if (self._boundClose) return;
+      self._boundClose = true;
+      self.once('close', function() {
+        self.emit('exit', code, signal);
+      });
+      return;
+    }
+    self.emit('exit', code, signal);
+  }
+
   // fork
-  term = opt.uid && opt.gid
-    ? pty.fork(file, args, env, cwd, cols, rows, opt.uid, opt.gid)
-    : pty.fork(file, args, env, cwd, cols, rows);
+  term = pty.fork(file, args, env, cwd, cols, rows, uid, gid, onexit);
 
   this.socket = TTYStream(term.fd);
   this.socket.setEncoding('utf8');
-  this.socket.resume();
+
+  if (opt.resume !== false) {
+    this.socket.resume();
+  }
 
   // setup
   this.socket.on('error', function(err) {
@@ -112,10 +138,10 @@ function Terminal(file, args, opt) {
     // close
     self._close();
     // EIO on exit from fs.ReadStream:
-    if (!self._emittedExit) {
-      self._emittedExit = true;
+    if (!self._emittedClose) {
+      self._emittedClose = true;
       Terminal.total--;
-      self.emit('exit', null);
+      self.emit('close');
     }
 
     // EIO, happens when someone closes our child
@@ -146,13 +172,13 @@ function Terminal(file, args, opt) {
   this.writable = true;
 
   Terminal.total++;
-  // XXX This never gets emitted with v0.12.0
+
   this.socket.on('close', function() {
-    if (self._emittedExit) return;
-    self._emittedExit = true;
+    if (self._emittedClose) return;
+    self._emittedClose = true;
     Terminal.total--;
     self._close();
-    self.emit('exit', null);
+    self.emit('close');
   });
 
   env = null;
@@ -268,11 +294,18 @@ Terminal.prototype.setEncoding = function(enc) {
 
 Terminal.prototype.addListener =
 Terminal.prototype.on = function(type, func) {
+  if (type === 'close') {
+    this._internalee.on('close', func);
+    return this;
+  }
   this.socket.on(type, func);
   return this;
 };
 
-Terminal.prototype.emit = function() {
+Terminal.prototype.emit = function(evt) {
+  if (evt === 'close') {
+    return this._internalee.emit.apply(this._internalee, arguments);
+  }
   return this.socket.emit.apply(this.socket, arguments);
 };
 

package.json

@@ -2,7 +2,8 @@
   "name": "pty.js",
   "description": "Pseudo terminals for node.",
   "author": "Christopher Jeffrey",
-  "version": "0.2.7-1",
+  "version": "0.3.0",
+  "license": "MIT",
   "main": "./index.js",
   "repository": "git://github.com/chjj/pty.js.git",
   "homepage": "https://github.com/chjj/pty.js",
@@ -24,7 +25,7 @@
   ],
   "dependencies": {
     "extend": "~1.2.1",
-    "nan": "^1.8.4"
+    "nan": "2.2.0"
   },
   "devDependencies": {
     "mocha": "~1.17.1"