nodebb-plugin-ezoic-infinite 1.6.35 → 1.6.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "1.6.35",
+  "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,15 +1514,20 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V18: Always host between DIVs in <li> + anchor by topic tid (MutationObserver, no scroll hooks to injection) =====
+// ===== 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 ANCHOR_ATTR = 'data-ezoic-anchor-tid';
 
+  var ul = null;
+  var mo = null;
+
   var pending = false;
   var queue = new Set();
+  var lastFlush = 0;
+  var FLUSH_COOLDOWN = 60;
 
   function getTopicList() {
     try {
@@ -1532,43 +1537,14 @@ function buildOrdinalMap(items) {
     } 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 ensureUL() { ul = ul || getTopicList(); return ul; }
 
-  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 isHost(el) {
+    return !!(el && el.nodeType === 1 && el.tagName === 'LI' && el.classList && el.classList.contains(HOST_CLASS));
   }
 
-  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) {
-    // Always ensure UL children are LI, to avoid NodeBB reparenting DIVs (root cause of pile-up).
+  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;
@@ -1576,25 +1552,20 @@ function buildOrdinalMap(items) {
       var host = wrap.closest ? wrap.closest('li.' + HOST_CLASS) : null;
       if (host) return host;
 
-      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;
 
-      // Only wrap if it's a direct child of the list
-      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%';
-
-        // 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);
+        try {
+          var after = wrap.getAttribute('data-ezoic-after');
+          if (after) host.setAttribute('data-ezoic-after', after);
+        } catch (e) {}
+        ulEl.insertBefore(host, wrap);
         host.appendChild(wrap);
         try { wrap.style.width = '100%'; } catch (e) {}
         return host;
@@ -1603,133 +1574,227 @@ function buildOrdinalMap(items) {
     return null;
   }
 
-  function ensureAnchorTid(host) {
+  function getTidFromTopicLi(li) {
     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);
+      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 reconcileHost(host, ul, tidMap) {
+  function closestPrevTopicLi(node) {
     try {
-      if (!host || host.nodeType !== 1 || !host.isConnected) return;
-      ul = ul || host.parentElement;
-      if (!ul) return;
+      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;
+  }
 
-      // if host got detached from list, skip
-      if (!(ul.tagName === 'UL' || ul.tagName === 'OL')) return;
+  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;
+  }
 
-      ensureAnchorTid(host);
+  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;
+      }
+      if (!isHost(el) && !(el.matches && el.matches(BETWEEN_WRAP_SEL))) return;
 
-      var tid = host.getAttribute(ANCHOR_ATTR);
+      if (el.getAttribute && el.getAttribute(ANCHOR_ATTR)) return;
+
+      var prevTopic = closestPrevTopicLi(el);
+      if (!prevTopic) return;
+      var tid = getTidFromTopicLi(prevTopic);
       if (!tid) return;
 
-      var anchorLi = tidMap[tid];
-      if (!anchorLi || !anchorLi.isConnected) return;
+      el.setAttribute(ANCHOR_ATTR, tid);
+    } catch (e) {}
+  }
+
+  function repairOne(node, ulEl) {
+    try {
+      ulEl = ulEl || ensureUL();
+      if (!ulEl) return;
+
+      var el = node;
 
-      if (host.previousElementSibling !== anchorLi) {
-        anchorLi.insertAdjacentElement('afterend', host);
+      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;
+      }
+
+      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 drain() {
+  function enqueue(node) {
+    try {
+      if (!node || node.nodeType !== 1) return;
+
+      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 ul = getTopicList();
-    if (!ul) return;
+    var ulEl = ensureUL();
+    if (!ulEl) return;
 
-    // First, host any direct-child between DIVs currently in list (cheap, keeps DOM valid).
+    // host invalid ul>div and capture anchors
     try {
-      ul.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function (w) {
-        var h = ensureHostForWrap(w, ul);
-        if (h) queue.add(h);
+      ulEl.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function(w){
+        var host = ensureHostForWrap(w, ulEl);
+        if (host) queue.add(host);
       });
+      ulEl.querySelectorAll('li.' + HOST_CLASS).forEach(function(h){ rememberAnchor(h); });
+      ulEl.querySelectorAll(BETWEEN_WRAP_SEL).forEach(function(w){ rememberAnchor(w); });
     } 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;
+    var n = 0;
+    for (var item of Array.from(queue)) {
+      queue.delete(item);
+      repairOne(item, ulEl);
+      n++;
+      if (n >= 10) break;
     }
-    if (queue.size) schedule();
+    if (queue.size) scheduleFlush();
   }
 
-  function schedule() {
+  function scheduleFlush() {
+    var now = Date.now();
     if (pending) return;
+    if (now - lastFlush < FLUSH_COOLDOWN) return;
     pending = true;
-    requestAnimationFrame(drain);
+    lastFlush = now;
+    requestAnimationFrame(flush);
   }
 
-  function enqueueNode(node, ul) {
+  function initObserver() {
+    var ulEl = ensureUL();
+    if (!ulEl || mo) return;
+
+    // initial capture
     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); });
-      }
+      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) {}
+
+    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() {
-    var ul = getTopicList();
-    if (!ul) return;
+    initObserver();
+    scheduleFlush();
 
-    // Initial pass: host all between DIVs and reconcile once.
-    schedule();
-
-    // 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) {}
-    }
-
-    // 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);
+        window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function(){
+          ul = null;
+          try { if (mo) { mo.disconnect(); } } catch(e){}
+          mo = null;
+          initObserver();
+          setTimeout(function(){ scheduleFlush(); }, 80);
+          setTimeout(function(){ scheduleFlush(); }, 450);
         });
       } 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();
 })();
-// ===== /V18 =====
+// ===== /V17.7 =====
 

package/public/style.css

@@ -88,8 +88,8 @@ li.nodebb-ezoic-host > .nodebb-ezoic-wrap.ezoic-ad-between { width: 100%; displa
 
 
 
-/* ===== 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 ===== */
+/* ===== 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.7 ===== */