nodebb-plugin-ezoic-infinite 1.5.4 → 1.5.6

package/package.json

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

package/public/client.js

@@ -10,15 +10,6 @@
 (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
   // -------------------------
@@ -87,39 +78,64 @@
     return args.flat().map(String);
   }
 
-// -------------------------
-// Ezoic safe calls (no defineProperty hooks)
-// -------------------------
-function ensureEzGlobals() {
-  window._ezaq = window._ezaq || [];
-  window.ezstandalone = window.ezstandalone || {};
-  window.ezstandalone.cmd = window.ezstandalone.cmd || [];
-}
+  function wrapShowAds(original) {
+    if (!original || original.__nodebbSafeWrapped) return original;
 
-function safeShowAds(ids) {
-  ensureEzGlobals();
-  const show = (window.ezstandalone && typeof window.ezstandalone.showAds === 'function')
-    ? window.ezstandalone.showAds
-    : null;
+    const wrapped = function (...args) {
+      const ids = normalizeIds(args);
+      if (!ids.length) return;
 
-  if (!show) return;
+      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
+          }
+        }
+      }
+    };
 
-  for (const id of ids) {
-    Pool.ensurePlaceholder(id);
-    const el = document.getElementById(id);
-    if (!el) continue;
+    wrapped.__nodebbSafeWrapped = true;
+    return wrapped;
+  }
 
-    // Don't render into the hidden pool (would be invisible, and can confuse Ezoic)
-    if (el.closest('#ezoic-placeholder-pool')) continue;
+  function installShowAdsHook() {
+    // If ezstandalone already exists, wrap now.
+    if (window.ezstandalone && window.ezstandalone.showAds) {
+      window.ezstandalone.showAds = wrapShowAds(window.ezstandalone.showAds);
+    }
 
-    if (!document.body.contains(el)) continue;
+    // Hook future assignment (no polling)
+    try {
+      if (!window.ezstandalone) window.ezstandalone = {};
+      const ez = window.ezstandalone;
+
+      // If already has a setter installed, do nothing
+      const desc = Object.getOwnPropertyDescriptor(ez, 'showAds');
+      if (desc && (desc.set || desc.get)) return;
+
+      let _showAds = ez.showAds;
+      Object.defineProperty(ez, 'showAds', {
+        configurable: true,
+        enumerable: true,
+        get() { return _showAds; },
+        set(v) { _showAds = wrapShowAds(v); }
+      });
 
-    try { show.call(window.ezstandalone, id); } catch (e) {}
+      // Re-assign current value through setter
+      ez.showAds = _showAds;
+    } catch (e) {
+      // If defineProperty fails, best-effort wrap is still in place above.
+    }
   }
-}
-
-function ezCmd(fn) {
 
+  function ezCmd(fn) {
     // Tokenize so queued callbacks don't run after navigation
     const tokenAtSchedule = navToken;
     window.ezstandalone = window.ezstandalone || {};
@@ -215,6 +231,7 @@ function ezCmd(fn) {
 
       if (c.excluded) return; // HARD stop: never inject for excluded users
 
+      installShowAdsHook();
       this.initObservers();
 
       if (c.enableBetweenAds) this.injectBetweenTopics(c);
@@ -361,7 +378,7 @@ function ezCmd(fn) {
 
   // First load
   once('DOMContentLoaded', () => {
-
+    installShowAdsHook();
     prefetchConfig();
     Ad.scheduleScan();
   });