abort getSpaceMemberStream (#490)

This commit is contained in:
Water Blower 2024-07-07 11:28:16 +08:00 committed by GitHub
parent ea5f843af1
commit 4f9f0186e4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 9 deletions

View File

@ -709,10 +709,15 @@ const sync_space_members = async (
database: Database_View, database: Database_View,
) => { ) => {
for (const relay of pool.getRelays()) { for (const relay of pool.getRelays()) {
forever((async () => { (async () => {
const chan = relay.getSpaceMembersStream(); const chan = relay.getSpaceMembersStream();
for await (const spaceMembers of chan) { for await (const spaceMembers of chan) {
if (spaceMembers instanceof Error) { if (spaceMembers instanceof Error) {
if (spaceMembers instanceof TypeError || spaceMembers instanceof SyntaxError) {
console.error(spaceMembers);
await chan.close();
return;
}
console.error(spaceMembers); console.error(spaceMembers);
} else { } else {
for (const spaceMember of spaceMembers) { for (const spaceMember of spaceMembers) {
@ -720,6 +725,6 @@ const sync_space_members = async (
} }
} }
} }
})()); })();
} }
}; };

View File

@ -318,7 +318,6 @@ export class Database_View
pubkey: PublicKey | string, pubkey: PublicKey | string,
spaceURL: string | URL | undefined, spaceURL: string | URL | undefined,
): Profile_Nostr_Event | undefined => { ): Profile_Nostr_Event | undefined => {
console.log(pubkey, spaceURL);
if (pubkey instanceof PublicKey) { if (pubkey instanceof PublicKey) {
pubkey = pubkey.hex; pubkey = pubkey.hex;
} }

View File

@ -43,7 +43,7 @@
}, },
"imports": { "imports": {
"@blowater/csp": "jsr:@blowater/csp@1.0.0", "@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/assert": "jsr:@std/assert@0.226.0",
"@std/datetime": "jsr:@std/datetime@0.224.2", "@std/datetime": "jsr:@std/datetime@0.224.2",
"@std/encoding": "jsr:@std/encoding@1.0.0", "@std/encoding": "jsr:@std/encoding@1.0.0",

View File

@ -4,7 +4,7 @@
"specifiers": { "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/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:@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:@noble/secp256k1@2.1.0": "jsr:@noble/secp256k1@2.1.0",
"jsr:@std/assert@0.226.0": "jsr:@std/assert@0.226.0", "jsr:@std/assert@0.226.0": "jsr:@std/assert@0.226.0",
@ -32,10 +32,9 @@
"@blowater/csp@1.0.0": { "@blowater/csp@1.0.0": {
"integrity": "415d4e8bf1656e4a508997fb8e725e9372e1e39b2b714afa76e86efd733f8c4c" "integrity": "415d4e8bf1656e4a508997fb8e725e9372e1e39b2b714afa76e86efd733f8c4c"
}, },
"@blowater/nostr-sdk@0.0.2": { "@blowater/nostr-sdk@0.0.3": {
"integrity": "3ae55b98cd35785305f31433bf95ee92b16083640892ffeab7965f666072cf14", "integrity": "20686056fcdd9453f573d4d8a6027b030d6e0df5f5bf62fba05f844cb6c0db40",
"dependencies": [ "dependencies": [
"jsr:@blowater/csp@1.0.0",
"jsr:@noble/secp256k1@2.1.0", "jsr:@noble/secp256k1@2.1.0",
"jsr:@std/assert@0.226.0", "jsr:@std/assert@0.226.0",
"jsr:@std/datetime@0.224.1", "jsr:@std/datetime@0.224.1",
@ -408,7 +407,7 @@
"workspace": { "workspace": {
"dependencies": [ "dependencies": [
"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.3",
"jsr:@std/assert@0.226.0", "jsr:@std/assert@0.226.0",
"jsr:@std/datetime@0.224.2", "jsr:@std/datetime@0.224.2",
"jsr:@std/encoding@1.0.0", "jsr:@std/encoding@1.0.0",