Better cleanup

hgranlund · Mar 26, 2020 · 5e346fc · 5e346fc
1 parent 633ea50
commit 5e346fc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jetsons",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Stringifies objects as a Readable stream in a JSON.stringify fashion",
   "main": "src/index.js",
   "scripts": {

diff --git a/src/stackElements.js b/src/stackElements.js
@@ -206,10 +206,16 @@ class StreamStackElement extends StackElement {
 
   untilReadable() {
     let eventListener = null;
+    let cleanUpReject = () => { };
     const promise = new Promise((resolve, reject) => {
+      cleanUpReject = () => {
+        if (this._rejections.has(reject)) {
+          this._rejections.delete(reject)
+        }
+      };
       eventListener = () => {
         this._state = states.readable;
-        this._rejections.delete(reject);
+        cleanUpReject();
         eventListener = null;
         resolve();
       };
@@ -218,6 +224,7 @@ class StreamStackElement extends StackElement {
     });
 
     const cleanup = () => {
+      cleanUpReject();
       if (eventListener == null) return;
       this._value.removeListener('readable', eventListener);
     };
@@ -227,11 +234,16 @@ class StreamStackElement extends StackElement {
 
   untilEnd() {
     let eventListener = null;
-
+    let cleanUpReject = () => { };
     const promise = new Promise((resolve, reject) => {
+      cleanUpReject = () => {
+        if (this._rejections.has(reject)) {
+          this._rejections.delete(reject)
+        }
+      };
       eventListener = () => {
         this._state = states.ended;
-        this._rejections.delete(reject);
+        cleanUpReject();
         eventListener = null;
         resolve();
       };
@@ -240,6 +252,7 @@ class StreamStackElement extends StackElement {
     });
 
     const cleanup = () => {
+      cleanUpReject();
       if (eventListener == null) return;
       this._value.removeListener('end', eventListener);
     };