aboutsummaryrefslogtreecommitdiffstats
path: root/packages/trpc
diff options
context:
space:
mode:
authorMohamed Bassem <me@mbassem.com>2025-09-14 18:16:40 +0000
committerMohamed Bassem <me@mbassem.com>2025-09-14 18:16:57 +0000
commit8d32055485858210252096483bb20533dc8bdf60 (patch)
treece8a1373411d1ce40aa0dbe6c37e707f0dbf4c98 /packages/trpc
parent6ba61b46154e076fca47d3841b158105dbeeef80 (diff)
downloadkarakeep-8d32055485858210252096483bb20533dc8bdf60.tar.zst
refactor: Move callsites to liteque to be behind a plugin
Diffstat (limited to 'packages/trpc')
-rw-r--r--packages/trpc/lib/__tests__/ruleEngine.test.ts4
-rw-r--r--packages/trpc/lib/ruleEngine.ts2
-rw-r--r--packages/trpc/models/lists.ts2
-rw-r--r--packages/trpc/models/tags.ts2
-rw-r--r--packages/trpc/package.json1
-rw-r--r--packages/trpc/routers/admin.ts2
-rw-r--r--packages/trpc/routers/bookmarks.ts20
-rw-r--r--packages/trpc/routers/feeds.ts2
-rw-r--r--packages/trpc/stats.ts2
-rw-r--r--packages/trpc/testUtils.ts33
-rw-r--r--packages/trpc/vitest.config.ts4
11 files changed, 37 insertions, 37 deletions
diff --git a/packages/trpc/lib/__tests__/ruleEngine.test.ts b/packages/trpc/lib/__tests__/ruleEngine.test.ts
index cbb4b978..a108ede7 100644
--- a/packages/trpc/lib/__tests__/ruleEngine.test.ts
+++ b/packages/trpc/lib/__tests__/ruleEngine.test.ts
@@ -15,7 +15,7 @@ import {
tagsOnBookmarks,
users,
} from "@karakeep/db/schema";
-import { LinkCrawlerQueue } from "@karakeep/shared/queues";
+import { LinkCrawlerQueue } from "@karakeep/shared-server";
import { BookmarkTypes } from "@karakeep/shared/types/bookmarks";
import {
RuleEngineAction,
@@ -29,7 +29,7 @@ import { TestDB } from "../../testUtils";
import { RuleEngine } from "../ruleEngine";
// Mock the queue
-vi.mock("@karakeep/shared/queues", () => ({
+vi.mock("@karakeep/shared-server", () => ({
LinkCrawlerQueue: {
enqueue: vi.fn(),
},
diff --git a/packages/trpc/lib/ruleEngine.ts b/packages/trpc/lib/ruleEngine.ts
index 0bef8cdc..2d5deae6 100644
--- a/packages/trpc/lib/ruleEngine.ts
+++ b/packages/trpc/lib/ruleEngine.ts
@@ -2,7 +2,7 @@ import deepEql from "deep-equal";
import { and, eq } from "drizzle-orm";
import { bookmarks, tagsOnBookmarks } from "@karakeep/db/schema";
-import { LinkCrawlerQueue } from "@karakeep/shared/queues";
+import { LinkCrawlerQueue } from "@karakeep/shared-server";
import {
RuleEngineAction,
RuleEngineCondition,
diff --git a/packages/trpc/models/lists.ts b/packages/trpc/models/lists.ts
index 39d78ac1..c0e17bfc 100644
--- a/packages/trpc/models/lists.ts
+++ b/packages/trpc/models/lists.ts
@@ -6,7 +6,7 @@ import { z } from "zod";
import { SqliteError } from "@karakeep/db";
import { bookmarkLists, bookmarksInLists } from "@karakeep/db/schema";
-import { triggerRuleEngineOnEvent } from "@karakeep/shared/queues";
+import { triggerRuleEngineOnEvent } from "@karakeep/shared-server";
import { parseSearchQuery } from "@karakeep/shared/searchQueryParser";
import { ZSortOrder } from "@karakeep/shared/types/bookmarks";
import {
diff --git a/packages/trpc/models/tags.ts b/packages/trpc/models/tags.ts
index 79cd855b..a91dcbdf 100644
--- a/packages/trpc/models/tags.ts
+++ b/packages/trpc/models/tags.ts
@@ -5,7 +5,7 @@ import { z } from "zod";
import type { ZAttachedByEnum } from "@karakeep/shared/types/tags";
import { SqliteError } from "@karakeep/db";
import { bookmarkTags, tagsOnBookmarks } from "@karakeep/db/schema";
-import { triggerSearchReindex } from "@karakeep/shared/queues";
+import { triggerSearchReindex } from "@karakeep/shared-server";
import {
zCreateTagRequestSchema,
zGetTagResponseSchema,
diff --git a/packages/trpc/package.json b/packages/trpc/package.json
index c4e16675..d1896a0b 100644
--- a/packages/trpc/package.json
+++ b/packages/trpc/package.json
@@ -20,7 +20,6 @@
"bcryptjs": "^2.4.3",
"deep-equal": "^2.2.3",
"drizzle-orm": "^0.44.2",
- "liteque": "^0.6.0",
"nodemailer": "^7.0.4",
"prom-client": "^15.1.3",
"stripe": "^18.3.0",
diff --git a/packages/trpc/routers/admin.ts b/packages/trpc/routers/admin.ts
index e005c3dd..25425eaf 100644
--- a/packages/trpc/routers/admin.ts
+++ b/packages/trpc/routers/admin.ts
@@ -13,7 +13,7 @@ import {
triggerSearchReindex,
VideoWorkerQueue,
WebhookQueue,
-} from "@karakeep/shared/queues";
+} from "@karakeep/shared-server";
import { getSearchClient } from "@karakeep/shared/search";
import {
resetPasswordSchema,
diff --git a/packages/trpc/routers/bookmarks.ts b/packages/trpc/routers/bookmarks.ts
index efd295f7..3399bf19 100644
--- a/packages/trpc/routers/bookmarks.ts
+++ b/packages/trpc/routers/bookmarks.ts
@@ -1,6 +1,5 @@
import { experimental_trpcMiddleware, TRPCError } from "@trpc/server";
import { and, eq, gt, inArray, lt, or } from "drizzle-orm";
-import { EnqueueOptions } from "liteque";
import invariant from "tiny-invariant";
import { z } from "zod";
@@ -21,23 +20,24 @@ import {
customPrompts,
tagsOnBookmarks,
} from "@karakeep/db/schema";
-import { QuotaService } from "@karakeep/shared-server";
-import {
- deleteAsset,
- SUPPORTED_BOOKMARK_ASSET_TYPES,
-} from "@karakeep/shared/assetdb";
-import serverConfig from "@karakeep/shared/config";
-import { InferenceClientFactory } from "@karakeep/shared/inference";
-import { buildSummaryPrompt } from "@karakeep/shared/prompts";
import {
AssetPreprocessingQueue,
LinkCrawlerQueue,
OpenAIQueue,
+ QuotaService,
SearchIndexingQueue,
triggerRuleEngineOnEvent,
triggerSearchReindex,
triggerWebhook,
-} from "@karakeep/shared/queues";
+} from "@karakeep/shared-server";
+import {
+ deleteAsset,
+ SUPPORTED_BOOKMARK_ASSET_TYPES,
+} from "@karakeep/shared/assetdb";
+import serverConfig from "@karakeep/shared/config";
+import { InferenceClientFactory } from "@karakeep/shared/inference";
+import { buildSummaryPrompt } from "@karakeep/shared/prompts";
+import { EnqueueOptions } from "@karakeep/shared/queueing";
import { FilterQuery, getSearchClient } from "@karakeep/shared/search";
import { parseSearchQuery } from "@karakeep/shared/searchQueryParser";
import {
diff --git a/packages/trpc/routers/feeds.ts b/packages/trpc/routers/feeds.ts
index 27eefdf1..57c88084 100644
--- a/packages/trpc/routers/feeds.ts
+++ b/packages/trpc/routers/feeds.ts
@@ -1,6 +1,6 @@
import { z } from "zod";
-import { FeedQueue } from "@karakeep/shared/queues";
+import { FeedQueue } from "@karakeep/shared-server";
import {
zFeedSchema,
zNewFeedSchema,
diff --git a/packages/trpc/stats.ts b/packages/trpc/stats.ts
index 9aef42ef..c6d5c94c 100644
--- a/packages/trpc/stats.ts
+++ b/packages/trpc/stats.ts
@@ -13,7 +13,7 @@ import {
TidyAssetsQueue,
VideoWorkerQueue,
WebhookQueue,
-} from "@karakeep/shared/queues";
+} from "@karakeep/shared-server";
// Queue metrics
const queuePendingJobsGauge = new Gauge({
diff --git a/packages/trpc/testUtils.ts b/packages/trpc/testUtils.ts
index 1cc4e727..b8fe3c30 100644
--- a/packages/trpc/testUtils.ts
+++ b/packages/trpc/testUtils.ts
@@ -77,20 +77,25 @@ export async function buildTestContext(
export function defaultBeforeEach(seedDB = true) {
return async (context: object) => {
- vi.mock("@karakeep/shared/queues", () => ({
- LinkCrawlerQueue: {
- enqueue: vi.fn(),
- },
- OpenAIQueue: {
- enqueue: vi.fn(),
- },
- SearchIndexingQueue: {
- enqueue: vi.fn(),
- },
- triggerRuleEngineOnEvent: vi.fn(),
- triggerSearchReindex: vi.fn(),
- triggerWebhook: vi.fn(),
- }));
+ vi.mock("@karakeep/shared-server", async (original) => {
+ const mod =
+ (await original()) as typeof import("@karakeep/shared-server");
+ return {
+ ...mod,
+ LinkCrawlerQueue: {
+ enqueue: vi.fn(),
+ },
+ OpenAIQueue: {
+ enqueue: vi.fn(),
+ },
+ SearchIndexingQueue: {
+ enqueue: vi.fn(),
+ },
+ triggerRuleEngineOnEvent: vi.fn(),
+ triggerSearchReindex: vi.fn(),
+ triggerWebhook: vi.fn(),
+ };
+ });
Object.assign(context, await buildTestContext(seedDB));
};
}
diff --git a/packages/trpc/vitest.config.ts b/packages/trpc/vitest.config.ts
index 5af4ad16..41fd70c4 100644
--- a/packages/trpc/vitest.config.ts
+++ b/packages/trpc/vitest.config.ts
@@ -10,9 +10,5 @@ export default defineConfig({
alias: {
"@/*": "./*",
},
- deps: {
- // TODO: this need to be fixed
- inline: ["liteque"],
- },
},
});