aljaz/rabbit
1
0
Fork 0
mirror of https://github.com/aljazceru/rabbit.git synced 2025-12-17 05:54:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: latest event query

Browse Source
This commit is contained in:
Shusui MOYATANI
2024-01-03 14:50:44 +09:00
parent 5a69036cd7
commit 541d036824
1 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/nostr/query.ts
View File

@@ -6,6 +6,16 @@ import { compareEvents, pickLatestEvent, sortEvents } from '@/nostr/event/compar
import { BatchedEventsTask, registerTask } from '@/nostr/useBatchedEvents';
import timeout from '@/utils/timeout';
const chooseLatestEvent = (
prev: NostrEvent | undefined,
latest: NostrEvent | undefined,
): NostrEvent | undefined => {
if (latest != null && (prev == null || compareEvents(latest, prev) >= 0)) {
return latest;
}
return prev;
};
export const latestEventQuery =
<K extends QueryKey>({
taskProvider,
@@ -17,22 +27,32 @@ export const latestEventQuery =
({ queryKey, signal }: { queryKey: K; signal?: AbortSignal }): Promise<NostrEvent | null> => {
const task = taskProvider(queryKey);
if (task == null) return Promise.resolve(null);
const promise = task.firstEventPromise().catch(() => {
throw new Error(`event not found: ${JSON.stringify(queryKey)}`);
});
const promise = task
.firstEventPromise()
.then((latest) => {
const prev = queryClient.getQueryData(queryKey) as NostrEvent;
return chooseLatestEvent(prev, latest) ?? null;
})
.catch(() => {
throw new Error(`event not found: ${JSON.stringify(queryKey)}`);
});
task.onUpdate((events) => {
const latest = pickLatestEvent(events);
queryClient.setQueriesData<NostrEvent>({ queryKey }, (prev) => {
if (latest != null && (prev == null || compareEvents(latest, prev) >= 0)) {
return latest;
}
return undefined;
});
queryClient.setQueriesData<NostrEvent>({ queryKey }, (prev) =>
chooseLatestEvent(prev, latest),
);
});
registerTask({ task, signal });
return timeout(15000, `${JSON.stringify(queryKey)}`)(promise);
};
const mergeEvents = (prev: NostrEvent[] | undefined, events: NostrEvent[]) => {
if (prev == null) return events;
const deduped = uniqBy([...prev, ...events], (e) => e.id);
return sortEvents(deduped);
};
export const eventsQuery =
<K extends QueryKey>({
taskProvider,
@@ -44,14 +64,16 @@ export const eventsQuery =
({ queryKey, signal }: { queryKey: K; signal?: AbortSignal }): Promise<NostrEvent[]> => {
const task = taskProvider(queryKey);
if (task == null) return Promise.resolve([]);
const promise = task.toUpdatePromise().catch(() => []);
const promise = task
.toUpdatePromise()
.then((events) => {
const prev: NostrEvent[] = queryClient.getQueryData(queryKey) ?? [];
return mergeEvents(prev, events);
})
.catch(() => []);
task.onUpdate((events) => {
// TODO consider kind:5 deletion
queryClient.setQueriesData<NostrEvent[]>({ queryKey }, (prev) => {
if (prev == null) return events;
const deduped = uniqBy([...prev, ...events], (e) => e.id);
return sortEvents(deduped);
});
queryClient.setQueriesData<NostrEvent[]>({ queryKey }, (prev) => mergeEvents(prev, events));
});
registerTask({ task, signal });
return timeout(15000, `${JSON.stringify(queryKey)}`)(promise);