@libp2p/pubsub 8.0.13-738dd40f1 → 8.0.14

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@libp2p/pubsub",
-  "version": "8.0.13-738dd40f1",
+  "version": "8.0.14",
   "description": "libp2p pubsub base class",
   "license": "Apache-2.0 OR MIT",
-  "homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/pubsub#readme",
+  "homepage": "https://github.com/libp2p/js-libp2p/tree/master/packages/pubsub#readme",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/libp2p/js-libp2p.git"
@@ -11,10 +11,6 @@
   "bugs": {
     "url": "https://github.com/libp2p/js-libp2p/issues"
   },
-  "publishConfig": {
-    "access": "public",
-    "provenance": true
-  },
   "keywords": [
     "interface",
     "libp2p"
@@ -71,7 +67,7 @@
   "scripts": {
     "clean": "aegir clean",
     "lint": "aegir lint",
-    "dep-check": "aegir dep-check",
+    "dep-check": "aegir dep-check -i protons",
     "build": "aegir build",
     "generate": "protons test/message/rpc.proto",
     "test": "aegir test",
@@ -83,30 +79,30 @@
     "test:electron-main": "aegir test -t electron-main"
   },
   "dependencies": {
-    "@libp2p/crypto": "3.0.1-738dd40f1",
-    "@libp2p/interface": "1.0.1-738dd40f1",
-    "@libp2p/interface-internal": "1.0.0-738dd40f1",
-    "@libp2p/peer-collections": "4.0.10-738dd40f1",
-    "@libp2p/peer-id": "4.0.1-738dd40f1",
-    "@libp2p/utils": "5.0.1-738dd40f1",
-    "it-length-prefixed": "^9.0.3",
+    "@libp2p/crypto": "^2.0.8",
+    "@libp2p/interface": "^0.1.6",
+    "@libp2p/interface-internal": "^0.1.9",
+    "@libp2p/logger": "^3.1.0",
+    "@libp2p/peer-collections": "^4.0.8",
+    "@libp2p/peer-id": "^3.0.6",
+    "abortable-iterator": "^5.0.1",
+    "it-length-prefixed": "^9.0.1",
     "it-pipe": "^3.0.1",
-    "it-pushable": "^3.2.1",
-    "multiformats": "^12.1.3",
-    "p-queue": "^7.4.1",
+    "it-pushable": "^3.2.0",
+    "multiformats": "^12.0.1",
+    "p-queue": "^7.3.4",
     "uint8arraylist": "^2.4.3",
     "uint8arrays": "^4.0.6"
   },
   "devDependencies": {
-    "@libp2p/logger": "4.0.1-738dd40f1",
-    "@libp2p/peer-id-factory": "3.0.10-738dd40f1",
+    "@libp2p/peer-id-factory": "^3.0.8",
     "@types/sinon": "^17.0.0",
     "aegir": "^41.0.2",
     "delay": "^6.0.0",
     "it-pair": "^2.0.6",
     "p-defer": "^4.0.0",
     "p-wait-for": "^5.0.2",
-    "protons": "^7.3.0",
+    "protons": "^7.0.2",
     "protons-runtime": "^5.0.0",
     "sinon": "^17.0.0"
   }

package/src/index.ts

@@ -4,7 +4,6 @@
  * A set of components to be extended in order to create a pubsub implementation.
  *
  * @example
- *
  * ```javascript
  * import { PubSubBaseProtocol } from '@libp2p/pubsub'
  *
@@ -14,8 +13,10 @@
  * ```
  */
 
-import { CodeError, TypedEventEmitter, CustomEvent } from '@libp2p/interface'
-import { type PubSub, type Message, type StrictNoSign, type StrictSign, type PubSubInit, type PubSubEvents, type PeerStreams, type PubSubRPCMessage, type PubSubRPC, type PubSubRPCSubscription, type SubscriptionChangeData, type PublishResult, type TopicValidatorFn, TopicValidatorResult, type ComponentLogger, type Logger, type Connection, type PeerId } from '@libp2p/interface'
+import { CodeError } from '@libp2p/interface/errors'
+import { TypedEventEmitter, CustomEvent } from '@libp2p/interface/events'
+import { type PubSub, type Message, type StrictNoSign, type StrictSign, type PubSubInit, type PubSubEvents, type PeerStreams, type PubSubRPCMessage, type PubSubRPC, type PubSubRPCSubscription, type SubscriptionChangeData, type PublishResult, type TopicValidatorFn, TopicValidatorResult } from '@libp2p/interface/pubsub'
+import { logger } from '@libp2p/logger'
 import { PeerMap, PeerSet } from '@libp2p/peer-collections'
 import { pipe } from 'it-pipe'
 import Queue from 'p-queue'
@@ -26,13 +27,16 @@ import {
   verifySignature
 } from './sign.js'
 import { toMessage, ensureArray, noSignMsgId, msgId, toRpcMessage, randomSeqno } from './utils.js'
-import type { IncomingStreamData, Registrar } from '@libp2p/interface-internal'
+import type { Connection } from '@libp2p/interface/connection'
+import type { PeerId } from '@libp2p/interface/peer-id'
+import type { IncomingStreamData, Registrar } from '@libp2p/interface-internal/registrar'
 import type { Uint8ArrayList } from 'uint8arraylist'
 
+const log = logger('libp2p:pubsub')
+
 export interface PubSubComponents {
   peerId: PeerId
   registrar: Registrar
-  logger: ComponentLogger
 }
 
 /**
@@ -40,8 +44,6 @@ export interface PubSubComponents {
  * and specifies the API that pubsub routers should have.
  */
 export abstract class PubSubBaseProtocol<Events extends Record<string, any> = PubSubEvents> extends TypedEventEmitter<Events> implements PubSub<Events> {
-  protected log: Logger
-
   public started: boolean
   /**
    * Map of topics to which peers are subscribed to
@@ -96,7 +98,6 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
       maxOutboundStreams = 1
     } = props
 
-    this.log = components.logger.forComponent('libp2p:pubsub')
     this.components = components
     this.multicodecs = ensureArray(multicodecs)
     this.enabled = props.enabled !== false
@@ -127,7 +128,7 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
       return
     }
 
-    this.log('starting')
+    log('starting')
 
     const registrar = this.components.registrar
     // Incoming streams
@@ -147,7 +148,7 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
     }
     this._registrarTopologyIds = await Promise.all(this.multicodecs.map(async multicodec => registrar.register(multicodec, topology)))
 
-    this.log('started')
+    log('started')
     this.started = true
   }
 
@@ -172,7 +173,7 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
       await registrar.unhandle(multicodec)
     }))
 
-    this.log('stopping')
+    log('stopping')
     for (const peerStreams of this.peers.values()) {
       peerStreams.close()
     }
@@ -180,7 +181,7 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
     this.peers.clear()
     this.subscriptions = new Set()
     this.started = false
-    this.log('stopped')
+    log('stopped')
   }
 
   isStarted (): boolean {
@@ -203,18 +204,18 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
     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
    */
   protected _onPeerConnected (peerId: PeerId, conn: Connection): void {
-    this.log('connected %p', peerId)
+    log('connected %p', peerId)
 
     // if this connection is already in use for pubsub, ignore it
     if (conn.streams.find(stream => stream.direction === 'outbound' && stream.protocol != null && this.multicodecs.includes(stream.protocol)) != null) {
-      this.log('outbound pubsub streams already present on connection from %p', peerId)
+      log('outbound pubsub streams already present on connection from %p', peerId)
       return
     }
 
@@ -230,14 +231,14 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
         const peer = this.addPeer(peerId, stream.protocol)
         await peer.attachOutboundStream(stream)
       } catch (err: any) {
-        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 })
     })
       .catch(err => {
-        this.log.error(err)
+        log.error(err)
       })
   }
 
@@ -247,7 +248,7 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
   protected _onPeerDisconnected (peerId: PeerId, conn?: Connection): void {
     const idB58Str = peerId.toString()
 
-    this.log('connection ended', idB58Str)
+    log('connection ended', idB58Str)
     this._removePeer(peerId)
   }
 
@@ -263,9 +264,9 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
     }
 
     // else create a new peer streams
-    this.log('new peer %p', peerId)
+    log('new peer %p', peerId)
 
-    const peerStreams: PeerStreams = new PeerStreamsImpl(this.components, {
+    const peerStreams: PeerStreams = new PeerStreamsImpl({
       id: peerId,
       protocol
     })
@@ -291,7 +292,7 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
     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
@@ -318,7 +319,7 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
 
             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
               }
 
@@ -343,7 +344,7 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
               })),
               messages
             })
-              .catch(err => { this.log(err) })
+              .catch(err => { log(err) })
           }
         }
       )
@@ -357,16 +358,16 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
    */
   async processRpc (from: PeerId, peerStreams: PeerStreams, rpc: PubSubRPC): Promise<boolean> {
     if (!this.acceptFrom(from)) {
-      this.log('received message from unacceptable peer %p', from)
+      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 != null && subscriptions.length > 0) {
-      this.log('subscription update from %p', from)
+      log('subscription update from %p', from)
 
       // update peer subscriptions
       subscriptions.forEach((subOpt) => {
@@ -385,11 +386,11 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
     }
 
     if (messages != null && messages.length > 0) {
-      this.log('messages from %p', from)
+      log('messages from %p', from)
 
       this.queue.addAll(messages.map(message => async () => {
         if (message.topic == null || (!this.subscriptions.has(message.topic) && !this.canRelayMessage)) {
-          this.log('received message we didn\'t subscribe to. Dropping.')
+          log('received message we didn\'t subscribe to. Dropping.')
           return false
         }
 
@@ -398,10 +399,10 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
 
           await this.processMessage(from, msg)
         } catch (err: any) {
-          this.log.error(err)
+          log.error(err)
         }
       }))
-        .catch(err => { this.log(err) })
+        .catch(err => { log(err) })
     }
 
     return true
@@ -444,7 +445,7 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
     try {
       await this.validate(from, msg)
     } catch (err: any) {
-      this.log('Message is invalid, dropping it. %O', err)
+      log('Message is invalid, dropping it. %O', err)
       return
     }
 
@@ -534,13 +535,13 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
     const peerStreams = this.peers.get(peer)
 
     if (peerStreams == null) {
-      this.log.error('Cannot send RPC to %p as there are no streams to it available', peer)
+      log.error('Cannot send RPC to %p as there are no streams to it available', peer)
 
       return
     }
 
     if (!peerStreams.isWritable) {
-      this.log.error('Cannot send RPC to %p as there is no outbound stream to it available', peer)
+      log.error('Cannot send RPC to %p as there is no outbound stream to it available', peer)
 
       return
     }
@@ -663,7 +664,7 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
       sequenceNumber: randomSeqno()
     }
 
-    this.log('publish topic: %s from: %p data: %m', topic, message.from, message.data)
+    log('publish topic: %s from: %p data: %m', topic, message.from, message.data)
 
     const rpcMessage = await this.buildMessage(message)
     let emittedToSelf = false
@@ -705,7 +706,7 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
       throw new Error('Pubsub has not started')
     }
 
-    this.log('subscribe to topic: %s', topic)
+    log('subscribe to topic: %s', topic)
 
     if (!this.subscriptions.has(topic)) {
       this.subscriptions.add(topic)
@@ -728,7 +729,7 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
 
     const wasSubscribed = this.subscriptions.has(topic)
 
-    this.log('unsubscribe from %s - am subscribed %s', topic, wasSubscribed)
+    log('unsubscribe from %s - am subscribed %s', topic, wasSubscribed)
 
     if (wasSubscribed) {
       this.subscriptions.delete(topic)

package/src/peer-streams.ts

@@ -1,21 +1,22 @@
-import { TypedEventEmitter, CustomEvent } from '@libp2p/interface'
-import { closeSource } from '@libp2p/utils/close-source'
+import { TypedEventEmitter, CustomEvent } from '@libp2p/interface/events'
+import { logger } from '@libp2p/logger'
+import { abortableSource } from 'abortable-iterator'
 import * as lp from 'it-length-prefixed'
 import { pipe } from 'it-pipe'
 import { pushable } from 'it-pushable'
 import { Uint8ArrayList } from 'uint8arraylist'
-import type { ComponentLogger, Logger, Stream, PeerId, PeerStreamEvents } from '@libp2p/interface'
+import type { Stream } from '@libp2p/interface/connection'
+import type { PeerId } from '@libp2p/interface/peer-id'
+import type { PeerStreamEvents } from '@libp2p/interface/pubsub'
 import type { Pushable } from 'it-pushable'
 
+const log = logger('libp2p-pubsub:peer-streams')
+
 export interface PeerStreamsInit {
   id: PeerId
   protocol: string
 }
 
-export interface PeerStreamsComponents {
-  logger: ComponentLogger
-}
-
 /**
  * Thin wrapper around a peer's inbound / outbound pubsub streams
  */
@@ -43,12 +44,10 @@ export class PeerStreams extends TypedEventEmitter<PeerStreamEvents> {
    */
   private readonly _inboundAbortController: AbortController
   private closed: boolean
-  private readonly log: Logger
 
-  constructor (components: PeerStreamsComponents, init: PeerStreamsInit) {
+  constructor (init: PeerStreamsInit) {
     super()
 
-    this.log = components.logger.forComponent('libp2p-pubsub:peer-streams')
     this.id = init.id
     this.protocol = init.protocol
 
@@ -87,22 +86,18 @@ export class PeerStreams extends TypedEventEmitter<PeerStreamEvents> {
    * Attach a raw inbound stream and setup a read stream
    */
   attachInboundStream (stream: Stream): AsyncIterable<Uint8ArrayList> {
-    const abortListener = (): void => {
-      closeSource(stream.source, this.log)
-    }
-
-    this._inboundAbortController.signal.addEventListener('abort', abortListener, {
-      once: true
-    })
-
     // Create and attach a new inbound stream
     // The inbound stream is:
     // - abortable, set to only return on abort, rather than throw
     // - transformed with length-prefix transform
     this._rawInboundStream = stream
-    this.inboundStream = pipe(
-      this._rawInboundStream,
-      (source) => lp.decode(source)
+    this.inboundStream = abortableSource(
+      pipe(
+        this._rawInboundStream,
+        (source) => lp.decode(source)
+      ),
+      this._inboundAbortController.signal,
+      { returnOnAbort: true }
     )
 
     this.dispatchEvent(new CustomEvent('stream:inbound'))
@@ -122,12 +117,13 @@ export class PeerStreams extends TypedEventEmitter<PeerStreamEvents> {
 
     this._rawOutboundStream = stream
     this.outboundStream = pushable<Uint8ArrayList>({
+      objectMode: true,
       onEnd: (shouldEmit) => {
         // close writable side of the stream
         if (this._rawOutboundStream != null) { // eslint-disable-line @typescript-eslint/prefer-optional-chain
           this._rawOutboundStream.closeWrite()
             .catch(err => {
-              this.log('error closing outbound stream', err)
+              log('error closing outbound stream', err)
             })
         }
 
@@ -144,7 +140,7 @@ export class PeerStreams extends TypedEventEmitter<PeerStreamEvents> {
       (source) => lp.encode(source),
       this._rawOutboundStream
     ).catch((err: Error) => {
-      this.log.error(err)
+      log.error(err)
     })
 
     // Only emit if the connection is new

package/src/sign.ts

@@ -3,7 +3,8 @@ import { peerIdFromKeys } from '@libp2p/peer-id'
 import { concat as uint8ArrayConcat } from 'uint8arrays/concat'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toRpcMessage } from './utils.js'
-import type { PeerId, PubSubRPCMessage, SignedMessage } from '@libp2p/interface'
+import type { PeerId } from '@libp2p/interface/peer-id'
+import type { PubSubRPCMessage, SignedMessage } from '@libp2p/interface/pubsub'
 
 export const SignPrefix = uint8ArrayFromString('libp2p-pubsub:')
 

package/src/utils.ts

@@ -1,11 +1,11 @@
 import { randomBytes } from '@libp2p/crypto'
-import { CodeError } from '@libp2p/interface'
+import { CodeError } from '@libp2p/interface/errors'
 import { peerIdFromBytes, peerIdFromKeys } from '@libp2p/peer-id'
 import { sha256 } from 'multiformats/hashes/sha2'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import { codes } from './errors.js'
-import type { Message, PubSubRPCMessage } from '@libp2p/interface'
+import type { Message, PubSubRPCMessage } from '@libp2p/interface/pubsub'
 
 /**
  * Generate a random sequence number