Mirror/vega
1
0
Fork 0
mirror of https://github.com/hoornet/vega.git synced 2026-05-06 20:29:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix relay dedup: normalize URLs to prevent trailing-slash duplicates

Browse Source
This commit is contained in:
Jure
2026-03-31 06:45:55 +02:00
parent f2d51fba31
commit 91ddfddf53
3 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/lib/nostr/core.ts
View File

@@ -51,16 +51,30 @@ export const OUTBOX_RELAYS = [
"wss://relay.nostr.band/",
];
/** Normalize relay URL: lowercase host, strip trailing slash, deduplicate. */
export function normalizeRelayUrl(url: string): string {
return url.replace(/\/+$/, "");
}
export function getStoredRelayUrls(): string[] {
try {
const stored = localStorage.getItem(RELAY_STORAGE_KEY);
if (stored) return JSON.parse(stored);
if (stored) {
// Deduplicate on load (handles legacy duplicates from trailing-slash mismatch)
const urls: string[] = JSON.parse(stored);
const seen = new Set<string>();
return urls.map(normalizeRelayUrl).filter((u) => {
if (seen.has(u)) return false;
seen.add(u);
return true;
});
}
} catch { /* ignore */ }
return FALLBACK_RELAYS;
}
export function saveRelayUrls(urls: string[]) {
localStorage.setItem(RELAY_STORAGE_KEY, JSON.stringify(urls));
localStorage.setItem(RELAY_STORAGE_KEY, JSON.stringify(urls.map(normalizeRelayUrl)));
}
let ndk: NDK | null = null;
@@ -119,13 +133,15 @@ export async function resetNDK(): Promise<void> {
}
export function addRelay(url: string): void {
const normalized = normalizeRelayUrl(url);
const instance = getNDK();
const urls = getStoredRelayUrls();
if (!urls.includes(url)) {
saveRelayUrls([...urls, url]);
if (!urls.includes(normalized)) {
saveRelayUrls([...urls, normalized]);
}
if (!instance.pool?.relays.has(url)) {
const relay = new NDKRelay(url, undefined, instance);
// Check both with and without trailing slash since NDK may use either
if (!instance.pool?.relays.has(normalized) && !instance.pool?.relays.has(normalized + "/")) {
const relay = new NDKRelay(normalized, undefined, instance);
instance.pool?.addRelay(relay, true);
}
}

2
src/lib/nostr/index.ts
View File

@@ -1,4 +1,4 @@
export { getNDK, getNDKUptimeMs, connectToRelays, ensureConnected, resetNDK, getStoredRelayUrls, addRelay, removeRelay, fetchWithTimeout, withTimeout, FEED_TIMEOUT, THREAD_TIMEOUT, SINGLE_TIMEOUT } from "./core";
export { getNDK, getNDKUptimeMs, connectToRelays, ensureConnected, resetNDK, getStoredRelayUrls, normalizeRelayUrl, addRelay, removeRelay, fetchWithTimeout, withTimeout, FEED_TIMEOUT, THREAD_TIMEOUT, SINGLE_TIMEOUT } from "./core";
export { fetchGlobalFeed, fetchFollowFeed, fetchUserNotes, fetchUserNotesNIP65, fetchNoteById, fetchReplies, publishNote, publishReply, publishRepost, publishQuote, fetchHashtagFeed, fetchThreadEvents, fetchAncestors } from "./notes";
export { publishProfile, publishContactList, fetchProfile, fetchFollowSuggestions, fetchMentions, fetchFollowers, fetchNewFollowers } from "./social";
export { publishArticle, fetchArticle, fetchAuthorArticles, fetchArticleFeed, searchArticles, fetchByAddr } from "./articles";