Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add mapping function to multiaddr of peerid #1306

Merged
merged 3 commits into from
Apr 19, 2023
Merged

feat: add mapping function to multiaddr of peerid #1306

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0782e9b
feat: add mapping function to multiaddr of peerid
weboko Apr 17, 2023
b062e9b
remove unused
weboko Apr 18, 2023
fd3670c
Merge branch 'master' of github.com:waku-org/js-waku into weboko/mult…
weboko Apr 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions packages/core/src/lib/waku.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import type { Stream } from "@libp2p/interface-connection";
import type { Libp2p } from "@libp2p/interface-libp2p";
import type { PeerId } from "@libp2p/interface-peer-id";
import type { Multiaddr } from "@multiformats/multiaddr";
import { isPeerId } from "@libp2p/interface-peer-id";
import type { Multiaddr, MultiaddrInput } from "@multiformats/multiaddr";
import { multiaddr } from "@multiformats/multiaddr";
import type {
IFilter,
ILightPush,
Expand Down Expand Up @@ -104,10 +106,11 @@ export class WakuNode implements Waku {
* @param protocols Waku protocols we expect from the peer; Defaults to mounted protocols
*/
async dial(
peer: PeerId | Multiaddr,
peer: PeerId | MultiaddrInput,
protocols?: Protocols[]
): Promise<Stream> {
const _protocols = protocols ?? [];
const peerId = mapToPeerIdOrMultiaddr(peer);

if (typeof protocols === "undefined") {
this.relay && _protocols.push(Protocols.Relay);
Expand Down Expand Up @@ -156,9 +159,9 @@ export class WakuNode implements Waku {
}
}

log(`Dialing to ${peer.toString()} with protocols ${_protocols}`);
log(`Dialing to ${peerId.toString()} with protocols ${_protocols}`);

return this.libp2p.dialProtocol(peer, codecs);
return this.libp2p.dialProtocol(peerId, codecs);
}

async start(): Promise<void> {
Expand Down Expand Up @@ -189,3 +192,9 @@ export class WakuNode implements Waku {
return localMultiaddr + "/p2p/" + this.libp2p.peerId.toString();
}
}

function mapToPeerIdOrMultiaddr(
peerId: PeerId | MultiaddrInput
): PeerId | Multiaddr {
return isPeerId(peerId) ? peerId : multiaddr(peerId);
}