@waku/core 0.0.31-ce62600.0 → 0.0.31-f387f59.0

package/src/lib/metadata/index.ts

@@ -6,10 +6,11 @@ import {
   type MetadataQueryResult,
   type PeerIdStr,
   ProtocolError,
+  PubsubTopic,
   type ShardInfo
 } from "@waku/interfaces";
 import { proto_metadata } from "@waku/proto";
-import { encodeRelayShard, Logger, shardInfoToPubsubTopics } from "@waku/utils";
+import { encodeRelayShard, Logger, pubsubTopicsToShardInfo } from "@waku/utils";
 import all from "it-all";
 import * as lp from "it-length-prefixed";
 import { pipe } from "it-pipe";
@@ -23,59 +24,26 @@ export const MetadataCodec = "/vac/waku/metadata/1.0.0";
 
 class Metadata extends BaseProtocol implements IMetadata {
   private libp2pComponents: Libp2pComponents;
-  handshakesConfirmed: Map<PeerIdStr, ShardInfo> = new Map();
+  protected handshakesConfirmed: Map<PeerIdStr, ShardInfo> = new Map();
 
-  constructor(
-    public shardInfo: ShardInfo,
+  public constructor(
+    public pubsubTopics: PubsubTopic[],
     libp2p: Libp2pComponents
   ) {
-    super(
-      MetadataCodec,
-      libp2p.components,
-      log,
-      shardInfoToPubsubTopics(shardInfo)
-    );
+    super(MetadataCodec, libp2p.components, log, pubsubTopics);
     this.libp2pComponents = libp2p;
     void libp2p.registrar.handle(MetadataCodec, (streamData) => {
       void this.onRequest(streamData);
     });
   }
 
-  /**
-   * Handle an incoming metadata request
-   */
-  private async onRequest(streamData: IncomingStreamData): Promise<void> {
-    try {
-      const { stream, connection } = streamData;
-      const encodedShardInfo = proto_metadata.WakuMetadataResponse.encode(
-        this.shardInfo
-      );
-
-      const encodedResponse = await pipe(
-        [encodedShardInfo],
-        lp.encode,
-        stream,
-        lp.decode,
-        async (source) => await all(source)
-      );
-
-      const { error, shardInfo } = this.decodeMetadataResponse(encodedResponse);
-
-      if (error) {
-        return;
-      }
-
-      await this.savePeerShardInfo(connection.remotePeer, shardInfo);
-    } catch (error) {
-      log.error("Error handling metadata request", error);
-    }
-  }
-
   /**
    * Make a metadata query to a peer
    */
-  async query(peerId: PeerId): Promise<MetadataQueryResult> {
-    const request = proto_metadata.WakuMetadataRequest.encode(this.shardInfo);
+  public async query(peerId: PeerId): Promise<MetadataQueryResult> {
+    const request = proto_metadata.WakuMetadataRequest.encode(
+      pubsubTopicsToShardInfo(this.pubsubTopics)
+    );
 
     const peer = await this.peerStore.get(peerId);
     if (!peer) {
@@ -135,6 +103,36 @@ class Metadata extends BaseProtocol implements IMetadata {
     return await this.query(peerId);
   }
 
+  /**
+   * Handle an incoming metadata request
+   */
+  private async onRequest(streamData: IncomingStreamData): Promise<void> {
+    try {
+      const { stream, connection } = streamData;
+      const encodedShardInfo = proto_metadata.WakuMetadataResponse.encode(
+        pubsubTopicsToShardInfo(this.pubsubTopics)
+      );
+
+      const encodedResponse = await pipe(
+        [encodedShardInfo],
+        lp.encode,
+        stream,
+        lp.decode,
+        async (source) => await all(source)
+      );
+
+      const { error, shardInfo } = this.decodeMetadataResponse(encodedResponse);
+
+      if (error) {
+        return;
+      }
+
+      await this.savePeerShardInfo(connection.remotePeer, shardInfo);
+    } catch (error) {
+      log.error("Error handling metadata request", error);
+    }
+  }
+
   private decodeMetadataResponse(
     encodedResponse: Uint8ArrayList[]
   ): MetadataQueryResult {
@@ -177,7 +175,8 @@ class Metadata extends BaseProtocol implements IMetadata {
 }
 
 export function wakuMetadata(
-  shardInfo: ShardInfo
+  pubsubTopics: PubsubTopic[]
 ): (components: Libp2pComponents) => IMetadata {
-  return (components: Libp2pComponents) => new Metadata(shardInfo, components);
+  return (components: Libp2pComponents) =>
+    new Metadata(pubsubTopics, components);
 }

package/src/lib/store/index.ts

@@ -1,13 +1,12 @@
 import type { Peer } from "@libp2p/interface";
 import {
-  Cursor,
   IDecodedMessage,
   IDecoder,
   IStoreCore,
   Libp2p,
-  ProtocolCreateOptions
+  PubsubTopic,
+  QueryRequestParams
 } from "@waku/interfaces";
-import { proto_store as proto } from "@waku/proto";
 import { Logger } from "@waku/utils";
 import all from "it-all";
 import * as lp from "it-length-prefixed";
@@ -17,63 +16,27 @@ import { Uint8ArrayList } from "uint8arraylist";
 import { BaseProtocol } from "../base_protocol.js";
 import { toProtoMessage } from "../to_proto_message.js";
 
-import { HistoryRpc, PageDirection, Params } from "./history_rpc.js";
-
-import HistoryError = proto.HistoryResponse.HistoryError;
+import {
+  DEFAULT_PAGE_SIZE,
+  MAX_PAGE_SIZE,
+  StoreQueryRequest,
+  StoreQueryResponse
+} from "./rpc.js";
 
 const log = new Logger("store");
 
-export const StoreCodec = "/vac/waku/store/2.0.0-beta4";
-
-export { PageDirection, Params };
-
-export interface TimeFilter {
-  startTime: Date;
-  endTime: Date;
-}
-
-export interface QueryOptions {
-  /**
-   * The direction in which pages are retrieved:
-   * - { @link PageDirection.BACKWARD }: Most recent page first.
-   * - { @link PageDirection.FORWARD }: Oldest page first.
-   *
-   * Note: This does not affect the ordering of messages with the page
-   * (the oldest message is always first).
-   *
-   * @default { @link PageDirection.BACKWARD }
-   */
-  pageDirection?: PageDirection;
-  /**
-   * The number of message per page.
-   *
-   * @default { @link DefaultPageSize }
-   */
-  pageSize?: number;
-  /**
-   * Retrieve messages with a timestamp within the provided values.
-   */
-  timeFilter?: TimeFilter;
-  /**
-   * Cursor as an index to start a query from.
-   * The cursor index will be exclusive (i.e. the message at the cursor index will not be included in the result).
-   * If undefined, the query will start from the beginning or end of the history, depending on the page direction.
-   */
-  cursor?: Cursor;
-}
+export const StoreCodec = "/vac/waku/store-query/3.0.0";
 
-/**
- * Implements the [Waku v2 Store protocol](https://rfc.vac.dev/spec/13/).
- *
- * The Waku Store protocol can be used to retrieved historical messages.
- */
 export class StoreCore extends BaseProtocol implements IStoreCore {
-  constructor(libp2p: Libp2p, options?: ProtocolCreateOptions) {
-    super(StoreCodec, libp2p.components, log, options!.pubsubTopics!, options);
+  public constructor(
+    public readonly pubsubTopics: PubsubTopic[],
+    libp2p: Libp2p
+  ) {
+    super(StoreCodec, libp2p.components, log, pubsubTopics);
   }
 
-  async *queryPerPage<T extends IDecodedMessage>(
-    queryOpts: Params,
+  public async *queryPerPage<T extends IDecodedMessage>(
+    queryOpts: QueryRequestParams,
     decoders: Map<string, IDecoder<T>>,
     peer: Peer
   ): AsyncGenerator<Promise<T | undefined>[]> {
@@ -86,11 +49,12 @@ export class StoreCore extends BaseProtocol implements IStoreCore {
       );
     }
 
-    let currentCursor = queryOpts.cursor;
+    let currentCursor = queryOpts.paginationCursor;
     while (true) {
-      queryOpts.cursor = currentCursor;
-
-      const historyRpcQuery = HistoryRpc.createQuery(queryOpts);
+      const storeQueryRequest = StoreQueryRequest.create({
+        ...queryOpts,
+        paginationCursor: currentCursor
+      });
 
       let stream;
       try {
@@ -101,7 +65,7 @@ export class StoreCore extends BaseProtocol implements IStoreCore {
       }
 
       const res = await pipe(
-        [historyRpcQuery.encode()],
+        [storeQueryRequest.encode()],
         lp.encode,
         stream,
         lp.decode,
@@ -113,61 +77,57 @@ export class StoreCore extends BaseProtocol implements IStoreCore {
         bytes.append(chunk);
       });
 
-      const reply = historyRpcQuery.decode(bytes);
-
-      if (!reply.response) {
-        log.warn("Stopping pagination due to store `response` field missing");
-        break;
-      }
-
-      const response = reply.response as proto.HistoryResponse;
+      const storeQueryResponse = StoreQueryResponse.decode(bytes);
 
-      if (response.error && response.error !== HistoryError.NONE) {
-        throw "History response contains an Error: " + response.error;
+      if (
+        !storeQueryResponse.statusCode ||
+        storeQueryResponse.statusCode >= 300
+      ) {
+        const errorMessage = `Store query failed with status code: ${storeQueryResponse.statusCode}, description: ${storeQueryResponse.statusDesc}`;
+        log.error(errorMessage);
+        throw new Error(errorMessage);
       }
 
-      if (!response.messages || !response.messages.length) {
-        log.warn(
-          "Stopping pagination due to store `response.messages` field missing or empty"
-        );
+      if (!storeQueryResponse.messages || !storeQueryResponse.messages.length) {
+        log.warn("Stopping pagination due to empty messages in response");
         break;
       }
 
-      log.error(`${response.messages.length} messages retrieved from store`);
+      log.info(
+        `${storeQueryResponse.messages.length} messages retrieved from store`
+      );
 
-      yield response.messages.map((protoMsg) => {
-        const contentTopic = protoMsg.contentTopic;
-        if (typeof contentTopic !== "undefined") {
+      const decodedMessages = storeQueryResponse.messages.map((protoMsg) => {
+        if (!protoMsg.message) {
+          return Promise.resolve(undefined);
+        }
+        const contentTopic = protoMsg.message.contentTopic;
+        if (contentTopic) {
           const decoder = decoders.get(contentTopic);
           if (decoder) {
             return decoder.fromProtoObj(
-              queryOpts.pubsubTopic,
-              toProtoMessage(protoMsg)
+              protoMsg.pubsubTopic || "",
+              toProtoMessage(protoMsg.message)
             );
           }
         }
         return Promise.resolve(undefined);
       });
 
-      const nextCursor = response.pagingInfo?.cursor;
-      if (typeof nextCursor === "undefined") {
-        // If the server does not return cursor then there is an issue,
-        // Need to abort, or we end up in an infinite loop
-        log.warn(
-          "Stopping pagination due to `response.pagingInfo.cursor` missing from store response"
-        );
-        break;
-      }
+      yield decodedMessages;
 
-      currentCursor = nextCursor;
+      if (queryOpts.paginationForward) {
+        currentCursor =
+          storeQueryResponse.messages[storeQueryResponse.messages.length - 1]
+            .messageHash;
+      } else {
+        currentCursor = storeQueryResponse.messages[0].messageHash;
+      }
 
-      const responsePageSize = response.pagingInfo?.pageSize;
-      const queryPageSize = historyRpcQuery.query?.pagingInfo?.pageSize;
       if (
-        // Response page size smaller than query, meaning this is the last page
-        responsePageSize &&
-        queryPageSize &&
-        responsePageSize < queryPageSize
+        storeQueryResponse.messages.length > MAX_PAGE_SIZE &&
+        storeQueryResponse.messages.length <
+          (queryOpts.paginationLimit || DEFAULT_PAGE_SIZE)
       ) {
         break;
       }

package/src/lib/store/rpc.ts

@@ -0,0 +1,92 @@
+import { QueryRequestParams } from "@waku/interfaces";
+import { proto_store as proto } from "@waku/proto";
+import type { Uint8ArrayList } from "uint8arraylist";
+import { v4 as uuid } from "uuid";
+
+// https://github.com/waku-org/nwaku/blob/7205f95cff9f49ca0bb762e8fd0bf56a6a7f3b3b/waku/waku_store/common.nim#L12
+export const DEFAULT_PAGE_SIZE = 20;
+export const MAX_PAGE_SIZE = 100;
+const ONE_MILLION = 1_000000;
+
+export class StoreQueryRequest {
+  public constructor(public proto: proto.StoreQueryRequest) {}
+
+  public static create(params: QueryRequestParams): StoreQueryRequest {
+    const request = new StoreQueryRequest({
+      ...params,
+      requestId: uuid(),
+      timeStart: params.timeStart
+        ? BigInt(params.timeStart.getTime() * ONE_MILLION)
+        : undefined,
+      timeEnd: params.timeEnd
+        ? BigInt(params.timeEnd.getTime() * ONE_MILLION)
+        : undefined,
+      messageHashes: params.messageHashes || [],
+      paginationLimit: params.paginationLimit
+        ? BigInt(params.paginationLimit)
+        : undefined
+    });
+
+    // Validate request parameters based on RFC
+    if (
+      (params.pubsubTopic && !params.contentTopics) ||
+      (!params.pubsubTopic && params.contentTopics)
+    ) {
+      throw new Error(
+        "Both pubsubTopic and contentTopics must be set or unset"
+      );
+    }
+
+    if (
+      params.messageHashes &&
+      (params.pubsubTopic ||
+        params.contentTopics ||
+        params.timeStart ||
+        params.timeEnd)
+    ) {
+      throw new Error(
+        "Message hash lookup queries cannot include content filter criteria"
+      );
+    }
+
+    return request;
+  }
+
+  public static decode(bytes: Uint8ArrayList): StoreQueryRequest {
+    const res = proto.StoreQueryRequest.decode(bytes);
+    return new StoreQueryRequest(res);
+  }
+
+  public encode(): Uint8Array {
+    return proto.StoreQueryRequest.encode(this.proto);
+  }
+}
+
+export class StoreQueryResponse {
+  public constructor(public proto: proto.StoreQueryResponse) {}
+
+  public static decode(bytes: Uint8ArrayList): StoreQueryResponse {
+    const res = proto.StoreQueryResponse.decode(bytes);
+    return new StoreQueryResponse(res);
+  }
+
+  public encode(): Uint8Array {
+    return proto.StoreQueryResponse.encode(this.proto);
+  }
+
+  public get statusCode(): number | undefined {
+    return this.proto.statusCode;
+  }
+
+  public get statusDesc(): string | undefined {
+    return this.proto.statusDesc;
+  }
+
+  public get messages(): proto.WakuMessageKeyValue[] {
+    return this.proto.messages;
+  }
+
+  public get paginationCursor(): Uint8Array | undefined {
+    return this.proto.paginationCursor;
+  }
+}

package/src/lib/stream_manager/index.ts

@@ -0,0 +1 @@
+export { StreamManager } from "./stream_manager.js";

package/src/lib/{stream_manager.ts → stream_manager/stream_manager.ts}

@@ -2,7 +2,8 @@ import type { PeerUpdate, Stream } from "@libp2p/interface";
 import type { Peer, PeerId } from "@libp2p/interface";
 import { Libp2p } from "@waku/interfaces";
 import { Logger } from "@waku/utils";
-import { selectConnection } from "@waku/utils/libp2p";
+
+import { selectConnection } from "./utils.js";
 
 const CONNECTION_TIMEOUT = 5_000;
 const RETRY_BACKOFF_BASE = 1_000;
@@ -12,7 +13,7 @@ export class StreamManager {
   private readonly streamPool: Map<string, Promise<Stream | void>>;
   private readonly log: Logger;
 
-  constructor(
+  public constructor(
     public multicodec: string,
     public getConnections: Libp2p["getConnections"],
     public addEventListener: Libp2p["addEventListener"]

package/src/lib/stream_manager/utils.ts

@@ -0,0 +1,22 @@
+import type { Connection } from "@libp2p/interface";
+
+export function selectConnection(
+  connections: Connection[]
+): Connection | undefined {
+  if (!connections.length) return;
+  if (connections.length === 1) return connections[0];
+
+  let latestConnection: Connection | undefined;
+
+  connections.forEach((connection) => {
+    if (connection.status === "open") {
+      if (!latestConnection) {
+        latestConnection = connection;
+      } else if (connection.timeline.open > latestConnection.timeline.open) {
+        latestConnection = connection;
+      }
+    }
+  });
+
+  return latestConnection;
+}

package/dist/lib/store/history_rpc.d.ts

@@ -1,27 +0,0 @@
-import { proto_store as proto } from "@waku/proto";
-import type { Uint8ArrayList } from "uint8arraylist";
-export declare enum PageDirection {
-    BACKWARD = "backward",
-    FORWARD = "forward"
-}
-export interface Params {
-    contentTopics: string[];
-    pubsubTopic: string;
-    pageDirection: PageDirection;
-    pageSize: number;
-    startTime?: Date;
-    endTime?: Date;
-    cursor?: proto.Index;
-}
-export declare class HistoryRpc {
-    readonly proto: proto.HistoryRpc;
-    private constructor();
-    get query(): proto.HistoryQuery | undefined;
-    get response(): proto.HistoryResponse | undefined;
-    /**
-     * Create History Query.
-     */
-    static createQuery(params: Params): HistoryRpc;
-    decode(bytes: Uint8ArrayList): HistoryRpc;
-    encode(): Uint8Array;
-}

package/dist/lib/store/history_rpc.js

@@ -1,72 +0,0 @@
-import { proto_store as proto } from "@waku/proto";
-import { v4 as uuid } from "uuid";
-const OneMillion = BigInt(1_000_000);
-export var PageDirection;
-(function (PageDirection) {
-    PageDirection["BACKWARD"] = "backward";
-    PageDirection["FORWARD"] = "forward";
-})(PageDirection || (PageDirection = {}));
-export class HistoryRpc {
-    proto;
-    constructor(proto) {
-        this.proto = proto;
-    }
-    get query() {
-        return this.proto.query;
-    }
-    get response() {
-        return this.proto.response;
-    }
-    /**
-     * Create History Query.
-     */
-    static createQuery(params) {
-        const contentFilters = params.contentTopics.map((contentTopic) => {
-            return { contentTopic };
-        });
-        const direction = directionToProto(params.pageDirection);
-        const pagingInfo = {
-            pageSize: BigInt(params.pageSize),
-            cursor: params.cursor,
-            direction
-        };
-        let startTime, endTime;
-        if (params.startTime) {
-            // milliseconds 10^-3 to nanoseconds 10^-9
-            startTime = BigInt(params.startTime.valueOf()) * OneMillion;
-        }
-        if (params.endTime) {
-            // milliseconds 10^-3 to nanoseconds 10^-9
-            endTime = BigInt(params.endTime.valueOf()) * OneMillion;
-        }
-        return new HistoryRpc({
-            requestId: uuid(),
-            query: {
-                pubsubTopic: params.pubsubTopic,
-                contentFilters,
-                pagingInfo,
-                startTime,
-                endTime
-            },
-            response: undefined
-        });
-    }
-    decode(bytes) {
-        const res = proto.HistoryRpc.decode(bytes);
-        return new HistoryRpc(res);
-    }
-    encode() {
-        return proto.HistoryRpc.encode(this.proto);
-    }
-}
-function directionToProto(pageDirection) {
-    switch (pageDirection) {
-        case PageDirection.BACKWARD:
-            return proto.PagingInfo.Direction.BACKWARD;
-        case PageDirection.FORWARD:
-            return proto.PagingInfo.Direction.FORWARD;
-        default:
-            return proto.PagingInfo.Direction.BACKWARD;
-    }
-}
-//# sourceMappingURL=history_rpc.js.map

package/dist/lib/store/history_rpc.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"history_rpc.js","sourceRoot":"","sources":["../../../src/lib/store/history_rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,IAAI,KAAK,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAC;AAElC,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;AAErC,MAAM,CAAN,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,sCAAqB,CAAA;IACrB,oCAAmB,CAAA;AACrB,CAAC,EAHW,aAAa,KAAb,aAAa,QAGxB;AAYD,MAAM,OAAO,UAAU;IACe;IAApC,YAAoC,KAAuB;QAAvB,UAAK,GAAL,KAAK,CAAkB;IAAG,CAAC;IAE/D,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;IAC1B,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;IAC7B,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,MAAc;QAC/B,MAAM,cAAc,GAAG,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE;YAC/D,OAAO,EAAE,YAAY,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,gBAAgB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAEzD,MAAM,UAAU,GAAG;YACjB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;YACjC,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,SAAS;SACU,CAAC;QAEtB,IAAI,SAAS,EAAE,OAAO,CAAC;QACvB,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACrB,0CAA0C;YAC1C,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,GAAG,UAAU,CAAC;QAC9D,CAAC;QAED,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,0CAA0C;YAC1C,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,GAAG,UAAU,CAAC;QAC1D,CAAC;QACD,OAAO,IAAI,UAAU,CAAC;YACpB,SAAS,EAAE,IAAI,EAAE;YACjB,KAAK,EAAE;gBACL,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,cAAc;gBACd,UAAU;gBACV,SAAS;gBACT,OAAO;aACR;YACD,QAAQ,EAAE,SAAS;SACpB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,KAAqB;QAC1B,MAAM,GAAG,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3C,OAAO,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM;QACJ,OAAO,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;CACF;AAED,SAAS,gBAAgB,CACvB,aAA4B;IAE5B,QAAQ,aAAa,EAAE,CAAC;QACtB,KAAK,aAAa,CAAC,QAAQ;YACzB,OAAO,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC;QAC7C,KAAK,aAAa,CAAC,OAAO;YACxB,OAAO,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC;QAC5C;YACE,OAAO,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC;IAC/C,CAAC;AACH,CAAC"}

package/dist/lib/stream_manager.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"stream_manager.js","sourceRoot":"","sources":["../../src/lib/stream_manager.ts"],"names":[],"mappings":"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"}

package/src/lib/store/history_rpc.ts

@@ -1,93 +0,0 @@
-import { proto_store as proto } from "@waku/proto";
-import type { Uint8ArrayList } from "uint8arraylist";
-import { v4 as uuid } from "uuid";
-
-const OneMillion = BigInt(1_000_000);
-
-export enum PageDirection {
-  BACKWARD = "backward",
-  FORWARD = "forward"
-}
-
-export interface Params {
-  contentTopics: string[];
-  pubsubTopic: string;
-  pageDirection: PageDirection;
-  pageSize: number;
-  startTime?: Date;
-  endTime?: Date;
-  cursor?: proto.Index;
-}
-
-export class HistoryRpc {
-  private constructor(public readonly proto: proto.HistoryRpc) {}
-
-  get query(): proto.HistoryQuery | undefined {
-    return this.proto.query;
-  }
-
-  get response(): proto.HistoryResponse | undefined {
-    return this.proto.response;
-  }
-
-  /**
-   * Create History Query.
-   */
-  static createQuery(params: Params): HistoryRpc {
-    const contentFilters = params.contentTopics.map((contentTopic) => {
-      return { contentTopic };
-    });
-
-    const direction = directionToProto(params.pageDirection);
-
-    const pagingInfo = {
-      pageSize: BigInt(params.pageSize),
-      cursor: params.cursor,
-      direction
-    } as proto.PagingInfo;
-
-    let startTime, endTime;
-    if (params.startTime) {
-      // milliseconds 10^-3 to nanoseconds 10^-9
-      startTime = BigInt(params.startTime.valueOf()) * OneMillion;
-    }
-
-    if (params.endTime) {
-      // milliseconds 10^-3 to nanoseconds 10^-9
-      endTime = BigInt(params.endTime.valueOf()) * OneMillion;
-    }
-    return new HistoryRpc({
-      requestId: uuid(),
-      query: {
-        pubsubTopic: params.pubsubTopic,
-        contentFilters,
-        pagingInfo,
-        startTime,
-        endTime
-      },
-      response: undefined
-    });
-  }
-
-  decode(bytes: Uint8ArrayList): HistoryRpc {
-    const res = proto.HistoryRpc.decode(bytes);
-    return new HistoryRpc(res);
-  }
-
-  encode(): Uint8Array {
-    return proto.HistoryRpc.encode(this.proto);
-  }
-}
-
-function directionToProto(
-  pageDirection: PageDirection
-): proto.PagingInfo.Direction {
-  switch (pageDirection) {
-    case PageDirection.BACKWARD:
-      return proto.PagingInfo.Direction.BACKWARD;
-    case PageDirection.FORWARD:
-      return proto.PagingInfo.Direction.FORWARD;
-    default:
-      return proto.PagingInfo.Direction.BACKWARD;
-  }
-}