nodebb-plugin-ezoic-infinite 1.6.22 → 1.6.24

package/package.json

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

package/public/client.js

@@ -1511,58 +1511,44 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V14.1.2 IO reconcile (visible only) – minimal impact on infinite scroll =====
+// ===== V14.1.3: Mutation-based reconcile (no scroll listener), place by data-ezoic-after =====
 (function () {
   var WRAP_SEL = 'div.nodebb-ezoic-wrap.ezoic-ad-between';
-  var HOST_CLASS = 'nodebb-ezoic-host';
-  var io = null;
+  var HOST_SEL = 'li.nodebb-ezoic-host';
+  var TOPIC_LI_SEL = 'li[component="category/topic"]';
 
-  function getListContainer(node) {
+  var freezeUntil = 0;
+  var pending = false;
+  var queue = new Set();
+
+  function now() { return Date.now(); }
+
+  function getTopicList() {
     try {
-      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;
+      var topic = document.querySelector(TOPIC_LI_SEL);
+      if (!topic) return null;
+      return topic.closest ? topic.closest('ul,ol') : null;
+    } catch (e) { return null; }
   }
 
-  function closestNonHostLi(node) {
+  function isLoading() {
     try {
-      var cur = node;
-      if (!cur) return null;
-      // If inside host, start from host
-      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;
+      if (now() < freezeUntil) return true;
+      return !!document.querySelector('.infinite-loading, .infinite-scroll-loading, .loading-indicator, .spinner, .topic-loading');
+    } catch (e) { return false; }
   }
 
-  function ensureHostForWrap(wrap) {
-    // Only repairs invalid UL>DIV. Does NOT move around the list except wrapping in-place.
+  function ensureHostForWrap(wrap, ul) {
     try {
       if (!wrap || wrap.nodeType !== 1) return null;
       if (!(wrap.matches && wrap.matches(WRAP_SEL))) return null;
-
-      var host = wrap.closest ? wrap.closest('li.' + HOST_CLASS) : null;
+      var host = wrap.closest ? wrap.closest(HOST_SEL) : null;
       if (host) return host;
-
-      var ul = getListContainer(wrap);
+      ul = ul || (wrap.closest ? wrap.closest('ul,ol') : null);
       if (!ul) return null;
-
       if (wrap.parentElement === ul) {
         host = document.createElement('li');
-        host.className = HOST_CLASS;
+        host.className = 'nodebb-ezoic-host';
         host.setAttribute('role', 'listitem');
         host.style.listStyle = 'none';
         host.style.width = '100%';
@@ -1575,98 +1561,170 @@ function buildOrdinalMap(items) {
     return null;
   }
 
-  function reconcileHostPosition(host) {
-    // Moves ONLY the one host we are currently handling (visible or just inserted).
+  function nthTopic(ul, n) {
+    try {
+      var topics = ul.querySelectorAll(TOPIC_LI_SEL);
+      if (!topics || !topics.length) return null;
+      if (n < 1) n = 1;
+      if (n > topics.length) n = topics.length;
+      return topics[n-1] || null;
+    } catch (e) { return null; }
+  }
+
+  function previousTopicLi(host) {
+    try {
+      var prev = host.previousElementSibling;
+      while (prev) {
+        if (prev.matches && prev.matches(TOPIC_LI_SEL)) return prev;
+        prev = prev.previousElementSibling;
+      }
+    } catch (e) {}
+    return null;
+  }
+
+  function placeHost(host, ul) {
     try {
       if (!host || host.nodeType !== 1) return;
-      var ul = getListContainer(host);
+      ul = ul || host.parentElement;
       if (!ul) return;
 
-      var anchorLi = closestNonHostLi(host);
-      if (!anchorLi) return;
+      var wrap = host.querySelector && host.querySelector(WRAP_SEL);
+      if (!wrap) { host.remove(); return; }
+
+      var after = wrap.getAttribute('data-ezoic-after');
+      var anchor = null;
+
+      if (after) {
+        anchor = nthTopic(ul, parseInt(after, 10));
+      }
+      if (!anchor) {
+        anchor = previousTopicLi(host);
+      }
+      if (!anchor) {
+        // Can't place reliably; if host drifted to top area, remove to avoid pile-up.
+        // Otherwise keep as-is.
+        var firstTopic = nthTopic(ul, 1);
+        if (firstTopic && host !== firstTopic && host.compareDocumentPosition(firstTopic) & Node.DOCUMENT_POSITION_FOLLOWING) {
+          host.remove();
+        }
+        return;
+      }
 
-      if (host.previousElementSibling !== anchorLi) {
-        anchorLi.insertAdjacentElement('afterend', host);
+      if (host.previousElementSibling !== anchor) {
+        anchor.insertAdjacentElement('afterend', host);
       }
     } catch (e) {}
   }
 
-  function observeHost(host) {
+  function drain() {
+    pending = false;
+    if (isLoading()) {
+      // retry later
+      scheduleDrain(250);
+      return;
+    }
+    var ul = getTopicList();
+    if (!ul) return;
+
+    // repair invalid ul>div once
     try {
-      if (!host) return;
-      if (!io) return;
-      io.observe(host);
+      ul.querySelectorAll(':scope > ' + WRAP_SEL).forEach(function(w){
+        var h = ensureHostForWrap(w, ul);
+        if (h) queue.add(h);
+      });
     } catch (e) {}
+
+    var count = 0;
+    for (var host of Array.from(queue)) {
+      queue.delete(host);
+      placeHost(host, ul);
+      count++;
+      if (count >= 8) break; // keep it light
+    }
+    if (queue.size) scheduleDrain(60);
   }
 
-  function initIO() {
-    if (io || typeof IntersectionObserver === 'undefined') return;
-    io = new IntersectionObserver(function (entries) {
-      try {
-        entries.forEach(function (e) {
-          if (!e || !e.isIntersecting || !e.target) return;
-          // When host is near viewport, reconcile once.
-          reconcileHostPosition(e.target);
-        });
-      } catch (e) {}
-    }, { root: null, rootMargin: '800px 0px 800px 0px', threshold: 0.01 });
+  function scheduleDrain(delay) {
+    if (pending) return;
+    pending = true;
+    if (delay) {
+      setTimeout(function(){ requestAnimationFrame(drain); }, delay);
+    } else {
+      requestAnimationFrame(drain);
+    }
   }
 
-  function processWrap(wrap) {
+  function enqueueFromNode(node) {
     try {
-      var host = ensureHostForWrap(wrap) || (wrap.closest ? wrap.closest('li.' + HOST_CLASS) : null);
-      if (host) {
-        // reconcile immediately only for the newly processed node (cheap)
-        reconcileHostPosition(host);
-        observeHost(host);
+      if (!node || node.nodeType !== 1) return;
+      var ul = getTopicList();
+      if (!ul) return;
+
+      if (node.matches && node.matches(WRAP_SEL)) {
+        var h = ensureHostForWrap(node, ul) || (node.closest ? node.closest(HOST_SEL) : null);
+        if (h) queue.add(h);
+      } else if (node.matches && node.matches(HOST_SEL)) {
+        queue.add(node);
+      } else if (node.querySelectorAll) {
+        node.querySelectorAll(WRAP_SEL).forEach(function(w){
+          var h2 = ensureHostForWrap(w, ul) || (w.closest ? w.closest(HOST_SEL) : null);
+          if (h2) queue.add(h2);
+        });
+        node.querySelectorAll(HOST_SEL).forEach(function(h3){ queue.add(h3); });
       }
     } catch (e) {}
   }
 
-  function scanInitial() {
+  function init() {
+    // initial scan (light)
     try {
-      document.querySelectorAll(WRAP_SEL).forEach(processWrap);
+      var ul = getTopicList();
+      if (ul) {
+        ul.querySelectorAll(WRAP_SEL).forEach(function(w){
+          var h = ensureHostForWrap(w, ul) || (w.closest ? w.closest(HOST_SEL) : null);
+          if (h) queue.add(h);
+        });
+        scheduleDrain(0);
+      }
     } catch (e) {}
-  }
 
-  function installMO() {
+    // Observe ONLY the topic list container once available
     try {
-      if (typeof MutationObserver === 'undefined') return;
-      var mo = new MutationObserver(function (muts) {
-        try {
-          for (var i = 0; i < muts.length; i++) {
+      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) continue;
-
-            for (var j = 0; j < m.addedNodes.length; j++) {
-              var n = m.addedNodes[j];
-              if (!n || n.nodeType !== 1) continue;
-
-              if (n.matches && n.matches(WRAP_SEL)) {
-                processWrap(n);
-              } else if (n.querySelectorAll) {
-                var inner = n.querySelectorAll(WRAP_SEL);
-                if (inner && inner.length) inner.forEach(processWrap);
+            if (m.addedNodes && m.addedNodes.length) {
+              for (var j=0;j<m.addedNodes.length;j++){
+                enqueueFromNode(m.addedNodes[j]);
               }
+              scheduleDrain(0);
             }
           }
-        } catch (e) {}
-      });
-      mo.observe(document.documentElement || document.body, { childList: true, subtree: true });
-    } catch (e) {}
-  }
+        });
 
-  function init() {
-    initIO();
-    scanInitial();
-    installMO();
+        var ul = getTopicList();
+        if (ul) mo.observe(ul, { childList:true, subtree:true });
+        else {
+          // wait for ajaxify
+          var mo2 = new MutationObserver(function(){
+            var u2 = getTopicList();
+            if (u2) {
+              try { mo.observe(u2, { childList:true, subtree:true }); } catch(e){}
+              try { mo2.disconnect(); } catch(e){}
+            }
+          });
+          mo2.observe(document.documentElement || document.body, { childList:true, subtree:true });
+        }
+      }
+    } catch (e) {}
 
     if (window.jQuery) {
       try {
-        window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function () {
-          // do a light rescan (no scroll listeners)
-          setTimeout(scanInitial, 0);
-          setTimeout(scanInitial, 250);
+        window.jQuery(window).on('action:infiniteScroll.loaded action:ajaxify.end', function(){
+          freezeUntil = now() + 900; // allow NodeBB to settle
+          // then reconcile any drift
+          setTimeout(function(){ scheduleDrain(0); }, 950);
         });
       } catch (e) {}
     }
@@ -1675,5 +1733,5 @@ function buildOrdinalMap(items) {
   if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
   else init();
 })();
-// ===== /V14.1.2 =====
+// ===== /V14.1.3 =====
 

package/public/style.css

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