highperfocused/grimoire
1
0
Fork 0
mirror of https://github.com/purrgrammer/grimoire.git synced 2026-04-11 07:56:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor(nip-29): simplify parallel fetch using pool.request

Browse Source 
Use pool.request() with both filters in a single call instead of manual
subscription management. This is cleaner and more idiomatic:
- Auto-closes on EOSE (no manual unsubscribe needed)
- Fetches both kinds (39001 and 39002) in parallel with one request
- Reduces code complexity significantly
This commit is contained in:
Claude
2026-01-20 09:08:28 +00:00
parent 350b908129
commit 11e75ce5f5
1 changed files with 9 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/lib/chat/adapters/nip-29-adapter.ts
View File

@@ -203,75 +203,17 @@ export class Nip29Adapter extends ChatProtocolAdapter {
limit: 5, // Should be 1, but allow for duplicates
};
// Fetch admins and members in parallel
const adminEvents: NostrEvent[] = [];
const memberEvents: NostrEvent[] = [];
// Use pool.request with both filters to fetch and auto-close on EOSE
const participantEvents = await firstValueFrom(
pool
.request([relayUrl], [adminsFilter, membersFilter], { eventStore })
.pipe(toArray()),
);
const adminsObs = pool.subscription([relayUrl], [adminsFilter], {
eventStore,
});
console.log(`[NIP-29] Got ${participantEvents.length} participant events`);
const membersObs = pool.subscription([relayUrl], [membersFilter], {
eventStore,
});
// Wait for both subscriptions to complete in parallel
await Promise.all([
new Promise<void>((resolve, reject) => {
const timeout = setTimeout(() => {
console.log("[NIP-29] Admins fetch timeout");
resolve();
}, 5000);
const sub = adminsObs.subscribe({
next: (response) => {
if (typeof response === "string") {
// EOSE received
clearTimeout(timeout);
console.log(`[NIP-29] Got ${adminEvents.length} admin events`);
sub.unsubscribe();
resolve();
} else {
// Event received
adminEvents.push(response);
}
},
error: (err) => {
clearTimeout(timeout);
console.error("[NIP-29] Admins fetch error:", err);
sub.unsubscribe();
reject(err);
},
});
}),
new Promise<void>((resolve, reject) => {
const timeout = setTimeout(() => {
console.log("[NIP-29] Members fetch timeout");
resolve();
}, 5000);
const sub = membersObs.subscribe({
next: (response) => {
if (typeof response === "string") {
// EOSE received
clearTimeout(timeout);
console.log(`[NIP-29] Got ${memberEvents.length} member events`);
sub.unsubscribe();
resolve();
} else {
// Event received
memberEvents.push(response);
}
},
error: (err) => {
clearTimeout(timeout);
console.error("[NIP-29] Members fetch error:", err);
sub.unsubscribe();
reject(err);
},
});
}),
]);
const adminEvents = participantEvents.filter((e) => e.kind === 39001);
const memberEvents = participantEvents.filter((e) => e.kind === 39002);
// Helper to validate and normalize role names
const normalizeRole = (