feat: vector search worker improvements

src/plugins/built-in/globalSearch/core/index.ts

@@ -15,7 +15,7 @@ import { waitForElm } from "@/seqta/utils/waitForElm";
 import { loadAllStoredItems, runIndexing } from "../indexing/indexer";
 //import { initVectorSearch } from "../search/vector/vectorSearch";
 import { VectorWorkerManager } from "../indexing/worker/vectorWorkerManager";
-import indexWorker from "./indexWorker?inlineWorker";
+import VectorSearchWorkerManager from "../search/vector/vectorSearch";
 
 const settings = defineSettings({
   searchHotkey: stringSetting({
@@ -88,18 +88,7 @@ const globalSearchPlugin: Plugin<typeof settings> = {
   run: async (api) => {
     let app: any;
 
-    console.log("=======================")
+    VectorSearchWorkerManager.getInstance();
-    /* const worker = new Worker(new URL('./indexWorker.ts', import.meta.url), {
-      type: 'module',
-    }); */
-    //const blob = new Blob([indexWorker], { type: 'application/javascript' });
-    const worker = indexWorker();
-    worker.addEventListener("message", (e) => {
-      console.log(e);
-    });
-
-    worker.postMessage({ type: "ready" });
-    console.log("=======================")
 
     // Run initial indexing and update dynamic items
     if (api.settings.runIndexingOnLoad) {
@@ -165,9 +154,9 @@ const globalSearchPlugin: Plugin<typeof settings> = {
       if (searchButton) searchButton.remove();
       if (searchRoot) searchRoot.remove();
 
-      // Clean up vector worker
+      // Clean up workers
       VectorWorkerManager.getInstance().terminate();
-
+      VectorSearchWorkerManager.getInstance().terminate();
       unmount(app);
     };
   },

src/plugins/built-in/globalSearch/core/indexWorker.ts

@@ -1,5 +0,0 @@
-self.addEventListener('message', (e: Event) => {
-  console.log(e);
-});
-
-self.postMessage({ type: 'ready' });

src/plugins/built-in/globalSearch/search/vector/vectorSearch.ts

@@ -1,17 +1,19 @@
 import type { VectorSearchResult } from "./vectorTypes";
-//import vectorSearchWorker from "./vectorSearchWorker?worker";
+import vectorSearchWorker from "./vectorSearchWorker?inlineWorker";
 
 export function searchVectors(query: string, topK: number = 10): Promise<VectorSearchResult[]> {
-  //return VectorSearchWorkerManager.getInstance().search(query, topK);
+  return VectorSearchWorkerManager.getInstance().search(query, topK);
-  return new Promise((resolve) => {
+  /* return new Promise((resolve) => {
     resolve([]);
-  });
+  }); */
 }
 
-/* class VectorSearchWorkerManager {
+class VectorSearchWorkerManager {
   private static instance: VectorSearchWorkerManager;
   private worker: Worker | null = null;
   private pendingSearches = new Map<string, (results: VectorSearchResult[]) => void>();
+  private debounceTimer: NodeJS.Timeout | null = null;
+  private lastSearchParams: { query: string; topK: number; resolve: (results: VectorSearchResult[]) => void } | null = null;
 
   constructor() {
     this.initWorker();
@@ -19,7 +21,7 @@ export function searchVectors(query: string, topK: number = 10): Promise<VectorS
 
   private initWorker() {
     try {
-      this.worker = new vectorSearchWorker({ name: "vectorSearchWorker" });
+      this.worker = vectorSearchWorker();
       this.worker.addEventListener('message', this.messageHandler);
     } catch (e) {
       console.error("Failed to initialize vector search:", e);
@@ -46,21 +48,40 @@ export function searchVectors(query: string, topK: number = 10): Promise<VectorS
   }
 
   public async search(query: string, topK: number = 10): Promise<VectorSearchResult[]> {
-    console.log("Searching vectors", query, topK);
     if (!this.worker) {
       this.initWorker();
     }
   
-    const messageId = crypto.randomUUID();
     return new Promise((resolve) => {
-      this.pendingSearches.set(messageId, resolve);
+      this.lastSearchParams = { query, topK, resolve };
-      this.worker?.postMessage({
+      if (this.debounceTimer) clearTimeout(this.debounceTimer);
-        type: "search",
+      this.debounceTimer = setTimeout(() => {
-        data: { query, topK },
+        const messageId = crypto.randomUUID();
-        messageId
+        if (this.lastSearchParams) {
-      });
+          this.pendingSearches.set(messageId, this.lastSearchParams.resolve);
+          this.worker?.postMessage({
+            type: "search",
+            data: { query: this.lastSearchParams.query, topK: this.lastSearchParams.topK },
+            messageId
+          });
+          this.lastSearchParams = null;
+        }
+        this.debounceTimer = null;
+      }, query !== '' ? 300 : 0);
     });
   }
+
+  public terminate() {
+    if (this.worker) {
+      for (const [messageId, resolve] of this.pendingSearches.entries()) {
+        resolve([]);
+        this.pendingSearches.delete(messageId);
+      }
+
+      this.worker.terminate();
+      this.worker = null;
+    }
+  }
 }
 
-export default VectorSearchWorkerManager; */
+export default VectorSearchWorkerManager;

src/plugins/built-in/globalSearch/search/vector/vectorSearchWorker.ts

@@ -44,8 +44,9 @@ self.addEventListener('message', async (e) => {
   switch (type) {
     case 'search':
       console.log("Search request received", data);
-      const results = await searchVectors(data.query, data.topK);
+      searchVectors(data.query, data.topK).then((results) => {
-      self.postMessage({ type: 'searchResults', data: { messageId, results } });
+        self.postMessage({ type: 'searchResults', data: { messageId, results } });
+      });
       break;
     default:
       console.warn(`Unknown message type: ${type}`);
@@ -53,7 +54,3 @@ self.addEventListener('message', async (e) => {
 });
 
 initVectorSearch();
-
-export default function test() {
-  console.log("%cTest!!!", "background-color: #000; color: #fff;");
-}