nodebb-plugin-onekite-calendar 2.0.66 → 2.0.67

package/lib/nodebb-helpers.js

@@ -1,179 +1,16 @@
 'use strict';
 
-const nconf = require.main.require('nconf');
-const meta = require.main.require('./src/meta');
-const emailer = require.main.require('./src/emailer');
-const groups = require.main.require('./src/groups');
-const user = require.main.require('./src/user');
-
-const { getGroupNameBySlug } = require('./group-helpers');
-
-function normalizeAllowedGroups(raw) {
-  if (!raw) return [];
-  if (Array.isArray(raw)) {
-    return raw.map((v) => String(v || '').trim()).filter(Boolean);
-  }
-  const s = String(raw || '').trim();
-  if (!s) return [];
-
-  if (s.startsWith('[') && s.endsWith(']')) {
-    try {
-      const parsed = JSON.parse(s);
-      if (Array.isArray(parsed)) {
-        return parsed.map((v) => String(v || '').trim()).filter(Boolean);
-      }
-    } catch (e) {
-      // fall through
-    }
-  }
-
-  return s
-    .split(',')
-    .map((v) => String(v || '').trim().replace(/^"+|"+$/g, ''))
-    .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()) {
-      const n = parseInt(m, 10);
-      if (Number.isFinite(n)) out.push(n);
-      continue;
-    }
-    if (m && typeof m === 'object' && m.uid != null) {
-      const n = Number.isInteger(m.uid) ? m.uid : parseInt(String(m.uid).trim(), 10);
-      if (Number.isFinite(n)) out.push(n);
-    }
-  }
-  return Array.from(new Set(out)).filter((u) => Number.isInteger(u) && u > 0);
-}
-
-async function getMembersByGroupIdentifier(groupIdentifier) {
-  const id = String(groupIdentifier || '').trim();
-  if (!id) return [];
-
-  try {
-    const members = await groups.getMembers(id, 0, -1);
-    if (Array.isArray(members) && members.length) return members;
-  } catch (e) {
-    // ignore
-  }
-
-  const groupName = await getGroupNameBySlug(id);
-  if (groupName && String(groupName).trim() && String(groupName).trim() !== id) {
-    try {
-      const members = await groups.getMembers(String(groupName).trim(), 0, -1);
-      return Array.isArray(members) ? members : [];
-    } catch (e) {
-      return [];
-    }
-  }
-
-  return [];
-}
-
-async function userInAnyGroup(uid, allowedGroups) {
-  const allowed = normalizeAllowedGroups(allowedGroups);
-  if (!uid || !allowed.length) return false;
-
-  const ug = await groups.getUserGroups([uid]);
-  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)));
-}
-
-function forumBaseUrl() {
-  let base = (meta && meta.config && (meta.config.url || meta.config['url'])) ? (meta.config.url || meta.config['url']) : '';
-  if (!base) base = String(nconf.get('url') || '').trim();
-  base = String(base || '').trim().replace(/\/$/, '');
-  if (base && !/^https?:\/\//i.test(base)) {
-    base = `https://${base.replace(/^\/\//, '')}`;
-  }
-  return base;
-}
-
-async function sendEmail(template, uid, subject, params) {
-  const toUid = Number.isInteger(uid) ? uid : parseInt(String(uid || '').trim(), 10);
-  if (!Number.isFinite(toUid) || toUid <= 0) return;
-
-  const payload = Object.assign({}, params || {}, subject ? { subject } : {});
-
-  try {
-    if (typeof emailer.send !== 'function') return;
-    await emailer.send(template, toUid, payload);
-  } catch (err) {
-    // eslint-disable-next-line no-console
-    console.warn('[calendar-onekite] Failed to send email', { template, uid: toUid, err: String((err && err.message) || err) });
-  }
-}
-
-function normalizeUidList(uids) {
-  if (!uids) return [];
-  const arr = Array.isArray(uids) ? uids : (() => {
-    const s = String(uids || '').trim();
-    if (!s) return [];
-    try {
-      const parsed = JSON.parse(s);
-      return Array.isArray(parsed) ? parsed : [];
-    } catch (e) {
-      return s.split(',').map((x) => String(x).trim()).filter(Boolean);
-    }
-  })();
-
-  const out = [];
-  for (const u of arr) {
-    const n = Number.isInteger(u) ? u : parseInt(String(u || '').trim(), 10);
-    if (Number.isFinite(n) && n > 0) out.push(String(n));
-  }
-  return Array.from(new Set(out));
-}
-
-async function usernamesByUids(uids) {
-  const ids = normalizeUidList(uids);
-  if (!ids.length) return [];
-
-  try {
-    if (typeof user.getUsersFields === 'function') {
-      const rows = await user.getUsersFields(ids, ['username']);
-      return (rows || []).map((r) => (r && r.username ? String(r.username) : '')).filter(Boolean);
-    }
-  } catch (e) {
-    // fall through
-  }
-
-  const rows = await Promise.all(ids.map(async (uid) => {
-    try {
-      const r = await user.getUserFields(uid, ['username']);
-      return r && r.username ? String(r.username) : '';
-    } catch (e) {
-      return '';
-    }
-  }));
-  return rows.filter(Boolean);
-}
+// Thin re-export layer for backward compatibility.
+// All helpers now live in ./shared.js.
+const shared = require('./shared');
 
 module.exports = {
-  normalizeAllowedGroups,
-  normalizeUids,
-  getMembersByGroupIdentifier,
-  userInAnyGroup,
-  forumBaseUrl,
-  sendEmail,
-  normalizeUidList,
-  usernamesByUids,
+  normalizeAllowedGroups: shared.normalizeAllowedGroups,
+  normalizeUids: shared.normalizeUids,
+  getMembersByGroupIdentifier: shared.getMembersByGroupIdentifier,
+  userInAnyGroup: shared.userInAnyGroup,
+  forumBaseUrl: shared.forumBaseUrl,
+  sendEmail: shared.sendEmail,
+  normalizeUidList: shared.normalizeUidList,
+  usernamesByUids: shared.usernamesByUids,
 };

package/lib/scheduler.js

@@ -1,15 +1,23 @@
 'use strict';
 
-const meta = require.main.require('./src/meta');
+const nconf = require.main.require('nconf');
 const db = require.main.require('./src/database');
 const dbLayer = require('./db');
 const discord = require('./discord');
 const realtime = require('./realtime');
-const nconf = require.main.require('nconf');
-const utils = require("./utils");
-const nb = require("./nodebb-helpers");
 const { getSettings } = require('./settings');
 
+const shared = require('./shared');
+const {
+  getSetting,
+  formatFR,
+  arrayifyNames,
+  forumBaseUrl,
+  normalizeAllowedGroups,
+  normalizeUids,
+  getMembersByGroupIdentifier,
+  sendEmail,
+} = shared;
 let timer = null;
 
 // Some NodeBB database adapters don't expose setAdd/setRemove helpers.
@@ -53,8 +61,7 @@ async function addOnce(key, value) {
   }
 }
 
-const { getSetting, formatFR, arrayifyNames } = utils;
-const { forumBaseUrl, normalizeAllowedGroups, normalizeUids, getMembersByGroupIdentifier, sendEmail } = nb;
+// Helpers imported from shared.js above
 async function getValidatorUids(settings) {
   const out = new Set();
   // Always include administrators
@@ -96,7 +103,7 @@ async function getNotifiedValidatorUids(settings) {
 }
 
 // Pending holds: short lock after a user creates a request (defaults to 5 minutes)
-async function expirePending() {
+async function expirePending(preIds, preReservations) {
   const settings = await getSettings();
   const holdMins = parseInt(getSetting(settings, 'pendingHoldMinutes', '5'), 10) || 5;
   const validatorReminderMins = parseInt(getSetting(settings, 'validatorReminderMinutesPending', '0'), 10) || 0;
@@ -111,11 +118,10 @@ async function expirePending() {
 
   const validatorUids = validatorReminderMins > 0 ? await getNotifiedValidatorUids(settings) : [];
 
-  const ids = await dbLayer.listAllReservationIds(5000);
+  const ids = preIds || await dbLayer.listAllReservationIds(5000);
   if (!ids || !ids.length) return;
 
-  // Batch load to avoid N+1 queries on Mongo/Redis adapters.
-  const reservations = await dbLayer.getReservations(ids);
+  const reservations = preReservations || await dbLayer.getReservations(ids);
 
   for (let i = 0; i < ids.length; i += 1) {
     const rid = ids[i];
@@ -197,7 +203,7 @@ async function expirePending() {
 // - When a reservation is validated it becomes awaiting_payment
 // - We send a reminder after `paymentHoldMinutes` (default 60)
 // - We expire (and remove) after `2 * paymentHoldMinutes`
-async function processAwaitingPayment() {
+async function processAwaitingPayment(preIds, preReservations) {
   const settings = await getSettings();
   const holdMins = parseInt(
     getSetting(settings, 'paymentHoldMinutes', getSetting(settings, 'holdMinutes', '60')),
@@ -205,7 +211,7 @@ async function processAwaitingPayment() {
   ) || 60;
   const now = Date.now();
 
-  const ids = await dbLayer.listAllReservationIds(5000);
+  const ids = preIds || await dbLayer.listAllReservationIds(5000);
   if (!ids || !ids.length) return;
 
   const user = require.main.require('./src/user');
@@ -215,7 +221,7 @@ async function processAwaitingPayment() {
     return base ? `${base}/admin/plugins/calendar-onekite` : '/admin/plugins/calendar-onekite';
   })();
 
-  const reservations = await dbLayer.getReservations(ids);
+  const reservations = preReservations || await dbLayer.getReservations(ids);
 
   for (let i = 0; i < ids.length; i += 1) {
     const rid = ids[i];
@@ -339,15 +345,20 @@ function start() {
   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) => {
-      // eslint-disable-next-line no-console
-      console.warn('[calendar-onekite] Scheduler error in processAwaitingPayment', err && err.message ? err.message : err);
-    });
+  timer = setInterval(async () => {
+    try {
+      // Single DB fetch shared between both jobs (avoids duplicate listAll + getReservations)
+      const ids = await dbLayer.listAllReservationIds(5000);
+      const reservations = ids && ids.length ? await dbLayer.getReservations(ids) : [];
+      await expirePending(ids, reservations).catch((err) => {
+        console.warn('[calendar-onekite] Scheduler error in expirePending', err && err.message ? err.message : err);
+      });
+      await processAwaitingPayment(ids, reservations).catch((err) => {
+        console.warn('[calendar-onekite] Scheduler error in processAwaitingPayment', err && err.message ? err.message : err);
+      });
+    } catch (err) {
+      console.warn('[calendar-onekite] Scheduler tick error', err && err.message ? err.message : err);
+    }
   }, 60 * 1000);
 }