nodebb-plugin-ezoic-infinite 1.6.44 → 1.6.46

package/package.json

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

package/public/client.js

@@ -1646,129 +1646,6 @@ function buildOrdinalMap(items) {
     });
   }
 
-  // --- Empty ad "poke" helper ---
-  // Some GPT / safeframe renders can stay visually blank until a *real* scroll happens.
-  // We still avoid showAds()/refresh() (can hurt fill), but we mimic the user "micro scroll".
-  var ezEmptySeen = Object.create(null);
-  var ezEmptyPokeTimer = Object.create(null);
-  var ezEmptyAttempts = Object.create(null);
-
-  function inViewportLoose(el) {
-    try {
-      if (!el || !el.getBoundingClientRect) return false;
-      var r = el.getBoundingClientRect();
-      var vh = window.innerHeight || document.documentElement.clientHeight || 0;
-      // within 1.5 viewports from top/bottom
-      return r.bottom > -vh * 0.5 && r.top < vh * 1.5;
-    } catch (e) {
-      return false;
-    }
-  }
-
-  function hasAnyIframe(divEl) {
-    try {
-      if (!divEl) return false;
-      return !!divEl.querySelector('iframe');
-    } catch (e) {
-      return false;
-    }
-  }
-
-  function microScrollNudge() {
-    try {
-      // Only if the page can actually scroll
-      var maxY = (document.documentElement && document.documentElement.scrollHeight) ? document.documentElement.scrollHeight : 0;
-      if (maxY <= (window.innerHeight || 0) + 2) return;
-
-      var x = window.scrollX || 0;
-      var y = window.scrollY || 0;
-      // Nudge by 1px and restore on the next frame.
-      window.scrollTo(x, y + 1);
-      requestAnimationFrame(function(){
-        try { window.scrollTo(x, y); } catch (e) {}
-      });
-    } catch (e) {}
-  }
-
-  function pokeReflowForDivId(divId) {
-    try {
-      var el = document.getElementById(divId);
-      if (!el) return;
-      if (!inViewportLoose(el)) return;
-
-      // If the slot already has an iframe, don't keep poking.
-      if (hasAnyIframe(el)) return;
-
-      // Force a tiny reflow/paint on the closest wrapper
-      var wrap = el.closest ? (el.closest('.ez-fixed-wrap') || el.parentElement) : el.parentElement;
-      if (!wrap) wrap = el;
-
-      // 1) Force layout
-      try { void wrap.offsetHeight; } catch (e) {}
-
-      // 2) Toggle visibility for one frame (forces paint)
-      var prevVis = wrap.style.visibility;
-      wrap.style.visibility = 'hidden';
-      requestAnimationFrame(function(){
-        wrap.style.visibility = prevVis || '';
-        // 3) Fire synthetic events (cheap)
-        try { window.dispatchEvent(new Event('scroll')); } catch (e) {}
-        try { window.dispatchEvent(new Event('resize')); } catch (e) {}
-
-        // 4) If the slot was "empty", a real scroll often makes it fill immediately.
-        microScrollNudge();
-      });
-    } catch (e) {}
-  }
-
-  function schedulePoke(divId) {
-    try {
-      if (!divId) return;
-      var now = Date.now();
-      // Cooldown per slot to avoid loops
-      if (ezEmptySeen[divId] && now - ezEmptySeen[divId] < 15000) return;
-      // New window: reset attempts
-      ezEmptyAttempts[divId] = 0;
-      ezEmptySeen[divId] = now;
-
-      // Cap attempts per slot in a short window
-      ezEmptyAttempts[divId] = (ezEmptyAttempts[divId] || 0) + 1;
-      if (ezEmptyAttempts[divId] > 3) return;
-
-      if (ezEmptyPokeTimer[divId]) return;
-      // Multi-poke: fast + a couple of retries (covers slow GPT / lazy paint)
-      ezEmptyPokeTimer[divId] = setTimeout(function(){
-        ezEmptyPokeTimer[divId] = null;
-        pokeReflowForDivId(divId);
-        setTimeout(function(){ pokeReflowForDivId(divId); }, 350);
-        setTimeout(function(){ pokeReflowForDivId(divId); }, 1200);
-      }, 80);
-    } catch (e) {}
-  }
-
-  function initGptEmptyPoke() {
-    try {
-      if (!window.googletag || !googletag.cmd || !googletag.pubads) return;
-      googletag.cmd.push(function(){
-        try {
-          var pub = googletag.pubads();
-          if (!pub || !pub.addEventListener) return;
-          pub.addEventListener('slotRenderEnded', function(e){
-            try {
-              if (!e) return;
-              // divId is the GPT container id for the slot (e.g. div-gpt-ad-...)
-              var divId = e.slot && e.slot.getSlotElementId ? e.slot.getSlotElementId() : (e.slotElementId || '');
-              if (e.isEmpty) {
-                if (divId) console.log('[EZ EMPTY]', divId);
-                schedulePoke(divId);
-              }
-            } catch (err) {}
-          });
-        } catch (err2) {}
-      });
-    } catch (e) {}
-  }
-
   function init() {
     schedule('init');
 
@@ -1808,10 +1685,6 @@ function buildOrdinalMap(items) {
         });
       } catch (e) {}
     }
-
-    // Listen for GPT empty renders and apply a cheap reflow "poke".
-    // This is intentionally non-invasive (no showAds/refresh) to preserve fill.
-    initGptEmptyPoke();
   }
 
   if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
@@ -1819,3 +1692,106 @@ 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';
+
+  function getUl(){
+    return document.querySelector(UL_SEL);
+  }
+
+  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 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 handleWrapInserted(ul, 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) {}
+      }
+    } catch (e) {}
+  }
+
+  function scanExisting(ul){
+    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;
+          }
+          // 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 });
+  }
+
+  if (document.readyState === 'loading') {
+    document.addEventListener('DOMContentLoaded', init);
+  } else {
+    init();
+  }
+})();
+// ===== /V17.17 TOPFIX =====