From 9edd154440c18bcc4542560e229eb293f9e0c2d4 Mon Sep 17 00:00:00 2001 From: Mohamed Bassem Date: Sun, 21 Jul 2024 19:18:58 +0100 Subject: refactor: Replace the usage of bullMQ with the hoarder sqlite-based queue (#309) --- apps/workers/searchWorker.ts | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'apps/workers/searchWorker.ts') diff --git a/apps/workers/searchWorker.ts b/apps/workers/searchWorker.ts index 75c057c6..56c2aac4 100644 --- a/apps/workers/searchWorker.ts +++ b/apps/workers/searchWorker.ts @@ -1,13 +1,11 @@ -import type { Job } from "bullmq"; -import { Worker } from "bullmq"; import { eq } from "drizzle-orm"; import type { ZSearchIndexingRequest } from "@hoarder/shared/queues"; import { db } from "@hoarder/db"; import { bookmarks } from "@hoarder/db/schema"; +import { DequeuedJob, Runner } from "@hoarder/queue"; import logger from "@hoarder/shared/logger"; import { - queueConnectionDetails, SearchIndexingQueue, zSearchIndexingRequestSchema, } from "@hoarder/shared/queues"; @@ -16,25 +14,28 @@ import { getSearchIdxClient } from "@hoarder/shared/search"; export class SearchIndexingWorker { static build() { logger.info("Starting search indexing worker ..."); - const worker = new Worker( - SearchIndexingQueue.name, - runSearchIndexing, + const worker = new Runner( + SearchIndexingQueue, { - connection: queueConnectionDetails, - autorun: false, + run: runSearchIndexing, + onComplete: (job) => { + const jobId = job?.id ?? "unknown"; + logger.info(`[search][${jobId}] Completed successfully`); + return Promise.resolve(); + }, + onError: (job) => { + const jobId = job?.id ?? "unknown"; + logger.error(`[search][${jobId}] search job failed: ${job.error}`); + return Promise.resolve(); + }, + }, + { + concurrency: 1, + pollIntervalMs: 1000, + timeoutSecs: 30, }, ); - worker.on("completed", (job) => { - const jobId = job?.id ?? "unknown"; - logger.info(`[search][${jobId}] Completed successfully`); - }); - - worker.on("failed", (job, error) => { - const jobId = job?.id ?? "unknown"; - logger.error(`[search][${jobId}] search job failed: ${error}`); - }); - return worker; } } @@ -112,7 +113,7 @@ async function runDelete( await ensureTaskSuccess(searchClient, task.taskUid); } -async function runSearchIndexing(job: Job) { +async function runSearchIndexing(job: DequeuedJob) { const jobId = job.id ?? "unknown"; const request = zSearchIndexingRequestSchema.safeParse(job.data); -- cgit v1.2.3-70-g09d2