Update app.js

app.js

@@ -1,4 +1,3 @@
-Let's fix this cron server, when it enters it's 24 hours interval loop, it doesn't deliver at all, only when it's in it's Timeout stage from the logs we see, script first:
 import express from 'express';
 import cors from 'cors';
 import { createClient } from '@supabase/supabase-js';
@@ -17,12 +16,13 @@ if (!SUPABASE_URL || !SUPABASE_KEY) {
 const app = express();
 const supabase = createClient(SUPABASE_URL, SUPABASE_KEY);
 
+// Map will now store job details and absolute timestamps (nextRunAt)
 const activeJobs = new Map();
 
 app.use(express.json());
 app.use(cors());
 
-// --- BULLETPROOF DELAY MATH (UPDATED TO 5 AM) ---
+// --- BULLETPROOF DELAY MATH ---
 function getMsUntilNextFiveAM(offset = 0) {
     const now = new Date();
     const target = new Date(now);
@@ -32,7 +32,9 @@ function getMsUntilNextFiveAM(offset = 0) {
 
     target.setUTCHours(0, targetUtcMinutes, 0, 0); 
     
-    if (target <= now) {
+    // BUFFER: If the target is in the past OR within the next 2 minutes 
+    // (meaning we just fired it), schedule for TOMORROW.
+    if (target.getTime() <= now.getTime() + 120000) {
         target.setDate(target.getDate() + 1);
     }
 
@@ -40,45 +42,59 @@ function getMsUntilNextFiveAM(offset = 0) {
 }
 
 function startJobInternal(jobId, intervalMs, url, payload, initialDelay) {
-    if (activeJobs.has(jobId)) {
-        const existing = activeJobs.get(jobId);
-        if (existing.timeout) clearTimeout(existing.timeout);
-        if (existing.interval) clearInterval(existing.interval);
-        activeJobs.delete(jobId);
-    }
+    // Calculate absolute timestamp for when this should run next
+    const nextRunAt = Date.now() + initialDelay;
+
+    activeJobs.set(jobId, {
+        url,
+        payload,
+        intervalMs,
+        offset: payload?.timezoneOffset || 0,
+        nextRunAt
+    });
 
-    const runTask = async () => {
-        console.log(`⏰ [${new Date().toLocaleTimeString()}] Executing: ${jobId}`);
-        try {
-            const res = await fetch(url, {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify(payload)
-            });
-            console.log(`   └─ Response: ${res.status}`);
-        } catch (e) {
-            console.error(`❌ Job ${jobId} HTTP Failed:`, e.message);
+    console.log(`⏳ Job ${jobId} scheduled. Next run: ${new Date(nextRunAt).toLocaleString()}`);
+}
+
+// ==========================================
+// ⚙️ THE CRON ENGINE (HEARTBEAT)
+// ==========================================
+// This loop checks every 60 seconds if any job is ready to fire.
+// This survives container sleeps, CPU throttling, and timer drifts.
+setInterval(async () => {
+    const now = Date.now();
+
+    for (const [jobId, job] of activeJobs.entries()) {
+        if (now >= job.nextRunAt) {
+            console.log(`⏰ [${new Date().toLocaleTimeString()}] Executing: ${jobId}`);
+            
+            // 1. Immediately push the next run time forward to prevent double-firing
+            // We lock it back to exactly the next 5 AM based on their timezone
+            const nextDelay = getMsUntilNextFiveAM(job.offset);
+            job.nextRunAt = now + nextDelay;
+
+            // 2. Fire the webhook asynchronously
+            try {
+                fetch(job.url, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify(job.payload)
+                }).then(res => {
+                    console.log(`   └─ Response [${jobId}]: ${res.status}`);
+                }).catch(err => {
+                    console.error(`❌ Fetch Error [${jobId}]:`, err.message);
+                });
+            } catch (e) {
+                console.error(`❌ Job ${jobId} HTTP Failed:`, e.message);
+            }
+            
+            console.log(`🔄 Job ${jobId} entered 24h cycle. Next run in ${(nextDelay/1000/60/60).toFixed(2)} hours.`);
         }
-    };
-
-    const jobHandles = { timeout: null, interval: null };
-
-    if (initialDelay > 0) {
-        console.log(`⏳ Job ${jobId} scheduled. First 5AM run in ${(initialDelay/1000/60/60).toFixed(2)} hours.`);
-        
-        jobHandles.timeout = setTimeout(async () => {
-            await runTask(); 
-            jobHandles.interval = setInterval(runTask, intervalMs);
-            console.log(`🔄 Job ${jobId} entering 24h interval cycle.`);
-        }, initialDelay);
-    } else {
-        console.log(`🚀 Job ${jobId} starting immediate interval.`);
-        jobHandles.interval = setInterval(runTask, intervalMs);
     }
+}, 60000); // Ticks every 60 seconds
 
-    activeJobs.set(jobId, jobHandles);
-}
 
+// --- DB HYDRATION ---
 async function hydrateJobs() {
     console.log("💧 Hydrating Cron Jobs from DB...");
     const { data, error } = await supabase.from('system_jobs').select('*');
@@ -99,6 +115,7 @@ async function hydrateJobs() {
     console.log(`✅ Successfully hydrated and scheduled ${count} jobs.`);
 }
 
+// --- ENDPOINTS ---
 app.get('/', (req, res) => res.json({ status: "Cron Registry Active", active_jobs: activeJobs.size }));
 
 app.post('/register', async (req, res) => {
@@ -121,20 +138,20 @@ app.post('/register', async (req, res) => {
     
     startJobInternal(jobId, intervalMs, webhookUrl, payload, delay);
 
-    console.log(`➕ Registered & Scheduled Job (5AM Anchor): ${jobId}`);
+    console.log(`➕ Registered Job: ${jobId}`);
     res.json({ success: true, jobId });
 });
 
 app.post('/deregister', async (req, res) => {
     const { secret, jobId } = req.body;
     if (secret !== CRON_SECRET) return res.status(403).json({ error: "Unauthorized" });
+    
     await supabase.from('system_jobs').delete().eq('id', jobId);
+    
     if (activeJobs.has(jobId)) {
-        const handles = activeJobs.get(jobId);
-        if (handles.timeout) clearTimeout(handles.timeout);
-        if (handles.interval) clearInterval(handles.interval);
         activeJobs.delete(jobId);
     }
+    
     console.log(`➖ Deregistered Job: ${jobId}`);
     res.json({ success: true });
 });
@@ -142,15 +159,4 @@ app.post('/deregister', async (req, res) => {
 app.listen(PORT, async () => {
     console.log(`🚀 Cron Registry live on port ${PORT}`);
     setTimeout(hydrateJobs, 2000);
-});
-
-⏰ [4:59:59 AM] Executing: briefing_ba3a93b7-9032-49f6-998a-48228a8ef526
-   └─ Response: 200
-🔄 Job briefing_ba3a93b7-9032-49f6-998a-48228a8ef526 entering 24h interval cycle.
-⏳ Job briefing_ba3a93b7-9032-49f6-998a-48228a8ef526 scheduled. First 5AM run in 4.99 hours.
-➕ Registered & Scheduled Job (5AM Anchor): briefing_ba3a93b7-9032-49f6-998a-48228a8ef526
-⏰ [10:00:00 AM] Executing: briefing_ba3a93b7-9032-49f6-998a-48228a8ef526
-   └─ Response: 200
-🔄 Job briefing_ba3a93b7-9032-49f6-998a-48228a8ef526 entering 24h interval cycle. 
-
-And we can't keep restarting the server to keep it running, let's find a solution either a reoccurring timeout or something that works
+});