nodebb-plugin-ezoic-infinite 1.5.51 → 1.5.53

package/package.json

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

package/public/client.js

@@ -100,7 +100,7 @@
   function markEmptyWrapper(id) {
     try {
       const ph = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
-      if (!ph || !ph.isConnected) { try { clearTimeout(hardTimer); } catch (e) {} release(); return; }
+      if (!ph || !ph.isConnected) return;
       const wrap = ph.closest ? ph.closest(`.${WRAP_CLASS}`) : null;
       if (!wrap) return;
       // If still empty after a delay, collapse it.
@@ -205,13 +205,6 @@
         ['dns-prefetch', 'https://g.ezoic.net', false],
         ['preconnect', 'https://go.ezoic.net', true],
         ['dns-prefetch', 'https://go.ezoic.net', false],
-        // Google Ads / Safeframe warm-up (helps cold-start latency)
-        ['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],
       ];
       for (const [rel, href, cors] of links) {
         const key = `${rel}|${href}`;
@@ -226,34 +219,91 @@
     } catch (e) {}
   }
 
+  
   // Patch showAds to avoid warnings when a placeholder disappears (infinite scroll, ajaxify)
+  // Ezoic can (re)define ezstandalone.showAds over time; we hook assignments to keep the guard.
   function patchShowAds() {
-    const applyPatch = () => {
+    function wrapShowAds(ez, orig) {
+      if (orig && 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 seen = new Set();
+        for (const v of ids) {
+          const id = parseInt(v, 10);
+          if (!Number.isFinite(id) || id <= 0 || seen.has(id)) continue;
+
+          const domId = `${PLACEHOLDER_PREFIX}${id}`;
+          const ph = document.getElementById(domId);
+          if (!ph || !ph.isConnected) continue;
+
+          // Prevent repeated "define" attempts on the same placeholder while it remains in DOM.
+          if (ph.dataset && (ph.dataset.ezRequested === '1' || ph.dataset.ezDefined === '1')) continue;
+
+          seen.add(id);
+          try {
+            if (ph.dataset) ph.dataset.ezRequested = '1';
+            orig.call(ez, id);
+            if (ph.dataset) {
+              ph.dataset.ezDefined = '1';
+              ph.dataset.ezRequested = '0';
+            }
+          } catch (e) {
+            try { if (ph.dataset) ph.dataset.ezRequested = '0'; } catch (_) {}
+          }
+        }
+      };
+      try { wrapped.__nodebbWrapped = true; } catch (e) {}
+      return wrapped;
+    }
+
+    function ensureHook() {
       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()) { try { clearTimeout(hardTimer); } catch (e) {} release(); 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) {}
+
+        // Hook future assignments to showAds so we keep our wrapper even if Ezoic overwrites it.
+        if (!ez.__nodebbShowAdsHooked) {
+          ez.__nodebbShowAdsHooked = true;
+          let _showAds = ez.showAds;
+
+          Object.defineProperty(ez, 'showAds', {
+            configurable: true,
+            enumerable: true,
+            get() {
+              return _showAds;
+            },
+            set(fn) {
+              _showAds = (typeof fn === 'function') ? wrapShowAds(ez, fn) : fn;
+            },
+          });
+
+          // If showAds already exists, wrap it immediately
+          if (typeof _showAds === 'function') {
+            _showAds = wrapShowAds(ez, _showAds);
           }
+        } else if (typeof ez.showAds === 'function' && !ez.showAds.__nodebbWrapped) {
+          // In case defineProperty wasn't possible (rare), re-wrap
+          ez.showAds = wrapShowAds(ez, ez.showAds);
+        }
+      } catch (e) {}
+    }
+
+    ensureHook();
+
+    // Also attempt via cmd queue
+    try {
+      window.ezstandalone = window.ezstandalone || {};
+      window.ezstandalone.cmd = window.ezstandalone.cmd || [];
+      window.ezstandalone.cmd.push(ensureHook);
+    } catch (e) {}
+  }
+
         };
       } catch (e) {}
     };
@@ -334,9 +384,15 @@ function withInternalDomChange(fn) {
 
   function safeDestroyById(id) {
     try {
+      const domId = `${PLACEHOLDER_PREFIX}${id}`;
+      const ph = document.getElementById(domId);
+      if (ph && ph.dataset) {
+        delete ph.dataset.ezDefined;
+        delete ph.dataset.ezRequested;
+      }
       const ez = window.ezstandalone;
       if (ez && typeof ez.destroyPlaceholders === 'function') {
-        ez.destroyPlaceholders([`${PLACEHOLDER_PREFIX}${id}`]);
+        ez.destroyPlaceholders([domId]);
       }
     } catch (e) {}
   }
@@ -377,7 +433,7 @@ function withInternalDomChange(fn) {
     window.setTimeout(() => {
       try {
         const ph = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
-        if (!ph || !ph.isConnected) { try { clearTimeout(hardTimer); } catch (e) {} release(); return; }
+        if (!ph || !ph.isConnected) return;
         const wrap = ph.closest(`.${WRAP_CLASS}`);
         if (!wrap) return;
         const hasContent = ph.childElementCount > 0 || ph.offsetHeight > 0;
@@ -490,7 +546,7 @@ function buildWrap(id, kindClass, afterPos) {
 }
 
 function drainQueue() {
-  if (isBlocked()) { try { clearTimeout(hardTimer); } catch (e) {} release(); return; }
+  if (isBlocked()) return;
   const max = getMaxInflight();
   while (state.inflight < max && state.pending.length) {
     const id = state.pending.shift();
@@ -499,9 +555,11 @@ function drainQueue() {
   }
 }
 
+
 function startShow(id) {
-  if (!id || isBlocked()) return;
+  if (!id) return;
 
+  // Reserve an inflight slot, but ALWAYS release on any early exit.
   state.inflight++;
   let released = false;
   const release = () => {
@@ -515,14 +573,15 @@ function startShow(id) {
 
   requestAnimationFrame(() => {
     try {
-      if (isBlocked()) { try { clearTimeout(hardTimer); } catch (e) {} release(); return; }
+      if (isBlocked()) { clearTimeout(hardTimer); release(); return; }
 
-      const ph = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
-      if (!ph || !ph.isConnected) { try { clearTimeout(hardTimer); } catch (e) {} release(); return; }
+      const domId = `${PLACEHOLDER_PREFIX}${id}`;
+      const phNow = document.getElementById(domId);
+      if (!phNow || !phNow.isConnected) { clearTimeout(hardTimer); release(); return; }
 
       const now2 = Date.now();
       const last2 = state.lastShowById.get(id) || 0;
-      if (now2 - last2 < 900) { try { clearTimeout(hardTimer); } catch (e) {} release(); return; }
+      if (now2 - last2 < 900) { clearTimeout(hardTimer); release(); return; }
       state.lastShowById.set(id, now2);
 
       window.ezstandalone = window.ezstandalone || {};
@@ -530,35 +589,25 @@ function startShow(id) {
 
       const doShow = () => {
         try {
-          // Re-check at execution time: ajaxify/infinite-scroll may have removed the placeholder.
-          const phNow = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
-          if (!phNow || !phNow.isConnected) {
-            try { clearTimeout(hardTimer); } catch (e) {}
-            release();
-            return;
-          }
-        } catch (e) {}
+          if (isBlocked()) return;
 
-        try {
-          // If we reused an id in this pageview, destroy first (use DOM id string form).
-          if (state.usedOnce && state.usedOnce.has(id) && typeof ez.destroyPlaceholders === 'function') {
-            try { ez.destroyPlaceholders([`${PLACEHOLDER_PREFIX}${id}`]); } catch (e) {}
+          // Re-check at execution time (ez.cmd can run later).
+          const ph = document.getElementById(domId);
+          if (!ph || !ph.isConnected) return;
+
+          // If this id was used before, destroy safely using full DOM id.
+          if (state.usedOnce && state.usedOnce.has(id)) {
+            safeDestroyById(id);
           }
-        } catch (e) {}
 
-        try {
-          // Call Ezoic. Our showAds patch will also filter if DOM disappeared.
+          // showAds is patched to ignore missing placeholders and repeated defines.
           ez.showAds(id);
-        } catch (e) {}
-
-        try { state.usedOnce && state.usedOnce.add(id); } catch (e) {}
-        try { markEmptyWrapper(id); } catch (e) {}
 
-        // Release budget quickly; rendering continues async in ad stack.
-        setTimeout(() => {
-          try { clearTimeout(hardTimer); } catch (e) {}
-          release();
-        }, 300);
+          try { state.usedOnce && state.usedOnce.add(id); } catch (e) {}
+        } catch (e) {}
+        finally {
+          setTimeout(() => { try { clearTimeout(hardTimer); } catch (_) {} release(); }, 650);
+        }
       };
 
       if (Array.isArray(ez.cmd)) {
@@ -566,13 +615,15 @@ function startShow(id) {
       } else {
         doShow();
       }
-    } finally {
-      // If we returned early, hardTimer will release.
+    } catch (e) {
+      try { clearTimeout(hardTimer); } catch (_) {}
+      release();
     }
   });
 }
 
 
+
   // ---------- preload / above-the-fold ----------
 
   function ensurePreloadObserver() {
@@ -614,7 +665,7 @@ function startShow(id) {
 
   function observePlaceholder(id) {
     const ph = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
-    if (!ph || !ph.isConnected) { try { clearTimeout(hardTimer); } catch (e) {} release(); return; }
+    if (!ph || !ph.isConnected) return;
     const io = ensurePreloadObserver();
     try { io && io.observe(ph); } catch (e) {}
 
@@ -874,7 +925,7 @@ function startShow(id) {
 
     // Infinite scroll / partial updates
     $(window).on('action:posts.loaded.ezoicInfinite action:topics.loaded.ezoicInfinite action:category.loaded.ezoicInfinite action:topic.loaded.ezoicInfinite', () => {
-      if (isBlocked()) { try { clearTimeout(hardTimer); } catch (e) {} release(); return; }
+      if (isBlocked()) return;
       scheduleRun();
     });
   }

package/public/style.css

@@ -38,16 +38,3 @@
 .ezoic-ad > [id^="ezoic-pub-ad-placeholder-"] {
   min-height: 0 !important;
 }
-
-
-/* Smooth fill: avoid harsh flash when safeframe/iframe arrives */
-.ezoic-ad iframe {
-  opacity: 0;
-  transition: opacity 140ms ease;
-  display: block !important;
-  vertical-align: top !important;
-}
-.ezoic-ad iframe[data-load-complete="true"],
-.ezoic-ad iframe[src] {
-  opacity: 1;
-}