nodebb-plugin-ezoic-infinite 1.5.51 → 1.5.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "1.5.51",
+  "version": "1.5.52",
   "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}`;
@@ -227,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()) { 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) {}
-          }
-        };
-      } 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;
 
@@ -377,7 +400,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 +513,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();
@@ -502,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 = () => {
@@ -513,16 +537,22 @@ function startShow(id) {
 
   const hardTimer = setTimeout(release, 6500);
 
+  const earlyExit = () => {
+    try { clearTimeout(hardTimer); } catch (e) {}
+    release();
+  };
+
   requestAnimationFrame(() => {
     try {
-      if (isBlocked()) { try { clearTimeout(hardTimer); } catch (e) {} release(); return; }
+      if (isBlocked()) return earlyExit();
 
-      const ph = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
-      if (!ph || !ph.isConnected) { try { clearTimeout(hardTimer); } catch (e) {} release(); 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) { try { clearTimeout(hardTimer); } catch (e) {} release(); return; }
+      if (now2 - last2 < 900) return earlyExit();
       state.lastShowById.set(id, now2);
 
       window.ezstandalone = window.ezstandalone || {};
@@ -530,35 +560,31 @@ 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 earlyExit();
 
-        try {
-          // If we reused an id in this pageview, destroy first (use DOM id string form).
+          // 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([`${PLACEHOLDER_PREFIX}${id}`]); } catch (e) {}
+            try { ez.destroyPlaceholders([domId]); } catch (e) {}
           }
-        } catch (e) {}
 
-        try {
-          // Call Ezoic. Our showAds patch will also filter if DOM disappeared.
-          ez.showAds(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) {}
+          try { state.usedOnce && state.usedOnce.add(id); } catch (e) {}
+          try { markEmptyWrapper(id); } catch (e) {}  // harmless; if removed later, it no-ops
 
-        // Release budget quickly; rendering continues async in ad stack.
-        setTimeout(() => {
-          try { clearTimeout(hardTimer); } catch (e) {}
-          release();
-        }, 300);
+          // 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)) {
@@ -566,8 +592,8 @@ function startShow(id) {
       } else {
         doShow();
       }
-    } finally {
-      // If we returned early, hardTimer will release.
+    } catch (e) {
+      earlyExit();
     }
   });
 }
@@ -614,7 +640,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 +900,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;
-}