nodebb-plugin-ezoic-infinite 1.6.5 → 1.6.7

package/package.json

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

package/public/client.js

@@ -1348,30 +1348,33 @@ function buildOrdinalMap(items) {
 
 
 
+
 // ===== CLEAN REFRACTOR: visibility manager for Ezoic wraps =====
 (function () {
-  // v2.3 (no-redefine):
-  // Your logs show:
-  // - "Placeholder Id XXX has already been defined"
-  // - "No valid placeholders for loadMore"
+  // v2.5 (position-enforcer):
+  // - Keep "no-redefine" (showAds only once per id, dedupe placeholders).
+  // - Fix pile-up at top when scrolling up: wraps are being detached and re-inserted near the first post.
+  //   Adjacent-anchor can move with the wrap; so we anchor INSIDE the host post/topic element.
   //
-  // Root cause: calling showAds repeatedly for the same placeholder id and/or
-  // removing/recreating wrappers with the same IDs causes Ezoic to treat them as re-defined.
+  // Mechanism:
+  // 1) For each wrap, find a "host" element (closest previous post/topic item).
+  // 2) Insert an invisible marker span INSIDE that host (stays with host even if wrap is moved).
+  // 3) On scroll/interval, if wrap is not located right AFTER its host element, move it back.
   //
-  // Fix:
-  // - NEVER remove wraps/placeholders here (no DOM deletion of ads).
-  // - Only call showAds ONCE per placeholder per page lifetime (unless the placeholder is truly empty).
-  // - De-duplicate placeholders in DOM: if the same data-ezoic-id appears multiple times, keep the first.
+  // This moves existing DOM nodes back (no placeholder recreation).
 
   var BETWEEN_SELECTOR = '.nodebb-ezoic-wrap.ezoic-ad-between';
   var MESSAGE_SELECTOR = '.nodebb-ezoic-wrap.ezoic-ad-message';
   var WRAP_SELECTOR = BETWEEN_SELECTOR + ', ' + MESSAGE_SELECTOR;
 
-  // show tuning (safe)
   var MAX_SHOW_PER_TICK = 4;
 
+  // validation throttles
+  var ENFORCE_COOLDOWN_MS = 220;
+  var lastEnforce = 0;
+
   // internal state
-  var activatedById = Object.create(null);   // id -> ts
+  var activatedById = Object.create(null);
   var showQueue = [];
   var showTicking = false;
 
@@ -1388,7 +1391,6 @@ function buildOrdinalMap(items) {
 
   function isFilled(w) {
     try {
-      // if Ezoic/Google already injected, there will be an iframe or an element with id starting google_ads_iframe
       if (w.querySelector('iframe')) return true;
       if (w.querySelector('[id^="google_ads_iframe"]')) return true;
       if (w.querySelector('.ezoic-ad')) return true;
@@ -1398,9 +1400,7 @@ function buildOrdinalMap(items) {
 
   function enqueueShow(id) {
     if (!id) return;
-    // show only once (avoid "already defined")
     if (activatedById[id]) return;
-
     for (var i = 0; i < showQueue.length; i++) if (showQueue[i] === id) return;
     showQueue.push(id);
     scheduleShowTick();
@@ -1426,7 +1426,7 @@ function buildOrdinalMap(items) {
     });
   }
 
-  // De-duplicate placeholders to avoid Ezoic warnings.
+  // --- De-dupe placeholders to avoid Ezoic warnings ---
   function dedupePlaceholders() {
     var seen = Object.create(null);
     try {
@@ -1434,10 +1434,10 @@ function buildOrdinalMap(items) {
         try {
           var id = ph.getAttribute('data-ezoic-id');
           if (!id) return;
+          var wrap = ph.closest('.nodebb-ezoic-wrap');
+          if (!wrap) return;
           if (seen[id]) {
-            // remove duplicate wrapper entirely (keep first occurrence)
-            var wrap = ph.closest('.nodebb-ezoic-wrap');
-            if (wrap) wrap.remove();
+            wrap.remove();
           } else {
             seen[id] = true;
           }
@@ -1446,7 +1446,124 @@ function buildOrdinalMap(items) {
     } catch (e) {}
   }
 
-  // Track visibility: when a wrap comes near viewport, trigger show once if empty.
+  // --- Position Enforcer ---
+  function ensureUid(w) {
+    try {
+      var uid = w.getAttribute('data-ezoic-wrapuid');
+      if (!uid) {
+        uid = String(Date.now()) + '-' + Math.floor(Math.random() * 1e9);
+        w.setAttribute('data-ezoic-wrapuid', uid);
+      }
+      return uid;
+    } catch (e) { return null; }
+  }
+
+  function findHostForWrap(w) {
+    // Host should be a stable post/topic element, NOT the wrap itself.
+    // Heuristics: previous siblings that look like topic/post items.
+    try {
+      var cur = w.previousElementSibling;
+      // walk backward a bit
+      for (var i = 0; i < 18 && cur; i++) {
+        if (cur.classList && (cur.classList.contains('topic-item') || cur.classList.contains('posts-list-item') || cur.classList.contains('post') || cur.classList.contains('category-item'))) {
+          return cur;
+        }
+        if (cur.getAttribute) {
+          if (cur.getAttribute('data-pid') || cur.getAttribute('data-tid') || cur.getAttribute('data-topic-id') || cur.getAttribute('data-index')) return cur;
+        }
+        cur = cur.previousElementSibling;
+      }
+
+      // fallback: walk up from wrap to find nearest list container, then approximate by data-ezoic-after index
+      var afterPos = parseInt(w.getAttribute('data-ezoic-after') || '0', 10) || 0;
+      if (afterPos > 0) {
+        var list = w.parentElement;
+        for (var up = 0; up < 6 && list && list !== document.body; up++) {
+          if (list.classList && (list.classList.contains('topic-list') || list.classList.contains('topics') || list.classList.contains('posts') || list.classList.contains('category'))) break;
+          list = list.parentElement;
+        }
+        if (list && list.querySelectorAll) {
+          var items = list.querySelectorAll('.topic-item, .posts-list-item, .post, [data-pid], [data-tid], [data-topic-id]');
+          if (items && items.length >= afterPos) {
+            return items[Math.min(items.length - 1, afterPos - 1)];
+          }
+        }
+      }
+    } catch (e) {}
+    return null;
+  }
+
+  function ensureMarkerInHost(w) {
+    try {
+      var uid = ensureUid(w);
+      if (!uid) return;
+
+      var markerId = w.getAttribute('data-ezoic-markerid');
+      if (markerId) {
+        var existing = document.getElementById(markerId);
+        if (existing) return;
+      }
+
+      var host = findHostForWrap(w);
+      if (!host) return;
+
+      markerId = 'nodebb-ezoic-marker-' + uid;
+      // if already exists somewhere else, reuse
+      var m = document.getElementById(markerId);
+      if (!m) {
+        m = document.createElement('span');
+        m.id = markerId;
+        m.className = 'nodebb-ezoic-marker';
+        m.setAttribute('data-marker-for', uid);
+        m.style.display = 'none';
+        host.appendChild(m);
+      } else {
+        // ensure marker is inside host (if moved, re-append)
+        if (m.parentElement !== host) host.appendChild(m);
+      }
+
+      w.setAttribute('data-ezoic-markerid', markerId);
+    } catch (e) {}
+  }
+
+  function insertAfter(ref, node) {
+    try {
+      if (!ref || !ref.parentNode || !node) return;
+      if (ref.nextSibling) ref.parentNode.insertBefore(node, ref.nextSibling);
+      else ref.parentNode.appendChild(node);
+    } catch (e) {}
+  }
+
+  function enforcePositions() {
+    var now = Date.now();
+    if (now - lastEnforce < ENFORCE_COOLDOWN_MS) return;
+    lastEnforce = now;
+
+    try {
+      var wraps = document.querySelectorAll('.nodebb-ezoic-wrap');
+      for (var i = 0; i < wraps.length; i++) {
+        var w = wraps[i];
+        try {
+          ensureMarkerInHost(w);
+
+          var markerId = w.getAttribute('data-ezoic-markerid');
+          if (!markerId) continue;
+
+          var marker = document.getElementById(markerId);
+          if (!marker || !marker.parentElement) continue;
+
+          var host = marker.parentElement;
+          // desired: wrap should be directly after host (as sibling)
+          if (!host.parentElement) continue;
+          if (w.parentElement !== host.parentElement || w.previousElementSibling !== host) {
+            insertAfter(host, w);
+          }
+        } catch (e) {}
+      }
+    } catch (e) {}
+  }
+
+  // --- Visibility: trigger show once if empty ---
   var io = null;
   function installIO() {
     if (io || typeof IntersectionObserver === 'undefined') return;
@@ -1455,8 +1572,11 @@ function buildOrdinalMap(items) {
       try {
         entries.forEach(function (e) {
           if (!e || !e.target) return;
+
+          // ensure host marker on sight
+          ensureMarkerInHost(e.target);
+
           if (e.isIntersecting) {
-            // If the slot is already filled, mark it as activated to prevent re-define attempts.
             var id = getId(e.target);
             if (!id) return;
 
@@ -1470,20 +1590,19 @@ function buildOrdinalMap(items) {
       } catch (e) {}
     }, { root: null, rootMargin: '1200px 0px 1200px 0px', threshold: 0.01 });
 
-    try { document.querySelectorAll(WRAP_SELECTOR).forEach(function (w) { try { io.observe(w); } catch(e) {} }); } catch (e) {}
+    try { document.querySelectorAll(WRAP_SELECTOR).forEach(function (w) { try { ensureMarkerInHost(w); io.observe(w); } catch(e) {} }); } catch (e) {}
   }
 
-  // Observe newly added wraps and observe them + dedupe
+  // Observe newly added wraps and marker them
   var moInstalled = false;
   function installMO() {
     if (moInstalled || typeof MutationObserver === 'undefined') return;
     moInstalled = true;
 
     var mo = new MutationObserver(function (muts) {
-      // dedupe quickly, then observe new wraps
       try { dedupePlaceholders(); } catch (e) {}
-
       if (!io) return;
+
       try {
         for (var i = 0; i < muts.length; i++) {
           var m = muts[i];
@@ -1493,34 +1612,40 @@ function buildOrdinalMap(items) {
             if (!n || n.nodeType !== 1) continue;
 
             if (n.matches && n.matches(WRAP_SELECTOR)) {
+              ensureMarkerInHost(n);
               try { io.observe(n); } catch (e) {}
-              // eager show if empty
               var id = getId(n);
               if (id && !isFilled(n)) enqueueShow(id);
               else if (id) activatedById[id] = activatedById[id] || Date.now();
             } else if (n.querySelectorAll) {
               var inner = n.querySelectorAll(WRAP_SELECTOR);
               for (var k = 0; k < inner.length; k++) {
+                ensureMarkerInHost(inner[k]);
                 try { io.observe(inner[k]); } catch (e) {}
               }
             }
           }
         }
       } catch (e) {}
+
+      // enforce after mutations (cheap throttle will apply)
+      enforcePositions();
     });
 
     try { mo.observe(document.documentElement || document.body, { childList: true, subtree: true }); } catch (e) {}
   }
 
   function init() {
-    // 1) dedupe existing
     dedupePlaceholders();
 
-    // 2) install observers
+    try {
+      document.querySelectorAll('.nodebb-ezoic-wrap').forEach(function (w) { ensureMarkerInHost(w); });
+    } catch (e) {}
+
     installIO();
     installMO();
 
-    // 3) initial eager show for empty visible-ish wraps (bounded)
+    // initial eager show (bounded)
     try {
       var vh = window.innerHeight || document.documentElement.clientHeight || 0;
       var margin = 900;
@@ -1528,6 +1653,7 @@ function buildOrdinalMap(items) {
       var budget = 12;
       for (var i = 0; i < wraps.length && budget > 0; i++) {
         var w = wraps[i];
+        ensureMarkerInHost(w);
         var r = w.getBoundingClientRect();
         if (r.bottom >= -margin && r.top <= (vh + margin)) {
           var id = getId(w);
@@ -1540,19 +1666,28 @@ function buildOrdinalMap(items) {
       }
     } catch (e) {}
 
-    window.addEventListener('scroll', scheduleShowTick, { passive: true });
-    window.addEventListener('resize', scheduleShowTick, { passive: true });
+    window.addEventListener('scroll', function () {
+      enforcePositions();
+      scheduleShowTick();
+    }, { passive: true });
+    window.addEventListener('resize', function () {
+      enforcePositions();
+      scheduleShowTick();
+    }, { passive: true });
 
     if (window.jQuery) {
       window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function () {
         setTimeout(function () {
           dedupePlaceholders();
+          try { document.querySelectorAll('.nodebb-ezoic-wrap').forEach(function (w) { ensureMarkerInHost(w); }); } catch (e) {}
+          enforcePositions();
           scheduleShowTick();
         }, 0);
       });
     }
 
-    setTimeout(scheduleShowTick, 0);
+    setInterval(enforcePositions, 1000);
+    setTimeout(function () { enforcePositions(); scheduleShowTick(); }, 0);
   }
 
   if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
@@ -1564,3 +1699,4 @@ function buildOrdinalMap(items) {
 
 
 
+