nodebb-plugin-ezoic-infinite 1.6.20 → 1.6.21

package/package.json

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

package/public/client.js

@@ -1511,46 +1511,75 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V14.3 reconcile by data-ezoic-after (upscroll only, no DOM scanning on downscroll) =====
+// ===== V14.1.1 Hook between-wrap (safe): host repair always, reconcile ONLY on upscroll, never append host to bottom =====
 (function () {
+  var BETWEEN_SEL = 'div.nodebb-ezoic-wrap.ezoic-ad-between';
   var HOST_CLASS = 'nodebb-ezoic-host';
-  var WRAP_SEL = 'div.nodebb-ezoic-wrap.ezoic-ad-between';
-  var TOPIC_LI_SEL = 'li[component="category/topic"]';
+  var TOKEN_ATTR = 'data-ezoic-anchor-token';
+
   var lastY = window.pageYOffset || document.documentElement.scrollTop || 0;
+  var pending = false;
+  var lastRun = 0;
+  var COOLDOWN = 140;
 
   function getY() {
     return window.pageYOffset || document.documentElement.scrollTop || 0;
   }
 
-  function getTopicList() {
+  function token() {
+    try { return String(Date.now()) + '-' + Math.random().toString(16).slice(2); } catch (e) { return String(Date.now()); }
+  }
+
+  function getListContainer(node) {
     try {
-      var topicLi = document.querySelector(TOPIC_LI_SEL);
-      if (!topicLi) return null;
-      var ul = topicLi.closest ? topicLi.closest('ul,ol') : null;
-      return ul;
-    } catch (e) { return null; }
+      var ul = node && node.closest ? node.closest('ul,ol') : null;
+      if (ul && (ul.tagName === 'UL' || ul.tagName === 'OL')) return ul;
+      var p = node && node.parentElement;
+      while (p) {
+        if (p.tagName === 'UL' || p.tagName === 'OL') return p;
+        p = p.parentElement;
+      }
+    } catch (e) {}
+    return null;
   }
 
-  function ensureValidHostForBetween(wrap) {
-    // Ensure ul/ol does not directly contain div wraps: wrap them in LI host.
+  function closestNonHostLi(node) {
+    try {
+      var cur = node;
+      if (!cur) return null;
+      if (cur.closest) {
+        var host = cur.closest('li.' + HOST_CLASS);
+        if (host) cur = host;
+      }
+      var prev = cur.previousElementSibling;
+      while (prev) {
+        if (prev.tagName === 'LI' && !(prev.classList && prev.classList.contains(HOST_CLASS))) return prev;
+        prev = prev.previousElementSibling;
+      }
+    } catch (e) {}
+    return null;
+  }
+
+  function ensureHost(wrap) {
+    // Always ensure UL/OL doesn't directly contain DIV wraps.
     try {
       if (!wrap || wrap.nodeType !== 1) return null;
-      if (!(wrap.matches && wrap.matches(WRAP_SEL))) return null;
-      var ul = wrap.parentElement;
-      while (ul && !(ul.tagName === 'UL' || ul.tagName === 'OL')) ul = ul.parentElement;
+      if (!(wrap.matches && wrap.matches(BETWEEN_SEL))) return null;
+
+      var ul = getListContainer(wrap);
       if (!ul) return null;
 
-      // If already inside host, return host
       var host = wrap.closest ? wrap.closest('li.' + HOST_CLASS) : null;
       if (host) return host;
 
-      // If direct child of UL/OL, create host and move wrap into it
+      // If direct child of UL/OL, create host in-place (does not affect infinite scroll measurements much)
       if (wrap.parentElement === ul) {
         host = document.createElement('li');
         host.className = HOST_CLASS;
         host.setAttribute('role', 'listitem');
         host.style.listStyle = 'none';
         host.style.width = '100%';
+
         ul.insertBefore(host, wrap);
         host.appendChild(wrap);
         try { wrap.style.width = '100%'; } catch (e) {}
@@ -1560,66 +1589,72 @@ function buildOrdinalMap(items) {
     return null;
   }
 
-  function desiredAnchorByAfter(ul, afterNum) {
-    // afterNum is like 6/12/18 etc. It means "after nth topic".
-    // We'll locate the nth topic LI currently in DOM (1-indexed), then anchor after it.
+  function tetherHostToAnchor(host, ul) {
+    // Only called on upscroll to avoid breaking load logic.
     try {
-      if (!ul || !afterNum) return null;
-      var n = parseInt(afterNum, 10);
-      if (!n || n < 1) return null;
-      var topics = ul.querySelectorAll(TOPIC_LI_SEL);
-      if (!topics || !topics.length) return null;
-      // clamp to range
-      if (n > topics.length) n = topics.length;
-      return topics[n - 1];
-    } catch (e) { return null; }
-  }
+      if (!host) return;
+      var wrap = host.querySelector && host.querySelector(BETWEEN_SEL);
+      if (!wrap) { host.remove(); return; }
+
+      // Determine anchor = nearest previous non-host li
+      var anchorLi = closestNonHostLi(host);
+      if (!anchorLi) {
+        // No anchor in DOM -> mark orphan (handled on upscroll only)
+        host.setAttribute('data-ezoic-orphan', '1');
+        return;
+      }
 
-  function reconcileHostsUpScroll() {
-    var ul = getTopicList();
-    if (!ul) return;
+      var t = anchorLi.getAttribute(TOKEN_ATTR);
+      if (!t) {
+        t = token();
+        anchorLi.setAttribute(TOKEN_ATTR, t);
+      }
+      host.setAttribute(TOKEN_ATTR, t);
+      host.removeAttribute('data-ezoic-orphan');
 
-    // 1) Repair invalid wraps (cheap)
-    try {
-      ul.querySelectorAll(':scope > ' + WRAP_SEL).forEach(function(w){ ensureValidHostForBetween(w); });
+      // If host drifted, put it back right after anchor
+      if (host.previousElementSibling !== anchorLi) {
+        anchorLi.insertAdjacentElement('afterend', host);
+      }
     } catch (e) {}
+  }
 
-    // 2) Only on upscroll: move hosts back to their after-index positions if they drifted.
+  function reconcileUpScroll() {
     var y = getY();
     var dy = y - lastY;
     lastY = y;
-    if (dy >= -10) return;
 
+    // ALWAYS: repair invalid ul>div occurrences (cheap) but don't reorder
     try {
-      var hosts = ul.querySelectorAll('li.' + HOST_CLASS);
-      hosts.forEach(function(host){
-        try {
-          var wrap = host.querySelector && host.querySelector(WRAP_SEL);
-          if (!wrap) { host.remove(); return; }
+      var bad = document.querySelectorAll('ul > ' + BETWEEN_SEL + ', ol > ' + BETWEEN_SEL);
+      bad.forEach(function(w){ ensureHost(w); });
+    } catch (e) {}
 
-          var afterNum = wrap.getAttribute('data-ezoic-after') || host.getAttribute('data-ezoic-after') || '';
-          if (!afterNum) return;
+    // If NOT upscroll, do nothing else (prevents "ads accumulate at bottom" and avoids scroll blocking)
+    if (dy > -8) return;
 
-          var anchor = desiredAnchorByAfter(ul, afterNum);
-          if (!anchor) {
-            // if we can't anchor, remove to prevent piling
-            host.remove();
-            return;
-          }
+    // Up-scroll: tether/reconcile and drop orphan hosts (they cause pile-ups)
+    try {
+      var wraps = document.querySelectorAll(BETWEEN_SEL);
+      wraps.forEach(function(w){
+        var host = ensureHost(w);
+        if (!host) host = w.closest ? w.closest('li.' + HOST_CLASS) : null;
+        var ul = getListContainer(host || w);
+        if (host && ul) tetherHostToAnchor(host, ul);
+      });
 
-          if (host.previousElementSibling !== anchor) {
-            anchor.insertAdjacentElement('afterend', host);
-          }
-        } catch (e) {}
+      // Drop orphans only on upscroll
+      var orphans = document.querySelectorAll('li.' + HOST_CLASS + '[data-ezoic-orphan="1"]');
+      orphans.forEach(function(h){ try { h.remove(); } catch(e) {} });
+
+      // Drop empty hosts
+      var empties = document.querySelectorAll('li.' + HOST_CLASS);
+      empties.forEach(function(h){
+        try { if (!(h.querySelector && h.querySelector(BETWEEN_SEL))) h.remove(); } catch(e) {}
       });
     } catch (e) {}
   }
 
-  // Throttled scheduler (scroll)
-  var pending = false;
-  var lastRun = 0;
-  var COOLDOWN = 160;
-
   function schedule() {
     var now = Date.now();
     if (now - lastRun < COOLDOWN) return;
@@ -1628,15 +1663,15 @@ function buildOrdinalMap(items) {
     requestAnimationFrame(function(){
       pending = false;
       lastRun = Date.now();
-      reconcileHostsUpScroll();
+      reconcileUpScroll();
     });
   }
 
   function init() {
-    // initial repair only
+    // Initial repair only
     try {
-      var ul = getTopicList();
-      if (ul) ul.querySelectorAll(':scope > ' + WRAP_SEL).forEach(function(w){ ensureValidHostForBetween(w); });
+      var bad = document.querySelectorAll('ul > ' + BETWEEN_SEL + ', ol > ' + BETWEEN_SEL);
+      bad.forEach(function(w){ ensureHost(w); });
     } catch (e) {}
 
     window.addEventListener('scroll', schedule, { passive: true });
@@ -1645,13 +1680,27 @@ function buildOrdinalMap(items) {
     if (window.jQuery) {
       window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function(){
         setTimeout(schedule, 0);
-        setTimeout(schedule, 300);
+        setTimeout(schedule, 250);
+        setTimeout(schedule, 900);
       });
     }
+
+    // MutationObserver: only schedule (no immediate heavy work)
+    try {
+      if (typeof MutationObserver !== 'undefined') {
+        var mo = new MutationObserver(function(muts){
+          for (var i=0;i<muts.length;i++){
+            var m=muts[i];
+            if ((m.addedNodes && m.addedNodes.length) || (m.removedNodes && m.removedNodes.length)) { schedule(); break; }
+          }
+        });
+        mo.observe(document.documentElement || document.body, { childList:true, subtree:true });
+      }
+    } catch (e) {}
   }
 
   if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
   else init();
 })();
-// ===== /V14.3 =====
+// ===== /V14.1.1 =====
 

package/public/style.css

@@ -81,7 +81,7 @@
 }
 
 
-/* ===== V14.3 host ===== */
+/* ===== V14.1.1 host ===== */
 li.nodebb-ezoic-host { list-style: none; width: 100%; }
-/* ===== /V14.3 ===== */
+/* ===== /V14.1.1 ===== */