nodebb-plugin-ezoic-infinite 1.6.44 → 1.6.45

package/package.json

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

package/public/client.js

@@ -1515,7 +1515,11 @@ 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"]';
-  var BETWEEN_WRAP_SEL = 'div.nodebb-ezoic-wrap.ezoic-ad-between';
+  // 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 HOST_CLASS = 'nodebb-ezoic-host';
 
   var scheduled = false;
@@ -1607,7 +1611,19 @@ function buildOrdinalMap(items) {
       if (!ul) return;
 
       // Step 1: wrap any direct child between DIVs into LI hosts (makes list stable)
-      ul.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); });
+      // 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);
+      });
 
       // Step 2: only act if we see pile-up (avoid touching infinite scroll during normal flow)
       if (!detectPileUp(ul)) return;
@@ -1646,129 +1662,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 +1701,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);