nodebb-plugin-ezoic-infinite 1.6.46 → 1.6.48

package/package.json

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

package/public/client.js

@@ -1693,105 +1693,136 @@ function buildOrdinalMap(items) {
 // ===== /V17 =====
 
 
-// ===== V17.17 TOPFIX (minimal, non-invasive) =====
-// Goal: prevent "between" ad wrappers from being inserted at the very top of the topic list
-// (before any real topic LI), without moving or re-wrapping existing GPT containers.
-// We only:
-//  1) If a between wrapper is inserted as the first child and a topic LI exists, move its host
-//     to after the first topic LI (one-time).
-//  2) If no topic LI exists yet, mark it with data-ezoic-after="1" and leave it in place.
-// This avoids the heavier "pending pool" logic that can reduce fill.
-(function(){
-  'use strict';
 
-  var UL_SEL = 'ul.topics, ul.topic-list, ul.category-list';
-  var BETWEEN_WRAP_SEL = '.nodebb-ezoic-wrap.ezoic-ad-between';
-  var HOST_CLASS = 'ezoic-ad-host';
+// ===== 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;
+  // NOTE: Calling ezstandalone.showAds() was triggering extra bidder requests
+  // (and in your setup, surfacing ServiceWorker/CORS failures) which made
+  // fills slower and created visible repositioning. We only do a tiny scroll
+  // nudge here, because manual micro-scroll reliably triggers a fill.
+  var microScrollCooldownUntil = 0;
 
-  function getUl(){
-    return document.querySelector(UL_SEL);
+  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 firstTopicLi(ul){
-    if (!ul) return null;
-    // Consider any LI that is not our ad host as a topic LI
-    var lis = ul.querySelectorAll(':scope > li');
-    for (var i=0;i<lis.length;i++){
-      if (!lis[i].classList.contains(HOST_CLASS)) return lis[i];
-    }
-    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 hostFromWrap(wrap){
-    if (!wrap) return null;
-    // expected structure: li.ezoic-ad-host > (something) > span.nodebb-ezoic-wrap
-    var host = wrap.closest('li');
-    if (host && host.classList && host.classList.contains(HOST_CLASS)) return host;
-    return null;
+  function microScrollNudge() {
+    var t = now();
+    if (t < microScrollCooldownUntil) return;
+    microScrollCooldownUntil = t + 1200;
+
+    // Prefer a real 1px scroll + restore: this matches the observed manual fix.
+    try {
+      var y = window.pageYOffset || document.documentElement.scrollTop || 0;
+      window.scrollTo(0, y + 1);
+      (window.requestAnimationFrame || setTimeout)(function () {
+        try { window.scrollTo(0, y); } catch (e) {}
+        try { window.dispatchEvent(new Event('scroll')); } catch (e) {}
+      }, 16);
+      return;
+    } catch (e) {}
+
+    // Fallback: nudge listeners.
+    try { window.dispatchEvent(new Event('scroll')); } catch (e) {}
   }
 
-  function handleWrapInserted(ul, wrap){
+  function scheduleCheck(wrap) {
     try {
-      if (!ul || !wrap) return;
-      var host = hostFromWrap(wrap);
-      if (!host) return;
-
-      // Only act when the host is at the very top (before any topic LI)
-      if (host.parentElement !== ul) return;
-      if (ul.firstElementChild !== host) return;
-
-      var anchor = firstTopicLi(ul);
-      if (anchor) {
-        // One-time move to just after first topic LI
-        anchor.insertAdjacentElement('afterend', host);
-      } else {
-        // No anchor yet: mark to discourage top placement; do not move later
-        try { wrap.setAttribute('data-ezoic-after', '1'); } catch(e) {}
+      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 (micro-scroll only; no showAds/refresh calls).
+      var id = getSlotId(wrap) || 'none';
+      try { console.log('[EZ EMPTY]', id); } catch (e) {}
+      microScrollNudge();
+
+      // Re-check once after the nudge, but do not loop.
+      setTimeout(function () {
+        if (!wrap.isConnected) return;
+        if (hasAnyCreative(wrap)) return;
+        // Still empty: leave it to the native pipeline; avoid repeated nudges.
+      }, 900);
     } catch (e) {}
   }
 
-  function scanExisting(ul){
+  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 = ul ? ul.querySelectorAll(BETWEEN_WRAP_SEL) : [];
-      wraps.forEach(function(w){ handleWrapInserted(ul, w); });
-    } catch(e) {}
-  }
-
-  function init(){
-    var ul = getUl();
-    if (!ul) return;
-
-    scanExisting(ul);
-
-    if (typeof MutationObserver === 'undefined') return;
-    var mo = new MutationObserver(function(muts){
-      for (var i=0;i<muts.length;i++){
-        var m = muts[i];
-        if (!m.addedNodes) continue;
-        for (var j=0;j<m.addedNodes.length;j++){
-          var n = m.addedNodes[j];
-          if (!n || n.nodeType !== 1) continue;
-
-          // direct wrap
-          if (n.matches && n.matches(BETWEEN_WRAP_SEL)) {
-            handleWrapInserted(ul, n);
-            continue;
+      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]);
+            }
           }
-          // wrap somewhere inside
-          var inner = n.querySelector ? n.querySelector(BETWEEN_WRAP_SEL) : null;
-          if (inner) handleWrapInserted(ul, inner);
         }
-      }
-    });
-
-    mo.observe(ul, { childList: true, subtree: true });
+      });
+      mo.observe(document.body, { childList: true, subtree: true });
+    } catch (e) {}
   }
 
   if (document.readyState === 'loading') {
-    document.addEventListener('DOMContentLoaded', init);
+    document.addEventListener('DOMContentLoaded', ensureIO, { once: true });
   } else {
-    init();
+    ensureIO();
   }
 })();
-// ===== /V17.17 TOPFIX =====