@waku/core 0.0.26 → 0.0.27

package/src/lib/metadata/index.ts

@@ -1,14 +1,13 @@
-import type { PeerId } from "@libp2p/interface/peer-id";
-import { IncomingStreamData } from "@libp2p/interface/stream-handler";
-import { encodeRelayShard } from "@waku/enr";
+import type { PeerId } from "@libp2p/interface";
+import { IncomingStreamData } from "@libp2p/interface";
 import type {
   IMetadata,
   Libp2pComponents,
-  ShardInfo,
-  ShardingParams
+  PeerIdStr,
+  ShardInfo
 } from "@waku/interfaces";
 import { proto_metadata } from "@waku/proto";
-import { Logger } from "@waku/utils";
+import { encodeRelayShard, Logger, shardInfoToPubsubTopics } from "@waku/utils";
 import all from "it-all";
 import * as lp from "it-length-prefixed";
 import { pipe } from "it-pipe";
@@ -20,13 +19,21 @@ const log = new Logger("metadata");
 
 export const MetadataCodec = "/vac/waku/metadata/1.0.0";
 
-class Metadata extends BaseProtocol {
-  private readonly shardInfo: ShardingParams;
+class Metadata extends BaseProtocol implements IMetadata {
   private libp2pComponents: Libp2pComponents;
-  constructor(shardInfo: ShardingParams, libp2p: Libp2pComponents) {
-    super(MetadataCodec, libp2p.components);
+  handshakesConfirmed: Set<PeerIdStr> = new Set();
+
+  constructor(
+    public shardInfo: ShardInfo,
+    libp2p: Libp2pComponents
+  ) {
+    super(
+      MetadataCodec,
+      libp2p.components,
+      log,
+      shardInfoToPubsubTopics(shardInfo)
+    );
     this.libp2pComponents = libp2p;
-    this.shardInfo = shardInfo;
     void libp2p.registrar.handle(MetadataCodec, (streamData) => {
       void this.onRequest(streamData);
     });
@@ -53,12 +60,10 @@ class Metadata extends BaseProtocol {
       const remoteShardInfoResponse =
         this.decodeMetadataResponse(encodedResponse);
 
-      // add or update the shardInfo to peer store
-      await this.libp2pComponents.peerStore.merge(connection.remotePeer, {
-        metadata: {
-          shardInfo: encodeRelayShard(remoteShardInfoResponse)
-        }
-      });
+      await this.savePeerShardInfo(
+        connection.remotePeer,
+        remoteShardInfoResponse
+      );
     } catch (error) {
       log.error("Error handling metadata request", error);
     }
@@ -70,7 +75,10 @@ class Metadata extends BaseProtocol {
   async query(peerId: PeerId): Promise<ShardInfo> {
     const request = proto_metadata.WakuMetadataRequest.encode(this.shardInfo);
 
-    const peer = await this.getPeer(peerId);
+    const peer = await this.peerStore.get(peerId);
+    if (!peer) {
+      throw new Error(`Peer ${peerId.toString()} not found`);
+    }
 
     const stream = await this.getStream(peer);
 
@@ -84,9 +92,19 @@ class Metadata extends BaseProtocol {
 
     const decodedResponse = this.decodeMetadataResponse(encodedResponse);
 
+    await this.savePeerShardInfo(peerId, decodedResponse);
+
     return decodedResponse;
   }
 
+  public async confirmOrAttemptHandshake(peerId: PeerId): Promise<void> {
+    if (this.handshakesConfirmed.has(peerId.toString())) return;
+
+    await this.query(peerId);
+
+    return;
+  }
+
   private decodeMetadataResponse(encodedResponse: Uint8ArrayList[]): ShardInfo {
     const bytes = new Uint8ArrayList();
 
@@ -101,10 +119,24 @@ class Metadata extends BaseProtocol {
 
     return response;
   }
+
+  private async savePeerShardInfo(
+    peerId: PeerId,
+    shardInfo: ShardInfo
+  ): Promise<void> {
+    // add or update the shardInfo to peer store
+    await this.libp2pComponents.peerStore.merge(peerId, {
+      metadata: {
+        shardInfo: encodeRelayShard(shardInfo)
+      }
+    });
+
+    this.handshakesConfirmed.add(peerId.toString());
+  }
 }
 
 export function wakuMetadata(
-  shardInfo: ShardingParams
+  shardInfo: ShardInfo
 ): (components: Libp2pComponents) => IMetadata {
   return (components: Libp2pComponents) => new Metadata(shardInfo, components);
 }

package/src/lib/store/index.ts

@@ -1,4 +1,4 @@
-import type { Stream } from "@libp2p/interface/connection";
+import type { Stream } from "@libp2p/interface";
 import { sha256 } from "@noble/hashes/sha256";
 import {
   Cursor,
@@ -6,8 +6,7 @@ import {
   IDecoder,
   IStore,
   Libp2p,
-  ProtocolCreateOptions,
-  PubsubTopic
+  ProtocolCreateOptions
 } from "@waku/interfaces";
 import { proto_store as proto } from "@waku/proto";
 import { ensurePubsubTopicIsConfigured, isDefined } from "@waku/utils";
@@ -74,12 +73,10 @@ export interface QueryOptions {
  * The Waku Store protocol can be used to retrieved historical messages.
  */
 class Store extends BaseProtocol implements IStore {
-  private readonly pubsubTopics: PubsubTopic[];
   private readonly NUM_PEERS_PROTOCOL = 1;
 
   constructor(libp2p: Libp2p, options?: ProtocolCreateOptions) {
-    super(StoreCodec, libp2p.components);
-    this.pubsubTopics = this.initializePubsubTopic(options);
+    super(StoreCodec, libp2p.components, log, options!.pubsubTopics!, options);
   }
 
   /**

package/src/lib/stream_manager.ts

@@ -1,6 +1,5 @@
-import type { PeerUpdate } from "@libp2p/interface";
-import type { Stream } from "@libp2p/interface/connection";
-import { Peer } from "@libp2p/interface/peer-store";
+import type { PeerUpdate, Stream } from "@libp2p/interface";
+import { Peer } from "@libp2p/interface";
 import { Libp2p } from "@waku/interfaces";
 import { Logger } from "@waku/utils";
 import { selectConnection } from "@waku/utils/libp2p";

package/src/lib/wait_for_remote_peer.ts

@@ -1,15 +1,14 @@
 import type { IdentifyResult } from "@libp2p/interface";
-import type { IBaseProtocol, IRelay, Waku } from "@waku/interfaces";
+import type { IBaseProtocol, IMetadata, IRelay, Waku } from "@waku/interfaces";
 import { Protocols } from "@waku/interfaces";
 import { Logger } from "@waku/utils";
 import { pEvent } from "p-event";
-
 const log = new Logger("wait-for-remote-peer");
 
 /**
  * Wait for a remote peer to be ready given the passed protocols.
  * Must be used after attempting to connect to nodes, using
- * {@link @waku/core!WakuNode.dial} or a bootstrap method with
+ * {@link @waku/sdk!WakuNode.dial} or a bootstrap method with
  * {@link @waku/sdk!createLightNode}.
  *
  * If the passed protocols is a GossipSub protocol, then it resolves only once
@@ -45,19 +44,25 @@ export async function waitForRemotePeer(
   if (protocols.includes(Protocols.Store)) {
     if (!waku.store)
       throw new Error("Cannot wait for Store peer: protocol not mounted");
-    promises.push(waitForConnectedPeer(waku.store));
+    promises.push(
+      waitForConnectedPeer(waku.store, waku.libp2p.services.metadata)
+    );
   }
 
   if (protocols.includes(Protocols.LightPush)) {
     if (!waku.lightPush)
       throw new Error("Cannot wait for LightPush peer: protocol not mounted");
-    promises.push(waitForConnectedPeer(waku.lightPush));
+    promises.push(
+      waitForConnectedPeer(waku.lightPush, waku.libp2p.services.metadata)
+    );
   }
 
   if (protocols.includes(Protocols.Filter)) {
     if (!waku.filter)
       throw new Error("Cannot wait for Filter peer: protocol not mounted");
-    promises.push(waitForConnectedPeer(waku.filter));
+    promises.push(
+      waitForConnectedPeer(waku.filter, waku.libp2p.services.metadata)
+    );
   }
 
   if (timeoutMs) {
@@ -73,21 +78,62 @@ export async function waitForRemotePeer(
 
 /**
  * Wait for a peer with the given protocol to be connected.
+ * If sharding is enabled on the node, it will also wait for the peer to be confirmed by the metadata service.
  */
-async function waitForConnectedPeer(protocol: IBaseProtocol): Promise<void> {
+async function waitForConnectedPeer(
+  protocol: IBaseProtocol,
+  metadataService?: IMetadata
+): Promise<void> {
   const codec = protocol.multicodec;
-  const peers = await protocol.peers();
+  const peers = await protocol.connectedPeers();
 
   if (peers.length) {
-    log.info(`${codec} peer found: `, peers[0].id.toString());
-    return;
+    if (!metadataService) {
+      log.info(`${codec} peer found: `, peers[0].id.toString());
+      return;
+    }
+
+    // once a peer is connected, we need to confirm the metadata handshake with at least one of those peers if sharding is enabled
+    try {
+      await Promise.any(
+        peers.map((peer) => metadataService.confirmOrAttemptHandshake(peer.id))
+      );
+      return;
+    } catch (e) {
+      if ((e as any).code === "ERR_CONNECTION_BEING_CLOSED")
+        log.error(
+          `Connection with the peer was closed and possibly because it's on a different shard. Error: ${e}`
+        );
+
+      log.error(`Error waiting for handshake confirmation: ${e}`);
+    }
   }
 
+  log.info(`Waiting for ${codec} peer`);
+
+  // else we'll just wait for the next peer to connect
   await new Promise<void>((resolve) => {
     const cb = (evt: CustomEvent<IdentifyResult>): void => {
       if (evt.detail?.protocols?.includes(codec)) {
-        protocol.removeLibp2pEventListener("peer:identify", cb);
-        resolve();
+        if (metadataService) {
+          metadataService
+            .confirmOrAttemptHandshake(evt.detail.peerId)
+            .then(() => {
+              protocol.removeLibp2pEventListener("peer:identify", cb);
+              resolve();
+            })
+            .catch((e) => {
+              if (e.code === "ERR_CONNECTION_BEING_CLOSED")
+                log.error(
+                  `Connection with the peer was closed and possibly because it's on a different shard. Error: ${e}`
+                );
+
+              log.error(`Error waiting for handshake confirmation: ${e}`);
+            });
+        } else {
+          protocol.removeLibp2pEventListener("peer:identify", cb);
+          resolve();
+        }
       }
     };
     protocol.addLibp2pEventListener("peer:identify", cb);

package/dist/lib/waku.d.ts

@@ -1,57 +0,0 @@
-import type { Stream } from "@libp2p/interface/connection";
-import { PeerId } from "@libp2p/interface/peer-id";
-import { MultiaddrInput } from "@multiformats/multiaddr";
-import type { IFilter, ILightPush, IRelay, IStore, Libp2p, PubsubTopic, ShardingParams, Waku } from "@waku/interfaces";
-import { Protocols } from "@waku/interfaces";
-import { ConnectionManager } from "./connection_manager.js";
-export declare const DefaultPingKeepAliveValueSecs: number;
-export declare const DefaultRelayKeepAliveValueSecs: number;
-export declare const DefaultUserAgent = "js-waku";
-export interface WakuOptions {
-    /**
-     * Set keep alive frequency in seconds: Waku will send a `/ipfs/ping/1.0.0`
-     * request to each peer after the set number of seconds. Set to 0 to disable.
-     *
-     * @default {@link @waku/core.DefaultPingKeepAliveValueSecs}
-     */
-    pingKeepAlive?: number;
-    /**
-     * Set keep alive frequency in seconds: Waku will send a ping message over
-     * relay to each peer after the set number of seconds. Set to 0 to disable.
-     *
-     * @default {@link @waku/core.DefaultRelayKeepAliveValueSecs}
-     */
-    relayKeepAlive?: number;
-    /**
-     * Set the user agent string to be used in identification of the node.
-     * @default {@link @waku/core.DefaultUserAgent}
-     */
-    userAgent?: string;
-}
-export declare class WakuNode implements Waku {
-    libp2p: Libp2p;
-    relay?: IRelay;
-    store?: IStore;
-    filter?: IFilter;
-    lightPush?: ILightPush;
-    connectionManager: ConnectionManager;
-    readonly pubsubTopics: PubsubTopic[];
-    constructor(options: WakuOptions, pubsubTopics: string[] | undefined, libp2p: Libp2p, pubsubShardInfo?: ShardingParams, store?: (libp2p: Libp2p) => IStore, lightPush?: (libp2p: Libp2p) => ILightPush, filter?: (libp2p: Libp2p) => IFilter, relay?: (libp2p: Libp2p) => IRelay);
-    /**
-     * Dials to the provided peer.
-     *
-     * @param peer The peer to dial
-     * @param protocols Waku protocols we expect from the peer; Defaults to mounted protocols
-     */
-    dial(peer: PeerId | MultiaddrInput, protocols?: Protocols[]): Promise<Stream>;
-    start(): Promise<void>;
-    stop(): Promise<void>;
-    isStarted(): boolean;
-    isConnected(): boolean;
-    /**
-     * Return the local multiaddr with peer id on which libp2p is listening.
-     *
-     * @throws if libp2p is not listening on localhost.
-     */
-    getLocalMultiaddrWithID(): string;
-}

package/dist/lib/waku.js

@@ -1,130 +0,0 @@
-import { isPeerId } from "@libp2p/interface/peer-id";
-import { multiaddr } from "@multiformats/multiaddr";
-import { DefaultPubsubTopic, Protocols } from "@waku/interfaces";
-import { Logger, shardInfoToPubsubTopics } from "@waku/utils";
-import { ConnectionManager } from "./connection_manager.js";
-export const DefaultPingKeepAliveValueSecs = 5 * 60;
-export const DefaultRelayKeepAliveValueSecs = 5 * 60;
-export const DefaultUserAgent = "js-waku";
-const log = new Logger("waku");
-export class WakuNode {
-    libp2p;
-    relay;
-    store;
-    filter;
-    lightPush;
-    connectionManager;
-    pubsubTopics;
-    constructor(options, pubsubTopics = [], libp2p, pubsubShardInfo, store, lightPush, filter, relay) {
-        if (!pubsubShardInfo) {
-            this.pubsubTopics =
-                pubsubTopics.length > 0 ? pubsubTopics : [DefaultPubsubTopic];
-        }
-        else {
-            this.pubsubTopics = shardInfoToPubsubTopics(pubsubShardInfo);
-        }
-        this.libp2p = libp2p;
-        if (store) {
-            this.store = store(libp2p);
-        }
-        if (filter) {
-            this.filter = filter(libp2p);
-        }
-        if (lightPush) {
-            this.lightPush = lightPush(libp2p);
-        }
-        if (relay) {
-            this.relay = relay(libp2p);
-        }
-        const pingKeepAlive = options.pingKeepAlive || DefaultPingKeepAliveValueSecs;
-        const relayKeepAlive = this.relay
-            ? options.relayKeepAlive || DefaultRelayKeepAliveValueSecs
-            : 0;
-        const peerId = this.libp2p.peerId.toString();
-        this.connectionManager = ConnectionManager.create(peerId, libp2p, { pingKeepAlive, relayKeepAlive }, this.pubsubTopics, this.relay);
-        log.info("Waku node created", peerId, `relay: ${!!this.relay}, store: ${!!this.store}, light push: ${!!this
-            .lightPush}, filter: ${!!this.filter}`);
-    }
-    /**
-     * Dials to the provided peer.
-     *
-     * @param peer The peer to dial
-     * @param protocols Waku protocols we expect from the peer; Defaults to mounted protocols
-     */
-    async dial(peer, protocols) {
-        const _protocols = protocols ?? [];
-        const peerId = mapToPeerIdOrMultiaddr(peer);
-        if (typeof protocols === "undefined") {
-            this.relay && _protocols.push(Protocols.Relay);
-            this.store && _protocols.push(Protocols.Store);
-            this.filter && _protocols.push(Protocols.Filter);
-            this.lightPush && _protocols.push(Protocols.LightPush);
-        }
-        const codecs = [];
-        if (_protocols.includes(Protocols.Relay)) {
-            if (this.relay) {
-                this.relay.gossipSub.multicodecs.forEach((codec) => codecs.push(codec));
-            }
-            else {
-                log.error("Relay codec not included in dial codec: protocol not mounted locally");
-            }
-        }
-        if (_protocols.includes(Protocols.Store)) {
-            if (this.store) {
-                codecs.push(this.store.multicodec);
-            }
-            else {
-                log.error("Store codec not included in dial codec: protocol not mounted locally");
-            }
-        }
-        if (_protocols.includes(Protocols.LightPush)) {
-            if (this.lightPush) {
-                codecs.push(this.lightPush.multicodec);
-            }
-            else {
-                log.error("Light Push codec not included in dial codec: protocol not mounted locally");
-            }
-        }
-        if (_protocols.includes(Protocols.Filter)) {
-            if (this.filter) {
-                codecs.push(this.filter.multicodec);
-            }
-            else {
-                log.error("Filter codec not included in dial codec: protocol not mounted locally");
-            }
-        }
-        log.info(`Dialing to ${peerId.toString()} with protocols ${_protocols}`);
-        return this.libp2p.dialProtocol(peerId, codecs);
-    }
-    async start() {
-        await this.libp2p.start();
-    }
-    async stop() {
-        this.connectionManager.stop();
-        await this.libp2p.stop();
-    }
-    isStarted() {
-        return this.libp2p.isStarted();
-    }
-    isConnected() {
-        return this.connectionManager.isConnected();
-    }
-    /**
-     * Return the local multiaddr with peer id on which libp2p is listening.
-     *
-     * @throws if libp2p is not listening on localhost.
-     */
-    getLocalMultiaddrWithID() {
-        const localMultiaddr = this.libp2p
-            .getMultiaddrs()
-            .find((addr) => addr.toString().match(/127\.0\.0\.1/));
-        if (!localMultiaddr || localMultiaddr.toString() === "") {
-            throw "Not listening on localhost";
-        }
-        return localMultiaddr + "/p2p/" + this.libp2p.peerId.toString();
-    }
-}
-function mapToPeerIdOrMultiaddr(peerId) {
-    return isPeerId(peerId) ? peerId : multiaddr(peerId);
-}
-//# sourceMappingURL=waku.js.map

package/dist/lib/waku.js.map

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

package/src/lib/waku.ts

@@ -1,214 +0,0 @@
-import type { Stream } from "@libp2p/interface/connection";
-import { isPeerId, PeerId } from "@libp2p/interface/peer-id";
-import { multiaddr, Multiaddr, MultiaddrInput } from "@multiformats/multiaddr";
-import type {
-  IFilter,
-  ILightPush,
-  IRelay,
-  IStore,
-  Libp2p,
-  PubsubTopic,
-  ShardingParams,
-  Waku
-} from "@waku/interfaces";
-import { DefaultPubsubTopic, Protocols } from "@waku/interfaces";
-import { Logger, shardInfoToPubsubTopics } from "@waku/utils";
-
-import { ConnectionManager } from "./connection_manager.js";
-
-export const DefaultPingKeepAliveValueSecs = 5 * 60;
-export const DefaultRelayKeepAliveValueSecs = 5 * 60;
-export const DefaultUserAgent = "js-waku";
-
-const log = new Logger("waku");
-
-export interface WakuOptions {
-  /**
-   * Set keep alive frequency in seconds: Waku will send a `/ipfs/ping/1.0.0`
-   * request to each peer after the set number of seconds. Set to 0 to disable.
-   *
-   * @default {@link @waku/core.DefaultPingKeepAliveValueSecs}
-   */
-  pingKeepAlive?: number;
-  /**
-   * Set keep alive frequency in seconds: Waku will send a ping message over
-   * relay to each peer after the set number of seconds. Set to 0 to disable.
-   *
-   * @default {@link @waku/core.DefaultRelayKeepAliveValueSecs}
-   */
-  relayKeepAlive?: number;
-  /**
-   * Set the user agent string to be used in identification of the node.
-   * @default {@link @waku/core.DefaultUserAgent}
-   */
-  userAgent?: string;
-}
-
-export class WakuNode implements Waku {
-  public libp2p: Libp2p;
-  public relay?: IRelay;
-  public store?: IStore;
-  public filter?: IFilter;
-  public lightPush?: ILightPush;
-  public connectionManager: ConnectionManager;
-  public readonly pubsubTopics: PubsubTopic[];
-
-  constructor(
-    options: WakuOptions,
-    pubsubTopics: PubsubTopic[] = [],
-    libp2p: Libp2p,
-    pubsubShardInfo?: ShardingParams,
-    store?: (libp2p: Libp2p) => IStore,
-    lightPush?: (libp2p: Libp2p) => ILightPush,
-    filter?: (libp2p: Libp2p) => IFilter,
-    relay?: (libp2p: Libp2p) => IRelay
-  ) {
-    if (!pubsubShardInfo) {
-      this.pubsubTopics =
-        pubsubTopics.length > 0 ? pubsubTopics : [DefaultPubsubTopic];
-    } else {
-      this.pubsubTopics = shardInfoToPubsubTopics(pubsubShardInfo);
-    }
-
-    this.libp2p = libp2p;
-
-    if (store) {
-      this.store = store(libp2p);
-    }
-    if (filter) {
-      this.filter = filter(libp2p);
-    }
-    if (lightPush) {
-      this.lightPush = lightPush(libp2p);
-    }
-
-    if (relay) {
-      this.relay = relay(libp2p);
-    }
-
-    const pingKeepAlive =
-      options.pingKeepAlive || DefaultPingKeepAliveValueSecs;
-    const relayKeepAlive = this.relay
-      ? options.relayKeepAlive || DefaultRelayKeepAliveValueSecs
-      : 0;
-
-    const peerId = this.libp2p.peerId.toString();
-
-    this.connectionManager = ConnectionManager.create(
-      peerId,
-      libp2p,
-      { pingKeepAlive, relayKeepAlive },
-      this.pubsubTopics,
-      this.relay
-    );
-
-    log.info(
-      "Waku node created",
-      peerId,
-      `relay: ${!!this.relay}, store: ${!!this.store}, light push: ${!!this
-        .lightPush}, filter: ${!!this.filter}`
-    );
-  }
-
-  /**
-   * Dials to the provided peer.
-   *
-   * @param peer The peer to dial
-   * @param protocols Waku protocols we expect from the peer; Defaults to mounted protocols
-   */
-  async dial(
-    peer: PeerId | MultiaddrInput,
-    protocols?: Protocols[]
-  ): Promise<Stream> {
-    const _protocols = protocols ?? [];
-    const peerId = mapToPeerIdOrMultiaddr(peer);
-
-    if (typeof protocols === "undefined") {
-      this.relay && _protocols.push(Protocols.Relay);
-      this.store && _protocols.push(Protocols.Store);
-      this.filter && _protocols.push(Protocols.Filter);
-      this.lightPush && _protocols.push(Protocols.LightPush);
-    }
-
-    const codecs: string[] = [];
-    if (_protocols.includes(Protocols.Relay)) {
-      if (this.relay) {
-        this.relay.gossipSub.multicodecs.forEach((codec: string) =>
-          codecs.push(codec)
-        );
-      } else {
-        log.error(
-          "Relay codec not included in dial codec: protocol not mounted locally"
-        );
-      }
-    }
-    if (_protocols.includes(Protocols.Store)) {
-      if (this.store) {
-        codecs.push(this.store.multicodec);
-      } else {
-        log.error(
-          "Store codec not included in dial codec: protocol not mounted locally"
-        );
-      }
-    }
-    if (_protocols.includes(Protocols.LightPush)) {
-      if (this.lightPush) {
-        codecs.push(this.lightPush.multicodec);
-      } else {
-        log.error(
-          "Light Push codec not included in dial codec: protocol not mounted locally"
-        );
-      }
-    }
-    if (_protocols.includes(Protocols.Filter)) {
-      if (this.filter) {
-        codecs.push(this.filter.multicodec);
-      } else {
-        log.error(
-          "Filter codec not included in dial codec: protocol not mounted locally"
-        );
-      }
-    }
-
-    log.info(`Dialing to ${peerId.toString()} with protocols ${_protocols}`);
-
-    return this.libp2p.dialProtocol(peerId, codecs);
-  }
-
-  async start(): Promise<void> {
-    await this.libp2p.start();
-  }
-
-  async stop(): Promise<void> {
-    this.connectionManager.stop();
-    await this.libp2p.stop();
-  }
-
-  isStarted(): boolean {
-    return this.libp2p.isStarted();
-  }
-
-  isConnected(): boolean {
-    return this.connectionManager.isConnected();
-  }
-
-  /**
-   * Return the local multiaddr with peer id on which libp2p is listening.
-   *
-   * @throws if libp2p is not listening on localhost.
-   */
-  getLocalMultiaddrWithID(): string {
-    const localMultiaddr = this.libp2p
-      .getMultiaddrs()
-      .find((addr) => addr.toString().match(/127\.0\.0\.1/));
-    if (!localMultiaddr || localMultiaddr.toString() === "") {
-      throw "Not listening on localhost";
-    }
-    return localMultiaddr + "/p2p/" + this.libp2p.peerId.toString();
-  }
-}
-function mapToPeerIdOrMultiaddr(
-  peerId: PeerId | MultiaddrInput
-): PeerId | Multiaddr {
-  return isPeerId(peerId) ? peerId : multiaddr(peerId);
-}