End asyncStream later in the process (before piping)

zalando · Sep 21, 2017 · a1fb334 · a1fb334
1 parent 2eba01e
commit a1fb334
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/request-handler.js b/lib/request-handler.js
@@ -78,6 +78,10 @@ module.exports = function processRequest(options, request, response) {
     } = options;
 
     const asyncStream = new AsyncStream();
+    asyncStream.once('plugged', () => {
+        asyncStream.end();
+    });
+
     const contextPromise = fetchContext(request).catch(err => {
         this.emit('context:error', request, err);
         return {};
@@ -195,9 +199,6 @@ module.exports = function processRequest(options, request, response) {
             });
 
             resultStream.once('finish', () => {
-                // Flush the async stream only after stringifer stream is finished
-                // This guarentees the async fragments are flushed to the client at last
-                asyncStream.end();
                 const statusCode = response.statusCode || 200;
                 if (shouldWriteHead) {
                     shouldWriteHead = false;

diff --git a/lib/streams/stringifier-stream.js b/lib/streams/stringifier-stream.js
@@ -22,6 +22,8 @@ module.exports = class StringifierStream extends stream.Transform {
         }
         let st = this.queue.shift();
         if (st instanceof stream) {
+            st.emit('plugged');
+
             st.setMaxListeners(st.getMaxListeners() + 1);
             this.isBusy = true;