Merge 7a5b2f7 into 6c24e51

strongloop · Sep 1, 2017 · 204c42a · 204c42a
2 parents 6c24e51 + 7a5b2f7
commit 204c42a
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 1 deletion.
diff --git a/lib/http-context.js b/lib/http-context.js
@@ -417,6 +417,10 @@ HttpContext.prototype.respondWithEventStream = function(stream) {
   stream.on('end', function() {
     client.send({event: 'end', data: 'null'});
   });
+
+  client.on('close', function() {
+    stream.destroy();
+  });
 };
 
 /**

diff --git a/test/streams.js b/test/streams.js
@@ -70,7 +70,7 @@ describe('strong-remoting', function() {
 describe('a function returning a ReadableStream', function() {
   var Readable = require('stream').Readable;
   var remotes = RemoteObjects.create();
-  var streamClass, server, app;
+  var streamClass, server, app, streamClosed;
 
   before(function(done) {
     var test = this;
@@ -99,6 +99,22 @@ describe('a function returning a ReadableStream', function() {
       cb(null, rs);
     };
 
+    StreamClass.createInfiniteStream = function createStream(cb) {
+      streamClosed = new Promise(resolve => {
+        const rs = new Readable({
+          objectMode: true,
+          read: function(size) {
+            setTimeout(() => this.push({foo: 'bar'}), 50);
+          },
+          destroy: function(size) {
+            resolve(true);
+          },
+        });
+
+        cb(null, rs);
+      });
+    };
+
     streamClass = new SharedClass('StreamClass', StreamClass);
 
     this.createStreamMethod = streamClass.defineMethod('createStream', {
@@ -121,6 +137,16 @@ describe('a function returning a ReadableStream', function() {
       }],
     });
 
+    streamClass.defineMethod('createInfiniteStream', {
+      isStatic: true,
+      fn: StreamClass.createInfiniteStream,
+      returns: [{
+        arg: 'result',
+        type: 'ReadableStream',
+        json: true,
+      }],
+    });
+
     remotes.addClass(streamClass);
     app.use(remotes.handler('rest'));
   });
@@ -194,6 +220,15 @@ describe('a function returning a ReadableStream', function() {
       });
     });
 
+    it('should close server stream on client disconnect', function(done) {
+      const es = new EventSource(this.url + '/StreamClass/createInfiniteStream');
+
+      es.on('data', function(e) {
+        es.close();
+        streamClosed.then(() => done());
+      });
+    });
+
     after(function() {
       this.server.close();
     });