From 9fb3ef6f6d0d7fff6d9aa59a0dc2407ad8e4eb3f Mon Sep 17 00:00:00 2001 From: Mohamed Bassem Date: Sat, 12 Jul 2025 13:06:46 +0000 Subject: fix: Prioritize crawling user added links over bulk imports. fixes #1717 --- packages/trpc/routers/bookmarks.ts | 67 ++++++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 20 deletions(-) (limited to 'packages/trpc/routers/bookmarks.ts') diff --git a/packages/trpc/routers/bookmarks.ts b/packages/trpc/routers/bookmarks.ts index 77f40878..b6acadd6 100644 --- a/packages/trpc/routers/bookmarks.ts +++ b/packages/trpc/routers/bookmarks.ts @@ -1,5 +1,6 @@ import { experimental_trpcMiddleware, TRPCError } from "@trpc/server"; import { and, count, eq, gt, inArray, lt, or } from "drizzle-orm"; +import { EnqueueOptions } from "liteque"; import invariant from "tiny-invariant"; import { z } from "zod"; @@ -32,8 +33,8 @@ import { AssetPreprocessingQueue, LinkCrawlerQueue, OpenAIQueue, + SearchIndexingQueue, triggerRuleEngineOnEvent, - triggerSearchDeletion, triggerSearchReindex, triggerWebhook, } from "@karakeep/shared/queues"; @@ -420,37 +421,60 @@ export const bookmarksAppRouter = router({ }; }); + const enqueueOpts: EnqueueOptions = { + // The lower the priority number, the sooner the job will be processed + priority: input.crawlPriority === "low" ? 50 : 0, + }; + // Enqueue crawling request switch (bookmark.content.type) { case BookmarkTypes.LINK: { // The crawling job triggers openai when it's done - await LinkCrawlerQueue.enqueue({ - bookmarkId: bookmark.id, - }); + await LinkCrawlerQueue.enqueue( + { + bookmarkId: bookmark.id, + }, + enqueueOpts, + ); break; } case BookmarkTypes.TEXT: { - await OpenAIQueue.enqueue({ - bookmarkId: bookmark.id, - type: "tag", - }); + await OpenAIQueue.enqueue( + { + bookmarkId: bookmark.id, + type: "tag", + }, + enqueueOpts, + ); break; } case BookmarkTypes.ASSET: { - await AssetPreprocessingQueue.enqueue({ - bookmarkId: bookmark.id, - fixMode: false, - }); + await AssetPreprocessingQueue.enqueue( + { + bookmarkId: bookmark.id, + fixMode: false, + }, + enqueueOpts, + ); break; } } - await triggerRuleEngineOnEvent(bookmark.id, [ - { - type: "bookmarkAdded", - }, - ]); - await triggerSearchReindex(bookmark.id); - await triggerWebhook(bookmark.id, "created"); + await triggerRuleEngineOnEvent( + bookmark.id, + [ + { + type: "bookmarkAdded", + }, + ], + enqueueOpts, + ); + await triggerSearchReindex(bookmark.id, enqueueOpts); + await triggerWebhook( + bookmark.id, + "created", + /* userId */ undefined, + enqueueOpts, + ); return bookmark; }), @@ -671,7 +695,10 @@ export const bookmarksAppRouter = router({ eq(bookmarks.id, input.bookmarkId), ), ); - await triggerSearchDeletion(input.bookmarkId); + await SearchIndexingQueue.enqueue({ + bookmarkId: input.bookmarkId, + type: "delete", + }); await triggerWebhook(input.bookmarkId, "deleted", ctx.user.id); if (deleted.changes > 0 && bookmark) { await cleanupAssetForBookmark({ -- cgit v1.2.3-70-g09d2