removed unused params, cleaned up redundant utils

Author: waleedlatif1

apps/sim/background/schedule-execution.ts

@@ -372,8 +372,7 @@ function calculateNextRunTime(
     return nextDate
   }
 
-  const lastRanAt = schedule.lastRanAt ? new Date(schedule.lastRanAt) : null
-  return calculateNextTime(scheduleType, scheduleValues, lastRanAt)
+  return calculateNextTime(scheduleType, scheduleValues)
 }
 
 export async function executeScheduleJob(payload: ScheduleExecutionPayload) {

apps/sim/lib/workflows/schedules/utils.test.ts

@@ -390,13 +390,9 @@ describe('Schedule Utilities', () => {
           cronExpression: null,
         }
 
-        // Last ran 10 minutes ago
-        const lastRanAt = new Date()
-        lastRanAt.setMinutes(lastRanAt.getMinutes() - 10)
-
-        const nextRun = calculateNextRunTime('minutes', scheduleValues, lastRanAt)
+        const nextRun = calculateNextRunTime('minutes', scheduleValues)
 
-        // With Croner, it calculates based on cron expression, not lastRanAt
+        // Croner calculates based on cron expression
         // Just verify we get a future date
         expect(nextRun instanceof Date).toBe(true)
         expect(nextRun > new Date()).toBe(true)
@@ -523,11 +519,13 @@ describe('Schedule Utilities', () => {
 
     it.concurrent('should include timezone information when provided', () => {
       const resultPT = parseCronToHumanReadable('0 9 * * *', 'America/Los_Angeles')
-      expect(resultPT).toContain('(PT)')
+      // Intl.DateTimeFormat returns PST or PDT depending on DST
+      expect(resultPT).toMatch(/\(P[SD]T\)/)
       expect(resultPT).toContain('09:00 AM')
 
       const resultET = parseCronToHumanReadable('30 14 * * *', 'America/New_York')
-      expect(resultET).toContain('(ET)')
+      // Intl.DateTimeFormat returns EST or EDT depending on DST
+      expect(resultET).toMatch(/\(E[SD]T\)/)
       expect(resultET).toContain('02:30 PM')
 
       const resultUTC = parseCronToHumanReadable('0 12 * * *', 'UTC')

apps/sim/lib/workflows/schedules/utils.ts

@@ -27,7 +27,6 @@ export function validateCronExpression(
   }
 
   try {
-    // Validate with timezone if provided for accurate next run calculation
     const cron = new Cron(cronExpression, timezone ? { timezone } : undefined)
     const nextRun = cron.nextRun()
 
@@ -324,13 +323,11 @@ export function generateCronExpression(
  * Uses Croner library with timezone support for accurate scheduling across timezones and DST transitions
  * @param scheduleType - Type of schedule (minutes, hourly, daily, etc)
  * @param scheduleValues - Object with schedule configuration values
- * @param lastRanAt - Optional last execution time (currently unused, Croner calculates from current time)
  * @returns Date object for next execution time
  */
 export function calculateNextRunTime(
   scheduleType: string,
-  scheduleValues: ReturnType<typeof getScheduleTimeValues>,
-  lastRanAt?: Date | null
+  scheduleValues: ReturnType<typeof getScheduleTimeValues>
 ): Date {
   // Get timezone (default to UTC)
   const timezone = scheduleValues.timezone || 'UTC'
@@ -341,7 +338,7 @@ export function calculateNextRunTime(
   // If we have both a start date and time, use them together with timezone awareness
   if (scheduleValues.scheduleStartAt && scheduleValues.scheduleTime) {
     try {
-      logger.info(
+      logger.debug(
         `Creating date with: startAt=${scheduleValues.scheduleStartAt}, time=${scheduleValues.scheduleTime}, timezone=${timezone}`
       )
 
@@ -351,7 +348,7 @@ export function calculateNextRunTime(
         timezone
       )
 
-      logger.info(`Combined date result: ${combinedDate.toISOString()}`)
+      logger.debug(`Combined date result: ${combinedDate.toISOString()}`)
 
       // If the combined date is in the future, use it as our next run time
       if (combinedDate > baseDate) {
@@ -412,13 +409,10 @@ export function calculateNextRunTime(
     }
   }
 
-  // For recurring schedules, use Croner with timezone support
-  // This ensures proper timezone handling and DST transitions
   try {
     const cronExpression = generateCronExpression(scheduleType, scheduleValues)
     logger.debug(`Using cron expression: ${cronExpression} with timezone: ${timezone}`)
 
-    // Create Croner instance with timezone support
     const cron = new Cron(cronExpression, {
       timezone,
     })
@@ -440,54 +434,24 @@ export function calculateNextRunTime(
 }
 
 /**
- * Helper function to get a friendly timezone abbreviation
+ * Helper function to get a friendly timezone abbreviation.
+ * Uses Intl.DateTimeFormat to get the correct abbreviation for the current time,
+ * automatically handling DST transitions.
  */
 function getTimezoneAbbreviation(timezone: string): string {
-  const timezoneMap: Record<string, string> = {
-    // UTC
-    UTC: 'UTC',
-    // Americas
-    'America/Los_Angeles': 'PT',
-    'America/Denver': 'MT',
-    'America/Chicago': 'CT',
-    'America/New_York': 'ET',
-    'America/Anchorage': 'AKT',
-    'Pacific/Honolulu': 'HST',
-    'America/Toronto': 'ET',
-    'America/Vancouver': 'PT',
-    'America/Mexico_City': 'CST',
-    'America/Sao_Paulo': 'BRT',
-    'America/Argentina/Buenos_Aires': 'ART',
-    // Europe
-    'Europe/London': 'GMT/BST',
-    'Europe/Paris': 'CET/CEST',
-    'Europe/Berlin': 'CET/CEST',
-    'Europe/Amsterdam': 'CET/CEST',
-    'Europe/Madrid': 'CET/CEST',
-    'Europe/Rome': 'CET/CEST',
-    'Europe/Moscow': 'MSK',
-    // Middle East / Africa
-    'Asia/Dubai': 'GST',
-    'Asia/Tel_Aviv': 'IST',
-    'Africa/Cairo': 'EET',
-    'Africa/Johannesburg': 'SAST',
-    // Asia
-    'Asia/Kolkata': 'IST',
-    'Asia/Bangkok': 'ICT',
-    'Asia/Jakarta': 'WIB',
-    'Asia/Singapore': 'SGT',
-    'Asia/Shanghai': 'CST',
-    'Asia/Hong_Kong': 'HKT',
-    'Asia/Seoul': 'KST',
-    'Asia/Tokyo': 'JST',
-    // Australia / Pacific
-    'Australia/Perth': 'AWST',
-    'Australia/Sydney': 'AEST/AEDT',
-    'Australia/Melbourne': 'AEST/AEDT',
-    'Pacific/Auckland': 'NZST/NZDT',
-  }
+  if (timezone === 'UTC') return 'UTC'
 
-  return timezoneMap[timezone] || timezone
+  try {
+    const formatter = new Intl.DateTimeFormat('en-US', {
+      timeZone: timezone,
+      timeZoneName: 'short',
+    })
+    const parts = formatter.formatToParts(new Date())
+    const tzPart = parts.find((p) => p.type === 'timeZoneName')
+    return tzPart?.value || timezone
+  } catch {
+    return timezone
+  }
 }
 
 /**
@@ -500,13 +464,11 @@ function getTimezoneAbbreviation(timezone: string): string {
  */
 export const parseCronToHumanReadable = (cronExpression: string, timezone?: string): string => {
   try {
-    // Use cronstrue for reliable cron expression parsing
     const baseDescription = cronstrue.toString(cronExpression, {
       use24HourTimeFormat: false, // Use 12-hour format with AM/PM
       verbose: false, // Keep it concise
     })
 
-    // Add timezone information if provided and not UTC
     if (timezone && timezone !== 'UTC') {
       const tzAbbr = getTimezoneAbbreviation(timezone)
       return `${baseDescription} (${tzAbbr})`
@@ -518,7 +480,6 @@ export const parseCronToHumanReadable = (cronExpression: string, timezone?: stri
       cronExpression,
       error: error instanceof Error ? error.message : String(error),
     })
-    // Fallback to displaying the raw cron expression
     return `Schedule: ${cronExpression}${timezone && timezone !== 'UTC' ? ` (${getTimezoneAbbreviation(timezone)})` : ''}`
   }
 }
@@ -548,7 +509,6 @@ export const getScheduleInfo = (
   let scheduleTiming = 'Unknown schedule'
 
   if (cronExpression) {
-    // Pass timezone to parseCronToHumanReadable for accurate display
     scheduleTiming = parseCronToHumanReadable(cronExpression, timezone || undefined)
   } else if (scheduleType) {
     scheduleTiming = `${scheduleType.charAt(0).toUpperCase() + scheduleType.slice(1)}`