Make sure SSEResponse end() resolves after calling res.end()

ottomata · ottomata · commit 7f55e2d074f3 · 2020-03-19T11:04:33.000-04:00
The res.end callback was not always being called.  It should be enough
to end the response and resolve now, no need to for the caller
to wait for res.end() to fire its callback.

This was causing dependent Promises in KafkaSSE to wait indefinetly
when disconnecting.
diff --git a/lib/SSEResponse.js b/lib/SSEResponse.js
@@ -135,35 +135,32 @@ class SSEResponse {
 
 
     /**
-     * Ends the response.
+     * Ends the HTTP response.
      */
     end() {
         if (!this.res) {
             return P.resolve();
         }
+
         if (this._resFinished()) {
             delete this.res;
             return P.resolve();
         }
+
+        const res = this.res;
+        delete this.res;
+
         return new P((resolve, reject) => {
-            const res = this.res;
-            if (this._resFinished()) {
-                delete this.res;
-                return resolve();
-            }
-            delete this.res;
-            res.on('error', reject);
+            res.once('error', reject);
             try {
-                if (res.end(resolve) === false) {
-                    resolve();
-                }
+                res.end();
+                resolve();
             } catch(e) {
                 reject(e);
             }
         });
     }
 
-
     _resFinished() {
         const res = this.res;
         if (!res || res.finished || (res.connection && res.connection.destroyed)) {
