nodebb-plugin-calendar-onekite 12.0.17 → 12.0.18

package/lib/api.js

@@ -12,11 +12,22 @@ const logger = require.main.require('./src/logger');
 
 const dbLayer = require('./db');
 
+// Fast membership check without N calls to groups.isMember.
+// NodeBB's groups.getUserGroups([uid]) returns an array (per uid) of group objects.
+// We compare against both group slugs and names to be tolerant with older settings.
 async function userInAnyGroup(uid, allowed) {
-  if (!uid || !allowed || !allowed.length) return false;
+  if (!uid || !Array.isArray(allowed) || !allowed.length) return false;
   const ug = await groups.getUserGroups([uid]);
-  const slugs = ug[0] || [];
-  return allowed.some(g => slugs.includes(g));
+  const list = (ug && ug[0]) ? ug[0] : [];
+  const seen = new Set();
+  for (const g of list) {
+    if (!g) continue;
+    if (g.slug) seen.add(String(g.slug));
+    if (g.name) seen.add(String(g.name));
+    if (g.groupName) seen.add(String(g.groupName));
+    if (g.displayName) seen.add(String(g.displayName));
+  }
+  return allowed.some(v => seen.has(String(v)));
 }
 
 
@@ -35,17 +46,7 @@ function normalizeAllowedGroups(raw) {
   return s.split(',').map(v => String(v).trim().replace(/^"+|"+$/g, '')).filter(Boolean);
 }
 
-async function isMemberOfAnyGroup(uid, allowed) {
-  if (!uid || !allowed || !allowed.length) return false;
-  for (const g of allowed) {
-    try {
-      if (await groups.isMember(uid, g)) return true;
-    } catch (e) {
-      // ignore
-    }
-  }
-  return false;
-}
+// NOTE: Avoid per-group async checks (groups.isMember) when possible.
 
 
 const helloasso = require('./helloasso');
@@ -160,53 +161,8 @@ function autoCreatorGroupForYear(year) {
 }
 
 
-async function resolveGroupName(maybeSlugOrName) {
-  const g = String(maybeSlugOrName || '').trim();
-  if (!g) return '';
-  try {
-    // NodeBB stores a mapping from slug -> groupName in groupslug:groupname
-    // groupName is the internal identifier used by groups.isMember()
-    const mapped = await db.getObjectField('groupslug:groupname', g);
-    if (mapped) return String(mapped);
-  } catch (e) {}
-  return g;
-}
-
-async function resolveAllowedGroups(list) {
-  const out = [];
-  for (const raw of (list || [])) {
-    const gn = await resolveGroupName(raw);
-    if (gn) out.push(gn);
-  }
-  // de-duplicate, preserve order
-  return [...new Set(out)];
-}
-
-
-async function expandGroupCandidates(rawList) {
-  const out = [];
-  for (const raw of (rawList || [])) {
-    const g = String(raw || '').trim();
-    if (!g) continue;
-    out.push(g);
-    const mapped = await resolveGroupName(g);
-    if (mapped && mapped !== g) out.push(mapped);
-  }
-  return [...new Set(out)];
-}
-
-async function checkAnyMembership(uid, rawList, fnLabel) {
-  const candidates = await expandGroupCandidates(rawList);
-  for (const g of candidates) {
-    try {
-      const ok = await groups.isMember(uid, g);
-      if (ok) return { ok: true, matched: g, candidates };
-    } catch (e) {
-      logger.warn('[calendar-onekite] auth check error', { uid, group: g, fn: fnLabel, err: String(e && e.message || e) });
-    }
-  }
-  return { ok: false, matched: '', candidates };
-}
+// (removed) group slug/name resolving helpers: we now use userInAnyGroup() which
+// matches both slugs and names and avoids extra DB lookups.
 
 
 function autoFormSlugForYear(year) {
@@ -278,8 +234,7 @@ async function canDeleteSpecial(uid, settings) {
   try {
     const isAdmin = await groups.isMember(uid, 'administrators');
     if (isAdmin) return true;} catch (e) {}
-  const rawAllowed = (settings.specialDeleterGroups || settings.specialCreatorGroups || '').split(',').map(s => s.trim()).filter(Boolean);
-  const allowed = await resolveAllowedGroups(rawAllowed);
+  const allowed = normalizeAllowedGroups(settings.specialDeleterGroups || settings.specialCreatorGroups || '');
   if (!allowed.length) return false;
   if (await userInAnyGroup(uid, allowed)) return true;
 
@@ -378,8 +333,9 @@ api.getEvents = async function (req, res) {
   const wideStart = Math.max(0, startTs - 366 * 24 * 3600 * 1000);
   const ids = await dbLayer.listReservationIdsByStartRange(wideStart, endTs, 5000);
   const out = [];
-  for (const rid of ids) {
-    const r = await dbLayer.getReservation(rid);
+  // Batch fetch = major perf win when there are many reservations.
+  const reservations = await dbLayer.getReservations(ids);
+  for (const r of (reservations || [])) {
     if (!r) continue;
     // Purged from calendar view (kept for accounting)
     if (r.calendarPurgedAt) continue;
@@ -425,8 +381,8 @@ api.getEvents = async function (req, res) {
   // Special events
   try {
     const specialIds = await dbLayer.listSpecialIdsByStartRange(wideStart, endTs, 5000);
-    for (const eid of specialIds) {
-      const sev = await dbLayer.getSpecialEvent(eid);
+    const specials = await dbLayer.getSpecialEvents(specialIds);
+    for (const sev of (specials || [])) {
       if (!sev) continue;
       const sStart = parseInt(sev.start, 10);
       const sEnd = parseInt(sev.end, 10);
@@ -677,8 +633,8 @@ api.createReservation = async function (req, res) {
   const wideStart2 = Math.max(0, start - 366 * 24 * 3600 * 1000);
   const candidateIds = await dbLayer.listReservationIdsByStartRange(wideStart2, end, 5000);
   const conflicts = [];
-  for (const cid of candidateIds) {
-    const existing = await dbLayer.getReservation(cid);
+  const existingRows = await dbLayer.getReservations(candidateIds);
+  for (const existing of (existingRows || [])) {
     if (!existing || !blocking.has(existing.status)) continue;
     const exStart = parseInt(existing.start, 10);
     const exEnd = parseInt(existing.end, 10);
@@ -729,24 +685,35 @@ api.createReservation = async function (req, res) {
       const itemsLabel = (resv.itemNames || []).join(', ');
       for (const g of notifyGroups) {
         const members = await groups.getMembers(g, 0, -1);
-        for (const memberUid of (members || [])) {
-          const md = await user.getUserFields(memberUid, ['username', 'email']);
+        const uids = Array.isArray(members) ? members : [];
+
+        // Batch fetch user email/username when supported by this NodeBB version.
+        let usersData = [];
+        try {
+          if (typeof user.getUsersFields === 'function') {
+            usersData = await user.getUsersFields(uids, ['username', 'email']);
+          } else {
+            usersData = await Promise.all(uids.map(async (memberUid) => {
+              try { return await user.getUserFields(memberUid, ['username', 'email']); }
+              catch (e) { return null; }
+            }));
+          }
+        } catch (e) {
+          usersData = [];
+        }
+
+        for (const md of (usersData || [])) {
           if (md && md.email) {
-            await sendEmail(
-              'calendar-onekite_pending',
-              md.email,
-              'Location matériel - Demande de réservation',
-              {
-                username: md.username,
-                requester: requester.username,
-                itemName: itemsLabel,
-                itemNames: resv.itemNames || [],
-                dateRange: `Du ${formatFR(start)} au ${formatFR(end)}`,
-                start: formatFR(start),
-                end: formatFR(end),
-                total: resv.total || 0,
-              }
-            );
+            await sendEmail('calendar-onekite_pending', md.email, 'Location matériel - Demande de réservation', {
+              username: md.username,
+              requester: requester.username,
+              itemName: itemsLabel,
+              itemNames: resv.itemNames || [],
+              dateRange: `Du ${formatFR(start)} au ${formatFR(end)}`,
+              start: formatFR(start),
+              end: formatFR(end),
+              total: resv.total || 0,
+            });
           }
         }
       }

package/lib/db.js

@@ -10,10 +10,36 @@ const KEY_CHECKOUT_INTENT_TO_RID = 'calendar-onekite:helloasso:checkoutIntentToR
 const KEY_SPECIAL_ZSET = 'calendar-onekite:special';
 const KEY_SPECIAL_OBJ = (eid) => `calendar-onekite:special:${eid}`;
 
+// Helpers
+function reservationKey(rid) {
+  return KEY_OBJ(rid);
+}
+
+function specialKey(eid) {
+  return KEY_SPECIAL_OBJ(eid);
+}
+
 async function getReservation(rid) {
   return await db.getObject(KEY_OBJ(rid));
 }
 
+/**
+ * Batch fetch reservations in one DB roundtrip.
+ * Returns an array aligned with rids (missing objects => null).
+ */
+async function getReservations(rids) {
+  const ids = Array.isArray(rids) ? rids.filter(Boolean) : [];
+  if (!ids.length) return [];
+  const keys = ids.map(reservationKey);
+  const rows = await db.getObjects(keys);
+  // Ensure rid is present even if older objects were missing it.
+  return (rows || []).map((row, idx) => {
+    if (!row) return null;
+    if (!row.rid) row.rid = String(ids[idx]);
+    return row;
+  });
+}
+
 async function saveReservation(resv) {
   await db.setObject(KEY_OBJ(resv.rid), resv);
   // score = start timestamp
@@ -50,10 +76,22 @@ module.exports = {
   KEY_SPECIAL_ZSET,
   KEY_CHECKOUT_INTENT_TO_RID,
   getReservation,
+  getReservations,
   saveReservation,
   removeReservation,
   // Special events
   getSpecialEvent: async (eid) => await db.getObject(KEY_SPECIAL_OBJ(eid)),
+  getSpecialEvents: async (eids) => {
+    const ids = Array.isArray(eids) ? eids.filter(Boolean) : [];
+    if (!ids.length) return [];
+    const keys = ids.map(specialKey);
+    const rows = await db.getObjects(keys);
+    return (rows || []).map((row, idx) => {
+      if (!row) return null;
+      if (!row.eid) row.eid = String(ids[idx]);
+      return row;
+    });
+  },
   saveSpecialEvent: async (ev) => {
     await db.setObject(KEY_SPECIAL_OBJ(ev.eid), ev);
     await db.sortedSetAdd(KEY_SPECIAL_ZSET, ev.start, ev.eid);

package/lib/scheduler.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const meta = require.main.require('./src/meta');
+const db = require.main.require('./src/database');
 const dbLayer = require('./db');
 
 let timer = null;
@@ -109,7 +110,16 @@ async function processAwaitingPayment() {
     const expireAt = approvedAt + 2 * holdMins * 60 * 1000;
 
     if (!r.reminderSent && now >= reminderAt && now < expireAt) {
-      // Send reminder once
+      // Send reminder once (guarded across clustered NodeBB processes)
+      const reminderKey = 'calendar-onekite:email:reminderSent';
+      const first = await db.setAdd(reminderKey, rid);
+      if (!first) {
+        // another process already sent it
+        r.reminderSent = true;
+        r.reminderAt = now;
+        await dbLayer.saveReservation(r);
+        continue;
+      }
       const u = await user.getUserFields(r.uid, ['username', 'email']);
       if (u && u.email) {
         await sendEmail('calendar-onekite_reminder', u.email, 'Location matériel - Rappel', {
@@ -130,8 +140,12 @@ async function processAwaitingPayment() {
 
     if (now >= expireAt) {
       // 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 shouldEmail = !!firstExpired;
       const u = await user.getUserFields(r.uid, ['username', 'email']);
-      if (u && u.email) {
+      if (shouldEmail && u && u.email) {
         await sendEmail('calendar-onekite_expired', u.email, 'Location matériel - Rappel', {
           username: u.username,
           itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),

package/package.json

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