feat!: @waku/relay

package.json

@@ -8,6 +8,7 @@
     "packages/interfaces",
     "packages/enr",
     "packages/core",
+    "packages/relay",
     "packages/peer-exchange",
     "packages/dns-discovery",
     "packages/message-encryption",

packages/core/package.json

@@ -74,7 +74,6 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@chainsafe/libp2p-gossipsub": "^6.1.0",
     "@noble/hashes": "^1.3.0",
     "@waku/interfaces": "0.0.11",
     "@waku/proto": "0.0.4",

packages/core/src/index.ts

@@ -1,4 +1,4 @@
-export { DefaultPubSubTopic } from "./lib/constants.js";
+export { DefaultPubSubTopic } from "@waku/utils/constants";
 export { DefaultUserAgent } from "./lib/waku.js";
 
 export { createEncoder, createDecoder } from "./lib/message/version_0.js";
@@ -7,6 +7,7 @@ export type {
   Decoder,
   DecodedMessage,
 } from "./lib/message/version_0.js";
+export { TopicOnlyDecoder } from "./lib/message/topic_only_message.js";
 export * as message from "./lib/message/index.js";
 
 export * as waku from "./lib/waku.js";
@@ -18,13 +19,6 @@ export { wakuFilter } from "./lib/filter/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,

packages/core/src/lib/filter/index.ts

@@ -11,14 +11,14 @@ import type {
   ProtocolOptions,
 } from "@waku/interfaces";
 import { WakuMessage as WakuMessageProto } from "@waku/proto";
+import { groupByContentTopic } from "@waku/utils";
+import { DefaultPubSubTopic } from "@waku/utils/constants";
 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 { ContentFilter, FilterRpc } from "./filter_rpc.js";

packages/core/src/lib/keep_alive_manager.ts

@@ -1,12 +1,11 @@
 import type { PeerId } from "@libp2p/interface-peer-id";
 import type { IRelay } from "@waku/interfaces";
+import { RelayPingContentTopic } from "@waku/utils/constants";
 import debug from "debug";
 import type { Libp2p } from "libp2p";
 
 import { createEncoder } from "../index.js";
 
-import { RelayPingContentTopic } from "./relay/constants.js";
-
 const log = debug("waku:keep-alive");
 
 export interface KeepAliveOptions {

packages/core/src/lib/light_push/index.ts

@@ -9,14 +9,14 @@ import type {
   SendResult,
 } from "@waku/interfaces";
 import { PushResponse } from "@waku/proto";
+import { DefaultPubSubTopic } from "@waku/utils/constants";
 import debug from "debug";
 import all from "it-all";
 import * as lp from "it-length-prefixed";
 import { pipe } from "it-pipe";
 import { Uint8ArrayList } from "uint8arraylist";
 
 import { BaseProtocol } from "../base_protocol.js";
-import { DefaultPubSubTopic } from "../constants.js";
 
 import { PushRpc } from "./push_rpc.js";
 

packages/core/src/lib/store/index.ts

@@ -12,14 +12,14 @@ import {
 import { proto_store as proto } from "@waku/proto";
 import { isDefined } from "@waku/utils";
 import { concat, utf8ToBytes } from "@waku/utils/bytes";
+import { DefaultPubSubTopic } from "@waku/utils/constants";
 import debug from "debug";
 import all from "it-all";
 import * as lp from "it-length-prefixed";
 import { pipe } from "it-pipe";
 import { Uint8ArrayList } from "uint8arraylist";
 
 import { BaseProtocol } from "../base_protocol.js";
-import { DefaultPubSubTopic } from "../constants.js";
 import { toProtoMessage } from "../to_proto_message.js";
 
 import { HistoryRpc, PageDirection, Params } from "./history_rpc.js";

packages/create/package.json

@@ -53,6 +53,7 @@
     "@libp2p/websockets": "^5.0.3",
     "@waku/core": "0.0.16",
     "@waku/dns-discovery": "0.0.10",
+    "@waku/relay": "^0.0.1",
     "libp2p": "^0.42.2"
   },
   "devDependencies": {

packages/create/src/index.ts

@@ -7,13 +7,10 @@ import { webSockets } from "@libp2p/websockets";
 import { all as filterAll } from "@libp2p/websockets/filters";
 import {
   DefaultUserAgent,
-  RelayCreateOptions,
   wakuFilter,
-  wakuGossipSub,
   wakuLightPush,
   WakuNode,
   WakuOptions,
-  wakuRelay,
   wakuStore,
 } from "@waku/core";
 import { enrTree, wakuDnsDiscovery } from "@waku/dns-discovery";
@@ -23,6 +20,7 @@ import type {
   ProtocolCreateOptions,
   RelayNode,
 } from "@waku/interfaces";
+import { RelayCreateOptions, wakuGossipSub, wakuRelay } from "@waku/relay";
 import { createLibp2p, Libp2pOptions } from "libp2p";
 
 import type { Libp2pComponents } from "./libp2p_components.js";

packages/relay/.eslintrc.cjs

@@ -0,0 +1,6 @@
+module.exports = {
+  parserOptions: {
+    tsconfigRootDir: __dirname,
+    project: "./tsconfig.dev.json",
+  },
+};

packages/relay/.mocharc.json

@@ -0,0 +1,11 @@
+{
+  "extension": ["ts"],
+  "spec": "src/**/*.spec.ts",
+  "require": ["ts-node/register", "isomorphic-fetch"],
+  "loader": "ts-node/esm",
+  "node-option": [
+    "experimental-specifier-resolution=node",
+    "loader=ts-node/esm"
+  ],
+  "exit": true
+}