@waku/core 0.0.17 → 0.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waku/core",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "description": "TypeScript implementation of the Waku v2 protocol",
   "types": "./dist/index.d.ts",
   "module": "./dist/index.js",
@@ -17,10 +17,6 @@
       "types": "./dist/lib/message/version_0.d.ts",
       "import": "./dist/lib/message/version_0.js"
     },
-    "./lib/message/topic_only_message": {
-      "types": "./dist/lib/message/topic_only_message.d.ts",
-      "import": "./dist/lib/message/topic_only_message.js"
-    },
     "./lib/base_protocol": {
       "types": "./dist/lib/base_protocol.d.ts",
       "import": "./dist/lib/base_protocol.js"
@@ -30,6 +26,9 @@
     "*": {
       "lib/*": [
         "dist/lib/*"
+      ],
+      "constants/*": [
+        "dist/constants/*"
       ]
     }
   },
@@ -57,7 +56,6 @@
     "build:bundle": "rollup --config rollup.config.js",
     "fix": "run-s fix:*",
     "fix:lint": "eslint src *.js --fix",
-    "pretest": "run-s pretest:*",
     "check": "run-s check:*",
     "check:tsc": "tsc -p tsconfig.dev.json",
     "check:lint": "eslint src *.js",
@@ -74,12 +72,10 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@chainsafe/libp2p-gossipsub": "^6.1.0",
-    "@libp2p/interface-pubsub": "^3.0.7",
     "@noble/hashes": "^1.3.0",
-    "@waku/interfaces": "0.0.12",
-    "@waku/proto": "0.0.4",
-    "@waku/utils": "0.0.5",
+    "@waku/interfaces": "0.0.14",
+    "@waku/proto": "0.0.5",
+    "@waku/utils": "0.0.7",
     "debug": "^4.3.4",
     "it-all": "^3.0.1",
     "it-length-prefixed": "^9.0.1",
@@ -124,11 +120,11 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.8",
     "process": "^0.11.10",
-    "puppeteer": "^19.8.2",
+    "puppeteer": "^20.4.0",
     "rollup": "^3.21.3",
     "ts-loader": "^9.4.2",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.5"
+    "typescript": "^5.0.4"
   },
   "peerDependencies": {
     "@multiformats/multiaddr": "^12.0.0",

package/src/index.ts

@@ -1,6 +1,5 @@
-export { DefaultPubSubTopic } from "./lib/constants.js";
 export { DefaultUserAgent } from "./lib/waku.js";
-
+export { DefaultPubSubTopic } from "./lib/constants.js";
 export { createEncoder, createDecoder } from "./lib/message/version_0.js";
 export type {
   Encoder,
@@ -12,19 +11,15 @@ export * as message from "./lib/message/index.js";
 export * as waku from "./lib/waku.js";
 export { WakuNode, WakuOptions } from "./lib/waku.js";
 
-export * as waku_filter from "./lib/filter/index.js";
-export { wakuFilter } from "./lib/filter/index.js";
+export * as waku_filter_v1 from "./lib/filter/v1/index.js";
+export { wakuFilter as wakuFilterV1 } from "./lib/filter/v1/index.js";
+
+export * as waku_filter_v2 from "./lib/filter/v2/index.js";
+export { wakuFilterV2 } from "./lib/filter/v2/index.js";
 
 export * as waku_light_push from "./lib/light_push/index.js";
 export { wakuLightPush, LightPushCodec } from "./lib/light_push/index.js";
 
-export * as waku_relay from "./lib/relay/index.js";
-export {
-  wakuRelay,
-  RelayCreateOptions,
-  wakuGossipSub,
-} from "./lib/relay/index.js";
-
 export * as waku_store from "./lib/store/index.js";
 export {
   PageDirection,

package/src/lib/connection_manager.ts

@@ -19,6 +19,7 @@ export class ConnectionManager {
   private options: ConnectionManagerOptions;
   private libp2pComponents: Libp2p;
   private dialAttemptsForPeer: Map<string, number> = new Map();
+  private dialErrorsForPeer: Map<string, any> = new Map();
 
   public static create(
     peerId: string,
@@ -102,9 +103,11 @@ export class ConnectionManager {
 
         this.dialAttemptsForPeer.delete(peerId.toString());
         return;
-      } catch (error) {
-        log(`
-          Error dialing peer ${peerId.toString()}`);
+      } catch (e) {
+        const error = e as AggregateError;
+        this.dialErrorsForPeer.set(peerId.toString(), error);
+        log(`Error dialing peer ${peerId.toString()} - ${error.errors}`);
+
         dialAttempt = this.dialAttemptsForPeer.get(peerId.toString()) ?? 1;
         this.dialAttemptsForPeer.set(peerId.toString(), dialAttempt + 1);
 
@@ -115,7 +118,13 @@ export class ConnectionManager {
     }
 
     try {
-      log(`Deleting undialable peer ${peerId.toString()} from peer store`);
+      log(
+        `Deleting undialable peer ${peerId.toString()} from peer store. Error: ${JSON.stringify(
+          this.dialErrorsForPeer.get(peerId.toString()).errors[0]
+        )}
+        }`
+      );
+      this.dialErrorsForPeer.delete(peerId.toString());
       return await this.libp2pComponents.peerStore.delete(peerId);
     } catch (error) {
       throw `Error deleting undialable peer ${peerId.toString()} from peer store - ${error}`;

package/src/lib/filter/{filter_rpc.ts → v1/filter_rpc.ts}

@@ -1,10 +1,7 @@
+import { ContentFilter } from "@waku/interfaces";
 import { proto_filter as proto } from "@waku/proto";
 import { v4 as uuid } from "uuid";
 
-export type ContentFilter = {
-  contentTopic: string;
-};
-
 /**
  * FilterRPC represents a message conforming to the Waku Filter protocol
  */

package/src/lib/filter/{index.ts → v1/index.ts}

@@ -4,6 +4,7 @@ import type { IncomingStreamData } from "@libp2p/interface-registrar";
 import type {
   ActiveSubscriptions,
   Callback,
+  ContentFilter,
   IAsyncIterator,
   IDecodedMessage,
   IDecoder,
@@ -12,20 +13,18 @@ import type {
   ProtocolOptions,
 } from "@waku/interfaces";
 import { WakuMessage as WakuMessageProto } from "@waku/proto";
+import { groupByContentTopic } from "@waku/utils";
 import { toAsyncIterator } from "@waku/utils";
 import debug from "debug";
 import all from "it-all";
 import * as lp from "it-length-prefixed";
 import { pipe } from "it-pipe";
 
-import { BaseProtocol } from "../base_protocol.js";
-import { DefaultPubSubTopic } from "../constants.js";
-import { groupByContentTopic } from "../group_by.js";
-import { toProtoMessage } from "../to_proto_message.js";
+import { BaseProtocol } from "../../base_protocol.js";
+import { DefaultPubSubTopic } from "../../constants.js";
+import { toProtoMessage } from "../../to_proto_message.js";
 
-import { ContentFilter, FilterRpc } from "./filter_rpc.js";
-
-export { ContentFilter };
+import { FilterRpc } from "./filter_rpc.js";
 
 export const FilterCodec = "/vac/waku/filter/2.0.0-beta1";
 

package/src/lib/filter/v2/filter_rpc.ts

@@ -0,0 +1,131 @@
+import { proto_filter_v2 as proto, WakuMessage } from "@waku/proto";
+import { v4 as uuid } from "uuid";
+
+/**
+ * FilterPushRPC represents a message conforming to the Waku FilterPush protocol.
+ * Protocol documentation: https://rfc.vac.dev/spec/12/
+ */
+export class FilterPushRpc {
+  public constructor(public proto: proto.MessagePush) {}
+
+  static decode(bytes: Uint8Array): FilterPushRpc {
+    const res = proto.MessagePush.decode(bytes);
+    return new FilterPushRpc(res);
+  }
+
+  encode(): Uint8Array {
+    return proto.MessagePush.encode(this.proto);
+  }
+
+  get wakuMessage(): WakuMessage | undefined {
+    return this.proto.wakuMessage;
+  }
+
+  /**
+   * Get the pubsub topic from the FilterPushRpc object.
+   * @returns string
+   */
+  get pubsubTopic(): string | undefined {
+    return this.proto.pubsubTopic;
+  }
+}
+
+export class FilterSubscribeRpc {
+  public constructor(public proto: proto.FilterSubscribeRequest) {}
+
+  static createSubscribeRequest(
+    pubsubTopic: string,
+    contentTopics: string[]
+  ): FilterSubscribeRpc {
+    return new FilterSubscribeRpc({
+      requestId: uuid(),
+      filterSubscribeType:
+        proto.FilterSubscribeRequest.FilterSubscribeType.SUBSCRIBE,
+      pubsubTopic,
+      contentTopics,
+    });
+  }
+
+  static createUnsubscribeRequest(
+    pubsubTopic: string,
+    contentTopics: string[]
+  ): FilterSubscribeRpc {
+    return new FilterSubscribeRpc({
+      requestId: uuid(),
+      filterSubscribeType:
+        proto.FilterSubscribeRequest.FilterSubscribeType.UNSUBSCRIBE,
+      pubsubTopic,
+      contentTopics,
+    });
+  }
+
+  static createUnsubscribeAllRequest(pubsubTopic: string): FilterSubscribeRpc {
+    return new FilterSubscribeRpc({
+      requestId: uuid(),
+      filterSubscribeType:
+        proto.FilterSubscribeRequest.FilterSubscribeType.UNSUBSCRIBE_ALL,
+      pubsubTopic,
+      contentTopics: [],
+    });
+  }
+
+  static createSubscriberPingRequest(): FilterSubscribeRpc {
+    return new FilterSubscribeRpc({
+      requestId: uuid(),
+      filterSubscribeType:
+        proto.FilterSubscribeRequest.FilterSubscribeType.SUBSCRIBER_PING,
+      pubsubTopic: "",
+      contentTopics: [],
+    });
+  }
+
+  static decode(bytes: Uint8Array): FilterSubscribeRpc {
+    const res = proto.FilterSubscribeRequest.decode(bytes);
+    return new FilterSubscribeRpc(res);
+  }
+
+  encode(): Uint8Array {
+    return proto.FilterSubscribeRequest.encode(this.proto);
+  }
+
+  get filterSubscribeType(): proto.FilterSubscribeRequest.FilterSubscribeType {
+    return this.proto.filterSubscribeType;
+  }
+
+  get requestId(): string {
+    return this.proto.requestId;
+  }
+
+  get pubsubTopic(): string | undefined {
+    return this.proto.pubsubTopic;
+  }
+
+  get contentTopics(): string[] {
+    return this.proto.contentTopics;
+  }
+}
+
+export class FilterSubscribeResponse {
+  public constructor(public proto: proto.FilterSubscribeResponse) {}
+
+  static decode(bytes: Uint8Array): FilterSubscribeResponse {
+    const res = proto.FilterSubscribeResponse.decode(bytes);
+    return new FilterSubscribeResponse(res);
+  }
+
+  encode(): Uint8Array {
+    return proto.FilterSubscribeResponse.encode(this.proto);
+  }
+
+  get statusCode(): number {
+    return this.proto.statusCode;
+  }
+
+  get statusDesc(): string | undefined {
+    return this.proto.statusDesc;
+  }
+
+  get requestId(): string {
+    return this.proto.requestId;
+  }
+}