nodebb-plugin-onekite-calendar 2.0.38 → 2.0.40

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.38
+- Refactor : factorisation du code client (helpers headers/CSRF) et simplification du widget.
+- Widget : suppression des fallbacks de polling/visibilitychange (mise à jour via sockets uniquement) + conservation du no-cache pour éviter les 304.
+
 ## 2.0.37
 - Les rappels validateurs et notifications d’expiration ne sont envoyés qu’aux membres du/des groupe(s) "personnes notifiées" (notifyGroups).
 

package/lib/group-helpers.js

@@ -0,0 +1,31 @@
+'use strict';
+
+const groups = require.main.require('./src/groups');
+
+async function getGroupNameBySlug(slug) {
+  const fn = groups && groups.getGroupNameByGroupSlug;
+  if (typeof fn !== 'function') return null;
+
+  const id = String(slug || '').trim();
+  if (!id) return null;
+
+  try {
+    const maybe = fn(id);
+    if (maybe && typeof maybe.then === 'function') {
+      return await maybe;
+    }
+    if (typeof maybe === 'string') {
+      return maybe;
+    }
+  } catch (e) {
+    // fall through to callback form
+  }
+
+  return await new Promise((resolve) => {
+    try {
+      fn(id, (err, name) => resolve(err ? null : name));
+    } catch (e) {
+      resolve(null);
+    }
+  });
+}

package/lib/helloassoWebhook.js

@@ -326,6 +326,7 @@ async function handler(req, res, next) {
         itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
         dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
         paymentReceiptUrl: r.paymentReceiptUrl || '',
+        pickupTime: r.pickupTime || '',
         pickupAddress: r.pickupAddress || '',
         mapUrl,
       });

package/lib/realtime.js

@@ -24,10 +24,6 @@ function emitCalendarUpdated(payload) {
 
     // New event name (generic).
     server.sockets.emit('event:calendar-onekite.calendarUpdated', payload || {});
-
-    // Backwards compatible event name (older clients only listened to this).
-    // Keep it emitted for *any* calendar mutation, not just reservation status.
-    server.sockets.emit('event:calendar-onekite.reservationUpdated', payload || {});
   } catch (e) {}
 }
 

package/lib/widgets.js

@@ -271,10 +271,31 @@ widgets.renderTwoWeeksWidget = async function (data) {
         wrap.appendChild(dot);
         return { domNodes: [wrap] };
       },
+      // IMPORTANT: disable HTTP caching here.
+      // Some NodeBB setups add ETag/304 on API routes; fetch(...).json() will
+      // then fail because 304 responses have no body, which prevents the widget
+      // from updating on refetchEvents(). We add a cache-buster and request
+      // no-store to guarantee a fresh JSON payload.
       events: function(info, successCallback, failureCallback) {
-        const qs = new URLSearchParams({ start: info.startStr, end: info.endStr, widget: '1' });
-        fetch(eventsEndpoint + '?' + qs.toString(), { credentials: 'same-origin' })
-          .then((r) => r.json())
+        const qs = new URLSearchParams({
+          start: info.startStr,
+          end: info.endStr,
+          widget: '1',
+          _: String(Date.now()),
+        });
+        fetch(eventsEndpoint + '?' + qs.toString(), {
+          credentials: 'same-origin',
+          cache: 'no-store',
+          headers: { 'Cache-Control': 'no-cache' },
+        })
+          .then((r) => {
+            if (!r.ok) {
+              const err = new Error(String(r.status || 'fetch_failed'));
+              err.status = r.status;
+              throw err;
+            }
+            return r.json();
+          })
           .then((json) => successCallback(json || []))
           .catch((e) => failureCallback(e));
       },
@@ -371,19 +392,19 @@ dateClick: function() { window.location.href = calUrl; },
     calendar.render();
 
     // Real-time refresh for the widget (same server events as the main calendar)
+    // We intentionally rely on sockets only (no periodic polling fallback):
+    // - keeps the widget lightweight
+    // - avoids pointless API traffic
+    // - updates are already broadcast server-side across NodeBB instances
     try {
       // Debounce per widget instance
       let tRefetch = null;
       const refetch = function () {
-        try {
-          if (tRefetch) return;
-          tRefetch = setTimeout(() => {
-            tRefetch = null;
-            try {
-              calendar.refetchEvents();
-            } catch (e) {}
-          }, 200);
-        } catch (e) {}
+        if (tRefetch) return;
+        tRefetch = setTimeout(() => {
+          tRefetch = null;
+          try { calendar.refetchEvents(); } catch (e) {}
+        }, 200);
       };
 
       // Register refetcher and bind socket listeners once per page
@@ -393,15 +414,12 @@ dateClick: function() { window.location.href = calUrl; },
       if (!window.__oneKiteWidgetSocketBound && typeof socket !== 'undefined' && socket && typeof socket.on === 'function') {
         window.__oneKiteWidgetSocketBound = true;
         const triggerAll = function () {
-          try {
-            const list = window.__oneKiteWidgetRefetchers || [];
-            for (let i = 0; i < list.length; i += 1) {
-              try { list[i](); } catch (e) {}
-            }
-          } catch (e) {}
+          const list = window.__oneKiteWidgetRefetchers || [];
+          for (let i = 0; i < list.length; i += 1) {
+            try { list[i](); } catch (e) {}
+          }
         };
         socket.on('event:calendar-onekite.calendarUpdated', triggerAll);
-        socket.on('event:calendar-onekite.reservationUpdated', triggerAll);
       }
     } catch (e) {}
 

package/package.json

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

package/plugin.json

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

package/public/admin.js

@@ -109,48 +109,32 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
   }
 
   async function fetchJson(url, opts) {
-    const res = await fetch(url, {
-      credentials: 'same-origin',
-      headers: (() => {
-        const headers = { 'Content-Type': 'application/json' };
-        const token =
+    const getCsrfToken = () => {
+      try {
+        return (
           (window.config && (window.config.csrf_token || window.config.csrfToken)) ||
           (window.ajaxify && window.ajaxify.data && window.ajaxify.data.csrf_token) ||
           (document.querySelector('meta[name="csrf-token"]') && document.querySelector('meta[name="csrf-token"]').getAttribute('content')) ||
           (document.querySelector('meta[name="csrf_token"]') && document.querySelector('meta[name="csrf_token"]').getAttribute('content')) ||
           (typeof app !== 'undefined' && app && app.csrfToken) ||
-          null;
-        if (token) headers['x-csrf-token'] = token;
-        return headers;
-      })(),
+          null
+        );
+      } catch (e) {
+        return null;
+      }
+    };
+
+    const headers = { 'Content-Type': 'application/json' };
+    const token = getCsrfToken();
+    if (token) headers['x-csrf-token'] = token;
+
+    const res = await fetch(url, {
+      credentials: 'same-origin',
+      headers,
       ...opts,
     });
 
-
     if (!res.ok) {
-      // NodeBB versions differ: some expose admin APIs under /api/admin instead of /api/v3/admin
-      if (res.status === 404 && typeof url === 'string' && url.includes('/api/v3/admin/')) {
-        const altUrl = url.replace('/api/v3/admin/', '/api/admin/');
-        const res2 = await fetch(altUrl, {
-          credentials: 'same-origin',
-          headers: (() => {
-            const headers = { 'Content-Type': 'application/json' };
-            const token =
-              (window.config && (window.config.csrf_token || window.config.csrfToken)) ||
-              (window.ajaxify && window.ajaxify.data && window.ajaxify.data.csrf_token) ||
-              (document.querySelector('meta[name="csrf-token"]') && document.querySelector('meta[name="csrf-token"]').getAttribute('content')) ||
-              (document.querySelector('meta[name="csrf_token"]') && document.querySelector('meta[name="csrf_token"]').getAttribute('content')) ||
-              (typeof app !== 'undefined' && app && app.csrfToken) ||
-              null;
-            if (token) headers['x-csrf-token'] = token;
-            return headers;
-          })(),
-          ...opts,
-        });
-        if (res2.ok) {
-          return await res2.json();
-        }
-      }
       const text = await res.text().catch(() => '');
       throw new Error(`${res.status} ${text}`);
     }

package/public/client.js

@@ -138,6 +138,28 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
       .replace(/'/g, ''');
   }
 
+  function getCsrfToken() {
+    try {
+      return (
+        (window.config && (window.config.csrf_token || window.config.csrfToken)) ||
+        (window.ajaxify && window.ajaxify.data && window.ajaxify.data.csrf_token) ||
+        (document.querySelector('meta[name="csrf-token"]') && document.querySelector('meta[name="csrf-token"]').getAttribute('content')) ||
+        (document.querySelector('meta[name="csrf_token"]') && document.querySelector('meta[name="csrf_token"]').getAttribute('content')) ||
+        (typeof app !== 'undefined' && app && app.csrfToken) ||
+        null
+      );
+    } catch (e) {
+      return null;
+    }
+  }
+
+  function jsonHeaders(extra) {
+    const headers = Object.assign({ 'Content-Type': 'application/json' }, extra || {});
+    const token = getCsrfToken();
+    if (token) headers['x-csrf-token'] = token;
+    return headers;
+  }
+
   function pad2(n) { return String(n).padStart(2, '0'); }
 
   function toDateInputValue(d) {
@@ -502,18 +524,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
   async function fetchJson(url, opts) {
     const res = await fetch(url, {
       credentials: 'same-origin',
-      headers: (() => {
-        const headers = { 'Content-Type': 'application/json' };
-        const token =
-          (window.config && (window.config.csrf_token || window.config.csrfToken)) ||
-          (window.ajaxify && window.ajaxify.data && window.ajaxify.data.csrf_token) ||
-          (document.querySelector('meta[name="csrf-token"]') && document.querySelector('meta[name="csrf-token"]').getAttribute('content')) ||
-          (document.querySelector('meta[name="csrf_token"]') && document.querySelector('meta[name="csrf_token"]').getAttribute('content')) ||
-          (typeof app !== 'undefined' && app && app.csrfToken) ||
-          null;
-        if (token) headers['x-csrf-token'] = token;
-        return headers;
-      })(),
+      headers: jsonHeaders((opts && opts.headers) || {}),
       ...opts,
     });
     if (!res.ok) {
@@ -545,6 +556,9 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
       if (!cal || typeof cal.refetchEvents !== 'function') return;
       clearTimeout(window.__onekiteRefetchTimer);
       window.__onekiteRefetchTimer = setTimeout(() => {
+        // Clear the in-memory JSON cache so status/color changes are fetched
+        // immediately (otherwise an unchanged ETag may keep stale colors).
+        try { invalidateEventsCache(); } catch (e) {}
         try { cal.refetchEvents(); } catch (e) {}
       }, 150);
     } catch (e) {}
@@ -560,19 +574,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     try {
       res = await fetch(url, {
         credentials: 'same-origin',
-        headers: (() => {
-          // reuse csrf header builder (fetchJson) by calling it indirectly
-          const base = { 'Content-Type': 'application/json' };
-          const token =
-            (window.config && (window.config.csrf_token || window.config.csrfToken)) ||
-            (window.ajaxify && window.ajaxify.data && window.ajaxify.data.csrf_token) ||
-            (document.querySelector('meta[name="csrf-token"]') && document.querySelector('meta[name="csrf-token"]').getAttribute('content')) ||
-            (document.querySelector('meta[name="csrf_token"]') && document.querySelector('meta[name="csrf_token"]').getAttribute('content')) ||
-            (typeof app !== 'undefined' && app && app.csrfToken) ||
-            null;
-          if (token) base['x-csrf-token'] = token;
-          return Object.assign(base, headers);
-        })(),
+        headers: jsonHeaders(headers),
         ...opts,
       });
     } catch (e) {
@@ -2380,12 +2382,6 @@ try {
         scheduleRefetch(cal);
       } catch (e) {}
     });
-    socket.on('event:calendar-onekite.reservationUpdated', function () {
-      try {
-        const cal = window.oneKiteCalendar;
-        scheduleRefetch(cal);
-      } catch (e) {}
-    });
   }
 } catch (e) {}