nodebb-plugin-ezoic-infinite 1.6.28 → 1.6.29

package/package.json

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

package/public/client.js

@@ -1511,16 +1511,21 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V17 minimal pile-fix (no insert hooks) =====
+// ===== V17.1 upscroll-only top pile-up fixer (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 scheduled = false;
   var lastRun = 0;
-  var COOLDOWN = 180;
+  var COOLDOWN = 140;
+
+  var lastY = window.pageYOffset || document.documentElement.scrollTop || 0;
+
+  function getY() {
+    return window.pageYOffset || document.documentElement.scrollTop || 0;
+  }
 
   function getTopicList() {
     try {
@@ -1535,6 +1540,7 @@ function buildOrdinalMap(items) {
   }
 
   function ensureHostForWrap(wrap, ul) {
+    // only wrap invalid ul>div cases; do not interfere with normal injection
     try {
       if (!wrap || wrap.nodeType !== 1) return null;
       if (!(wrap.matches && wrap.matches(BETWEEN_WRAP_SEL))) return null;
@@ -1545,7 +1551,6 @@ 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;
@@ -1566,67 +1571,59 @@ function buildOrdinalMap(items) {
       var prev = node.previousElementSibling;
       while (prev) {
         if (prev.matches && prev.matches(TOPIC_LI_SEL)) return prev;
-        // skip other hosts/wraps
         prev = prev.previousElementSibling;
       }
     } catch (e) {}
     return null;
   }
 
-  function detectPileUp(ul) {
-    // Pile-up signature: 2+ between wraps/hosts adjacent with no topics between, often near top.
+  function detectTopPileUp(ul) {
+    // Detect a pile-up near the top: within first ~40 children, find 2+ between ads without topics between.
     try {
       var kids = ul.children;
+      var limit = Math.min(kids.length, 40);
       var run = 0;
       var maxRun = 0;
-      for (var i = 0; i < kids.length; i++) {
+      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));
-        } 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;
-        }
+        if (isHost(el)) isBetween = !!(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 { run=0; }
       }
       return maxRun >= 2;
     } catch (e) {}
     return false;
   }
 
-  function redistribute(ul) {
+  function redistributeTopPile(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); });
+      // Step 0: wrap invalid top-level between divs
+      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 (!detectTopPileUp(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 anchor = previousTopicLi(host);
-          if (!anchor) return; // if none, don't move (prevents yanking to top/bottom)
-
-          if (host.previousElementSibling !== anchor) {
-            anchor.insertAdjacentElement('afterend', host);
-          }
-        } catch (e) {}
-      });
+      // Only move hosts that are currently in the top region (first 60 list children).
+      var kids = ul.children;
+      var limit = Math.min(kids.length, 60);
+      for (var i=0;i<limit;i++){
+        var el = kids[i];
+        if (!isHost(el)) continue;
+        var host = el;
+        var wrap = host.querySelector && host.querySelector(BETWEEN_WRAP_SEL);
+        if (!wrap) continue;
+
+        var anchor = previousTopicLi(host);
+        if (!anchor) continue;
+        if (host.previousElementSibling !== anchor) {
+          anchor.insertAdjacentElement('afterend', host);
+        }
+      }
     } catch (e) {}
   }
 
@@ -1635,60 +1632,55 @@ function buildOrdinalMap(items) {
     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);
+        redistributeTopPile(ul);
       } catch (e) {}
     });
   }
 
+  function onScroll() {
+    var y = getY();
+    var dy = y - lastY;
+    lastY = y;
+
+    // Only act on upscroll (when the pile-up manifests)
+    if (dy < -6) schedule('upscroll');
+  }
+
   function init() {
+    // Initial repair does nothing unless pile-up already present.
     schedule('init');
 
-    // Observe only the topic list once available
+    window.addEventListener('scroll', onScroll, { passive: true });
+
+    // MutationObserver on list (guarded; redistribution only runs on upscroll)
     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 });
+        if (ul) {
+          var mo = new MutationObserver(function(){ /* no immediate redistribution */ });
+          mo.observe(ul, { childList:true, subtree:true });
         }
       }
     } catch (e) {}
 
-    // NodeBB events: run after infinite scroll batches
     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);
+          // don't touch during downscroll load; just re-evaluate when user scrolls up
+          setTimeout(function(){ schedule('event'); }, 0);
         });
-      } catch (e) {}
+      } catch(e){}
     }
   }
 
   if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
   else init();
 })();
-// ===== /V17 =====
+// ===== /V17.1 =====
 

package/public/style.css

@@ -81,8 +81,8 @@
 }
 
 
-/* ===== V17 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 ===== */
+/* ===== V17.1 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.1 ===== */