nodebb-plugin-ezoic-infinite 1.6.50 → 1.6.51

package/README-V17.md

@@ -0,0 +1,17 @@
+# V17 – Minimal pile-up fixer (base: ezoic-infinite-fixed (1).zip)
+
+Tu as demandé de repartir du zip d'origine: certaines variantes ont cassé l'injection.
+
+## Principe
+V17 **ne touche pas** au code d'injection (pas de hook dans insertAfter/moveWrapAfter).
+Les pubs continuent de se créer comme avant.
+
+V17 intervient seulement quand on détecte un symptôme "pile-up" (2+ pubs between consécutives sans topics entre):
+- encapsule les `ul > div.nodebb-ezoic-wrap.ezoic-ad-between` dans un `<li class="nodebb-ezoic-host">` (DOM stable)
+- redistribue les hosts en les replaçant juste après le topic `<li>` précédent dans la liste
+
+## Déclencheurs
+- MutationObserver uniquement sur la liste de topics (guarded par détection pile-up)
+- events NodeBB ajaxify / infiniteScroll
+
+Build: 2026-02-18T14:53:42.167388Z

package/package.json

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

package/public/client.js

@@ -63,31 +63,6 @@
   // Production build: debug disabled
   function dbg() {}
 
-  // Some ad providers (notably Google Safeframe) can defer creative rendering until a
-  // scroll/resize tick is observed. On SPA/infinite-scroll pages we can end up with
-  // valid iframes that stay visually empty until the user nudges the scroll.
-  // We gently "poke" observers by dispatching scroll/resize events (debounced).
-  let _ezPokeScheduled = false;
-  function scheduleViewportPoke(reason) {
-    if (_ezPokeScheduled) return;
-    _ezPokeScheduled = true;
-    try {
-      requestAnimationFrame(() => {
-        _ezPokeScheduled = false;
-        try {
-          window.dispatchEvent(new Event('scroll'));
-          window.dispatchEvent(new Event('resize'));
-        } catch (e) {}
-        try {
-          document.dispatchEvent(new Event('scroll'));
-        } catch (e) {}
-        dbg('viewportPoke', reason || '');
-      });
-    } catch (e) {
-      _ezPokeScheduled = false;
-    }
-  }
-
   // Ezoic (and some partner scripts) can be very noisy in console on SPA/Ajaxify setups.
   // These warnings are not actionable for end-users and can flood the console.
   // We selectively silence the known spam patterns while keeping other warnings intact.
@@ -661,8 +636,8 @@ function globalGapFixInit() {
 
   // ---------------- insertion primitives ----------------
 
-  function buildWrap(id, kindClass, afterPos, createPlaceholder, tagName) {
-    const wrap = document.createElement(tagName || 'div');
+  function buildWrap(id, kindClass, afterPos, createPlaceholder) {
+    const wrap = document.createElement('div');
     wrap.className = `${WRAP_CLASS} ${kindClass}`;
     wrap.setAttribute('data-ezoic-after', String(afterPos));
     wrap.setAttribute('data-ezoic-wrapid', String(id));
@@ -673,15 +648,6 @@ function globalGapFixInit() {
     }
     wrap.style.width = '100%';
 
-    // If we're inserted into a UL/OL list, use an LI wrapper to keep valid markup.
-    // Otherwise browsers can re-parent the DIV, which looks like items/ads “remontent”
-    // and can break topic list rendering.
-    if ((tagName || '').toLowerCase() === 'li') {
-      wrap.style.listStyle = 'none';
-      wrap.style.padding = '0';
-      wrap.style.margin = '0';
-    }
-
     if (createPlaceholder) {
       const ph = document.createElement('div');
       ph.id = `${PLACEHOLDER_PREFIX}${id}`;
@@ -701,10 +667,7 @@ function globalGapFixInit() {
 
     insertingIds.add(id);
     try {
-      const parent = target.parentElement;
-      const parentTag = parent && parent.tagName ? parent.tagName.toUpperCase() : '';
-      const tagName = (parentTag === 'UL' || parentTag === 'OL') ? 'li' : 'div';
-      const wrap = buildWrap(id, kindClass, afterPos, !existingPh, tagName);
+      const wrap = buildWrap(id, kindClass, afterPos, !existingPh);
       target.insertAdjacentElement('afterend', wrap);
 
       // If placeholder exists elsewhere (including pool), move it into the wrapper.
@@ -716,9 +679,6 @@ function globalGapFixInit() {
         } catch (e) {}
       }
 
-      // Help creatives render promptly without requiring an actual user scroll.
-      scheduleViewportPoke(`afterInsert:${kindClass}:${id}`);
-
       return wrap;
     } finally {
       insertingIds.delete(id);
@@ -1551,21 +1511,16 @@ function buildOrdinalMap(items) {
 
 
 
-
-
-
-// ===== V17.8: No pile-up by design — keep "future" between slots pending/collapsed until their anchor topic exists =====
+// ===== V17 minimal pile-fix (no insert hooks) =====
 (function () {
+  // Goal: keep ad injection intact. Only repair when we detect "pile-up" of between wraps.
   var TOPIC_LI_SEL = 'li[component="category/topic"]';
   var BETWEEN_WRAP_SEL = 'div.nodebb-ezoic-wrap.ezoic-ad-between';
   var HOST_CLASS = 'nodebb-ezoic-host';
-  var PENDING_CLASS = 'nodebb-ezoic-pending';
 
-  var ul = null;
-  var mo = null;
   var scheduled = false;
   var lastRun = 0;
-  var COOLDOWN = 80;
+  var COOLDOWN = 180;
 
   function getTopicList() {
     try {
@@ -1575,41 +1530,29 @@ function buildOrdinalMap(items) {
     } catch (e) { return null; }
   }
 
-  function ensureUL() { ul = ul || getTopicList(); return ul; }
-
-  function isHost(el) {
-    return !!(el && el.nodeType === 1 && el.tagName === 'LI' && el.classList && el.classList.contains(HOST_CLASS));
-  }
-
-  function isBetweenWrap(el) {
-    try { return !!(el && el.nodeType === 1 && el.matches && el.matches(BETWEEN_WRAP_SEL)); } catch(e){ return false; }
+  function isHost(node) {
+    return !!(node && node.nodeType === 1 && node.tagName === 'LI' && node.classList && node.classList.contains(HOST_CLASS));
   }
 
-  function ensureHostForWrap(wrap, ulEl) {
-    // If Ezoic inserts ul > div..., wrap it into a LI to keep a valid list structure (less NodeBB churn).
+  function ensureHostForWrap(wrap, ul) {
     try {
-      if (!wrap || !isBetweenWrap(wrap)) return null;
+      if (!wrap || wrap.nodeType !== 1) return null;
+      if (!(wrap.matches && wrap.matches(BETWEEN_WRAP_SEL))) return null;
+
       var host = wrap.closest ? wrap.closest('li.' + HOST_CLASS) : null;
       if (host) return host;
 
-      ulEl = ulEl || (wrap.closest ? wrap.closest('ul,ol') : null);
-      if (!ulEl || !(ulEl.tagName === 'UL' || ulEl.tagName === 'OL')) return null;
+      if (!ul) ul = wrap.closest ? wrap.closest('ul,ol') : null;
+      if (!ul || !(ul.tagName === 'UL' || ul.tagName === 'OL')) return null;
 
-      if (wrap.parentElement === ulEl) {
+      // Only wrap if direct child of list (invalid / fragile)
+      if (wrap.parentElement === ul) {
         host = document.createElement('li');
         host.className = HOST_CLASS;
         host.setAttribute('role', 'listitem');
         host.style.listStyle = 'none';
         host.style.width = '100%';
-
-        try {
-          var after = wrap.getAttribute('data-ezoic-after');
-          if (after) host.setAttribute('data-ezoic-after', after);
-          var pin = wrap.getAttribute('data-ezoic-pin');
-          if (pin) host.setAttribute('data-ezoic-pin', pin);
-        } catch (e) {}
-
-        ulEl.insertBefore(host, wrap);
+        ul.insertBefore(host, wrap);
         host.appendChild(wrap);
         try { wrap.style.width = '100%'; } catch (e) {}
         return host;
@@ -1618,147 +1561,134 @@ function buildOrdinalMap(items) {
     return null;
   }
 
-  function getAfter(el) {
+  function previousTopicLi(node) {
     try {
-      var v = null;
-      if (el && el.getAttribute) v = el.getAttribute('data-ezoic-after');
-      if (!v && el && el.querySelector) {
-        var w = el.querySelector(BETWEEN_WRAP_SEL);
-        if (w) v = w.getAttribute('data-ezoic-after');
+      var prev = node.previousElementSibling;
+      while (prev) {
+        if (prev.matches && prev.matches(TOPIC_LI_SEL)) return prev;
+        // skip other hosts/wraps
+        prev = prev.previousElementSibling;
       }
-      var n = parseInt(v, 10);
-      return isNaN(n) ? null : n;
-    } catch (e) { return null; }
-  }
-
-  function getTopics(ulEl) {
-    try { return ulEl ? ulEl.querySelectorAll(TOPIC_LI_SEL) : []; } catch(e){ return []; }
-  }
-
-  function lastTopic(ulEl, topics) {
-    try {
-      topics = topics || getTopics(ulEl);
-      return topics && topics.length ? topics[topics.length - 1] : null;
-    } catch (e) { return null; }
-  }
-
-  function moveAfter(node, anchor) {
-    try {
-      if (!node || !anchor || !anchor.insertAdjacentElement) return;
-      if (node.previousElementSibling === anchor) return;
-      anchor.insertAdjacentElement('afterend', node);
     } catch (e) {}
+    return null;
   }
 
-  function placeOrPend(host, ulEl, topics) {
+  function detectPileUp(ul) {
+    // Pile-up signature: 2+ between wraps/hosts adjacent with no topics between, often near top.
     try {
-      if (!host) return;
-      ulEl = ulEl || ensureUL();
-      if (!ulEl) return;
-
-      topics = topics || getTopics(ulEl);
-
-      var after = getAfter(host);
-      if (!after) {
-        var lt = lastTopic(ulEl, topics);
-        if (lt) moveAfter(host, lt);
-        host.classList && host.classList.remove(PENDING_CLASS);
-        return;
-      }
-
-      if (after > topics.length) {
-        var lt2 = lastTopic(ulEl, topics);
-        if (lt2) moveAfter(host, lt2);
-        host.classList && host.classList.add(PENDING_CLASS);
-        return;
+      var kids = ul.children;
+      var run = 0;
+      var maxRun = 0;
+      for (var i = 0; i < kids.length; i++) {
+        var el = kids[i];
+        var isBetween = false;
+        if (isHost(el)) {
+          isBetween = !!(el.querySelector && el.querySelector(BETWEEN_WRAP_SEL));
+        } else if (el.matches && el.matches(BETWEEN_WRAP_SEL)) {
+          isBetween = true;
+        }
+        if (isBetween) {
+          run++;
+          if (run > maxRun) maxRun = run;
+        } else if (el.matches && el.matches(TOPIC_LI_SEL)) {
+          run = 0;
+        } else {
+          // other nodes reset lightly
+          run = 0;
+        }
       }
-
-      var anchor = topics[after - 1];
-      if (anchor) moveAfter(host, anchor);
-      host.classList && host.classList.remove(PENDING_CLASS);
+      return maxRun >= 2;
     } catch (e) {}
+    return false;
   }
 
-  function reconcile() {
-    var ulEl = ensureUL();
-    if (!ulEl) return;
+  function redistribute(ul) {
+    try {
+      if (!ul) return;
+
+      // Step 1: wrap any direct child between DIVs into LI hosts (makes list stable)
+      ul.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); });
 
-    var topics = getTopics(ulEl);
+      // Step 2: only act if we see pile-up (avoid touching infinite scroll during normal flow)
+      if (!detectPileUp(ul)) return;
 
-    try {
-      ulEl.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function (w) {
-        var h = ensureHostForWrap(w, ulEl);
-        if (h) placeOrPend(h, ulEl, topics);
-      });
+      // Move each host to immediately after the closest previous topic LI at its current position.
+      var hosts = ul.querySelectorAll(':scope > li.' + HOST_CLASS);
+      hosts.forEach(function(host){
+        try {
+          var wrap = host.querySelector && host.querySelector(BETWEEN_WRAP_SEL);
+          if (!wrap) return;
 
-      ulEl.querySelectorAll('li.' + HOST_CLASS).forEach(function (h) {
-        placeOrPend(h, ulEl, topics);
-      });
+          var anchor = previousTopicLi(host);
+          if (!anchor) return; // if none, don't move (prevents yanking to top/bottom)
 
-      ulEl.querySelectorAll(BETWEEN_WRAP_SEL).forEach(function (w) {
-        var h = ensureHostForWrap(w, ulEl) || (w.closest ? w.closest('li.' + HOST_CLASS) : null);
-        if (h) placeOrPend(h, ulEl, topics);
+          if (host.previousElementSibling !== anchor) {
+            anchor.insertAdjacentElement('afterend', host);
+          }
+        } catch (e) {}
       });
     } catch (e) {}
   }
 
-  function scheduleReconcile() {
+  function schedule(reason) {
     var now = Date.now();
-    if (scheduled) return;
     if (now - lastRun < COOLDOWN) return;
+    if (scheduled) return;
     scheduled = true;
-    lastRun = now;
     requestAnimationFrame(function () {
       scheduled = false;
-      reconcile();
+      lastRun = Date.now();
+      try {
+        var ul = getTopicList();
+        if (!ul) return;
+        redistribute(ul);
+      } catch (e) {}
     });
   }
 
-  function initObserver() {
-    var ulEl = ensureUL();
-    if (!ulEl || mo) return;
-
-    mo = new MutationObserver(function () {
-      scheduleReconcile();
-    });
+  function init() {
+    schedule('init');
 
-    mo.observe(ulEl, { childList: true, subtree: true });
-  }
+    // Observe only the topic list once available
+    try {
+      if (typeof MutationObserver !== 'undefined') {
+        var observeList = function(ul){
+          if (!ul) return;
+          var mo = new MutationObserver(function(muts){
+            // schedule on any change; redistribute() itself is guarded by pile-up detection
+            schedule('mo');
+          });
+          mo.observe(ul, { childList: true, subtree: true });
+        };
 
-  function init() {
-    scheduleViewportPoke('init');
-    initObserver();
-    scheduleReconcile();
+        var ul = getTopicList();
+        if (ul) observeList(ul);
+        else {
+          var mo2 = new MutationObserver(function(){
+            var u2 = getTopicList();
+            if (u2) {
+              try { observeList(u2); } catch(e){}
+              try { mo2.disconnect(); } catch(e){}
+            }
+          });
+          mo2.observe(document.documentElement || document.body, { childList: true, subtree: true });
+        }
+      }
+    } catch (e) {}
 
+    // NodeBB events: run after infinite scroll batches
     if (window.jQuery) {
       try {
-        window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function () {
-          ul = null;
-          try { if (mo) mo.disconnect(); } catch (e) {}
-          mo = null;
-          initObserver();
-          scheduleReconcile();
-          scheduleViewportPoke('ajaxify.end');
-          setTimeout(scheduleReconcile, 120);
-          setTimeout(scheduleReconcile, 500);
+        window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function(){
+          setTimeout(function(){ schedule('event'); }, 50);
+          setTimeout(function(){ schedule('event2'); }, 400);
         });
       } catch (e) {}
     }
-
-    var tries = 0;
-    var t = setInterval(function () {
-      tries++;
-      if (ensureUL()) {
-        clearInterval(t);
-        initObserver();
-        scheduleReconcile();
-      }
-      if (tries > 30) clearInterval(t);
-    }, 200);
   }
 
   if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
   else init();
 })();
-// ===== /V17.8 =====
+// ===== /V17 =====
 

package/public/style.css

@@ -86,20 +86,3 @@ li.nodebb-ezoic-host { list-style: none; width: 100%; display: block; }
 li.nodebb-ezoic-host > .nodebb-ezoic-wrap.ezoic-ad-between { width: 100%; display: block; }
 /* ===== /V17 ===== */
 
-
-
-/* ===== V17.8 pending slots (prevents pile-up top/bottom) ===== */
-li.nodebb-ezoic-host { list-style:none; width:100%; display:block; }
-li.nodebb-ezoic-host > .nodebb-ezoic-wrap.ezoic-ad-between { width:100%; display:block; }
-
-/* slots whose anchor topic isn't loaded yet */
-li.nodebb-ezoic-host.nodebb-ezoic-pending{
-  max-height: 0 !important;
-  margin: 0 !important;
-  padding: 0 !important;
-  overflow: hidden !important;
-  opacity: 0 !important;
-  pointer-events: none !important;
-}
-/* ===== /V17.8 ===== */
-