nodebb-plugin-ezoic-infinite 1.6.40 → 1.6.41

package/package.json

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

package/public/client.js

@@ -498,48 +498,6 @@ function globalGapFixInit() {
     return el;
   }
 
-  // Best-effort refresh for Ezoic standalone when we defer placement.
-  // Some stacks won't fill ads if a placeholder is rendered while collapsed/0px.
-  let _refreshTimer = null;
-
-  function collectEzoicIds(root) {
-    const ids = new Set();
-    if (!root || !root.querySelectorAll) return [];
-    // Common Ezoic placeholder ids
-    root.querySelectorAll('[id^="ezoic-pub-ad-placeholder-"]').forEach(el => ids.add(el.id));
-    // Some integrations keep ids on wrappers
-    root.querySelectorAll('[data-ezoic-id]').forEach(el => {
-      if (el.id) ids.add(el.id);
-    });
-    return Array.from(ids);
-  }
-
-  function refreshAds(ids) {
-    clearTimeout(_refreshTimer);
-    _refreshTimer = setTimeout(() => {
-      try {
-        if (window.ezstandalone && typeof window.ezstandalone.showAds === 'function') {
-          // Prefer a full rescan; fall back to ids if supported.
-          try {
-            window.ezstandalone.showAds();
-          } catch (e) {
-            if (ids && ids.length) window.ezstandalone.showAds(ids);
-          }
-          if (window.__EZ_DEBUG) console.debug('[ezoic-infinite] refreshAds (ezstandalone)', { ids });
-          return;
-        }
-        if (window.ez && typeof window.ez.showAds === 'function') {
-          try {
-            window.ez.showAds();
-          } catch (e) {
-            if (ids && ids.length) window.ez.showAds(ids);
-          }
-          if (window.__EZ_DEBUG) console.debug('[ezoic-infinite] refreshAds (ez)', { ids });
-        }
-      } catch (e) {}
-    }, 75);
-  }
-
   function primePlaceholderPool(allIds) {
     try {
       if (!Array.isArray(allIds) || !allIds.length) return;
@@ -1553,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 {
@@ -1577,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 isHost(node) {
+    return !!(node && node.nodeType === 1 && node.tagName === 'LI' && node.classList && node.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 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;
@@ -1620,259 +1561,296 @@ 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; }
+    } catch (e) {}
+    return null;
   }
 
-  function moveAfter(node, anchor) {
+  function detectPileUp(ul) {
+    // Pile-up signature: 2+ between wraps/hosts adjacent with no topics between, often near top.
     try {
-      if (!node || !anchor || !anchor.insertAdjacentElement) return;
-      if (node.previousElementSibling === anchor) return;
-      anchor.insertAdjacentElement('afterend', node);
+      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;
+        }
+      }
+      return maxRun >= 2;
     } catch (e) {}
+    return false;
   }
 
-  function placeOrPend(host, ulEl, topics) {
+  function redistribute(ul) {
     try {
-      if (!host) return;
-      ulEl = ulEl || ensureUL();
-      if (!ulEl) return;
+      if (!ul) return;
 
-      topics = topics || getTopics(ulEl);
+      // 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 after = getAfter(host);
-      if (!after) {
-        var lt = lastTopic(ulEl, topics);
-        if (lt) moveAfter(host, lt);
-        host.classList && host.classList.remove(PENDING_CLASS);
-        return;
-      }
+      // Step 2: only act if we see pile-up (avoid touching infinite scroll during normal flow)
+      if (!detectPileUp(ul)) return;
 
-      if (after > topics.length) {
-        // Defer placement until the anchor exists.
-        // Keeping a placeholder in a collapsed/0px container can prevent ad fill on some stacks.
-        host.classList && host.classList.add(PENDING_CLASS);
+      // 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 {
-          getPoolEl().appendChild(host);
-        } catch (e) {}
-        return;
-      }
-
-      var anchor = topics[after - 1];
-      if (anchor) moveAfter(host, anchor);
-      if (host.classList && host.classList.contains(PENDING_CLASS)) {
-        host.classList.remove(PENDING_CLASS);
-        if (host.dataset && host.dataset.ezoicId) refreshAds([host.dataset.ezoicId]);
-      }
-    } catch (e) {}
-  }
-
-  function reconcile() {
-    var ulEl = ensureUL();
-    if (!ulEl) return;
-
-    var topics = getTopics(ulEl);
-
-    try {
-      ulEl.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function (w) {
-        var h = ensureHostForWrap(w, ulEl);
-        if (h) placeOrPend(h, ulEl, topics);
-      });
+          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) {}
     });
   }
 
-  // -------- Viewport "poke" for empty Ezoic placeholders --------
-  // Some Ezoic placeholders can be placed into the DOM already in-view, but
-  // the ad stack only reacts on the next scroll tick. This keeps blocks from
-  // staying blank until the user nudges the page.
-  var io = null;
-  var observedPlaceholders = typeof WeakSet !== 'undefined' ? new WeakSet() : null;
-
-  function isEzoicPlaceholder(el) {
-    return !!(el && el.id && el.id.indexOf('ezoic-pub-ad-placeholder-') === 0);
-  }
+  function init() {
+    schedule('init');
 
-  function iframeCount(el) {
+    // Observe only the topic list once available
     try {
-      return (el && el.querySelectorAll) ? el.querySelectorAll('iframe').length : 0;
-    } catch (e) {
-      return 0;
+      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 });
+        };
+
+        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(){
+          setTimeout(function(){ schedule('event'); }, 50);
+          setTimeout(function(){ schedule('event2'); }, 400);
+        });
+      } catch (e) {}
     }
   }
 
-  function pokePlaceholder(ph, reason) {
-    if (!ph || !ph.id) return;
-    // throttle per placeholder
-    var now = Date.now();
-    var last = 0;
-    try { last = parseInt(ph.getAttribute('data-ez-poke-at') || '0', 10) || 0; } catch (e) {}
-    if (now - last < 1200) return;
-    try { ph.setAttribute('data-ez-poke-at', String(now)); } catch (e) {}
+  if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
+  else init();
+})();
+// ===== /V17 =====
 
-    // Only poke if still empty
-    if (iframeCount(ph) > 0) return;
+// ===== V17.13: empty GPT "poke" (keeps V17 pile-fix intact) =====
+// Goal: some GPT containers render empty until a tiny scroll triggers a refresh.
+// This watcher detects visible empty GPT slots and triggers a lightweight refresh.
+(function () {
+  var TAG = '[EZ EMPTY]';
+  var seen = Object.create(null);
+
+  function dbg() {
+    if (!window.__EZ_DEBUG) return;
+    try { console.log.apply(console, arguments); } catch (e) {}
+  }
+
+  function throttle(fn, wait) {
+    var t = 0;
+    var timer = null;
+    return function () {
+      var now = Date.now();
+      var args = arguments;
+      if (now - t >= wait) {
+        t = now;
+        fn.apply(null, args);
+        return;
+      }
+      if (timer) return;
+      timer = setTimeout(function () {
+        timer = null;
+        t = Date.now();
+        fn.apply(null, args);
+      }, wait);
+    };
+  }
 
-    if (DEBUG) {
-      try { console.log('[EZ POKE]', reason || 'io', ph.id); } catch (e) {}
-    }
+  function isVisible(el) {
+    try {
+      if (!el || el.nodeType !== 1) return false;
+      var r = el.getBoundingClientRect();
+      if (!r) return false;
+      if (r.width <= 0 || r.height <= 0) return false;
+      var vh = window.innerHeight || document.documentElement.clientHeight || 0;
+      var vw = window.innerWidth || document.documentElement.clientWidth || 0;
+      if (vh <= 0 || vw <= 0) return false;
+      return r.bottom > 0 && r.right > 0 && r.top < vh && r.left < vw;
+    } catch (e) {}
+    return false;
+  }
 
-    // Ask Ezoic to fill that specific placeholder
-    refreshAds([ph.id]);
+  function slotHasFill(slot) {
+    try {
+      if (slot.querySelector && slot.querySelector('iframe')) return true;
+      var cid = 'google_ads_iframe_';
+      var any = slot.querySelector && slot.querySelector('[id^="' + cid + '"] iframe');
+      return !!any;
+    } catch (e) {}
+    return false;
+  }
 
-    // And also emit a lightweight scroll/resize tick to trigger any lazy logic
+  function pokeRefresh() {
+    try {
+      if (window.ezstandalone && typeof window.ezstandalone.showAds === 'function') {
+        window.ezstandalone.showAds();
+        dbg(TAG, 'showAds called');
+        return true;
+      }
+    } catch (e) {}
     try { window.dispatchEvent(new Event('scroll')); } catch (e) {}
     try { window.dispatchEvent(new Event('resize')); } catch (e) {}
-
-    // One re-try shortly after, in case the first request was dropped.
-    setTimeout(function () {
-      try {
-        if (iframeCount(ph) === 0) {
-          refreshAds([ph.id]);
-          try { window.dispatchEvent(new Event('scroll')); } catch (e2) {}
-        }
-      } catch (e3) {}
-    }, 450);
-  }
-
-  function ensureIO() {
-    if (io) return;
-    if (!('IntersectionObserver' in window)) return;
-    io = new IntersectionObserver(function (entries) {
-      for (var i = 0; i < entries.length; i++) {
-        var e = entries[i];
-        if (!e || !e.isIntersecting) continue;
-        var ph = e.target;
-        if (!isEzoicPlaceholder(ph)) continue;
-        if (iframeCount(ph) === 0) {
-          pokePlaceholder(ph, 'in-view');
-        }
-      }
-    }, { root: null, rootMargin: '200px 0px', threshold: 0.01 });
+    return false;
   }
 
-  function observePlaceholder(ph) {
-    if (!ph) return;
-    ensureIO();
-    if (!io) return;
-    if (observedPlaceholders) {
-      if (observedPlaceholders.has(ph)) return;
-      observedPlaceholders.add(ph);
-    } else {
-      // fallback: mark directly
-      if (ph.getAttribute && ph.getAttribute('data-ez-observed') === '1') return;
-      try { ph.setAttribute('data-ez-observed', '1'); } catch (e) {}
-    }
-    try { io.observe(ph); } catch (e) {}
-  }
+  function checkSlot(slot) {
+    try {
+      if (!slot || !slot.id) return;
+      if (slot.id.indexOf('div-gpt-ad-') !== 0) return;
+      if (slotHasFill(slot)) return;
+      if (!isVisible(slot)) return;
+
+      var k = slot.id;
+      var now = Date.now();
+      if (seen[k] && (now - seen[k]) < 2000) return;
+      seen[k] = now;
 
-  function scanPlaceholders(root) {
-    if (!root || !root.querySelectorAll) return;
-    var list = [];
-    try { list = root.querySelectorAll('div[id^="ezoic-pub-ad-placeholder-"]'); } catch (e) { list = []; }
-    for (var i = 0; i < list.length; i++) observePlaceholder(list[i]);
+      setTimeout(function () {
+        try {
+          if (!slotHasFill(slot) && isVisible(slot)) {
+            console.log(TAG, k);
+            pokeRefresh();
+          }
+        } catch (e) {}
+      }, 120);
+    } catch (e) {}
   }
 
-  function initObserver() {
-    var ulEl = ensureUL();
-    if (!ulEl || mo) return;
+  function scan() {
+    try {
+      var slots = document.querySelectorAll('[id^="div-gpt-ad-"]');
+      if (!slots || !slots.length) {
+        dbg(TAG, 'none');
+        return;
+      }
+      for (var i = 0; i < slots.length; i++) checkSlot(slots[i]);
+    } catch (e) {}
+  }
 
-    mo = new MutationObserver(function (mutations) {
-      scheduleReconcile();
-      // Also observe any newly injected placeholders so in-view blanks get poked.
-      try {
-        for (var i = 0; i < (mutations || []).length; i++) {
-          var m = mutations[i];
-          if (!m || !m.addedNodes) continue;
-          for (var j = 0; j < m.addedNodes.length; j++) {
-            var n = m.addedNodes[j];
-            if (!n) continue;
-            if (isEzoicPlaceholder(n)) observePlaceholder(n);
-            else scanPlaceholders(n);
+  function observeNewSlots(io) {
+    try {
+      if (typeof MutationObserver === 'undefined') return;
+      var mo = new MutationObserver(function (muts) {
+        try {
+          for (var i = 0; i < muts.length; i++) {
+            var m = muts[i];
+            if (!m.addedNodes) continue;
+            for (var j = 0; j < m.addedNodes.length; j++) {
+              var n = m.addedNodes[j];
+              if (!n || n.nodeType !== 1) continue;
+              if (n.id && n.id.indexOf('div-gpt-ad-') === 0) {
+                try { io.observe(n); } catch (e) {}
+                checkSlot(n);
+              } else if (n.querySelectorAll) {
+                var inner = n.querySelectorAll('[id^="div-gpt-ad-"]');
+                for (var k = 0; k < inner.length; k++) {
+                  try { io.observe(inner[k]); } catch (e) {}
+                  checkSlot(inner[k]);
+                }
+              }
+            }
           }
-        }
-      } catch (e) {}
-    });
-
-    mo.observe(ulEl, { childList: true, subtree: true });
+        } catch (e) {}
+      });
+      mo.observe(document.documentElement || document.body, { childList: true, subtree: true });
+    } catch (e) {}
   }
 
-  function init() {
-    initObserver();
-    scheduleReconcile();
-    // initial scan for placeholders already in the DOM
-    scanPlaceholders(document);
+  function initEmptyWatcher() {
+    scan();
 
-    if (window.jQuery) {
+    if ('IntersectionObserver' in window) {
       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();
-          setTimeout(scheduleReconcile, 120);
-          setTimeout(scheduleReconcile, 500);
-          // re-scan after ajaxify/infinite load
-          setTimeout(function () { scanPlaceholders(document); }, 50);
-        });
+        var io = new IntersectionObserver(function (entries) {
+          for (var i = 0; i < entries.length; i++) {
+            var ent = entries[i];
+            if (ent && ent.isIntersecting) checkSlot(ent.target);
+          }
+        }, { root: null, threshold: 0.12 });
+
+        var slots = document.querySelectorAll('[id^="div-gpt-ad-"]');
+        for (var s = 0; s < slots.length; s++) {
+          try { io.observe(slots[s]); } catch (e) {}
+        }
+        observeNewSlots(io);
       } catch (e) {}
     }
 
-    var tries = 0;
-    var t = setInterval(function () {
-      tries++;
-      if (ensureUL()) {
-        clearInterval(t);
-        initObserver();
-        scheduleReconcile();
-      }
-      if (tries > 30) clearInterval(t);
-    }, 200);
+    try { window.addEventListener('scroll', throttle(scan, 250), { passive: true }); } catch (e) {}
+    try { window.addEventListener('resize', throttle(scan, 500)); } catch (e) {}
+    try { document.addEventListener('visibilitychange', function () { if (!document.hidden) setTimeout(scan, 150); }); } catch (e) {}
   }
 
-  if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
-  else init();
+  if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', initEmptyWatcher);
+  else initEmptyWatcher();
 })();
-// ===== /V17.8 =====
+// ===== /V17.13 =====
 

package/public/style.css

@@ -86,15 +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{
-  display: none !important;
-}
-/* ===== /V17.8 ===== */
-