nodebb-plugin-ezoic-infinite 1.7.95 → 1.7.97

package/package.json

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

package/public/client.js

@@ -132,8 +132,6 @@
     burstDeadline: 0,
     burstCount:   0,
     lastBurstTs:  0,
-    lastScrollY:  0,
-    scrollDir:    1,     // 1=down, -1=up
   };
 
   let blockedUntil = 0;
@@ -144,6 +142,34 @@
   const normBool  = v  => v === true || v === 'true' || v === 1 || v === '1' || v === 'on';
   const isFilled  = n  => !!(n?.querySelector?.('iframe, ins, img, video, [data-google-container-id]'));
 
+  function ezCmd(fn) {
+    try {
+      window.ezstandalone = window.ezstandalone || {};
+      const ez = window.ezstandalone;
+      if (Array.isArray(ez.cmd)) ez.cmd.push(fn);
+      else fn();
+    } catch (_) {}
+  }
+
+  function destroyPlaceholderIds(ids) {
+    try {
+      const uniq = Array.from(new Set((ids || [])
+        .map(v => parseInt(v, 10))
+        .filter(v => Number.isFinite(v) && v > 0)));
+      if (!uniq.length) return;
+      ezCmd(() => {
+        try {
+          const ez = window.ezstandalone;
+          if (typeof ez?.destroyPlaceholders === 'function') ez.destroyPlaceholders(uniq);
+        } catch (_) {}
+      });
+    } catch (_) {}
+  }
+
+  function placeholderCount(id) {
+    try { return document.querySelectorAll(`#${PH_PREFIX}${id}`).length; } catch (_) { return 0; }
+  }
+
   function mutate(fn) {
     S.mutGuard++;
     try { fn(); } finally { S.mutGuard--; }
@@ -315,49 +341,26 @@
         typeof ez?.define             !== 'function' ||
         typeof ez?.displayMore        !== 'function') return null;
 
-    const vh = window.innerHeight || 800;
-    const targetRect = targetEl?.getBoundingClientRect?.() || { top: vh, bottom: vh };
-
-    // Recyclage bidirectionnel :
-    // - scroll vers le bas  -> recycle préférentiellement des wraps loin au-dessus
-    // - scroll vers le haut -> recycle préférentiellement des wraps loin en-dessous
-    // Fallback sur l'autre côté si aucun candidat.
-    const aboveThreshold = -vh;      // wrap entièrement/suffisamment au-dessus
-    const belowThreshold = vh * 2;   // wrap loin sous le viewport
-
-    let aboveEmpty = null, aboveEmptyBottom = Infinity;
-    let aboveFilled = null, aboveFilledBottom = Infinity;
-    let belowEmpty = null, belowEmptyTop = -Infinity;
-    let belowFilled = null, belowFilledTop = -Infinity;
+    const vh        = window.innerHeight || 800;
+    // Seuil : -1vh (hors viewport visible). On appelle unobserve(ph) juste
+    // après pour neutraliser l'IO — plus de showAds parasite possible.
+    const threshold = -vh;
+    let bestEmpty = null, bestEmptyBottom = Infinity;
+    let bestFilled = null, bestFilledBottom = Infinity;
 
     document.querySelectorAll(`.${WRAP_CLASS}.${klass}`).forEach(wrap => {
       try {
-        if (!wrap?.isConnected) return;
         const rect = wrap.getBoundingClientRect();
-
-        if (rect.bottom < aboveThreshold) {
-          if (!isFilled(wrap)) {
-            if (rect.bottom < aboveEmptyBottom) { aboveEmptyBottom = rect.bottom; aboveEmpty = wrap; }
-          } else {
-            if (rect.bottom < aboveFilledBottom) { aboveFilledBottom = rect.bottom; aboveFilled = wrap; }
-          }
-          return;
-        }
-
-        if (rect.top > belowThreshold) {
-          if (!isFilled(wrap)) {
-            if (rect.top > belowEmptyTop) { belowEmptyTop = rect.top; belowEmpty = wrap; }
-          } else {
-            if (rect.top > belowFilledTop) { belowFilledTop = rect.top; belowFilled = wrap; }
-          }
+        if (rect.bottom > threshold) return;
+        if (!isFilled(wrap)) {
+          if (rect.bottom < bestEmptyBottom) { bestEmptyBottom = rect.bottom; bestEmpty = wrap; }
+        } else {
+          if (rect.bottom < bestFilledBottom) { bestFilledBottom = rect.bottom; bestFilled = wrap; }
         }
       } catch (_) {}
     });
 
-    const preferBelow = (S.scrollDir < 0) || (targetRect.top < vh * 0.5);
-    const pickAbove = () => aboveEmpty ?? aboveFilled;
-    const pickBelow = () => belowEmpty ?? belowFilled;
-    const best = preferBelow ? (pickBelow() ?? pickAbove()) : (pickAbove() ?? pickBelow());
+    const best = bestEmpty ?? bestFilled;
     if (!best) return null;
     const id = parseInt(best.getAttribute(A_WRAPID), 10);
     if (!Number.isFinite(id)) return null;
@@ -421,7 +424,10 @@
       const ph = w.querySelector(`[id^="${PH_PREFIX}"]`);
       if (ph instanceof Element) S.io?.unobserve(ph);
       const id = parseInt(w.getAttribute(A_WRAPID), 10);
-      if (Number.isFinite(id)) S.mountedIds.delete(id);
+      if (Number.isFinite(id)) {
+        destroyPlaceholderIds([id]);
+        S.mountedIds.delete(id);
+      }
       const key = w.getAttribute(A_ANCHOR);
       if (key && S.wrapByKey.get(key) === w) S.wrapByKey.delete(key);
       w.remove();
@@ -567,6 +573,7 @@
         if (isBlocked()) { clearTimeout(timer); return release(); }
         const ph = document.getElementById(`${PH_PREFIX}${id}`);
         if (!ph?.isConnected || isFilled(ph)) { clearTimeout(timer); return release(); }
+        if (placeholderCount(id) !== 1) { clearTimeout(timer); return release(); }
 
         const t = ts();
         if (t - (S.lastShow.get(id) ?? 0) < SHOW_THROTTLE_MS) { clearTimeout(timer); return release(); }
@@ -620,6 +627,7 @@
             const id = parseInt(v, 10);
             if (!Number.isFinite(id) || id <= 0 || seen.has(id)) continue;
             if (!document.getElementById(`${PH_PREFIX}${id}`)?.isConnected) continue;
+            if (placeholderCount(id) !== 1) continue;
             seen.add(id);
             try { orig(id); } catch (_) {}
           }
@@ -714,6 +722,18 @@
 
   function cleanup() {
     blockedUntil = ts() + 1500;
+    try {
+      const ids = Array.from(document.querySelectorAll(`.${WRAP_CLASS}[${A_WRAPID}]`))
+        .map(w => parseInt(w.getAttribute(A_WRAPID), 10))
+        .filter(v => Number.isFinite(v) && v > 0);
+      destroyPlaceholderIds(ids);
+      ezCmd(() => {
+        try {
+          const ez = window.ezstandalone;
+          if (typeof ez?.destroyAll === 'function') ez.destroyAll();
+        } catch (_) {}
+      });
+    } catch (_) {}
     mutate(() => document.querySelectorAll(`.${WRAP_CLASS}`).forEach(dropWrap));
     S.cfg          = null;
     S.poolsReady   = false;
@@ -824,7 +844,9 @@
       S.pageKey    = pageKey();
       blockedUntil = 0;
       muteConsole(); ensureTcfLocator(); warmNetwork();
-      patchShowAds(); getIO(); ensureDomObserver(); requestBurst();
+      patchShowAds(); getIO(); ensureDomObserver();
+      ezCmd(() => { try { window.ezstandalone?.showAds?.(); } catch (_) {} });
+      requestBurst();
     });
 
     const burstEvts = [
@@ -847,12 +869,6 @@
   function bindScroll() {
     let ticking = false;
     window.addEventListener('scroll', () => {
-      try {
-        const y = window.scrollY || window.pageYOffset || 0;
-        const dy = y - (S.lastScrollY || 0);
-        if (Math.abs(dy) > 2) S.scrollDir = dy > 0 ? 1 : -1;
-        S.lastScrollY = y;
-      } catch (_) {}
       if (ticking) return;
       ticking = true;
       requestAnimationFrame(() => { ticking = false; requestBurst(); });
@@ -862,7 +878,6 @@
   // ── Boot ───────────────────────────────────────────────────────────────────
 
   S.pageKey = pageKey();
-  try { S.lastScrollY = window.scrollY || window.pageYOffset || 0; } catch (_) { S.lastScrollY = 0; }
   muteConsole();
   ensureTcfLocator();
   warmNetwork();