waku-org/js-waku
1
0
Fork 0
mirror of https://github.com/waku-org/js-waku.git synced 2025-01-12 21:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #968 from waku-org/type-store

Browse Source
This commit is contained in:
fryorcraken.eth 2022-09-21 16:20:50 +10:00 committed by GitHub
commit 9e4b3acd81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/waku_store/index.ts
View File

@ -106,15 +106,15 @@ export class WakuStore {
*/ */
async queryOrderedCallback<T extends Message>( async queryOrderedCallback<T extends Message>(
decoders: Decoder<T>[], decoders: Decoder<T>[],
callback: (message: Message) => Promise<void | boolean> | boolean | void, callback: (message: T) => Promise<void | boolean> | boolean | void,
options?: QueryOptions options?: QueryOptions
): Promise<void> { ): Promise<void> {
const abort = false; const abort = false;
for await (const promises of this.queryGenerator(decoders, options)) { for await (const promises of this.queryGenerator(decoders, options)) {
if (abort) break; if (abort) break;
let messages = await Promise.all(promises); const messagesOrUndef: Array<T | undefined> = await Promise.all(promises);
messages = messages.filter(isWakuMessageDefined); let messages: Array<T> = messagesOrUndef.filter(isDefined);
// Messages in pages are ordered from oldest (first) to most recent (last). // Messages in pages are ordered from oldest (first) to most recent (last).
// https://github.com/vacp2p/rfc/issues/533 // https://github.com/vacp2p/rfc/issues/533
@ -156,7 +156,7 @@ export class WakuStore {
async queryCallbackOnPromise<T extends Message>( async queryCallbackOnPromise<T extends Message>(
decoders: Decoder<T>[], decoders: Decoder<T>[],
callback: ( callback: (
message: Promise<Message | undefined> message: Promise<T | undefined>
) => Promise<void | boolean> | boolean | void, ) => Promise<void | boolean> | boolean | void,
options?: QueryOptions options?: QueryOptions
): Promise<void> { ): Promise<void> {
@ -194,7 +194,7 @@ export class WakuStore {
async *queryGenerator<T extends Message>( async *queryGenerator<T extends Message>(
decoders: Decoder<T>[], decoders: Decoder<T>[],
options?: QueryOptions options?: QueryOptions
): AsyncGenerator<Promise<Message | undefined>[]> { ): AsyncGenerator<Promise<T | undefined>[]> {
let startTime, endTime; let startTime, endTime;
if (options?.timeFilter) { if (options?.timeFilter) {
@ -245,7 +245,7 @@ export class WakuStore {
if (!connection) throw "Failed to get a connection to the peer"; if (!connection) throw "Failed to get a connection to the peer";
for await (const messages of paginate( for await (const messages of paginate<T>(
connection, connection,
protocol, protocol,
queryOpts, queryOpts,
@ -370,8 +370,6 @@ async function* paginate<T extends Message>(
} }
} }
export const isWakuMessageDefined = ( export function isDefined<T>(msg: T | undefined): msg is T {
msg: Message | undefined
): msg is Message => {
return !!msg; return !!msg;
}; }