Merge pull request #394 from franciscodes-ops/fix/issues-360-363

fix(#360,#361,#362,#363): retry metrics, cron validation, price cleanup, heartbeat fix

Author: ritaifeoluwa

src/jobs/priceRefresh.js

@@ -18,6 +18,19 @@ const health = {
 
 function start() {
   const intervalSeconds = config.price.refreshInterval;
+
+  // #361 — Validate that the interval evenly divides 60 so the cron
+  // expression produces a correct schedule. Non-divisor intervals (e.g.
+  // 7 seconds) would create an incorrect cron schedule with node-cron's
+  // second-level syntax.
+  if (!Number.isInteger(intervalSeconds) || intervalSeconds < 1 || intervalSeconds > 59 || 60 % intervalSeconds !== 0) {
+    throw new Error(
+      `price.refreshInterval must be a whole number between 1 and 59 that evenly divides 60 ` +
+      `(got ${intervalSeconds}). Non-divisor intervals produce incorrect cron schedules. ` +
+      `Valid values: 1, 2, 3, 4, 5, 6, 10, 12, 15, 20, 30, 60.`
+    );
+  }
+
   const cronExpression = `*/${intervalSeconds} * * * * *`;
   health.startedAt = Date.now();
 

src/jobs/webhookRetryWorker.js

@@ -36,7 +36,11 @@ async function tick() {
       const attemptStartedAt = Date.now();
       try {
         await dispatcher.attempt(id);
+        health.totalRetriesProcessed++;
+        health.totalRetryLatencyMs += Date.now() - startMs;
       } catch (err) {
+        health.totalRetriesProcessed++;
+        health.totalRetryLatencyMs += Date.now() - startMs;
         logger.error('Retry attempt failed', { delivery_id: id, error: err.message });
       }
       // Latency is recorded for failed attempts too — a retry that times

src/ws/PriceSubscriptionManager.js

@@ -193,16 +193,23 @@ class PriceSubscriptionManager {
   startHeartbeat() {
     if (this._pingTimer) return;
     this._pingTimer = setInterval(() => {
+      // #363 — Collect timed-out clients first, then disconnect after
+      // iteration. Modifying a Map during for-of iteration is undefined
+      // behavior in JS; snapshotting the keys avoids the mutation.
+      const timedOut = [];
       for (const [ws, client] of this._clients) {
         if (client.missedPings >= MAX_MISSED_PINGS) {
-          logger.info('WS client timed out, disconnecting');
-          ws.terminate();
-          this._remove(ws);
+          timedOut.push(ws);
           continue;
         }
         client.missedPings += 1;
         this._send(ws, { type: 'ping' });
       }
+      for (const ws of timedOut) {
+        logger.info('WS client timed out, disconnecting');
+        ws.terminate();
+        this._remove(ws);
+      }
     }, PING_INTERVAL_MS);
   }