nodebb-plugin-ezoic-infinite 1.6.19 → 1.6.20

package/package.json

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

package/public/client.js

@@ -1511,205 +1511,147 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V14.2 targeted hook (topic list only) + upscroll reconcile =====
+// ===== V14.3 reconcile by data-ezoic-after (upscroll only, no DOM scanning on downscroll) =====
 (function () {
-  var BETWEEN_SEL = 'div.nodebb-ezoic-wrap.ezoic-ad-between';
   var HOST_CLASS = 'nodebb-ezoic-host';
-  var TOKEN_ATTR = 'data-ezoic-anchor-token';
+  var WRAP_SEL = 'div.nodebb-ezoic-wrap.ezoic-ad-between';
   var TOPIC_LI_SEL = 'li[component="category/topic"]';
-
   var lastY = window.pageYOffset || document.documentElement.scrollTop || 0;
 
-  function token() {
-    try { return String(Date.now()) + '-' + Math.random().toString(16).slice(2); } catch (e) { return String(Date.now()); }
-  }
-
-  function getScrollY() {
+  function getY() {
     return window.pageYOffset || document.documentElement.scrollTop || 0;
   }
 
-  function isTopicList(ul) {
-    try { return !!(ul && ul.querySelector && ul.querySelector(TOPIC_LI_SEL)); } catch (e) { return false; }
-  }
-
-  function closestTopicList(node) {
+  function getTopicList() {
     try {
-      var ul = node && node.closest ? node.closest('ul,ol') : null;
-      if (ul && isTopicList(ul)) return ul;
-      // sometimes wrap is outside: search up
-      var p = node && node.parentElement;
-      while (p) {
-        if ((p.tagName === 'UL' || p.tagName === 'OL') && isTopicList(p)) return p;
-        p = p.parentElement;
-      }
-    } catch (e) {}
-    return null;
+      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; }
   }
 
-  function closestAnchorTopicLi(hostOrWrap, ul) {
+  function ensureValidHostForBetween(wrap) {
+    // Ensure ul/ol does not directly contain div wraps: wrap them in LI host.
     try {
-      var cur = hostOrWrap;
-      if (!cur) return null;
-      // if wrap inside host li, start from host
-      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;
+      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 (!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 (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) {}
+        return host;
       }
     } catch (e) {}
     return null;
   }
 
-  function ensureHostAndTokenForWrap(wrap) {
+  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.
     try {
-      if (!wrap || wrap.nodeType !== 1) return;
-      if (!(wrap.matches && wrap.matches(BETWEEN_SEL))) return;
-
-      var ul = closestTopicList(wrap);
-      if (!ul) return;
-
-      // Ensure wrap is not direct child of UL/OL
-      var host = wrap.closest ? wrap.closest('li.' + HOST_CLASS) : null;
-      if (!host) {
-        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);
-        }
-      }
-
-      if (!host) return;
-
-      // Anchor = previous topic LI only
-      var anchorLi = closestAnchorTopicLi(host, ul);
-      if (!anchorLi) {
-        host.setAttribute('data-ezoic-orphan', '1');
-        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');
-    } catch (e) {}
+      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; }
   }
 
-  function repairInvalidUlChildren(ul) {
+  function reconcileHostsUpScroll() {
+    var ul = getTopicList();
+    if (!ul) return;
+
+    // 1) Repair invalid wraps (cheap)
     try {
-      if (!ul) return;
-      // Fix ul>div wraps
-      var bad = ul.querySelectorAll(':scope > ' + BETWEEN_SEL);
-      bad.forEach(function(wrap){ ensureHostAndTokenForWrap(wrap); });
+      ul.querySelectorAll(':scope > ' + WRAP_SEL).forEach(function(w){ ensureValidHostForBetween(w); });
     } catch (e) {}
-  }
 
-  function cleanupEmptyHosts(ul) {
+    // 2) Only on upscroll: move hosts back to their after-index positions if they drifted.
+    var y = getY();
+    var dy = y - lastY;
+    lastY = y;
+    if (dy >= -10) return;
+
     try {
-      if (!ul) return;
       var hosts = ul.querySelectorAll('li.' + HOST_CLASS);
       hosts.forEach(function(host){
         try {
-          var hasWrap = host.querySelector && host.querySelector(BETWEEN_SEL);
-          if (!hasWrap) host.remove();
-        } catch (e) {}
-      });
-    } catch (e) {}
-  }
+          var wrap = host.querySelector && host.querySelector(WRAP_SEL);
+          if (!wrap) { host.remove(); return; }
 
-  function reconcileUpScroll(ul) {
-    // Only reconcile (move/drop) on upscroll to avoid breaking infinite scroll load calculations.
-    try {
-      if (!ul) return;
-      var y = getScrollY();
-      var dy = y - lastY;
-      lastY = y;
-      if (dy >= -10) return; // not an upscroll
-
-      // Reconcile / drop
-      var hosts = ul.querySelectorAll('li.' + HOST_CLASS + '[' + TOKEN_ATTR + '], li.' + HOST_CLASS + '[data-ezoic-orphan="1"]');
-      hosts.forEach(function(host){
-        try {
-          if (host.getAttribute('data-ezoic-orphan') === '1') { host.remove(); return; }
-          var t = host.getAttribute(TOKEN_ATTR);
-          if (!t) { host.remove(); return; }
-          var anchor = ul.querySelector(TOPIC_LI_SEL + '[' + TOKEN_ATTR + '="' + t + '"]');
-          if (!anchor) { host.remove(); return; }
-          if (host.previousElementSibling !== anchor) anchor.insertAdjacentElement('afterend', host);
+          var afterNum = wrap.getAttribute('data-ezoic-after') || host.getAttribute('data-ezoic-after') || '';
+          if (!afterNum) return;
+
+          var anchor = desiredAnchorByAfter(ul, afterNum);
+          if (!anchor) {
+            // if we can't anchor, remove to prevent piling
+            host.remove();
+            return;
+          }
+
+          if (host.previousElementSibling !== anchor) {
+            anchor.insertAdjacentElement('afterend', host);
+          }
         } catch (e) {}
       });
     } catch (e) {}
   }
 
-  function sweepAll(reasonNode) {
-    try {
-      var ul = closestTopicList(reasonNode || document.querySelector(TOPIC_LI_SEL));
-      if (!ul) return;
-      repairInvalidUlChildren(ul);
-
-      // Tokenize any new wraps within this list
-      ul.querySelectorAll(BETWEEN_SEL).forEach(function(wrap){ ensureHostAndTokenForWrap(wrap); });
-
-      // Don't move on downscroll; only clean empties
-      cleanupEmptyHosts(ul);
-      reconcileUpScroll(ul);
-    } 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;
+    if (pending) return;
+    pending = true;
+    requestAnimationFrame(function(){
+      pending = false;
+      lastRun = Date.now();
+      reconcileHostsUpScroll();
+    });
   }
 
-  // Process mutations incrementally (no full-document scan)
-  function installMO() {
+  function init() {
+    // initial repair only
     try {
-      if (typeof MutationObserver === 'undefined') return;
-      var mo = new MutationObserver(function(muts){
-        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++){
-              var n = m.addedNodes[j];
-              if (!n || n.nodeType !== 1) continue;
-              if (n.matches && n.matches(BETWEEN_SEL)) {
-                ensureHostAndTokenForWrap(n);
-              } else if (n.querySelector && n.querySelector(BETWEEN_SEL)) {
-                n.querySelectorAll(BETWEEN_SEL).forEach(function(w){ ensureHostAndTokenForWrap(w); });
-              }
-            }
-            // light sweep on the container only
-            sweepAll(m.target);
-            break;
-          }
-        }
-      });
-      mo.observe(document.documentElement || document.body, { childList: true, subtree: true });
+      var ul = getTopicList();
+      if (ul) ul.querySelectorAll(':scope > ' + WRAP_SEL).forEach(function(w){ ensureValidHostForBetween(w); });
     } catch (e) {}
-  }
 
-  function init() {
-    // initial tokenizing/repair
-    sweepAll(document);
-    window.addEventListener('scroll', function(){ sweepAll(document); }, { passive: true });
-    window.addEventListener('resize', function(){ sweepAll(document); }, { passive: true });
+    window.addEventListener('scroll', schedule, { passive: true });
+    window.addEventListener('resize', schedule, { passive: true });
 
     if (window.jQuery) {
       window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function(){
-        setTimeout(function(){ sweepAll(document); }, 0);
-        setTimeout(function(){ sweepAll(document); }, 250);
+        setTimeout(schedule, 0);
+        setTimeout(schedule, 300);
       });
     }
-    installMO();
   }
 
   if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
   else init();
 })();
-// ===== /V14.2 =====
+// ===== /V14.3 =====
 

package/public/style.css

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