nodebb-plugin-onekite-calendar 2.0.29 → 2.0.31

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog – calendar-onekite
 
+## 1.3.28
+- Perf (temps réel) : debounce global des `refetchEvents()` (calendrier + widget) et **skip** quand l’onglet est masqué (refetch unique au retour de visibilité).
+- Perf/Robustesse (multi-instance) : ajout d’un **lock distribué Redis** sur le tick scheduler (un seul runner exécute le cycle à un instant donné).
+- Perf (API events) : cache Redis très court (**TTL 2s**) par utilisateur/permissions sur l’endpoint events pour absorber les rafales.
+
+## 1.3.27
+- Refactor : ajout d'un module `lib/utils.js` (format dates FR, lecture settings ACP, helpers listes/UIDs) pour supprimer les duplications.
+- Cleanup : suppression d'un doublon de fonctions dans `helloassoWebhook.js` (formatFR + getReservationIdFromPayload).
+- Perf : scheduler optimisé (chargement **batch** des réservations via `getReservations()` au lieu d'un `getReservation()` par id).
+
+## 1.3.26
+- Scheduler : garde "send-once" rendue **atomique** en multi-instance (priorité à `db.incrObjectField(key, rid)`), pour garantir qu'au moins une instance envoie les emails/Discord avant suppression.
+- Scheduler : en cas d'erreur DB sur la garde, on **privilégie l'envoi** plutôt que "expire sans email" (dernier recours : autoriser l'envoi même si la garde échoue).
+
+## 1.3.25
+- Scheduler : correction robuste du mécanisme "send-once" en environnement multi-process (utilise `db.incrObjectField` quand disponible).
+- Fix : évite le cas "réservation expirée/supprimée sans email/Discord" lorsque la DB ne supporte pas correctement les sets/objets utilisés comme garde.
+
+## 1.3.24
+- Multi-process : le scheduler ne démarre pas si NodeBB a `runJobs=false` (évite les exécutions multiples de jobs en cluster).
+
 ## 1.3.23
 - Scheduler (paiement en attente) : correction de la garde "send-once" pour compatibilité avec tous les adaptateurs DB NodeBB (fallback si `db.setAdd` n'est pas disponible).
 - Scheduler : les erreurs ne sont plus avalées silencieusement (logs `Scheduler error ...`).

package/lib/admin.js

@@ -3,20 +3,7 @@
 const meta = require.main.require('./src/meta');
 const user = require.main.require('./src/user');
 const emailer = require.main.require('./src/emailer');
-const nconf = require.main.require('nconf');
-
-function forumBaseUrl() {
-  const base = String(nconf.get('url') || '').trim().replace(/\/$/, '');
-  return base;
-}
-
-function formatFR(tsOrIso) {
-  const d = new Date(typeof tsOrIso === 'string' && /^[0-9]+$/.test(tsOrIso) ? parseInt(tsOrIso, 10) : tsOrIso);
-  const dd = String(d.getDate()).padStart(2, '0');
-  const mm = String(d.getMonth() + 1).padStart(2, '0');
-  const yyyy = d.getFullYear();
-  return `${dd}/${mm}/${yyyy}`;
-}
+const { forumBaseUrl, formatFR } = require('./utils');
 
 function buildHelloAssoItemName(baseLabel, itemNames, start, end) {
   const base = String(baseLabel || 'Réservation matériel Onekite').trim();

package/lib/api.js

@@ -9,8 +9,11 @@ const user = require.main.require('./src/user');
 const groups = require.main.require('./src/groups');
 const db = require.main.require('./src/database');
 const logger = require.main.require('./src/logger');
+let cache = null;
+try { cache = require.main.require('./src/cache'); } catch (e) { cache = null; }
 
 const dbLayer = require('./db');
+const { formatFR } = require('./utils');
 
 // Resolve group identifiers from ACP.
 // Admins may enter a group *name* ("Test") or a *slug* ("onekite-ffvl-2026").
@@ -177,14 +180,6 @@ function overlap(aStart, aEnd, bStart, bEnd) {
 }
 
 
-function formatFR(tsOrIso) {
-  const d = new Date(typeof tsOrIso === 'string' && /^[0-9]+$/.test(tsOrIso) ? parseInt(tsOrIso, 10) : tsOrIso);
-  const dd = String(d.getDate()).padStart(2, '0');
-  const mm = String(d.getMonth() + 1).padStart(2, '0');
-  const yyyy = d.getFullYear();
-  return `${dd}/${mm}/${yyyy}`;
-}
-
 function buildHelloAssoItemName(baseLabel, itemNames, start, end) {
   const base = String(baseLabel || '').trim();
   const items = Array.isArray(itemNames) ? itemNames.map((s) => String(s || '').trim()).filter(Boolean) : [];
@@ -484,6 +479,42 @@ function computeEtag(payload) {
   return `W/"${hash}"`;
 }
 
+async function cacheGet(key) {
+  try {
+    if (!cache) return null;
+    if (typeof cache.get === 'function') {
+      if (cache.get.length >= 2) {
+        return await new Promise((resolve) => {
+          cache.get(key, (err, data) => resolve(err ? null : data));
+        });
+      }
+      return await cache.get(key);
+    }
+  } catch (e) {}
+  return null;
+}
+
+async function cacheSet(key, value, ttlSeconds) {
+  try {
+    if (!cache) return;
+    const ttl = Math.max(1, parseInt(ttlSeconds, 10) || 2);
+    if (typeof cache.set === 'function') {
+      if (cache.set.length >= 4) {
+        await new Promise((resolve) => {
+          cache.set(key, value, ttl, (err) => resolve(!err));
+        });
+        return;
+      }
+      // Some NodeBB versions accept an options object.
+      try {
+        await cache.set(key, value, { ttl });
+        return;
+      } catch (e) {}
+      await cache.set(key, value, ttl);
+    }
+  } catch (e) {}
+}
+
 api.getEvents = async function (req, res) {
   const qStartRaw = (req && req.query && req.query.start !== undefined) ? String(req.query.start).trim() : '';
   const qEndRaw = (req && req.query && req.query.end !== undefined) ? String(req.query.end).trim() : '';
@@ -503,6 +534,22 @@ api.getEvents = async function (req, res) {
   const canSpecialCreate = req.uid ? await canCreateSpecial(req.uid, settings) : false;
   const canSpecialDelete = req.uid ? await canDeleteSpecial(req.uid, settings) : false;
 
+  // Ultra-short Redis-backed cache (2s) to absorb bursts and reduce redundant renders.
+  // Keyed per uid + permissions because payload can include private fields.
+  const uidKey = req.uid ? String(req.uid) : '0';
+  const cacheKey = `calendar-onekite:events:${uidKey}:${canMod ? 'm' : 'u'}:${widgetMode ? 'w' : 'p'}:${qStartYmd || startTs}:${qEndYmd || endTs}`;
+  try {
+    const cached = await cacheGet(cacheKey);
+    if (cached && cached.payload && cached.etag) {
+      res.setHeader('ETag', cached.etag);
+      res.setHeader('Cache-Control', 'private, max-age=0, must-revalidate');
+      if (String(req.headers['if-none-match'] || '') === String(cached.etag)) {
+        return res.status(304).end();
+      }
+      return res.json(cached.payload);
+    }
+  } catch (e) {}
+
   // Fetch a wider window because an event can start before the query range
   // and still overlap.
   const wideStart = Math.max(0, startTs - 366 * 24 * 3600 * 1000);
@@ -641,6 +688,12 @@ api.getEvents = async function (req, res) {
   });
 
   const etag = computeEtag(out);
+
+  // Store in cache for a very short period (burst absorption).
+  try {
+    await cacheSet(cacheKey, { etag, payload: out }, 2);
+  } catch (e) {}
+
   res.setHeader('ETag', etag);
   res.setHeader('Cache-Control', 'private, max-age=0, must-revalidate');
   if (String(req.headers['if-none-match'] || '') === etag) {

package/lib/helloassoWebhook.js

@@ -10,6 +10,7 @@ const dbLayer = require('./db');
 const helloasso = require('./helloasso');
 const discord = require('./discord');
 const realtime = require('./realtime');
+const { formatFR } = require('./utils');
 
 async function auditLog(action, actorUid, payload) {
   try {
@@ -49,14 +50,6 @@ async function sendEmail(template, uid, subject, data) {
   }
 }
 
-function formatFR(tsOrIso) {
-  const d = new Date(tsOrIso);
-  const dd = String(d.getDate()).padStart(2, '0');
-  const mm = String(d.getMonth() + 1).padStart(2, '0');
-  const yyyy = d.getFullYear();
-  return `${dd}/${mm}/${yyyy}`;
-}
-
 function getReservationIdFromPayload(payload) {
   try {
     const data = payload && payload.data ? payload.data : null;
@@ -186,27 +179,6 @@ function isConfirmedPayment(payload) {
   }
 }
 
-function formatFR(tsOrIso) {
-  const d = new Date(tsOrIso);
-  const dd = String(d.getDate()).padStart(2, '0');
-  const mm = String(d.getMonth() + 1).padStart(2, '0');
-  const yyyy = d.getFullYear();
-  return `${dd}/${mm}/${yyyy}`;
-}
-
-function getReservationIdFromPayload(payload) {
-  try {
-    const m = payload && payload.data ? payload.data.meta : null;
-    if (!m) return null;
-    if (typeof m === 'object' && m.reservationId) return String(m.reservationId);
-    if (typeof m === 'object' && m.reservationID) return String(m.reservationID);
-    return null;
-  } catch (e) {
-    return null;
-  }
-}
-
-
 function getCheckoutIntentIdFromPayload(payload) {
   try {
     const data = payload && payload.data ? payload.data : null;

package/lib/scheduler.js

@@ -7,15 +7,62 @@ const discord = require('./discord');
 const realtime = require('./realtime');
 const nconf = require.main.require('nconf');
 const groups = require.main.require('./src/groups');
+const utils = require('./utils');
+let redis = null;
+try { redis = require.main.require('./src/redis'); } catch (e) { redis = null; }
 
 let timer = null;
 
+// Distributed lock (Redis) to avoid running the scheduler on multiple NodeBB instances.
+// Safe no-op if Redis is not available.
+async function acquireSchedulerLock(ttlMs) {
+  const key = 'calendar-onekite:scheduler:lock';
+  const value = `${process.pid}:${Date.now()}`;
+  const ttl = Math.max(1000, parseInt(ttlMs, 10) || 55000);
+
+  // Prefer Redis SET NX PX.
+  try {
+    const client = redis && (redis.client || redis);
+    if (client && typeof client.set === 'function') {
+      const res = await new Promise((resolve, reject) => {
+        // node_redis style
+        client.set(key, value, 'NX', 'PX', ttl, (err, out) => {
+          if (err) return reject(err);
+          resolve(out);
+        });
+      });
+      return String(res || '').toUpperCase() === 'OK';
+    }
+  } catch (e) {
+    // ignore and fall back
+  }
+
+  // Fallback: in-process lock only.
+  if (global.__onekiteSchedulerInProcessLockUntil && Date.now() < global.__onekiteSchedulerInProcessLockUntil) {
+    return false;
+  }
+  global.__onekiteSchedulerInProcessLockUntil = Date.now() + ttl;
+  return true;
+}
+
 // Some NodeBB database adapters don't expose setAdd/setRemove helpers.
 // Use a safe "add once" guard to avoid crashing the scheduler.
 async function addOnce(key, value) {
   const v = String(value);
   if (!v) return false;
 
+  // Best-effort atomic guard across multi-process / multi-instance.
+  // incrObjectField is implemented by most NodeBB DB adapters (Redis/Mongo).
+  // If it exists, it gives us a reliable "first winner" (value === 1).
+  if (typeof db.incrObjectField === 'function') {
+    try {
+      const n = await db.incrObjectField(key, v);
+      return Number(n) === 1;
+    } catch (e) {
+      // fall through
+    }
+  }
+
   // Preferred atomic helper (Redis + some adapters)
   if (typeof db.setAdd === 'function') {
     try {
@@ -33,29 +80,13 @@ async function addOnce(key, value) {
     await db.setObjectField(key, v, 1);
     return true;
   } catch (e) {
-    return false;
+    // Last resort: allow sending rather than silently doing nothing.
+    // This may duplicate emails in edge cases, but avoids "expires with no email".
+    return true;
   }
 }
 
-function getSetting(settings, key, fallback) {
-  const v = settings && Object.prototype.hasOwnProperty.call(settings, key) ? settings[key] : undefined;
-  if (v == null || v === '') return fallback;
-  if (typeof v === 'object' && v && typeof v.value !== 'undefined') return v.value;
-  return v;
-}
-
-function formatFR(ts) {
-  const d = new Date(ts);
-  const dd = String(d.getDate()).padStart(2, '0');
-  const mm = String(d.getMonth() + 1).padStart(2, '0');
-  const yyyy = d.getFullYear();
-  return `${dd}/${mm}/${yyyy}`;
-}
-
-function forumBaseUrl() {
-  const base = String(nconf.get('url') || '').trim().replace(/\/$/, '');
-  return base;
-}
+const { getSetting, formatFR, forumBaseUrl, normalizeAllowedGroups, normalizeUids, arrayifyNames } = utils;
 
 // Resolve group identifiers from ACP (name or slug) and return UIDs.
 async function getMembersByGroupIdentifier(groupIdentifier) {
@@ -97,30 +128,7 @@ async function getMembersByGroupIdentifier(groupIdentifier) {
   return Array.isArray(members) ? members : [];
 }
 
-function normalizeUids(members) {
-  if (!Array.isArray(members)) return [];
-  const out = [];
-  for (const m of members) {
-    if (Number.isInteger(m)) { out.push(m); continue; }
-    if (typeof m === 'string' && m.trim() && !Number.isNaN(parseInt(m, 10))) { out.push(parseInt(m, 10)); continue; }
-    if (m && typeof m === 'object' && (Number.isInteger(m.uid) || (typeof m.uid === 'string' && m.uid.trim()))) {
-      const u = Number.isInteger(m.uid) ? m.uid : parseInt(m.uid, 10);
-      if (!Number.isNaN(u)) out.push(u);
-    }
-  }
-  return Array.from(new Set(out)).filter((u) => Number.isInteger(u) && u > 0);
-}
-
-function normalizeAllowedGroups(raw) {
-  if (!raw) return [];
-  if (Array.isArray(raw)) {
-    return raw.map((s) => String(s || '').trim()).filter(Boolean);
-  }
-  return String(raw)
-    .split(',')
-    .map((s) => String(s || '').trim())
-    .filter(Boolean);
-}
+// normalizeUids/normalizeAllowedGroups are provided by utils
 
 async function getValidatorUids(settings) {
   const out = new Set();
@@ -175,12 +183,14 @@ async function expirePending() {
   const validatorUids = validatorReminderMins > 0 ? await getValidatorUids(settings) : [];
 
   const ids = await dbLayer.listAllReservationIds(5000);
-  if (!ids || !ids.length) {
-    return;
-  }
+  if (!ids || !ids.length) return;
+
+  // Batch load to avoid N+1 queries on Mongo/Redis adapters.
+  const reservations = await dbLayer.getReservations(ids);
 
-  for (const rid of ids) {
-    const resv = await dbLayer.getReservation(rid);
+  for (let i = 0; i < ids.length; i += 1) {
+    const rid = ids[i];
+    const resv = reservations[i];
     if (!resv || resv.status !== 'pending') {
       continue;
     }
@@ -199,7 +209,7 @@ async function expirePending() {
           await sendEmail('calendar-onekite_validator_reminder', vuid, 'Location matériel - Demande en attente', {
             rid,
             requesterUsername,
-            itemNames: (Array.isArray(resv.itemNames) ? resv.itemNames : (resv.itemName ? [resv.itemName] : [])).filter(Boolean),
+            itemNames: arrayifyNames(resv),
             dateRange: `Du ${formatFR(resv.start)} au ${formatFR(resv.end)}`,
             adminUrl,
             kind: 'pending',
@@ -224,7 +234,7 @@ async function expirePending() {
         await sendEmail('calendar-onekite_expired', requesterUid, 'Location matériel - Demande expirée', {
           uid: requesterUid,
           username: requesterUsername,
-          itemNames: (Array.isArray(resv.itemNames) ? resv.itemNames : (resv.itemName ? [resv.itemName] : [])).filter(Boolean),
+          itemNames: arrayifyNames(resv),
           dateRange: `Du ${formatFR(resv.start)} au ${formatFR(resv.end)}`,
           delayMinutes: holdMins,
           reason,
@@ -238,7 +248,7 @@ async function expirePending() {
           await sendEmail('calendar-onekite_validator_expired', vuid, 'Location matériel - Demande expirée', {
             rid,
             requesterUsername,
-            itemNames: (Array.isArray(resv.itemNames) ? resv.itemNames : (resv.itemName ? [resv.itemName] : [])).filter(Boolean),
+            itemNames: arrayifyNames(resv),
             dateRange: `Du ${formatFR(resv.start)} au ${formatFR(resv.end)}`,
             adminUrl,
             reason,
@@ -294,21 +304,16 @@ async function processAwaitingPayment() {
     }
   }
 
-  function formatFR(ts) {
-    const d = new Date(ts);
-    const dd = String(d.getDate()).padStart(2, '0');
-    const mm = String(d.getMonth() + 1).padStart(2, '0');
-    const yyyy = d.getFullYear();
-    return `${dd}/${mm}/${yyyy}`;
-  }
-
   const adminUrl = (() => {
     const base = forumBaseUrl();
     return base ? `${base}/admin/plugins/calendar-onekite` : '/admin/plugins/calendar-onekite';
   })();
 
-  for (const rid of ids) {
-    const r = await dbLayer.getReservation(rid);
+  const reservations = await dbLayer.getReservations(ids);
+
+  for (let i = 0; i < ids.length; i += 1) {
+    const rid = ids[i];
+    const r = reservations[i];
     if (!r || r.status !== 'awaiting_payment') continue;
 
     const approvedAt = parseInt(r.approvedAt || r.validatedAt || 0, 10) || 0;
@@ -335,8 +340,8 @@ async function processAwaitingPayment() {
         await sendEmail('calendar-onekite_reminder', toUid, 'Location matériel - Rappel', {
           uid: toUid,
           username: (u && u.username) ? u.username : '',
-          itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
-          itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
+          itemName: arrayifyNames(r).join(', '),
+          itemNames: arrayifyNames(r),
           dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
           paymentUrl: r.paymentUrl || '',
           delayMinutes: holdMins,
@@ -369,8 +374,8 @@ async function processAwaitingPayment() {
         await sendEmail('calendar-onekite_expired', toUid, 'Location matériel - Demande expirée', {
           uid: toUid,
           username: (u && u.username) ? u.username : '',
-          itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
-          itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
+          itemName: arrayifyNames(r).join(', '),
+          itemNames: arrayifyNames(r),
           dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
           delayMinutes: holdMins,
           reason: 'Paiement non reçu dans le temps imparti.',
@@ -384,7 +389,7 @@ async function processAwaitingPayment() {
           await sendEmail('calendar-onekite_validator_expired', vuid, 'Location matériel - Demande expirée', {
             rid: r.rid || rid,
             requesterUsername: (u && u.username) ? u.username : (r.username || ''),
-            itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])).filter(Boolean),
+            itemNames: arrayifyNames(r),
             dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
             adminUrl,
             reason: 'Paiement non reçu dans le temps imparti.',
@@ -421,17 +426,22 @@ async function processAwaitingPayment() {
 function start() {
   const runJobs = nconf.get('runJobs');
   if (runJobs === false || runJobs === 'false' || runJobs === 0 || runJobs === '0') {
+    // eslint-disable-next-line no-console
+    console.info('[calendar-onekite] Scheduler disabled (runJobs=false)');
     return;
   }
   if (timer) return;
+  // eslint-disable-next-line no-console
+  console.info('[calendar-onekite] Scheduler enabled');
   timer = setInterval(() => {
-    expirePending().catch((err) => {
-      // eslint-disable-next-line no-console
-      console.warn('[calendar-onekite] Scheduler error in expirePending', err && err.message ? err.message : err);
-    });
-    processAwaitingPayment().catch((err) => {
+    (async () => {
+      const locked = await acquireSchedulerLock(55 * 1000);
+      if (!locked) return;
+      await expirePending();
+      await processAwaitingPayment();
+    })().catch((err) => {
       // eslint-disable-next-line no-console
-      console.warn('[calendar-onekite] Scheduler error in processAwaitingPayment', err && err.message ? err.message : err);
+      console.warn('[calendar-onekite] Scheduler tick error', err && err.message ? err.message : err);
     });
   }, 60 * 1000);
 }

package/lib/utils.js

@@ -0,0 +1,70 @@
+'use strict';
+
+const nconf = require.main.require('nconf');
+
+function getSetting(settings, key, fallback) {
+  const v = settings && Object.prototype.hasOwnProperty.call(settings, key) ? settings[key] : undefined;
+  if (v == null || v === '') return fallback;
+  if (typeof v === 'object' && v && typeof v.value !== 'undefined') return v.value;
+  return v;
+}
+
+function formatFR(tsOrIso) {
+  const ts = (typeof tsOrIso === 'string' && tsOrIso.includes('-')) ? Date.parse(tsOrIso) : Number(tsOrIso);
+  const d = new Date(Number.isFinite(ts) ? ts : tsOrIso);
+  const dd = String(d.getDate()).padStart(2, '0');
+  const mm = String(d.getMonth() + 1).padStart(2, '0');
+  const yyyy = d.getFullYear();
+  return `${dd}/${mm}/${yyyy}`;
+}
+
+function formatFRShort(tsOrIso) {
+  const ts = (typeof tsOrIso === 'string' && tsOrIso.includes('-')) ? Date.parse(tsOrIso) : Number(tsOrIso);
+  const d = new Date(Number.isFinite(ts) ? ts : tsOrIso);
+  const dd = String(d.getDate()).padStart(2, '0');
+  const mm = String(d.getMonth() + 1).padStart(2, '0');
+  return `${dd}/${mm}`;
+}
+
+function forumBaseUrl() {
+  return String(nconf.get('url') || '').trim().replace(/\/$/, '');
+}
+
+function normalizeAllowedGroups(raw) {
+  if (!raw) return [];
+  if (Array.isArray(raw)) {
+    return raw.map((s) => String(s || '').trim()).filter(Boolean);
+  }
+  return String(raw)
+    .split(',')
+    .map((s) => String(s || '').trim())
+    .filter(Boolean);
+}
+
+function normalizeUids(members) {
+  if (!Array.isArray(members)) return [];
+  const out = [];
+  for (const m of members) {
+    if (Number.isInteger(m)) { out.push(m); continue; }
+    if (typeof m === 'string' && m.trim() && !Number.isNaN(parseInt(m, 10))) { out.push(parseInt(m, 10)); continue; }
+    if (m && typeof m === 'object' && (Number.isInteger(m.uid) || (typeof m.uid === 'string' && m.uid.trim()))) {
+      const u = Number.isInteger(m.uid) ? m.uid : parseInt(m.uid, 10);
+      if (!Number.isNaN(u)) out.push(u);
+    }
+  }
+  return Array.from(new Set(out)).filter((u) => Number.isInteger(u) && u > 0);
+}
+
+function arrayifyNames(obj) {
+  return (Array.isArray(obj && obj.itemNames) ? obj.itemNames : (obj && obj.itemName ? [obj.itemName] : [])).filter(Boolean);
+}
+
+module.exports = {
+  getSetting,
+  formatFR,
+  formatFRShort,
+  forumBaseUrl,
+  normalizeAllowedGroups,
+  normalizeUids,
+  arrayifyNames,
+};

package/lib/widgets.js

@@ -376,13 +376,20 @@ dateClick: function() { window.location.href = calUrl; },
       let tRefetch = null;
       const refetch = function () {
         try {
+          // Skip work while tab is hidden; refetch once when visible again.
+          try {
+            if (typeof document !== 'undefined' && document && document.hidden) {
+              window.__oneKiteWidgetNeedsRefetch = true;
+              return;
+            }
+          } catch (e) {}
           if (tRefetch) return;
           tRefetch = setTimeout(() => {
             tRefetch = null;
             try {
               calendar.refetchEvents();
             } catch (e) {}
-          }, 200);
+          }, 450);
         } catch (e) {}
       };
 
@@ -402,6 +409,21 @@ dateClick: function() { window.location.href = calUrl; },
         };
         socket.on('event:calendar-onekite.calendarUpdated', triggerAll);
         socket.on('event:calendar-onekite.reservationUpdated', triggerAll);
+
+        // If updates occurred while hidden, refetch once when visible again.
+        try {
+          if (!window.__oneKiteWidgetVisibilityBound && typeof document !== 'undefined' && document && typeof document.addEventListener === 'function') {
+            window.__oneKiteWidgetVisibilityBound = true;
+            document.addEventListener('visibilitychange', () => {
+              try {
+                if (!document.hidden && window.__oneKiteWidgetNeedsRefetch) {
+                  window.__oneKiteWidgetNeedsRefetch = false;
+                  triggerAll();
+                }
+              } catch (e) {}
+            }, { passive: true });
+          }
+        } catch (e) {}
       }
     } catch (e) {}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-onekite-calendar",
-  "version": "2.0.29",
+  "version": "2.0.31",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",

package/pkg/package/public/client.js

@@ -533,13 +533,40 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
   function scheduleRefetch(cal) {
     try {
       if (!cal || typeof cal.refetchEvents !== 'function') return;
+
+      // Avoid refetching while the tab is hidden; do it once when visible again.
+      try {
+        if (typeof document !== 'undefined' && document && document.hidden) {
+          window.__onekiteNeedsRefetch = true;
+          return;
+        }
+      } catch (e) {}
+
       clearTimeout(window.__onekiteRefetchTimer);
       window.__onekiteRefetchTimer = setTimeout(() => {
         try { cal.refetchEvents(); } catch (e) {}
-      }, 150);
+      }, 450);
     } catch (e) {}
   }
 
+  // If updates occurred while hidden, refetch once when visible again.
+  try {
+    if (!window.__onekiteVisibilityBound && typeof document !== 'undefined' && document && typeof document.addEventListener === 'function') {
+      window.__onekiteVisibilityBound = true;
+      document.addEventListener('visibilitychange', () => {
+        try {
+          if (!document.hidden && window.__onekiteNeedsRefetch) {
+            window.__onekiteNeedsRefetch = false;
+            const cal = window.oneKiteCalendar;
+            if (cal && typeof cal.refetchEvents === 'function') {
+              scheduleRefetch(cal);
+            }
+          }
+        } catch (e) {}
+      }, { passive: true });
+    }
+  } catch (e) {}
+
   async function fetchJsonCached(url, opts) {
     const cached = jsonCache.get(url);
     const headers = Object.assign({}, (opts && opts.headers) || {});

package/plugin.json

@@ -39,5 +39,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "2.0.29"
+  "version": "2.0.31"
 }

package/public/client.js

@@ -543,13 +543,40 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
   function scheduleRefetch(cal) {
     try {
       if (!cal || typeof cal.refetchEvents !== 'function') return;
+
+      // Avoid refetching while the tab is hidden; do it once when visible again.
+      try {
+        if (typeof document !== 'undefined' && document && document.hidden) {
+          window.__onekiteNeedsRefetch = true;
+          return;
+        }
+      } catch (e) {}
+
       clearTimeout(window.__onekiteRefetchTimer);
       window.__onekiteRefetchTimer = setTimeout(() => {
         try { cal.refetchEvents(); } catch (e) {}
-      }, 150);
+      }, 450);
     } catch (e) {}
   }
 
+  // If updates occurred while hidden, refetch once when visible again.
+  try {
+    if (!window.__onekiteVisibilityBound && typeof document !== 'undefined' && document && typeof document.addEventListener === 'function') {
+      window.__onekiteVisibilityBound = true;
+      document.addEventListener('visibilitychange', () => {
+        try {
+          if (!document.hidden && window.__onekiteNeedsRefetch) {
+            window.__onekiteNeedsRefetch = false;
+            const cal = window.oneKiteCalendar;
+            if (cal && typeof cal.refetchEvents === 'function') {
+              scheduleRefetch(cal);
+            }
+          }
+        } catch (e) {}
+      }, { passive: true });
+    }
+  } catch (e) {}
+
   async function fetchJsonCached(url, opts) {
     const cached = jsonCache.get(url);
     const headers = Object.assign({}, (opts && opts.headers) || {});