Skip to content

Commit 6a0db71

Browse files
committed
improvement(codebase): apply @sim/utils conventions to staging-introduced files
1 parent 3bcf71b commit 6a0db71

File tree

6 files changed

+16
-35
lines changed

6 files changed

+16
-35
lines changed

apps/sim/app/api/v1/admin/outbox/[id]/requeue/route.ts

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { db } from '@sim/db'
22
import { outboxEvent } from '@sim/db/schema'
33
import { createLogger } from '@sim/logger'
4+
import { toError } from '@sim/utils/errors'
45
import { and, eq } from 'drizzle-orm'
56
import { NextResponse } from 'next/server'
67
import { withAdminAuthParams } from '@/app/api/v1/admin/middleware'
@@ -56,16 +57,7 @@ export const POST = withAdminAuthParams<{ id: string }>(async (_request, { param
5657
requeued: result[0],
5758
})
5859
} catch (error) {
59-
logger.error('Failed to requeue outbox event', {
60-
eventId: id,
61-
error: error instanceof Error ? error.message : error,
62-
})
63-
return NextResponse.json(
64-
{
65-
success: false,
66-
error: error instanceof Error ? error.message : 'Unknown error',
67-
},
68-
{ status: 500 }
69-
)
60+
logger.error('Failed to requeue outbox event', { eventId: id, error: toError(error).message })
61+
return NextResponse.json({ success: false, error: toError(error).message }, { status: 500 })
7062
}
7163
})

apps/sim/app/api/v1/admin/outbox/route.ts

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { db } from '@sim/db'
22
import { outboxEvent } from '@sim/db/schema'
33
import { createLogger } from '@sim/logger'
4+
import { toError } from '@sim/utils/errors'
45
import { and, desc, eq, sql } from 'drizzle-orm'
56
import { type NextRequest, NextResponse } from 'next/server'
67
import { withAdminAuth } from '@/app/api/v1/admin/middleware'
@@ -77,15 +78,7 @@ export const GET = withAdminAuth(async (request: NextRequest) => {
7778
counts,
7879
})
7980
} catch (error) {
80-
logger.error('Failed to list outbox events', {
81-
error: error instanceof Error ? error.message : error,
82-
})
83-
return NextResponse.json(
84-
{
85-
success: false,
86-
error: error instanceof Error ? error.message : 'Unknown error',
87-
},
88-
{ status: 500 }
89-
)
81+
logger.error('Failed to list outbox events', { error: toError(error).message })
82+
return NextResponse.json({ success: false, error: toError(error).message }, { status: 500 })
9083
}
9184
})

apps/sim/app/api/webhooks/outbox/process/route.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { createLogger } from '@sim/logger'
2+
import { toError } from '@sim/utils/errors'
23
import { type NextRequest, NextResponse } from 'next/server'
34
import { verifyCronAuth } from '@/lib/auth/internal'
45
import { billingOutboxHandlers } from '@/lib/billing/webhooks/outbox-handlers'
@@ -33,16 +34,9 @@ export async function GET(request: NextRequest) {
3334
result,
3435
})
3536
} catch (error) {
36-
logger.error('Outbox processing failed', {
37-
requestId,
38-
error: error instanceof Error ? error.message : error,
39-
})
37+
logger.error('Outbox processing failed', { requestId, error: toError(error).message })
4038
return NextResponse.json(
41-
{
42-
success: false,
43-
requestId,
44-
error: error instanceof Error ? error.message : 'Unknown error',
45-
},
39+
{ success: false, requestId, error: toError(error).message },
4640
{ status: 500 }
4741
)
4842
}

apps/sim/executor/handlers/agent/agent-handler.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { db } from '@sim/db'
22
import { mcpServers } from '@sim/db/schema'
33
import { createLogger } from '@sim/logger'
44
import { toError } from '@sim/utils/errors'
5+
import { sleep } from '@sim/utils/helpers'
56
import { and, eq, inArray, isNull } from 'drizzle-orm'
67
import { createMcpToolId } from '@/lib/mcp/utils'
78
import { getCustomToolById } from '@/lib/workflows/custom-tools/operations'
@@ -456,7 +457,7 @@ export class AgentBlockHandler implements BlockHandler {
456457
logger.warn(
457458
`[AgentHandler] Session error discovering tools from ${serverId}, retrying (attempt ${attempt + 1})`
458459
)
459-
await new Promise((r) => setTimeout(r, 100))
460+
await sleep(100)
460461
continue
461462
}
462463
throw new Error(`Failed to discover tools: ${response.status} ${errorText}`)
@@ -475,7 +476,7 @@ export class AgentBlockHandler implements BlockHandler {
475476
`[AgentHandler] Retryable error discovering tools from ${serverId} (attempt ${attempt + 1}):`,
476477
error
477478
)
478-
await new Promise((r) => setTimeout(r, 100))
479+
await sleep(100)
479480
continue
480481
}
481482
throw error

apps/sim/lib/core/outbox/service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { db } from '@sim/db'
22
import { outboxEvent } from '@sim/db/schema'
33
import { createLogger } from '@sim/logger'
4+
import { toError } from '@sim/utils/errors'
45
import { generateId } from '@sim/utils/id'
56
import { and, asc, eq, inArray, lte } from 'drizzle-orm'
67

@@ -250,7 +251,7 @@ async function runHandler(
250251
} catch (error) {
251252
const nextAttempts = event.attempts + 1
252253
const isDead = nextAttempts >= event.maxAttempts
253-
const errMsg = error instanceof Error ? error.message : String(error)
254+
const errMsg = toError(error).message
254255

255256
if (isDead) {
256257
const updated = await updateIfLeaseHeld(event, {

apps/sim/lib/table/__tests__/update-row.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
*/
44
import { databaseMock } from '@sim/testing'
55
import { beforeEach, describe, expect, it, vi } from 'vitest'
6-
import { updateRow } from '../service'
7-
import type { TableDefinition } from '../types'
6+
import { updateRow } from '@/lib/table/service'
7+
import type { TableDefinition } from '@/lib/table/types'
88

99
const EXISTING_ROW = {
1010
id: 'row-1',

0 commit comments

Comments
 (0)