nodebb-plugin-ezoic-infinite 1.6.13 → 1.6.15

package/package.json

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

package/public/client.js

@@ -1,61 +1,66 @@
 (function () {
   'use strict';
 
-function ezoicAnchorKeyFromEl(el) {
+function ezoicTopicIdFromLi(li) {
   try {
-    if (!el || !el.getAttribute) return '';
-    var tid = el.getAttribute('data-tid') || el.getAttribute('data-topic-id');
-    if (tid) return 'tid:' + String(tid);
-    var pid = el.getAttribute('data-pid') || el.getAttribute('data-id');
-    if (pid) return 'pid:' + String(pid);
-    var uid = el.getAttribute('data-uid');
-    if (uid) return 'uid:' + String(uid);
+    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 ezoicFindAnchorEl(anchorKey, scope) {
+function ezoicAnchorKeyFromTarget(target) {
+  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;
-    if (anchorKey.indexOf('tid:') === 0) {
-      var v = anchorKey.slice(4);
-      return root.querySelector('[data-tid="' + v + '"], [data-topic-id="' + v + '"]');
-    }
-    if (anchorKey.indexOf('pid:') === 0) {
-      var p = anchorKey.slice(4);
-      return root.querySelector('[data-pid="' + p + '"], [data-id="' + p + '"]');
-    }
-    if (anchorKey.indexOf('uid:') === 0) {
-      var u = anchorKey.slice(4);
-      return root.querySelector('[data-uid="' + u + '"]');
-    }
+    // 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 ezoicReconcileHosts(scope) {
-  // Ensure each li.nodebb-ezoic-host stays directly after its anchor <li>.
-  // Prevents "all hosts under first topic" after NodeBB re-render/virtualize.
+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) {
+    hosts.forEach(function(host){
       try {
-        var anchorKey = host.getAttribute('data-ezoic-anchor') || '';
-        if (!anchorKey) return;
-        var ul = host.parentElement;
-        if (!ul) return;
-
-        var anchor = ezoicFindAnchorEl(anchorKey, ul) || ezoicFindAnchorEl(anchorKey, document);
-        if (!anchor) return;
-
-        // Anchor is often inside the <li> topic; normalize to list item
-        var anchorLi = anchor.closest ? (anchor.closest('li') || anchor) : anchor;
-        if (!anchorLi || !anchorLi.parentElement) return;
-
+        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);
         }
@@ -64,8 +69,6 @@ function ezoicReconcileHosts(scope) {
   } catch (e) {}
 }
 
-' + '';
-
 
 function ezoicInsertAfterWithUlGuard(target, wrap, kindClass) {
   try {
@@ -80,7 +83,7 @@ function ezoicInsertAfterWithUlGuard(target, wrap, kindClass) {
         host.setAttribute('role', 'listitem');
         host.style.listStyle = 'none';
         host.style.width = '100%';
-        try { var ak = ezoicAnchorKeyFromEl(target); if (ak) host.setAttribute('data-ezoic-anchor', ak); } catch(e) {}
+        try { var ak = ezoicAnchorKeyFromTarget(target); if (ak) host.setAttribute('data-ezoic-anchor', ak); } catch(e) {}
 
         // Insert host after the target listitem, then move the wrap inside.
         if (target.insertAdjacentElement) {
@@ -115,7 +118,7 @@ function ezoicRepairInvalidBetweenWraps() {
         host.setAttribute('role', 'listitem');
         host.style.listStyle = 'none';
         host.style.width = '100%';
-        try { var ak = ezoicAnchorKeyFromEl(target); if (ak) host.setAttribute('data-ezoic-anchor', ak); } catch(e) {}
+        try { var prevLi = wrap.previousElementSibling; var ak2 = ezoicAnchorKeyFromTarget(prevLi || wrap); if (ak2) host.setAttribute('data-ezoic-anchor', ak2); } catch(e) {}
         p.insertBefore(host, wrap);
         host.appendChild(wrap);
         try { wrap.style.width = '100%'; } catch (e) {}
@@ -1647,52 +1650,50 @@ if (window.jQuery) {
 // ===== /V12.2 =====
 
 
-// ===== V12.3 reconcile scheduler =====
-(function(){
-  var pending = false;
-  var last = 0;
-  var COOLDOWN = 180;
 
+// ===== V12.5 topic-anchor reconcile =====
+(function(){
+  var pending=false, last=0, COOLDOWN=140;
   function schedule(scope){
-    var now = Date.now();
-    if (now - last < COOLDOWN) return;
+    var now=Date.now();
+    if (now-last<COOLDOWN) return;
     if (pending) return;
-    pending = true;
+    pending=true;
     requestAnimationFrame(function(){
-      pending = false;
-      last = Date.now();
-      try { ezoicReconcileHosts(scope); } catch(e) {}
+      pending=false; last=Date.now();
+      try { ezoicReconcileOrPurgeByTopic(scope); } catch(e) {}
     });
   }
 
-  window.addEventListener('scroll', function(){ schedule(document); }, { passive: true });
-  window.addEventListener('resize', function(){ schedule(document); }, { passive: true });
+  window.addEventListener('scroll', function(){ schedule(document); }, { passive:true });
+  window.addEventListener('resize', function(){ schedule(document); }, { passive:true });
 
   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); }, 600);
+      setTimeout(function(){ schedule(document); }, 700);
     });
   }
 
-  // MutationObserver lightweight: only watch ULs for child list changes
   try {
     if (typeof MutationObserver !== 'undefined') {
       var mo = new MutationObserver(function(muts){
-        // if any li hosts are moved/added, reconcile
         for (var i=0;i<muts.length;i++){
-          var m = muts[i];
-          if (m.addedNodes && m.addedNodes.length) { schedule(m.target); break; }
-          if (m.removedNodes && m.removedNodes.length) { schedule(m.target); break; }
+          var m=muts[i];
+          if ((m.addedNodes && m.addedNodes.length) || (m.removedNodes && m.removedNodes.length)) {
+            schedule(m.target);
+            break;
+          }
         }
       });
       document.querySelectorAll('ul,ol').forEach(function(list){
-        try { mo.observe(list, {childList:true}); } catch(e) {}
+        try { mo.observe(list, {childList:true, subtree:false}); } catch(e) {}
       });
     }
   } catch(e){}
 
-  setTimeout(function(){ try { schedule(document); } catch(e) {} }, 0);
+  setTimeout(function(){ schedule(document); }, 0);
 })();
-// ===== /V12.3 =====
+// ===== /V12.5 =====
+