nodebb-plugin-ezoic-infinite 1.6.24 → 1.6.25

package/package.json

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

package/public/client.js

@@ -1,6 +1,42 @@
 (function () {
   'use strict';
 
+function ezoicClosestTopicLi(el) {
+  try {
+    if (!el) return null;
+    if (el.closest) {
+      return el.closest('li[component="category/topic"]') || el.closest('li');
+    }
+  } catch (e) {}
+  return null;
+}
+
+function ezoicPlaceBetweenInLi(target, wrap) {
+  // Place between-ad WRAP inside the previous topic <li>, not as a sibling in the <ul>.
+  try {
+    var li = ezoicClosestTopicLi(target) || target;
+    if (!li || !wrap) return false;
+
+    // avoid duplicates per anchor+after
+    try {
+      var after = wrap.getAttribute && wrap.getAttribute('data-ezoic-after');
+      if (after && li.querySelector) {
+        var existing = li.querySelector('.nodebb-ezoic-wrap.ezoic-ad-between[data-ezoic-after="' + after + '"]');
+        if (existing && existing !== wrap) {
+          try { wrap.remove(); } catch(e) {}
+          return true;
+        }
+      }
+    } catch (e) {}
+
+    try { wrap.setAttribute('data-ezoic-in-li', '1'); } catch (e) {}
+    li.appendChild(wrap);
+    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;
@@ -668,7 +704,10 @@ function globalGapFixInit() {
     insertingIds.add(id);
     try {
       const wrap = buildWrap(id, kindClass, afterPos, !existingPh);
-      target.insertAdjacentElement('afterend', wrap);
+      if (kindClass === 'ezoic-ad-between') {
+      if (ezoicPlaceBetweenInLi(target, wrap)) return;
+    }
+    target.insertAdjacentElement('afterend', wrap);
 
       // If placeholder exists elsewhere (including pool), move it into the wrapper.
       if (existingPh) {
@@ -1160,7 +1199,10 @@ function buildOrdinalMap(items) {
       if (!anchorEl || !wrap || !wrap.isConnected) return null;
 
       wrap.setAttribute('data-ezoic-after', String(afterPos));
-      anchorEl.insertAdjacentElement('afterend', wrap);
+      if (kindClass === 'ezoic-ad-between') {
+      if (ezoicPlaceBetweenInLi(anchorEl, wrap)) return;
+    }
+    anchorEl.insertAdjacentElement('afterend', wrap);
 
       // Ensure minimal layout impact.
       try { wrap.style.contain = 'layout style paint'; } catch (e) {}
@@ -1511,227 +1553,26 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V14.1.3: Mutation-based reconcile (no scroll listener), place by data-ezoic-after =====
-(function () {
-  var WRAP_SEL = 'div.nodebb-ezoic-wrap.ezoic-ad-between';
-  var HOST_SEL = 'li.nodebb-ezoic-host';
-  var TOPIC_LI_SEL = 'li[component="category/topic"]';
-
-  var freezeUntil = 0;
-  var pending = false;
-  var queue = new Set();
-
-  function now() { return Date.now(); }
-
-  function getTopicList() {
-    try {
-      var topic = document.querySelector(TOPIC_LI_SEL);
-      if (!topic) return null;
-      return topic.closest ? topic.closest('ul,ol') : null;
-    } catch (e) { return null; }
-  }
-
-  function isLoading() {
-    try {
-      if (now() < freezeUntil) return true;
-      return !!document.querySelector('.infinite-loading, .infinite-scroll-loading, .loading-indicator, .spinner, .topic-loading');
-    } catch (e) { return false; }
-  }
-
-  function ensureHostForWrap(wrap, ul) {
-    try {
-      if (!wrap || wrap.nodeType !== 1) return null;
-      if (!(wrap.matches && wrap.matches(WRAP_SEL))) return null;
-      var host = wrap.closest ? wrap.closest(HOST_SEL) : null;
-      if (host) return host;
-      ul = ul || (wrap.closest ? wrap.closest('ul,ol') : null);
-      if (!ul) return null;
-      if (wrap.parentElement === ul) {
-        host = document.createElement('li');
-        host.className = 'nodebb-ezoic-host';
-        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 nthTopic(ul, n) {
-    try {
-      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 previousTopicLi(host) {
-    try {
-      var prev = host.previousElementSibling;
-      while (prev) {
-        if (prev.matches && prev.matches(TOPIC_LI_SEL)) return prev;
-        prev = prev.previousElementSibling;
-      }
-    } catch (e) {}
-    return null;
-  }
-
-  function placeHost(host, ul) {
-    try {
-      if (!host || host.nodeType !== 1) return;
-      ul = ul || host.parentElement;
-      if (!ul) return;
-
-      var wrap = host.querySelector && host.querySelector(WRAP_SEL);
-      if (!wrap) { host.remove(); return; }
-
-      var after = wrap.getAttribute('data-ezoic-after');
-      var anchor = null;
-
-      if (after) {
-        anchor = nthTopic(ul, parseInt(after, 10));
-      }
-      if (!anchor) {
-        anchor = previousTopicLi(host);
-      }
-      if (!anchor) {
-        // Can't place reliably; if host drifted to top area, remove to avoid pile-up.
-        // Otherwise keep as-is.
-        var firstTopic = nthTopic(ul, 1);
-        if (firstTopic && host !== firstTopic && host.compareDocumentPosition(firstTopic) & Node.DOCUMENT_POSITION_FOLLOWING) {
-          host.remove();
-        }
-        return;
-      }
-
-      if (host.previousElementSibling !== anchor) {
-        anchor.insertAdjacentElement('afterend', host);
-      }
-    } catch (e) {}
-  }
-
-  function drain() {
-    pending = false;
-    if (isLoading()) {
-      // retry later
-      scheduleDrain(250);
-      return;
-    }
-    var ul = getTopicList();
-    if (!ul) return;
-
-    // repair invalid ul>div once
-    try {
-      ul.querySelectorAll(':scope > ' + WRAP_SEL).forEach(function(w){
-        var h = ensureHostForWrap(w, ul);
-        if (h) queue.add(h);
-      });
-    } catch (e) {}
-
-    var count = 0;
-    for (var host of Array.from(queue)) {
-      queue.delete(host);
-      placeHost(host, ul);
-      count++;
-      if (count >= 8) break; // keep it light
-    }
-    if (queue.size) scheduleDrain(60);
-  }
-
-  function scheduleDrain(delay) {
-    if (pending) return;
-    pending = true;
-    if (delay) {
-      setTimeout(function(){ requestAnimationFrame(drain); }, delay);
-    } else {
-      requestAnimationFrame(drain);
-    }
-  }
-
-  function enqueueFromNode(node) {
-    try {
-      if (!node || node.nodeType !== 1) return;
-      var ul = getTopicList();
-      if (!ul) return;
-
-      if (node.matches && node.matches(WRAP_SEL)) {
-        var h = ensureHostForWrap(node, ul) || (node.closest ? node.closest(HOST_SEL) : null);
-        if (h) queue.add(h);
-      } else if (node.matches && node.matches(HOST_SEL)) {
-        queue.add(node);
-      } else if (node.querySelectorAll) {
-        node.querySelectorAll(WRAP_SEL).forEach(function(w){
-          var h2 = ensureHostForWrap(w, ul) || (w.closest ? w.closest(HOST_SEL) : null);
-          if (h2) queue.add(h2);
-        });
-        node.querySelectorAll(HOST_SEL).forEach(function(h3){ queue.add(h3); });
-      }
-    } catch (e) {}
-  }
-
-  function init() {
-    // initial scan (light)
-    try {
-      var ul = getTopicList();
-      if (ul) {
-        ul.querySelectorAll(WRAP_SEL).forEach(function(w){
-          var h = ensureHostForWrap(w, ul) || (w.closest ? w.closest(HOST_SEL) : null);
-          if (h) queue.add(h);
-        });
-        scheduleDrain(0);
-      }
-    } catch (e) {}
-
-    // Observe ONLY the topic list container once available
-    try {
-      if (typeof MutationObserver !== 'undefined') {
-        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++){
-                enqueueFromNode(m.addedNodes[j]);
-              }
-              scheduleDrain(0);
-            }
-          }
-        });
-
-        var ul = getTopicList();
-        if (ul) mo.observe(ul, { childList:true, subtree:true });
-        else {
-          // wait for ajaxify
-          var mo2 = new MutationObserver(function(){
-            var u2 = getTopicList();
-            if (u2) {
-              try { mo.observe(u2, { childList:true, subtree:true }); } catch(e){}
-              try { mo2.disconnect(); } catch(e){}
-            }
-          });
-          mo2.observe(document.documentElement || document.body, { childList:true, subtree:true });
-        }
-      }
-    } catch (e) {}
-
-    if (window.jQuery) {
+// ===== V15 one-shot repair (no heavy observers) =====
+function ezoicRepairBetweenPlacement() {
+  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){
       try {
-        window.jQuery(window).on('action:infiniteScroll.loaded action:ajaxify.end', function(){
-          freezeUntil = now() + 900; // allow NodeBB to settle
-          // then reconcile any drift
-          setTimeout(function(){ scheduleDrain(0); }, 950);
-        });
+        var prev = wrap.previousElementSibling;
+        if (prev) ezoicPlaceBetweenInLi(prev, wrap);
       } catch (e) {}
-    }
-  }
-
-  if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
-  else init();
-})();
-// ===== /V14.1.3 =====
+    });
+  } catch (e) {}
+}
+try { ezoicRepairBetweenPlacement(); } catch (e) {}
+if (window.jQuery) {
+  try {
+    window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function(){
+      setTimeout(function(){ try { ezoicRepairBetweenPlacement(); } catch(e) {} }, 0);
+      setTimeout(function(){ try { ezoicRepairBetweenPlacement(); } catch(e) {} }, 250);
+    });
+  } catch (e) {}
+}
+// ===== /V15 =====
 

package/public/style.css

@@ -81,7 +81,15 @@
 }
 
 
-/* ===== V14.1.3 host ===== */
-li.nodebb-ezoic-host { list-style: none; width: 100%; }
-/* ===== /V14.1.3 ===== */
+/* ===== V15 between in li ===== */
+li[component="category/topic"] > .nodebb-ezoic-wrap.ezoic-ad-between[data-ezoic-in-li="1"] {
+  display: block;
+  width: 100%;
+  margin-top: 12px;
+  margin-bottom: 12px;
+}
+li[component="category/topic"] > .nodebb-ezoic-wrap.ezoic-ad-between[data-ezoic-in-li="1"] * {
+  max-width: 100%;
+}
+/* ===== /V15 ===== */