Skip to content

fix: cache the NodeAddressString #231

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: cache the NodeAddressString #231

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions src/session/nodeInfo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,28 @@ import { Multiaddr, isMultiaddr } from "@multiformats/multiaddr";
import { peerIdFromString } from "@libp2p/peer-id";
import { createKeypairFromPeerId, IKeypair } from "../keypair/index.js";
import { ENR, NodeId, v4 } from "../enr/index.js";
import { NodeAddressString } from "./types.js";

/** A representation of an unsigned contactable node. */
export interface INodeAddress {
/** The destination socket address. */
socketAddr: Multiaddr;
/** The destination Node Id. */
nodeId: NodeId;
/** internal string to track sessions */
cachedStr?: NodeAddressString;
}

export function nodeAddressToString(nodeAddr: INodeAddress): string {
export function nodeAddressToString(nodeAddr: INodeAddress): NodeAddressString {
// Since the Discv5 service allows a Multiaddr in outbound message handlers and requires a multiaddr input to
// have a peer ID specified, we remove any p2p portions of the multiaddr when generating the nodeAddressString
// since only the UDP socket addr is included in the session cache key (e.g. /ip4/127.0.0.1/udp/9000/p2p/Qm...)
const normalizedAddr = nodeAddr.socketAddr.decapsulateCode(421);
return nodeAddr.nodeId + ":" + Buffer.from(normalizedAddr.bytes).toString("hex");
if (!nodeAddr.cachedStr) {
const normalizedAddr = nodeAddr.socketAddr.decapsulateCode(421);
nodeAddr.cachedStr = nodeAddr.nodeId + ":" + Buffer.from(normalizedAddr.bytes).toString("hex");
}

return nodeAddr.cachedStr;
}

/**
Expand Down