nodebb-plugin-ezoic-infinite 1.8.2 → 1.8.4

package/package.json

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

package/public/client.js

@@ -89,6 +89,10 @@
   const MAX_DESTROY_BATCH  = 4;       // ids max par destroyPlaceholders(...ids)
   const DESTROY_FLUSH_MS   = 30;      // micro-buffer destroy pour lisser les rafales
   const BURST_COOLDOWN_MS = 120;     // délai min entre deux déclenchements de burst
+  const PAGE_WARMUP_MS     = 700;     // laisse NodeBB rendre le contenu avant les premiers showAds
+  const CONTENT_SETTLE_WINDOW_MS = 350;
+  const CONTENT_SETTLE_MAX_DELAY_MS = 1500;
+  const CONTENT_GROWTH_THRESHOLD_PX = 120;
 
   // Marges IO larges et fixes — observer créé une seule fois au boot
   const IO_MARGIN_DESKTOP = '2500px 0px 2500px 0px';
@@ -138,7 +142,8 @@
     destroyPendingSet: new Set(),
     sweepQueued:  false,
     wrapByKey:    new Map(),  // anchorKey → wrap DOM node
-    ezActiveIds:  new Set(),  // ids déjà passés à showAds/displayMore
+    ezActiveIds:  new Set(),  // ids actifs côté plugin (wrap présent / récemment show)
+    ezShownSinceDestroy: new Set(), // ids déjà show depuis le dernier destroy Ezoic
     scrollDir:    1,          // 1=bas, -1=haut
     scrollSpeed:  0,          // px/s approx (EMA)
     lastScrollY:  0,
@@ -148,6 +153,10 @@
     burstDeadline: 0,
     burstCount:   0,
     lastBurstTs:  0,
+    pageWarmUntil: 0,
+    settleDelaySince: 0,
+    contentSampleH: 0,
+    contentSampleTs: 0,
   };
 
   let blockedUntil = 0;
@@ -240,6 +249,54 @@ function destroyEzoicId(id) {
   scheduleDestroyFlush();
 }
 
+function destroyBeforeReuse(ids) {
+  const out = [];
+  const toDestroy = [];
+  const seen = new Set();
+  for (const raw of (ids || [])) {
+    const id = parseInt(raw, 10);
+    if (!Number.isFinite(id) || id <= 0 || seen.has(id)) continue;
+    seen.add(id);
+    out.push(id);
+    if (S.ezShownSinceDestroy.has(id)) toDestroy.push(id);
+  }
+  if (toDestroy.length) {
+    try { window.ezstandalone?.destroyPlaceholders?.(toDestroy); } catch (_) {}
+    for (const id of toDestroy) S.ezShownSinceDestroy.delete(id);
+  }
+  return out;
+}
+
+
+  function getContentHeight() {
+    try {
+      const c = document.getElementById('content') || document.querySelector('main#panel') || document.body;
+      if (!c) return 0;
+      return Math.max(c.scrollHeight || 0, c.offsetHeight || 0);
+    } catch (_) { return 0; }
+  }
+
+  function getShowSettleDelayMs(now = ts()) {
+    try {
+      if (S.pageWarmUntil && now < S.pageWarmUntil) return Math.max(0, Math.min(120, S.pageWarmUntil - now));
+      const h = getContentHeight();
+      const prevH = S.contentSampleH || 0;
+      const prevTs = S.contentSampleTs || 0;
+      S.contentSampleH = h;
+      S.contentSampleTs = now;
+      if (!prevTs || h <= 0) { S.settleDelaySince = 0; return 0; }
+      const grew = h - prevH;
+      const recent = (now - prevTs) <= CONTENT_SETTLE_WINDOW_MS;
+      if (recent && grew >= CONTENT_GROWTH_THRESHOLD_PX) {
+        if (!S.settleDelaySince) S.settleDelaySince = now;
+        if ((now - S.settleDelaySince) < CONTENT_SETTLE_MAX_DELAY_MS) return CONTENT_SETTLE_WINDOW_MS;
+      } else {
+        S.settleDelaySince = 0;
+      }
+    } catch (_) {}
+    return 0;
+  }
+
 
   // ── Config ─────────────────────────────────────────────────────────────────
 
@@ -484,11 +541,15 @@ function recycleAndMove(klass, targetEl, newKey) {
   S.wrapByKey.set(newKey, best);
 
   const doDestroy = () => {
-    if (S.ezActiveIds.has(id)) destroyEzoicId(id);
+    if (S.ezShownSinceDestroy.has(id)) {
+      try { ez.destroyPlaceholders([id]); } catch (_) {}
+      S.ezShownSinceDestroy.delete(id);
+    }
+    S.ezActiveIds.delete(id);
     setTimeout(doDefine, 330);
   };
   const doDefine  = () => { try { ez.define([id]); } catch (_) {} setTimeout(doDisplay, 300); };
-  const doDisplay = () => { try { ez.displayMore([id]); S.ezActiveIds.add(id); } catch (_) {} };
+  const doDisplay = () => { try { ez.displayMore([id]); S.ezActiveIds.add(id); S.ezShownSinceDestroy.add(id); } catch (_) {} };
   try { (typeof ez.cmd?.push === 'function') ? ez.cmd.push(doDestroy) : doDestroy(); } catch (_) {}
 
   return { id, wrap: best };
@@ -529,7 +590,7 @@ function recycleAndMove(klass, targetEl, newKey) {
       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)) { destroyEzoicId(id); S.mountedIds.delete(id); }
+      if (Number.isFinite(id)) { S.ezActiveIds.delete(id); S.mountedIds.delete(id); }
       const key = w.getAttribute(A_ANCHOR);
       if (key && S.wrapByKey.get(key) === w) S.wrapByKey.delete(key);
       w.remove();
@@ -657,17 +718,19 @@ function enqueueShow(id) {
   scheduleDrainQueue();
 }
 
-function scheduleDrainQueue() {
+function scheduleDrainQueue(delayMs = BATCH_FLUSH_MS) {
   if (isBlocked()) return;
   if (S.showBatchTimer) return;
   S.showBatchTimer = setTimeout(() => {
     S.showBatchTimer = 0;
     drainQueue();
-  }, BATCH_FLUSH_MS);
+  }, Math.max(0, delayMs|0));
 }
 
 function drainQueue() {
   if (isBlocked()) return;
+  const settleDelay = getShowSettleDelayMs();
+  if (settleDelay > 0) { scheduleDrainQueue(Math.max(BATCH_FLUSH_MS, settleDelay)); return; }
   const free = Math.max(0, MAX_INFLIGHT - S.inflight);
   if (!free || !S.pending.length) return;
 
@@ -723,9 +786,12 @@ function startShowBatch(ids) {
       window.ezstandalone = window.ezstandalone || {};
       const ez = window.ezstandalone;
       const doShow = () => {
-        try { ez.showAds(...valid); } catch (_) {}
-        for (const id of valid) {
+        const prepared = destroyBeforeReuse(valid);
+        if (!prepared.length) { setTimeout(() => { clearTimeout(timer); release(); }, SHOW_RELEASE_MS); return; }
+        try { ez.showAds(...prepared); } catch (_) {}
+        for (const id of prepared) {
           S.ezActiveIds.add(id);
+          S.ezShownSinceDestroy.add(id);
         }
         setTimeout(() => { clearTimeout(timer); release(); }, SHOW_RELEASE_MS);
       };
@@ -868,6 +934,7 @@ function startShowBatch(ids) {
     S.lastShow.clear();
     S.wrapByKey.clear();
     S.ezActiveIds.clear();
+    S.ezShownSinceDestroy.clear();
     S.inflight     = 0;
     S.pending      = [];
     S.pendingSet.clear();
@@ -881,6 +948,10 @@ function startShowBatch(ids) {
     S.scrollSpeed  = 0;
     S.lastScrollY  = 0;
     S.lastScrollTs = 0;
+    S.pageWarmUntil = 0;
+    S.settleDelaySince = 0;
+    S.contentSampleH = 0;
+    S.contentSampleTs = 0;
   }
 
   // ── MutationObserver ───────────────────────────────────────────────────────
@@ -986,6 +1057,10 @@ function startShowBatch(ids) {
       S.pageKey    = pageKey();
       blockedUntil = 0;
       muteConsole(); ensureTcfLocator(); warmNetwork();
+      S.pageWarmUntil = ts() + PAGE_WARMUP_MS;
+      S.settleDelaySince = 0;
+      S.contentSampleH = getContentHeight();
+      S.contentSampleTs = ts();
       patchShowAds(); getIO(); ensureDomObserver(); sweepDeadWraps(); requestBurst();
     });
 
@@ -1041,6 +1116,9 @@ function startShowBatch(ids) {
   ensureDomObserver();
   bindNodeBB();
   bindScroll();
+  S.pageWarmUntil = ts() + PAGE_WARMUP_MS;
+  S.contentSampleH = getContentHeight();
+  S.contentSampleTs = ts();
   blockedUntil = 0;
   requestBurst();