Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions src/queue/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
* Only loaded when REDIS_URL is set (production dashboard container).
*/

import { type ConnectionOptions, Queue } from 'bullmq';
import { Queue } from 'bullmq';
import { parseRedisUrl } from '../utils/redis.js';

// ── Job types ────────────────────────────────────────────────────────────────

Expand Down Expand Up @@ -41,15 +42,6 @@ export type DashboardJob = ManualRunJob | RetryRunJob | DebugAnalysisJob;

const QUEUE_NAME = 'cascade-dashboard-jobs';

function parseRedisUrl(url: string): ConnectionOptions {
const parsed = new URL(url);
return {
host: parsed.hostname,
port: Number(parsed.port) || 6379,
password: parsed.password || undefined,
};
}

let queue: Queue<DashboardJob> | null = null;

function getQueue(): Queue<DashboardJob> {
Expand Down
65 changes: 65 additions & 0 deletions src/router/bullmq-workers.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
/**
* BullMQ worker factory for CASCADE queue consumers.
*
* Provides a `createQueueWorker` factory that de-duplicates the event handler
* boilerplate shared across all queue workers (completed/failed/error logging
* and Sentry capture).
*/

import { type ConnectionOptions, type Job, Worker } from 'bullmq';
import { captureException } from '../sentry.js';
import { parseRedisUrl } from '../utils/redis.js';

// Re-export so existing callers (worker-manager.ts) don't need to change imports.
export { parseRedisUrl };

export interface QueueWorkerConfig<T = unknown> {
queueName: string;
/** Human-readable label used in log messages and Sentry tags */
label: string;
connection: ConnectionOptions;
concurrency: number;
lockDuration: number;
processFn: (job: Job<T>) => Promise<void>;
}

/**
* Factory that creates a BullMQ Worker with standard event handlers.
*
* All cascade queue workers share the same completed/failed/error handling
* pattern — this factory de-duplicates that boilerplate while keeping
* per-queue differences (name, label, processFn) configurable.
*/
export function createQueueWorker<T = unknown>(config: QueueWorkerConfig<T>): Worker<T> {
const { queueName, label, connection, concurrency, lockDuration, processFn } = config;

const worker = new Worker<T>(queueName, processFn, {
connection,
concurrency,
lockDuration,
});

worker.on('completed', (job) => {
console.log(`[WorkerManager] ${label} dispatched:`, { jobId: job.id });
});

worker.on('failed', (job, err) => {
console.error(`[WorkerManager] ${label} failed to dispatch:`, {
jobId: job?.id,
error: String(err),
});
captureException(err, {
tags: { source: 'bullmq_dispatch', queue: queueName },
extra: { jobId: job?.id },
});
});

worker.on('error', (err) => {
console.error(`[WorkerManager] ${label} worker error:`, err);
captureException(err, {
tags: { source: 'bullmq_error', queue: queueName },
});
});

return worker;
}
Loading