nodebb-plugin-ezoic-infinite 1.7.82 → 1.7.83

package/package.json

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

package/public/client.js

@@ -132,6 +132,7 @@
     burstDeadline: 0,
     burstCount:   0,
     lastBurstTs:  0,
+    emptyChecks:   new Map(), // id -> timeout ids[]
   };
 
   let blockedUntil = 0;
@@ -142,6 +143,44 @@
   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 clearEmptyChecks(id) {
+    const timers = S.emptyChecks.get(id);
+    if (!timers) return;
+    for (const t of timers) { try { clearTimeout(t); } catch (_) {} }
+    S.emptyChecks.delete(id);
+  }
+
+  function queueEmptyCheck(id, timerId) {
+    const arr = S.emptyChecks.get(id) || [];
+    arr.push(timerId);
+    S.emptyChecks.set(id, arr);
+  }
+
+  function uncollapseIfFilled(ph) {
+    try {
+      const wrap = ph?.closest?.(`.${WRAP_CLASS}`);
+      if (!wrap) return false;
+      if (!isFilled(ph)) return false;
+      wrap.classList.remove('is-empty');
+      return true;
+    } catch (_) { return false; }
+  }
+
+  function watchPlaceholderFill(ph) {
+    if (!ph || ph.__nbbFillObs) return;
+    try {
+      const obs = new MutationObserver(() => { if (uncollapseIfFilled(ph)) return; });
+      obs.observe(ph, { childList: true, subtree: true, attributes: true });
+      ph.__nbbFillObs = obs;
+    } catch (_) {}
+    uncollapseIfFilled(ph);
+  }
+
+  function unwatchPlaceholderFill(ph) {
+    try { ph?.__nbbFillObs?.disconnect?.(); } catch (_) {}
+    try { if (ph) delete ph.__nbbFillObs; } catch (_) {}
+  }
+
   function mutate(fn) {
     S.mutGuard++;
     try { fn(); } finally { S.mutGuard--; }
@@ -341,13 +380,14 @@
     // Neutraliser l'IO sur ce wrap avant déplacement — évite un showAds
     // parasite si le nœud était encore dans la zone IO_MARGIN.
     try { const ph = best.querySelector(`#${PH_PREFIX}${id}`); if (ph) S.io?.unobserve(ph); } catch (_) {}
+    clearEmptyChecks(id);
     mutate(() => {
       best.setAttribute(A_ANCHOR,  newKey);
       best.setAttribute(A_CREATED, String(ts()));
       best.setAttribute(A_SHOWN,   '0');
       best.classList.remove('is-empty');
       const ph = best.querySelector(`#${PH_PREFIX}${id}`);
-      if (ph) ph.innerHTML = '';
+      if (ph) { ph.innerHTML = ''; watchPlaceholderFill(ph); }
       targetEl.insertAdjacentElement('afterend', best);
     });
     if (oldKey && S.wrapByKey.get(oldKey) === best) S.wrapByKey.delete(oldKey);
@@ -388,15 +428,16 @@
     mutate(() => el.insertAdjacentElement('afterend', w));
     S.mountedIds.add(id);
     S.wrapByKey.set(key, w);
+    try { watchPlaceholderFill(w.querySelector(`#${PH_PREFIX}${id}`)); } catch (_) {}
     return w;
   }
 
   function dropWrap(w) {
     try {
       const ph = w.querySelector(`[id^="${PH_PREFIX}"]`);
-      if (ph instanceof Element) S.io?.unobserve(ph);
+      if (ph instanceof Element) { S.io?.unobserve(ph); unwatchPlaceholderFill(ph); }
       const id = parseInt(w.getAttribute(A_WRAPID), 10);
-      if (Number.isFinite(id)) S.mountedIds.delete(id);
+      if (Number.isFinite(id)) { S.mountedIds.delete(id); clearEmptyChecks(id); }
       const key = w.getAttribute(A_ANCHOR);
       if (key && S.wrapByKey.get(key) === w) S.wrapByKey.delete(key);
       w.remove();
@@ -503,7 +544,9 @@
 
   function observePh(id) {
     const ph = document.getElementById(`${PH_PREFIX}${id}`);
-    if (ph?.isConnected) try { getIO()?.observe(ph); } catch (_) {}
+    if (!ph?.isConnected) return;
+    watchPlaceholderFill(ph);
+    try { getIO()?.observe(ph); } catch (_) {}
   }
 
   function enqueueShow(id) {
@@ -542,6 +585,8 @@
         if (isBlocked()) { clearTimeout(timer); return release(); }
         const ph = document.getElementById(`${PH_PREFIX}${id}`);
         if (!ph?.isConnected || isFilled(ph)) { clearTimeout(timer); return release(); }
+        clearEmptyChecks(id);
+        try { ph.closest?.(`.${WRAP_CLASS}`)?.classList.remove('is-empty'); } catch (_) {}
 
         const t = ts();
         if (t - (S.lastShow.get(id) ?? 0) < SHOW_THROTTLE_MS) { clearTimeout(timer); return release(); }
@@ -562,15 +607,19 @@
   }
 
   function scheduleEmptyCheck(id, showTs) {
-    setTimeout(() => {
+    clearEmptyChecks(id);
+    const delays = [EMPTY_CHECK_MS, EMPTY_CHECK_MS + 5000, EMPTY_CHECK_MS + 15000];
+    const runCheck = () => {
       try {
         const ph   = document.getElementById(`${PH_PREFIX}${id}`);
         const wrap = ph?.closest?.(`.${WRAP_CLASS}`);
         if (!wrap || !ph?.isConnected) return;
         if (parseInt(wrap.getAttribute(A_SHOWN) || '0', 10) > showTs) return;
-        wrap.classList.toggle('is-empty', !isFilled(ph));
+        if (uncollapseIfFilled(ph)) return;
+        wrap.classList.add('is-empty');
       } catch (_) {}
-    }, EMPTY_CHECK_MS);
+    };
+    for (const d of delays) queueEmptyCheck(id, setTimeout(runCheck, d));
   }
 
   // ── Patch Ezoic showAds ────────────────────────────────────────────────────
@@ -700,6 +749,8 @@
     S.inflight     = 0;
     S.pending      = [];
     S.pendingSet.clear();
+    for (const timers of S.emptyChecks.values()) for (const t of timers) { try { clearTimeout(t); } catch (_) {} }
+    S.emptyChecks.clear();
     S.burstActive  = false;
     S.runQueued    = false;
   }

package/public/style.css

@@ -76,3 +76,12 @@
   margin: 0 !important;
   padding: 0 !important;
 }
+
+
+/* Filet de sécurité : si Ezoic a rempli le wrap, annuler le collapse même si .is-empty est resté */
+.nodebb-ezoic-wrap.is-empty:has(iframe, ins, img, video, [data-google-container-id]) {
+  height: auto !important;
+  min-height: 1px !important;
+  max-height: none !important;
+  overflow: visible !important;
+}