nodebb-plugin-ezoic-infinite 1.6.34 → 1.6.36

package/package.json

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

package/public/client.js

@@ -1514,189 +1514,287 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V17.3: keep injection; hide top pile on upscroll; rehome EMPTY hosts on downscroll =====
-(function(){
+// ===== V17.7: Keep injection, anchor each between slot to topic TID and repair on DOM moves (minimal, targeted) =====
+(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 ANCHOR_ATTR = 'data-ezoic-anchor-tid';
 
-  var lastY = window.pageYOffset || document.documentElement.scrollTop || 0;
-  var scheduled = false;
-  var lastRun = 0;
-  var COOLDOWN = 120;
+  var ul = null;
+  var mo = null;
 
-  function getY(){ return window.pageYOffset || document.documentElement.scrollTop || 0; }
+  var pending = false;
+  var queue = new Set();
+  var lastFlush = 0;
+  var FLUSH_COOLDOWN = 60;
 
-  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 ensureHostForWrap(wrap, ul){
-    try{
-      if (!wrap || wrap.nodeType!==1) 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 ensureHostForWrap(wrap, ulEl) {
+    // Only wrap invalid ul>div cases (same idea as V17), no injection hook.
+    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;
+      ulEl = ulEl || (wrap.closest ? wrap.closest('ul,ol') : null);
+      if (!ulEl || !(ulEl.tagName === 'UL' || ulEl.tagName === 'OL')) return null;
 
-      if (wrap.parentElement === ul){
+      if (wrap.parentElement === ulEl) {
         host = document.createElement('li');
         host.className = HOST_CLASS;
-        host.setAttribute('role','listitem');
-        host.style.listStyle='none';
-        host.style.width='100%';
-        // preserve after
+        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);
-        } catch(e){}
-        ul.insertBefore(host, wrap);
+        } catch (e) {}
+        ulEl.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 getTidFromTopicLi(li) {
+    try {
+      if (!li) return null;
+      var tid = li.getAttribute('data-tid') || li.getAttribute('data-topic-id') || li.getAttribute('data-topicid') || li.getAttribute('data-id');
+      if (tid && /^\\d+$/.test(tid)) return tid;
+
+      var a = li.querySelector && li.querySelector('a[href*="/topic/"]');
+      if (a) {
+        var href = a.getAttribute('href') || '';
+        var m = href.match(/\\/topic\\/(\\d+)(\\/|$)/);
+        if (m) return m[1];
+      }
+    } 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 closestPrevTopicLi(node) {
+    try {
+      var cur = node;
+      if (!cur) return null;
+      if (cur.closest) {
+        var h = cur.closest('li.' + HOST_CLASS);
+        if (h) cur = h;
+      }
+      var prev = cur.previousElementSibling;
+      while (prev) {
+        if (prev.matches && prev.matches(TOPIC_LI_SEL)) return prev;
+        prev = prev.previousElementSibling;
+      }
+    } catch (e) {}
+    return null;
   }
 
-  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 topicLiByTid(ulEl, tid) {
+    try {
+      if (!ulEl || !tid) return null;
+      var q = ulEl.querySelector(
+        TOPIC_LI_SEL + '[data-tid="' + tid + '"], ' +
+        TOPIC_LI_SEL + '[data-topic-id="' + tid + '"], ' +
+        TOPIC_LI_SEL + '[data-topicid="' + tid + '"]'
+      );
+      if (q) return q;
+
+      var topics = ulEl.querySelectorAll(TOPIC_LI_SEL);
+      for (var i=0;i<topics.length;i++){
+        var t = getTidFromTopicLi(topics[i]);
+        if (t === tid) return topics[i];
+      }
+    } catch (e) {}
+    return null;
   }
 
-  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');
+  function rememberAnchor(el) {
+    try {
+      if (!el) return;
+
+      // normalize to host if wrap
+      if (el.matches && el.matches(BETWEEN_WRAP_SEL)) {
+        var h = el.closest ? el.closest('li.' + HOST_CLASS) : null;
+        if (h) el = h;
       }
-      var n = parseInt(v,10);
-      return isNaN(n)? null : n;
-    }catch(e){ return null; }
-  }
-
-  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
+      if (!isHost(el) && !(el.matches && el.matches(BETWEEN_WRAP_SEL))) return;
+
+      if (el.getAttribute && el.getAttribute(ANCHOR_ATTR)) return;
+
+      var prevTopic = closestPrevTopicLi(el);
+      if (!prevTopic) return;
+      var tid = getTidFromTopicLi(prevTopic);
+      if (!tid) return;
+
+      el.setAttribute(ANCHOR_ATTR, tid);
+    } catch (e) {}
+  }
+
+  function repairOne(node, ulEl) {
+    try {
+      ulEl = ulEl || ensureUL();
+      if (!ulEl) return;
+
+      var el = node;
+
+      if (el && el.nodeType === 1 && el.matches && el.matches(BETWEEN_WRAP_SEL)) {
+        var host = ensureHostForWrap(el, ulEl) || (el.closest ? el.closest('li.' + HOST_CLASS) : null);
+        if (host) el = host;
+      }
+
+      if (isHost(el)) {
+        rememberAnchor(el);
+        var tid = el.getAttribute(ANCHOR_ATTR);
+        if (!tid) return;
+        var anchorTopic = topicLiByTid(ulEl, tid);
+        if (!anchorTopic) return;
+        if (el.previousElementSibling !== anchorTopic) {
+          anchorTopic.insertAdjacentElement('afterend', el);
         }
+        return;
       }
-    }catch(e){}
+
+      if (el && el.nodeType === 1 && el.matches && el.matches(BETWEEN_WRAP_SEL)) {
+        rememberAnchor(el);
+        var tid2 = el.getAttribute(ANCHOR_ATTR);
+        if (!tid2) return;
+        var anchor2 = topicLiByTid(ulEl, tid2);
+        if (!anchor2) return;
+        if (el.previousElementSibling !== anchor2) {
+          anchor2.insertAdjacentElement('afterend', el);
+        }
+      }
+    } 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;
+  function enqueue(node) {
+    try {
+      if (!node || node.nodeType !== 1) 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){}
+      if (isHost(node) || (node.matches && node.matches(BETWEEN_WRAP_SEL))) {
+        queue.add(node);
+        scheduleFlush();
+        return;
+      }
+      if (node.querySelectorAll) {
+        var wraps = node.querySelectorAll(BETWEEN_WRAP_SEL);
+        if (wraps && wraps.length) wraps.forEach(function(w){ queue.add(w); });
+        var hosts = node.querySelectorAll('li.' + HOST_CLASS);
+        if (hosts && hosts.length) hosts.forEach(function(h){ queue.add(h); });
+        if ((wraps && wraps.length) || (hosts && hosts.length)) scheduleFlush();
+      }
+    } catch (e) {}
+  }
+
+  function flush() {
+    pending = false;
+    var ulEl = ensureUL();
+    if (!ulEl) return;
+
+    // host invalid ul>div and capture anchors
+    try {
+      ulEl.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function(w){
+        var host = ensureHostForWrap(w, ulEl);
+        if (host) queue.add(host);
       });
-    }catch(e){}
+      ulEl.querySelectorAll('li.' + HOST_CLASS).forEach(function(h){ rememberAnchor(h); });
+      ulEl.querySelectorAll(BETWEEN_WRAP_SEL).forEach(function(w){ rememberAnchor(w); });
+    } catch (e) {}
+
+    var n = 0;
+    for (var item of Array.from(queue)) {
+      queue.delete(item);
+      repairOne(item, ulEl);
+      n++;
+      if (n >= 10) break;
+    }
+    if (queue.size) scheduleFlush();
   }
 
-  function schedule(fn){
+  function scheduleFlush() {
     var now = Date.now();
-    if (now-lastRun < COOLDOWN) return;
-    if (scheduled) return;
-    scheduled = true;
-    requestAnimationFrame(function(){
-      scheduled=false;
-      lastRun = Date.now();
-      fn();
-    });
+    if (pending) return;
+    if (now - lastFlush < FLUSH_COOLDOWN) return;
+    pending = true;
+    lastFlush = now;
+    requestAnimationFrame(flush);
   }
 
-  function onScroll(){
-    var y = getY();
-    var dy = y - lastY;
-    lastY = y;
-    var ul = getTopicList();
-    if (!ul) return;
+  function initObserver() {
+    var ulEl = ensureUL();
+    if (!ulEl || mo) return;
 
-    // always wrap invalid ul>div (cheap)
-    try { ul.querySelectorAll(':scope > '+BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); }); } catch(e){}
+    // initial capture
+    try {
+      ulEl.querySelectorAll(BETWEEN_WRAP_SEL).forEach(function(w){
+        var host = ensureHostForWrap(w, ulEl) || (w.closest ? w.closest('li.' + HOST_CLASS) : null);
+        rememberAnchor(host || w);
+      });
+    } catch (e) {}
 
-    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); });
-    }
+    mo = new MutationObserver(function(muts){
+      try {
+        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++) enqueue(m.addedNodes[j]);
+          }
+          if (m.target) enqueue(m.target);
+        }
+      } catch (e) {}
+    });
+    mo.observe(ulEl, { childList:true, subtree:true });
   }
 
-  function init(){
-    window.addEventListener('scroll', onScroll, { passive:true });
+  function init() {
+    initObserver();
+    scheduleFlush();
 
-    if (window.jQuery){
-      try{
+    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);
+          ul = null;
+          try { if (mo) { mo.disconnect(); } } catch(e){}
+          mo = null;
+          initObserver();
+          setTimeout(function(){ scheduleFlush(); }, 80);
+          setTimeout(function(){ scheduleFlush(); }, 450);
         });
-      }catch(e){}
+      } catch (e) {}
     }
+
+    var tries = 0;
+    var t = setInterval(function(){
+      tries++;
+      if (ensureUL()) {
+        clearInterval(t);
+        initObserver();
+        scheduleFlush();
+      }
+      if (tries > 25) clearInterval(t);
+    }, 200);
   }
 
   if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
   else init();
 })();
-// ===== /V17.3 =====
+// ===== /V17.7 =====
 

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 */
+/* ===== V17.7 host styling ===== */
 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 ===== */
+/* ===== /V17.7 ===== */