libp2p 0.45.8 → 0.45.9-06f4901a

package/src/upgrader.ts

@@ -1,5 +1,5 @@
 import { setMaxListeners } from 'events'
-import { CodeError } from '@libp2p/interfaces/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import { logger } from '@libp2p/logger'
 import * as mss from '@libp2p/multistream-select'
 import { peerIdFromString } from '@libp2p/peer-id'
@@ -9,19 +9,18 @@ import { createConnection } from './connection/index.js'
 import { INBOUND_UPGRADE_TIMEOUT } from './connection-manager/constants.js'
 import { codes } from './errors.js'
 import { DEFAULT_MAX_INBOUND_STREAMS, DEFAULT_MAX_OUTBOUND_STREAMS } from './registrar.js'
-import type { MultiaddrConnection, Connection, Stream, ConnectionProtector } from '@libp2p/interface-connection'
-import type { ConnectionEncrypter, SecuredConnection } from '@libp2p/interface-connection-encrypter'
-import type { ConnectionGater } from '@libp2p/interface-connection-gater'
-import type { ConnectionManager } from '@libp2p/interface-connection-manager'
-import type { Libp2pEvents } from '@libp2p/interface-libp2p'
-import type { Metrics } from '@libp2p/interface-metrics'
-import type { PeerId } from '@libp2p/interface-peer-id'
-import type { PeerStore } from '@libp2p/interface-peer-store'
-import type { Registrar } from '@libp2p/interface-registrar'
-import type { StreamMuxer, StreamMuxerFactory } from '@libp2p/interface-stream-muxer'
-import type { Upgrader, UpgraderOptions } from '@libp2p/interface-transport'
-import type { AbortOptions } from '@libp2p/interfaces'
-import type { EventEmitter } from '@libp2p/interfaces/events'
+import type { Libp2pEvents, AbortOptions } from '@libp2p/interface'
+import type { MultiaddrConnection, Connection, Stream, ConnectionProtector, NewStreamOptions } from '@libp2p/interface/connection'
+import type { ConnectionEncrypter, SecuredConnection } from '@libp2p/interface/connection-encrypter'
+import type { ConnectionGater } from '@libp2p/interface/connection-gater'
+import type { EventEmitter } from '@libp2p/interface/events'
+import type { Metrics } from '@libp2p/interface/metrics'
+import type { PeerId } from '@libp2p/interface/peer-id'
+import type { PeerStore } from '@libp2p/interface/peer-store'
+import type { StreamMuxer, StreamMuxerFactory } from '@libp2p/interface/stream-muxer'
+import type { ConnectionManager } from '@libp2p/interface-internal/connection-manager'
+import type { Registrar } from '@libp2p/interface-internal/registrar'
+import type { Upgrader, UpgraderOptions } from '@libp2p/interface-internal/upgrader'
 import type { Duplex, Source } from 'it-stream-types'
 
 const log = logger('libp2p:upgrader')
@@ -70,17 +69,20 @@ function findIncomingStreamLimit (protocol: string, registrar: Registrar): numbe
   return DEFAULT_MAX_INBOUND_STREAMS
 }
 
-function findOutgoingStreamLimit (protocol: string, registrar: Registrar): number | undefined {
+function findOutgoingStreamLimit (protocol: string, registrar: Registrar, options: NewStreamOptions = {}): number {
   try {
     const { options } = registrar.getHandler(protocol)
-    return options.maxOutboundStreams
+
+    if (options.maxOutboundStreams != null) {
+      return options.maxOutboundStreams
+    }
   } catch (err: any) {
     if (err.code !== codes.ERR_NO_HANDLER_FOR_PROTOCOL) {
       throw err
     }
   }
 
-  return DEFAULT_MAX_OUTBOUND_STREAMS
+  return options.maxOutboundStreams ?? DEFAULT_MAX_OUTBOUND_STREAMS
 }
 
 function countStreams (protocol: string, direction: 'inbound' | 'outbound', connection: Connection): number {
@@ -428,7 +430,7 @@ export class DefaultUpgrader implements Upgrader {
         }
       })
 
-      newStream = async (protocols: string[], options: AbortOptions = {}): Promise<Stream> => {
+      newStream = async (protocols: string[], options: NewStreamOptions = {}): Promise<Stream> => {
         if (muxer == null) {
           throw new CodeError('Stream is not multiplexed', codes.ERR_MUXER_UNAVAILABLE)
         }
@@ -450,10 +452,10 @@ export class DefaultUpgrader implements Upgrader {
 
           const { stream, protocol } = await mss.select(muxedStream, protocols, options)
 
-          const outgoingLimit = findOutgoingStreamLimit(protocol, this.components.registrar)
+          const outgoingLimit = findOutgoingStreamLimit(protocol, this.components.registrar, options)
           const streamCount = countStreams(protocol, 'outbound', connection)
 
-          if (streamCount === outgoingLimit) {
+          if (streamCount >= outgoingLimit) {
             const err = new CodeError(`Too many outbound protocol streams for protocol "${protocol}" - limit ${outgoingLimit}`, codes.ERR_TOO_MANY_OUTBOUND_PROTOCOL_STREAMS)
             muxedStream.abort(err)
 

package/src/upnp-nat/index.ts

@@ -1,5 +1,5 @@
 import { upnpNat, type NatAPI } from '@achingbrain/nat-port-mapper'
-import { CodeError } from '@libp2p/interfaces/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import { logger } from '@libp2p/logger'
 import { isLoopback } from '@libp2p/utils/multiaddr/is-loopback'
 import { fromNodeAddress } from '@multiformats/multiaddr'
@@ -7,10 +7,10 @@ import isPrivateIp from 'private-ip'
 import { isBrowser } from 'wherearewe'
 import { codes } from '../errors.js'
 import * as pkg from '../version.js'
-import type { AddressManager } from '@libp2p/interface-address-manager'
-import type { PeerId } from '@libp2p/interface-peer-id'
-import type { TransportManager } from '@libp2p/interface-transport'
-import type { Startable } from '@libp2p/interfaces/startable'
+import type { PeerId } from '@libp2p/interface/peer-id'
+import type { Startable } from '@libp2p/interface/startable'
+import type { AddressManager } from '@libp2p/interface-internal/address-manager'
+import type { TransportManager } from '@libp2p/interface-internal/transport-manager'
 
 const log = logger('libp2p:upnp-nat')
 const DEFAULT_TTL = 7200

package/src/utils/peer-job-queue.ts

@@ -1,9 +1,9 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 
-import { CodeError } from '@libp2p/interfaces/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import PQueue from 'p-queue'
 import { codes } from '../errors.js'
-import type { PeerId } from '@libp2p/interface-peer-id'
+import type { PeerId } from '@libp2p/interface/peer-id'
 import type { QueueAddOptions, Options, Queue } from 'p-queue'
 
 // Port of lower_bound from https://en.cppreference.com/w/cpp/algorithm/lower_bound

package/src/version.ts

@@ -1,2 +1,2 @@
-export const version = '0.45.8'
+export const version = '0.45.9-06f4901a'
 export const name = 'libp2p'

package/dist/src/pubsub/dummy-pubsub.d.ts

@@ -1,18 +0,0 @@
-import { EventEmitter } from '@libp2p/interfaces/events';
-import type { PeerId } from '@libp2p/interface-peer-id';
-import type { PublishResult, PubSub, PubSubEvents, StrictNoSign, StrictSign, TopicValidatorFn } from '@libp2p/interface-pubsub';
-export declare class DummyPubSub extends EventEmitter<PubSubEvents> implements PubSub {
-    topicValidators: Map<string, TopicValidatorFn>;
-    isStarted(): boolean;
-    start(): void | Promise<void>;
-    stop(): void | Promise<void>;
-    get globalSignaturePolicy(): typeof StrictSign | typeof StrictNoSign;
-    get multicodecs(): string[];
-    getPeers(): PeerId[];
-    getTopics(): string[];
-    subscribe(): void;
-    unsubscribe(): void;
-    getSubscribers(): PeerId[];
-    publish(): Promise<PublishResult>;
-}
-//# sourceMappingURL=dummy-pubsub.d.ts.map

package/dist/src/pubsub/dummy-pubsub.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"dummy-pubsub.d.ts","sourceRoot":"","sources":["../../../src/pubsub/dummy-pubsub.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAExD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAE/H,qBAAa,WAAY,SAAQ,YAAY,CAAC,YAAY,CAAE,YAAW,MAAM;IACpE,eAAe,gCAAsC;IAE5D,SAAS,IAAK,OAAO;IAIrB,KAAK,IAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9B,IAAI,IAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7B,IAAI,qBAAqB,IAAK,OAAO,UAAU,GAAG,OAAO,YAAY,CAEpE;IAED,IAAI,WAAW,IAAK,MAAM,EAAE,CAE3B;IAED,QAAQ,IAAK,MAAM,EAAE;IAIrB,SAAS,IAAK,MAAM,EAAE;IAItB,SAAS,IAAK,IAAI;IAIlB,WAAW,IAAK,IAAI;IAIpB,cAAc,IAAK,MAAM,EAAE;IAIrB,OAAO,IAAK,OAAO,CAAC,aAAa,CAAC;CAGzC"}

package/dist/src/pubsub/dummy-pubsub.js

@@ -1,38 +0,0 @@
-import { CodeError } from '@libp2p/interfaces/errors';
-import { EventEmitter } from '@libp2p/interfaces/events';
-import { messages, codes } from '../errors.js';
-export class DummyPubSub extends EventEmitter {
-    topicValidators = new Map();
-    isStarted() {
-        return false;
-    }
-    start() {
-    }
-    stop() {
-    }
-    get globalSignaturePolicy() {
-        throw new CodeError(messages.PUBSUB_DISABLED, codes.ERR_PUBSUB_DISABLED);
-    }
-    get multicodecs() {
-        throw new CodeError(messages.PUBSUB_DISABLED, codes.ERR_PUBSUB_DISABLED);
-    }
-    getPeers() {
-        throw new CodeError(messages.PUBSUB_DISABLED, codes.ERR_PUBSUB_DISABLED);
-    }
-    getTopics() {
-        throw new CodeError(messages.PUBSUB_DISABLED, codes.ERR_PUBSUB_DISABLED);
-    }
-    subscribe() {
-        throw new CodeError(messages.PUBSUB_DISABLED, codes.ERR_PUBSUB_DISABLED);
-    }
-    unsubscribe() {
-        throw new CodeError(messages.PUBSUB_DISABLED, codes.ERR_PUBSUB_DISABLED);
-    }
-    getSubscribers() {
-        throw new CodeError(messages.PUBSUB_DISABLED, codes.ERR_PUBSUB_DISABLED);
-    }
-    async publish() {
-        throw new CodeError(messages.PUBSUB_DISABLED, codes.ERR_PUBSUB_DISABLED);
-    }
-}
-//# sourceMappingURL=dummy-pubsub.js.map

package/dist/src/pubsub/dummy-pubsub.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"dummy-pubsub.js","sourceRoot":"","sources":["../../../src/pubsub/dummy-pubsub.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AAI9C,MAAM,OAAO,WAAY,SAAQ,YAA0B;IAClD,eAAe,GAAG,IAAI,GAAG,EAA4B,CAAA;IAE5D,SAAS;QACP,OAAO,KAAK,CAAA;IACd,CAAC;IAED,KAAK;IAEL,CAAC;IAED,IAAI;IAEJ,CAAC;IAED,IAAI,qBAAqB;QACvB,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,KAAK,CAAC,mBAAmB,CAAC,CAAA;IAC1E,CAAC;IAED,IAAI,WAAW;QACb,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,KAAK,CAAC,mBAAmB,CAAC,CAAA;IAC1E,CAAC;IAED,QAAQ;QACN,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,KAAK,CAAC,mBAAmB,CAAC,CAAA;IAC1E,CAAC;IAED,SAAS;QACP,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,KAAK,CAAC,mBAAmB,CAAC,CAAA;IAC1E,CAAC;IAED,SAAS;QACP,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,KAAK,CAAC,mBAAmB,CAAC,CAAA;IAC1E,CAAC;IAED,WAAW;QACT,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,KAAK,CAAC,mBAAmB,CAAC,CAAA;IAC1E,CAAC;IAED,cAAc;QACZ,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,KAAK,CAAC,mBAAmB,CAAC,CAAA;IAC1E,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,KAAK,CAAC,mBAAmB,CAAC,CAAA;IAC1E,CAAC;CACF"}

package/src/pubsub/dummy-pubsub.ts

@@ -1,53 +0,0 @@
-import { CodeError } from '@libp2p/interfaces/errors'
-import { EventEmitter } from '@libp2p/interfaces/events'
-import { messages, codes } from '../errors.js'
-import type { PeerId } from '@libp2p/interface-peer-id'
-import type { PublishResult, PubSub, PubSubEvents, StrictNoSign, StrictSign, TopicValidatorFn } from '@libp2p/interface-pubsub'
-
-export class DummyPubSub extends EventEmitter<PubSubEvents> implements PubSub {
-  public topicValidators = new Map<string, TopicValidatorFn>()
-
-  isStarted (): boolean {
-    return false
-  }
-
-  start (): void | Promise<void> {
-
-  }
-
-  stop (): void | Promise<void> {
-
-  }
-
-  get globalSignaturePolicy (): typeof StrictSign | typeof StrictNoSign {
-    throw new CodeError(messages.PUBSUB_DISABLED, codes.ERR_PUBSUB_DISABLED)
-  }
-
-  get multicodecs (): string[] {
-    throw new CodeError(messages.PUBSUB_DISABLED, codes.ERR_PUBSUB_DISABLED)
-  }
-
-  getPeers (): PeerId[] {
-    throw new CodeError(messages.PUBSUB_DISABLED, codes.ERR_PUBSUB_DISABLED)
-  }
-
-  getTopics (): string[] {
-    throw new CodeError(messages.PUBSUB_DISABLED, codes.ERR_PUBSUB_DISABLED)
-  }
-
-  subscribe (): void {
-    throw new CodeError(messages.PUBSUB_DISABLED, codes.ERR_PUBSUB_DISABLED)
-  }
-
-  unsubscribe (): void {
-    throw new CodeError(messages.PUBSUB_DISABLED, codes.ERR_PUBSUB_DISABLED)
-  }
-
-  getSubscribers (): PeerId[] {
-    throw new CodeError(messages.PUBSUB_DISABLED, codes.ERR_PUBSUB_DISABLED)
-  }
-
-  async publish (): Promise<PublishResult> {
-    throw new CodeError(messages.PUBSUB_DISABLED, codes.ERR_PUBSUB_DISABLED)
-  }
-}