nodebb-plugin-ezoic-infinite 1.8.1 → 1.8.3

package/package.json

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

package/public/client.js

@@ -80,17 +80,19 @@
   // Tunables (stables en prod)
   const MIN_PRUNE_AGE_MS  = 8_000;   // délai de grâce avant pruning (stabilisation DOM)
   const MAX_INSERTS_RUN   = 10;      // plus réactif si NodeBB injecte en rafale
-  const MAX_INFLIGHT      = 2;       // max showAds() simultanés (garde-fou)
+  const MAX_INFLIGHT      = 4;       // max showAds() simultanés (garde-fou)
   const MAX_SHOW_BATCH    = 4;       // ids max par appel showAds(...ids)
-  const SHOW_THROTTLE_MS  = 500;     // anti-spam showAds() par id (plus réactif)
-  const SHOW_RELEASE_MS   = 300;     // relâche inflight après showAds() batché
+  const SHOW_THROTTLE_MS  = 600;     // anti-spam showAds() par id (plus réactif)
+  const SHOW_RELEASE_MS   = 700;     // relâche inflight après showAds() batché
   const SHOW_FAILSAFE_MS  = 7000;    // relâche forcée si stack pub lente
-  const BATCH_FLUSH_MS    = 30;      // micro-buffer pour regrouper les ids proches
-  const BURST_COOLDOWN_MS = 100;     // délai min entre deux déclenchements de burst
+  const BATCH_FLUSH_MS    = 40;      // micro-buffer pour regrouper les ids proches
+  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
 
   // Marges IO larges et fixes — observer créé une seule fois au boot
-  const IO_MARGIN_DESKTOP = '3000px 0px 3000px 0px';
-  const IO_MARGIN_MOBILE  = '2000px 0px 2000px 0px';
+  const IO_MARGIN_DESKTOP = '2500px 0px 2500px 0px';
+  const IO_MARGIN_MOBILE  = '3500px 0px 3500px 0px';
 
   const SEL = {
     post:     '[component="post"][data-pid]',
@@ -131,9 +133,13 @@
     pending:      [],    // ids en attente de slot inflight
     pendingSet:   new Set(),
     showBatchTimer: 0,
+    destroyBatchTimer: 0,
+    destroyPending: [],
+    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,
@@ -197,15 +203,60 @@
     S.mutGuard++;
     try { fn(); } finally { S.mutGuard--; }
   }
+function scheduleDestroyFlush() {
+  if (S.destroyBatchTimer) return;
+  S.destroyBatchTimer = setTimeout(() => {
+    S.destroyBatchTimer = 0;
+    flushDestroyBatch();
+  }, DESTROY_FLUSH_MS);
+}
+
+function flushDestroyBatch() {
+  if (!S.destroyPending.length) return;
+  const ids = [];
+  while (S.destroyPending.length && ids.length < MAX_DESTROY_BATCH) {
+    const id = S.destroyPending.shift();
+    S.destroyPendingSet.delete(id);
+    if (!Number.isFinite(id) || id <= 0) continue;
+    ids.push(id);
+  }
+  if (ids.length) {
+    try {
+      const ez = window.ezstandalone;
+      const run = () => { try { ez?.destroyPlaceholders?.(ids); } catch (_) {} };
+      try { (typeof ez?.cmd?.push === 'function') ? ez.cmd.push(run) : run(); } catch (_) {}
+    } catch (_) {}
+  }
+  if (S.destroyPending.length) scheduleDestroyFlush();
+}
+
 function destroyEzoicId(id) {
   if (!Number.isFinite(id) || id <= 0) return;
   if (!S.ezActiveIds.has(id)) return;
-  try {
-    const ez = window.ezstandalone;
-    const run = () => { try { ez?.destroyPlaceholders?.([id]); } catch (_) {} };
-    try { (typeof ez?.cmd?.push === 'function') ? ez.cmd.push(run) : run(); } catch (_) {}
-  } catch (_) {}
   S.ezActiveIds.delete(id);
+  if (!S.destroyPendingSet.has(id)) {
+    S.destroyPending.push(id);
+    S.destroyPendingSet.add(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;
 }
 
 
@@ -452,14 +503,15 @@ function recycleAndMove(klass, targetEl, newKey) {
   S.wrapByKey.set(newKey, best);
 
   const doDestroy = () => {
-    if (S.ezActiveIds.has(id)) {
+    if (S.ezShownSinceDestroy.has(id)) {
       try { ez.destroyPlaceholders([id]); } catch (_) {}
-      S.ezActiveIds.delete(id);
+      S.ezShownSinceDestroy.delete(id);
     }
-    setTimeout(doDefine, 300);
+    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 };
@@ -500,7 +552,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();
@@ -694,9 +746,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);
       };
@@ -839,10 +894,14 @@ function startShowBatch(ids) {
     S.lastShow.clear();
     S.wrapByKey.clear();
     S.ezActiveIds.clear();
+    S.ezShownSinceDestroy.clear();
     S.inflight     = 0;
     S.pending      = [];
     S.pendingSet.clear();
     if (S.showBatchTimer) { clearTimeout(S.showBatchTimer); S.showBatchTimer = 0; }
+    if (S.destroyBatchTimer) { clearTimeout(S.destroyBatchTimer); S.destroyBatchTimer = 0; }
+    S.destroyPending = [];
+    S.destroyPendingSet.clear();
     S.burstActive  = false;
     S.runQueued    = false;
     S.sweepQueued   = false;