-
Notifications
You must be signed in to change notification settings - Fork 3.4k
fix: add pagination to GET /api/workflows to prevent OOM on large workspaces #3578
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| import { db } from '@sim/db' | ||
| import { permissions, workflow, workflowFolder } from '@sim/db/schema' | ||
| import { createLogger } from '@sim/logger' | ||
| import { and, asc, eq, inArray, isNull, min } from 'drizzle-orm' | ||
| import { and, asc, eq, gt, gte, inArray, isNull, lt, min, or } from 'drizzle-orm' | ||
| import { type NextRequest, NextResponse } from 'next/server' | ||
| import { z } from 'zod' | ||
| import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log' | ||
|
|
@@ -27,6 +27,9 @@ export async function GET(request: NextRequest) { | |
| const startTime = Date.now() | ||
| const url = new URL(request.url) | ||
| const workspaceId = url.searchParams.get('workspaceId') | ||
| const cursor = url.searchParams.get('cursor') | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
The The To properly implement cursor-based offset, the WHERE clause needs to be extended, e.g.: // In the workspaceId branch
.where(
cursor
? and(eq(workflow.workspaceId, workspaceId), gt(workflow.id, cursor))
: eq(workflow.workspaceId, workspaceId)
)Note also that using |
||
| const limitParam = url.searchParams.get('limit') | ||
| const limit = Math.min(Math.max(parseInt(limitParam || '100', 10) || 100, 1), 500) | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Silent data truncation for callers expecting all workflowsHigh Severity The new default |
||
|
|
||
| try { | ||
| const auth = await checkSessionOrInternalAuth(request, { requireWorkflowId: false }) | ||
|
|
@@ -66,12 +69,48 @@ export async function GET(request: NextRequest) { | |
|
|
||
| const orderByClause = [asc(workflow.sortOrder), asc(workflow.createdAt), asc(workflow.id)] | ||
|
|
||
| // Fetch limit+1 to detect if there are more pages | ||
| const fetchLimit = limit + 1 | ||
|
|
||
| // Build cursor condition for keyset pagination | ||
| // Cursor is base64-encoded JSON: { s: sortOrder, c: createdAt, i: id } | ||
| let cursorCondition = null | ||
| if (cursor) { | ||
| try { | ||
| const decoded = JSON.parse(Buffer.from(cursor, 'base64').toString()) | ||
| const cursorSortOrder = decoded.s | ||
| const cursorCreatedAt = new Date(decoded.c) | ||
| const cursorId = decoded.i | ||
| // Keyset pagination for ORDER BY sortOrder ASC, createdAt ASC, id ASC: | ||
| // (sortOrder > cursorSortOrder) OR | ||
| // (sortOrder = cursorSortOrder AND createdAt > cursorCreatedAt) OR | ||
| // (sortOrder = cursorSortOrder AND createdAt = cursorCreatedAt AND id > cursorId) | ||
| cursorCondition = or( | ||
| gt(workflow.sortOrder, cursorSortOrder), | ||
| and( | ||
| eq(workflow.sortOrder, cursorSortOrder), | ||
| or( | ||
| gt(workflow.createdAt, cursorCreatedAt), | ||
| and(eq(workflow.createdAt, cursorCreatedAt), gt(workflow.id, cursorId)) | ||
| ) | ||
| ) | ||
| ) | ||
| } catch { | ||
| // Invalid cursor - ignore and return first page | ||
| } | ||
| } | ||
|
|
||
| if (workspaceId) { | ||
| const whereClause = cursorCondition | ||
| ? and(eq(workflow.workspaceId, workspaceId), cursorCondition) | ||
| : eq(workflow.workspaceId, workspaceId) | ||
|
|
||
| workflows = await db | ||
| .select() | ||
| .from(workflow) | ||
| .where(eq(workflow.workspaceId, workspaceId)) | ||
| .where(whereClause) | ||
| .orderBy(...orderByClause) | ||
| .limit(fetchLimit) | ||
| } else { | ||
| const workspacePermissionRows = await db | ||
| .select({ workspaceId: permissions.entityId }) | ||
|
|
@@ -81,14 +120,30 @@ export async function GET(request: NextRequest) { | |
| if (workspaceIds.length === 0) { | ||
| return NextResponse.json({ data: [] }, { status: 200 }) | ||
| } | ||
| const whereClause = cursorCondition | ||
| ? and(inArray(workflow.workspaceId, workspaceIds), cursorCondition) | ||
| : inArray(workflow.workspaceId, workspaceIds) | ||
|
|
||
| workflows = await db | ||
| .select() | ||
| .from(workflow) | ||
| .where(inArray(workflow.workspaceId, workspaceIds)) | ||
| .where(whereClause) | ||
| .orderBy(...orderByClause) | ||
| .limit(fetchLimit) | ||
| } | ||
|
|
||
| // Determine if there are more results and compute next cursor | ||
| const hasMore = workflows.length > limit | ||
| const data = hasMore ? workflows.slice(0, limit) : workflows | ||
| let nextCursor = null | ||
| if (hasMore && data.length > 0) { | ||
| const last = data[data.length - 1] | ||
| nextCursor = Buffer.from( | ||
| JSON.stringify({ s: last.sortOrder, c: last.createdAt, i: last.id }) | ||
| ).toString('base64') | ||
| } | ||
|
|
||
| return NextResponse.json({ data: workflows }, { status: 200 }) | ||
| return NextResponse.json({ data, nextCursor }, { status: 200 }) | ||
| } catch (error: any) { | ||
| const elapsed = Date.now() - startTime | ||
| logger.error(`[${requestId}] Workflow fetch error after ${elapsed}ms`, error) | ||
|
|
||


Uh oh!
There was an error while loading. Please reload this page.