nodebb-plugin-ezoic-infinite 1.6.34 → 1.6.35

package/package.json

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

package/public/client.js

@@ -1514,189 +1514,222 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V17.3: keep injection; hide top pile on upscroll; rehome EMPTY hosts on downscroll =====
-(function(){
+// ===== V18: Always host between DIVs in <li> + anchor by topic tid (MutationObserver, no scroll hooks to injection) =====
+(function () {
   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 PILED_ATTR = 'data-ezoic-piled';
-
-  var lastY = window.pageYOffset || document.documentElement.scrollTop || 0;
-  var scheduled = false;
-  var lastRun = 0;
-  var COOLDOWN = 120;
+  var ANCHOR_ATTR = 'data-ezoic-anchor-tid';
 
-  function getY(){ return window.pageYOffset || document.documentElement.scrollTop || 0; }
+  var pending = false;
+  var queue = new Set();
 
-  function getTopicList(){
+  function getTopicList() {
     try {
       var li = document.querySelector(TOPIC_LI_SEL);
       if (!li) return null;
       return li.closest ? li.closest('ul,ol') : null;
-    } catch(e){ return null; }
+    } catch (e) { return null; }
+  }
+
+  function extractTidFromTopicLi(li) {
+    // Parse tid from a topic link (/topic/{tid}/...)
+    try {
+      if (!li || !li.querySelector) return null;
+      var a = li.querySelector('a[href^="/topic/"], a[href*="/topic/"]');
+      if (!a) return null;
+      var href = a.getAttribute('href') || '';
+      var m = href.match(/\/topic\/(\d+)\b/);
+      return m ? m[1] : null;
+    } catch (e) { return null; }
+  }
+
+  function buildTidMap(ul) {
+    var map = Object.create(null);
+    try {
+      var topics = ul.querySelectorAll(TOPIC_LI_SEL);
+      for (var i = 0; i < topics.length; i++) {
+        var tid = extractTidFromTopicLi(topics[i]);
+        if (tid && !map[tid]) map[tid] = topics[i];
+      }
+    } catch (e) {}
+    return map;
+  }
+
+  function previousTopicLi(node) {
+    try {
+      var prev = node.previousElementSibling;
+      while (prev) {
+        if (prev.matches && prev.matches(TOPIC_LI_SEL)) return prev;
+        prev = prev.previousElementSibling;
+      }
+    } catch (e) {}
+    return null;
   }
 
-  function ensureHostForWrap(wrap, ul){
-    try{
-      if (!wrap || wrap.nodeType!==1) return null;
+  function ensureHostForWrap(wrap, ul) {
+    // Always ensure UL children are LI, to avoid NodeBB reparenting DIVs (root cause of pile-up).
+    try {
+      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;
+      var host = wrap.closest ? wrap.closest('li.' + HOST_CLASS) : null;
       if (host) return host;
 
-      if (!ul) ul = wrap.closest ? wrap.closest('ul,ol') : null;
-      if (!ul || !(ul.tagName==='UL' || ul.tagName==='OL')) return null;
+      ul = ul || (wrap.closest ? wrap.closest('ul,ol') : null);
+      if (!ul || !(ul.tagName === 'UL' || ul.tagName === 'OL')) return null;
 
-      if (wrap.parentElement === ul){
+      // Only wrap if it's a direct child of the list
+      if (wrap.parentElement === ul) {
         host = document.createElement('li');
         host.className = HOST_CLASS;
-        host.setAttribute('role','listitem');
-        host.style.listStyle='none';
-        host.style.width='100%';
-        // preserve after
-        try {
-          var after = wrap.getAttribute('data-ezoic-after');
-          if (after) host.setAttribute('data-ezoic-after', after);
-        } catch(e){}
+        host.setAttribute('role', 'listitem');
+        host.style.listStyle = 'none';
+        host.style.width = '100%';
+
+        // anchor tid from previous topic
+        var anchor = previousTopicLi(wrap) || wrap.previousElementSibling;
+        if (anchor && anchor.matches && anchor.matches(TOPIC_LI_SEL)) {
+          var tid = extractTidFromTopicLi(anchor);
+          if (tid) host.setAttribute(ANCHOR_ATTR, tid);
+        }
+
         ul.insertBefore(host, wrap);
         host.appendChild(wrap);
-        try { wrap.style.width='100%'; } catch(e){}
+        try { wrap.style.width = '100%'; } catch (e) {}
         return host;
       }
-    }catch(e){}
+    } catch (e) {}
     return null;
   }
 
-  function hostHasAdContent(host){
-    // iframes/amp ads mean it's already rendered; moving might reduce fill
-    try{
-      return !!(host.querySelector && host.querySelector('iframe, amp-ad, amp-iframe, .amp-ads, .ezoic-ad iframe'));
-    }catch(e){ return false; }
+  function ensureAnchorTid(host) {
+    try {
+      if (!host || host.nodeType !== 1) return;
+      if (host.getAttribute(ANCHOR_ATTR)) return;
+      var anchor = previousTopicLi(host);
+      if (!anchor) return;
+      var tid = extractTidFromTopicLi(anchor);
+      if (tid) host.setAttribute(ANCHOR_ATTR, tid);
+    } catch (e) {}
   }
 
-  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 reconcileHost(host, ul, tidMap) {
+    try {
+      if (!host || host.nodeType !== 1 || !host.isConnected) return;
+      ul = ul || host.parentElement;
+      if (!ul) return;
 
-  function getAfter(host){
-    try{
-      var v = host.getAttribute('data-ezoic-after');
-      if (!v){
-        var wrap = host.querySelector && host.querySelector(BETWEEN_WRAP_SEL);
-        if (wrap) v = wrap.getAttribute('data-ezoic-after');
-      }
-      var n = parseInt(v,10);
-      return isNaN(n)? null : n;
-    }catch(e){ return null; }
-  }
+      // if host got detached from list, skip
+      if (!(ul.tagName === 'UL' || ul.tagName === 'OL')) return;
 
-  function detectAndHideTopPile(ul){
-    // Hide piled hosts near top so user doesn't see the stack.
-    try{
-      var kids = ul.children;
-      var limit = Math.min(kids.length, 60);
-      var run = 0;
-      for (var i=0;i<limit;i++){
-        var el = kids[i];
-        var isBetweenHost = (el.tagName==='LI' && el.classList && el.classList.contains(HOST_CLASS) && el.querySelector && el.querySelector(BETWEEN_WRAP_SEL));
-        var isTopic = (el.matches && el.matches(TOPIC_LI_SEL));
-        if (isBetweenHost){
-          run++;
-          if (run>=2){
-            // mark piled beyond the first
-            el.setAttribute(PILED_ATTR,'1');
-          }
-        } else if (isTopic){
-          run=0;
-        } else {
-          // reset on any non-topic
-        }
+      ensureAnchorTid(host);
+
+      var tid = host.getAttribute(ANCHOR_ATTR);
+      if (!tid) return;
+
+      var anchorLi = tidMap[tid];
+      if (!anchorLi || !anchorLi.isConnected) return;
+
+      if (host.previousElementSibling !== anchorLi) {
+        anchorLi.insertAdjacentElement('afterend', host);
       }
-    }catch(e){}
+    } catch (e) {}
   }
 
-  function rehomePiledEmptyOnDownscroll(ul){
-    // On downscroll, try to move only EMPTY (not yet rendered) piled hosts to intended anchors and unhide them.
-    try{
-      var piled = ul.querySelectorAll('li.'+HOST_CLASS+'['+PILED_ATTR+'="1"]');
-      if (!piled.length) return;
-
-      piled.forEach(function(host){
-        try{
-          // if it already has rendered ad, just unhide; do not move
-          if (hostHasAdContent(host)){
-            host.removeAttribute(PILED_ATTR);
-            return;
-          }
-          var after = getAfter(host);
-          var anchor = after!=null ? nthTopic(ul, after) : null;
-          if (anchor){
-            anchor.insertAdjacentElement('afterend', host);
-          }
-          host.removeAttribute(PILED_ATTR);
-        }catch(e){}
+  function drain() {
+    pending = false;
+    var ul = getTopicList();
+    if (!ul) return;
+
+    // First, host any direct-child between DIVs currently in list (cheap, keeps DOM valid).
+    try {
+      ul.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function (w) {
+        var h = ensureHostForWrap(w, ul);
+        if (h) queue.add(h);
       });
-    }catch(e){}
+    } catch (e) {}
+
+    var tidMap = buildTidMap(ul);
+
+    // Process a limited batch per frame
+    var processed = 0;
+    for (var host of Array.from(queue)) {
+      queue.delete(host);
+      reconcileHost(host, ul, tidMap);
+      processed++;
+      if (processed >= 12) break;
+    }
+    if (queue.size) schedule();
   }
 
-  function schedule(fn){
-    var now = Date.now();
-    if (now-lastRun < COOLDOWN) return;
-    if (scheduled) return;
-    scheduled = true;
-    requestAnimationFrame(function(){
-      scheduled=false;
-      lastRun = Date.now();
-      fn();
-    });
+  function schedule() {
+    if (pending) return;
+    pending = true;
+    requestAnimationFrame(drain);
+  }
+
+  function enqueueNode(node, ul) {
+    try {
+      if (!node || node.nodeType !== 1) return;
+      if (node.matches && node.matches(BETWEEN_WRAP_SEL)) {
+        var h = ensureHostForWrap(node, ul);
+        if (h) queue.add(h);
+      } else if (node.tagName === 'LI' && node.classList && node.classList.contains(HOST_CLASS)) {
+        queue.add(node);
+      } else if (node.querySelectorAll) {
+        // only check within added subtree, not whole doc
+        node.querySelectorAll(':scope ' + BETWEEN_WRAP_SEL).forEach(function (w) {
+          var h2 = ensureHostForWrap(w, ul);
+          if (h2) queue.add(h2);
+        });
+        node.querySelectorAll(':scope li.' + HOST_CLASS).forEach(function (h3) { queue.add(h3); });
+      }
+    } catch (e) {}
   }
 
-  function onScroll(){
-    var y = getY();
-    var dy = y - lastY;
-    lastY = y;
+  function init() {
     var ul = getTopicList();
     if (!ul) return;
 
-    // always wrap invalid ul>div (cheap)
-    try { ul.querySelectorAll(':scope > '+BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); }); } catch(e){}
+    // Initial pass: host all between DIVs and reconcile once.
+    schedule();
 
-    if (dy < -8 && y < 900){
-      // upscroll near top: hide pile quickly (no moving)
-      schedule(function(){ detectAndHideTopPile(ul); });
-    } else if (dy > 8){
-      // downscroll: rehome only empty piled hosts (safe) and unhide
-      schedule(function(){ rehomePiledEmptyOnDownscroll(ul); });
+    // Observe only the topic list
+    if (typeof MutationObserver !== 'undefined') {
+      var mo = new MutationObserver(function (muts) {
+        try {
+          var u = getTopicList();
+          if (!u) return;
+
+          for (var i = 0; i < muts.length; i++) {
+            var m = muts[i];
+            if (m.addedNodes && m.addedNodes.length) {
+              for (var j = 0; j < m.addedNodes.length; j++) {
+                enqueueNode(m.addedNodes[j], u);
+              }
+            }
+          }
+          if (queue.size) schedule();
+        } catch (e) {}
+      });
+      try { mo.observe(ul, { childList: true, subtree: true }); } catch (e) {}
     }
-  }
 
-  function init(){
-    window.addEventListener('scroll', onScroll, { passive:true });
-
-    if (window.jQuery){
-      try{
-        window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function(){
-          // wrap invalids only
-          setTimeout(function(){
-            try{
-              var ul = getTopicList();
-              if (!ul) return;
-              ul.querySelectorAll(':scope > '+BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); });
-            }catch(e){}
-          }, 50);
+    // NodeBB events: run a settle pass after batches
+    if (window.jQuery) {
+      try {
+        window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function () {
+          // Let NodeBB append topics, then reconcile hosts by anchor tid.
+          setTimeout(function(){ schedule(); }, 120);
+          setTimeout(function(){ schedule(); }, 520);
         });
-      }catch(e){}
+      } catch (e) {}
     }
   }
 
   if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
   else init();
 })();
-// ===== /V17.3 =====
+// ===== /V18 =====
 

package/public/style.css

@@ -88,10 +88,8 @@ li.nodebb-ezoic-host > .nodebb-ezoic-wrap.ezoic-ad-between { width: 100%; displa
 
 
 
-/* ===== V17.3 piled hide ===== */
-li.nodebb-ezoic-host[data-ezoic-piled="1"] { display: none !important; }
-/* keep host stable */
-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.3 ===== */
+/* ===== V18 hosts ===== */
+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; }
+/* ===== /V18 ===== */