npm - nodebb-plugin-ezoic-infinite - Versions diffs - 1.8.35 → 1.8.37 - Mend

nodebb-plugin-ezoic-infinite 1.8.35 → 1.8.37

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/library.js CHANGED Viewed

@@ -173,7 +173,23 @@ plugin.injectEzoicHead = async (data) => {
     const settings = await getSettings();
     const uid      = data.req?.uid ?? 0;
     const excluded = await isUserExcluded(uid, settings.excludedGroups);
-    if (!excluded) {
+    if (excluded) {
+      // Even for excluded users, inject a minimal stub so that any script
+      // referencing ezstandalone doesn't throw a ReferenceError, plus
+      // the config with excluded=true so client.js bails early.
+      const cfg = buildClientConfig(settings, true);
+      const stub = [
+        '<script>',
+        'window.ezstandalone = window.ezstandalone || {};',
+        'ezstandalone.cmd = ezstandalone.cmd || [];',
+        '</script>',
+      ].join('\n');
+      data.templateData.customHTML =
+        stub + '\n' +
+        serializeInlineConfig(cfg) +
+        (data.templateData.customHTML || '');
+    } else {
       const cfg = buildClientConfig(settings, false);
       data.templateData.customHTML =
         HEAD_PRECONNECTS + '\n' +
@@ -182,7 +198,6 @@ plugin.injectEzoicHead = async (data) => {
         (data.templateData.customHTML || '');
     }
   } catch (err) {
-    // Log but don't break rendering
     console.error('[ezoic-infinite] injectEzoicHead error:', err.message);
   }
   return data;

package/package.json CHANGED Viewed

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

package/public/client.js CHANGED Viewed

@@ -1,15 +1,13 @@
 /**
- * NodeBB Ezoic Infinite Ads — client.js v2.0.0
+ * NodeBB Ezoic Infinite Ads — client.js v2.1.0
  *
- * Complete rewrite: performance optimization, CMP/TCF fix, clean architecture.
- *
- * Key changes from v1.x:
- * - TCF locator: debounced recreation instead of per-mutation, prevents CMP postMessage null errors
- * - MutationObserver: scoped to content containers instead of document.body subtree
- * - Console muting: regex-free, prefix-based matching
- * - showAds batching: microtask-based flush instead of setTimeout
- * - Warm network: runs once per session, not per navigation
- * - State machine: clear lifecycle for placeholders (idle → observed → queued → shown → recycled)
+ * Fixes in v2.1:
+ * - Early bail when user is excluded (no ezstandalone reference errors)
+ * - aria-hidden on <body>: MutationObserver removes it continuously
+ * - Recycle threshold raised to -3×vh to prevent mobile fast-scroll blank ads
+ * - Scroll-up: re-observe placeholders whose wraps come back into DOM
+ * - adsbygoogle "already have ads" error: clear ins before recycle
+ * - TCF/CMP 3-layer protection (head iframe, API guard, MutationObserver)
  */
 (function nbbEzoicInfinite() {
   'use strict';
@@ -19,7 +17,6 @@
   const WRAP_CLASS = 'nodebb-ezoic-wrap';
   const PH_PREFIX  = 'ezoic-pub-ad-placeholder-';
-  // Data attributes
   const ATTR = {
     ANCHOR:  'data-ezoic-anchor',
     WRAPID:  'data-ezoic-wrapid',
@@ -27,7 +24,6 @@
     SHOWN:   'data-ezoic-shown',
   };
-  // Timing
   const TIMING = {
     EMPTY_CHECK_MS:    20_000,
     MIN_PRUNE_AGE_MS:   8_000,
@@ -38,10 +34,8 @@
     SHOW_RELEASE_MS:      700,
     BATCH_FLUSH_MS:        80,
     RECYCLE_DELAY_MS:     450,
   };
-  // Limits
   const LIMITS = {
     MAX_INSERTS_RUN: 6,
     MAX_INFLIGHT:    4,
@@ -55,21 +49,18 @@
     MOBILE:  '3500px 0px 3500px 0px',
   };
-  // Selectors
   const SEL = {
     post:     '[component="post"][data-pid]',
     topic:    'li[component="category/topic"]',
     category: 'li[component="categories/category"]',
   };
-  // Kind configuration table — single source of truth per ad type
   const KIND = {
     'ezoic-ad-message':    { sel: SEL.post,     baseTag: '',   anchorAttr: 'data-pid',   ordinalAttr: 'data-index' },
     'ezoic-ad-between':    { sel: SEL.topic,    baseTag: 'li', anchorAttr: 'data-index', ordinalAttr: 'data-index' },
     'ezoic-ad-categories': { sel: SEL.category, baseTag: 'li', anchorAttr: 'data-cid',   ordinalAttr: null         },
   };
-  // Selector for detecting filled ad slots
   const FILL_SEL = 'iframe, ins, img, video, [data-google-container-id], div[id$="__container__"]';
   // ── Utility ────────────────────────────────────────────────────────────────
@@ -103,45 +94,37 @@
   // ── State ──────────────────────────────────────────────────────────────────
   const state = {
-    // Page context
     pageKey:    null,
     kind:       null,
     cfg:        null,
-    // Pools
     poolsReady: false,
     pools:      { topics: [], posts: [], categories: [] },
     cursors:    { topics: 0,  posts: 0,  categories: 0  },
-    // Mounted placeholders
     mountedIds: new Set(),
-    phState:    new Map(),  // id → 'new' | 'show-queued' | 'shown' | 'destroyed'
-    lastShow:   new Map(),  // id → timestamp
+    phState:    new Map(),
+    lastShow:   new Map(),
-    // Wrap registry
-    wrapByKey:    new Map(),  // anchorKey → wrap element
-    wrapsByClass: new Map(),  // kindClass → Set<wrap>
+    wrapByKey:    new Map(),
+    wrapsByClass: new Map(),
-    // Observers
     io:     null,
     domObs: null,
-    // Guards
-    mutGuard:   0,
+    mutGuard:     0,
     blockedUntil: 0,
-    // Show queue
     inflight:   0,
     pending:    [],
     pendingSet: new Set(),
-    // Scheduler
-    runQueued:    false,
-    burstActive:  false,
+    runQueued:     false,
+    burstActive:   false,
     burstDeadline: 0,
-    burstCount:   0,
-    lastBurstTs:  0,
-    firstShown:   false,
+    burstCount:    0,
+    lastBurstTs:   0,
+    firstShown:    false,
   };
   const isBlocked = () => now() < state.blockedUntil;
@@ -155,7 +138,6 @@
   async function fetchConfig() {
     if (state.cfg) return state.cfg;
-    // Prefer inline config injected by server (zero latency)
     try {
       const inline = window.__nbbEzoicCfg;
       if (inline && typeof inline === 'object') {
@@ -163,7 +145,6 @@
         return state.cfg;
       }
     } catch (_) {}
-    // Fallback to API
     try {
       const r = await fetch('/api/plugins/ezoic-infinite/config', { credentials: 'same-origin' });
       if (r.ok) state.cfg = await r.json();
@@ -195,7 +176,6 @@
     if (/^\/topic\//.test(p))                 return 'topic';
     if (/^\/category\//.test(p))              return 'categoryTopics';
     if (p === '/' || /^\/categories/.test(p)) return 'categories';
-    // DOM fallback
     if (document.querySelector(SEL.category)) return 'categories';
     if (document.querySelector(SEL.post))     return 'topic';
     if (document.querySelector(SEL.topic))    return 'categoryTopics';
@@ -215,7 +195,6 @@
       const el = all[i];
       if (!el.isConnected) continue;
       if (!el.querySelector('[component="post/content"]')) continue;
-      // Skip nested quotes / parent posts
       const parent = el.parentElement?.closest(SEL.post);
       if (parent && parent !== el) continue;
       if (el.getAttribute('component') === 'post/parent') continue;
@@ -235,7 +214,6 @@
       const v = el.getAttribute(attr);
       if (v != null && v !== '') return v;
     }
-    // Positional fallback
     const children = el.parentElement?.children;
     if (!children) return 'i0';
     for (let i = 0; i < children.length; i++) {
@@ -257,28 +235,21 @@
     return set;
   }
-  // ── Wrap lifecycle detection ───────────────────────────────────────────────
+  // ── Wrap lifecycle ─────────────────────────────────────────────────────────
-  /**
-   * Check if a wrap element still has its corresponding anchor in the DOM.
-   * Uses O(1) registry lookup first, then sibling scan, then global querySelector.
-   */
   function wrapIsLive(wrap) {
     if (!wrap?.classList?.contains(WRAP_CLASS)) return false;
     const key = wrap.getAttribute(ATTR.ANCHOR);
     if (!key) return false;
-    // Fast path: registry match
     if (state.wrapByKey.get(key) === wrap) return wrap.isConnected;
-    // Parse key
     const colonIdx = key.indexOf(':');
     const klass    = key.slice(0, colonIdx);
     const anchorId = key.slice(colonIdx + 1);
     const cfg = KIND[klass];
     if (!cfg) return false;
-    // Sibling scan (cheap for adjacent anchors)
     const parent = wrap.parentElement;
     if (parent) {
       const sel = `${cfg.baseTag || ''}[${cfg.anchorAttr}="${anchorId}"]`;
@@ -289,7 +260,6 @@
       }
     }
-    // Global fallback (expensive, rare)
     try {
       return document.querySelector(`${cfg.sel}[${cfg.anchorAttr}="${anchorId}"]`)?.isConnected === true;
     } catch (_) { return false; }
@@ -313,8 +283,7 @@
   function scheduleUncollapseChecks(wrap) {
     if (!wrap) return;
-    const delays = [500, 1500, 3000, 7000, 15000];
-    for (const ms of delays) {
+    for (const ms of [500, 1500, 3000, 7000, 15000]) {
       setTimeout(() => {
         try { clearEmptyIfFilled(wrap); } catch (_) {}
       }, ms);
@@ -336,11 +305,17 @@
   }
   // ── Recycling ──────────────────────────────────────────────────────────────
+  //
+  // v2.1 changes:
+  // - Threshold raised to -(3 × vh) — on mobile fast scroll, -vh was too close
+  //   and wraps got recycled before ads had time to load
+  // - Never recycle a wrap whose showAds is still inflight (show-queued state)
+  // - Clear ins.adsbygoogle children before re-creating placeholder to avoid
+  //   "All ins elements already have ads" error
+  // - Skip wraps that were created less than 5s ago (give ads time to fill)
+  const RECYCLE_MIN_AGE_MS = 5_000;
-  /**
-   * When pool is exhausted, recycle a wrap far above the viewport.
-   * Sequence: destroy → delay → re-observe → enqueueShow
-   */
   function recycleWrap(klass, targetEl, newKey) {
     const ez = window.ezstandalone;
     if (typeof ez?.destroyPlaceholders !== 'function' ||
@@ -348,7 +323,9 @@
         typeof ez?.displayMore        !== 'function') return null;
     const vh = window.innerHeight || 800;
-    const threshold = -vh;
+    // Conservative threshold: 3× viewport height above the top of the screen
+    const threshold = -(3 * vh);
+    const t = now();
     let bestEmpty = null, bestEmptyY = Infinity;
     let bestFull  = null, bestFullY  = Infinity;
@@ -357,8 +334,17 @@
     for (const wrap of wraps) {
       try {
+        // Don't recycle wraps that are too young (ads might still be loading)
+        const created = parseInt(wrap.getAttribute(ATTR.CREATED) || '0', 10);
+        if (t - created < RECYCLE_MIN_AGE_MS) continue;
+        // Don't recycle wraps with inflight showAds
+        const wid = parseInt(wrap.getAttribute(ATTR.WRAPID), 10);
+        if (wid > 0 && state.phState.get(wid) === 'show-queued') continue;
         const bottom = wrap.getBoundingClientRect().bottom;
         if (bottom > threshold) continue;
         if (!isFilled(wrap)) {
           if (bottom < bestEmptyY) { bestEmptyY = bottom; bestEmpty = wrap; }
         } else {
@@ -375,18 +361,20 @@
     const oldKey = best.getAttribute(ATTR.ANCHOR);
-    // Unobserve before moving to prevent stale showAds
+    // Unobserve before moving
     try {
       const ph = best.querySelector(`#${PH_PREFIX}${id}`);
       if (ph) state.io?.unobserve(ph);
     } catch (_) {}
-    // Move the wrap to new position
+    // Move the wrap to new position with a clean placeholder
     mutate(() => {
       best.setAttribute(ATTR.ANCHOR,  newKey);
       best.setAttribute(ATTR.CREATED, String(now()));
       best.setAttribute(ATTR.SHOWN,   '0');
       best.classList.remove('is-empty');
+      // Clear ALL children including ins.adsbygoogle to avoid
+      // "All ins elements already have ads" error on re-show
       best.replaceChildren();
       const fresh = document.createElement('div');
@@ -397,11 +385,10 @@
       targetEl.insertAdjacentElement('afterend', best);
     });
-    // Update registry
     if (oldKey && state.wrapByKey.get(oldKey) === best) state.wrapByKey.delete(oldKey);
     state.wrapByKey.set(newKey, best);
-    // Ezoic recycle sequence
+    // Ezoic destroy → re-define → re-show sequence
     const doDestroy = () => {
       state.phState.set(id, 'destroyed');
       try { ez.destroyPlaceholders(id); } catch (_) {
@@ -444,7 +431,6 @@
     if (!el?.insertAdjacentElement) return null;
     if (findWrap(key)) return null;
     if (state.mountedIds.has(id)) return null;
-    // Ensure no duplicate DOM element with same placeholder ID
     const existing = document.getElementById(`${PH_PREFIX}${id}`);
     if (existing?.isConnected) return null;
@@ -471,7 +457,6 @@
       const key = w.getAttribute(ATTR.ANCHOR);
       if (key && state.wrapByKey.get(key) === w) state.wrapByKey.delete(key);
-      // Find the kind class to unregister
       for (const cls of w.classList) {
         if (cls !== WRAP_CLASS && cls.startsWith('ezoic-ad-')) {
           state.wrapsByClass.get(cls)?.delete(w);
@@ -483,9 +468,6 @@
   }
   // ── Prune (category topic lists only) ──────────────────────────────────────
-  //
-  // Safe for category topic lists: NodeBB does NOT virtualize topics in categories.
-  // NOT safe for posts: NodeBB virtualizes posts off-viewport.
   function pruneOrphansBetween() {
     const klass = 'ezoic-ad-between';
@@ -493,7 +475,6 @@
     const wraps = state.wrapsByClass.get(klass);
     if (!wraps?.size) return;
-    // Build set of live anchor IDs
     const liveAnchors = new Set();
     for (const el of document.querySelectorAll(`${cfg.baseTag}[${cfg.anchorAttr}]`)) {
       const v = el.getAttribute(cfg.anchorAttr);
@@ -504,7 +485,6 @@
     for (const w of wraps) {
       const created = parseInt(w.getAttribute(ATTR.CREATED) || '0', 10);
       if (t - created < TIMING.MIN_PRUNE_AGE_MS) continue;
       const key = w.getAttribute(ATTR.ANCHOR) ?? '';
       const sid = key.slice(klass.length + 1);
       if (!sid || !liveAnchors.has(sid)) {
@@ -521,7 +501,6 @@
       const v = el.getAttribute(attr);
       if (v != null && v !== '' && !isNaN(v)) return parseInt(v, 10);
     }
-    // Positional fallback
     const fullSel = KIND[klass]?.sel ?? '';
     let i = 0;
     for (const s of el.parentElement?.children ?? []) {
@@ -556,7 +535,7 @@
         }
       } else {
         const recycled = recycleWrap(klass, el, key);
-        if (!recycled) break;  // Pool truly exhausted
+        if (!recycled) break;
         inserted++;
       }
     }
@@ -571,7 +550,10 @@
       state.io = new IntersectionObserver(entries => {
         for (const entry of entries) {
           if (!entry.isIntersecting) continue;
-          if (entry.target instanceof Element) state.io?.unobserve(entry.target);
+          // DON'T unobserve — we need to re-trigger on scroll-up when NodeBB
+          // re-inserts virtualized posts back into the DOM.
+          // Instead, the show throttle (SHOW_THROTTLE_MS) and phState check
+          // in enqueueShow prevent duplicate calls.
           const id = parseInt(entry.target.getAttribute('data-ezoic-id'), 10);
           if (id > 0) enqueueShow(id);
         }
@@ -685,7 +667,6 @@
         const ph   = document.getElementById(`${PH_PREFIX}${id}`);
         const wrap = ph?.closest(`.${WRAP_CLASS}`);
         if (!wrap || !ph?.isConnected) return;
-        // Skip if a newer show happened since
         if (parseInt(wrap.getAttribute(ATTR.SHOWN) || '0', 10) > showTs) return;
         if (clearEmptyIfFilled(wrap)) return;
         wrap.classList.add('is-empty');
@@ -694,11 +675,6 @@
   }
   // ── Patch Ezoic showAds ────────────────────────────────────────────────────
-  //
-  // Intercepts ez.showAds() to:
-  //   - block calls during navigation transitions
-  //   - filter out disconnected placeholders
-  //   - batch calls for efficiency
   function patchShowAds() {
     const apply = () => {
@@ -760,6 +736,44 @@
     }
   }
+  // ── Re-observe on scroll-up ────────────────────────────────────────────────
+  //
+  // NodeBB virtualizes posts: removes them from DOM when off-viewport, then
+  // re-inserts them when scrolling back up. Our wraps stay in the DOM but
+  // the placeholder was already unobserved by IO (in v2.0) or the phState
+  // was 'shown'. We need to check if wraps that are back in viewport have
+  // unfilled placeholders and re-trigger show for them.
+  function reobserveVisibleWraps() {
+    const vh = window.innerHeight || 800;
+    for (const [key, wrap] of state.wrapByKey) {
+      if (!wrap.isConnected) continue;
+      const id = parseInt(wrap.getAttribute(ATTR.WRAPID), 10);
+      if (!id || id <= 0) continue;
+      const ph = wrap.querySelector(`[id^="${PH_PREFIX}"]`);
+      if (!ph?.isConnected) continue;
+      // Already filled — nothing to do
+      if (isFilled(ph) || isPlaceholderUsed(ph)) continue;
+      // Check if the wrap is in or near the viewport
+      const rect = wrap.getBoundingClientRect();
+      if (rect.bottom < -vh || rect.top > 2 * vh) continue;
+      // This wrap is visible-ish but unfilled — re-trigger
+      const st = state.phState.get(id);
+      if (st === 'shown' || st === 'show-queued') {
+        // Reset state so enqueueShow accepts it again
+        state.phState.set(id, 'new');
+        state.lastShow.delete(id);
+      }
+      // Re-observe in IO (safe to call multiple times)
+      try { getIO()?.observe(ph); } catch (_) {}
+      enqueueShow(id);
+    }
+  }
   // ── Core ───────────────────────────────────────────────────────────────────
   async function runCore() {
@@ -772,6 +786,9 @@
     const kind = getKind();
     if (kind === 'other') return 0;
+    // Re-observe wraps that came back into viewport (scroll-up fix)
+    reobserveVisibleWraps();
     const exec = (klass, getItems, cfgEnable, cfgInterval, cfgShowFirst, poolKey) => {
       if (!normBool(cfgEnable)) return 0;
       const interval = Math.max(1, parseInt(cfgInterval, 10) || 3);
@@ -867,8 +884,6 @@
   }
   // ── MutationObserver ───────────────────────────────────────────────────────
-  //
-  // Scoped to detect: (1) ad fill events in wraps, (2) new content items
   function ensureDomObserver() {
     if (state.domObs) return;
@@ -878,13 +893,12 @@
       let needsBurst = false;
-      // Determine relevant selectors for current page kind
       const kind = getKind();
       const relevantSels =
-        kind === 'topic'         ? [SEL.post]     :
-        kind === 'categoryTopics'? [SEL.topic]    :
-        kind === 'categories'    ? [SEL.category] :
-                                   [SEL.post, SEL.topic, SEL.category];
+        kind === 'topic'          ? [SEL.post]     :
+        kind === 'categoryTopics' ? [SEL.topic]    :
+        kind === 'categories'     ? [SEL.category] :
+                                    [SEL.post, SEL.topic, SEL.category];
       for (const m of muts) {
         if (m.type !== 'childList') continue;
@@ -900,7 +914,7 @@
             }
           } catch (_) {}
-          // Check for new content items (posts, topics, categories)
+          // Check for new content items
           if (!needsBurst) {
             for (const sel of relevantSels) {
               try {
@@ -923,52 +937,30 @@
     } 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):
-  //
-  //  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>.
+  // ── TCF / CMP Protection ───────────────────────────────────────────────────
   //
-  //  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.
-  //
-  //  3. RESTORE: MutationObserver on <body> childList (not subtree) to
-  //     immediately re-create the locator if something still removes it.
+  // 3 layers:
+  //  1. PROTECT: locator iframe in <head> (ajaxify never touches <head>)
+  //  2. GUARD: wrap __tcfapi/__cmp to catch null contentWindow errors
+  //  3. RESTORE: MutationObserver for immediate re-creation
   function ensureTcfLocator() {
     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 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;
@@ -976,11 +968,10 @@
     ensureInHead();
-    // Layer 2: Guard the CMP API calls against null contentWindow
+    // Guard CMP API calls
     if (!window.__nbbCmpGuarded) {
       window.__nbbCmpGuarded = true;
-      // Wrap __tcfapi
       if (typeof window.__tcfapi === 'function') {
         const origTcf = window.__tcfapi;
         window.__tcfapi = function (cmd, version, cb, param) {
@@ -989,9 +980,7 @@
               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 (_) {}
             }
@@ -999,7 +988,6 @@
         };
       }
-      // Wrap __cmp (legacy CMP v1 API)
       if (typeof window.__cmp === 'function') {
         const origCmp = window.__cmp;
         window.__cmp = function (...args) {
@@ -1015,37 +1003,54 @@
       }
     }
-    // Layer 3: MutationObserver to immediately restore if removed
     if (!window.__nbbTcfObs) {
-      window.__nbbTcfObs = new MutationObserver(muts => {
-        // Fast check: still in document?
+      window.__nbbTcfObs = new MutationObserver(() => {
         if (document.getElementById(LOCATOR_ID)) return;
-        // Something removed it — restore immediately (no debounce)
         ensureInHead();
       });
-      // Observe body direct children only (the most likely removal point)
       try {
         window.__nbbTcfObs.observe(document.body || document.documentElement, {
-          childList: true,
-          subtree: false,
+          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,
+            childList: true, subtree: false,
           });
         }
       } catch (_) {}
     }
   }
-  // ── Console muting ─────────────────────────────────────────────────────────
+  // ── aria-hidden protection ─────────────────────────────────────────────────
+  //
+  // The CMP modal sets aria-hidden="true" on <body> when opening, and may not
+  // remove it after ajaxify navigation. A simple removeAttribute in ajaxify.end
+  // isn't enough because the CMP can re-set it asynchronously.
   //
-  // Mute noisy Ezoic warnings that are expected in infinite scroll context.
-  // Uses startsWith checks instead of includes for performance.
+  // Use a MutationObserver on <body> attributes to remove it immediately.
+  function protectAriaHidden() {
+    if (window.__nbbAriaObs) return;
+    const remove = () => {
+      try {
+        if (document.body.getAttribute('aria-hidden') === 'true') {
+          document.body.removeAttribute('aria-hidden');
+        }
+      } catch (_) {}
+    };
+    remove();
+    window.__nbbAriaObs = new MutationObserver(remove);
+    try {
+      window.__nbbAriaObs.observe(document.body, {
+        attributes: true,
+        attributeFilter: ['aria-hidden'],
+      });
+    } catch (_) {}
+  }
+  // ── Console muting ─────────────────────────────────────────────────────────
   function muteConsole() {
     if (window.__nbbEzMuted) return;
@@ -1060,7 +1065,10 @@
       '[CMP] Error in custom getTCData',
       'vignette: no interstitial API',
     ];
-    const PH_PATTERN = `with id ${PH_PREFIX}`;
+    const PATTERNS = [
+      `with id ${PH_PREFIX}`,
+      'adsbygoogle.push() error: All',
+    ];
     for (const method of ['log', 'info', 'warn', 'error']) {
       const orig = console[method];
@@ -1071,7 +1079,9 @@
           for (const prefix of PREFIXES) {
             if (msg.startsWith(prefix)) return;
           }
-          if (msg.includes(PH_PATTERN)) return;
+          for (const pat of PATTERNS) {
+            if (msg.includes(pat)) return;
+          }
         }
         return orig.apply(console, args);
       };
@@ -1079,7 +1089,6 @@
   }
   // ── Network warmup ─────────────────────────────────────────────────────────
-  // Run once per session — preconnect hints are in <head> via server-side injection
   let _networkWarmed = false;
@@ -1116,19 +1125,16 @@
     if (!$) return;
     $(window).off('.nbbEzoic');
     $(window).on('action:ajaxify.start.nbbEzoic', cleanup);
     $(window).on('action:ajaxify.end.nbbEzoic', () => {
-      state.pageKey    = pageKey();
-      state.kind       = null;
+      state.pageKey      = pageKey();
+      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();
+      protectAriaHidden();
       warmNetwork();
       patchShowAds();
       getIO();
@@ -1136,7 +1142,6 @@
       requestBurst();
     });
-    // Content-loaded events trigger burst
     const burstEvents = [
       'action:ajaxify.contentLoaded',
       'action:posts.loaded',
@@ -1148,7 +1153,6 @@
     $(window).on(burstEvents, () => { if (!isBlocked()) requestBurst(); });
-    // Also bind via NodeBB hooks module (for compatibility)
     try {
       require(['hooks'], hooks => {
         if (typeof hooks?.on !== 'function') return;
@@ -1182,6 +1186,7 @@
   state.pageKey = pageKey();
   muteConsole();
   ensureTcfLocator();
+  protectAriaHidden();
   warmNetwork();
   patchShowAds();
   getIO();