From 4f9f0186e471ded070d3c59b8ce3cc1995452a62 Mon Sep 17 00:00:00 2001 From: Water Blower <127284497+BlowaterNostr@users.noreply.github.com> Date: Sun, 7 Jul 2024 11:28:16 +0800 Subject: [PATCH] abort getSpaceMemberStream (#490) --- app/UI/app.tsx | 9 +++++++-- app/database.ts | 1 - deno.json | 2 +- deno.lock | 9 ++++----- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/UI/app.tsx b/app/UI/app.tsx index b865f25..ece9bc4 100644 --- a/app/UI/app.tsx +++ b/app/UI/app.tsx @@ -709,10 +709,15 @@ const sync_space_members = async ( database: Database_View, ) => { for (const relay of pool.getRelays()) { - forever((async () => { + (async () => { const chan = relay.getSpaceMembersStream(); for await (const spaceMembers of chan) { if (spaceMembers instanceof Error) { + if (spaceMembers instanceof TypeError || spaceMembers instanceof SyntaxError) { + console.error(spaceMembers); + await chan.close(); + return; + } console.error(spaceMembers); } else { for (const spaceMember of spaceMembers) { @@ -720,6 +725,6 @@ const sync_space_members = async ( } } } - })()); + })(); } }; diff --git a/app/database.ts b/app/database.ts index 074425a..b7647c6 100644 --- a/app/database.ts +++ b/app/database.ts @@ -318,7 +318,6 @@ export class Database_View pubkey: PublicKey | string, spaceURL: string | URL | undefined, ): Profile_Nostr_Event | undefined => { - console.log(pubkey, spaceURL); if (pubkey instanceof PublicKey) { pubkey = pubkey.hex; } diff --git a/deno.json b/deno.json index 002b6eb..256ac5d 100644 --- a/deno.json +++ b/deno.json @@ -43,7 +43,7 @@ }, "imports": { "@blowater/csp": "jsr:@blowater/csp@1.0.0", - "@blowater/nostr-sdk": "jsr:@blowater/nostr-sdk@0.0.2", + "@blowater/nostr-sdk": "jsr:@blowater/nostr-sdk@0.0.3", "@std/assert": "jsr:@std/assert@0.226.0", "@std/datetime": "jsr:@std/datetime@0.224.2", "@std/encoding": "jsr:@std/encoding@1.0.0", diff --git a/deno.lock b/deno.lock index 0f3a0b5..4c8314a 100644 --- a/deno.lock +++ b/deno.lock @@ -4,7 +4,7 @@ "specifiers": { "jsr:@blowater/csp@1.0.0": "jsr:@blowater/csp@1.0.0", "jsr:@blowater/csp@^1.0.0": "jsr:@blowater/csp@1.0.0", - "jsr:@blowater/nostr-sdk@0.0.2": "jsr:@blowater/nostr-sdk@0.0.2", + "jsr:@blowater/nostr-sdk@0.0.3": "jsr:@blowater/nostr-sdk@0.0.3", "jsr:@luca/esbuild-deno-loader@^0.10.3": "jsr:@luca/esbuild-deno-loader@0.10.3", "jsr:@noble/secp256k1@2.1.0": "jsr:@noble/secp256k1@2.1.0", "jsr:@std/assert@0.226.0": "jsr:@std/assert@0.226.0", @@ -32,10 +32,9 @@ "@blowater/csp@1.0.0": { "integrity": "415d4e8bf1656e4a508997fb8e725e9372e1e39b2b714afa76e86efd733f8c4c" }, - "@blowater/nostr-sdk@0.0.2": { - "integrity": "3ae55b98cd35785305f31433bf95ee92b16083640892ffeab7965f666072cf14", + "@blowater/nostr-sdk@0.0.3": { + "integrity": "20686056fcdd9453f573d4d8a6027b030d6e0df5f5bf62fba05f844cb6c0db40", "dependencies": [ - "jsr:@blowater/csp@1.0.0", "jsr:@noble/secp256k1@2.1.0", "jsr:@std/assert@0.226.0", "jsr:@std/datetime@0.224.1", @@ -408,7 +407,7 @@ "workspace": { "dependencies": [ "jsr:@blowater/csp@1.0.0", - "jsr:@blowater/nostr-sdk@0.0.2", + "jsr:@blowater/nostr-sdk@0.0.3", "jsr:@std/assert@0.226.0", "jsr:@std/datetime@0.224.2", "jsr:@std/encoding@1.0.0",