nodebb-plugin-ezoic-infinite 1.6.15 → 1.6.17

package/package.json

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

package/public/client.js

@@ -1,127 +1,110 @@
 (function () {
   'use strict';
 
-function ezoicTopicIdFromLi(li) {
-  try {
-    if (!li) return '';
-    // try explicit attrs first
-    var tid = li.getAttribute && (li.getAttribute('data-tid') || li.getAttribute('data-topic-id'));
-    if (tid) return String(tid);
-    // try finding a topic permalink like /topic/13789/...
-    var a = li.querySelector && li.querySelector('a[href*="/topic/"]');
-    if (!a) return '';
-    var href = a.getAttribute('href') || '';
-    var m = href.match(/\/topic\/(\d+)\b/);
-    if (m && m[1]) return m[1];
-  } catch (e) {}
-  return '';
+function ezoicAnchorToken() {
+  // cheap unique-ish token
+  try { return String(Date.now()) + '-' + Math.random().toString(16).slice(2); } catch (e) { return String(Date.now()); }
 }
 
-function ezoicAnchorKeyFromTarget(target) {
+function ezoicInsertAfterWithToken(target, wrap, kindClass) {
   try {
-    if (!target) return '';
-    var li = target.closest ? target.closest('li') : null;
-    if (!li) li = target.tagName === 'LI' ? target : null;
-    if (!li) return '';
-    var tid = ezoicTopicIdFromLi(li);
-    if (tid) return 'topic:' + tid;
-  } catch (e) {}
-  return '';
-}
-
-function ezoicFindAnchorLiByKey(anchorKey, scope) {
-  try {
-    if (!anchorKey) return null;
-    if (anchorKey.indexOf('topic:') !== 0) return null;
-    var tid = anchorKey.slice(6);
-    var root = scope || document;
-    // locate any link to this topic and climb to li
-    var link = root.querySelector('a[href^="/topic/' + tid + '"], a[href*="/topic/' + tid + '/"]');
-    if (!link) return null;
-    return link.closest ? link.closest('li') : null;
-  } catch (e) {}
-  return null;
-}
-
-function ezoicReconcileOrPurgeByTopic(scope) {
-  try {
-    var root = scope || document;
-    var hosts = root.querySelectorAll('li.nodebb-ezoic-host[data-ezoic-anchor]');
-    if (!hosts || !hosts.length) return;
-
-    hosts.forEach(function(host){
-      try {
-        var listEl = host.parentElement;
-        if (!listEl) return;
-        var key = host.getAttribute('data-ezoic-anchor') || '';
-        if (!key) return;
-
-        var anchorLi = ezoicFindAnchorLiByKey(key, listEl) || ezoicFindAnchorLiByKey(key, document);
-        if (!anchorLi) {
-          host.remove();
-          return;
-        }
-        if (host.previousElementSibling !== anchorLi) {
-          anchorLi.insertAdjacentElement('afterend', host);
-        }
-      } catch (e) {}
-    });
-  } catch (e) {}
-}
+    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) {}
+      }
 
-function ezoicInsertAfterWithUlGuard(target, wrap, kindClass) {
-  try {
-    if (!target || !wrap) return;
-    // Only guard for BETWEEN placements (known to be inserted between <li> items inside <ul>/<ol>)
-    if (kindClass === 'ezoic-ad-between') {
-      var p = target.parentElement;
+      // 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')) {
-        // Ensure wrap is not a direct child of UL/OL (invalid HTML); wrap it in an LI host.
         var host = document.createElement('li');
         host.className = 'nodebb-ezoic-host';
         host.setAttribute('role', 'listitem');
         host.style.listStyle = 'none';
         host.style.width = '100%';
-        try { var ak = ezoicAnchorKeyFromTarget(target); if (ak) host.setAttribute('data-ezoic-anchor', ak); } catch(e) {}
+        try { host.setAttribute('data-ezoic-anchor-token', token); } catch (e) {}
 
-        // Insert host after the target listitem, then move the wrap inside.
-        if (target.insertAdjacentElement) {
-          target.insertAdjacentElement('afterend', host);
-        } else if (p.insertBefore) {
-          p.insertBefore(host, target.nextSibling);
-        }
-        try { host.appendChild(wrap); } catch (e) {}
+        if (anchorLi.insertAdjacentElement) anchorLi.insertAdjacentElement('afterend', host);
+        else if (p.insertBefore) p.insertBefore(host, anchorLi.nextSibling);
 
-        // Keep wrap full width
+        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) {}
     }
 
-    // Default behavior
-    if (target.insertAdjacentElement) ezoicInsertAfterWithUlGuard(target, wrap, kindClass);
+    if (target.insertAdjacentElement) ezoicInsertAfterWithToken(target, wrap, kindClass);
     else if (target.parentNode) target.parentNode.insertBefore(wrap, target.nextSibling);
   } catch (e) {}
 }
 
-function ezoicRepairInvalidBetweenWraps() {
-  // If any legacy DIV wraps were already inserted directly under UL/OL, repair them once.
+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 p = wrap.parentElement;
-        if (!p) return;
+        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%';
-        try { var prevLi = wrap.previousElementSibling; var ak2 = ezoicAnchorKeyFromTarget(prevLi || wrap); if (ak2) host.setAttribute('data-ezoic-anchor', ak2); } catch(e) {}
-        p.insertBefore(host, wrap);
+        if (token) host.setAttribute('data-ezoic-anchor-token', token);
+
+        ul.insertBefore(host, wrap);
         host.appendChild(wrap);
-        try { wrap.style.width = '100%'; } catch (e) {}
+        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) {}
@@ -795,7 +778,7 @@ function globalGapFixInit() {
     insertingIds.add(id);
     try {
       const wrap = buildWrap(id, kindClass, afterPos, !existingPh);
-      ezoicInsertAfterWithUlGuard(target, wrap, kindClass);
+      ezoicInsertAfterWithToken(target, wrap, kindClass);
 
       // If placeholder exists elsewhere (including pool), move it into the wrapper.
       if (existingPh) {
@@ -1287,7 +1270,7 @@ function buildOrdinalMap(items) {
       if (!anchorEl || !wrap || !wrap.isConnected) return null;
 
       wrap.setAttribute('data-ezoic-after', String(afterPos));
-      ezoicInsertAfterWithUlGuard(anchorEl, wrap, kindClass);
+      ezoicInsertAfterWithToken(anchorEl, wrap, kindClass);
 
       // Ensure minimal layout impact.
       try { wrap.style.contain = 'layout style paint'; } catch (e) {}
@@ -1637,21 +1620,7 @@ function buildOrdinalMap(items) {
 })();
 
 
-// ===== V12.2: run UL/OL repair =====
-try { ezoicRepairInvalidBetweenWraps(); } catch (e) {}
-if (window.jQuery) {
-  try {
-    window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function () {
-      setTimeout(function(){ try { ezoicRepairInvalidBetweenWraps(); } catch(e) {} }, 0);
-      setTimeout(function(){ try { ezoicRepairInvalidBetweenWraps(); } catch(e) {} }, 200);
-    });
-  } catch (e) {}
-}
-// ===== /V12.2 =====
-
-
-
-// ===== V12.5 topic-anchor reconcile =====
+// ===== V14 token reconcile scheduler =====
 (function(){
   var pending=false, last=0, COOLDOWN=140;
   function schedule(scope){
@@ -1661,7 +1630,8 @@ if (window.jQuery) {
     pending=true;
     requestAnimationFrame(function(){
       pending=false; last=Date.now();
-      try { ezoicReconcileOrPurgeByTopic(scope); } catch(e) {}
+      try { ezoicRepairBetweenWrapsToHost(); } catch(e) {}
+      try { ezoicReconcileOrDropHostsByToken(scope); } catch(e) {}
     });
   }
 
@@ -1672,7 +1642,7 @@ 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); }, 700);
+      setTimeout(function(){ schedule(document); }, 800);
     });
   }
 
@@ -1688,12 +1658,11 @@ if (window.jQuery) {
         }
       });
       document.querySelectorAll('ul,ol').forEach(function(list){
-        try { mo.observe(list, {childList:true, subtree:false}); } catch(e) {}
+        try { mo.observe(list, {childList:true}); } catch(e) {}
       });
     }
   } catch(e){}
 
   setTimeout(function(){ schedule(document); }, 0);
 })();
-// ===== /V12.5 =====
-
+// ===== /V14 =====

package/public/style.css

@@ -81,8 +81,7 @@
 }
 
 
-/* ===== V12.2 UL host for between wraps ===== */
+/* ===== V14 token host styles ===== */
 li.nodebb-ezoic-host { list-style: none; width: 100%; }
-li.nodebb-ezoic-host > .nodebb-ezoic-wrap { width: 100%; }
-/* ===== /V12.2 ===== */
+/* ===== /V14 ===== */