nodebb-plugin-onekite-calendar 2.0.96 → 2.0.97

package/lib/helloassoWebhook.js

@@ -336,17 +336,22 @@ async function handler(req, res, next) {
     // Extract paymentId.
     // Format A: data.id is the payment ID.
     // Format B: order.payments[0].id is the payment ID (data.id is the checkout intent ID).
+    // For Format B, HelloAsso sometimes omits order.payments — fall back to checkoutIntentId
+    // as the idempotency key (prefixed to avoid collision with numeric payment IDs).
     const _payments = (_d && _d.order && Array.isArray(_d.order.payments)) ? _d.order.payments : [];
     const paymentId = payload.data
       ? (_d.id || _d.paymentId)
       : (_payments.length ? _payments[0].id : null);
-    if (!paymentId) {
+    const idempotencyKey = paymentId
+      ? String(paymentId)
+      : (!payload.data && checkoutIntentId ? `ci_${checkoutIntentId}` : null);
+    if (!idempotencyKey) {
       // eslint-disable-next-line no-console
-      console.warn('[calendar-onekite] HelloAsso webhook: missing payment id', { eventType, dataKeys: _d ? Object.keys(_d) : [] });
+      console.warn('[calendar-onekite] HelloAsso webhook: missing payment id and checkout intent id', { eventType, dataKeys: _d ? Object.keys(_d) : [] });
       return res.json({ ok: true, ignored: true, missingPaymentId: true });
     }
 
-    if (await alreadyProcessed(paymentId)) {
+    if (await alreadyProcessed(idempotencyKey)) {
       return res.json({ ok: true, duplicate: true });
     }
 
@@ -369,13 +374,13 @@ async function handler(req, res, next) {
     if (!r) {
       // eslint-disable-next-line no-console
       console.warn('[calendar-onekite] HelloAsso webhook: reservation not found (expired/deleted?)', { rid: resolvedRid, paymentId });
-      await markProcessed(paymentId);
+      await markProcessed(idempotencyKey);
       return res.json({ ok: true, processed: true, reservationNotFound: true });
     }
 
     // Idempotency: already paid → just mark as processed and return.
     if (r.status === 'paid') {
-      await markProcessed(paymentId);
+      await markProcessed(idempotencyKey);
       return res.json({ ok: true, processed: true, alreadyPaid: true });
     }
 
@@ -384,7 +389,7 @@ async function handler(req, res, next) {
 
     r.status = 'paid';
     r.paidAt = Date.now();
-    r.paymentId = String(paymentId);
+    if (paymentId) r.paymentId = String(paymentId);
     // paymentReceiptUrl: Format A = data.paymentReceiptUrl, Format B = order.payments[0].paymentReceiptUrl
     const _receiptUrl = (payload.data && payload.data.paymentReceiptUrl)
       ? String(payload.data.paymentReceiptUrl)
@@ -444,7 +449,7 @@ async function handler(req, res, next) {
       });
     } catch (e) {}
 
-    await markProcessed(paymentId);
+    await markProcessed(idempotencyKey);
     return res.json({ ok: true, processed: true });
   } catch (err) {
     return next(err);

package/lib/scheduler.js

@@ -1,8 +1,54 @@
 'use strict';
 
 const nconf = require.main.require('nconf');
+const meta = require.main.require('./src/meta');
+
+const dbLayer = require('./db');
+const { syncPayment } = require('./syncPayment');
+
+const SETTINGS_KEY = 'calendar-onekite';
+const SYNC_INTERVAL_MS = 60 * 1000;
+// Minimum time between HelloAsso API checks for the same reservation (avoid spamming)
+const MIN_CHECK_INTERVAL_MS = 2 * 60 * 1000;
 
 let timer = null;
+const lastChecked = new Map(); // rid → timestamp of last HelloAsso check
+
+async function runPaymentSync() {
+  try {
+    const settings = await meta.settings.get(SETTINGS_KEY);
+    if (!settings || !settings.helloassoClientId || !settings.helloassoClientSecret) return;
+
+    const ids = await dbLayer.listAllReservationIds(5000);
+    if (!ids || !ids.length) return;
+
+    const reservations = await dbLayer.getReservations(ids);
+    const now = Date.now();
+
+    const toSync = (reservations || []).filter((r) => {
+      if (!r || r.status !== 'awaiting_payment' || !r.checkoutIntentId) return false;
+      const last = lastChecked.get(String(r.rid));
+      return !last || (now - last) >= MIN_CHECK_INTERVAL_MS;
+    });
+
+    for (const r of toSync) {
+      lastChecked.set(String(r.rid), now);
+      try {
+        const result = await syncPayment({ r, settings, actorUid: 0 });
+        if (result.synced) {
+          // eslint-disable-next-line no-console
+          console.info('[calendar-onekite] Scheduler: auto-synced payment from HelloAsso', { rid: r.rid });
+        }
+      } catch (e) {
+        // eslint-disable-next-line no-console
+        console.warn('[calendar-onekite] Scheduler: syncPayment error', { rid: r.rid, err: e && e.message });
+      }
+    }
+  } catch (e) {
+    // eslint-disable-next-line no-console
+    console.warn('[calendar-onekite] Scheduler: payment sync error', { err: e && e.message });
+  }
+}
 
 function start() {
   const runJobs = nconf.get('runJobs');
@@ -11,8 +57,9 @@ function start() {
     console.info('[calendar-onekite] Scheduler disabled (runJobs=false)');
     return;
   }
+  timer = setInterval(runPaymentSync, SYNC_INTERVAL_MS);
   // eslint-disable-next-line no-console
-  console.info('[calendar-onekite] Scheduler started (no expiry timers configured)');
+  console.info('[calendar-onekite] Scheduler started');
 }
 
 function stop() {

package/package.json

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