highperfocused/nostrudel
1
0
Fork 0
mirror of https://github.com/hzrd149/nostrudel.git synced 2025-03-29 11:12:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

small fix for nostr-connect

Browse Source
This commit is contained in:
hzrd149 2024-04-17 08:18:16 -05:00
parent 3868f7ec03
commit d27bcaffef
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/classes/nostr-multi-subscription.ts
View File

@ -6,6 +6,7 @@ import { isFilterEqual } from "../helpers/nostr/filter";
import ControlledObservable from "./controlled-observable";
import { Filter, Relay, Subscription } from "nostr-tools";
import { offlineMode } from "../services/offline-mode";
import RelaySet from "./relay-set";
export default class NostrMultiSubscription {
static INIT = "initial";
@ -64,9 +65,9 @@ export default class NostrMultiSubscription {
}
}
const urlArr = Array.from(relays);
const relaySet = RelaySet.from(relays);
for (const relay of this.relays) {
if (!urlArr.includes(relay.url)) {
if (!relaySet.has(relay.url)) {
this.relays = this.relays.filter((r) => r !== relay);
this.handleRemoveRelay(relay);
}
@ -111,7 +112,7 @@ export default class NostrMultiSubscription {
}
publish(event: NostrEvent) {
return Promise.all(this.relays.map((r) => r.publish(event)));
return Promise.allSettled(this.relays.map((r) => r.publish(event)));
}
open() {
@ -127,7 +128,7 @@ export default class NostrMultiSubscription {
}
waitForAllConnection(): Promise<void> {
if (offlineMode.value) return Promise.resolve();
return Promise.all(this.relays.filter((r) => !r.connected).map((r) => r.connect())).then((v) => void 0);
return Promise.allSettled(this.relays.filter((r) => !r.connected).map((r) => r.connect())).then((v) => void 0);
}
close() {
if (this.state !== NostrMultiSubscription.OPEN) return this;

2
src/services/nostr-connect.ts
View File

@ -75,7 +75,7 @@ export class NostrConnectClient {
supportedMethods: NostrConnectMethod[] | undefined;
constructor(pubkey: string, relays: string[], secretKey?: string, provider?: string) {
this.sub = new NostrMultiSubscription(`${truncatedId(pubkey)}-nostr-connect`);
this.sub = new NostrMultiSubscription(`${pubkey}-nostr-connect`);
this.pubkey = pubkey;
this.relays = relays;
this.provider = provider;