pools need to inherit blacklists from ndk

Author: pablof7z

ndk/src/ndk/index.ts

@@ -27,7 +27,6 @@ import { setActiveUser } from "./active-user.js";
 import type { CashuPayCb, LnPayCb, NDKPaymentConfirmation, NDKZapSplit } from "../zapper/index.js";
 import type { NostrEvent } from "nostr-tools";
 import type { NDKLnUrlData } from "../zapper/ln.js";
-import { NDKEncryptionScheme } from "../types.js";
 
 export type NDKValidationRatioFn = (
     relay: NDKRelay,
@@ -224,6 +223,7 @@ export class NDK extends EventEmitter<{
     ) => void;
 }> {
     private _explicitRelayUrls?: WebSocket["url"][];
+    public blacklistRelayUrls?: WebSocket["url"][];
     public pool: NDKPool;
     public outboxPool?: NDKPool;
     private _signer?: NDKSigner;
@@ -301,13 +301,14 @@ export class NDK extends EventEmitter<{
         this.debug = opts.debug || debug("ndk");
         this.netDebug = opts.netDebug;
         this._explicitRelayUrls = opts.explicitRelayUrls || [];
+        this.blacklistRelayUrls = opts.blacklistRelayUrls || DEFAULT_BLACKLISTED_RELAYS;
         this.subManager = new NDKSubscriptionManager(this.debug);
         this.pool = new NDKPool(
             opts.explicitRelayUrls || [],
-            opts.blacklistRelayUrls || DEFAULT_BLACKLISTED_RELAYS,
+            [],
             this
         );
-        this.pool.name = "main";
+        this.pool.name = "Main";
 
         this.pool.on("relay:auth", async (relay: NDKRelay, challenge: string) => {
             if (this.relayAuthDefaultPolicy) {
@@ -326,11 +327,11 @@ export class NDK extends EventEmitter<{
         if (opts.enableOutboxModel) {
             this.outboxPool = new NDKPool(
                 opts.outboxRelayUrls || DEFAULT_OUTBOX_RELAYS,
-                opts.blacklistRelayUrls || DEFAULT_BLACKLISTED_RELAYS,
+                [],
                 this,
                 {
                     debug: this.debug.extend("outbox-pool"),
-                    name: "outbox"
+                    name: "Outbox Pool"
                 }
             );
 

ndk/src/relay/pool/index.ts

@@ -45,14 +45,26 @@ export class NDKPool extends EventEmitter<{
     private _relays = new Map<WebSocket["url"], NDKRelay>();
     private status: 'idle' | 'active' = 'idle';
     public autoConnectRelays = new Set<WebSocket["url"]>();
-    public blacklistRelayUrls: Set<WebSocket["url"]>;
+    public poolBlacklistRelayUrls = new Set<WebSocket["url"]>();
     private debug: debug.Debugger;
     private temporaryRelayTimers = new Map<WebSocket["url"], NodeJS.Timeout>();
     private flappingRelays: Set<WebSocket["url"]> = new Set();
     // A map to store timeouts for each flapping relay.
     private backoffTimes: Map<string, number> = new Map();
     private ndk: NDK;
 
+    get blacklistRelayUrls() {
+        const val = new Set(this.ndk.blacklistRelayUrls);
+        this.poolBlacklistRelayUrls.forEach((url) => val.add(url));
+        return val;
+    }
+
+    /**
+     * @param relayUrls - The URLs of the relays to connect to.
+     * @param blacklistedRelayUrls - URLs to blacklist for this pool IN ADDITION to those blacklisted at the ndk-level
+     * @param ndk - The NDK instance.
+     * @param opts - Options for the pool.
+     */
     public constructor(
         relayUrls: WebSocket["url"][] = [],
         blacklistedRelayUrls: WebSocket["url"][] = [],
@@ -68,8 +80,7 @@ export class NDKPool extends EventEmitter<{
         this.ndk = ndk;
         this.relayUrls = relayUrls;
 
-
-        this.blacklistRelayUrls = new Set(blacklistedRelayUrls);
+        this.poolBlacklistRelayUrls = new Set(blacklistedRelayUrls);
 
         this.ndk.pools.push(this);
     }