@libp2p/pubsub 1.2.6 → 1.2.9

package/dist/src/errors.d.ts

@@ -15,6 +15,10 @@ export declare const codes: {
      * Message expected to have a `seqno`, but doesn't
      */
     ERR_MISSING_SEQNO: string;
+    /**
+     * Message expected to have a `key`, but doesn't
+     */
+    ERR_MISSING_KEY: string;
     /**
      * Message `signature` is invalid
      */

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;;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;;IAEH;;OAEG;;IAKH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;CAEJ,CAAA"}

package/dist/src/errors.js

@@ -16,6 +16,10 @@ export const codes = {
      * Message expected to have a `seqno`, but doesn't
      */
     ERR_MISSING_SEQNO: 'ERR_MISSING_SEQNO',
+    /**
+     * Message expected to have a `key`, but doesn't
+     */
+    ERR_MISSING_KEY: 'ERR_MISSING_KEY',
     /**
      * Message `signature` is invalid
      */

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;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"}
+{"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,eAAe,EAAE,iBAAiB;IAClC;;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,9 +1,9 @@
-import { EventEmitter } from '@libp2p/interfaces';
+import { EventEmitter, EventHandler } from '@libp2p/interfaces';
 import Queue from 'p-queue';
 import type { PeerId } from '@libp2p/interfaces/peer-id';
 import type { Registrar, IncomingStreamData } from '@libp2p/interfaces/registrar';
 import type { Connection } from '@libp2p/interfaces/connection';
-import type { PubSub, Message, StrictNoSign, StrictSign, PubSubOptions, PubSubEvents, RPCMessage, RPC, PeerStreams, RPCSubscription } from '@libp2p/interfaces/pubsub';
+import type { PubSub, Message, StrictNoSign, StrictSign, PubSubOptions, PubSubEvents, 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';
@@ -15,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> {
+export declare abstract class PubsubBaseProtocol<EventMap extends PubSubEvents = PubSubEvents> extends EventEmitter<EventMap & PubSubEvents> implements PubSub<EventMap & PubSubEvents> {
     peerId: PeerId;
     started: boolean;
     /**
@@ -83,7 +83,7 @@ export declare abstract class PubsubBaseProtocol<EventMap> extends EventEmitter<
     /**
      * Notifies the router that a peer has been connected
      */
-    protected _addPeer(peerId: PeerId, protocol: string): PeerStreams;
+    addPeer(peerId: PeerId, protocol: string): PeerStreams;
     /**
      * Notifies the router that a peer has been disconnected
      */
@@ -91,23 +91,19 @@ export declare abstract class PubsubBaseProtocol<EventMap> extends EventEmitter<
     /**
      * Responsible for processing each RPC message received by other peers.
      */
-    _processMessages(peerId: PeerId, stream: AsyncIterable<Uint8Array>, peerStreams: PeerStreams): Promise<void>;
+    processMessages(peerId: PeerId, stream: AsyncIterable<Uint8Array>, peerStreams: PeerStreams): Promise<void>;
     /**
      * Handles an rpc request from a peer
      */
-    processRpc(from: PeerId, peerStreams: PeerStreams, rpc: RPC): Promise<boolean>;
+    processRpc(from: PeerId, peerStreams: PeerStreams, rpc: RPC): Promise<void>;
     /**
      * Handles a subscription change from a peer
      */
-    _processRpcSubOpt(id: PeerId, subOpt: RPCSubscription): void;
+    processRpcSubOpt(id: PeerId, subOpt: RPCSubscription): void;
     /**
      * Handles an message from a peer
      */
-    _processMessage(msg: Message): Promise<void>;
-    /**
-     * Emit a message from a peer
-     */
-    emitMessage(message: Message): void;
+    processMessage(from: PeerId, msg: Message): Promise<void>;
     /**
      * The default msgID implementation
      * Child class can override this.
@@ -117,25 +113,29 @@ export declare abstract class PubsubBaseProtocol<EventMap> extends EventEmitter<
      * Whether to accept a message from a peer
      * Override to create a graylist
      */
-    _acceptFrom(id: PeerId): boolean;
+    acceptFrom(id: PeerId): boolean;
     /**
      * Decode Uint8Array into an RPC object.
      * This can be override to use a custom router protobuf.
      */
-    _decodeRpc(bytes: Uint8Array): RPCProto;
+    decodeRpc(bytes: Uint8Array): RPCProto;
     /**
      * Encode RPC object into a Uint8Array.
      * This can be override to use a custom router protobuf.
      */
-    _encodeRpc(rpc: IRPC): Uint8Array;
+    encodeRpc(rpc: IRPC): Uint8Array;
     /**
      * Send an rpc object to a peer
      */
-    _sendRpc(peer: PeerId, rpc: IRPC): void;
+    send(peer: PeerId, data: {
+        messages?: Message[];
+        subscriptions?: string[];
+        subscribe?: boolean;
+    }): void;
     /**
-     * Send subscriptions to a peer
+     * Send an rpc object to a peer
      */
-    _sendSubscriptions(id: PeerId, topics: string[], subscribe: boolean): void;
+    sendRpc(peer: PeerId, rpc: IRPC): void;
     /**
      * Validates the given message. The signature will be checked for authenticity.
      * Throws an error on invalid messages
@@ -145,7 +145,7 @@ 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 _maybeSignMessage(message: Message): Promise<Message>;
+    buildMessage(message: Message): Promise<Message>;
     /**
      * Get a list of the peer-ids that are subscribed to one topic.
      */
@@ -153,18 +153,18 @@ export declare abstract class PubsubBaseProtocol<EventMap> extends EventEmitter<
     /**
      * Publishes messages to all subscribed peers
      */
-    publish(topic: string, message: Uint8Array): Promise<void>;
+    dispatchEvent(event: CustomEvent): boolean;
     /**
      * 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: RPCMessage): Promise<void>;
+    abstract publishMessage(peerId: PeerId, message: Message): Promise<void>;
     /**
      * Subscribes to a given topic.
      */
     subscribe(topic: string): void;
     /**
-     * Unsubscribe from the given topic.
+     * Unsubscribe from the given topic
      */
     unsubscribe(topic: string): void;
     /**
@@ -172,5 +172,7 @@ export declare abstract class PubsubBaseProtocol<EventMap> extends EventEmitter<
      */
     getTopics(): string[];
     getPeers(): PeerId[];
+    addEventListener<U extends keyof EventMap>(type: U, callback: EventHandler<EventMap[U]>, options?: AddEventListenerOptions | boolean): void;
+    removeEventListener<U extends keyof EventMap>(type: U, callback: EventHandler<EventMap[U]> | undefined, options?: EventListenerOptions | boolean): void;
 }
 //# 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,10 +3,10 @@ import { EventEmitter, CustomEvent } from '@libp2p/interfaces';
 import errcode from 'err-code';
 import { pipe } from 'it-pipe';
 import Queue from 'p-queue';
-import { Topology } from '@libp2p/topology';
+import { createTopology } from '@libp2p/topology';
 import { codes } from './errors.js';
 import { PeerStreams as PeerStreamsImpl } from './peer-streams.js';
-import { toRpcMessage, toMessage, ensureArray, randomSeqno, noSignMsgId, msgId } from './utils.js';
+import { toMessage, ensureArray, randomSeqno, noSignMsgId, msgId, toRpcMessage } from './utils.js';
 import { signMessage, verifySignature } from './message/sign.js';
 import { base58btc } from 'multiformats/bases/base58';
 import { peerMap } from '@libp2p/peer-map';
@@ -53,7 +53,7 @@ export class PubsubBaseProtocol extends EventEmitter {
         this._registrarHandlerId = await this.registrar.handle(this.multicodecs, this._onIncomingStream);
         // register protocol with topology
         // Topology callbacks called on connection manager changes
-        const topology = new Topology({
+        const topology = createTopology({
             onConnect: this._onPeerConnected,
             onDisconnect: this._onPeerDisconnected
         });
@@ -93,9 +93,9 @@ export class PubsubBaseProtocol extends EventEmitter {
     _onIncomingStream(evt) {
         const { protocol, stream, connection } = evt.detail;
         const peerId = connection.remotePeer;
-        const peer = this._addPeer(peerId, protocol);
+        const peer = this.addPeer(peerId, protocol);
         const inboundStream = peer.attachInboundStream(stream);
-        this._processMessages(peerId, inboundStream, peer)
+        this.processMessages(peerId, inboundStream, peer)
             .catch(err => this.log(err));
     }
     /**
@@ -105,14 +105,14 @@ export class PubsubBaseProtocol extends EventEmitter {
         this.log('connected %p', peerId);
         try {
             const { stream, protocol } = await conn.newStream(this.multicodecs);
-            const peer = this._addPeer(peerId, protocol);
+            const peer = this.addPeer(peerId, protocol);
             await peer.attachOutboundStream(stream);
         }
         catch (err) {
             this.log.error(err);
         }
         // Immediately send my own subscriptions to the newly established conn
-        this._sendSubscriptions(peerId, Array.from(this.subscriptions), true);
+        this.send(peerId, { subscriptions: Array.from(this.subscriptions).map(sub => sub.toString()), subscribe: true });
     }
     /**
      * Registrar notifies a closing connection with pubsub protocol
@@ -125,7 +125,7 @@ export class PubsubBaseProtocol extends EventEmitter {
     /**
      * Notifies the router that a peer has been connected
      */
-    _addPeer(peerId, protocol) {
+    addPeer(peerId, protocol) {
         const existing = this.peers.get(peerId);
         // If peer streams already exists, do nothing
         if (existing != null) {
@@ -167,28 +167,36 @@ export class PubsubBaseProtocol extends EventEmitter {
     /**
      * Responsible for processing each RPC message received by other peers.
      */
-    async _processMessages(peerId, stream, peerStreams) {
+    async processMessages(peerId, stream, peerStreams) {
         try {
             await pipe(stream, async (source) => {
                 for await (const data of source) {
-                    const rpcMsg = this._decodeRpc(data);
-                    // Since _processRpc may be overridden entirely in unsafe ways,
+                    const rpcMsg = this.decodeRpc(data);
+                    const messages = [];
+                    for (const msg of (rpcMsg.messages ?? [])) {
+                        if (msg.from == null || msg.data == null || msg.topic == null) {
+                            this.log('message from %p was missing from, data or topic fields, dropping', peerId);
+                            continue;
+                        }
+                        messages.push({
+                            from: msg.from,
+                            data: msg.data,
+                            topic: msg.topic,
+                            seqno: msg.seqno ?? undefined,
+                            signature: msg.signature ?? undefined,
+                            key: msg.key ?? undefined
+                        });
+                    }
+                    // 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(peerId, peerStreams, {
                         subscriptions: (rpcMsg.subscriptions).map(sub => ({
                             subscribe: Boolean(sub.subscribe),
-                            topicID: sub.topicID ?? ''
+                            topic: sub.topic ?? ''
                         })),
-                        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
-                        }))
+                        messages
                     })
                         .catch(err => this.log(err));
                 }
@@ -202,36 +210,32 @@ export class PubsubBaseProtocol extends EventEmitter {
      * Handles an rpc request from a peer
      */
     async processRpc(from, peerStreams, rpc) {
+        if (!this.acceptFrom(from)) {
+            this.log('received message from unacceptable peer %p', from);
+            return;
+        }
         this.log('rpc from %p', from);
-        const subs = rpc.subscriptions;
-        const msgs = rpc.msgs;
-        if (subs.length > 0) {
+        const { subscriptions, messages } = rpc;
+        if (subscriptions.length > 0) {
+            this.log('subscription update from %p', from);
             // update peer subscriptions
-            subs.forEach((subOpt) => {
-                this._processRpcSubOpt(from, subOpt);
+            subscriptions.forEach((subOpt) => {
+                this.processRpcSubOpt(from, subOpt);
             });
-            this.dispatchEvent(new CustomEvent('pubsub:subscription-change', {
-                detail: { peerId: peerStreams.id, subscriptions: subs }
+            super.dispatchEvent(new CustomEvent('pubsub:subscription-change', {
+                detail: { peerId: peerStreams.id, subscriptions }
             }));
         }
-        if (!this._acceptFrom(from)) {
-            this.log('received message from unacceptable peer %p', from);
-            return false;
-        }
-        if (msgs.length > 0) {
-            this.queue.addAll(msgs.map(message => async () => {
-                const topics = message.topicIDs != null ? message.topicIDs : [];
-                const hasSubscription = topics.some((topic) => this.subscriptions.has(topic));
-                if (!hasSubscription && !this.canRelayMessage) {
+        if (messages.length > 0) {
+            this.log('messages from %p', from);
+            this.queue.addAll(messages.map(message => async () => {
+                if (!this.subscriptions.has(message.topic) && !this.canRelayMessage) {
                     this.log('received message we didn\'t subscribe to. Dropping.');
                     return;
                 }
                 try {
-                    const msg = toMessage({
-                        ...message,
-                        from: from.multihash.bytes
-                    });
-                    await this._processMessage(msg);
+                    const msg = await toMessage(message);
+                    await this.processMessage(from, msg);
                 }
                 catch (err) {
                     this.log.error(err);
@@ -239,13 +243,12 @@ export class PubsubBaseProtocol extends EventEmitter {
             }))
                 .catch(err => this.log(err));
         }
-        return true;
     }
     /**
      * Handles a subscription change from a peer
      */
-    _processRpcSubOpt(id, subOpt) {
-        const t = subOpt.topicID;
+    processRpcSubOpt(id, subOpt) {
+        const t = subOpt.topic;
         if (t == null) {
             return;
         }
@@ -266,8 +269,8 @@ export class PubsubBaseProtocol extends EventEmitter {
     /**
      * Handles an message from a peer
      */
-    async _processMessage(msg) {
-        if (this.peerId.equals(msg.from) && !this.emitSelf) {
+    async processMessage(from, msg) {
+        if (this.peerId.equals(from) && !this.emitSelf) {
             return;
         }
         // Ensure the message is valid before processing it
@@ -278,21 +281,15 @@ export class PubsubBaseProtocol extends EventEmitter {
             this.log('Message is invalid, dropping it. %O', err);
             return;
         }
-        // Emit to self
-        this.emitMessage(msg);
-        return await this._publish(toRpcMessage(msg));
-    }
-    /**
-     * Emit a message from a peer
-     */
-    emitMessage(message) {
-        message.topicIDs.forEach((topic) => {
-            if (this.subscriptions.has(topic)) {
-                this.dispatchEvent(new CustomEvent(topic, {
-                    detail: message
+        if (this.subscriptions.has(msg.topic)) {
+            const isFromSelf = this.peerId.equals(from);
+            if (!isFromSelf || this.emitSelf) {
+                super.dispatchEvent(new CustomEvent(msg.topic, {
+                    detail: msg
                 }));
             }
-        });
+        }
+        await this.publishMessage(from, msg);
     }
     /**
      * The default msgID implementation
@@ -305,7 +302,10 @@ export class PubsubBaseProtocol extends EventEmitter {
                 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);
+                if (msg.key == null) {
+                    throw errcode(new Error('Need key when signature policy is StrictSign but it was missing'), codes.ERR_MISSING_KEY);
+                }
+                return msgId(msg.key, msg.seqno);
             case 'StrictNoSign':
                 return noSignMsgId(msg.data);
             default:
@@ -316,42 +316,44 @@ export class PubsubBaseProtocol extends EventEmitter {
      * Whether to accept a message from a peer
      * Override to create a graylist
      */
-    _acceptFrom(id) {
+    acceptFrom(id) {
         return true;
     }
     /**
      * Decode Uint8Array into an RPC object.
      * This can be override to use a custom router protobuf.
      */
-    _decodeRpc(bytes) {
+    decodeRpc(bytes) {
         return RPCProto.decode(bytes);
     }
     /**
      * Encode RPC object into a Uint8Array.
      * This can be override to use a custom router protobuf.
      */
-    _encodeRpc(rpc) {
+    encodeRpc(rpc) {
         return RPCProto.encode(rpc).finish();
     }
     /**
      * Send an rpc object to a peer
      */
-    _sendRpc(peer, rpc) {
+    send(peer, data) {
+        const { messages, subscriptions, subscribe } = data;
+        return this.sendRpc(peer, {
+            subscriptions: (subscriptions ?? []).map(str => ({ topic: str, subscribe: Boolean(subscribe) })),
+            messages: (messages ?? []).map(toRpcMessage)
+        });
+    }
+    /**
+     * Send an rpc object to a peer
+     */
+    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;
         }
-        peerStreams.write(this._encodeRpc(rpc));
-    }
-    /**
-     * Send subscriptions to a peer
-     */
-    _sendSubscriptions(id, topics, subscribe) {
-        return this._sendRpc(id, {
-            subscriptions: topics.map(t => ({ topicID: t, subscribe: subscribe }))
-        });
+        peerStreams.write(this.encodeRpc(rpc));
     }
     /**
      * Validates the given message. The signature will be checked for authenticity.
@@ -385,18 +387,16 @@ export class PubsubBaseProtocol extends EventEmitter {
             default:
                 throw errcode(new Error('Cannot validate message: unhandled signature policy'), codes.ERR_UNHANDLED_SIGNATURE_POLICY);
         }
-        for (const topic of message.topicIDs) {
-            const validatorFn = this.topicValidators.get(topic);
-            if (validatorFn != null) {
-                await validatorFn(topic, message);
-            }
+        const validatorFn = this.topicValidators.get(message.topic);
+        if (validatorFn != null) {
+            await validatorFn(message.topic, message);
         }
     }
     /**
      * Normalizes the message and signs it, if signing is enabled.
      * Should be used by the routers to create the message to send.
      */
-    async _maybeSignMessage(message) {
+    async buildMessage(message) {
         const signaturePolicy = this.globalSignaturePolicy;
         switch (signaturePolicy) {
             case 'StrictSign':
@@ -419,7 +419,7 @@ export class PubsubBaseProtocol extends EventEmitter {
         if (topic == null) {
             throw errcode(new Error('topic is required'), 'ERR_NOT_VALID_TOPIC');
         }
-        const peersInTopic = this.topics.get(topic);
+        const peersInTopic = this.topics.get(topic.toString());
         if (peersInTopic == null) {
             return [];
         }
@@ -428,22 +428,40 @@ export class PubsubBaseProtocol extends EventEmitter {
     /**
      * Publishes messages to all subscribed peers
      */
-    async publish(topic, message) {
+    dispatchEvent(event) {
         if (!this.started) {
             throw new Error('Pubsub has not started');
         }
+        const topic = event.type;
+        let message = event.detail;
+        if (message instanceof Uint8Array) {
+            message = {
+                from: this.peerId,
+                topic,
+                data: message
+            };
+        }
         this.log('publish', topic, message);
-        const msgObject = {
-            from: this.peerId,
-            data: message,
-            topicIDs: [topic]
-        };
-        // ensure that the message follows the signature policy
-        const msg = await this._maybeSignMessage(msgObject);
-        // Emit to self if I'm interested and emitSelf enabled
-        this.emitSelf && this.emitMessage(msg);
-        // send to all the other peers
-        await this._publish(toRpcMessage(msg));
+        Promise.resolve().then(async () => {
+            message = await this.buildMessage(message);
+            // dispatch the event if we are interested
+            if (this.emitSelf) {
+                if (this.subscriptions.has(topic)) {
+                    super.dispatchEvent(new CustomEvent(topic, {
+                        detail: message
+                    }));
+                    if (this.listenerCount(topic) === 0) {
+                        this.unsubscribe(topic);
+                    }
+                }
+            }
+            // send to all the other peers
+            await this.publishMessage(this.peerId, message);
+        })
+            .catch(err => {
+            this.log.error(err);
+        });
+        return true;
     }
     /**
      * Subscribes to a given topic.
@@ -452,24 +470,37 @@ export class PubsubBaseProtocol extends EventEmitter {
         if (!this.started) {
             throw new Error('Pubsub has not started');
         }
-        if (!this.subscriptions.has(topic)) {
-            this.subscriptions.add(topic);
+        const topicStr = topic.toString();
+        if (topicStr === 'pubsub:subscription-change') {
+            return;
+        }
+        if (!this.subscriptions.has(topicStr)) {
+            this.subscriptions.add(topicStr);
             for (const peerId of this.peers.keys()) {
-                this._sendSubscriptions(peerId, [topic], true);
+                this.send(peerId, { subscriptions: [topicStr], subscribe: true });
             }
         }
     }
     /**
-     * Unsubscribe from the given topic.
+     * Unsubscribe from the given topic
      */
     unsubscribe(topic) {
         if (!this.started) {
             throw new Error('Pubsub is not started');
         }
-        if (this.subscriptions.has(topic) && this.listenerCount(topic) === 0) {
-            this.subscriptions.delete(topic);
+        // @ts-expect-error topic should be a key of the event map
+        super.removeEventListener(topic);
+        const topicStr = topic.toString();
+        if (topicStr === 'pubsub:subscription-change') {
+            return;
+        }
+        const wasSubscribed = this.subscriptions.has(topicStr);
+        const listeners = this.listenerCount(topicStr);
+        this.log('unsubscribe from %s - am subscribed %s, listeners %d', topic, wasSubscribed, listeners);
+        if (wasSubscribed && listeners === 0) {
+            this.subscriptions.delete(topicStr);
             for (const peerId of this.peers.keys()) {
-                this._sendSubscriptions(peerId, [topic], false);
+                this.send(peerId, { subscriptions: [topicStr], subscribe: false });
             }
         }
     }
@@ -488,5 +519,16 @@ export class PubsubBaseProtocol extends EventEmitter {
         }
         return Array.from(this.peers.keys());
     }
+    addEventListener(type, callback, options) {
+        this.subscribe(type.toString());
+        super.addEventListener(type, callback, options);
+    }
+    removeEventListener(type, callback, options) {
+        super.removeEventListener(type, callback, options);
+        const topicStr = type.toString();
+        if (this.listenerCount(topicStr) === 0) {
+            this.unsubscribe(topicStr);
+        }
+    }
 }
 //# sourceMappingURL=index.js.map