feat: fix relay manager

packages/ark/src/ark.ts

@@ -254,9 +254,12 @@ export class Ark {
 		}
 	}
 
-	public async getEventByFilter({ filter }: { filter: NDKFilter }) {
+	public async getEventByFilter({
+		filter,
+		cache,
+	}: { filter: NDKFilter; cache?: NDKSubscriptionCacheUsage }) {
 		const event = await this.ndk.fetchEvent(filter, {
-			cacheUsage: NDKSubscriptionCacheUsage.CACHE_FIRST,
+			cacheUsage: cache || NDKSubscriptionCacheUsage.CACHE_FIRST,
 		});
 
 		if (!event) return null;
@@ -352,7 +355,7 @@ export class Ark {
 		}
 	}
 
-	public async getAllRelaysFromContacts() {
+	public async getAllRelaysFromContacts({ signal }: { signal: AbortSignal }) {
 		const fetcher = NostrFetcher.withCustomPool(ndkAdapter(this.ndk));
 		const connectedRelays = this.ndk.pool
 			.connectedRelays()
@@ -367,15 +370,21 @@ export class Ark {
 				},
 				{ kinds: [NDKKind.RelayList] },
 				1,
+				{ abortSignal: signal },
 			);
 
-			for await (const { author, events } of relayEvents) {
-				if (events[0]) {
-					for (const tag of events[0].tags) {
-						const users = relayMap.get(tag[1]);
+			console.log(relayEvents);
 
-						if (!users) relayMap.set(tag[1], [author]);
-						users.push(author);
+			for await (const { author, events } of relayEvents) {
+				if (events.length) {
+					const relayTags = events[0].tags.filter((item) => item[0] === "r");
+					for (const tag of relayTags) {
+						const item = relayMap.get(tag[1]);
+						if (item?.length) {
+							item.push(author);
+						} else {
+							relayMap.set(tag[1], [author]);
+						}
 					}
 				}
 			}

packages/ark/src/hooks/useRelayList.ts

@@ -1,5 +1,6 @@
-import { NDKKind, NDKRelayUrl, NDKTag } from "@nostr-dev-kit/ndk";
+import { NDKKind, NDKTag } from "@nostr-dev-kit/ndk";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { normalizeRelayUrl } from "nostr-fetch";
 import { useArk } from "./useArk";
 
 export function useRelaylist() {
@@ -8,7 +9,7 @@ export function useRelaylist() {
 
 	const connectRelay = useMutation({
 		mutationFn: async (
-			relay: NDKRelayUrl,
+			relay: WebSocket["url"],
 			purpose?: "read" | "write" | undefined,
 		) => {
 			// Cancel any outgoing refetches
@@ -16,11 +17,10 @@ export function useRelaylist() {
 				queryKey: ["relay-personal"],
 			});
 
+			const relayUrl = normalizeRelayUrl(relay);
+
 			// Snapshot the previous value
-			const prevRelays: NDKTag[] = queryClient.getQueryData([
-				"relays",
-				ark.account.pubkey,
-			]);
+			const prevRelays: NDKTag[] = queryClient.getQueryData(["relay-personal"]);
 
 			// create new relay list if not exist
 			if (!prevRelays) {
@@ -36,13 +36,13 @@ export function useRelaylist() {
 
 			await ark.createEvent({
 				kind: NDKKind.RelayList,
-				tags: [...prevRelays, ["r", relay, purpose ?? ""]],
+				tags: [...prevRelays, ["r", relayUrl, purpose ?? ""]],
 			});
 
 			// Optimistically update to the new value
 			queryClient.setQueryData(["relay-personal"], (prev: NDKTag[]) => [
 				...prev,
-				["r", relay, purpose ?? ""],
+				["r", relayUrl, purpose ?? ""],
 			]);
 
 			// Return a context object with the snapshotted value
@@ -56,17 +56,14 @@ export function useRelaylist() {
 	});
 
 	const removeRelay = useMutation({
-		mutationFn: async (relay: NDKRelayUrl) => {
+		mutationFn: async (relay: WebSocket["url"]) => {
 			// Cancel any outgoing refetches
 			await queryClient.cancelQueries({
 				queryKey: ["relay-personal"],
 			});
 
 			// Snapshot the previous value
-			const prevRelays: NDKTag[] = queryClient.getQueryData([
-				"relays",
-				ark.account.pubkey,
-			]);
+			const prevRelays: NDKTag[] = queryClient.getQueryData(["relay-personal"]);
 
 			if (!prevRelays) return;