nodebb-plugin-ezoic-infinite 1.6.28 → 1.6.30

package/package.json

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

package/public/client.js

@@ -1511,16 +1511,23 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V17 minimal pile-fix (no insert hooks) =====
+
+
+
+// ===== V17.2: Up-scroll "rehome" by data-ezoic-after (keeps injection intact) =====
 (function () {
-  // Goal: keep ad injection intact. Only repair when we detect "pile-up" of between wraps.
   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 lastY = window.pageYOffset || document.documentElement.scrollTop || 0;
   var scheduled = false;
   var lastRun = 0;
-  var COOLDOWN = 180;
+  var COOLDOWN = 160;
+
+  function getY() {
+    return window.pageYOffset || document.documentElement.scrollTop || 0;
+  }
 
   function getTopicList() {
     try {
@@ -1530,10 +1537,6 @@ function buildOrdinalMap(items) {
     } catch (e) { return null; }
   }
 
-  function isHost(node) {
-    return !!(node && node.nodeType === 1 && node.tagName === 'LI' && node.classList && node.classList.contains(HOST_CLASS));
-  }
-
   function ensureHostForWrap(wrap, ul) {
     try {
       if (!wrap || wrap.nodeType !== 1) return null;
@@ -1545,13 +1548,16 @@ function buildOrdinalMap(items) {
       if (!ul) ul = wrap.closest ? wrap.closest('ul,ol') : null;
       if (!ul || !(ul.tagName === 'UL' || ul.tagName === 'OL')) return null;
 
-      // Only wrap if direct child of list (invalid / fragile)
       if (wrap.parentElement === ul) {
         host = document.createElement('li');
         host.className = HOST_CLASS;
         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);
         host.appendChild(wrap);
         try { wrap.style.width = '100%'; } catch (e) {}
@@ -1561,66 +1567,98 @@ function buildOrdinalMap(items) {
     return null;
   }
 
-  function previousTopicLi(node) {
+  function nthTopic(ul, n) {
     try {
-      var prev = node.previousElementSibling;
-      while (prev) {
-        if (prev.matches && prev.matches(TOPIC_LI_SEL)) return prev;
-        // skip other hosts/wraps
-        prev = prev.previousElementSibling;
+      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 getAfterValue(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;
   }
 
-  function detectPileUp(ul) {
-    // Pile-up signature: 2+ between wraps/hosts adjacent with no topics between, often near top.
+  function isTopPiled(ul) {
     try {
       var kids = ul.children;
-      var run = 0;
-      var maxRun = 0;
-      for (var i = 0; i < kids.length; i++) {
+      var limit = Math.min(kids.length, 50);
+      var run = 0, maxRun = 0;
+      for (var i=0;i<limit;i++){
         var el = kids[i];
-        var isBetween = false;
-        if (isHost(el)) {
-          isBetween = !!(el.querySelector && el.querySelector(BETWEEN_WRAP_SEL));
+        var isAd = false;
+        if (el.tagName === 'LI' && el.classList && el.classList.contains(HOST_CLASS)) {
+          isAd = !!(el.querySelector && el.querySelector(BETWEEN_WRAP_SEL));
         } else if (el.matches && el.matches(BETWEEN_WRAP_SEL)) {
-          isBetween = true;
-        }
-        if (isBetween) {
-          run++;
-          if (run > maxRun) maxRun = run;
-        } else if (el.matches && el.matches(TOPIC_LI_SEL)) {
-          run = 0;
-        } else {
-          // other nodes reset lightly
-          run = 0;
+          isAd = true;
         }
+
+        if (isAd) { run++; if (run>maxRun) maxRun=run; }
+        else if (el.matches && el.matches(TOPIC_LI_SEL)) { run = 0; }
+        else { run = 0; }
       }
       return maxRun >= 2;
     } catch (e) {}
     return false;
   }
 
-  function redistribute(ul) {
+  function rehomeByAfter(ul) {
     try {
       if (!ul) return;
 
-      // Step 1: wrap any direct child between DIVs into LI hosts (makes list stable)
-      ul.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); });
+      try {
+        ul.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); });
+      } catch (e) {}
 
-      // Step 2: only act if we see pile-up (avoid touching infinite scroll during normal flow)
-      if (!detectPileUp(ul)) return;
+      if (!isTopPiled(ul)) return;
 
-      // Move each host to immediately after the closest previous topic LI at its current position.
-      var hosts = ul.querySelectorAll(':scope > li.' + HOST_CLASS);
-      hosts.forEach(function(host){
-        try {
-          var wrap = host.querySelector && host.querySelector(BETWEEN_WRAP_SEL);
-          if (!wrap) return;
+      var kids = ul.children;
+      var limit = Math.min(kids.length, 80);
+      var topHosts = [];
+      for (var i=0;i<limit;i++){
+        var el = kids[i];
+        if (el.tagName === 'LI' && el.classList && el.classList.contains(HOST_CLASS)) {
+          var wrap = el.querySelector && el.querySelector(BETWEEN_WRAP_SEL);
+          if (wrap) topHosts.push(el);
+        }
+      }
+      if (!topHosts.length) return;
+
+      topHosts.sort(function(a,b){
+        var aa = getAfterValue(a);
+        var bb = getAfterValue(b);
+        if (aa == null && bb == null) return 0;
+        if (aa == null) return 1;
+        if (bb == null) return -1;
+        return aa - bb;
+      });
 
-          var anchor = previousTopicLi(host);
-          if (!anchor) return; // if none, don't move (prevents yanking to top/bottom)
+      topHosts.forEach(function(host){
+        try {
+          var after = getAfterValue(host);
+          var anchor = null;
+          if (after != null) anchor = nthTopic(ul, after);
+
+          if (!anchor) {
+            var prev = host.previousElementSibling;
+            while (prev) {
+              if (prev.matches && prev.matches(TOPIC_LI_SEL)) { anchor = prev; break; }
+              prev = prev.previousElementSibling;
+            }
+          }
+          if (!anchor) return;
 
           if (host.previousElementSibling !== anchor) {
             anchor.insertAdjacentElement('afterend', host);
@@ -1630,58 +1668,44 @@ function buildOrdinalMap(items) {
     } catch (e) {}
   }
 
-  function schedule(reason) {
+  function schedule() {
     var now = Date.now();
     if (now - lastRun < COOLDOWN) return;
     if (scheduled) return;
     scheduled = true;
-    requestAnimationFrame(function () {
+    requestAnimationFrame(function(){
       scheduled = false;
       lastRun = Date.now();
-      try {
-        var ul = getTopicList();
-        if (!ul) return;
-        redistribute(ul);
-      } catch (e) {}
+      var ul = getTopicList();
+      if (!ul) return;
+      rehomeByAfter(ul);
     });
   }
 
-  function init() {
-    schedule('init');
+  function onScroll() {
+    var y = getY();
+    var dy = y - lastY;
+    lastY = y;
+    if (dy < -8 && y < 900) schedule();
+  }
 
-    // Observe only the topic list once available
+  function init() {
     try {
-      if (typeof MutationObserver !== 'undefined') {
-        var observeList = function(ul){
-          if (!ul) return;
-          var mo = new MutationObserver(function(muts){
-            // schedule on any change; redistribute() itself is guarded by pile-up detection
-            schedule('mo');
-          });
-          mo.observe(ul, { childList: true, subtree: true });
-        };
-
-        var ul = getTopicList();
-        if (ul) observeList(ul);
-        else {
-          var mo2 = new MutationObserver(function(){
-            var u2 = getTopicList();
-            if (u2) {
-              try { observeList(u2); } catch(e){}
-              try { mo2.disconnect(); } catch(e){}
-            }
-          });
-          mo2.observe(document.documentElement || document.body, { childList: true, subtree: true });
-        }
-      }
+      var ul = getTopicList();
+      if (ul) ul.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); });
     } catch (e) {}
 
-    // NodeBB events: run after infinite scroll batches
+    window.addEventListener('scroll', onScroll, { passive:true });
+
     if (window.jQuery) {
       try {
         window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function(){
-          setTimeout(function(){ schedule('event'); }, 50);
-          setTimeout(function(){ schedule('event2'); }, 400);
+          setTimeout(function(){
+            try {
+              var ul = getTopicList();
+              if (ul) ul.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); });
+            } catch(e){}
+          }, 50);
         });
       } catch (e) {}
     }
@@ -1690,5 +1714,5 @@ function buildOrdinalMap(items) {
   if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
   else init();
 })();
-// ===== /V17 =====
+// ===== /V17.2 =====
 

package/public/style.css

@@ -86,3 +86,10 @@ 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 ===== */
 
+
+
+/* ===== V17.2 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.2 ===== */
+