Update app.js

app.js

@@ -11,7 +11,7 @@ const SUPABASE_KEY = process.env.SUPABASE_SERVICE_KEY;
 const CRON_SECRET = process.env.CRON_SECRET || "default_secret";
 
 // 🔴 VARIABLE BOOLEAN: Should past/missed jobs fire immediately on server startup?
-const RUN_PAST_EVENTS_ON_STARTUP = true; // false; 
+const RUN_PAST_EVENTS_ON_STARTUP = true; 
 
 if (!SUPABASE_URL || !SUPABASE_KEY) {
     console.error("❌ Missing Supabase Credentials");
@@ -27,13 +27,12 @@ app.use(express.json());
 app.use(cors());
 
 // ==========================================
-// ⏱️ YOUR EXACT ORIGINAL MATH (RESTORED)
+// ⏱️ YOUR EXACT ORIGINAL MATH
 // ==========================================
 function getMsUntilNextFiveAM(offset = 0) {
     const now = new Date();
     const target = new Date(now.getTime());
     
-    // Using your exact original calculation
     const targetUtcMinutes = (5 * 60) - (offset * 60); 
     target.setUTCHours(0, targetUtcMinutes, 0, 0); 
     
@@ -58,27 +57,37 @@ async function executeJob(jobId) {
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify(job.payload)
         });
+        
         console.log(`   └─ Response: ${res.status}`);
+
+        // ✅ UPDATE DATABASE ON SUCCESS
+        // If the webhook succeeds, we log the exact time so future restarts know it ran.
+        if (res.ok) {
+            const { error } = await supabase
+                .from('system_jobs')
+                .update({ updated_at: new Date().toISOString() })
+                .eq('id', jobId);
+
+            if (!error) {
+                console.log(`   └─ 💾 Database 'updated_at' successfully synced.`);
+            } else {
+                console.error(`   └─ ❌ Failed to update DB:`, error.message);
+            }
+        }
+
     } catch (e) {
         console.error(`❌ Job ${jobId} HTTP Failed:`, e.message);
     }
 }
 
-function startJobInternal(jobId, intervalMs, url, payload, initialDelay, isHydration = false) {
+function startJobInternal(jobId, intervalMs, url, payload, initialDelay, runImmediately = false) {
     let delay = initialDelay;
-    let runImmediately = false;
 
-    // Failsafe: If delay is somehow massive (e.g. accidentally passed a timestamp), reset it
+    // Failsafe: Reset crazy massive delays to next 5AM
     if (delay > 31536000000) { 
         delay = getMsUntilNextFiveAM(payload?.timezoneOffset || 0);
     }
 
-    // Handle the past events boolean for DB hydration
-    if (isHydration && RUN_PAST_EVENTS_ON_STARTUP) {
-        runImmediately = true;
-        delay = getMsUntilNextFiveAM(payload?.timezoneOffset || 0);
-    }
-
     const nextRunAt = Date.now() + delay;
     const hours = (delay / 1000 / 60 / 60).toFixed(2);
     const minutes = (delay / 1000 / 60).toFixed(2);
@@ -92,38 +101,35 @@ function startJobInternal(jobId, intervalMs, url, payload, initialDelay, isHydra
     });
 
     if (runImmediately) {
-        console.log(`⚡ [Startup] Firing past/missed event immediately: ${jobId}`);
-        executeJob(jobId); // Fire right now
+        console.log(`⚡ [Startup] Missed event detected! Firing immediately: ${jobId}`);
+        executeJob(jobId); 
         console.log(`⏳ Job ${jobId} re-scheduled. Next 5AM run in ${hours} hours (${minutes} mins).`);
     } else {
-        console.log(`⏳ Job ${jobId} scheduled. First 5AM run in ${hours} hours (${minutes} mins).`);
+        console.log(`⏳ Job ${jobId} scheduled. Next 5AM run in ${hours} hours (${minutes} mins).`);
     }
 }
 
 // ==========================================
-// ⚙️ THE TICK ENGINE (REPLACES CRASHING TIMEOUTS)
+// ⚙️ THE TICK ENGINE (WATCHDOG)
 // ==========================================
-// We keep this because native setTimeouts die after 24 hours on cloud servers.
-// This 60-second tick just acts as a watchdog to fire your jobs accurately.
 setInterval(() => {
     const now = Date.now();
 
     for (const [jobId, job] of activeJobs.entries()) {
         if (now >= job.nextRunAt) {
-            executeJob(jobId); // Fire the webhook
+            executeJob(jobId); 
             
-            // Calculate exact time until NEXT 5 AM
             const nextDelay = getMsUntilNextFiveAM(job.offset);
             job.nextRunAt = now + nextDelay;
             
             const hours = (nextDelay / 1000 / 60 / 60).toFixed(2);
-            console.log(`🔄 Job ${jobId} entering 24h interval cycle. Next run in ${hours} hours.`);
+            console.log(`🔄 Job ${jobId} entered 24h cycle. Next run in ${hours} hours.`);
         }
     }
-}, 60000); // Ticks every 60 seconds
+}, 60000); 
 
 // ==========================================
-// 💾 DB HYDRATION & ROUTES
+// 💾 DB HYDRATION USING `updated_at`
 // ==========================================
 async function hydrateJobs() {
     console.log("💧 Hydrating Cron Jobs from DB...");
@@ -135,12 +141,29 @@ async function hydrateJobs() {
     }
 
     let count = 0;
+    const now = Date.now();
+
     for (const job of data) {
         const offset = job.payload?.timezoneOffset ?? 0;
         const newDelay = getMsUntilNextFiveAM(offset);
+        let runImmediately = false;
+
+        // ✅ CHECK LAST UPDATED TIME
+        if (job.updated_at) {
+            const lastUpdatedTime = new Date(job.updated_at).getTime();
+            const timeSinceLastRunMs = now - lastUpdatedTime;
+            
+            // If it's been more than 24 hours (86,400,000 ms) since the last successful run,
+            // AND the variable allows it, we fire it instantly to catch up.
+            if (RUN_PAST_EVENTS_ON_STARTUP && timeSinceLastRunMs >= 86400000) {
+                runImmediately = true;
+            }
+        } else if (RUN_PAST_EVENTS_ON_STARTUP) {
+            // If it has NEVER run before (no updated_at), run it now.
+            runImmediately = true;
+        }
 
-        // Pass 'true' at the end to signify this is a startup hydration
-        startJobInternal(job.id, job.interval_ms, job.webhook_url, job.payload, newDelay, true);
+        startJobInternal(job.id, job.interval_ms, job.webhook_url, job.payload, newDelay, runImmediately);
         count++;
     }
     console.log(`✅ Successfully hydrated and scheduled ${count} jobs.`);
@@ -153,20 +176,20 @@ app.post('/register', async (req, res) => {
 
     if (secret !== CRON_SECRET) return res.status(403).json({ error: "Unauthorized" });
 
+    // Creating a fresh job (updated_at is null so it gets processed naturally)
     const { error } = await supabase.from('system_jobs').upsert({
         id: jobId,
         lead_id: leadId,
         interval_ms: intervalMs,
         webhook_url: webhookUrl,
         payload: payload,
-        updated_at: new Date()
+        updated_at: new Date().toISOString()
     });
   
     if (error) return res.status(500).json({ error: error.message });
 
     const delay = (initialDelay !== undefined) ? initialDelay : getMsUntilNextFiveAM(payload?.timezoneOffset || 0);
     
-    // Pass 'false' at the end to signify this is a fresh registration
     startJobInternal(jobId, intervalMs, webhookUrl, payload, delay, false);
 
     console.log(`➕ Registered & Scheduled Job (5AM Anchor): ${jobId}`);