@libp2p/pubsub 1.2.7 → 1.2.10

package/README.md

@@ -15,9 +15,9 @@ npm i libp2p-pubsub
 ```
 
 ```javascript
-import { PubsubBaseProtocol } from '@libp2p/pubsub'
+import { PubSubBaseProtocol } from '@libp2p/pubsub'
 
-class MyPubsubImplementation extends PubsubBaseProtocol {
+class MyPubsubImplementation extends PubSubBaseProtocol {
   // .. extra methods here
 }
 ```

package/dist/src/index.d.ts

@@ -1,27 +1,24 @@
 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 { IncomingStreamData } from '@libp2p/interfaces/registrar';
 import type { Connection } from '@libp2p/interfaces/connection';
-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';
-import { RPC as RPCProto } from './message/rpc.js';
+import type { PubSub, Message, StrictNoSign, StrictSign, PubSubInit, PubSubEvents, PeerStreams, PubSubRPCMessage, PubSubRPC, PubSubRPCSubscription } from '@libp2p/interfaces/pubsub';
+import { PeerMap, PeerSet } from '@libp2p/peer-collections';
+import { Components, Initializable } from '@libp2p/interfaces/components';
 export interface TopicValidator {
     (topic: string, message: Message): Promise<void>;
 }
 /**
- * PubsubBaseProtocol handles the peers and connections logic for pubsub routers
+ * 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 PubSubEvents = PubSubEvents> extends EventEmitter<EventMap & PubSubEvents> implements PubSub<EventMap & PubSubEvents> {
-    peerId: PeerId;
+export declare abstract class PubSubBaseProtocol<EventMap extends PubSubEvents = PubSubEvents> extends EventEmitter<EventMap & PubSubEvents> implements PubSub<EventMap & PubSubEvents>, Initializable {
     started: boolean;
     /**
      * Map of topics to which peers are subscribed to
      */
-    topics: Map<string, Set<string>>;
+    topics: Map<string, PeerSet>;
     /**
      * List of our subscriptions
      */
@@ -50,13 +47,12 @@ export declare abstract class PubsubBaseProtocol<EventMap extends PubSubEvents =
      */
     topicValidators: Map<string, TopicValidator>;
     queue: Queue;
-    registrar: Registrar;
     multicodecs: string[];
-    protected log: Logger;
-    protected _libp2p: any;
-    private _registrarHandlerId;
+    components: Components;
     private _registrarTopologyId;
-    constructor(props: PubSubOptions);
+    protected enabled: boolean;
+    constructor(props: PubSubInit);
+    init(components: Components): void;
     /**
      * Register the pubsub protocol onto the libp2p node.
      *
@@ -71,7 +67,7 @@ export declare abstract class PubsubBaseProtocol<EventMap extends PubSubEvents =
     /**
      * On an inbound stream opened
      */
-    protected _onIncomingStream(evt: CustomEvent<IncomingStreamData>): void;
+    protected _onIncomingStream(data: IncomingStreamData): void;
     /**
      * Registrar notifies an established connection with pubsub protocol
      */
@@ -95,13 +91,13 @@ export declare abstract class PubsubBaseProtocol<EventMap extends PubSubEvents =
     /**
      * Handles an rpc request from a peer
      */
-    processRpc(from: PeerId, peerStreams: PeerStreams, rpc: RPC): Promise<void>;
+    processRpc(from: PeerId, peerStreams: PeerStreams, rpc: PubSubRPC): Promise<boolean>;
     /**
      * Handles a subscription change from a peer
      */
-    processRpcSubOpt(id: PeerId, subOpt: RPCSubscription): void;
+    processRpcSubOpt(id: PeerId, subOpt: PubSubRPCSubscription): void;
     /**
-     * Handles an message from a peer
+     * Handles a message from a peer
      */
     processMessage(from: PeerId, msg: Message): Promise<void>;
     /**
@@ -118,12 +114,22 @@ export declare abstract class PubsubBaseProtocol<EventMap extends PubSubEvents =
      * Decode Uint8Array into an RPC object.
      * This can be override to use a custom router protobuf.
      */
-    decodeRpc(bytes: Uint8Array): RPCProto;
+    abstract decodeRpc(bytes: Uint8Array): PubSubRPC;
     /**
      * Encode RPC object into a Uint8Array.
      * This can be override to use a custom router protobuf.
      */
-    encodeRpc(rpc: IRPC): Uint8Array;
+    abstract encodeRpc(rpc: PubSubRPC): Uint8Array;
+    /**
+     * Decode Uint8Array into an RPC object.
+     * This can be override to use a custom router protobuf.
+     */
+    abstract decodeMessage(bytes: Uint8Array): PubSubRPCMessage;
+    /**
+     * Encode RPC object into a Uint8Array.
+     * This can be override to use a custom router protobuf.
+     */
+    abstract encodeMessage(rpc: PubSubRPCMessage): Uint8Array;
     /**
      * Send an rpc object to a peer
      */
@@ -135,7 +141,7 @@ export declare abstract class PubsubBaseProtocol<EventMap extends PubSubEvents =
     /**
      * Send an rpc object to a peer
      */
-    sendRpc(peer: PeerId, rpc: IRPC): void;
+    sendRpc(peer: PeerId, rpc: PubSubRPC): void;
     /**
      * Validates the given message. The signature will be checked for authenticity.
      * Throws an error on invalid messages
@@ -153,12 +159,15 @@ export declare abstract class PubsubBaseProtocol<EventMap extends PubSubEvents =
     /**
      * Publishes messages to all subscribed peers
      */
-    dispatchEvent(event: CustomEvent): boolean;
+    dispatchEvent(event: CustomEvent<Uint8Array | Message>): 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
+     * For example, a Floodsub implementation might simply publish each message to each topic for every peer.
+     *
+     * `sender` might be this peer, or we might be forwarding a message on behalf of another peer, in which case sender
+     * is the peer we received the message from, which may not be the peer the message was created by.
      */
-    abstract publishMessage(peerId: PeerId, message: Message): Promise<void>;
+    abstract publishMessage(sender: PeerId, message: Message): Promise<void>;
     /**
      * Subscribes to a given topic.
      */

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,31 +3,29 @@ 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 { 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';
-import { peerIdFromString } from '@libp2p/peer-id';
-import { RPC as RPCProto } from './message/rpc.js';
+import { signMessage, verifySignature } from './sign.js';
+import { PeerMap, PeerSet } from '@libp2p/peer-collections';
+import { Components } from '@libp2p/interfaces/components';
+const log = logger('libp2p:pubsub');
 /**
- * PubsubBaseProtocol handles the peers and connections logic for pubsub routers
+ * PubSubBaseProtocol handles the peers and connections logic for pubsub routers
  * and specifies the API that pubsub routers should have.
  */
-export class PubsubBaseProtocol extends EventEmitter {
+export class PubSubBaseProtocol extends EventEmitter {
     constructor(props) {
         super();
-        const { debugName = 'libp2p:pubsub', multicodecs = [], peerId, registrar, globalSignaturePolicy = 'StrictSign', canRelayMessage = false, emitSelf = false, messageProcessingConcurrency = 10 } = props;
-        this.log = logger(debugName);
+        this.components = new Components();
+        const { multicodecs = [], globalSignaturePolicy = 'StrictSign', canRelayMessage = false, emitSelf = false, messageProcessingConcurrency = 10 } = props;
         this.multicodecs = ensureArray(multicodecs);
-        this.registrar = registrar;
-        this.peerId = peerId;
+        this.enabled = props.enabled !== false;
         this.started = false;
         this.topics = new Map();
         this.subscriptions = new Set();
-        this.peers = peerMap();
+        this.peers = new PeerMap();
         this.globalSignaturePolicy = globalSignaturePolicy === 'StrictNoSign' ? 'StrictNoSign' : 'StrictSign';
         this.canRelayMessage = canRelayMessage;
         this.emitSelf = emitSelf;
@@ -37,6 +35,9 @@ export class PubsubBaseProtocol extends EventEmitter {
         this._onPeerConnected = this._onPeerConnected.bind(this);
         this._onPeerDisconnected = this._onPeerDisconnected.bind(this);
     }
+    init(components) {
+        this.components = components;
+    }
     // LIFECYCLE METHODS
     /**
      * Register the pubsub protocol onto the libp2p node.
@@ -44,45 +45,43 @@ export class PubsubBaseProtocol extends EventEmitter {
      * @returns {void}
      */
     async start() {
-        if (this.started) {
+        if (this.started || !this.enabled) {
             return;
         }
-        this.log('starting');
+        log('starting');
         // Incoming streams
         // Called after a peer dials us
-        this._registrarHandlerId = await this.registrar.handle(this.multicodecs, this._onIncomingStream);
+        await this.components.getRegistrar().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
         });
-        this._registrarTopologyId = this.registrar.register(this.multicodecs, topology);
-        this.log('started');
+        this._registrarTopologyId = await this.components.getRegistrar().register(this.multicodecs, topology);
+        log('started');
         this.started = true;
     }
     /**
      * Unregister the pubsub protocol and the streams with other peers will be closed.
      */
     async stop() {
-        if (!this.started) {
+        if (!this.started || !this.enabled) {
             return;
         }
         // unregister protocol and handlers
         if (this._registrarTopologyId != null) {
-            this.registrar.unregister(this._registrarTopologyId);
+            this.components.getRegistrar().unregister(this._registrarTopologyId);
         }
-        if (this._registrarHandlerId != null) {
-            await this.registrar.unhandle(this._registrarHandlerId);
-        }
-        this.log('stopping');
+        await this.components.getRegistrar().unhandle(this.multicodecs);
+        log('stopping');
         for (const peerStreams of this.peers.values()) {
             peerStreams.close();
         }
         this.peers.clear();
         this.subscriptions = new Set();
         this.started = false;
-        this.log('stopped');
+        log('stopped');
     }
     isStarted() {
         return this.started;
@@ -90,26 +89,26 @@ export class PubsubBaseProtocol extends EventEmitter {
     /**
      * On an inbound stream opened
      */
-    _onIncomingStream(evt) {
-        const { protocol, stream, connection } = evt.detail;
+    _onIncomingStream(data) {
+        const { protocol, stream, connection } = data;
         const peerId = connection.remotePeer;
         const peer = this.addPeer(peerId, protocol);
         const inboundStream = peer.attachInboundStream(stream);
         this.processMessages(peerId, inboundStream, peer)
-            .catch(err => this.log(err));
+            .catch(err => log(err));
     }
     /**
      * Registrar notifies an established connection with pubsub protocol
      */
     async _onPeerConnected(peerId, conn) {
-        this.log('connected %p', peerId);
+        log('connected %p', peerId);
         try {
             const { stream, protocol } = await conn.newStream(this.multicodecs);
             const peer = this.addPeer(peerId, protocol);
             await peer.attachOutboundStream(stream);
         }
         catch (err) {
-            this.log.error(err);
+            log.error(err);
         }
         // Immediately send my own subscriptions to the newly established conn
         this.send(peerId, { subscriptions: Array.from(this.subscriptions).map(sub => sub.toString()), subscribe: true });
@@ -119,7 +118,7 @@ export class PubsubBaseProtocol extends EventEmitter {
      */
     _onPeerDisconnected(peerId, conn) {
         const idB58Str = peerId.toString();
-        this.log('connection ended', idB58Str);
+        log('connection ended', idB58Str);
         this._removePeer(peerId);
     }
     /**
@@ -132,7 +131,7 @@ export class PubsubBaseProtocol extends EventEmitter {
             return existing;
         }
         // else create a new peer streams
-        this.log('new peer %p', peerId);
+        log('new peer %p', peerId);
         const peerStreams = new PeerStreamsImpl({
             id: peerId,
             protocol
@@ -147,7 +146,6 @@ export class PubsubBaseProtocol extends EventEmitter {
      * Notifies the router that a peer has been disconnected
      */
     _removePeer(peerId) {
-        const id = peerId.toString();
         const peerStreams = this.peers.get(peerId);
         if (peerStreams == null) {
             return;
@@ -155,11 +153,11 @@ export class PubsubBaseProtocol extends EventEmitter {
         // close peer streams
         peerStreams.close();
         // delete peer streams
-        this.log('delete peer %p', peerId);
+        log('delete peer %p', peerId);
         this.peers.delete(peerId);
         // remove peer from topics map
         for (const peers of this.topics.values()) {
-            peers.delete(id);
+            peers.delete(peerId);
         }
         return peerStreams;
     }
@@ -175,14 +173,14 @@ export class PubsubBaseProtocol extends EventEmitter {
                     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);
+                            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,
+                            sequenceNumber: msg.sequenceNumber ?? undefined,
                             signature: msg.signature ?? undefined,
                             key: msg.key ?? undefined
                         });
@@ -192,13 +190,13 @@ export class PubsubBaseProtocol extends EventEmitter {
                     // 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 => ({
+                        subscriptions: (rpcMsg.subscriptions ?? []).map(sub => ({
                             subscribe: Boolean(sub.subscribe),
                             topic: sub.topic ?? ''
                         })),
                         messages
                     })
-                        .catch(err => this.log(err));
+                        .catch(err => log(err));
                 }
             });
         }
@@ -211,38 +209,45 @@ export class PubsubBaseProtocol extends EventEmitter {
      */
     async processRpc(from, peerStreams, rpc) {
         if (!this.acceptFrom(from)) {
-            this.log('received message from unacceptable peer %p', from);
-            return;
+            log('received message from unacceptable peer %p', from);
+            return false;
         }
-        this.log('rpc from %p', from);
+        log('rpc from %p', from);
         const { subscriptions, messages } = rpc;
-        if (subscriptions.length > 0) {
-            this.log('subscription update from %p', from);
+        if (subscriptions != null && subscriptions.length > 0) {
+            log('subscription update from %p', from);
             // update peer subscriptions
             subscriptions.forEach((subOpt) => {
                 this.processRpcSubOpt(from, subOpt);
             });
             super.dispatchEvent(new CustomEvent('pubsub:subscription-change', {
-                detail: { peerId: peerStreams.id, subscriptions }
+                detail: {
+                    peerId: peerStreams.id,
+                    subscriptions: subscriptions.map(({ topic, subscribe }) => ({
+                        topic: `${topic ?? ''}`,
+                        subscribe: Boolean(subscribe)
+                    }))
+                }
             }));
         }
-        if (messages.length > 0) {
-            this.log('messages from %p', from);
+        if (messages != null && messages.length > 0) {
+            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;
+                if (message.topic == null || (!this.subscriptions.has(message.topic) && !this.canRelayMessage)) {
+                    log('received message we didn\'t subscribe to. Dropping.');
+                    return false;
                 }
                 try {
                     const msg = await toMessage(message);
                     await this.processMessage(from, msg);
                 }
                 catch (err) {
-                    this.log.error(err);
+                    log.error(err);
                 }
             }))
-                .catch(err => this.log(err));
+                .catch(err => log(err));
         }
+        return true;
     }
     /**
      * Handles a subscription change from a peer
@@ -254,23 +259,23 @@ export class PubsubBaseProtocol extends EventEmitter {
         }
         let topicSet = this.topics.get(t);
         if (topicSet == null) {
-            topicSet = new Set();
+            topicSet = new PeerSet();
             this.topics.set(t, topicSet);
         }
-        if (subOpt.subscribe) {
+        if (subOpt.subscribe === true) {
             // subscribe peer to new topic
-            topicSet.add(id.toString());
+            topicSet.add(id);
         }
         else {
             // unsubscribe from existing topic
-            topicSet.delete(id.toString());
+            topicSet.delete(id);
         }
     }
     /**
-     * Handles an message from a peer
+     * Handles a message from a peer
      */
     async processMessage(from, msg) {
-        if (this.peerId.equals(from) && !this.emitSelf) {
+        if (this.components.getPeerId().equals(from) && !this.emitSelf) {
             return;
         }
         // Ensure the message is valid before processing it
@@ -278,11 +283,11 @@ export class PubsubBaseProtocol extends EventEmitter {
             await this.validate(msg);
         }
         catch (err) {
-            this.log('Message is invalid, dropping it. %O', err);
+            log('Message is invalid, dropping it. %O', err);
             return;
         }
         if (this.subscriptions.has(msg.topic)) {
-            const isFromSelf = this.peerId.equals(from);
+            const isFromSelf = this.components.getPeerId().equals(from);
             if (!isFromSelf || this.emitSelf) {
                 super.dispatchEvent(new CustomEvent(msg.topic, {
                     detail: msg
@@ -299,13 +304,13 @@ export class PubsubBaseProtocol extends EventEmitter {
         const signaturePolicy = this.globalSignaturePolicy;
         switch (signaturePolicy) {
             case 'StrictSign':
-                if (msg.seqno == null) {
+                if (msg.sequenceNumber == null) {
                     throw errcode(new Error('Need seqno when signature policy is StrictSign but it was missing'), codes.ERR_MISSING_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);
+                return msgId(msg.key, msg.sequenceNumber);
             case 'StrictNoSign':
                 return noSignMsgId(msg.data);
             default:
@@ -319,20 +324,6 @@ export class PubsubBaseProtocol extends EventEmitter {
     acceptFrom(id) {
         return true;
     }
-    /**
-     * Decode Uint8Array into an RPC object.
-     * This can be override to use a custom router protobuf.
-     */
-    decodeRpc(bytes) {
-        return RPCProto.decode(bytes);
-    }
-    /**
-     * Encode RPC object into a Uint8Array.
-     * This can be override to use a custom router protobuf.
-     */
-    encodeRpc(rpc) {
-        return RPCProto.encode(rpc).finish();
-    }
     /**
      * Send an rpc object to a peer
      */
@@ -349,8 +340,7 @@ export class PubsubBaseProtocol extends EventEmitter {
     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);
+            log.error('Cannot send RPC to %p as there is no open stream to it available', peer);
             return;
         }
         peerStreams.write(this.encodeRpc(rpc));
@@ -369,7 +359,7 @@ export class PubsubBaseProtocol extends EventEmitter {
                 if (message.key != null) {
                     throw errcode(new Error('StrictNoSigning: key should not be present'), codes.ERR_UNEXPECTED_KEY);
                 }
-                if (message.seqno != null) {
+                if (message.sequenceNumber != null) {
                     throw errcode(new Error('StrictNoSigning: seqno should not be present'), codes.ERR_UNEXPECTED_SEQNO);
                 }
                 break;
@@ -377,10 +367,10 @@ export class PubsubBaseProtocol extends EventEmitter {
                 if (message.signature == null) {
                     throw errcode(new Error('StrictSigning: Signing required and no signature was present'), codes.ERR_MISSING_SIGNATURE);
                 }
-                if (message.seqno == null) {
+                if (message.sequenceNumber == null) {
                     throw errcode(new Error('StrictSigning: Signing required and no seqno was present'), codes.ERR_MISSING_SEQNO);
                 }
-                if (!(await verifySignature(message))) {
+                if (!(await verifySignature(message, this.encodeMessage.bind(this)))) {
                     throw errcode(new Error('StrictSigning: Invalid message signature'), codes.ERR_INVALID_SIGNATURE);
                 }
                 break;
@@ -400,8 +390,8 @@ export class PubsubBaseProtocol extends EventEmitter {
         const signaturePolicy = this.globalSignaturePolicy;
         switch (signaturePolicy) {
             case 'StrictSign':
-                message.seqno = randomSeqno();
-                return await signMessage(this.peerId, message);
+                message.sequenceNumber = randomSeqno();
+                return await signMessage(this.components.getPeerId(), message, this.encodeMessage.bind(this));
             case 'StrictNoSign':
                 return await Promise.resolve(message);
             default:
@@ -423,7 +413,7 @@ export class PubsubBaseProtocol extends EventEmitter {
         if (peersInTopic == null) {
             return [];
         }
-        return Array.from(peersInTopic).map(str => peerIdFromString(str));
+        return Array.from(peersInTopic.values());
     }
     /**
      * Publishes messages to all subscribed peers
@@ -433,15 +423,18 @@ export class PubsubBaseProtocol extends EventEmitter {
             throw new Error('Pubsub has not started');
         }
         const topic = event.type;
-        let message = event.detail;
-        if (message instanceof Uint8Array) {
+        let message;
+        if (event.detail instanceof Uint8Array) {
             message = {
-                from: this.peerId,
+                from: this.components.getPeerId(),
                 topic,
-                data: message
+                data: event.detail
             };
         }
-        this.log('publish', topic, message);
+        else {
+            message = event.detail;
+        }
+        log('publish topic: %s from: %p data: %m', topic, message.from, message.data);
         Promise.resolve().then(async () => {
             message = await this.buildMessage(message);
             // dispatch the event if we are interested
@@ -456,10 +449,10 @@ export class PubsubBaseProtocol extends EventEmitter {
                 }
             }
             // send to all the other peers
-            await this.publishMessage(this.peerId, message);
+            await this.publishMessage(this.components.getPeerId(), message);
         })
             .catch(err => {
-            this.log.error(err);
+            log.error(err);
         });
         return true;
     }
@@ -496,7 +489,7 @@ export class PubsubBaseProtocol extends EventEmitter {
         }
         const wasSubscribed = this.subscriptions.has(topicStr);
         const listeners = this.listenerCount(topicStr);
-        this.log('unsubscribe from %s - am subscribed %s, listeners %d', topic, wasSubscribed, listeners);
+        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()) {