nodebb-plugin-ezoic-infinite 1.6.17 → 1.6.18

package/package.json

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

package/public/client.js

@@ -1,116 +1,6 @@
 (function () {
   'use strict';
 
-function ezoicAnchorToken() {
-  // cheap unique-ish token
-  try { return String(Date.now()) + '-' + Math.random().toString(16).slice(2); } catch (e) { return String(Date.now()); }
-}
-
-function ezoicInsertAfterWithToken(target, wrap, kindClass) {
-  try {
-    if (!target || !wrap) return;
-
-    // Tag the anchor LI (topic item) with a stable token the first time we attach a between ad to it.
-    // If NodeBB re-renders/virtualizes and recreates the LI, this tag disappears => we can drop orphan ads.
-    var anchorLi = null;
-    try { anchorLi = target.closest ? target.closest('li') : null; } catch (e) {}
-    if (!anchorLi && target.tagName === 'LI') anchorLi = target;
-
-    if (kindClass === 'ezoic-ad-between' && anchorLi) {
-      var token = anchorLi.getAttribute('data-ezoic-anchor-token');
-      if (!token) {
-        token = ezoicAnchorToken();
-        try { anchorLi.setAttribute('data-ezoic-anchor-token', token); } catch (e) {}
-      }
-
-      // If inside UL/OL, keep valid DOM with LI host, but keep wrap as DIV (compat).
-      var p = anchorLi.parentElement;
-      if (p && (p.tagName === 'UL' || p.tagName === 'OL')) {
-        var host = document.createElement('li');
-        host.className = 'nodebb-ezoic-host';
-        host.setAttribute('role', 'listitem');
-        host.style.listStyle = 'none';
-        host.style.width = '100%';
-        try { host.setAttribute('data-ezoic-anchor-token', token); } catch (e) {}
-
-        if (anchorLi.insertAdjacentElement) anchorLi.insertAdjacentElement('afterend', host);
-        else if (p.insertBefore) p.insertBefore(host, anchorLi.nextSibling);
-
-        try { host.appendChild(wrap); } catch (e) {}
-        try { wrap.style.width = '100%'; } catch (e) {}
-        return;
-      }
-
-      // Non-list parent: just insert sibling but still tag wrap so we can reconcile
-      try { wrap.setAttribute('data-ezoic-anchor-token', token); } catch (e) {}
-    }
-
-    if (target.insertAdjacentElement) ezoicInsertAfterWithToken(target, wrap, kindClass);
-    else if (target.parentNode) target.parentNode.insertBefore(wrap, target.nextSibling);
-  } catch (e) {}
-}
-
-function ezoicRepairBetweenWrapsToHost() {
-  // Repair any invalid UL children and ensure hosts/wraps carry token if possible.
-  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 {
-        var ul = wrap.parentElement;
-        if (!ul) return;
-        var prevLi = wrap.previousElementSibling && wrap.previousElementSibling.tagName === 'LI' ? wrap.previousElementSibling : null;
-        var token = prevLi ? prevLi.getAttribute('data-ezoic-anchor-token') : null;
-        if (!token && prevLi) {
-          token = ezoicAnchorToken();
-          prevLi.setAttribute('data-ezoic-anchor-token', token);
-        }
-
-        var host = document.createElement('li');
-        host.className = 'nodebb-ezoic-host';
-        host.setAttribute('role', 'listitem');
-        host.style.listStyle = 'none';
-        host.style.width = '100%';
-        if (token) host.setAttribute('data-ezoic-anchor-token', token);
-
-        ul.insertBefore(host, wrap);
-        host.appendChild(wrap);
-        wrap.style.width = '100%';
-      } catch (e) {}
-    });
-  } catch (e) {}
-}
-
-function ezoicReconcileOrDropHostsByToken(scope) {
-  // Core fix: if NodeBB virtualizes and anchors disappear, DROP hosts so they can't pile up at top.
-  // If anchor exists, ensure host sits right after it.
-  try {
-    var root = scope || document;
-    var hosts = root.querySelectorAll('li.nodebb-ezoic-host[data-ezoic-anchor-token]');
-    if (!hosts || !hosts.length) return;
-
-    hosts.forEach(function(host){
-      try {
-        var token = host.getAttribute('data-ezoic-anchor-token');
-        if (!token) return;
-        var listEl = host.parentElement;
-        if (!listEl) return;
-
-        // Find the exact anchor LI that still carries the token.
-        var anchor = listEl.querySelector('li[data-ezoic-anchor-token="' + token + '"]');
-        if (!anchor) {
-          // anchor not in DOM => virtualized/re-rendered: remove host to avoid stacking
-          host.remove();
-          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;
@@ -778,7 +668,7 @@ function globalGapFixInit() {
     insertingIds.add(id);
     try {
       const wrap = buildWrap(id, kindClass, afterPos, !existingPh);
-      ezoicInsertAfterWithToken(target, wrap, kindClass);
+      target.insertAdjacentElement('afterend', wrap);
 
       // If placeholder exists elsewhere (including pool), move it into the wrapper.
       if (existingPh) {
@@ -1270,7 +1160,7 @@ function buildOrdinalMap(items) {
       if (!anchorEl || !wrap || !wrap.isConnected) return null;
 
       wrap.setAttribute('data-ezoic-after', String(afterPos));
-      ezoicInsertAfterWithToken(anchorEl, wrap, kindClass);
+      anchorEl.insertAdjacentElement('afterend', wrap);
 
       // Ensure minimal layout impact.
       try { wrap.style.contain = 'layout style paint'; } catch (e) {}
@@ -1620,49 +1510,173 @@ function buildOrdinalMap(items) {
 })();
 
 
-// ===== V14 token reconcile scheduler =====
-(function(){
-  var pending=false, last=0, COOLDOWN=140;
-  function schedule(scope){
-    var now=Date.now();
-    if (now-last<COOLDOWN) return;
-    if (pending) return;
-    pending=true;
-    requestAnimationFrame(function(){
-      pending=false; last=Date.now();
-      try { ezoicRepairBetweenWrapsToHost(); } catch(e) {}
-      try { ezoicReconcileOrDropHostsByToken(scope); } catch(e) {}
-    });
+
+// ===== V14.1 Hook any between-wrap and tether to nearest topic LI =====
+(function () {
+  var BETWEEN_SEL = 'div.nodebb-ezoic-wrap.ezoic-ad-between';
+  var HOST_CLASS = 'nodebb-ezoic-host';
+  var TOKEN_ATTR = 'data-ezoic-anchor-token';
+  var pendingSweep = false;
+  var lastSweep = 0;
+  var COOLDOWN = 120;
+
+  function token() {
+    try { return String(Date.now()) + '-' + Math.random().toString(16).slice(2); } catch (e) { return String(Date.now()); }
+  }
+
+  function closestTopicLi(node) {
+    // Find the topic <li> that this wrap should be associated with:
+    // prefer previous sibling <li> that is NOT a host, else climb to nearest previous in the list.
+    try {
+      if (!node) return null;
+      var cur = node;
+      // If wrap is inside a host li, start from host
+      if (cur.closest) {
+        var host = cur.closest('li.' + HOST_CLASS);
+        if (host) cur = host;
+      }
+      // Find list container
+      var ul = cur.parentElement;
+      while (ul && !(ul.tagName === 'UL' || ul.tagName === 'OL')) ul = ul.parentElement;
+      if (!ul) return null;
+
+      // Start from current element position within ul
+      var prev = cur.previousElementSibling;
+      while (prev) {
+        if (prev.tagName === 'LI' && !(prev.classList && prev.classList.contains(HOST_CLASS))) return prev;
+        prev = prev.previousElementSibling;
+      }
+    } catch (e) {}
+    return null;
   }
 
-  window.addEventListener('scroll', function(){ schedule(document); }, { passive:true });
-  window.addEventListener('resize', function(){ schedule(document); }, { passive:true });
+  function ensureHostForWrap(wrap) {
+    try {
+      if (!wrap || wrap.nodeType !== 1) return;
+      if (!(wrap.matches && wrap.matches(BETWEEN_SEL))) return;
+
+      // Already in a host?
+      var host = wrap.closest ? wrap.closest('li.' + HOST_CLASS) : null;
+      var ul = wrap.parentElement;
+      while (ul && !(ul.tagName === 'UL' || ul.tagName === 'OL')) ul = ul.parentElement;
+      if (!ul) return;
+
+      // Ensure wrap is inside UL only via LI host (never direct ul>div)
+      if (!host) {
+        host = document.createElement('li');
+        host.className = HOST_CLASS;
+        host.setAttribute('role', 'listitem');
+        host.style.listStyle = 'none';
+        host.style.width = '100%';
+        // Insert host at wrap position
+        ul.insertBefore(host, wrap);
+        host.appendChild(wrap);
+      } else if (host.parentElement !== ul) {
+        // move host into correct list container if needed
+        ul.appendChild(host);
+      }
 
-  if (window.jQuery) {
-    window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function(){
-      setTimeout(function(){ schedule(document); }, 0);
-      setTimeout(function(){ schedule(document); }, 220);
-      setTimeout(function(){ schedule(document); }, 800);
-    });
+      // Tether to nearest topic li and tag both with same token
+      var anchorLi = closestTopicLi(host) || closestTopicLi(wrap);
+      if (anchorLi) {
+        var t = anchorLi.getAttribute(TOKEN_ATTR);
+        if (!t) {
+          t = token();
+          anchorLi.setAttribute(TOKEN_ATTR, t);
+        }
+        host.setAttribute(TOKEN_ATTR, t);
+        // keep host just after anchor
+        if (host.previousElementSibling !== anchorLi) {
+          anchorLi.insertAdjacentElement('afterend', host);
+        }
+      } else {
+        // No anchor -> it's dangerous; mark host so we can drop it later
+        host.setAttribute('data-ezoic-orphan', '1');
+      }
+    } catch (e) {}
   }
 
-  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) || (m.removedNodes && m.removedNodes.length)) {
-            schedule(m.target);
-            break;
+  function sweepAll() {
+    var now = Date.now();
+    if (now - lastSweep < COOLDOWN) return;
+    lastSweep = now;
+
+    try {
+      // 1) repair direct ul>div wraps
+      var bad = document.querySelectorAll('ul > ' + BETWEEN_SEL + ', ol > ' + BETWEEN_SEL);
+      bad.forEach(ensureHostForWrap);
+
+      // 2) ensure any between wrap anywhere is hosted+tethered
+      var wraps = document.querySelectorAll(BETWEEN_SEL);
+      wraps.forEach(ensureHostForWrap);
+
+      // 3) reconcile/drop hosts that lost their anchor (virtualized)
+      var hosts = document.querySelectorAll('li.' + HOST_CLASS + '[' + TOKEN_ATTR + ']');
+      hosts.forEach(function(host){
+        try {
+          var ul = host.parentElement;
+          if (!ul) { host.remove(); return; }
+          var t = host.getAttribute(TOKEN_ATTR);
+          if (!t) { host.remove(); return; }
+          var anchor = ul.querySelector('li[' + TOKEN_ATTR + '="' + t + '"]');
+          if (!anchor) {
+            host.remove();
+            return;
           }
-        }
+          if (host.previousElementSibling !== anchor) {
+            anchor.insertAdjacentElement('afterend', host);
+          }
+        } catch (e) {}
       });
-      document.querySelectorAll('ul,ol').forEach(function(list){
-        try { mo.observe(list, {childList:true}); } catch(e) {}
+
+      // 4) drop explicit orphans
+      var orphans = document.querySelectorAll('li.' + HOST_CLASS + '[data-ezoic-orphan="1"]');
+      orphans.forEach(function(h){ try { h.remove(); } catch(e) {} });
+    } catch (e) {}
+  }
+
+  function scheduleSweep() {
+    if (pendingSweep) return;
+    pendingSweep = true;
+    requestAnimationFrame(function(){
+      pendingSweep = false;
+      sweepAll();
+    });
+  }
+
+  function installObservers() {
+    // Observe the document for any between-wrap insertion/moves
+    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) { scheduleSweep(); break; }
+            if (m.removedNodes && m.removedNodes.length) { scheduleSweep(); break; }
+          }
+        });
+        mo.observe(document.documentElement || document.body, { childList: true, subtree: true });
+      }
+    } catch (e) {}
+  }
+
+  function init() {
+    scheduleSweep();
+    window.addEventListener('scroll', scheduleSweep, { passive: true });
+    window.addEventListener('resize', scheduleSweep, { passive: true });
+
+    if (window.jQuery) {
+      window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function(){
+        setTimeout(scheduleSweep, 0);
+        setTimeout(scheduleSweep, 250);
+        setTimeout(scheduleSweep, 900);
       });
     }
-  } catch(e){}
+    installObservers();
+  }
 
-  setTimeout(function(){ schedule(document); }, 0);
+  if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
+  else init();
 })();
-// ===== /V14 =====
+// ===== /V14.1 =====
+

package/public/style.css

@@ -81,7 +81,7 @@
 }
 
 
-/* ===== V14 token host styles ===== */
+/* ===== V14.1 host ===== */
 li.nodebb-ezoic-host { list-style: none; width: 100%; }
-/* ===== /V14 ===== */
+/* ===== /V14.1 ===== */