nodebb-plugin-onekite-calendar 2.0.31 → 2.0.32

package/CHANGELOG.md

@@ -1,10 +1,5 @@
 # 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).

package/lib/api.js

@@ -9,8 +9,6 @@ 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');
@@ -479,42 +477,6 @@ 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() : '';
@@ -534,22 +496,6 @@ 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);
@@ -688,12 +634,6 @@ 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/scheduler.js

@@ -8,43 +8,9 @@ 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) {
@@ -434,14 +400,13 @@ function start() {
   // eslint-disable-next-line no-console
   console.info('[calendar-onekite] Scheduler enabled');
   timer = setInterval(() => {
-    (async () => {
-      const locked = await acquireSchedulerLock(55 * 1000);
-      if (!locked) return;
-      await expirePending();
-      await processAwaitingPayment();
-    })().catch((err) => {
+    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) => {
       // eslint-disable-next-line no-console
-      console.warn('[calendar-onekite] Scheduler tick error', err && err.message ? err.message : err);
+      console.warn('[calendar-onekite] Scheduler error in processAwaitingPayment', err && err.message ? err.message : err);
     });
   }, 60 * 1000);
 }

package/lib/widgets.js

@@ -376,20 +376,13 @@ 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) {}
-          }, 450);
+          }, 200);
         } catch (e) {}
       };
 
@@ -409,21 +402,6 @@ 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.31",
+  "version": "2.0.32",
   "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,40 +533,13 @@ 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) {}
-      }, 450);
+      }, 150);
     } 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.31"
+  "version": "2.0.32"
 }

package/public/client.js

@@ -543,40 +543,13 @@ 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) {}
-      }, 450);
+      }, 150);
     } 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) || {});