nodebb-plugin-ezoic-infinite 1.4.10 → 1.4.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "1.4.10",
+  "version": "1.4.12",
   "description": "Production-ready Ezoic infinite ads integration for NodeBB 4.x",
   "main": "library.js",
   "license": "MIT",

package/public/client.js

@@ -14,6 +14,11 @@
 
   const MAX_INSERTS_PER_RUN = 2;
 
+  // IDs ayant été définis par Ezoic au moins une fois dans cette session navigateur.
+  // Survit aux navigations ajaxify (contrairement à state.definedIds remis à zéro dans cleanup).
+  // Nécessaire pour savoir si on doit appeler destroyPlaceholders avant recyclage.
+  const sessionDefinedIds = new Set();
+
   const state = {
     pageKey: null,
     cfg: null,
@@ -126,7 +131,8 @@
     if (!ids || !ids.length) return;
     // Only destroy ids that were actually "defined" (filled at least once) to avoid Ezoic warnings.
     const filtered = ids.filter((id) => {
-      try { return state.definedIds && state.definedIds.has(id); } catch (e) { return true; }
+      // Utiliser sessionDefinedIds (survit aux navigations) plutôt que state.definedIds
+      try { return sessionDefinedIds.has(id); } catch (e) { return true; }
     });
     if (!filtered.length) return;
 
@@ -233,29 +239,42 @@
 
   function patchShowAds() {
     // Minimal safety net: batch showAds can be triggered by other scripts; split into individual calls.
-    try {
-      window.ezstandalone = window.ezstandalone || {};
-      const ez = window.ezstandalone;
-      if (window.__nodebbEzoicPatched) return;
-      if (typeof ez.showAds !== 'function') return;
-
-      window.__nodebbEzoicPatched = true;
-      const orig = ez.showAds;
-
-      ez.showAds = function (arg) {
-        if (Array.isArray(arg)) {
-          const seen = new Set();
-          for (const v of arg) {
-            const id = parseInt(v, 10);
-            if (!Number.isFinite(id) || id <= 0 || seen.has(id)) continue;
-            seen.add(id);
-            try { orig.call(ez, id); } catch (e) {}
+    // Also ensures the patch is applied even if Ezoic loads after our script.
+    const applyPatch = () => {
+      try {
+        window.ezstandalone = window.ezstandalone || {};
+        const ez = window.ezstandalone;
+        if (window.__nodebbEzoicPatched) return;
+        if (typeof ez.showAds !== 'function') return;
+
+        window.__nodebbEzoicPatched = true;
+        const orig = ez.showAds;
+
+        ez.showAds = function (arg) {
+          if (Array.isArray(arg)) {
+            const seen = new Set();
+            for (const v of arg) {
+              const id = parseInt(v, 10);
+              if (!Number.isFinite(id) || id <= 0 || seen.has(id)) continue;
+              seen.add(id);
+              try { orig.call(ez, id); } catch (e) {}
+            }
+            return;
           }
-          return;
-        }
-        return orig.apply(ez, arguments);
-      };
-    } catch (e) {}
+          return orig.apply(ez, arguments);
+        };
+      } catch (e) {}
+    };
+
+    applyPatch();
+    // Si Ezoic n'est pas encore chargé, appliquer le patch via sa cmd queue
+    if (!window.__nodebbEzoicPatched) {
+      try {
+        window.ezstandalone = window.ezstandalone || {};
+        window.ezstandalone.cmd = window.ezstandalone.cmd || [];
+        window.ezstandalone.cmd.push(applyPatch);
+      } catch (e) {}
+    }
   }
 
 
@@ -280,13 +299,13 @@
       // Already filled?
       if (ph.childNodes && ph.childNodes.length > 0) {
         markFilled(wrap);
-        state.definedIds && state.definedIds.add(id);
+        state.definedIds && state.definedIds.add(id); sessionDefinedIds.add(id);
         return;
       }
       const obs = new MutationObserver(() => {
         if (ph.childNodes && ph.childNodes.length > 0) {
           markFilled(wrap);
-          try { state.definedIds && state.definedIds.add(id); } catch (e) {}
+          try { state.definedIds && state.definedIds.add(id); sessionDefinedIds.add(id); } catch (e) {}
           try { obs.disconnect(); } catch (e) {}
         }
       });
@@ -305,7 +324,7 @@
 
     const filled = !!(ph.childNodes && ph.childNodes.length > 0);
     if (filled) {
-      try { state.definedIds && state.definedIds.add(id); } catch (e) {}
+      try { state.definedIds && state.definedIds.add(id); sessionDefinedIds.add(id); } catch (e) {}
       try { markFilled(wrap); } catch (e) {}
     }
     return filled;
@@ -347,7 +366,10 @@
         resetPlaceholderInWrap(wrapNow, id);
         attachFillObserver(wrapNow, id);
       }
-      callShowAdsWhenReady(id);
+      // Ne pas appeler showAds si un autre appel est déjà en cours pour cet ID
+      if (!state.pendingById.has(id)) {
+        callShowAdsWhenReady(id);
+      }
       setTimeout(step, 1100);
     };
 
@@ -415,12 +437,13 @@
     (function waitForPh() {
       // Abort if the user navigated away since this showAds was scheduled
       if (state.pageKey !== startPageKey) return;
+      // Abort if another concurrent call is already handling this id
+      if (state.pendingById.has(id)) return;
       attempts += 1;
       const el = document.getElementById(phId);
       if (el && el.isConnected) {
         if (doCall()) return;
 
-        if (state.pendingById.has(id)) return;
         state.pendingById.add(id);
 
         window.ezstandalone = window.ezstandalone || {};
@@ -525,7 +548,7 @@
       let wrap = null;
       if (pick.recycled && pick.recycled.wrap) {
         // Only destroy if Ezoic has actually defined this placeholder before
-        if (state.definedIds && state.definedIds.has(id)) {
+        if (sessionDefinedIds.has(id)) {
           destroyPlaceholderIds([id]);
         }
         // Remove the old wrapper entirely, then create a fresh wrapper at the new position (same id)
@@ -534,7 +557,8 @@
         try { oldWrap && oldWrap.remove(); } catch (e) {}
         wrap = insertAfter(el, id, kindClass, afterPos);
         if (!wrap) continue;
-        setTimeout(() => { enqueueRetry(id); }, 450);
+        // Attendre 1500ms après destroy pour laisser Ezoic finir son cleanup interne
+        setTimeout(() => { enqueueRetry(id); }, 1500);
       } else {
         usedSet.add(id);
         wrap = insertAfter(el, id, kindClass, afterPos);