nodebb-plugin-onekite-calendar 2.0.26 → 2.0.28

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog – calendar-onekite
 
+## 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 ...`).
+- Fix : les **rappels de paiement**, l’**expiration automatique** et la **notification Discord d’annulation automatique** refonctionnent.
+
+## 1.3.22
+- ACP / Comptabilisation : le nombre de **sorties gratuites** correspond maintenant au **nombre de matériels sortis** (une réservation pouvant contenir plusieurs matériels).
+
 ## 1.3.21
 - Comptabilisation : les **sorties gratuites annulées** ne sont plus comptées (elles sont exclues si `cancelledAt` est présent, même si le statut est resté `paid`).
 

package/lib/admin.js

@@ -530,7 +530,9 @@ admin.getAccounting = async function (req, res) {
     const endDate = formatFR(r.end);
 
     if (isFree) {
-      freeCount += 1;
+      // In accounting, "Sorties gratuites" should reflect the number of items actually taken out,
+      // not the number of reservation lines (a single reservation can include multiple items).
+      freeCount += Math.max(1, itemNames.length || 0);
     } else {
       paidCount += 1;
       grandTotal += total;

package/lib/scheduler.js

@@ -10,6 +10,33 @@ const groups = require.main.require('./src/groups');
 
 let timer = null;
 
+// 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;
+
+  // Preferred atomic helper (Redis + some adapters)
+  if (typeof db.setAdd === 'function') {
+    try {
+      return !!(await db.setAdd(key, v));
+    } catch (e) {
+      // fall through
+    }
+  }
+
+  // Fallback: store a marker in an object map.
+  // Not perfectly atomic across clustered processes, but avoids a hard failure.
+  try {
+    const existing = await db.getObjectField(key, v);
+    if (existing) return false;
+    await db.setObjectField(key, v, 1);
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+
 function getSetting(settings, key, fallback) {
   const v = settings && Object.prototype.hasOwnProperty.call(settings, key) ? settings[key] : undefined;
   if (v == null || v === '') return fallback;
@@ -163,7 +190,7 @@ async function expirePending() {
     // Reminder to validators while still pending
     if (validatorReminderMins > 0 && createdAt && now >= (createdAt + validatorReminderMins * 60 * 1000) && now < expiresAt) {
       const reminderKey = 'calendar-onekite:email:validatorReminder:pending';
-      const first = await db.setAdd(reminderKey, rid);
+      const first = await addOnce(reminderKey, rid);
       if (first && validatorUids.length) {
         const requesterUid = parseInt(resv.uid, 10) || 0;
         const requester = requesterUid ? await user.getUserFields(requesterUid, ['username']) : null;
@@ -185,7 +212,7 @@ async function expirePending() {
     if (now > expiresAt) {
       // Expire (remove from calendar) + notify requester + validators
       const expiredKey = 'calendar-onekite:email:expiredSent:pending';
-      const firstExpired = await db.setAdd(expiredKey, rid);
+      const firstExpired = await addOnce(expiredKey, rid);
 
       const requesterUid = parseInt(resv.uid, 10) || 0;
       const requester = requesterUid ? await user.getUserFields(requesterUid, ['username']) : null;
@@ -293,7 +320,7 @@ async function processAwaitingPayment() {
     if (!r.reminderSent && now >= reminderAt && now < expireAt) {
       // Send reminder once (guarded across clustered NodeBB processes)
       const reminderKey = 'calendar-onekite:email:reminderSent';
-      const first = await db.setAdd(reminderKey, rid);
+      const first = await addOnce(reminderKey, rid);
       if (!first) {
         // another process already sent it
         r.reminderSent = true;
@@ -327,12 +354,12 @@ async function processAwaitingPayment() {
       // Expire: remove reservation so it disappears from calendar and frees items
       // Guard email send across clustered NodeBB processes
       const expiredKey = 'calendar-onekite:email:expiredSent';
-      const firstExpired = await db.setAdd(expiredKey, rid);
+      const firstExpired = await addOnce(expiredKey, rid);
       const shouldEmail = !!firstExpired;
 
       // Guard Discord notification across clustered NodeBB processes
       const discordKey = 'calendar-onekite:discord:cancelledSent';
-      const firstDiscord = await db.setAdd(discordKey, rid);
+      const firstDiscord = await addOnce(discordKey, rid);
       const shouldDiscord = !!firstDiscord;
 
       const toUid = parseInt(r.uid, 10);
@@ -394,8 +421,14 @@ async function processAwaitingPayment() {
 function start() {
   if (timer) return;
   timer = setInterval(() => {
-    expirePending().catch(() => {});
-    processAwaitingPayment().catch(() => {});
+    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 error in processAwaitingPayment', err && err.message ? err.message : err);
+    });
   }, 60 * 1000);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-onekite-calendar",
-  "version": "2.0.26",
+  "version": "2.0.28",
   "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.26"
+  "version": "2.0.28"
 }