nodebb-plugin-ezoic-infinite 1.5.50 → 1.5.52

package/package.json

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

package/public/client.js

@@ -96,48 +96,6 @@
 
   const insertingIds = new Set();
 
-  // ---------- lightweight "fade-in" for ad iframes ----------
-  // This reduces the perception of "flashing" when a slot appears empty then fills.
-  // We avoid scroll listeners and only react to DOM insertions.
-  const _faded = new WeakSet();
-  function _fadeInIframe(iframe) {
-    try {
-      if (!iframe || _faded.has(iframe)) return;
-      _faded.add(iframe);
-      iframe.style.opacity = '0';
-      iframe.style.transition = 'opacity 140ms ease';
-      // Next frame: show
-      requestAnimationFrame(() => {
-        try { iframe.style.opacity = '1'; } catch (e) {}
-      });
-    } catch (e) {}
-  }
-
-  const _adFillObserver = new MutationObserver((muts) => {
-    try {
-      for (const m of muts) {
-        if (m.addedNodes && m.addedNodes.length) {
-          for (const n of m.addedNodes) {
-            if (!n || n.nodeType !== 1) continue;
-            if (n.tagName === 'IFRAME') {
-              const w = n.closest && n.closest(`.${WRAP_CLASS}`);
-              if (w) _fadeInIframe(n);
-              continue;
-            }
-            // If a subtree is added, look for iframes inside ad wrappers only.
-            const ifs = n.querySelectorAll ? n.querySelectorAll(`.${WRAP_CLASS} iframe`) : null;
-            if (ifs && ifs.length) ifs.forEach(_fadeInIframe);
-          }
-        }
-      }
-    } catch (e) {}
-  });
-
-  try {
-    _adFillObserver.observe(document.documentElement, { subtree: true, childList: true });
-  } catch (e) {}
-
-
 
   function markEmptyWrapper(id) {
     try {
@@ -247,18 +205,6 @@
         ['dns-prefetch', 'https://g.ezoic.net', false],
         ['preconnect', 'https://go.ezoic.net', true],
         ['dns-prefetch', 'https://go.ezoic.net', false],
-
-        // Google ad stack (helps Safeframe/GPT warm up)
-        ['preconnect', 'https://pagead2.googlesyndication.com', true],
-        ['dns-prefetch', 'https://pagead2.googlesyndication.com', false],
-        ['preconnect', 'https://securepubads.g.doubleclick.net', true],
-        ['dns-prefetch', 'https://securepubads.g.doubleclick.net', false],
-        ['preconnect', 'https://tpc.googlesyndication.com', true],
-        ['dns-prefetch', 'https://tpc.googlesyndication.com', false],
-        ['preconnect', 'https://googleads.g.doubleclick.net', true],
-        ['dns-prefetch', 'https://googleads.g.doubleclick.net', false],
-        ['preconnect', 'https://static.doubleclick.net', true],
-        ['dns-prefetch', 'https://static.doubleclick.net', false],
       ];
       for (const [rel, href, cors] of links) {
         const key = `${rel}|${href}`;
@@ -274,46 +220,76 @@
   }
 
   // Patch showAds to avoid warnings when a placeholder disappears (infinite scroll, ajaxify)
-  function patchShowAds() {
-    const applyPatch = () => {
-      try {
-        window.ezstandalone = window.ezstandalone || {};
-        const ez = window.ezstandalone;
-        if (window.__nodebbEzoicPatched) return;
-        if (typeof ez.showAds !== 'function') return;
-
-        window.__nodebbEzoicPatched = true;
-        const orig = ez.showAds;
-
-        ez.showAds = function (...args) {
-          if (isBlocked()) return;
-
-          let ids = [];
-          if (args.length === 1 && Array.isArray(args[0])) ids = args[0];
-          else ids = args;
-
-          const seen = new Set();
-          for (const v of ids) {
-            const id = parseInt(v, 10);
-            if (!Number.isFinite(id) || id <= 0 || seen.has(id)) continue;
-            const ph = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
-            if (!ph || !ph.isConnected) continue;
-            seen.add(id);
-            try { orig.call(ez, id); } catch (e) {}
-          }
-        };
-      } catch (e) {}
+  
+function patchShowAds() {
+  // Robustly filter ez.showAds calls so Ezoic won't spam "placeholder does not exist"
+  // during ajaxify navigation or when some placeholders are not present on the current view.
+  try {
+    window.ezstandalone = window.ezstandalone || {};
+    const ez = window.ezstandalone;
+    ez.cmd = ez.cmd || [];
+
+    const wrap = (orig) => {
+      if (typeof orig !== 'function') return orig;
+      if (orig.__nodebbWrapped) return orig;
+
+      const wrapped = function (...args) {
+        if (isBlocked()) return;
+
+        let ids = [];
+        if (args.length === 1 && Array.isArray(args[0])) ids = args[0];
+        else ids = args;
+
+        const filtered = [];
+        const seen = new Set();
+        for (const v of ids) {
+          const id = parseInt(v, 10);
+          if (!Number.isFinite(id) || id <= 0 || seen.has(id)) continue;
+          const ph = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
+          if (!ph || !ph.isConnected) continue;
+          seen.add(id);
+          filtered.push(id);
+        }
+        if (!filtered.length) return;
+
+        // Call original with the same shape most implementations accept
+        try { return orig.call(ez, filtered.length === 1 ? filtered[0] : filtered); } catch (e) {}
+      };
+      wrapped.__nodebbWrapped = true;
+      wrapped.__nodebbOrig = orig;
+      return wrapped;
     };
 
-    applyPatch();
-    if (!window.__nodebbEzoicPatched) {
-      try {
-        window.ezstandalone = window.ezstandalone || {};
-        window.ezstandalone.cmd = window.ezstandalone.cmd || [];
-        window.ezstandalone.cmd.push(applyPatch);
-      } catch (e) {}
+    // If showAds already exists, wrap it now.
+    if (typeof ez.showAds === 'function') {
+      ez.showAds = wrap(ez.showAds);
+      return;
     }
-  }
+
+    // Otherwise, define a setter hook so whenever Ezoic defines showAds, we wrap it.
+    if (!ez.__nodebbShowAdsHooked) {
+      ez.__nodebbShowAdsHooked = true;
+      let _showAds = null;
+
+      Object.defineProperty(ez, 'showAds', {
+        configurable: true,
+        enumerable: true,
+        get() { return _showAds; },
+        set(fn) { _showAds = wrap(fn); }
+      });
+
+      // In case Ezoic sets showAds from cmd queue
+      ez.cmd.push(() => {
+        try {
+          if (typeof ez.showAds === 'function' && !ez.showAds.__nodebbWrapped) {
+            ez.showAds = wrap(ez.showAds);
+          }
+        } catch (e) {}
+      });
+    }
+  } catch (e) {}
+}
+
 
     const RECYCLE_COOLDOWN_MS = 1500;
 
@@ -439,7 +415,6 @@ function buildWrap(id, kindClass, afterPos) {
     wrap.className = `${WRAP_CLASS} ${kindClass}`;
     wrap.setAttribute('data-ezoic-after', String(afterPos));
     wrap.setAttribute('data-ezoic-wrapid', String(id));
-    wrap.setAttribute('data-ezoic-ts', String(Date.now()));
     wrap.style.width = '100%';
 
     const ph = document.createElement('div');
@@ -496,23 +471,14 @@ function buildWrap(id, kindClass, afterPos) {
       const wraps = Array.from(document.querySelectorAll(`.${WRAP_CLASS}.${kindClass}`));
       if (!wraps.length) return false;
 
-      const now = Date.now();
-
-      // Only recycle wraps that are clearly out of view AND old enough.
-      // This avoids the "unstable" feeling where ads disappear when the user scrolls back a bit.
-      const MIN_AGE_MS = 20000;      // 20s
-      const OFFSCREEN_PX = -5000;    // far above viewport
-
+      // Prefer a wrap far above the viewport
       let victim = null;
       for (const w of wraps) {
         const r = w.getBoundingClientRect();
-        const ts = parseInt(w.getAttribute('data-ezoic-ts') || '0', 10);
-        const ageOk = !ts || (now - ts) >= MIN_AGE_MS;
-        if (ageOk && r.bottom < OFFSCREEN_PX) { victim = w; break; }
+        if (r.bottom < -2000) { victim = w; break; }
       }
-
-      // If nothing is eligible, do not recycle. We'll simply skip inserting new ads this run.
-      if (!victim) return false;
+      // Otherwise remove the earliest one in the document
+      if (!victim) victim = wraps[0];
 
       // Unobserve placeholder if still observed
       try {
@@ -559,6 +525,7 @@ function drainQueue() {
 function startShow(id) {
   if (!id || isBlocked()) return;
 
+  // Reserve one inflight slot for this request
   state.inflight++;
   let released = false;
   const release = () => {
@@ -570,16 +537,22 @@ function startShow(id) {
 
   const hardTimer = setTimeout(release, 6500);
 
+  const earlyExit = () => {
+    try { clearTimeout(hardTimer); } catch (e) {}
+    release();
+  };
+
   requestAnimationFrame(() => {
     try {
-      if (isBlocked()) return;
+      if (isBlocked()) return earlyExit();
 
-      const ph = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
-      if (!ph || !ph.isConnected) return;
+      const domId = `${PLACEHOLDER_PREFIX}${id}`;
+      const ph = document.getElementById(domId);
+      if (!ph || !ph.isConnected) return earlyExit();
 
       const now2 = Date.now();
       const last2 = state.lastShowById.get(id) || 0;
-      if (now2 - last2 < 900) return;
+      if (now2 - last2 < 900) return earlyExit();
       state.lastShowById.set(id, now2);
 
       window.ezstandalone = window.ezstandalone || {};
@@ -587,16 +560,31 @@ function startShow(id) {
 
       const doShow = () => {
         try {
+          if (isBlocked()) return earlyExit();
+
+          // Re-check at execution time (cmd queue may delay)
+          const ph2 = document.getElementById(domId);
+          if (!ph2 || !ph2.isConnected) return earlyExit();
+
+          // If this id was used before in this pageview, destroy first (Ezoic best practice on recycle)
           if (state.usedOnce && state.usedOnce.has(id) && typeof ez.destroyPlaceholders === 'function') {
-            try { ez.destroyPlaceholders(id); } catch (e) {}
+            try { ez.destroyPlaceholders([domId]); } catch (e) {}
           }
-        } catch (e) {}
 
-        try { ez.showAds(id); } catch (e) {}
-        try { state.usedOnce && state.usedOnce.add(id); } catch (e) {}
-        try { markEmptyWrapper(id); } catch (e) {}
+          // Call showAds (patched to filter missing placeholders)
+          try { ez.showAds(id); } catch (e) {}
+
+          try { state.usedOnce && state.usedOnce.add(id); } catch (e) {}
+          try { markEmptyWrapper(id); } catch (e) {}  // harmless; if removed later, it no-ops
 
-        setTimeout(() => { clearTimeout(hardTimer); release(); }, 650);
+          // Release shortly after triggering, so we can pipeline the next ones
+          setTimeout(() => {
+            try { clearTimeout(hardTimer); } catch (e) {}
+            release();
+          }, 650);
+        } catch (e) {
+          earlyExit();
+        }
       };
 
       if (Array.isArray(ez.cmd)) {
@@ -604,8 +592,8 @@ function startShow(id) {
       } else {
         doShow();
       }
-    } finally {
-      // If we returned early, hardTimer will release.
+    } catch (e) {
+      earlyExit();
     }
   });
 }

package/public/style.css

@@ -38,9 +38,3 @@
 .ezoic-ad > [id^="ezoic-pub-ad-placeholder-"] {
   min-height: 0 !important;
 }
-
-/* Avoid baseline gap under iframes (can look like extra space) */
-.ezoic-ad iframe {
-  display: block !important;
-  vertical-align: top !important;
-}