@foblex/flow 19.1.3 → 19.1.4

package/fesm2022/foblex-flow.mjs

@@ -370,7 +370,13 @@ class FChannelHub {
         return result;
     }
     listen(destroyRef, callback) {
-        let current = callback;
+        let tornDown = false;
+        let current = () => {
+            if (tornDown || destroyRef.destroyed) {
+                return;
+            }
+            callback();
+        };
         const cleanups = [];
         const onSubscribes = [];
         const teardownSetters = [];
@@ -384,9 +390,8 @@ class FChannelHub {
             if (res.setTeardown)
                 teardownSetters.push(res.setTeardown);
         }
-        const unsubs = this._channels.map((ch) => ch.listen(() => current()));
+        const unsubs = [];
         let unregisterOnDestroy = null;
-        let tornDown = false;
         const teardown = () => {
             if (tornDown)
                 return;
@@ -400,11 +405,31 @@ class FChannelHub {
             .slice()
             .reverse()
             .forEach((set) => set(teardown));
+        if (destroyRef.destroyed) {
+            teardown();
+            return;
+        }
+        this._channels.forEach((channel) => {
+            unsubs.push(channel.listen(() => {
+                if (tornDown || destroyRef.destroyed) {
+                    return;
+                }
+                current();
+            }));
+        });
+        if (destroyRef.destroyed) {
+            teardown();
+            return;
+        }
+        unregisterOnDestroy = destroyRef.onDestroy(teardown);
         onSubscribes
             .slice()
             .reverse()
-            .forEach((fn) => fn(current));
-        unregisterOnDestroy = destroyRef.onDestroy(teardown);
+            .forEach((fn) => {
+            if (!tornDown && !destroyRef.destroyed) {
+                fn(current);
+            }
+        });
     }
 }