nodebb-plugin-ezoic-infinite 1.6.26 → 1.6.28

package/package.json

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

package/public/client.js

@@ -1,43 +1,6 @@
 (function () {
   'use strict';
 
-function ezoicInsertAfterTopicHost(target, wrap, kindClass) {
-  try {
-    if (!target || !wrap) return false;
-    if (kindClass !== 'ezoic-ad-between') return false;
-
-    // Ensure we insert a LI host that looks like a topic item so NodeBB list virtualization keeps ordering.
-    var anchorLi = target.closest ? (target.closest('li[component="category/topic"]') || target.closest('li')) : null;
-    if (!anchorLi && target.tagName === 'LI') anchorLi = target;
-    if (!anchorLi) return false;
-
-    var ul = anchorLi.parentElement;
-    if (!ul || !(ul.tagName === 'UL' || ul.tagName === 'OL')) return false;
-
-    // If wrap already hosted, do nothing
-    var existingHost = wrap.closest ? wrap.closest('li.nodebb-ezoic-host') : null;
-    if (existingHost) return true;
-
-    var host = document.createElement('li');
-    host.className = 'nodebb-ezoic-host';
-    // mimic topic list item so NodeBB doesn't relocate it
-    host.setAttribute('component', 'category/topic');
-    host.setAttribute('data-ezoic-host', 'between');
-    host.style.listStyle = 'none';
-    host.style.width = '100%';
-
-    // Insert host after anchorLi
-    if (anchorLi.insertAdjacentElement) anchorLi.insertAdjacentElement('afterend', host);
-    else ul.insertBefore(host, anchorLi.nextSibling);
-
-    host.appendChild(wrap);
-    try { wrap.style.width = '100%'; } catch (e) {}
-    return true;
-  } catch (e) {}
-  return false;
-}
-
-
   // Track scroll direction to avoid aggressive recycling when the user scrolls upward.
   // Recycling while scrolling up is a common cause of ads "bunching" and a "disappearing too fast" feeling.
   let lastScrollY = 0;
@@ -705,8 +668,7 @@ function globalGapFixInit() {
     insertingIds.add(id);
     try {
       const wrap = buildWrap(id, kindClass, afterPos, !existingPh);
-      if (ezoicInsertAfterTopicHost(target, wrap, kindClass)) return;
-    target.insertAdjacentElement('afterend', wrap);
+      target.insertAdjacentElement('afterend', wrap);
 
       // If placeholder exists elsewhere (including pool), move it into the wrapper.
       if (existingPh) {
@@ -1198,8 +1160,7 @@ function buildOrdinalMap(items) {
       if (!anchorEl || !wrap || !wrap.isConnected) return null;
 
       wrap.setAttribute('data-ezoic-after', String(afterPos));
-      if (ezoicInsertAfterTopicHost(anchorEl, wrap, kindClass)) return;
-    anchorEl.insertAdjacentElement('afterend', wrap);
+      anchorEl.insertAdjacentElement('afterend', wrap);
 
       // Ensure minimal layout impact.
       try { wrap.style.contain = 'layout style paint'; } catch (e) {}
@@ -1550,27 +1511,184 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V16 repair invalid UL children (between) =====
-function ezoicRepairBetweenHosts() {
-  try {
-    var bad = document.querySelectorAll('ul > div.nodebb-ezoic-wrap.ezoic-ad-between, ol > div.nodebb-ezoic-wrap.ezoic-ad-between');
-    bad.forEach(function(wrap){
+// ===== V17 minimal pile-fix (no insert hooks) =====
+(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;
+
+  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; }
+  }
+
+  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;
+      if (!(wrap.matches && wrap.matches(BETWEEN_WRAP_SEL))) return 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;
+
+      // 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%';
+        ul.insertBefore(host, wrap);
+        host.appendChild(wrap);
+        try { wrap.style.width = '100%'; } catch (e) {}
+        return host;
+      }
+    } catch (e) {}
+    return null;
+  }
+
+  function previousTopicLi(node) {
+    try {
+      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.
+    try {
+      var kids = ul.children;
+      var run = 0;
+      var maxRun = 0;
+      for (var i = 0; i < kids.length; 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;
+        }
+      }
+      return maxRun >= 2;
+    } catch (e) {}
+    return false;
+  }
+
+  function redistribute(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 2: only act if we see pile-up (avoid touching infinite scroll during normal flow)
+      if (!detectPileUp(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) {}
+      });
+    } catch (e) {}
+  }
+
+  function schedule(reason) {
+    var now = Date.now();
+    if (now - lastRun < COOLDOWN) return;
+    if (scheduled) return;
+    scheduled = true;
+    requestAnimationFrame(function () {
+      scheduled = false;
+      lastRun = Date.now();
       try {
-        var prev = wrap.previousElementSibling;
-        if (!prev) return;
-        ezoicInsertAfterTopicHost(prev, wrap, 'ezoic-ad-between');
+        var ul = getTopicList();
+        if (!ul) return;
+        redistribute(ul);
       } catch (e) {}
     });
-  } catch (e) {}
-}
-try { ezoicRepairBetweenHosts(); } catch (e) {}
-if (window.jQuery) {
-  try {
-    window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function(){
-      setTimeout(function(){ try { ezoicRepairBetweenHosts(); } catch(e) {} }, 0);
-      setTimeout(function(){ try { ezoicRepairBetweenHosts(); } catch(e) {} }, 250);
-    });
-  } catch (e) {}
-}
-// ===== /V16 =====
+  }
+
+  function init() {
+    schedule('init');
+
+    // Observe only the topic list once available
+    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 });
+        }
+      }
+    } 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);
+        });
+      } catch (e) {}
+    }
+  }
+
+  if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
+  else init();
+})();
+// ===== /V17 =====
 

package/public/style.css

@@ -81,14 +81,8 @@
 }
 
 
-/* ===== V16 host topic li ===== */
-li.nodebb-ezoic-host[component="category/topic"]{
-  list-style:none;
-  width:100%;
-}
-/* ensure host doesn't inherit topic card layout */
-li.nodebb-ezoic-host[component="category/topic"] > .nodebb-ezoic-wrap.ezoic-ad-between{
-  width:100%;
-}
-/* ===== /V16 ===== */
+/* ===== 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 ===== */