Fix redable stream 'end' event emitting and object lost on net socket.

src/iotjs.cpp

@@ -31,12 +31,15 @@ namespace iotjs {
 
 static bool InitJerry() {
 
+  uint32_t jerry_flag = JERRY_FLAG_ABORT_ON_FAIL;
+
 #ifdef ENABLE_JERRY_MEM_STATS
-  jerry_init(JERRY_FLAG_MEM_STATS | JERRY_FLAG_SHOW_OPCODES);
-#else
-  jerry_init(JERRY_FLAG_EMPTY);
+  jerry_flag |= JERRY_FLAG_MEM_STATS;
+  jerry_flag |= JERRY_FLAG_SHOW_OPCODES;
 #endif
 
+  jerry_init(jerry_flag);
+
   InitJerryMagicStringEx();
 
   if (!jerry_parse("", 0)) {

src/js/net.js

@@ -163,6 +163,12 @@ Socket.prototype._onread = function(nread, isEOF, buffer) {
 
 Socket.prototype._onclose = function() {
   this.emit('close');
+
+  if (this.server) {
+    var sockets = this.server._sockets;
+    var idx = sockets.indexOf(this);
+    delete sockets[idx];
+  }
 };
 
 
@@ -258,6 +264,7 @@ function Server(options, connectionListener) {
   }
 
   this._handle = null;
+  this._sockets = [];
 }
 
 // Server inherits EventEmitter.
@@ -359,6 +366,8 @@ Server.prototype._onconnection = function(status, clientHandle) {
   socket.server = this;
   onSocketConnect(socket);
 
+  this._sockets.push(socket);
+
   this.emit('connection', socket);
 };
 

src/js/stream_readable.js

@@ -198,9 +198,7 @@ function emitEnd(stream) {
 
   if (!state.endEmitted) {
     state.endEmitted = true;
-    process.nextTick(function(){
-      stream.emit('end');
-    })
+    stream.emit('end');
   }
 };
 
@@ -223,10 +221,11 @@ function emitError(stream, er) {
 function onEof(stream) {
   var state = stream._readableState;
 
-  if (state.ended) {
-    return;
-  }
   state.ended = true;
+
+  if (state.length == 0) {
+    emitEnd(stream);
+  }
 };
 
 

test/run_pass/test_stream.js

@@ -31,6 +31,10 @@ readable.on('data', function(data) {
   d += data.toString();
 });
 
+readable.on('end', function() {
+  e += 'e';
+});
+
 
 readable.pause();
 readable.push('abcde');
@@ -66,8 +70,8 @@ assert.equal(e, '');
 
 readable.push(null);
 assert.equal(d, 'abcde12345a1b2c3d4');
-assert.equal(e, '');
+assert.equal(e, 'e');
 
 readable.push('push after eof');
 assert.equal(d, 'abcde12345a1b2c3d4');
-assert.equal(e, '.');
+assert.equal(e, 'e.');