nodebb-plugin-ezoic-infinite 1.6.36 → 1.6.37

package/package.json

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

package/public/client.js

@@ -1514,20 +1514,18 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V17.7: Keep injection, anchor each between slot to topic TID and repair on DOM moves (minimal, targeted) =====
+// ===== V17.8: No pile-up by design — keep "future" between slots pending/collapsed until their anchor topic exists =====
 (function () {
   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 ANCHOR_ATTR = 'data-ezoic-anchor-tid';
+  var PENDING_CLASS = 'nodebb-ezoic-pending';
 
   var ul = null;
   var mo = null;
-
-  var pending = false;
-  var queue = new Set();
-  var lastFlush = 0;
-  var FLUSH_COOLDOWN = 60;
+  var scheduled = false;
+  var lastRun = 0;
+  var COOLDOWN = 80;
 
   function getTopicList() {
     try {
@@ -1543,12 +1541,14 @@ function buildOrdinalMap(items) {
     return !!(el && el.nodeType === 1 && el.tagName === 'LI' && el.classList && el.classList.contains(HOST_CLASS));
   }
 
+  function isBetweenWrap(el) {
+    try { return !!(el && el.nodeType === 1 && el.matches && el.matches(BETWEEN_WRAP_SEL)); } catch(e){ return false; }
+  }
+
   function ensureHostForWrap(wrap, ulEl) {
-    // Only wrap invalid ul>div cases (same idea as V17), no injection hook.
+    // If Ezoic inserts ul > div..., wrap it into a LI to keep a valid list structure (less NodeBB churn).
     try {
-      if (!wrap || wrap.nodeType !== 1) return null;
-      if (!(wrap.matches && wrap.matches(BETWEEN_WRAP_SEL))) return null;
-
+      if (!wrap || !isBetweenWrap(wrap)) return null;
       var host = wrap.closest ? wrap.closest('li.' + HOST_CLASS) : null;
       if (host) return host;
 
@@ -1561,10 +1561,14 @@ function buildOrdinalMap(items) {
         host.setAttribute('role', 'listitem');
         host.style.listStyle = 'none';
         host.style.width = '100%';
+
         try {
           var after = wrap.getAttribute('data-ezoic-after');
           if (after) host.setAttribute('data-ezoic-after', after);
+          var pin = wrap.getAttribute('data-ezoic-pin');
+          if (pin) host.setAttribute('data-ezoic-pin', pin);
         } catch (e) {}
+
         ulEl.insertBefore(host, wrap);
         host.appendChild(wrap);
         try { wrap.style.width = '100%'; } catch (e) {}
@@ -1574,227 +1578,145 @@ function buildOrdinalMap(items) {
     return null;
   }
 
-  function getTidFromTopicLi(li) {
+  function getAfter(el) {
     try {
-      if (!li) return null;
-      var tid = li.getAttribute('data-tid') || li.getAttribute('data-topic-id') || li.getAttribute('data-topicid') || li.getAttribute('data-id');
-      if (tid && /^\\d+$/.test(tid)) return tid;
-
-      var a = li.querySelector && li.querySelector('a[href*="/topic/"]');
-      if (a) {
-        var href = a.getAttribute('href') || '';
-        var m = href.match(/\\/topic\\/(\\d+)(\\/|$)/);
-        if (m) return m[1];
+      var v = null;
+      if (el && el.getAttribute) v = el.getAttribute('data-ezoic-after');
+      if (!v && el && el.querySelector) {
+        var w = el.querySelector(BETWEEN_WRAP_SEL);
+        if (w) v = w.getAttribute('data-ezoic-after');
       }
-    } catch (e) {}
-    return null;
+      var n = parseInt(v, 10);
+      return isNaN(n) ? null : n;
+    } catch (e) { return null; }
   }
 
-  function closestPrevTopicLi(node) {
-    try {
-      var cur = node;
-      if (!cur) return null;
-      if (cur.closest) {
-        var h = cur.closest('li.' + HOST_CLASS);
-        if (h) cur = h;
-      }
-      var prev = cur.previousElementSibling;
-      while (prev) {
-        if (prev.matches && prev.matches(TOPIC_LI_SEL)) return prev;
-        prev = prev.previousElementSibling;
-      }
-    } catch (e) {}
-    return null;
+  function getTopics(ulEl) {
+    try { return ulEl ? ulEl.querySelectorAll(TOPIC_LI_SEL) : []; } catch(e){ return []; }
   }
 
-  function topicLiByTid(ulEl, tid) {
+  function lastTopic(ulEl, topics) {
     try {
-      if (!ulEl || !tid) return null;
-      var q = ulEl.querySelector(
-        TOPIC_LI_SEL + '[data-tid="' + tid + '"], ' +
-        TOPIC_LI_SEL + '[data-topic-id="' + tid + '"], ' +
-        TOPIC_LI_SEL + '[data-topicid="' + tid + '"]'
-      );
-      if (q) return q;
-
-      var topics = ulEl.querySelectorAll(TOPIC_LI_SEL);
-      for (var i=0;i<topics.length;i++){
-        var t = getTidFromTopicLi(topics[i]);
-        if (t === tid) return topics[i];
-      }
-    } catch (e) {}
-    return null;
+      topics = topics || getTopics(ulEl);
+      return topics && topics.length ? topics[topics.length - 1] : null;
+    } catch (e) { return null; }
   }
 
-  function rememberAnchor(el) {
+  function moveAfter(node, anchor) {
     try {
-      if (!el) return;
-
-      // normalize to host if wrap
-      if (el.matches && el.matches(BETWEEN_WRAP_SEL)) {
-        var h = el.closest ? el.closest('li.' + HOST_CLASS) : null;
-        if (h) el = h;
-      }
-      if (!isHost(el) && !(el.matches && el.matches(BETWEEN_WRAP_SEL))) return;
-
-      if (el.getAttribute && el.getAttribute(ANCHOR_ATTR)) return;
-
-      var prevTopic = closestPrevTopicLi(el);
-      if (!prevTopic) return;
-      var tid = getTidFromTopicLi(prevTopic);
-      if (!tid) return;
-
-      el.setAttribute(ANCHOR_ATTR, tid);
+      if (!node || !anchor || !anchor.insertAdjacentElement) return;
+      if (node.previousElementSibling === anchor) return;
+      anchor.insertAdjacentElement('afterend', node);
     } catch (e) {}
   }
 
-  function repairOne(node, ulEl) {
+  function placeOrPend(host, ulEl, topics) {
     try {
+      if (!host) return;
       ulEl = ulEl || ensureUL();
       if (!ulEl) return;
 
-      var el = node;
-
-      if (el && el.nodeType === 1 && el.matches && el.matches(BETWEEN_WRAP_SEL)) {
-        var host = ensureHostForWrap(el, ulEl) || (el.closest ? el.closest('li.' + HOST_CLASS) : null);
-        if (host) el = host;
-      }
+      topics = topics || getTopics(ulEl);
 
-      if (isHost(el)) {
-        rememberAnchor(el);
-        var tid = el.getAttribute(ANCHOR_ATTR);
-        if (!tid) return;
-        var anchorTopic = topicLiByTid(ulEl, tid);
-        if (!anchorTopic) return;
-        if (el.previousElementSibling !== anchorTopic) {
-          anchorTopic.insertAdjacentElement('afterend', el);
-        }
+      var after = getAfter(host);
+      if (!after) {
+        var lt = lastTopic(ulEl, topics);
+        if (lt) moveAfter(host, lt);
+        host.classList && host.classList.remove(PENDING_CLASS);
         return;
       }
 
-      if (el && el.nodeType === 1 && el.matches && el.matches(BETWEEN_WRAP_SEL)) {
-        rememberAnchor(el);
-        var tid2 = el.getAttribute(ANCHOR_ATTR);
-        if (!tid2) return;
-        var anchor2 = topicLiByTid(ulEl, tid2);
-        if (!anchor2) return;
-        if (el.previousElementSibling !== anchor2) {
-          anchor2.insertAdjacentElement('afterend', el);
-        }
-      }
-    } catch (e) {}
-  }
-
-  function enqueue(node) {
-    try {
-      if (!node || node.nodeType !== 1) return;
-
-      if (isHost(node) || (node.matches && node.matches(BETWEEN_WRAP_SEL))) {
-        queue.add(node);
-        scheduleFlush();
+      if (after > topics.length) {
+        var lt2 = lastTopic(ulEl, topics);
+        if (lt2) moveAfter(host, lt2);
+        host.classList && host.classList.add(PENDING_CLASS);
         return;
       }
-      if (node.querySelectorAll) {
-        var wraps = node.querySelectorAll(BETWEEN_WRAP_SEL);
-        if (wraps && wraps.length) wraps.forEach(function(w){ queue.add(w); });
-        var hosts = node.querySelectorAll('li.' + HOST_CLASS);
-        if (hosts && hosts.length) hosts.forEach(function(h){ queue.add(h); });
-        if ((wraps && wraps.length) || (hosts && hosts.length)) scheduleFlush();
-      }
+
+      var anchor = topics[after - 1];
+      if (anchor) moveAfter(host, anchor);
+      host.classList && host.classList.remove(PENDING_CLASS);
     } catch (e) {}
   }
 
-  function flush() {
-    pending = false;
+  function reconcile() {
     var ulEl = ensureUL();
     if (!ulEl) return;
 
-    // host invalid ul>div and capture anchors
+    var topics = getTopics(ulEl);
+
     try {
-      ulEl.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function(w){
-        var host = ensureHostForWrap(w, ulEl);
-        if (host) queue.add(host);
+      ulEl.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function (w) {
+        var h = ensureHostForWrap(w, ulEl);
+        if (h) placeOrPend(h, ulEl, topics);
       });
-      ulEl.querySelectorAll('li.' + HOST_CLASS).forEach(function(h){ rememberAnchor(h); });
-      ulEl.querySelectorAll(BETWEEN_WRAP_SEL).forEach(function(w){ rememberAnchor(w); });
-    } catch (e) {}
 
-    var n = 0;
-    for (var item of Array.from(queue)) {
-      queue.delete(item);
-      repairOne(item, ulEl);
-      n++;
-      if (n >= 10) break;
-    }
-    if (queue.size) scheduleFlush();
+      ulEl.querySelectorAll('li.' + HOST_CLASS).forEach(function (h) {
+        placeOrPend(h, ulEl, topics);
+      });
+
+      ulEl.querySelectorAll(BETWEEN_WRAP_SEL).forEach(function (w) {
+        var h = ensureHostForWrap(w, ulEl) || (w.closest ? w.closest('li.' + HOST_CLASS) : null);
+        if (h) placeOrPend(h, ulEl, topics);
+      });
+    } catch (e) {}
   }
 
-  function scheduleFlush() {
+  function scheduleReconcile() {
     var now = Date.now();
-    if (pending) return;
-    if (now - lastFlush < FLUSH_COOLDOWN) return;
-    pending = true;
-    lastFlush = now;
-    requestAnimationFrame(flush);
+    if (scheduled) return;
+    if (now - lastRun < COOLDOWN) return;
+    scheduled = true;
+    lastRun = now;
+    requestAnimationFrame(function () {
+      scheduled = false;
+      reconcile();
+    });
   }
 
   function initObserver() {
     var ulEl = ensureUL();
     if (!ulEl || mo) return;
 
-    // initial capture
-    try {
-      ulEl.querySelectorAll(BETWEEN_WRAP_SEL).forEach(function(w){
-        var host = ensureHostForWrap(w, ulEl) || (w.closest ? w.closest('li.' + HOST_CLASS) : null);
-        rememberAnchor(host || w);
-      });
-    } catch (e) {}
-
-    mo = new MutationObserver(function(muts){
-      try {
-        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++) enqueue(m.addedNodes[j]);
-          }
-          if (m.target) enqueue(m.target);
-        }
-      } catch (e) {}
+    mo = new MutationObserver(function () {
+      scheduleReconcile();
     });
-    mo.observe(ulEl, { childList:true, subtree:true });
+
+    mo.observe(ulEl, { childList: true, subtree: true });
   }
 
   function init() {
     initObserver();
-    scheduleFlush();
+    scheduleReconcile();
 
     if (window.jQuery) {
       try {
-        window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function(){
+        window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function () {
           ul = null;
-          try { if (mo) { mo.disconnect(); } } catch(e){}
+          try { if (mo) mo.disconnect(); } catch (e) {}
           mo = null;
           initObserver();
-          setTimeout(function(){ scheduleFlush(); }, 80);
-          setTimeout(function(){ scheduleFlush(); }, 450);
+          scheduleReconcile();
+          setTimeout(scheduleReconcile, 120);
+          setTimeout(scheduleReconcile, 500);
         });
       } catch (e) {}
     }
 
     var tries = 0;
-    var t = setInterval(function(){
+    var t = setInterval(function () {
       tries++;
       if (ensureUL()) {
         clearInterval(t);
         initObserver();
-        scheduleFlush();
+        scheduleReconcile();
       }
-      if (tries > 25) clearInterval(t);
+      if (tries > 30) clearInterval(t);
     }, 200);
   }
 
   if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
   else init();
 })();
-// ===== /V17.7 =====
+// ===== /V17.8 =====
 

package/public/style.css

@@ -88,8 +88,18 @@ li.nodebb-ezoic-host > .nodebb-ezoic-wrap.ezoic-ad-between { width: 100%; displa
 
 
 
-/* ===== V17.7 host styling ===== */
+/* ===== V17.8 pending slots (prevents pile-up top/bottom) ===== */
 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.7 ===== */
+
+/* slots whose anchor topic isn't loaded yet */
+li.nodebb-ezoic-host.nodebb-ezoic-pending{
+  max-height: 0 !important;
+  margin: 0 !important;
+  padding: 0 !important;
+  overflow: hidden !important;
+  opacity: 0 !important;
+  pointer-events: none !important;
+}
+/* ===== /V17.8 ===== */