nodebb-plugin-ezoic-infinite 1.6.27 → 1.6.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "1.6.27",
+  "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,93 +1,6 @@
 (function () {
   'use strict';
 
-function ezoicEnsureBetweenHost(anchorLi, wrap) {
-  try {
-    if (!anchorLi || !wrap) return null;
-    var ul = anchorLi.parentElement;
-    if (!ul || !(ul.tagName === 'UL' || ul.tagName === 'OL')) return null;
-
-    // already hosted?
-    var host = wrap.closest ? wrap.closest('li.nodebb-ezoic-host') : null;
-    if (host) return host;
-
-    host = document.createElement('li');
-    host.className = 'nodebb-ezoic-host';
-    host.setAttribute('role', 'listitem');
-    host.style.listStyle = 'none';
-    host.style.width = '100%';
-
-    // copy after position for later repairs
-    try {
-      var after = wrap.getAttribute && wrap.getAttribute('data-ezoic-after');
-      if (after) host.setAttribute('data-ezoic-after', after);
-    } catch (e) {}
-
-    anchorLi.insertAdjacentElement('afterend', host);
-    host.appendChild(wrap);
-    try { wrap.style.width = '100%'; } catch (e) {}
-    return host;
-  } catch (e) {}
-  return null;
-}
-
-function ezoicDesiredAnchorForAfter(ul, afterNum) {
-  try {
-    var n = parseInt(afterNum, 10);
-    if (!n || n < 1) return null;
-    var topics = ul.querySelectorAll('li[component="category/topic"]');
-    if (!topics || !topics.length) return null;
-    if (n > topics.length) n = topics.length;
-    return topics[n-1] || null;
-  } catch (e) {}
-  return null;
-}
-
-function ezoicRepairBetweenHosts() {
-  // Reposition between hosts if NodeBB moved them (e.g., to the top/bottom) after virtualized rerender.
-  try {
-    var ul = document.querySelector('li[component="category/topic"]')?.closest('ul,ol');
-    if (!ul) return;
-
-    // 1) fix invalid ul>div wraps
-    ul.querySelectorAll(':scope > div.nodebb-ezoic-wrap.ezoic-ad-between').forEach(function(wrap){
-      try {
-        var prev = wrap.previousElementSibling;
-        if (prev && prev.tagName === 'LI') {
-          ezoicEnsureBetweenHost(prev, wrap);
-        }
-      } catch(e){}
-    });
-
-    // 2) ensure every between wrap is hosted (but don't scan whole document)
-    ul.querySelectorAll('div.nodebb-ezoic-wrap.ezoic-ad-between').forEach(function(wrap){
-      try {
-        var host = wrap.closest ? wrap.closest('li.nodebb-ezoic-host') : null;
-        if (!host) {
-          var prev = wrap.closest ? wrap.closest('li') : null;
-          if (prev) ezoicEnsureBetweenHost(prev, wrap);
-        }
-      } catch(e){}
-    });
-
-    // 3) reposition hosts based on data-ezoic-after (stable intent)
-    ul.querySelectorAll('li.nodebb-ezoic-host').forEach(function(host){
-      try {
-        var wrap = host.querySelector && host.querySelector('div.nodebb-ezoic-wrap.ezoic-ad-between');
-        if (!wrap) { host.remove(); return; }
-        var after = host.getAttribute('data-ezoic-after') || wrap.getAttribute('data-ezoic-after');
-        if (!after) return;
-        var anchor = ezoicDesiredAnchorForAfter(ul, after);
-        if (!anchor) return;
-        if (host.previousElementSibling !== anchor) {
-          anchor.insertAdjacentElement('afterend', host);
-        }
-      } catch(e){}
-    });
-  } catch (e) {}
-}
-
-
   // 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;
@@ -755,11 +668,7 @@ function globalGapFixInit() {
     insertingIds.add(id);
     try {
       const wrap = buildWrap(id, kindClass, afterPos, !existingPh);
-      if (kindClass === 'ezoic-ad-between') {
-      var aLi = (target.closest ? (target.closest('li[component="category/topic"]') || target.closest('li')) : null) || (target.tagName==='LI'?target:null);
-      if (aLi) { ezoicEnsureBetweenHost(aLi, wrap); return; }
-    }
-    target.insertAdjacentElement('afterend', wrap);
+      target.insertAdjacentElement('afterend', wrap);
 
       // If placeholder exists elsewhere (including pool), move it into the wrapper.
       if (existingPh) {
@@ -1251,11 +1160,7 @@ function buildOrdinalMap(items) {
       if (!anchorEl || !wrap || !wrap.isConnected) return null;
 
       wrap.setAttribute('data-ezoic-after', String(afterPos));
-      if (kindClass === 'ezoic-ad-between') {
-      var aLi = (anchorEl.closest ? (anchorEl.closest('li[component="category/topic"]') || anchorEl.closest('li')) : null) || (anchorEl.tagName==='LI'?anchorEl:null);
-      if (aLi) { ezoicEnsureBetweenHost(aLi, wrap); return; }
-    }
-    anchorEl.insertAdjacentElement('afterend', wrap);
+      anchorEl.insertAdjacentElement('afterend', wrap);
 
       // Ensure minimal layout impact.
       try { wrap.style.contain = 'layout style paint'; } catch (e) {}
@@ -1606,16 +1511,184 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V16.1 event-based repair (no scroll, no heavy observers) =====
-try { ezoicRepairBetweenHosts(); } catch(e) {}
-if (window.jQuery) {
-  try {
-    window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function(){
-      // Let NodeBB settle before repositioning
-      setTimeout(function(){ try { ezoicRepairBetweenHosts(); } catch(e) {} }, 150);
-      setTimeout(function(){ try { ezoicRepairBetweenHosts(); } catch(e) {} }, 700);
+// ===== 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 ul = getTopicList();
+        if (!ul) return;
+        redistribute(ul);
+      } catch (e) {}
     });
-  } catch(e) {}
-}
-// ===== /V16.1 =====
+  }
+
+  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,8 +81,8 @@
 }
 
 
-/* ===== V16.1 host li ===== */
-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; }
-/* ===== /V16.1 ===== */
+/* ===== 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 ===== */