From 521db62f60201ca8ac6ec0ebe0ed21a5da324b5e Mon Sep 17 00:00:00 2001
From: silberengel <silberengel7@protonmail.com>
Date: Sun, 3 Aug 2025 09:09:11 +0200
Subject: [PATCH] Use websocketpool in publication feed

---
 .../publications/PublicationFeed.svelte       | 68 ++++++++++++++-----
 1 file changed, 50 insertions(+), 18 deletions(-)

diff --git a/src/lib/components/publications/PublicationFeed.svelte b/src/lib/components/publications/PublicationFeed.svelte
index 44db458..701551b 100644
--- a/src/lib/components/publications/PublicationFeed.svelte
+++ b/src/lib/components/publications/PublicationFeed.svelte
@@ -7,10 +7,9 @@
   import { onMount, onDestroy } from "svelte";
   import {
     getMatchingTags,
-    NDKRelaySetFromNDK,
-    type NDKEvent,
-    type NDKRelaySet,
   } from "$lib/utils/nostrUtils";
+  import { WebSocketPool } from "$lib/data_structures/websocket_pool";
+  import { NDKEvent } from "@nostr-dev-kit/ndk";
   import { searchCache } from "$lib/utils/searchCache";
   import { indexEventCache } from "$lib/utils/indexEventCache";
   import { isValidNip05Address } from "$lib/utils/search_utility";
@@ -139,21 +138,54 @@
     async function fetchFromRelay(relay: string): Promise<void> {
       try {
         console.debug(`[PublicationFeed] Fetching from relay: ${relay}`);
-        const relaySet = NDKRelaySetFromNDK.fromRelayUrls([relay], ndk);
-        let eventSet = await ndk
-          .fetchEvents(
-            {
-              kinds: [indexKind],
-              limit: 1000, // Increased limit to get more events
-            },
-            {
-              groupable: false,
-              skipVerification: false,
-              skipValidation: false,
-            },
-            relaySet,
-          )
-          .withTimeout(5000); // Reduced timeout to 5 seconds for faster response
+        
+        // Use WebSocketPool to get a pooled connection
+        const ws = await WebSocketPool.instance.acquire(relay);
+        const subId = crypto.randomUUID();
+        
+        // Create a promise that resolves with the events
+        const eventPromise = new Promise<Set<NDKEvent>>((resolve, reject) => {
+          const events = new Set<NDKEvent>();
+          
+          const messageHandler = (ev: MessageEvent) => {
+            try {
+              const data = JSON.parse(ev.data);
+              
+              if (data[0] === "EVENT" && data[1] === subId) {
+                const event = new NDKEvent(ndk, data[2]);
+                events.add(event);
+              } else if (data[0] === "EOSE" && data[1] === subId) {
+                resolve(events);
+              }
+            } catch (error) {
+              console.error(`[PublicationFeed] Error parsing message from ${relay}:`, error);
+            }
+          };
+          
+          const errorHandler = (ev: Event) => {
+            reject(new Error(`WebSocket error for ${relay}: ${ev}`));
+          };
+          
+          ws.addEventListener("message", messageHandler);
+          ws.addEventListener("error", errorHandler);
+          
+          // Send the subscription request
+          ws.send(JSON.stringify([
+            "REQ", 
+            subId, 
+            { kinds: [indexKind], limit: 1000 }
+          ]));
+          
+          // Set up cleanup
+          setTimeout(() => {
+            ws.removeEventListener("message", messageHandler);
+            ws.removeEventListener("error", errorHandler);
+            WebSocketPool.instance.release(ws);
+            resolve(events);
+          }, 5000);
+        });
+        
+        let eventSet = await eventPromise;
         
         console.debug(`[PublicationFeed] Raw events from ${relay}:`, eventSet.size);
         eventSet = filterValidIndexEvents(eventSet);