remove unused envvar, remove extraneous comments

waleedlatif1 · waleedlatif1 · commit ba5b2abfe005 · 2026-02-04T13:17:47.000-08:00
diff --git a/apps/sim/app/api/cron/cleanup-stale-executions/route.ts b/apps/sim/app/api/cron/cleanup-stale-executions/route.ts
@@ -4,7 +4,7 @@ import { createLogger } from '@sim/logger'
 import { and, eq, inArray, lt, sql } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { verifyCronAuth } from '@/lib/auth/internal'
-import { JOB_RETENTION_HOURS } from '@/lib/core/async-jobs'
+import { JOB_RETENTION_HOURS, JOB_STATUS } from '@/lib/core/async-jobs'
 import { getMaxExecutionTimeout } from '@/lib/core/execution-limits'
 
 const logger = createLogger('CleanupStaleExecutions')
@@ -88,12 +88,14 @@ export async function GET(request: NextRequest) {
       const staleAsyncJobs = await db
         .update(asyncJobs)
         .set({
-          status: 'failed',
+          status: JOB_STATUS.FAILED,
           completedAt: new Date(),
           error: `Job terminated: stuck in processing for more than ${STALE_THRESHOLD_MINUTES} minutes`,
           updatedAt: new Date(),
         })
-        .where(and(eq(asyncJobs.status, 'processing'), lt(asyncJobs.startedAt, staleThreshold)))
+        .where(
+          and(eq(asyncJobs.status, JOB_STATUS.PROCESSING), lt(asyncJobs.startedAt, staleThreshold))
+        )
         .returning({ id: asyncJobs.id })
 
       asyncJobsMarkedFailed = staleAsyncJobs.length
@@ -115,7 +117,7 @@ export async function GET(request: NextRequest) {
         .delete(asyncJobs)
         .where(
           and(
-            inArray(asyncJobs.status, ['completed', 'failed']),
+            inArray(asyncJobs.status, [JOB_STATUS.COMPLETED, JOB_STATUS.FAILED]),
             lt(asyncJobs.completedAt, retentionThreshold)
           )
         )
diff --git a/apps/sim/app/api/jobs/[jobId]/route.ts b/apps/sim/app/api/jobs/[jobId]/route.ts
@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { checkHybridAuth } from '@/lib/auth/hybrid'
-import { getJobQueue } from '@/lib/core/async-jobs'
+import { getJobQueue, JOB_STATUS } from '@/lib/core/async-jobs'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { createErrorResponse } from '@/app/api/workflows/utils'
 
@@ -48,7 +48,7 @@ export async function GET(
       return createErrorResponse('Access denied', 403)
     }
 
-    const mappedStatus = job.status === 'pending' ? 'queued' : job.status
+    const mappedStatus = job.status === JOB_STATUS.PENDING ? 'queued' : job.status
 
     const response: any = {
       success: true,
@@ -59,23 +59,23 @@ export async function GET(
       },
     }
 
-    if (job.status === 'completed') {
+    if (job.status === JOB_STATUS.COMPLETED) {
       response.output = job.output
       response.metadata.completedAt = job.completedAt
       if (job.startedAt && job.completedAt) {
         response.metadata.duration = job.completedAt.getTime() - job.startedAt.getTime()
       }
     }
 
-    if (job.status === 'failed') {
+    if (job.status === JOB_STATUS.FAILED) {
       response.error = job.error
       response.metadata.completedAt = job.completedAt
       if (job.startedAt && job.completedAt) {
         response.metadata.duration = job.completedAt.getTime() - job.startedAt.getTime()
       }
     }
 
-    if (job.status === 'processing' || job.status === 'pending') {
+    if (job.status === JOB_STATUS.PROCESSING || job.status === JOB_STATUS.PENDING) {
       response.estimatedDuration = 180000
     }
 
diff --git a/apps/sim/lib/core/async-jobs/backends/database.ts b/apps/sim/lib/core/async-jobs/backends/database.ts
@@ -1,13 +1,14 @@
 import { asyncJobs, db } from '@sim/db'
 import { createLogger } from '@sim/logger'
 import { eq } from 'drizzle-orm'
-import type {
-  EnqueueOptions,
-  Job,
-  JobMetadata,
-  JobQueueBackend,
-  JobStatus,
-  JobType,
+import {
+  type EnqueueOptions,
+  JOB_STATUS,
+  type Job,
+  type JobMetadata,
+  type JobQueueBackend,
+  type JobStatus,
+  type JobType,
 } from '@/lib/core/async-jobs/types'
 
 const logger = createLogger('DatabaseJobQueue')
@@ -44,7 +45,7 @@ export class DatabaseJobQueue implements JobQueueBackend {
       id: jobId,
       type,
       payload: payload as Record<string, unknown>,
-      status: 'pending',
+      status: JOB_STATUS.PENDING,
       createdAt: now,
       attempts: 0,
       maxAttempts: options?.maxAttempts ?? 3,
@@ -68,7 +69,7 @@ export class DatabaseJobQueue implements JobQueueBackend {
     await db
       .update(asyncJobs)
       .set({
-        status: 'processing',
+        status: JOB_STATUS.PROCESSING,
         startedAt: now,
         attempts: 1,
         updatedAt: now,
@@ -84,7 +85,7 @@ export class DatabaseJobQueue implements JobQueueBackend {
     await db
       .update(asyncJobs)
       .set({
-        status: 'completed',
+        status: JOB_STATUS.COMPLETED,
         completedAt: now,
         output: output as Record<string, unknown>,
         updatedAt: now,
@@ -100,7 +101,7 @@ export class DatabaseJobQueue implements JobQueueBackend {
     await db
       .update(asyncJobs)
       .set({
-        status: 'failed',
+        status: JOB_STATUS.FAILED,
         completedAt: now,
         error,
         updatedAt: now,
diff --git a/apps/sim/lib/core/async-jobs/backends/redis.test.ts b/apps/sim/lib/core/async-jobs/backends/redis.test.ts
@@ -6,7 +6,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 vi.mock('@sim/logger', () => loggerMock)
 
-import { JOB_RETENTION_SECONDS } from '@/lib/core/async-jobs/types'
+import { JOB_RETENTION_SECONDS, JOB_STATUS } from '@/lib/core/async-jobs/types'
 import { RedisJobQueue } from './redis'
 
 describe('RedisJobQueue', () => {
@@ -31,7 +31,7 @@ describe('RedisJobQueue', () => {
 
       const [key, data] = localRedis.hset.mock.calls[0]
       expect(key).toBe(`async-jobs:job:${jobId}`)
-      expect(data.status).toBe('pending')
+      expect(data.status).toBe(JOB_STATUS.PENDING)
       expect(data.type).toBe('workflow-execution')
     })
 
@@ -54,7 +54,7 @@ describe('RedisJobQueue', () => {
       await localQueue.completeJob(jobId, { result: 'success' })
 
       expect(localRedis.hset).toHaveBeenCalledWith(`async-jobs:job:${jobId}`, {
-        status: 'completed',
+        status: JOB_STATUS.COMPLETED,
         completedAt: expect.any(String),
         output: JSON.stringify({ result: 'success' }),
         updatedAt: expect.any(String),
@@ -85,7 +85,7 @@ describe('RedisJobQueue', () => {
       await localQueue.markJobFailed(jobId, error)
 
       expect(localRedis.hset).toHaveBeenCalledWith(`async-jobs:job:${jobId}`, {
-        status: 'failed',
+        status: JOB_STATUS.FAILED,
         completedAt: expect.any(String),
         error,
         updatedAt: expect.any(String),
@@ -137,7 +137,7 @@ describe('RedisJobQueue', () => {
         id: 'run_test',
         type: 'workflow-execution',
         payload: JSON.stringify({ foo: 'bar' }),
-        status: 'completed',
+        status: JOB_STATUS.COMPLETED,
         createdAt: now.toISOString(),
         startedAt: now.toISOString(),
         completedAt: now.toISOString(),
@@ -154,7 +154,7 @@ describe('RedisJobQueue', () => {
       expect(job?.id).toBe('run_test')
       expect(job?.type).toBe('workflow-execution')
       expect(job?.payload).toEqual({ foo: 'bar' })
-      expect(job?.status).toBe('completed')
+      expect(job?.status).toBe(JOB_STATUS.COMPLETED)
       expect(job?.output).toEqual({ result: 'ok' })
       expect(job?.metadata.workflowId).toBe('wf_123')
     })
diff --git a/apps/sim/lib/core/async-jobs/backends/redis.ts b/apps/sim/lib/core/async-jobs/backends/redis.ts
@@ -3,6 +3,7 @@ import type Redis from 'ioredis'
 import {
   type EnqueueOptions,
   JOB_RETENTION_SECONDS,
+  JOB_STATUS,
   type Job,
   type JobMetadata,
   type JobQueueBackend,
@@ -77,7 +78,7 @@ export class RedisJobQueue implements JobQueueBackend {
       id: jobId,
       type,
       payload,
-      status: 'pending',
+      status: JOB_STATUS.PENDING,
       createdAt: now,
       attempts: 0,
       maxAttempts: options?.maxAttempts ?? 3,
@@ -100,7 +101,7 @@ export class RedisJobQueue implements JobQueueBackend {
     const now = new Date()
 
     await this.redis.hset(KEYS.job(jobId), {
-      status: 'processing',
+      status: JOB_STATUS.PROCESSING,
       startedAt: now.toISOString(),
       attempts: '1',
       updatedAt: now.toISOString(),
@@ -114,7 +115,7 @@ export class RedisJobQueue implements JobQueueBackend {
     const key = KEYS.job(jobId)
 
     await this.redis.hset(key, {
-      status: 'completed',
+      status: JOB_STATUS.COMPLETED,
       completedAt: now.toISOString(),
       output: JSON.stringify(output),
       updatedAt: now.toISOString(),
@@ -129,7 +130,7 @@ export class RedisJobQueue implements JobQueueBackend {
     const key = KEYS.job(jobId)
 
     await this.redis.hset(key, {
-      status: 'failed',
+      status: JOB_STATUS.FAILED,
       completedAt: now.toISOString(),
       error,
       updatedAt: now.toISOString(),
diff --git a/apps/sim/lib/core/async-jobs/backends/trigger-dev.ts b/apps/sim/lib/core/async-jobs/backends/trigger-dev.ts
@@ -1,12 +1,13 @@
 import { createLogger } from '@sim/logger'
 import { runs, tasks } from '@trigger.dev/sdk'
-import type {
-  EnqueueOptions,
-  Job,
-  JobMetadata,
-  JobQueueBackend,
-  JobStatus,
-  JobType,
+import {
+  type EnqueueOptions,
+  JOB_STATUS,
+  type Job,
+  type JobMetadata,
+  type JobQueueBackend,
+  type JobStatus,
+  type JobType,
 } from '@/lib/core/async-jobs/types'
 
 const logger = createLogger('TriggerDevJobQueue')
@@ -27,22 +28,22 @@ function mapTriggerDevStatus(status: string): JobStatus {
   switch (status) {
     case 'QUEUED':
     case 'WAITING_FOR_DEPLOY':
-      return 'pending'
+      return JOB_STATUS.PENDING
     case 'EXECUTING':
     case 'RESCHEDULED':
     case 'FROZEN':
-      return 'processing'
+      return JOB_STATUS.PROCESSING
     case 'COMPLETED':
-      return 'completed'
+      return JOB_STATUS.COMPLETED
     case 'CANCELED':
     case 'FAILED':
     case 'CRASHED':
     case 'INTERRUPTED':
     case 'SYSTEM_FAILURE':
     case 'EXPIRED':
-      return 'failed'
+      return JOB_STATUS.FAILED
     default:
-      return 'pending'
+      return JOB_STATUS.PENDING
   }
 }
 
@@ -61,9 +62,6 @@ export class TriggerDevJobQueue implements JobQueueBackend {
       throw new Error(`Unknown job type: ${type}`)
     }
 
-    // Merge metadata into payload so it's available when retrieving job status.
-    // This ensures access control checks work correctly since getJob() extracts
-    // workflowId and userId from the payload.
     const enrichedPayload =
       options?.metadata && typeof payload === 'object' && payload !== null
         ? { ...payload, ...options.metadata }
@@ -94,7 +92,7 @@ export class TriggerDevJobQueue implements JobQueueBackend {
         startedAt: run.startedAt ? new Date(run.startedAt) : undefined,
         completedAt: run.finishedAt ? new Date(run.finishedAt) : undefined,
         attempts: run.attemptCount ?? 1,
-        maxAttempts: 3, // trigger.dev doesn't expose maxAttempts, use default
+        maxAttempts: 3,
         error: run.error?.message,
         output: run.output as unknown,
         metadata,
@@ -105,24 +103,9 @@ export class TriggerDevJobQueue implements JobQueueBackend {
     }
   }
 
-  /**
-   * No-op for trigger.dev - job start is handled by the task runner
-   */
-  async startJob(_jobId: string): Promise<void> {
-    // No-op: trigger.dev handles job start internally
-  }
+  async startJob(_jobId: string): Promise<void> {}
 
-  /**
-   * No-op for trigger.dev - completion is handled by the task runner
-   */
-  async completeJob(_jobId: string, _output: unknown): Promise<void> {
-    // No-op: trigger.dev handles completion internally
-  }
+  async completeJob(_jobId: string, _output: unknown): Promise<void> {}
 
-  /**
-   * No-op for trigger.dev - failure is handled by the task runner
-   */
-  async markJobFailed(_jobId: string, _error: string): Promise<void> {
-    // No-op: trigger.dev handles failures internally
-  }
+  async markJobFailed(_jobId: string, _error: string): Promise<void> {}
 }
diff --git a/apps/sim/lib/core/async-jobs/config.ts b/apps/sim/lib/core/async-jobs/config.ts
@@ -11,25 +11,17 @@ let cachedBackendType: AsyncBackendType | null = null
 /**
  * Determines which async backend to use based on environment configuration.
  * Follows the fallback chain: trigger.dev → redis → database
- *
- * This mirrors the pattern used by:
- * - Socket.IO rooms (RedisRoomManager → MemoryRoomManager)
- * - Document processing queue (Redis → in-memory)
- * - Rate limiting (Redis → database)
  */
 export function getAsyncBackendType(): AsyncBackendType {
-  // Check trigger.dev first
   if (isTriggerDevEnabled) {
     return 'trigger-dev'
   }
 
-  // Check Redis availability
   const redis = getRedisClient()
   if (redis) {
     return 'redis'
   }
 
-  // Fall back to database
   return 'database'
 }
 
diff --git a/apps/sim/lib/core/async-jobs/index.ts b/apps/sim/lib/core/async-jobs/index.ts
@@ -14,4 +14,4 @@ export type {
   JobStatus,
   JobType,
 } from './types'
-export { JOB_RETENTION_HOURS, JOB_RETENTION_SECONDS } from './types'
+export { JOB_RETENTION_HOURS, JOB_RETENTION_SECONDS, JOB_STATUS } from './types'
diff --git a/apps/sim/lib/core/async-jobs/types.ts b/apps/sim/lib/core/async-jobs/types.ts
@@ -8,7 +8,14 @@ export const JOB_RETENTION_HOURS = 24
 /** Retention period for completed/failed jobs (in seconds, for Redis TTL) */
 export const JOB_RETENTION_SECONDS = JOB_RETENTION_HOURS * 60 * 60
 
-export type JobStatus = 'pending' | 'processing' | 'completed' | 'failed'
+export const JOB_STATUS = {
+  PENDING: 'pending',
+  PROCESSING: 'processing',
+  COMPLETED: 'completed',
+  FAILED: 'failed',
+} as const
+
+export type JobStatus = (typeof JOB_STATUS)[keyof typeof JOB_STATUS]
 
 export type JobType = 'workflow-execution' | 'schedule-execution' | 'webhook-execution'
 
diff --git a/apps/sim/lib/core/config/env.ts b/apps/sim/lib/core/config/env.ts
@@ -345,7 +345,6 @@ export const env = createEnv({
     NEXT_PUBLIC_BRAND_BACKGROUND_COLOR:    z.string().regex(/^#[0-9A-Fa-f]{6}$/).optional(),     // Brand background color (hex format)
 
     // Feature Flags
-    NEXT_PUBLIC_TRIGGER_DEV_ENABLED:       z.boolean().optional(),                   // Client-side gate for async executions UI
     NEXT_PUBLIC_SSO_ENABLED:               z.boolean().optional(),                   // Enable SSO login UI components
     NEXT_PUBLIC_CREDENTIAL_SETS_ENABLED:   z.boolean().optional(),                   // Enable credential sets (email polling) on self-hosted
     NEXT_PUBLIC_ACCESS_CONTROL_ENABLED:    z.boolean().optional(),                   // Enable access control (permission groups) on self-hosted
@@ -377,7 +376,6 @@ export const env = createEnv({
     NEXT_PUBLIC_BRAND_ACCENT_COLOR: process.env.NEXT_PUBLIC_BRAND_ACCENT_COLOR,
     NEXT_PUBLIC_BRAND_ACCENT_HOVER_COLOR: process.env.NEXT_PUBLIC_BRAND_ACCENT_HOVER_COLOR,
     NEXT_PUBLIC_BRAND_BACKGROUND_COLOR: process.env.NEXT_PUBLIC_BRAND_BACKGROUND_COLOR,
-    NEXT_PUBLIC_TRIGGER_DEV_ENABLED: process.env.NEXT_PUBLIC_TRIGGER_DEV_ENABLED,
     NEXT_PUBLIC_SSO_ENABLED: process.env.NEXT_PUBLIC_SSO_ENABLED,
     NEXT_PUBLIC_CREDENTIAL_SETS_ENABLED: process.env.NEXT_PUBLIC_CREDENTIAL_SETS_ENABLED,
     NEXT_PUBLIC_ACCESS_CONTROL_ENABLED: process.env.NEXT_PUBLIC_ACCESS_CONTROL_ENABLED,

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import { createLogger } from '@sim/logger'`
`2`	`2`	`import { type NextRequest, NextResponse } from 'next/server'`
`3`	`3`	`import { checkHybridAuth } from '@/lib/auth/hybrid'`
`4`		`-import { getJobQueue } from '@/lib/core/async-jobs'`
	`4`	`+import { getJobQueue, JOB_STATUS } from '@/lib/core/async-jobs'`
`5`	`5`	`import { generateRequestId } from '@/lib/core/utils/request'`
`6`	`6`	`import { createErrorResponse } from '@/app/api/workflows/utils'`
`7`	`7`
`@@ -48,7 +48,7 @@ export async function GET(`
`48`	`48`	`return createErrorResponse('Access denied', 403)`
`49`	`49`	`}`
`50`	`50`
`51`		`- const mappedStatus = job.status === 'pending' ? 'queued' : job.status`
	`51`	`+ const mappedStatus = job.status === JOB_STATUS.PENDING ? 'queued' : job.status`
`52`	`52`
`53`	`53`	`const response: any = {`
`54`	`54`	`success: true,`
`@@ -59,23 +59,23 @@ export async function GET(`
`59`	`59`	`},`
`60`	`60`	`}`
`61`	`61`
`62`		`- if (job.status === 'completed') {`
	`62`	`+ if (job.status === JOB_STATUS.COMPLETED) {`
`63`	`63`	`response.output = job.output`
`64`	`64`	`response.metadata.completedAt = job.completedAt`
`65`	`65`	`if (job.startedAt && job.completedAt) {`
`66`	`66`	`response.metadata.duration = job.completedAt.getTime() - job.startedAt.getTime()`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`		`- if (job.status === 'failed') {`
	`70`	`+ if (job.status === JOB_STATUS.FAILED) {`
`71`	`71`	`response.error = job.error`
`72`	`72`	`response.metadata.completedAt = job.completedAt`
`73`	`73`	`if (job.startedAt && job.completedAt) {`
`74`	`74`	`response.metadata.duration = job.completedAt.getTime() - job.startedAt.getTime()`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`78`		`- if (job.status === 'processing' \|\| job.status === 'pending') {`
	`78`	`+ if (job.status === JOB_STATUS.PROCESSING \|\| job.status === JOB_STATUS.PENDING) {`
`79`	`79`	`response.estimatedDuration = 180000`
`80`	`80`	`}`
`81`	`81`