@scarlett-player/core 0.5.0 → 0.5.2

package/dist/index.js

@@ -9,8 +9,19 @@ function setCurrentEffect(effect2) {
 function getCurrentEffect() {
   return effectContext.current;
 }
+const effectCleanups = /* @__PURE__ */ new WeakMap();
+function trackEffectSubscription(effectFn, unsubscribe) {
+  let cleanups = effectCleanups.get(effectFn);
+  if (!cleanups) {
+    cleanups = /* @__PURE__ */ new Set();
+    effectCleanups.set(effectFn, cleanups);
+  }
+  cleanups.add(unsubscribe);
+}
 function effect(fn) {
+  let disposed = false;
   const execute = () => {
+    if (disposed) return;
     setCurrentEffect(execute);
     try {
       fn();
@@ -23,6 +34,13 @@ function effect(fn) {
   };
   execute();
   return () => {
+    disposed = true;
+    const cleanups = effectCleanups.get(execute);
+    if (cleanups) {
+      cleanups.forEach((unsub) => unsub());
+      cleanups.clear();
+      effectCleanups.delete(execute);
+    }
   };
 }
 class Signal {
@@ -37,7 +55,9 @@ class Signal {
    */
   get() {
     if (currentEffect) {
-      this.subscribers.add(currentEffect);
+      const effect2 = currentEffect;
+      this.subscribers.add(effect2);
+      trackEffectSubscription(effect2, () => this.subscribers.delete(effect2));
     }
     return this.value;
   }
@@ -135,7 +155,9 @@ class Computed {
       }
     }
     if (currentEffect) {
-      this.subscribers.add(currentEffect);
+      const effect2 = currentEffect;
+      this.subscribers.add(effect2);
+      trackEffectSubscription(effect2, () => this.subscribers.delete(effect2));
     }
     return this.value;
   }
@@ -1604,6 +1626,7 @@ class ScarlettPlayer {
     this.destroyed = false;
     this.seekingWhilePlaying = false;
     this.seekResumeTimeout = null;
+    this.loadGeneration = 0;
     if (typeof options.container === "string") {
       const el = document.querySelector(options.container);
       if (!el || !(el instanceof HTMLElement)) {
@@ -1677,6 +1700,7 @@ class ScarlettPlayer {
    */
   async load(source) {
     this.checkDestroyed();
+    const generation = ++this.loadGeneration;
     try {
       this.logger.info("Loading source", { source });
       this.stateManager.update({
@@ -1695,6 +1719,10 @@ class ScarlettPlayer {
         await this.pluginManager.destroyPlugin(previousProviderId);
         this._currentProvider = null;
       }
+      if (generation !== this.loadGeneration) {
+        this.logger.info("Load superseded by newer load call", { source });
+        return;
+      }
       const provider = this.pluginManager.selectProvider(source);
       if (!provider) {
         this.errorHandler.throw(
@@ -1710,18 +1738,28 @@ class ScarlettPlayer {
       this._currentProvider = provider;
       this.logger.info("Provider selected", { provider: provider.id });
       await this.pluginManager.initPlugin(provider.id);
+      if (generation !== this.loadGeneration) {
+        this.logger.info("Load superseded by newer load call", { source });
+        return;
+      }
       this.stateManager.set("source", { src: source, type: this.detectMimeType(source) });
       if (typeof provider.loadSource === "function") {
         await provider.loadSource(source);
       }
+      if (generation !== this.loadGeneration) {
+        this.logger.info("Load superseded by newer load call", { source });
+        return;
+      }
       if (this.stateManager.getValue("autoplay")) {
         await this.play();
       }
     } catch (error) {
-      this.errorHandler.handle(error, {
-        operation: "load",
-        source
-      });
+      if (generation === this.loadGeneration) {
+        this.errorHandler.handle(error, {
+          operation: "load",
+          source
+        });
+      }
     }
   }
   /**