nodebb-plugin-ezoic-infinite 1.6.45 → 1.6.47

package/package.json

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

package/public/client.js

@@ -1515,11 +1515,7 @@ function buildOrdinalMap(items) {
 (function () {
   // Goal: keep ad injection intact. Only repair when we detect "pile-up" of between wraps.
   var TOPIC_LI_SEL = 'li[component="category/topic"]';
-  // Between-ad wrapper selector.
-  // Note: Ezoic can inject <span class="ezoic-ad ...">; we normalize those into our wraps.
-  var BETWEEN_WRAP_SEL = 'div.nodebb-ezoic-wrap.ezoic-ad-between, span.nodebb-ezoic-wrap.ezoic-ad-between, div.ezoic-ad-between, span.ezoic-ad-between';
-  var BETWEEN_WRAP_CHILD_SEL = ':scope > div.nodebb-ezoic-wrap.ezoic-ad-between, :scope > span.nodebb-ezoic-wrap.ezoic-ad-between, :scope > div.ezoic-ad-between, :scope > span.ezoic-ad-between';
-  var ORPHAN_EZOIC_CHILD_SEL = ':scope > span.ezoic-ad:not(.nodebb-ezoic-wrap), :scope > div.ezoic-ad:not(.nodebb-ezoic-wrap)';
+  var BETWEEN_WRAP_SEL = 'div.nodebb-ezoic-wrap.ezoic-ad-between';
   var HOST_CLASS = 'nodebb-ezoic-host';
 
   var scheduled = false;
@@ -1611,19 +1607,7 @@ function buildOrdinalMap(items) {
       if (!ul) return;
 
       // Step 1: wrap any direct child between DIVs into LI hosts (makes list stable)
-      // First: any explicit between wrappers
-      ul.querySelectorAll(BETWEEN_WRAP_CHILD_SEL).forEach(function(w){ ensureHostForWrap(w, ul); });
-
-      // Second: native injected Ezoic containers directly under the list.
-      // They don't have our marker classes, so we convert them.
-      ul.querySelectorAll(ORPHAN_EZOIC_CHILD_SEL).forEach(function(w){
-        try { w.classList.add('nodebb-ezoic-wrap'); } catch(e) {}
-        try { w.classList.add('ezoic-ad-between'); } catch(e) {}
-        if (!w.getAttribute('data-ezoic-after')) {
-          w.setAttribute('data-ezoic-after', '1');
-        }
-        ensureHostForWrap(w, ul);
-      });
+      ul.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); });
 
       // Step 2: only act if we see pile-up (avoid touching infinite scroll during normal flow)
       if (!detectPileUp(ul)) return;
@@ -1708,3 +1692,131 @@ function buildOrdinalMap(items) {
 })();
 // ===== /V17 =====
 
+
+
+// ===== V17 empty-refresh (no move) =====
+// Goal: if a between-ad is visible but still has no ad iframe, gently poke Ezoic/GPT to render.
+(function () {
+  var BETWEEN_WRAP_SEL = 'div.nodebb-ezoic-wrap.ezoic-ad-between';
+  var seen = new WeakMap();
+  var io = null;
+  var showAdsCooldownUntil = 0;
+
+  function now() { return Date.now ? Date.now() : +new Date(); }
+
+  function getSlotId(wrap) {
+    try {
+      var gpt = wrap.querySelector('[id^="div-gpt-ad-"]');
+      return gpt ? gpt.id : null;
+    } catch (e) { return null; }
+  }
+
+  function hasAnyCreative(wrap) {
+    try {
+      // Any iframe (safeframe or normal) inside the wrap counts as rendered.
+      if (wrap.querySelector('iframe')) return true;
+      // Some formats use ins/amp/other nodes.
+      if (wrap.querySelector('amp-ad, amp-embed, ins.adsbygoogle')) return true;
+    } catch (e) {}
+    return false;
+  }
+
+  function safeShowAds() {
+    var t = now();
+    if (t < showAdsCooldownUntil) return;
+    showAdsCooldownUntil = t + 1200;
+
+    try {
+      if (window.ezstandalone && typeof window.ezstandalone.showAds === 'function') {
+        window.ezstandalone.showAds();
+        return;
+      }
+    } catch (e) {}
+
+    // Fallback: nudge common listeners.
+    try { window.dispatchEvent(new Event('scroll')); } catch (e) {}
+    try { window.dispatchEvent(new Event('resize')); } catch (e) {}
+  }
+
+  function scheduleCheck(wrap) {
+    try {
+      if (!wrap || wrap.nodeType !== 1) return;
+      if (hasAnyCreative(wrap)) return;
+
+      var meta = seen.get(wrap);
+      var t = now();
+      if (!meta) {
+        meta = { firstSeen: t, checks: 0 };
+        seen.set(wrap, meta);
+      }
+
+      // Give the normal pipeline time to render.
+      if (meta.checks === 0) {
+        setTimeout(function () { scheduleCheck(wrap); }, 700);
+        meta.checks++;
+        return;
+      }
+
+      if (hasAnyCreative(wrap)) return;
+
+      // Still empty -> poke.
+      var id = getSlotId(wrap) || 'none';
+      try { console.log('[EZ EMPTY]', id); } catch (e) {}
+      safeShowAds();
+
+      // One more re-check shortly after the poke.
+      setTimeout(function () {
+        if (!wrap.isConnected) return;
+        if (hasAnyCreative(wrap)) return;
+        // If still empty after a poke, try once more (but do not loop forever).
+        safeShowAds();
+      }, 900);
+    } catch (e) {}
+  }
+
+  function ensureIO() {
+    if (io) return;
+    if (!('IntersectionObserver' in window)) return;
+
+    io = new IntersectionObserver(function (entries) {
+      for (var i = 0; i < entries.length; i++) {
+        var e = entries[i];
+        if (!e.isIntersecting) continue;
+        scheduleCheck(e.target);
+      }
+    }, { root: null, rootMargin: '900px 0px 900px 0px', threshold: 0.01 });
+
+    // Observe existing wraps.
+    try {
+      var wraps = document.querySelectorAll(BETWEEN_WRAP_SEL);
+      for (var j = 0; j < wraps.length; j++) io.observe(wraps[j]);
+    } catch (e) {}
+
+    // Observe new wraps.
+    try {
+      var mo = new MutationObserver(function (muts) {
+        for (var k = 0; k < muts.length; k++) {
+          var m = muts[k];
+          if (!m.addedNodes) continue;
+          for (var n = 0; n < m.addedNodes.length; n++) {
+            var node = m.addedNodes[n];
+            if (!node || node.nodeType !== 1) continue;
+            if (node.matches && node.matches(BETWEEN_WRAP_SEL)) {
+              io.observe(node);
+            } else if (node.querySelectorAll) {
+              var inner = node.querySelectorAll(BETWEEN_WRAP_SEL);
+              for (var q = 0; q < inner.length; q++) io.observe(inner[q]);
+            }
+          }
+        }
+      });
+      mo.observe(document.body, { childList: true, subtree: true });
+    } catch (e) {}
+  }
+
+  if (document.readyState === 'loading') {
+    document.addEventListener('DOMContentLoaded', ensureIO, { once: true });
+  } else {
+    ensureIO();
+  }
+})();