refactor: Extract meilisearch as a plugin

6 files changed, 52 insertions, 63 deletions

diff --git a/apps/web/app/dashboard/layout.tsx b/apps/web/app/dashboard/layout.tsx
index 670286ea..1471bfde 100644
--- a/apps/web/app/dashboard/layout.tsx
+++ b/apps/web/app/dashboard/layout.tsx
@@ -17,7 +17,7 @@ import {
   Tag,
 } from "lucide-react";
 
-import serverConfig from "@karakeep/shared/config";
+import { PluginManager, PluginType } from "@karakeep/shared/plugins";
 
 export default async function Dashboard({
   children,
@@ -43,7 +43,7 @@ export default async function Dashboard({
         icon: <Home size={18} />,
         path: "/dashboard/bookmarks",
       },
-      serverConfig.search.meilisearch
+      PluginManager.isRegistered(PluginType.Search)
         ? [
             {
               name: t("common.search"),
diff --git a/apps/web/app/layout.tsx b/apps/web/app/layout.tsx
index e8673c78..55cab4fd 100644
--- a/apps/web/app/layout.tsx
+++ b/apps/web/app/layout.tsx
@@ -2,6 +2,8 @@ import type { Metadata } from "next";
 import { Inter } from "next/font/google";
 import { NuqsAdapter } from "nuqs/adapters/next/app";
 
+import { loadAllPlugins } from "@karakeep/shared-server";
+
 import "@karakeep/tailwind-config/globals.css";
 
 import type { Viewport } from "next";
@@ -14,6 +16,8 @@ import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 
 import { clientConfig } from "@karakeep/shared/config";
 
+await loadAllPlugins();
+
 const inter = Inter({
   subsets: ["latin"],
   fallback: ["sans-serif"],
diff --git a/apps/web/package.json b/apps/web/package.json
index 3721d3b2..778a7419 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -25,6 +25,7 @@
     "@karakeep/db": "workspace:^0.1.0",
     "@karakeep/shared": "workspace:^0.1.0",
     "@karakeep/shared-react": "workspace:^0.1.0",
+    "@karakeep/shared-server": "workspace:^0.1.0",
     "@karakeep/trpc": "workspace:^0.1.0",
     "@lexical/list": "^0.20.2",
     "@lexical/markdown": "^0.20.2",
diff --git a/apps/workers/index.ts b/apps/workers/index.ts
index 1cc1ce49..a21b9c2d 100644
--- a/apps/workers/index.ts
+++ b/apps/workers/index.ts
@@ -1,5 +1,6 @@
 import "dotenv/config";
 
+import { loadAllPlugins } from "@karakeep/shared-server";
 import serverConfig from "@karakeep/shared/config";
 import logger from "@karakeep/shared/logger";
 import { runQueueDBMigrations } from "@karakeep/shared/queues";
@@ -16,6 +17,7 @@ import { VideoWorker } from "./workers/videoWorker";
 import { WebhookWorker } from "./workers/webhookWorker";
 
 async function main() {
+  await loadAllPlugins();
   logger.info(`Workers version: ${serverConfig.serverVersion ?? "not set"}`);
   runQueueDBMigrations();
 
diff --git a/apps/workers/package.json b/apps/workers/package.json
index aa30878a..a771c710 100644
--- a/apps/workers/package.json
+++ b/apps/workers/package.json
@@ -8,6 +8,7 @@
     "@ghostery/adblocker-playwright": "^2.5.1",
     "@karakeep/db": "workspace:^0.1.0",
     "@karakeep/shared": "workspace:^0.1.0",
+    "@karakeep/shared-server": "workspace:^0.1.0",
     "@karakeep/trpc": "workspace:^0.1.0",
     "@karakeep/tsconfig": "workspace:^0.1.0",
     "@mozilla/readability": "^0.6.0",
diff --git a/apps/workers/workers/searchWorker.ts b/apps/workers/workers/searchWorker.ts
index 74fcfc42..4c924ceb 100644
--- a/apps/workers/workers/searchWorker.ts
+++ b/apps/workers/workers/searchWorker.ts
@@ -10,7 +10,11 @@ import {
   SearchIndexingQueue,
   zSearchIndexingRequestSchema,
 } from "@karakeep/shared/queues";
-import { getSearchIdxClient } from "@karakeep/shared/search";
+import {
+  BookmarkSearchDocument,
+  getSearchClient,
+  SearchIndexClient,
+} from "@karakeep/shared/search";
 import { Bookmark } from "@karakeep/trpc/models/bookmarks";
 
 export class SearchIndexingWorker {
@@ -44,20 +48,7 @@ export class SearchIndexingWorker {
   }
 }
 
-async function ensureTaskSuccess(
-  searchClient: NonNullable<Awaited<ReturnType<typeof getSearchIdxClient>>>,
-  taskUid: number,
-) {
-  const task = await searchClient.waitForTask(taskUid);
-  if (task.error) {
-    throw new Error(`Search task failed: ${task.error.message}`);
-  }
-}
-
-async function runIndex(
-  searchClient: NonNullable<Awaited<ReturnType<typeof getSearchIdxClient>>>,
-  bookmarkId: string,
-) {
+async function runIndex(searchClient: SearchIndexClient, bookmarkId: string) {
   const bookmark = await db.query.bookmarks.findFirst({
     where: eq(bookmarks.id, bookmarkId),
     with: {
@@ -76,53 +67,43 @@ async function runIndex(
     throw new Error(`Bookmark ${bookmarkId} not found`);
   }
 
-  const task = await searchClient.addDocuments(
-    [
-      {
-        id: bookmark.id,
-        userId: bookmark.userId,
-        ...(bookmark.link
-          ? {
-              url: bookmark.link.url,
-              linkTitle: bookmark.link.title,
-              description: bookmark.link.description,
-              content: await Bookmark.getBookmarkPlainTextContent(
-                bookmark.link,
-                bookmark.userId,
-              ),
-              publisher: bookmark.link.publisher,
-              author: bookmark.link.author,
-              datePublished: bookmark.link.datePublished,
-              dateModified: bookmark.link.dateModified,
-            }
-          : undefined),
-        ...(bookmark.asset
-          ? {
-              content: bookmark.asset.content,
-              metadata: bookmark.asset.metadata,
-            }
-          : undefined),
-        ...(bookmark.text ? { content: bookmark.text.text } : undefined),
-        note: bookmark.note,
-        summary: bookmark.summary,
-        title: bookmark.title,
-        createdAt: bookmark.createdAt.toISOString(),
-        tags: bookmark.tagsOnBookmarks.map((t) => t.tag.name),
-      },
-    ],
-    {
-      primaryKey: "id",
-    },
-  );
-  await ensureTaskSuccess(searchClient, task.taskUid);
+  const document: BookmarkSearchDocument = {
+    id: bookmark.id,
+    userId: bookmark.userId,
+    ...(bookmark.link
+      ? {
+          url: bookmark.link.url,
+          linkTitle: bookmark.link.title,
+          description: bookmark.link.description,
+          content: await Bookmark.getBookmarkPlainTextContent(
+            bookmark.link,
+            bookmark.userId,
+          ),
+          publisher: bookmark.link.publisher,
+          author: bookmark.link.author,
+          datePublished: bookmark.link.datePublished,
+          dateModified: bookmark.link.dateModified,
+        }
+      : {}),
+    ...(bookmark.asset
+      ? {
+          content: bookmark.asset.content,
+          metadata: bookmark.asset.metadata,
+        }
+      : {}),
+    ...(bookmark.text ? { content: bookmark.text.text } : {}),
+    note: bookmark.note,
+    summary: bookmark.summary,
+    title: bookmark.title,
+    createdAt: bookmark.createdAt.toISOString(),
+    tags: bookmark.tagsOnBookmarks.map((t) => t.tag.name),
+  };
+
+  await searchClient.addDocuments([document]);
 }
 
-async function runDelete(
-  searchClient: NonNullable<Awaited<ReturnType<typeof getSearchIdxClient>>>,
-  bookmarkId: string,
-) {
-  const task = await searchClient.deleteDocument(bookmarkId);
-  await ensureTaskSuccess(searchClient, task.taskUid);
+async function runDelete(searchClient: SearchIndexClient, bookmarkId: string) {
+  await searchClient.deleteDocument(bookmarkId);
 }
 
 async function runSearchIndexing(job: DequeuedJob<ZSearchIndexingRequest>) {
@@ -135,7 +116,7 @@ async function runSearchIndexing(job: DequeuedJob<ZSearchIndexingRequest>) {
     );
   }
 
-  const searchClient = await getSearchIdxClient();
+  const searchClient = await getSearchClient();
   if (!searchClient) {
     logger.debug(
       `[search][${jobId}] Search is not configured, nothing to do now`,