nodebb-plugin-ezoic-infinite 1.8.99 → 1.9.1

package/library.js

@@ -243,6 +243,8 @@ plugin.injectEzoicHead = async (data) => {
 };
 
 plugin.init = async ({ router, middleware }) => {
+  getSettings().catch(() => {});
+
   async function render(req, res) {
     const settings  = await getSettings();
     const allGroups = await getAllGroups();

package/package.json

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

package/public/client.js

@@ -58,6 +58,7 @@
   };
 
   const FILL_SEL = 'iframe, ins, img, video, [data-google-container-id], div[id$="__container__"]';
+  const SUPPORTS_HAS = typeof CSS !== 'undefined' && !!CSS.supports?.('selector(:has(*))');
 
   // ── Utility ────────────────────────────────────────────────────────────────
 
@@ -101,16 +102,15 @@
     burstDeadline: 0,
     burstCount:   0,
     lastBurstTs:  0,
+    cleaningUp:   false,
   };
 
   const isBlocked = () => now() < S.blockedUntil;
 
   // ── DOM caches (burst-scoped) ──────────────────────────────────────────────
 
-  let _postsCache   = null, _postsCacheTs   = 0;
-  let _topicsCache  = null, _topicsCacheTs  = 0;
-  let _catsCache    = null, _catsCacheTs    = 0;
   const POSTS_CACHE_MS = 200;
+  const _dc = { posts: null, postsAt: 0, topics: null, topicsAt: 0, cats: null, catsAt: 0 };
 
   function mutate(fn) {
     S.mutGuard++;
@@ -121,10 +121,8 @@
 
   async function fetchConfig() {
     if (S.cfg) return S.cfg;
-    try {
-      const inline = window.__nbbEzoicCfg;
-      if (inline && typeof inline === 'object') { S.cfg = inline; return S.cfg; }
-    } catch (_) {}
+    const inline = window.__nbbEzoicCfg;
+    if (inline && typeof inline === 'object') { S.cfg = inline; return S.cfg; }
     try {
       const ctrl = new AbortController();
       const t = setTimeout(() => ctrl.abort(), 5_000);
@@ -184,37 +182,41 @@
 
   function getPosts() {
     const t = now();
-    if (_postsCache && t - _postsCacheTs < POSTS_CACHE_MS) return _postsCache;
-    const all = document.querySelectorAll(SEL.post);
+    if (_dc.posts && t - _dc.postsAt < POSTS_CACHE_MS) return _dc.posts;
+    const all = SUPPORTS_HAS
+      ? document.querySelectorAll('[component="post"][data-pid]:has([component="post/content"])')
+      : document.querySelectorAll(SEL.post);
     const out = [];
     for (let i = 0; i < all.length; i++) {
       const el = all[i];
       if (!el.isConnected) continue;
-      if (el.childElementCount === 0) continue;
-      if (!el.querySelector('[component="post/content"]')) continue;
+      if (!SUPPORTS_HAS) {
+        if (el.childElementCount === 0) continue;
+        if (!el.querySelector('[component="post/content"]')) continue;
+      }
       const parent = el.parentElement?.closest(SEL.post);
       if (parent && parent !== el) continue;
       if (el.getAttribute('component') === 'post/parent') continue;
       out.push(el);
     }
-    _postsCache = out;
-    _postsCacheTs = t;
+    _dc.posts = out;
+    _dc.postsAt = t;
     return out;
   }
 
   function getTopics() {
     const t = now();
-    if (_topicsCache && t - _topicsCacheTs < POSTS_CACHE_MS) return _topicsCache;
-    _topicsCache = document.querySelectorAll(SEL.topic);
-    _topicsCacheTs = t;
-    return _topicsCache;
+    if (_dc.topics && t - _dc.topicsAt < POSTS_CACHE_MS) return _dc.topics;
+    _dc.topics = Array.from(document.querySelectorAll(SEL.topic));
+    _dc.topicsAt = t;
+    return _dc.topics;
   }
   function getCategories() {
     const t = now();
-    if (_catsCache && t - _catsCacheTs < POSTS_CACHE_MS) return _catsCache;
-    _catsCache = document.querySelectorAll(SEL.category);
-    _catsCacheTs = t;
-    return _catsCache;
+    if (_dc.cats && t - _dc.catsAt < POSTS_CACHE_MS) return _dc.cats;
+    _dc.cats = Array.from(document.querySelectorAll(SEL.category));
+    _dc.catsAt = t;
+    return _dc.cats;
   }
 
   // ── Anchor keys & wrap registry ────────────────────────────────────────────
@@ -271,22 +273,7 @@
   function wrapIsLive(wrap) {
     if (!wrap?.classList?.contains(WRAP_CLASS)) return false;
     const key = wrap.getAttribute(ATTR.ANCHOR);
-    if (!key) return false;
-    if (S.wrapByKey.get(key) === wrap) return wrap.isConnected;
-    const colonIdx = key.indexOf(':');
-    const klass    = key.slice(0, colonIdx);
-    const anchorId = key.slice(colonIdx + 1);
-    const cfg = KIND[klass];
-    if (!cfg) return false;
-    const parent = wrap.parentElement;
-    if (!parent) return false;
-    const sel = `${cfg.baseTag || ''}[${cfg.anchorAttr}="${anchorId}"]`;
-    for (const sib of parent.children) {
-      if (sib !== wrap) {
-        try { if (sib.matches(sel)) return sib.isConnected; } catch (_) {}
-      }
-    }
-    return false;
+    return !!key && S.wrapByKey.get(key) === wrap && wrap.isConnected;
   }
 
   const adjacentWrap = el => wrapIsLive(el.nextElementSibling) || wrapIsLive(el.previousElementSibling);
@@ -435,15 +422,16 @@
       if (ph instanceof Element) S.io?.unobserve(ph);
       const id = parseInt(w.getAttribute(ATTR.WRAPID), 10);
       if (Number.isFinite(id)) {
-        S.mountedIds.delete(id);
-        S.lastShow.delete(id);
         const timers = S.wrapTimers.get(id);
         if (timers) { for (const t of timers) clearTimeout(t); S.wrapTimers.delete(id); }
       }
-      const key = w.getAttribute(ATTR.ANCHOR);
-      if (key && S.wrapByKey.get(key) === w) S.wrapByKey.delete(key);
-      const colonIdx = key?.indexOf(':') ?? -1;
-      if (colonIdx > 0) S.wrapsByClass.get(key.slice(0, colonIdx))?.delete(w);
+      if (!S.cleaningUp) {
+        if (Number.isFinite(id)) { S.mountedIds.delete(id); S.lastShow.delete(id); }
+        const key = w.getAttribute(ATTR.ANCHOR);
+        if (key && S.wrapByKey.get(key) === w) S.wrapByKey.delete(key);
+        const colonIdx = key?.indexOf(':') ?? -1;
+        if (colonIdx > 0) S.wrapsByClass.get(key.slice(0, colonIdx))?.delete(w);
+      }
       w.remove();
     } catch (_) {}
   }
@@ -722,16 +710,19 @@
       const ez = window.ezstandalone;
       if (typeof ez?.destroyPlaceholders === 'function') ez.destroyPlaceholders();
     } catch (_) {}
+    S.cleaningUp = true;
     mutate(() => {
       for (const w of document.querySelectorAll(`.${WRAP_CLASS}`)) dropWrap(w);
     });
+    S.cleaningUp = false;
+    // Safety net: wrapTimers should be empty after dropWrap loop, but clear any orphans.
     for (const timers of S.wrapTimers.values()) { for (const t of timers) clearTimeout(t); }
     S.wrapTimers.clear();
     S.domObs?.disconnect(); S.domObs = null;
     S.io?.disconnect();     S.io     = null; _ioMobile = null;
-    _postsCache = null; _postsCacheTs = 0;
-    _topicsCache = null; _topicsCacheTs = 0;
-    _catsCache = null; _catsCacheTs = 0;
+    _dc.posts = null; _dc.postsAt = 0;
+    _dc.topics = null; _dc.topicsAt = 0;
+    _dc.cats = null; _dc.catsAt = 0;
     // cfg/opts/pools are static for the session (window.__nbbEzoicCfg is set once
     // by the server and never changes between SPA navigations) — preserve them.
     S.cursors    = { topics: 0, posts: 0, categories: 0 };
@@ -796,7 +787,7 @@
           }
         }
       }
-      if (needsBurst) { _postsCacheTs = 0; _topicsCacheTs = 0; _catsCacheTs = 0; requestBurst(); }
+      if (needsBurst) { _dc.postsAt = 0; _dc.topicsAt = 0; _dc.catsAt = 0; requestBurst(); }
     });
     try {
       const target = document.getElementById('content') || document.body;