refactor: sim

Author: emir-karabeg

apps/sim/app/api/schedules/execute/route.ts

@@ -10,6 +10,7 @@ import { getPersonalAndWorkspaceEnv } from '@/lib/environment/utils'
 import { createLogger } from '@/lib/logs/console/logger'
 import { LoggingSession } from '@/lib/logs/execution/logging-session'
 import { buildTraceSpans } from '@/lib/logs/execution/trace-spans/trace-spans'
+import { RateLimiter } from '@/lib/queue'
 import {
   type BlockState,
   calculateNextRunTime as calculateNextTime,
@@ -21,7 +22,6 @@ import { loadDeployedWorkflowState } from '@/lib/workflows/db-helpers'
 import { updateWorkflowRunCounts } from '@/lib/workflows/utils'
 import { Executor } from '@/executor'
 import { Serializer } from '@/serializer'
-import { RateLimiter } from '@/services/queue'
 import { mergeSubblockState } from '@/stores/workflows/server-utils'
 
 export const dynamic = 'force-dynamic'

apps/sim/app/api/users/me/usage-limits/route.ts

@@ -4,8 +4,8 @@ import { checkServerSideUsageLimits } from '@/lib/billing'
 import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription'
 import { getEffectiveCurrentPeriodCost } from '@/lib/billing/core/usage'
 import { createLogger } from '@/lib/logs/console/logger'
+import { RateLimiter } from '@/lib/queue'
 import { createErrorResponse } from '@/app/api/workflows/utils'
-import { RateLimiter } from '@/services/queue'
 
 const logger = createLogger('UsageLimitsAPI')
 

apps/sim/app/api/v1/logs/meta.ts

@@ -1,7 +1,7 @@
 import { checkServerSideUsageLimits } from '@/lib/billing'
 import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription'
 import { getEffectiveCurrentPeriodCost } from '@/lib/billing/core/usage'
-import { RateLimiter } from '@/services/queue'
+import { RateLimiter } from '@/lib/queue'
 
 export interface UserLimits {
   workflowExecutionRateLimit: {

apps/sim/app/api/v1/middleware.ts

@@ -1,7 +1,7 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription'
 import { createLogger } from '@/lib/logs/console/logger'
-import { RateLimiter } from '@/services/queue/RateLimiter'
+import { RateLimiter } from '@/lib/queue/RateLimiter'
 import { authenticateV1Request } from './auth'
 
 const logger = createLogger('V1Middleware')

apps/sim/app/api/workflows/[id]/execute/route.ts

@@ -12,6 +12,7 @@ import { getPersonalAndWorkspaceEnv } from '@/lib/environment/utils'
 import { createLogger } from '@/lib/logs/console/logger'
 import { LoggingSession } from '@/lib/logs/execution/logging-session'
 import { buildTraceSpans } from '@/lib/logs/execution/trace-spans/trace-spans'
+import { RateLimitError, RateLimiter, type TriggerType } from '@/lib/queue'
 import { decryptSecret, generateRequestId } from '@/lib/utils'
 import { loadDeployedWorkflowState } from '@/lib/workflows/db-helpers'
 import { TriggerUtils } from '@/lib/workflows/triggers'
@@ -24,7 +25,6 @@ import { validateWorkflowAccess } from '@/app/api/workflows/middleware'
 import { createErrorResponse, createSuccessResponse } from '@/app/api/workflows/utils'
 import { Executor } from '@/executor'
 import { Serializer } from '@/serializer'
-import { RateLimitError, RateLimiter, type TriggerType } from '@/services/queue'
 import { mergeSubblockState } from '@/stores/workflows/server-utils'
 
 const logger = createLogger('WorkflowExecuteAPI')

apps/sim/app/layout.tsx

@@ -7,7 +7,7 @@ import { generateThemeCSS } from '@/lib/branding/inject-theme'
 import { generateBrandedMetadata, generateStructuredData } from '@/lib/branding/metadata'
 import { isHosted } from '@/lib/environment'
 import { createLogger } from '@/lib/logs/console/logger'
-import '@/app/globals.css'
+import './styles/globals.css'
 
 import { ConditionalThemeProvider } from '@/components/theme-provider/conditional-theme-provider'
 import { ZoomPrevention } from '@/components/zoom-prevention/zoom-prevention'

apps/sim/app/workspace/[workspaceId]/layout.tsx

@@ -1,9 +1,9 @@
 'use client'
 
 import { useSession } from '@/lib/auth-client'
+import { SocketProvider } from '@/lib/contexts/socket-context'
 import Providers from '@/app/workspace/[workspaceId]/providers/providers'
 import { Sidebar } from '@/app/workspace/[workspaceId]/w/components/sidebar/sidebar'
-import { SocketProvider } from '@/contexts/socket-context'
 
 interface WorkspaceLayoutProps {
   children: React.ReactNode

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-presence.ts

@@ -1,7 +1,7 @@
 'use client'
 
 import { useMemo } from 'react'
-import { useSocket } from '@/contexts/socket-context'
+import { useSocket } from '@/lib/contexts/socket-context'
 
 // Socket presence user from server
 interface SocketPresenceUser {

apps/sim/hooks/use-collaborative-workflow.ts

@@ -1,10 +1,10 @@
 import { useCallback, useEffect, useRef } from 'react'
 import type { Edge } from 'reactflow'
 import { useSession } from '@/lib/auth-client'
+import { useSocket } from '@/lib/contexts/socket-context'
 import { createLogger } from '@/lib/logs/console/logger'
 import { getBlock } from '@/blocks'
 import { resolveOutputType } from '@/blocks/utils'
-import { useSocket } from '@/contexts/socket-context'
 import { useUndoRedo } from '@/hooks/use-undo-redo'
 import { registerEmitFunctions, useOperationQueue } from '@/stores/operation-queue/store'
 import { useVariablesStore } from '@/stores/panel/variables/store'

apps/sim/instrumentation.ts

@@ -7,7 +7,7 @@ export async function register() {
   // Load Node.js-specific instrumentation
   if (process.env.NEXT_RUNTIME === 'nodejs') {
     console.log('[Main Instrumentation] Loading Node.js instrumentation...')
-    const nodeInstrumentation = await import('./instrumentation/node')
+    const nodeInstrumentation = await import('./lib/instrumentation/node')
     if (nodeInstrumentation.register) {
       console.log('[Main Instrumentation] Calling Node.js register()...')
       await nodeInstrumentation.register()
@@ -17,7 +17,7 @@ export async function register() {
   // Load Edge Runtime-specific instrumentation
   if (process.env.NEXT_RUNTIME === 'edge') {
     console.log('[Main Instrumentation] Loading Edge Runtime instrumentation...')
-    const edgeInstrumentation = await import('./instrumentation/edge')
+    const edgeInstrumentation = await import('./lib/instrumentation/edge')
     if (edgeInstrumentation.register) {
       console.log('[Main Instrumentation] Calling Edge Runtime register()...')
       await edgeInstrumentation.register()
@@ -27,6 +27,6 @@ export async function register() {
   // Load client instrumentation if we're on the client
   if (typeof window !== 'undefined') {
     console.log('[Main Instrumentation] Loading client instrumentation...')
-    await import('./instrumentation/client')
+    await import('./lib/instrumentation/client')
   }
 }