Skip to content

fix: cache peer ids #519

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

Merged
merged 2 commits into from
Mar 28, 2025
Merged

fix: cache peer ids #519

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3b7fcd
fix: cache peer ids
wemeetagain Mar 28, 2025
8a7dddd
chore: fix type errors
wemeetagain Mar 28, 2025
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
16 changes: 8 additions & 8 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ export class GossipSub extends TypedEventEmitter<GossipsubEvents> implements Pub

// State

public readonly peers = new Set<PeerIdStr>()
public readonly peers = new Map<PeerIdStr, PeerId>()
public readonly streamsInbound = new Map<PeerIdStr, InboundStream>()
public readonly streamsOutbound = new Map<PeerIdStr, OutboundStream>()

Expand Down Expand Up @@ -602,7 +602,7 @@ export class GossipSub extends TypedEventEmitter<GossipsubEvents> implements Pub
]

getPeers (): PeerId[] {
return [...this.peers.keys()].map((str) => peerIdFromString(str))
return [...this.peers.values()]
}

isStarted (): boolean {
Expand Down Expand Up @@ -915,7 +915,7 @@ export class GossipSub extends TypedEventEmitter<GossipsubEvents> implements Pub
if (!this.peers.has(id)) {
this.log('new peer %p', peerId)

this.peers.add(id)
this.peers.set(id, peerId)

// Add to peer scoring
this.score.addPeer(id)
Expand Down Expand Up @@ -1016,7 +1016,7 @@ export class GossipSub extends TypedEventEmitter<GossipsubEvents> implements Pub
*/
getSubscribers (topic: TopicStr): PeerId[] {
const peersInTopic = this.topics.get(topic)
return ((peersInTopic != null) ? Array.from(peersInTopic) : []).map((str) => peerIdFromString(str))
return ((peersInTopic != null) ? Array.from(peersInTopic) : []).map((str) => this.peers.get(str) ?? peerIdFromString(str))
}

/**
Expand Down Expand Up @@ -2316,7 +2316,7 @@ export class GossipSub extends TypedEventEmitter<GossipsubEvents> implements Pub
}

return {
recipients: Array.from(tosend.values()).map((str) => peerIdFromString(str))
recipients: Array.from(tosend.values()).map((str) => this.peers.get(str) ?? peerIdFromString(str))
}
}

Expand Down Expand Up @@ -2705,7 +2705,7 @@ export class GossipSub extends TypedEventEmitter<GossipsubEvents> implements Pub
// the peer ID and let the pruned peer find them in the DHT -- we can't trust
// unsigned address records through PX anyways
// Finding signed records in the DHT is not supported at the time of writing in js-libp2p
const id = peerIdFromString(peerId)
const id = this.peers.get(peerId) ?? peerIdFromString(peerId)
let peerInfo: Peer | undefined

try {
Expand Down Expand Up @@ -3229,7 +3229,7 @@ export class GossipSub extends TypedEventEmitter<GossipsubEvents> implements Pub

private readonly tagMeshPeer = (evt: CustomEvent<MeshPeer>): void => {
const { peerId, topic } = evt.detail
this.components.peerStore.merge(peerIdFromString(peerId), {
this.components.peerStore.merge(this.peers.get(peerId) ?? peerIdFromString(peerId), {
tags: {
[topic]: {
value: 100
Expand All @@ -3240,7 +3240,7 @@ export class GossipSub extends TypedEventEmitter<GossipsubEvents> implements Pub

private readonly untagMeshPeer = (evt: CustomEvent<MeshPeer>): void => {
const { peerId, topic } = evt.detail
this.components.peerStore.merge(peerIdFromString(peerId), {
this.components.peerStore.merge(this.peers.get(peerId) ?? peerIdFromString(peerId), {
tags: {
[topic]: undefined
}
Expand Down