nodebb-plugin-ezoic-infinite 1.8.41 → 1.8.42

package/library.js

@@ -144,8 +144,7 @@ const EZOIC_SCRIPTS = [
   '<script async src="//www.ezojs.com/ezoic/sa.min.js"></script>',
   '<script>',
   'window.ezstandalone = window.ezstandalone || {};',
-  // Always reference through window to avoid ReferenceError in stricter contexts
-  'window.ezstandalone.cmd = window.ezstandalone.cmd || [];',
+  'ezstandalone.cmd = ezstandalone.cmd || [];',
   '</script>',
 ].join('\n');
 

package/package.json

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

package/public/client.js

@@ -38,7 +38,7 @@
     SHOW_RELEASE_MS:      700,
     BATCH_FLUSH_MS:        80,
     RECYCLE_DELAY_MS:     450,
-
+    TCF_DEBOUNCE_MS:      500,
   };
 
   // Limits
@@ -257,54 +257,6 @@
     return set;
   }
 
-  // ── Garbage collection (NodeBB post virtualization safe) ─────────────────
-  //
-  // NodeBB can remove large portions of the DOM during infinite scrolling
-  // (especially posts in topics). If a wrap is removed outside of our own
-  // dropWrap(), we must free its placeholder id; otherwise the pool appears
-  // exhausted and ads won't re-insert when the user scrolls back up.
-
-  function gcDisconnectedWraps() {
-    // 1) Clean wrapByKey
-    for (const [key, w] of Array.from(state.wrapByKey.entries())) {
-      if (!w?.isConnected) state.wrapByKey.delete(key);
-    }
-
-    // 2) Clean wrapsByClass sets and free ids
-    for (const [klass, set] of Array.from(state.wrapsByClass.entries())) {
-      for (const w of Array.from(set)) {
-        if (w?.isConnected) continue;
-        set.delete(w);
-        try {
-          const id = parseInt(w.getAttribute(ATTR.WRAPID), 10);
-          if (Number.isFinite(id)) {
-            state.mountedIds.delete(id);
-            state.phState.delete(id);
-            state.lastShow.delete(id);
-          }
-        } catch (_) {}
-      }
-      if (!set.size) state.wrapsByClass.delete(klass);
-    }
-
-    // 3) Authoritative rebuild of mountedIds from the live DOM
-    try {
-      const live = new Set();
-      for (const w of document.querySelectorAll(`.${WRAP_CLASS}`)) {
-        const id = parseInt(w.getAttribute(ATTR.WRAPID) || '0', 10);
-        if (id > 0) live.add(id);
-      }
-      // Drop any ids that are no longer live
-      for (const id of Array.from(state.mountedIds)) {
-        if (!live.has(id)) {
-          state.mountedIds.delete(id);
-          state.phState.delete(id);
-          state.lastShow.delete(id);
-        }
-      }
-    } catch (_) {}
-  }
-
   // ── Wrap lifecycle detection ───────────────────────────────────────────────
 
   /**
@@ -813,10 +765,6 @@
   async function runCore() {
     if (isBlocked()) return 0;
 
-    // Keep internal pools in sync with NodeBB DOM virtualization/removals
-    // so ads can re-insert correctly when users scroll back up.
-    try { gcDisconnectedWraps(); } catch (_) {}
-
     const cfg = await fetchConfig();
     if (!cfg || cfg.excluded) return 0;
     initPools(cfg);
@@ -940,22 +888,6 @@
 
       for (const m of muts) {
         if (m.type !== 'childList') continue;
-
-        // If NodeBB removed wraps as part of virtualization, free ids immediately
-        for (const node of m.removedNodes) {
-          if (!(node instanceof Element)) continue;
-          try {
-            if (node.classList?.contains(WRAP_CLASS)) {
-              dropWrap(node);
-            } else {
-              const wraps = node.querySelectorAll?.(`.${WRAP_CLASS}`);
-              if (wraps?.length) {
-                for (const w of wraps) dropWrap(w);
-              }
-            }
-          } catch (_) {}
-        }
-
         for (const node of m.addedNodes) {
           if (!(node instanceof Element)) continue;
 
@@ -991,122 +923,50 @@
     } catch (_) {}
   }
 
-  // ── TCF / CMP Protection ─────────────────────────────────────────────────
-  //
-  // Root cause of the CMP errors:
-  //   "Cannot read properties of null (reading 'postMessage')"
-  //   "Cannot set properties of null (setting 'addtlConsent')"
-  //
-  // The CMP (Gatekeeper Consent) communicates via postMessage on the
-  // __tcfapiLocator iframe's contentWindow. During NodeBB ajaxify navigation,
-  // jQuery's html() or empty() on the content area can cascade and remove
-  // iframes from <body>. The CMP then calls getTCData on a stale reference
-  // where contentWindow is null.
-  //
-  // Strategy (3 layers):
+  // ── TCF Locator ────────────────────────────────────────────────────────────
   //
-  //  1. PROTECT: Move the locator iframe into <head> where ajaxify never
-  //     touches it. The TCF spec only requires the iframe to exist in the
-  //     document with name="__tcfapiLocator" — it works from <head>.
+  // FIX: The CMP iframe locator (__tcfapiLocator) must exist for the CMP to
+  // communicate via postMessage. NodeBB's ajaxify can remove it during navigation.
   //
-  //  2. GUARD: Wrap __tcfapi and __cmp with a safety layer that catches
-  //     errors in the CMP's internal getTCData, preventing the uncaught
-  //     TypeError from propagating.
+  // Previous approach: MutationObserver that re-injects on EVERY mutation → race
+  // conditions with CMP, causing "Cannot read properties of null (reading 'postMessage')"
+  // and "Cannot set properties of null (setting 'addtlConsent')".
   //
-  //  3. RESTORE: MutationObserver on <body> childList (not subtree) to
-  //     immediately re-create the locator if something still removes it.
+  // New approach: Debounced check — only re-inject after DOM stabilizes (500ms).
+  // The CMP scripts handle their own initialization; we just ensure the locator
+  // iframe exists when needed.
+
+  let _tcfDebounce = null;
 
   function ensureTcfLocator() {
+    // Only needed if CMP APIs are present
     if (!window.__tcfapi && !window.__cmp) return;
 
-    const LOCATOR_ID = '__tcfapiLocator';
-
-    // Create or relocate the locator iframe into <head> for protection
-    const ensureInHead = () => {
-      let existing = document.getElementById(LOCATOR_ID);
-      if (existing) {
-        // If it's in <body>, move it to <head> where ajaxify can't reach it
-        if (existing.parentElement !== document.head) {
-          try { document.head.appendChild(existing); } catch (_) {}
-        }
-        return existing;
-      }
-      // Create fresh
+    const inject = () => {
+      if (document.getElementById('__tcfapiLocator')) return;
       const f = document.createElement('iframe');
       f.style.display = 'none';
-      f.id = f.name = LOCATOR_ID;
-      try { document.head.appendChild(f); } catch (_) {
-        // Fallback to body if head insertion fails
-        (document.body || document.documentElement).appendChild(f);
-      }
-      return f;
+      f.id = f.name = '__tcfapiLocator';
+      (document.body || document.documentElement).appendChild(f);
     };
 
-    ensureInHead();
-
-    // Layer 2: Guard the CMP API calls against null contentWindow
-    if (!window.__nbbCmpGuarded) {
-      window.__nbbCmpGuarded = true;
-
-      // Wrap __tcfapi
-      if (typeof window.__tcfapi === 'function') {
-        const origTcf = window.__tcfapi;
-        window.__tcfapi = function (cmd, version, cb, param) {
-          try {
-            return origTcf.call(this, cmd, version, function (...args) {
-              try { cb?.(...args); } catch (_) {}
-            }, param);
-          } catch (e) {
-            // If the error is the null postMessage/addtlConsent, swallow it
-            if (e?.message?.includes('null')) {
-              // Re-ensure locator exists, then retry once
-              ensureInHead();
-              try { return origTcf.call(this, cmd, version, cb, param); } catch (_) {}
-            }
-          }
-        };
-      }
+    inject();
 
-      // Wrap __cmp (legacy CMP v1 API)
-      if (typeof window.__cmp === 'function') {
-        const origCmp = window.__cmp;
-        window.__cmp = function (...args) {
-          try {
-            return origCmp.apply(this, args);
-          } catch (e) {
-            if (e?.message?.includes('null')) {
-              ensureInHead();
-              try { return origCmp.apply(this, args); } catch (_) {}
-            }
-          }
-        };
-      }
-    }
-
-    // Layer 3: MutationObserver to immediately restore if removed
+    // Set up a debounced observer instead of per-mutation injection
     if (!window.__nbbTcfObs) {
-      window.__nbbTcfObs = new MutationObserver(muts => {
-        // Fast check: still in document?
-        if (document.getElementById(LOCATOR_ID)) return;
-        // Something removed it — restore immediately (no debounce)
-        ensureInHead();
+      window.__nbbTcfObs = new MutationObserver(() => {
+        // Quick check: if locator still exists, skip
+        if (document.getElementById('__tcfapiLocator')) return;
+        // Debounce: wait for DOM to stabilize before re-injecting
+        clearTimeout(_tcfDebounce);
+        _tcfDebounce = setTimeout(inject, TIMING.TCF_DEBOUNCE_MS);
+      });
+      // Observe only direct children of body (not deep subtree)
+      // since the locator iframe is a direct child
+      window.__nbbTcfObs.observe(document.body || document.documentElement, {
+        childList: true,
+        subtree: false,
       });
-      // Observe body direct children only (the most likely removal point)
-      try {
-        window.__nbbTcfObs.observe(document.body || document.documentElement, {
-          childList: true,
-          subtree: false,
-        });
-      } catch (_) {}
-      // Also observe <head> in case something cleans it
-      try {
-        if (document.head) {
-          window.__nbbTcfObs.observe(document.head, {
-            childList: true,
-            subtree: false,
-          });
-        }
-      } catch (_) {}
     }
   }
 
@@ -1125,8 +985,6 @@
       'cannot call refresh on the same page',
       'no placeholders are currently defined in Refresh',
       'Debugger iframe already exists',
-      '[CMP] Error in custom getTCData',
-      'vignette: no interstitial API',
     ];
     const PH_PATTERN = `with id ${PH_PREFIX}`;
 
@@ -1192,9 +1050,6 @@
       state.kind       = null;
       state.blockedUntil = 0;
 
-      // Fix: CMP modal can leave aria-hidden="true" on <body> after navigation
-      try { document.body.removeAttribute('aria-hidden'); } catch (_) {}
-
       muteConsole();
       ensureTcfLocator();
       warmNetwork();