nodebb-plugin-ezoic-infinite 1.5.3 → 1.5.4

package/package.json

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

package/public/client.js

@@ -1,7 +1,4 @@
 'use strict';
-
-// Safety stub: some Ezoic scripts expect a global queue even when ads are disabled
-window._ezaq = window._ezaq || [];
 /**
  * Ezoic Infinite Ads for NodeBB 4.x
  * - Event-driven only (ajaxify hooks + MutationObserver + IntersectionObserver)
@@ -13,6 +10,15 @@ window._ezaq = window._ezaq || [];
 (function () {
   const CFG_URL = '/api/plugins/ezoic-infinite/config';
 
+  // Ensure Ezoic globals exist early (prevents `cmd`/`_ezaq` crashes)
+  function bootEzGlobals(){
+    window._ezaq = window._ezaq || [];
+    window.ezstandalone = window.ezstandalone || {};
+    window.ezstandalone.cmd = window.ezstandalone.cmd || [];
+  }
+
+  bootEzGlobals();
+
   // -------------------------
   // Utilities
   // -------------------------
@@ -81,48 +87,39 @@ window._ezaq = window._ezaq || [];
     return args.flat().map(String);
   }
 
-  function wrapShowAds(original) {
-    if (!original || original.__nodebbSafeWrapped) return original;
+// -------------------------
+// Ezoic safe calls (no defineProperty hooks)
+// -------------------------
+function ensureEzGlobals() {
+  window._ezaq = window._ezaq || [];
+  window.ezstandalone = window.ezstandalone || {};
+  window.ezstandalone.cmd = window.ezstandalone.cmd || [];
+}
 
-    const wrapped = function (...args) {
-      const ids = normalizeIds(args);
-      if (!ids.length) return;
+function safeShowAds(ids) {
+  ensureEzGlobals();
+  const show = (window.ezstandalone && typeof window.ezstandalone.showAds === 'function')
+    ? window.ezstandalone.showAds
+    : null;
 
-      for (const id of ids) {
-        // Ensure placeholder exists somewhere (pool), so ez-standalone won't log "does not exist"
-        Pool.ensurePlaceholder(id);
-
-        const el = document.getElementById(id);
-        if (el && document.body.contains(el)) {
-          try {
-            // Call one-by-one to avoid batch logging on missing nodes
-            original.call(window.ezstandalone, id);
-          } catch (e) {
-            // swallow: Ezoic can throw if called during transitions
-          }
-        }
-      }
-    };
+  if (!show) return;
 
-    wrapped.__nodebbSafeWrapped = true;
-    return wrapped;
-  }
+  for (const id of ids) {
+    Pool.ensurePlaceholder(id);
+    const el = document.getElementById(id);
+    if (!el) continue;
+
+    // Don't render into the hidden pool (would be invisible, and can confuse Ezoic)
+    if (el.closest('#ezoic-placeholder-pool')) continue;
 
-  
-function installShowAdsHook() {
-  // NOTE: Do NOT use Object.defineProperty accessor tricks on `ezstandalone.showAds`.
-  // Ezoic's standalone loader may validate that property as a plain writable function,
-  // and accessor hooks can cause `defineScript failed` / `displayScript failed`.
-  // Instead, we only wrap it once it exists (event-driven paths will call this again).
-  const ez = window.ezstandalone;
-  if (!ez) return;
-  if (!Array.isArray(ez.cmd)) ez.cmd = [];
-  if (typeof ez.showAds === 'function' && !ez.showAds.__ezoicInfiniteWrapped) {
-    ez.showAds = wrapShowAds(ez.showAds);
+    if (!document.body.contains(el)) continue;
+
+    try { show.call(window.ezstandalone, id); } catch (e) {}
   }
 }
 
-  function ezCmd(fn) {
+function ezCmd(fn) {
+
     // Tokenize so queued callbacks don't run after navigation
     const tokenAtSchedule = navToken;
     window.ezstandalone = window.ezstandalone || {};
@@ -218,7 +215,6 @@ function installShowAdsHook() {
 
       if (c.excluded) return; // HARD stop: never inject for excluded users
 
-      installShowAdsHook();
       this.initObservers();
 
       if (c.enableBetweenAds) this.injectBetweenTopics(c);
@@ -365,7 +361,7 @@ function installShowAdsHook() {
 
   // First load
   once('DOMContentLoaded', () => {
-    installShowAdsHook();
+
     prefetchConfig();
     Ad.scheduleScan();
   });