@libp2p/pubsub 1.2.1 → 1.2.5

package/dist/src/errors.d.ts

@@ -19,6 +19,10 @@ export declare const codes: {
      * Message `signature` is invalid
      */
     ERR_INVALID_SIGNATURE: string;
+    /**
+     * Message expected to have a `from`, but doesn't
+     */
+    ERR_MISSING_FROM: string;
     /**
      * Message expected to not have a `from`, but does
      */

package/dist/src/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/errors.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,KAAK;IAChB;;OAEG;;IAEH;;OAEG;;IAKH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAKH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;CAEJ,CAAA"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/errors.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,KAAK;IAChB;;OAEG;;IAEH;;OAEG;;IAKH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAKH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;CAEJ,CAAA"}

package/dist/src/errors.js

@@ -20,6 +20,10 @@ export const codes = {
      * Message `signature` is invalid
      */
     ERR_INVALID_SIGNATURE: 'ERR_INVALID_SIGNATURE',
+    /**
+     * Message expected to have a `from`, but doesn't
+     */
+    ERR_MISSING_FROM: 'ERR_MISSING_FROM',
     // Strict no-signing codes
     /**
      * Message expected to not have a `from`, but does

package/dist/src/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/errors.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,KAAK,GAAG;IACnB;;OAEG;IACH,4BAA4B,EAAE,8BAA8B;IAC5D;;OAEG;IACH,8BAA8B,EAAE,gCAAgC;IAEhE,uBAAuB;IAEvB;;OAEG;IACH,qBAAqB,EAAE,uBAAuB;IAC9C;;OAEG;IACH,iBAAiB,EAAE,mBAAmB;IACtC;;OAEG;IACH,qBAAqB,EAAE,uBAAuB;IAE9C,0BAA0B;IAE1B;;OAEG;IACH,mBAAmB,EAAE,qBAAqB;IAC1C;;OAEG;IACH,wBAAwB,EAAE,0BAA0B;IACpD;;OAEG;IACH,kBAAkB,EAAE,oBAAoB;IACxC;;OAEG;IACH,oBAAoB,EAAE,sBAAsB;CAC7C,CAAA"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/errors.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,KAAK,GAAG;IACnB;;OAEG;IACH,4BAA4B,EAAE,8BAA8B;IAC5D;;OAEG;IACH,8BAA8B,EAAE,gCAAgC;IAEhE,uBAAuB;IAEvB;;OAEG;IACH,qBAAqB,EAAE,uBAAuB;IAC9C;;OAEG;IACH,iBAAiB,EAAE,mBAAmB;IACtC;;OAEG;IACH,qBAAqB,EAAE,uBAAuB;IAC9C;;OAEG;IACH,gBAAgB,EAAE,kBAAkB;IAEpC,0BAA0B;IAE1B;;OAEG;IACH,mBAAmB,EAAE,qBAAqB;IAC1C;;OAEG;IACH,wBAAwB,EAAE,0BAA0B;IACpD;;OAEG;IACH,kBAAkB,EAAE,oBAAoB;IACxC;;OAEG;IACH,oBAAoB,EAAE,sBAAsB;CAC7C,CAAA"}

package/dist/src/index.d.ts

@@ -1,14 +1,13 @@
 import { EventEmitter } from '@libp2p/interfaces';
 import Queue from 'p-queue';
-import { RPC, IRPC } from './message/rpc.js';
-import { PeerStreams } from './peer-streams.js';
 import type { PeerId } from '@libp2p/interfaces/peer-id';
-import type { Registrar, IncomingStreamEvent } from '@libp2p/interfaces/registrar';
+import type { Registrar, IncomingStreamData } from '@libp2p/interfaces/registrar';
 import type { Connection } from '@libp2p/interfaces/connection';
-import type BufferList from 'bl';
-import type { PubSub, Message, StrictNoSign, StrictSign, PubsubOptions, PubsubEvents } from '@libp2p/interfaces/pubsub';
-import type { Startable } from '@libp2p/interfaces';
+import type { PubSub, Message, StrictNoSign, StrictSign, PubSubOptions, PubSubEvents, RPCMessage, RPC, PeerStreams, RPCSubscription } from '@libp2p/interfaces/pubsub';
 import type { Logger } from '@libp2p/logger';
+import type { PeerMap } from '@libp2p/peer-map';
+import type { IRPC } from './message/rpc.js';
+import { RPC as RPCProto } from './message/rpc.js';
 export interface TopicValidator {
     (topic: string, message: Message): Promise<void>;
 }
@@ -16,7 +15,7 @@ export interface TopicValidator {
  * PubsubBaseProtocol handles the peers and connections logic for pubsub routers
  * and specifies the API that pubsub routers should have.
  */
-export declare abstract class PubsubBaseProtocol<EventMap> extends EventEmitter<EventMap & PubsubEvents> implements PubSub<EventMap & PubsubEvents>, Startable {
+export declare abstract class PubsubBaseProtocol<EventMap> extends EventEmitter<EventMap & PubSubEvents> implements PubSub<EventMap & PubSubEvents> {
     peerId: PeerId;
     started: boolean;
     /**
@@ -30,11 +29,11 @@ export declare abstract class PubsubBaseProtocol<EventMap> extends EventEmitter<
     /**
      * Map of peer streams
      */
-    peers: Map<string, PeerStreams>;
+    peers: PeerMap<PeerStreams>;
     /**
      * The signature policy to follow by default
      */
-    globalSignaturePolicy: StrictNoSign | StrictSign;
+    globalSignaturePolicy: typeof StrictNoSign | typeof StrictSign;
     /**
      * If router can relay received messages, even if not subscribed
      */
@@ -52,28 +51,27 @@ export declare abstract class PubsubBaseProtocol<EventMap> extends EventEmitter<
     topicValidators: Map<string, TopicValidator>;
     queue: Queue;
     registrar: Registrar;
+    multicodecs: string[];
     protected log: Logger;
-    protected multicodecs: string[];
     protected _libp2p: any;
-    private _registrarId;
-    constructor(props: PubsubOptions);
+    private _registrarHandlerId;
+    private _registrarTopologyId;
+    constructor(props: PubSubOptions);
     /**
      * Register the pubsub protocol onto the libp2p node.
      *
      * @returns {void}
      */
-    start(): void;
+    start(): Promise<void>;
     /**
      * Unregister the pubsub protocol and the streams with other peers will be closed.
-     *
-     * @returns {void}
      */
-    stop(): void;
+    stop(): Promise<void>;
     isStarted(): boolean;
     /**
      * On an inbound stream opened
      */
-    protected _onIncomingStream({ protocol, stream, connection }: IncomingStreamEvent): void;
+    protected _onIncomingStream(evt: CustomEvent<IncomingStreamData>): void;
     /**
      * Registrar notifies an established connection with pubsub protocol
      */
@@ -93,23 +91,23 @@ export declare abstract class PubsubBaseProtocol<EventMap> extends EventEmitter<
     /**
      * Responsible for processing each RPC message received by other peers.
      */
-    _processMessages(idB58Str: string, stream: AsyncIterable<Uint8Array | BufferList>, peerStreams: PeerStreams): Promise<void>;
+    _processMessages(peerId: PeerId, stream: AsyncIterable<Uint8Array>, peerStreams: PeerStreams): Promise<void>;
     /**
      * Handles an rpc request from a peer
      */
-    _processRpc(idB58Str: string, peerStreams: PeerStreams, rpc: RPC): Promise<boolean>;
+    processRpc(from: PeerId, peerStreams: PeerStreams, rpc: RPC): Promise<boolean>;
     /**
      * Handles a subscription change from a peer
      */
-    _processRpcSubOpt(id: string, subOpt: RPC.ISubOpts): void;
+    _processRpcSubOpt(id: PeerId, subOpt: RPCSubscription): void;
     /**
      * Handles an message from a peer
      */
-    _processRpcMessage(msg: Message): Promise<void>;
+    _processMessage(msg: Message): Promise<void>;
     /**
      * Emit a message from a peer
      */
-    _emitMessage(message: Message): void;
+    emitMessage(message: Message): void;
     /**
      * The default msgID implementation
      * Child class can override this.
@@ -119,12 +117,12 @@ export declare abstract class PubsubBaseProtocol<EventMap> extends EventEmitter<
      * Whether to accept a message from a peer
      * Override to create a graylist
      */
-    _acceptFrom(id: string): boolean;
+    _acceptFrom(id: PeerId): boolean;
     /**
      * Decode Uint8Array into an RPC object.
      * This can be override to use a custom router protobuf.
      */
-    _decodeRpc(bytes: Uint8Array): RPC;
+    _decodeRpc(bytes: Uint8Array): RPCProto;
     /**
      * Encode RPC object into a Uint8Array.
      * This can be override to use a custom router protobuf.
@@ -133,11 +131,11 @@ export declare abstract class PubsubBaseProtocol<EventMap> extends EventEmitter<
     /**
      * Send an rpc object to a peer
      */
-    _sendRpc(id: string, rpc: IRPC): void;
+    _sendRpc(peer: PeerId, rpc: IRPC): void;
     /**
      * Send subscriptions to a peer
      */
-    _sendSubscriptions(id: string, topics: string[], subscribe: boolean): void;
+    _sendSubscriptions(id: PeerId, topics: string[], subscribe: boolean): void;
     /**
      * Validates the given message. The signature will be checked for authenticity.
      * Throws an error on invalid messages
@@ -147,11 +145,11 @@ export declare abstract class PubsubBaseProtocol<EventMap> extends EventEmitter<
      * Normalizes the message and signs it, if signing is enabled.
      * Should be used by the routers to create the message to send.
      */
-    protected _buildMessage(message: Message): Promise<Message>;
+    protected _maybeSignMessage(message: Message): Promise<Message>;
     /**
      * Get a list of the peer-ids that are subscribed to one topic.
      */
-    getSubscribers(topic: string): string[];
+    getSubscribers(topic: string): PeerId[];
     /**
      * Publishes messages to all subscribed peers
      */
@@ -160,7 +158,7 @@ export declare abstract class PubsubBaseProtocol<EventMap> extends EventEmitter<
      * Overriding the implementation of publish should handle the appropriate algorithms for the publish/subscriber implementation.
      * For example, a Floodsub implementation might simply publish each message to each topic for every peer
      */
-    abstract _publish(message: Message): Promise<void>;
+    abstract _publish(message: RPCMessage): Promise<void>;
     /**
      * Subscribes to a given topic.
      */
@@ -173,5 +171,6 @@ export declare abstract class PubsubBaseProtocol<EventMap> extends EventEmitter<
      * Get the list of topics which the peer is subscribed to.
      */
     getTopics(): string[];
+    getPeers(): PeerId[];
 }
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

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

package/dist/src/index.js

@@ -3,12 +3,15 @@ import { EventEmitter, CustomEvent } from '@libp2p/interfaces';
 import errcode from 'err-code';
 import { pipe } from 'it-pipe';
 import Queue from 'p-queue';
-import { MulticodecTopology } from '@libp2p/topology/multicodec-topology';
+import { Topology } from '@libp2p/topology';
 import { codes } from './errors.js';
-import { RPC } from './message/rpc.js';
-import { PeerStreams } from './peer-streams.js';
-import * as utils from './utils.js';
+import { PeerStreams as PeerStreamsImpl } from './peer-streams.js';
+import { toRpcMessage, toMessage, ensureArray, randomSeqno, noSignMsgId, msgId } from './utils.js';
 import { signMessage, verifySignature } from './message/sign.js';
+import { base58btc } from 'multiformats/bases/base58';
+import { peerMap } from '@libp2p/peer-map';
+import { peerIdFromString } from '@libp2p/peer-id';
+import { RPC as RPCProto } from './message/rpc.js';
 /**
  * PubsubBaseProtocol handles the peers and connections logic for pubsub routers
  * and specifies the API that pubsub routers should have.
@@ -16,16 +19,15 @@ import { signMessage, verifySignature } from './message/sign.js';
 export class PubsubBaseProtocol extends EventEmitter {
     constructor(props) {
         super();
-        const { debugName = 'libp2p:pubsub', multicodecs = [], libp2p = null, globalSignaturePolicy = 'StrictSign', canRelayMessage = false, emitSelf = false, messageProcessingConcurrency = 10 } = props;
+        const { debugName = 'libp2p:pubsub', multicodecs = [], peerId, registrar, globalSignaturePolicy = 'StrictSign', canRelayMessage = false, emitSelf = false, messageProcessingConcurrency = 10 } = props;
         this.log = logger(debugName);
-        this.multicodecs = utils.ensureArray(multicodecs);
-        this._libp2p = libp2p;
-        this.registrar = libp2p.registrar;
-        this.peerId = libp2p.peerId;
+        this.multicodecs = ensureArray(multicodecs);
+        this.registrar = registrar;
+        this.peerId = peerId;
         this.started = false;
         this.topics = new Map();
         this.subscriptions = new Set();
-        this.peers = new Map();
+        this.peers = peerMap();
         this.globalSignaturePolicy = globalSignaturePolicy === 'StrictNoSign' ? 'StrictNoSign' : 'StrictSign';
         this.canRelayMessage = canRelayMessage;
         this.emitSelf = emitSelf;
@@ -41,45 +43,43 @@ export class PubsubBaseProtocol extends EventEmitter {
      *
      * @returns {void}
      */
-    start() {
+    async start() {
         if (this.started) {
             return;
         }
         this.log('starting');
         // Incoming streams
         // Called after a peer dials us
-        this.registrar.handle(this.multicodecs, this._onIncomingStream);
+        this._registrarHandlerId = await this.registrar.handle(this.multicodecs, this._onIncomingStream);
         // register protocol with topology
         // Topology callbacks called on connection manager changes
-        const topology = new MulticodecTopology({
-            peerStore: this._libp2p.peerStore,
-            connectionManager: this._libp2p.connectionManager,
-            multicodecs: this.multicodecs,
-            handlers: {
-                onConnect: this._onPeerConnected,
-                onDisconnect: this._onPeerDisconnected
-            }
+        const topology = new Topology({
+            onConnect: this._onPeerConnected,
+            onDisconnect: this._onPeerDisconnected
         });
-        this._registrarId = this.registrar.register(topology);
+        this._registrarTopologyId = this.registrar.register(this.multicodecs, topology);
         this.log('started');
         this.started = true;
     }
     /**
      * Unregister the pubsub protocol and the streams with other peers will be closed.
-     *
-     * @returns {void}
      */
-    stop() {
+    async stop() {
         if (!this.started) {
             return;
         }
         // unregister protocol and handlers
-        if (this._registrarId != null) {
-            this.registrar.unregister(this._registrarId);
+        if (this._registrarTopologyId != null) {
+            this.registrar.unregister(this._registrarTopologyId);
+        }
+        if (this._registrarHandlerId != null) {
+            await this.registrar.unhandle(this._registrarHandlerId);
         }
         this.log('stopping');
-        this.peers.forEach((peerStreams) => peerStreams.close());
-        this.peers = new Map();
+        for (const peerStreams of this.peers.values()) {
+            peerStreams.close();
+        }
+        this.peers.clear();
         this.subscriptions = new Set();
         this.started = false;
         this.log('stopped');
@@ -90,20 +90,19 @@ export class PubsubBaseProtocol extends EventEmitter {
     /**
      * On an inbound stream opened
      */
-    _onIncomingStream({ protocol, stream, connection }) {
+    _onIncomingStream(evt) {
+        const { protocol, stream, connection } = evt.detail;
         const peerId = connection.remotePeer;
-        const idB58Str = peerId.toString();
         const peer = this._addPeer(peerId, protocol);
         const inboundStream = peer.attachInboundStream(stream);
-        this._processMessages(idB58Str, inboundStream, peer)
+        this._processMessages(peerId, inboundStream, peer)
             .catch(err => this.log(err));
     }
     /**
      * Registrar notifies an established connection with pubsub protocol
      */
     async _onPeerConnected(peerId, conn) {
-        const idB58Str = peerId.toString();
-        this.log('connected', idB58Str);
+        this.log('connected %p', peerId);
         try {
             const { stream, protocol } = await conn.newStream(this.multicodecs);
             const peer = this._addPeer(peerId, protocol);
@@ -113,7 +112,7 @@ export class PubsubBaseProtocol extends EventEmitter {
             this.log.error(err);
         }
         // Immediately send my own subscriptions to the newly established conn
-        this._sendSubscriptions(idB58Str, Array.from(this.subscriptions), true);
+        this._sendSubscriptions(peerId, Array.from(this.subscriptions), true);
     }
     /**
      * Registrar notifies a closing connection with pubsub protocol
@@ -127,19 +126,18 @@ export class PubsubBaseProtocol extends EventEmitter {
      * Notifies the router that a peer has been connected
      */
     _addPeer(peerId, protocol) {
-        const id = peerId.toString();
-        const existing = this.peers.get(id);
+        const existing = this.peers.get(peerId);
         // If peer streams already exists, do nothing
         if (existing != null) {
             return existing;
         }
         // else create a new peer streams
-        this.log('new peer', id);
-        const peerStreams = new PeerStreams({
+        this.log('new peer %p', peerId);
+        const peerStreams = new PeerStreamsImpl({
             id: peerId,
             protocol
         });
-        this.peers.set(id, peerStreams);
+        this.peers.set(peerId, peerStreams);
         peerStreams.addEventListener('close', () => this._removePeer(peerId), {
             once: true
         });
@@ -150,15 +148,15 @@ export class PubsubBaseProtocol extends EventEmitter {
      */
     _removePeer(peerId) {
         const id = peerId.toString();
-        const peerStreams = this.peers.get(id);
+        const peerStreams = this.peers.get(peerId);
         if (peerStreams == null) {
             return;
         }
         // close peer streams
         peerStreams.close();
         // delete peer streams
-        this.log('delete peer', id);
-        this.peers.delete(id);
+        this.log('delete peer %p', peerId);
+        this.peers.delete(peerId);
         // remove peer from topics map
         for (const peers of this.topics.values()) {
             peers.delete(id);
@@ -169,17 +167,29 @@ export class PubsubBaseProtocol extends EventEmitter {
     /**
      * Responsible for processing each RPC message received by other peers.
      */
-    async _processMessages(idB58Str, stream, peerStreams) {
+    async _processMessages(peerId, stream, peerStreams) {
         try {
             await pipe(stream, async (source) => {
                 for await (const data of source) {
-                    const rpcBytes = data instanceof Uint8Array ? data : data.slice();
-                    const rpcMsg = this._decodeRpc(rpcBytes);
+                    const rpcMsg = this._decodeRpc(data);
                     // Since _processRpc may be overridden entirely in unsafe ways,
                     // the simplest/safest option here is to wrap in a function and capture all errors
                     // to prevent a top-level unhandled exception
                     // This processing of rpc messages should happen without awaiting full validation/execution of prior messages
-                    this._processRpc(idB58Str, peerStreams, rpcMsg)
+                    this.processRpc(peerId, peerStreams, {
+                        subscriptions: (rpcMsg.subscriptions).map(sub => ({
+                            subscribe: Boolean(sub.subscribe),
+                            topicID: sub.topicID ?? ''
+                        })),
+                        msgs: (rpcMsg.msgs ?? []).map(msg => ({
+                            from: msg.from ?? peerId.multihash.bytes,
+                            data: msg.data ?? new Uint8Array(0),
+                            topicIDs: msg.topicIDs ?? [],
+                            seqno: msg.seqno ?? undefined,
+                            signature: msg.signature ?? undefined,
+                            key: msg.key ?? undefined
+                        }))
+                    })
                         .catch(err => this.log(err));
                 }
             });
@@ -191,21 +201,21 @@ export class PubsubBaseProtocol extends EventEmitter {
     /**
      * Handles an rpc request from a peer
      */
-    async _processRpc(idB58Str, peerStreams, rpc) {
-        this.log('rpc from', idB58Str);
+    async processRpc(from, peerStreams, rpc) {
+        this.log('rpc from %p', from);
         const subs = rpc.subscriptions;
         const msgs = rpc.msgs;
         if (subs.length > 0) {
             // update peer subscriptions
             subs.forEach((subOpt) => {
-                this._processRpcSubOpt(idB58Str, subOpt);
+                this._processRpcSubOpt(from, subOpt);
             });
             this.dispatchEvent(new CustomEvent('pubsub:subscription-change', {
                 detail: { peerId: peerStreams.id, subscriptions: subs }
             }));
         }
-        if (!this._acceptFrom(idB58Str)) {
-            this.log('received message from unacceptable peer %s', idB58Str);
+        if (!this._acceptFrom(from)) {
+            this.log('received message from unacceptable peer %p', from);
             return false;
         }
         if (msgs.length > 0) {
@@ -217,8 +227,11 @@ export class PubsubBaseProtocol extends EventEmitter {
                     return;
                 }
                 try {
-                    const msg = utils.normalizeInRpcMessage(message, idB58Str);
-                    await this._processRpcMessage(msg);
+                    const msg = toMessage({
+                        ...message,
+                        from: from.multihash.bytes
+                    });
+                    await this._processMessage(msg);
                 }
                 catch (err) {
                     this.log.error(err);
@@ -241,20 +254,20 @@ export class PubsubBaseProtocol extends EventEmitter {
             topicSet = new Set();
             this.topics.set(t, topicSet);
         }
-        if (subOpt.subscribe === true) {
+        if (subOpt.subscribe) {
             // subscribe peer to new topic
-            topicSet.add(id);
+            topicSet.add(id.toString());
         }
         else {
             // unsubscribe from existing topic
-            topicSet.delete(id);
+            topicSet.delete(id.toString());
         }
     }
     /**
      * Handles an message from a peer
      */
-    async _processRpcMessage(msg) {
-        if ((msg.from != null) && this.peerId.equals(msg.from) && !this.emitSelf) {
+    async _processMessage(msg) {
+        if (this.peerId.equals(msg.from) && !this.emitSelf) {
             return;
         }
         // Ensure the message is valid before processing it
@@ -266,13 +279,13 @@ export class PubsubBaseProtocol extends EventEmitter {
             return;
         }
         // Emit to self
-        this._emitMessage(msg);
-        return await this._publish(utils.normalizeOutRpcMessage(msg));
+        this.emitMessage(msg);
+        return await this._publish(toRpcMessage(msg));
     }
     /**
      * Emit a message from a peer
      */
-    _emitMessage(message) {
+    emitMessage(message) {
         message.topicIDs.forEach((topic) => {
             if (this.subscriptions.has(topic)) {
                 this.dispatchEvent(new CustomEvent(topic, {
@@ -289,10 +302,12 @@ export class PubsubBaseProtocol extends EventEmitter {
         const signaturePolicy = this.globalSignaturePolicy;
         switch (signaturePolicy) {
             case 'StrictSign':
-                // @ts-expect-error seqno is optional in protobuf definition but it will exist
-                return utils.msgId(msg.from, msg.seqno);
+                if (msg.seqno == null) {
+                    throw errcode(new Error('Need seqno when signature policy is StrictSign but it was missing'), codes.ERR_MISSING_SEQNO);
+                }
+                return msgId(msg.from, msg.seqno);
             case 'StrictNoSign':
-                return utils.noSignMsgId(msg.data);
+                return noSignMsgId(msg.data);
             default:
                 throw errcode(new Error('Cannot get message id: unhandled signature policy'), codes.ERR_UNHANDLED_SIGNATURE_POLICY);
         }
@@ -309,22 +324,22 @@ export class PubsubBaseProtocol extends EventEmitter {
      * This can be override to use a custom router protobuf.
      */
     _decodeRpc(bytes) {
-        return RPC.decode(bytes);
+        return RPCProto.decode(bytes);
     }
     /**
      * Encode RPC object into a Uint8Array.
      * This can be override to use a custom router protobuf.
      */
     _encodeRpc(rpc) {
-        return RPC.encode(rpc).finish();
+        return RPCProto.encode(rpc).finish();
     }
     /**
      * Send an rpc object to a peer
      */
-    _sendRpc(id, rpc) {
-        const peerStreams = this.peers.get(id);
-        if ((peerStreams == null) || !peerStreams.isWritable) {
-            const msg = `Cannot send RPC to ${id} as there is no open stream to it available`;
+    _sendRpc(peer, rpc) {
+        const peerStreams = this.peers.get(peer);
+        if (peerStreams == null || !peerStreams.isWritable) {
+            const msg = `Cannot send RPC to ${peer.toString(base58btc)} as there is no open stream to it available`;
             this.log.error(msg);
             return;
         }
@@ -346,9 +361,6 @@ export class PubsubBaseProtocol extends EventEmitter {
         const signaturePolicy = this.globalSignaturePolicy;
         switch (signaturePolicy) {
             case 'StrictNoSign':
-                if (message.from != null) {
-                    throw errcode(new Error('StrictNoSigning: from should not be present'), codes.ERR_UNEXPECTED_FROM);
-                }
                 if (message.signature != null) {
                     throw errcode(new Error('StrictNoSigning: signature should not be present'), codes.ERR_UNEXPECTED_SIGNATURE);
                 }
@@ -384,12 +396,11 @@ export class PubsubBaseProtocol extends EventEmitter {
      * Normalizes the message and signs it, if signing is enabled.
      * Should be used by the routers to create the message to send.
      */
-    async _buildMessage(message) {
+    async _maybeSignMessage(message) {
         const signaturePolicy = this.globalSignaturePolicy;
         switch (signaturePolicy) {
             case 'StrictSign':
-                message.from = this.peerId.multihash.bytes;
-                message.seqno = utils.randomSeqno();
+                message.seqno = randomSeqno();
                 return await signMessage(this.peerId, message);
             case 'StrictNoSign':
                 return await Promise.resolve(message);
@@ -412,7 +423,7 @@ export class PubsubBaseProtocol extends EventEmitter {
         if (peersInTopic == null) {
             return [];
         }
-        return Array.from(peersInTopic);
+        return Array.from(peersInTopic).map(str => peerIdFromString(str));
     }
     /**
      * Publishes messages to all subscribed peers
@@ -422,19 +433,17 @@ export class PubsubBaseProtocol extends EventEmitter {
             throw new Error('Pubsub has not started');
         }
         this.log('publish', topic, message);
-        const from = this.peerId.toString();
         const msgObject = {
-            receivedFrom: from,
+            from: this.peerId,
             data: message,
             topicIDs: [topic]
         };
         // ensure that the message follows the signature policy
-        const outMsg = await this._buildMessage(msgObject);
-        const msg = utils.normalizeInRpcMessage(outMsg);
+        const msg = await this._maybeSignMessage(msgObject);
         // Emit to self if I'm interested and emitSelf enabled
-        this.emitSelf && this._emitMessage(msg);
+        this.emitSelf && this.emitMessage(msg);
         // send to all the other peers
-        await this._publish(msg);
+        await this._publish(toRpcMessage(msg));
     }
     /**
      * Subscribes to a given topic.
@@ -445,7 +454,9 @@ export class PubsubBaseProtocol extends EventEmitter {
         }
         if (!this.subscriptions.has(topic)) {
             this.subscriptions.add(topic);
-            this.peers.forEach((_, id) => this._sendSubscriptions(id, [topic], true));
+            for (const peerId of this.peers.keys()) {
+                this._sendSubscriptions(peerId, [topic], true);
+            }
         }
     }
     /**
@@ -457,7 +468,9 @@ export class PubsubBaseProtocol extends EventEmitter {
         }
         if (this.subscriptions.has(topic) && this.listenerCount(topic) === 0) {
             this.subscriptions.delete(topic);
-            this.peers.forEach((_, id) => this._sendSubscriptions(id, [topic], false));
+            for (const peerId of this.peers.keys()) {
+                this._sendSubscriptions(peerId, [topic], false);
+            }
         }
     }
     /**
@@ -469,5 +482,11 @@ export class PubsubBaseProtocol extends EventEmitter {
         }
         return Array.from(this.subscriptions);
     }
+    getPeers() {
+        if (!this.started) {
+            throw new Error('Pubsub is not started');
+        }
+        return Array.from(this.peers.keys());
+    }
 }
 //# sourceMappingURL=index.js.map