nodebb-plugin-ezoic-infinite 1.8.11 → 1.8.13

package/library.js

@@ -71,9 +71,8 @@ async function getSettings() {
 
 async function isUserExcluded(uid, excludedGroups) {
   if (!uid || !excludedGroups.length) return false;
-  const excluded = new Set((excludedGroups || []).map(String));
   const userGroups = await groups.getUserGroups([uid]);
-  return (userGroups[0] || []).some(g => excluded.has(String(g.name)));
+  return (userGroups[0] || []).some(g => excludedGroups.includes(g.name));
 }
 
 // ── Scripts Ezoic ──────────────────────────────────────────────────────────
@@ -114,34 +113,13 @@ plugin.injectEzoicHead = async (data) => {
     const uid      = data.req?.uid ?? 0;
     const excluded = await isUserExcluded(uid, settings.excludedGroups);
     if (!excluded) {
-      const html = data.templateData.customHTML || '';
-      if (!html.includes('data-nbb-ezoic-head="1"')) {
-        data.templateData.customHTML = `<meta data-nbb-ezoic-head="1">` + EZOIC_SCRIPTS + html;
-      }
+      // Préfixer : nos scripts d'abord, puis le customHTML existant de l'admin
+      data.templateData.customHTML = EZOIC_SCRIPTS + (data.templateData.customHTML || '');
     }
   } catch (_) {}
   return data;
 };
 
-
-function publicConfigPayload(settings, excluded) {
-  return {
-    excluded,
-    enableBetweenAds:       settings.enableBetweenAds,
-    showFirstTopicAd:       settings.showFirstTopicAd,
-    placeholderIds:         settings.placeholderIds,
-    intervalPosts:          settings.intervalPosts,
-    enableCategoryAds:      settings.enableCategoryAds,
-    showFirstCategoryAd:    settings.showFirstCategoryAd,
-    categoryPlaceholderIds: settings.categoryPlaceholderIds,
-    intervalCategories:     settings.intervalCategories,
-    enableMessageAds:       settings.enableMessageAds,
-    showFirstMessageAd:     settings.showFirstMessageAd,
-    messagePlaceholderIds:  settings.messagePlaceholderIds,
-    messageIntervalPosts:   settings.messageIntervalPosts,
-  };
-}
-
 plugin.init = async ({ router, middleware }) => {
   async function render(req, res) {
     const settings  = await getSettings();
@@ -161,7 +139,21 @@ plugin.init = async ({ router, middleware }) => {
   router.get('/api/plugins/ezoic-infinite/config', async (req, res) => {
     const settings = await getSettings();
     const excluded = await isUserExcluded(req.uid, settings.excludedGroups);
-    res.json(publicConfigPayload(settings, excluded));
+    res.json({
+      excluded,
+      enableBetweenAds:       settings.enableBetweenAds,
+      showFirstTopicAd:       settings.showFirstTopicAd,
+      placeholderIds:         settings.placeholderIds,
+      intervalPosts:          settings.intervalPosts,
+      enableCategoryAds:      settings.enableCategoryAds,
+      showFirstCategoryAd:    settings.showFirstCategoryAd,
+      categoryPlaceholderIds: settings.categoryPlaceholderIds,
+      intervalCategories:     settings.intervalCategories,
+      enableMessageAds:       settings.enableMessageAds,
+      showFirstMessageAd:     settings.showFirstMessageAd,
+      messagePlaceholderIds:  settings.messagePlaceholderIds,
+      messageIntervalPosts:   settings.messageIntervalPosts,
+    });
   });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "1.8.11",
+  "version": "1.8.13",
   "description": "Production-ready Ezoic infinite ads integration for NodeBB 4.x",
   "main": "library.js",
   "license": "MIT",
@@ -18,4 +18,4 @@
     "compatibility": "^4.0.0"
   },
   "private": false
-}
+}

package/public/client.js

@@ -1,5 +1,5 @@
 /**
- * NodeBB Ezoic Infinite Ads — client.js v52
+ * NodeBB Ezoic Infinite Ads — client.js v36
  *
  * Historique des corrections majeures
  * ────────────────────────────────────
@@ -32,8 +32,6 @@
  *
  * v34  moveDistantWrap — voir v38.
  *
- * v52  Clean architecture interne (modules logiques, cache DOM, bridge Ezoic).
- *
  * v50  Suppression de bindLoginCheck() : NodeBB fait un rechargement complet
  *      après login — filter:middleware.renderHeader re-évalue l'exclusion au
  *      rechargement. Redondant depuis le fix normalizeExcludedGroups (v49).
@@ -151,9 +149,6 @@
     burstDeadline: 0,
     burstCount:   0,
     lastBurstTs:  0,
-    ioViewportMode: isMobile() ? 'm' : 'd',
-    domRev:       0,
-    domCache:     new Map(),
   };
 
   let blockedUntil = 0;
@@ -162,61 +157,7 @@
   const isBlocked = () => ts() < blockedUntil;
   const isMobile  = () => { try { return window.innerWidth < 768; } catch (_) { return false; } };
   const normBool  = v  => v === true || v === 'true' || v === 1 || v === '1' || v === 'on';
-  const DEBUG     = (() => { try { return localStorage.getItem('nbbEzDebug') === '1'; } catch (_) { return false; } })();
-  const dbg = (...a) => { if (DEBUG) { try { console.debug('[nbb-ezoic]', ...a); } catch (_) {} } };
-  const isFilled  = n  => {
-    try {
-      if (!n?.querySelector) return false;
-      if (n.querySelector('iframe, ins, img, video, [data-google-container-id], .ezoic-ad, [id$="__container__"]')) return true;
-      const r = n.getBoundingClientRect?.();
-      return !!(r && r.height > 8);
-    } catch (_) { return false; }
-  };
-
-  const Arch = {
-    cache: {
-      invalidate(reason) {
-        S.domRev++;
-        S.domCache.clear();
-        dbg('dom-cache.invalidate', reason || '');
-      },
-      queryAll(key, selector, mapFn) {
-        const cacheKey = `${S.domRev}:${key}`;
-        if (S.domCache.has(cacheKey)) return S.domCache.get(cacheKey);
-        const arr = Array.from(document.querySelectorAll(selector));
-        const out = typeof mapFn === 'function' ? arr.filter(Boolean).filter(mapFn) : arr;
-        S.domCache.set(cacheKey, out);
-        return out;
-      },
-      get(key, buildFn) {
-        const cacheKey = `${S.domRev}:${key}`;
-        if (S.domCache.has(cacheKey)) return S.domCache.get(cacheKey);
-        const v = buildFn();
-        S.domCache.set(cacheKey, v);
-        return v;
-      },
-    },
-    ezoic: {
-      ensure() {
-        window.ezstandalone = window.ezstandalone || {};
-        return window.ezstandalone;
-      },
-      run(fn) {
-        const ez = this.ensure();
-        try { return (typeof ez?.cmd?.push === 'function') ? ez.cmd.push(fn) : fn(); } catch (_) {}
-      },
-      call(method, ...args) {
-        const ez = this.ensure();
-        const fn = ez?.[method];
-        if (typeof fn !== 'function') return;
-        try { return fn.apply(ez, args); } catch (_) {}
-      },
-    },
-    page: {
-      kind() { return getKind(); },
-      key() { return pageKey(); },
-    },
-  };
+  const isFilled  = n  => !!(n?.querySelector?.('iframe, ins, img, video, [data-google-container-id]'));
 
   function healFalseEmpty(root = document) {
     try {
@@ -274,8 +215,7 @@
 
   function mutate(fn) {
     S.mutGuard++;
-    try { fn(); }
-    finally { S.mutGuard--; Arch.cache.invalidate('mutate'); }
+    try { fn(); } finally { S.mutGuard--; }
   }
 function scheduleDestroyFlush() {
   if (S.destroyBatchTimer) return;
@@ -295,7 +235,11 @@ function flushDestroyBatch() {
     ids.push(id);
   }
   if (ids.length) {
-    try { Arch.ezoic.run(() => Arch.ezoic.call('destroyPlaceholders', ids)); } catch (_) {}
+    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();
 }
@@ -311,28 +255,20 @@ function destroyEzoicId(id) {
   scheduleDestroyFlush();
 }
 
-function queueDestroyIds(ids) {
-  for (const raw of (ids || [])) {
-    const id = parseInt(raw, 10);
-    if (!Number.isFinite(id) || id <= 0) continue;
-    if (!S.ezActiveIds.has(id) && !S.ezShownSinceDestroy.has(id)) continue;
-    if (S.destroyPendingSet.has(id)) continue;
-    S.destroyPending.push(id);
-    S.destroyPendingSet.add(id);
-    S.ezActiveIds.delete(id);
-    S.ezShownSinceDestroy.delete(id);
-  }
-  if (S.destroyPending.length) scheduleDestroyFlush();
-}
-
-function prepareIdsForShow(ids) {
+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;
 }
@@ -378,7 +314,6 @@ function prepareIdsForShow(ids) {
   }
 
   function getKind() {
-    return Arch.cache.get('kind', () => {
     const p = location.pathname;
     if (/^\/topic\//.test(p))                 return 'topic';
     if (/^\/category\//.test(p))              return 'categoryTopics';
@@ -387,13 +322,12 @@ function prepareIdsForShow(ids) {
     if (document.querySelector(SEL.post))     return 'topic';
     if (document.querySelector(SEL.topic))    return 'categoryTopics';
     return 'other';
-    });
   }
 
   // ── Items DOM ──────────────────────────────────────────────────────────────
 
   function getPosts() {
-    return Arch.cache.queryAll('posts', SEL.post, el => {
+    return Array.from(document.querySelectorAll(SEL.post)).filter(el => {
       if (!el.isConnected) return false;
       if (!el.querySelector('[component="post/content"]')) return false;
       const p = el.parentElement?.closest(SEL.post);
@@ -402,8 +336,8 @@ function prepareIdsForShow(ids) {
     });
   }
 
-  const getTopics     = () => Arch.cache.queryAll('topics', SEL.topic);
-  const getCategories = () => Arch.cache.queryAll('categories', SEL.category);
+  const getTopics     = () => Array.from(document.querySelectorAll(SEL.topic));
+  const getCategories = () => Array.from(document.querySelectorAll(SEL.category));
 
   // ── Wraps — détection ──────────────────────────────────────────────────────
 
@@ -504,7 +438,6 @@ function prepareIdsForShow(ids) {
         S.mountedIds.delete(id);
         S.pendingSet.delete(id);
         S.lastShow.delete(id);
-        queueDestroyIds([id]);
         S.ezActiveIds.delete(id);
       }
     }
@@ -521,7 +454,7 @@ function prepareIdsForShow(ids) {
    * Priorité : wraps vides d'abord, remplis si nécessaire.
    */
 function recycleAndMove(klass, targetEl, newKey) {
-  const ez = Arch.ezoic.ensure();
+  const ez = window.ezstandalone;
   if (typeof ez?.destroyPlaceholders !== 'function' ||
       typeof ez?.define             !== 'function' ||
       typeof ez?.displayMore        !== 'function') return null;
@@ -593,7 +526,7 @@ function recycleAndMove(klass, targetEl, newKey) {
   };
   const doDefine  = () => { try { ez.define([id]); } catch (_) {} setTimeout(doDisplay, 300); };
   const doDisplay = () => { try { ez.displayMore([id]); S.ezActiveIds.add(id); S.ezShownSinceDestroy.add(id); } catch (_) {} };
-  try { Arch.ezoic.run(doDestroy); } catch (_) {}
+  try { (typeof ez.cmd?.push === 'function') ? ez.cmd.push(doDestroy) : doDestroy(); } catch (_) {}
 
   return { id, wrap: best };
 }
@@ -633,7 +566,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)) { queueDestroyIds([id]); S.ezActiveIds.delete(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();
@@ -656,18 +589,19 @@ function recycleAndMove(klass, targetEl, newKey) {
   //   supprimerait les wraps, et provoquerait une réinjection en haut.
 
   function pruneOrphansBetween() {
-    if (S.burstActive || (S.scrollSpeed || 0) > 1800) return;
     const klass = 'ezoic-ad-between';
     const cfg   = KIND[klass];
-    const liveAnchors = new Set(Arch.cache.queryAll('prune-between-anchors', cfg.sel).map(el => el.getAttribute(cfg.anchorAttr)).filter(Boolean));
 
     document.querySelectorAll(`.${WRAP_CLASS}.${klass}`).forEach(w => {
       const created = parseInt(w.getAttribute(A_CREATED) || '0', 10);
-      if (ts() - created < MIN_PRUNE_AGE_MS) return;
+      if (ts() - created < MIN_PRUNE_AGE_MS) return; // grâce post-création
+
       const key = w.getAttribute(A_ANCHOR) ?? '';
-      const sid = key.slice(klass.length + 1);
+      const sid = key.slice(klass.length + 1); // après "ezoic-ad-between:"
       if (!sid) { mutate(() => dropWrap(w)); return; }
-      if (!liveAnchors.has(sid)) mutate(() => dropWrap(w));
+
+      const anchorEl = document.querySelector(`${cfg.baseTag}[${cfg.anchorAttr}="${sid}"]`);
+      if (!anchorEl?.isConnected) mutate(() => dropWrap(w));
     });
   }
 
@@ -713,8 +647,6 @@ function recycleAndMove(klass, targetEl, newKey) {
         const w = insertAfter(el, id, klass, key);
         if (w) { observePh(id); inserted++; }
       } else {
-        // Recyclage agressif = source fréquente de churn visuel (surtout sticky/fixed)
-        if (klass === 'ezoic-ad-message') break;
         const recycled = recycleAndMove(klass, el, key);
         if (!recycled) break;
         inserted++;
@@ -725,31 +657,15 @@ function recycleAndMove(klass, targetEl, newKey) {
 
   // ── IntersectionObserver & Show ────────────────────────────────────────────
 
-  function ensureIOViewportMode() {
-    const mode = isMobile() ? 'm' : 'd';
-    if (S.io && S.ioViewportMode !== mode) {
-      try { S.io.disconnect(); } catch (_) {}
-      S.io = null;
-    }
-    S.ioViewportMode = mode;
-  }
-
   function getIO() {
-    ensureIOViewportMode();
     if (S.io) return S.io;
     try {
       S.io = new IntersectionObserver(entries => {
         for (const e of entries) {
           if (!e.isIntersecting) continue;
-          const target = e.target instanceof Element ? e.target : null;
-          const id = parseInt(target?.getAttribute('data-ezoic-id'), 10);
-          if (!Number.isFinite(id) || id <= 0) continue;
-          const accepted = enqueueShow(id);
-          if (accepted) {
-            try { S.io?.unobserve(target); } catch (_) {}
-          } else if (target?.isConnected) {
-            setTimeout(() => { try { if (target.isConnected) S.io?.observe(target); } catch (_) {} }, 300);
-          }
+          if (e.target instanceof Element) S.io?.unobserve(e.target);
+          const id = parseInt(e.target.getAttribute('data-ezoic-id'), 10);
+          if (Number.isFinite(id) && id > 0) enqueueShow(id);
         }
       }, { root: null, rootMargin: isMobile() ? IO_MARGIN_MOBILE : IO_MARGIN_DESKTOP, threshold: 0 });
     } catch (_) { S.io = null; }
@@ -770,15 +686,12 @@ function recycleAndMove(klass, targetEl, newKey) {
   }
 
 function enqueueShow(id) {
-  if (!id || isBlocked()) return false;
+  if (!id || isBlocked()) return;
   const n = parseInt(id, 10);
-  if (!Number.isFinite(n) || n <= 0) return false;
-  if (ts() - (S.lastShow.get(n) ?? 0) < SHOW_THROTTLE_MS) return false;
-  const ph = phEl(n);
-  if (!ph?.isConnected || isFilled(ph) || !hasSinglePlaceholder(n)) return false;
+  if (!Number.isFinite(n) || n <= 0) return;
+  if (ts() - (S.lastShow.get(n) ?? 0) < SHOW_THROTTLE_MS) return;
   if (!S.pendingSet.has(n)) { S.pending.push(n); S.pendingSet.add(n); }
   scheduleDrainQueue();
-  return true;
 }
 
 function scheduleDrainQueue() {
@@ -844,18 +757,19 @@ function startShowBatch(ids) {
 
       if (!valid.length) { clearTimeout(timer); return release(); }
 
-      const ez = Arch.ezoic.ensure();
+      window.ezstandalone = window.ezstandalone || {};
+      const ez = window.ezstandalone;
       const doShow = () => {
-        const prepared = prepareIdsForShow(valid);
+        const prepared = destroyBeforeReuse(valid);
         if (!prepared.length) { setTimeout(() => { clearTimeout(timer); release(); }, SHOW_RELEASE_MS); return; }
-        try { ez.showAds(...prepared); } catch (_) { dbg('showAds failed', prepared); }
+        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);
       };
-      Arch.ezoic.run(doShow);
+      Array.isArray(ez.cmd) ? ez.cmd.push(doShow) : doShow();
     } catch (_) { clearTimeout(timer); release(); }
   });
 }
@@ -870,7 +784,8 @@ function startShowBatch(ids) {
   function patchShowAds() {
     const apply = () => {
       try {
-        const ez = Arch.ezoic.ensure();
+        window.ezstandalone = window.ezstandalone || {};
+        const ez = window.ezstandalone;
         if (window.__nbbEzPatched || typeof ez.showAds !== 'function') return;
         window.__nbbEzPatched = true;
         const orig = ez.showAds.bind(ez);
@@ -897,7 +812,8 @@ function startShowBatch(ids) {
     };
     apply();
     if (!window.__nbbEzPatched) {
-      Arch.ezoic.run(apply);
+      window.ezstandalone = window.ezstandalone || {};
+      (window.ezstandalone.cmd = window.ezstandalone.cmd || []).push(apply);
     }
   }
 
@@ -1006,7 +922,6 @@ function startShowBatch(ids) {
     S.scrollSpeed  = 0;
     S.lastScrollY  = 0;
     S.lastScrollTs = 0;
-    Arch.cache.invalidate('cleanup');
   }
 
   // ── MutationObserver ───────────────────────────────────────────────────────
@@ -1024,14 +939,14 @@ function startShowBatch(ids) {
             sawWrapRemoval = true;
           }
         }
-        if (sawWrapRemoval) { Arch.cache.invalidate('wrap-removed'); queueSweepDeadWraps(); }
+        if (sawWrapRemoval) queueSweepDeadWraps();
         for (const n of m.addedNodes) {
           if (n.nodeType !== 1) continue;
           try { healFalseEmpty(n); } catch (_) {}
           // matches() d'abord (O(1)), querySelector() seulement si nécessaire
           if (allSel.some(s => { try { return n.matches(s); } catch(_){return false;} }) ||
               allSel.some(s => { try { return !!n.querySelector(s); } catch(_){return false;} })) {
-            Arch.cache.invalidate('dom-added'); requestBurst(); return;
+            requestBurst(); return;
           }
         }
       }
@@ -1110,8 +1025,7 @@ function startShowBatch(ids) {
     $(window).off('.nbbEzoic');
     $(window).on('action:ajaxify.start.nbbEzoic', cleanup);
     $(window).on('action:ajaxify.end.nbbEzoic', () => {
-      S.pageKey    = Arch.page.key();
-      Arch.cache.invalidate('ajaxify.end');
+      S.pageKey    = pageKey();
       blockedUntil = 0;
       muteConsole(); ensureTcfLocator(); warmNetwork();
       patchShowAds(); getIO(); ensureDomObserver(); sweepDeadWraps(); requestBurst();
@@ -1134,17 +1048,6 @@ function startShowBatch(ids) {
     } catch (_) {}
   }
 
-  function bindResize() {
-    let rT = 0;
-    window.addEventListener('resize', () => {
-      if (rT) clearTimeout(rT);
-      rT = setTimeout(() => {
-        ensureIOViewportMode();
-        requestBurst();
-      }, 120);
-    }, { passive: true });
-  }
-
   function bindScroll() {
     let ticking = false;
     try {
@@ -1171,29 +1074,16 @@ function startShowBatch(ids) {
 
   // ── Boot ───────────────────────────────────────────────────────────────────
 
-  const App = {
-    modules: {
-      infra: { muteConsole, ensureTcfLocator, warmNetwork, patchShowAds },
-      lifecycle: { ensureDomObserver, bindNodeBB, cleanup },
-      viewport: { getIO, bindResize, bindScroll },
-      scheduler: { requestBurst },
-    },
-    boot() {
-      this.modules.infra.muteConsole();
-      this.modules.infra.ensureTcfLocator();
-      this.modules.infra.warmNetwork();
-      this.modules.infra.patchShowAds();
-      this.modules.viewport.getIO();
-      this.modules.lifecycle.ensureDomObserver();
-      this.modules.lifecycle.bindNodeBB();
-      this.modules.viewport.bindResize();
-      this.modules.viewport.bindScroll();
-      blockedUntil = 0;
-      this.modules.scheduler.requestBurst();
-    },
-  };
-
-  S.pageKey = Arch.page.key();
-  App.boot();
+  S.pageKey = pageKey();
+  muteConsole();
+  ensureTcfLocator();
+  warmNetwork();
+  patchShowAds();
+  getIO();
+  ensureDomObserver();
+  bindNodeBB();
+  bindScroll();
+  blockedUntil = 0;
+  requestBurst();
 
 })();

package/public/style.css

@@ -1,5 +1,5 @@
 /*
- * NodeBB Ezoic Infinite Ads — style.css (v21)
+ * NodeBB Ezoic Infinite Ads — style.css (v20)
  */
 
 /* ── Wrapper ──────────────────────────────────────────────────────────────── */
@@ -8,9 +8,8 @@
   width: 100%;
   margin: 0 !important;
   padding: 0 !important;
-  overflow: visible;
-  contain: none;
-  position: relative;
+  overflow: hidden;
+  contain: layout style;
 }
 
 /* Placeholder : 1px minimum pour rester visible par l'IntersectionObserver */
@@ -51,7 +50,11 @@
   position: absolute !important;
 }
 
-/* Compat sticky/fixed Ezoic : ne pas neutraliser globalement ici. */
+/* Neutralise sticky dans nos wraps (évite l'effet "gliding") */
+.nodebb-ezoic-wrap .ezads-sticky-intradiv {
+  position: static !important;
+  top: auto !important;
+}
 
 /* ── Ezoic global (hors de nos wraps) ────────────────────────────────────── */
 .ezoic-ad {