Merge pull request #3946 from lidel/fix/streams-in-chrome-app-environ…

…ment Add support for Chrome Apps and WebExtensions
hapijs · Sep 13, 2019 · b3535a4 · b3535a4
2 parents f55b27e + 0d73f8d
commit b3535a4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/lib/response.js b/lib/response.js
@@ -98,7 +98,7 @@ exports = module.exports = internals.Response = class {
             this.variety = 'buffer';
             this._contentType = 'application/octet-stream';
         }
-        else if (source instanceof Stream) {
+        else if (Streams.isReadableStream(source)) {
             this.variety = 'stream';
             this._contentType = 'application/octet-stream';
         }
@@ -529,7 +529,7 @@ exports = module.exports = internals.Response = class {
 
         // Stream source
 
-        if (source instanceof Stream) {
+        if (Streams.isStream(source)) {
             if (typeof source._read !== 'function') {
                 throw Boom.badImplementation('Stream must have a readable interface');
             }
@@ -607,7 +607,7 @@ exports = module.exports = internals.Response = class {
         }
 
         const stream = this._payload || this.source;
-        if (stream instanceof Stream) {
+        if (Streams.isReadableStream(stream)) {
             internals.Response.drain(stream);
         }
     }

diff --git a/lib/streams.js b/lib/streams.js
@@ -7,6 +7,20 @@ const internals = {
     team: Symbol('team')
 };
 
+exports.isStream = function (stream) {
+
+    return stream !== null &&
+    typeof stream === 'object' &&
+    typeof stream.pipe === 'function';
+};
+
+exports.isReadableStream = function (stream) {
+
+    return exports.isStream(stream) &&
+    stream.readable !== false &&
+    typeof stream._read === 'function' &&
+    typeof stream._readableState === 'object';
+};
 
 exports.drain = function (stream) {