@helia/bitswap 3.1.3 → 3.1.4

package/dist/src/bitswap.d.ts

@@ -1,8 +1,8 @@
-import { Network } from './network.js';
-import { PeerWantLists } from './peer-want-lists/index.js';
-import { Stats } from './stats.js';
-import { WantList } from './want-list.js';
-import type { BitswapOptions, Bitswap as BitswapInterface, BitswapWantProgressEvents, BitswapNotifyProgressEvents, WantListEntry, BitswapComponents, PeerWantListEntry } from './index.js';
+import { Network } from './network.ts';
+import { PeerWantLists } from './peer-want-lists/index.ts';
+import { Stats } from './stats.ts';
+import { WantList } from './want-list.ts';
+import type { BitswapOptions, Bitswap as BitswapInterface, BitswapWantProgressEvents, BitswapNotifyProgressEvents, WantListEntry, BitswapComponents, PeerWantListEntry } from './index.ts';
 import type { CreateSessionOptions, ProviderOptions, SessionBlockBroker } from '@helia/interface';
 import type { Libp2p, PeerId, AbortOptions } from '@libp2p/interface';
 import type { Blockstore } from 'interface-blockstore';

package/dist/src/bitswap.js

@@ -1,11 +1,11 @@
 import { setMaxListeners } from '@libp2p/interface';
 import { anySignal } from 'any-signal';
 import { CustomProgressEvent } from 'progress-events';
-import { Network } from './network.js';
-import { PeerWantLists } from './peer-want-lists/index.js';
-import { createBitswapSession } from './session.js';
-import { Stats } from './stats.js';
-import { WantList } from './want-list.js';
+import { Network } from "./network.js";
+import { PeerWantLists } from "./peer-want-lists/index.js";
+import { createBitswapSession } from "./session.js";
+import { Stats } from "./stats.js";
+import { WantList } from "./want-list.js";
 /**
  * JavaScript implementation of the Bitswap 'data exchange' protocol
  * used by IPFS.

package/dist/src/index.d.ts

@@ -5,8 +5,8 @@
  *
  * It supersedes the older [ipfs-bitswap](https://www.npmjs.com/package/ipfs-bitswap) module with the aim of being smaller, faster, better integrated with libp2p/helia, having fewer dependencies and using standard JavaScript instead of Node.js APIs.
  */
-import type { BitswapNetworkNotifyProgressEvents, BitswapNetworkWantProgressEvents, BitswapNetworkProgressEvents } from './network.js';
-import type { WantType } from './pb/message.js';
+import type { BitswapNetworkNotifyProgressEvents, BitswapNetworkWantProgressEvents, BitswapNetworkProgressEvents } from './network.ts';
+import type { WantType } from './pb/message.ts';
 import type { CreateSessionOptions, ProviderOptions, SessionBlockBroker } from '@helia/interface';
 import type { Routing } from '@helia/interface/routing';
 import type { Libp2p, AbortOptions, Startable, ComponentLogger, Metrics, PeerId } from '@libp2p/interface';

package/dist/src/index.js

@@ -5,7 +5,7 @@
  *
  * It supersedes the older [ipfs-bitswap](https://www.npmjs.com/package/ipfs-bitswap) module with the aim of being smaller, faster, better integrated with libp2p/helia, having fewer dependencies and using standard JavaScript instead of Node.js APIs.
  */
-import { Bitswap as BitswapClass } from './bitswap.js';
+import { Bitswap as BitswapClass } from "./bitswap.js";
 export const createBitswap = (components, options = {}) => {
     return new BitswapClass(components, options);
 };

package/dist/src/network.d.ts

@@ -1,9 +1,9 @@
 import { TypedEventEmitter } from '@libp2p/interface';
-import { BitswapMessage } from './pb/message.js';
-import type { WantOptions } from './bitswap.js';
-import type { MultihashHasherLoader } from './index.js';
-import type { Block } from './pb/message.js';
-import type { QueuedBitswapMessage } from './utils/bitswap-message.js';
+import { BitswapMessage } from './pb/message.ts';
+import type { WantOptions } from './bitswap.ts';
+import type { MultihashHasherLoader } from './index.ts';
+import type { Block } from './pb/message.ts';
+import type { QueuedBitswapMessage } from './utils/bitswap-message.ts';
 import type { Provider, Routing } from '@helia/interface/routing';
 import type { Libp2p, AbortOptions, Connection, PeerId, ComponentLogger, Metrics, Stream } from '@libp2p/interface';
 import type { Multiaddr } from '@multiformats/multiaddr';

package/dist/src/network.js

@@ -7,10 +7,10 @@ import { pushable } from 'it-pushable';
 import take from 'it-take';
 import { CustomProgressEvent } from 'progress-events';
 import { raceEvent } from 'race-event';
-import { BITSWAP_120, DEFAULT_MAX_INBOUND_STREAMS, DEFAULT_MAX_INCOMING_MESSAGE_SIZE, DEFAULT_MAX_OUTBOUND_STREAMS, DEFAULT_MAX_OUTGOING_MESSAGE_SIZE, DEFAULT_MAX_PROVIDERS_PER_REQUEST, DEFAULT_MESSAGE_RECEIVE_TIMEOUT, DEFAULT_MESSAGE_SEND_CONCURRENCY, DEFAULT_RUN_ON_TRANSIENT_CONNECTIONS } from './constants.js';
-import { BitswapMessage } from './pb/message.js';
-import { mergeMessages } from './utils/merge-messages.js';
-import { splitMessage } from './utils/split-message.js';
+import { BITSWAP_120, DEFAULT_MAX_INBOUND_STREAMS, DEFAULT_MAX_INCOMING_MESSAGE_SIZE, DEFAULT_MAX_OUTBOUND_STREAMS, DEFAULT_MAX_OUTGOING_MESSAGE_SIZE, DEFAULT_MAX_PROVIDERS_PER_REQUEST, DEFAULT_MESSAGE_RECEIVE_TIMEOUT, DEFAULT_MESSAGE_SEND_CONCURRENCY, DEFAULT_RUN_ON_TRANSIENT_CONNECTIONS } from "./constants.js";
+import { BitswapMessage } from "./pb/message.js";
+import { mergeMessages } from "./utils/merge-messages.js";
+import { splitMessage } from "./utils/split-message.js";
 export class Network extends TypedEventEmitter {
     log;
     libp2p;

package/dist/src/peer-want-lists/index.d.ts

@@ -1,8 +1,8 @@
 import { CID } from 'multiformats/cid';
-import { Ledger } from './ledger.js';
-import type { BitswapNotifyProgressEvents, PeerWantListEntry } from '../index.js';
-import type { Network } from '../network.js';
-import type { BitswapMessage } from '../pb/message.js';
+import { Ledger } from './ledger.ts';
+import type { BitswapNotifyProgressEvents, PeerWantListEntry } from '../index.ts';
+import type { Network } from '../network.ts';
+import type { BitswapMessage } from '../pb/message.ts';
 import type { AbortOptions, ComponentLogger, Libp2p, Metrics, PeerId } from '@libp2p/interface';
 import type { PeerMap } from '@libp2p/peer-collections';
 import type { Blockstore } from 'interface-blockstore';

package/dist/src/peer-want-lists/index.js

@@ -1,6 +1,6 @@
 import { trackedPeerMap } from '@libp2p/peer-collections';
 import { CID } from 'multiformats/cid';
-import { Ledger } from './ledger.js';
+import { Ledger } from "./ledger.js";
 export class PeerWantLists {
     blockstore;
     network;

package/dist/src/peer-want-lists/ledger.d.ts

@@ -1,7 +1,7 @@
 import { CID } from 'multiformats/cid';
-import { WantType } from '../pb/message.js';
-import type { Network } from '../network.js';
-import type { Wantlist } from '../pb/message.js';
+import { WantType } from '../pb/message.ts';
+import type { Network } from '../network.ts';
+import type { Wantlist } from '../pb/message.ts';
 import type { AbortOptions, ComponentLogger, PeerId } from '@libp2p/interface';
 import type { Blockstore } from 'interface-blockstore';
 export interface LedgerComponents {

package/dist/src/peer-want-lists/ledger.js

@@ -1,10 +1,10 @@
 import toBuffer from 'it-to-buffer';
 import { CID } from 'multiformats/cid';
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string';
-import { DEFAULT_MAX_SIZE_REPLACE_HAS_WITH_BLOCK, DEFAULT_DO_NOT_RESEND_BLOCK_WINDOW, DEFAULT_MAX_WANTLIST_SIZE } from '../constants.js';
-import { BlockPresenceType, WantType } from '../pb/message.js';
-import { QueuedBitswapMessage } from '../utils/bitswap-message.js';
-import { cidToPrefix } from '../utils/cid-prefix.js';
+import { DEFAULT_MAX_SIZE_REPLACE_HAS_WITH_BLOCK, DEFAULT_DO_NOT_RESEND_BLOCK_WINDOW, DEFAULT_MAX_WANTLIST_SIZE } from "../constants.js";
+import { BlockPresenceType, WantType } from "../pb/message.js";
+import { QueuedBitswapMessage } from "../utils/bitswap-message.js";
+import { cidToPrefix } from "../utils/cid-prefix.js";
 export class Ledger {
     peerId;
     blockstore;

package/dist/src/session.d.ts

@@ -1,7 +1,7 @@
 import { AbstractSession } from '@helia/utils';
-import type { BitswapWantProgressEvents } from './index.js';
-import type { Network } from './network.js';
-import type { WantList } from './want-list.js';
+import type { BitswapWantProgressEvents } from './index.ts';
+import type { Network } from './network.ts';
+import type { WantList } from './want-list.ts';
 import type { BlockRetrievalOptions, CreateSessionOptions } from '@helia/interface';
 import type { ComponentLogger, Libp2p, PeerId } from '@libp2p/interface';
 import type { Multiaddr } from '@multiformats/multiaddr';
@@ -16,6 +16,7 @@ export interface BitswapSessionComponents {
 interface ProviderPeer {
     peerId: PeerId;
     routing: string;
+    toString(): string;
 }
 declare class BitswapSession extends AbstractSession<ProviderPeer, BitswapWantProgressEvents> {
     readonly name = "bitswap-session";

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

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAG9C,OAAO,KAAK,EAAmB,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,KAAK,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAE3C,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,QAAQ,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,UAAU,YAAY;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,cAAM,cAAe,SAAQ,eAAe,CAAC,YAAY,EAAE,yBAAyB,CAAC;IACnF,SAAgB,IAAI,qBAAoB;IACxC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;gBAElB,UAAU,EAAE,wBAAwB,EAAE,IAAI,EAAE,oBAAoB;IAWvE,aAAa,CAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC;IAc1F,gBAAgB,CAAE,GAAG,EAAE,GAAG,EAAE,OAAO,GAAE,YAAiB,GAAG,cAAc,CAAC,YAAY,CAAC;IAS7F,WAAW,CAAE,QAAQ,EAAE,YAAY,GAAG,UAAU,GAAG,MAAM;IAIzD,MAAM,CAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,GAAG,OAAO;IAI5D,iBAAiB,CAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAsBhJ,8BAA8B,CAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,qBAAqB,CAAC,yBAAyB,CAAC,GAAG,IAAI;CAYnI;AAED,wBAAgB,oBAAoB,CAAE,UAAU,EAAE,wBAAwB,EAAE,IAAI,EAAE,oBAAoB,GAAG,cAAc,CAEtH"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAG9C,OAAO,KAAK,EAAmB,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,KAAK,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAE3C,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,QAAQ,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,UAAU,YAAY;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,IAAI,MAAM,CAAA;CACnB;AAED,cAAM,cAAe,SAAQ,eAAe,CAAC,YAAY,EAAE,yBAAyB,CAAC;IACnF,SAAgB,IAAI,qBAAoB;IACxC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;gBAElB,UAAU,EAAE,wBAAwB,EAAE,IAAI,EAAE,oBAAoB;IAWvE,aAAa,CAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC;IAc1F,gBAAgB,CAAE,GAAG,EAAE,GAAG,EAAE,OAAO,GAAE,YAAiB,GAAG,cAAc,CAAC,YAAY,CAAC;IAU7F,WAAW,CAAE,QAAQ,EAAE,YAAY,GAAG,UAAU,GAAG,MAAM;IAIzD,MAAM,CAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,GAAG,OAAO;IAI5D,iBAAiB,CAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAwBhJ,8BAA8B,CAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,qBAAqB,CAAC,yBAAyB,CAAC,GAAG,IAAI;CAYnI;AAED,wBAAgB,oBAAoB,CAAE,UAAU,EAAE,wBAAwB,EAAE,IAAI,EAAE,oBAAoB,GAAG,cAAc,CAEtH"}

package/dist/src/session.js

@@ -28,7 +28,8 @@ class BitswapSession extends AbstractSession {
         for await (const provider of this.network.findProviders(cid, options)) {
             yield {
                 peerId: provider.id,
-                routing: provider.routing
+                routing: provider.routing,
+                toString: () => `Bitswap(${provider.id})`
             };
         }
     }
@@ -42,7 +43,8 @@ class BitswapSession extends AbstractSession {
         if (isPeerId(provider)) {
             return {
                 peerId: provider,
-                routing
+                routing,
+                toString: () => `Bitswap(${provider})`
             };
         }
         if (await this.libp2p.isDialable(provider) === false) {
@@ -52,7 +54,8 @@ class BitswapSession extends AbstractSession {
             const connection = await this.libp2p.dial(provider, options);
             return {
                 peerId: connection.remotePeer,
-                routing
+                routing,
+                toString: () => `Bitswap(${connection.remotePeer})`
             };
         }
         catch { }

package/dist/src/session.js.map

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

package/dist/src/utils/bitswap-message.d.ts

@@ -1,4 +1,4 @@
-import type { Block, BlockPresence, WantlistEntry } from '../pb/message.js';
+import type { Block, BlockPresence, WantlistEntry } from '../pb/message.ts';
 import type { CID } from 'multiformats';
 /**
  * A bitswap message that is in the send queue. So implemented to be

package/dist/src/utils/cid-prefix.js

@@ -1,4 +1,4 @@
-import ve from './varint-encoder.js';
+import ve from "./varint-encoder.js";
 export function cidToPrefix(cid) {
     return ve([
         cid.version, cid.code, cid.multihash.code, cid.multihash.digest.byteLength

package/dist/src/utils/merge-messages.d.ts

@@ -1,3 +1,3 @@
-import type { QueuedBitswapMessage } from './bitswap-message.js';
+import type { QueuedBitswapMessage } from './bitswap-message.ts';
 export declare function mergeMessages(existingMessage: QueuedBitswapMessage, newMessage: QueuedBitswapMessage): QueuedBitswapMessage;
 //# sourceMappingURL=merge-messages.d.ts.map

package/dist/src/utils/split-message.d.ts

@@ -1,4 +1,4 @@
-import type { QueuedBitswapMessage } from './bitswap-message.js';
+import type { QueuedBitswapMessage } from './bitswap-message.ts';
 /**
  * https://github.com/ipfs/kubo/issues/4473#issuecomment-350390693
  */

package/dist/src/utils/split-message.js

@@ -1,6 +1,6 @@
 import { encodingLength } from 'uint8-varint';
-import { BlockTooLargeError } from '../errors.js';
-import { BitswapMessage, Block, BlockPresence, WantlistEntry } from '../pb/message.js';
+import { BlockTooLargeError } from "../errors.js";
+import { BitswapMessage, Block, BlockPresence, WantlistEntry } from "../pb/message.js";
 /**
  * https://github.com/ipfs/kubo/issues/4473#issuecomment-350390693
  */

package/dist/src/want-list.d.ts

@@ -1,8 +1,8 @@
 import { TypedEventEmitter } from '@libp2p/interface';
 import { CID } from 'multiformats/cid';
-import { WantType } from './pb/message.js';
-import type { BitswapNotifyProgressEvents, MultihashHasherLoader } from './index.js';
-import type { BitswapNetworkWantProgressEvents, Network } from './network.js';
+import { WantType } from './pb/message.ts';
+import type { BitswapNotifyProgressEvents, MultihashHasherLoader } from './index.ts';
+import type { BitswapNetworkWantProgressEvents, Network } from './network.ts';
 import type { ComponentLogger, PeerId, Startable, AbortOptions, Libp2p, TypedEventTarget, Metrics } from '@libp2p/interface';
 import type { PeerMap } from '@libp2p/peer-collections';
 import type { ProgressOptions } from 'progress-events';

package/dist/src/want-list.js

@@ -7,10 +7,10 @@ import pDefer from 'p-defer';
 import { raceEvent } from 'race-event';
 import { equals as uint8ArrayEquals } from 'uint8arrays/equals';
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string';
-import { DEFAULT_MESSAGE_SEND_DELAY } from './constants.js';
-import { BlockPresenceType, WantType } from './pb/message.js';
-import { QueuedBitswapMessage } from './utils/bitswap-message.js';
-import vd from './utils/varint-decoder.js';
+import { DEFAULT_MESSAGE_SEND_DELAY } from "./constants.js";
+import { BlockPresenceType, WantType } from "./pb/message.js";
+import { QueuedBitswapMessage } from "./utils/bitswap-message.js";
+import vd from "./utils/varint-decoder.js";
 export class WantList extends TypedEventEmitter {
     /**
      * Tracks what CIDs we've previously sent to which peers

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helia/bitswap",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "description": "JavaScript implementation of the Bitswap data exchange protocol used by Helia",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/ipfs/helia/tree/main/packages/bitswap#readme",

package/src/bitswap.ts

@@ -1,12 +1,12 @@
 import { setMaxListeners } from '@libp2p/interface'
 import { anySignal } from 'any-signal'
 import { CustomProgressEvent } from 'progress-events'
-import { Network } from './network.js'
-import { PeerWantLists } from './peer-want-lists/index.js'
-import { createBitswapSession } from './session.js'
-import { Stats } from './stats.js'
-import { WantList } from './want-list.js'
-import type { BitswapOptions, Bitswap as BitswapInterface, BitswapWantProgressEvents, BitswapNotifyProgressEvents, WantListEntry, BitswapComponents, PeerWantListEntry } from './index.js'
+import { Network } from './network.ts'
+import { PeerWantLists } from './peer-want-lists/index.ts'
+import { createBitswapSession } from './session.ts'
+import { Stats } from './stats.ts'
+import { WantList } from './want-list.ts'
+import type { BitswapOptions, Bitswap as BitswapInterface, BitswapWantProgressEvents, BitswapNotifyProgressEvents, WantListEntry, BitswapComponents, PeerWantListEntry } from './index.ts'
 import type { CreateSessionOptions, ProviderOptions, SessionBlockBroker } from '@helia/interface'
 import type { ComponentLogger, Libp2p, PeerId, AbortOptions } from '@libp2p/interface'
 import type { Logger } from '@libp2p/logger'

package/src/index.ts

@@ -6,9 +6,9 @@
  * It supersedes the older [ipfs-bitswap](https://www.npmjs.com/package/ipfs-bitswap) module with the aim of being smaller, faster, better integrated with libp2p/helia, having fewer dependencies and using standard JavaScript instead of Node.js APIs.
  */
 
-import { Bitswap as BitswapClass } from './bitswap.js'
-import type { BitswapNetworkNotifyProgressEvents, BitswapNetworkWantProgressEvents, BitswapNetworkProgressEvents } from './network.js'
-import type { WantType } from './pb/message.js'
+import { Bitswap as BitswapClass } from './bitswap.ts'
+import type { BitswapNetworkNotifyProgressEvents, BitswapNetworkWantProgressEvents, BitswapNetworkProgressEvents } from './network.ts'
+import type { WantType } from './pb/message.ts'
 import type { CreateSessionOptions, ProviderOptions, SessionBlockBroker } from '@helia/interface'
 import type { Routing } from '@helia/interface/routing'
 import type { Libp2p, AbortOptions, Startable, ComponentLogger, Metrics, PeerId } from '@libp2p/interface'

package/src/network.ts

@@ -7,14 +7,14 @@ import { pushable } from 'it-pushable'
 import take from 'it-take'
 import { CustomProgressEvent } from 'progress-events'
 import { raceEvent } from 'race-event'
-import { BITSWAP_120, DEFAULT_MAX_INBOUND_STREAMS, DEFAULT_MAX_INCOMING_MESSAGE_SIZE, DEFAULT_MAX_OUTBOUND_STREAMS, DEFAULT_MAX_OUTGOING_MESSAGE_SIZE, DEFAULT_MAX_PROVIDERS_PER_REQUEST, DEFAULT_MESSAGE_RECEIVE_TIMEOUT, DEFAULT_MESSAGE_SEND_CONCURRENCY, DEFAULT_RUN_ON_TRANSIENT_CONNECTIONS } from './constants.js'
-import { BitswapMessage } from './pb/message.js'
-import { mergeMessages } from './utils/merge-messages.js'
-import { splitMessage } from './utils/split-message.js'
-import type { WantOptions } from './bitswap.js'
-import type { MultihashHasherLoader } from './index.js'
-import type { Block } from './pb/message.js'
-import type { QueuedBitswapMessage } from './utils/bitswap-message.js'
+import { BITSWAP_120, DEFAULT_MAX_INBOUND_STREAMS, DEFAULT_MAX_INCOMING_MESSAGE_SIZE, DEFAULT_MAX_OUTBOUND_STREAMS, DEFAULT_MAX_OUTGOING_MESSAGE_SIZE, DEFAULT_MAX_PROVIDERS_PER_REQUEST, DEFAULT_MESSAGE_RECEIVE_TIMEOUT, DEFAULT_MESSAGE_SEND_CONCURRENCY, DEFAULT_RUN_ON_TRANSIENT_CONNECTIONS } from './constants.ts'
+import { BitswapMessage } from './pb/message.ts'
+import { mergeMessages } from './utils/merge-messages.ts'
+import { splitMessage } from './utils/split-message.ts'
+import type { WantOptions } from './bitswap.ts'
+import type { MultihashHasherLoader } from './index.ts'
+import type { Block } from './pb/message.ts'
+import type { QueuedBitswapMessage } from './utils/bitswap-message.ts'
 import type { Provider, Routing } from '@helia/interface/routing'
 import type { Libp2p, AbortOptions, Connection, PeerId, Topology, ComponentLogger, IdentifyResult, Counter, Metrics, Stream } from '@libp2p/interface'
 import type { Logger } from '@libp2p/logger'

package/src/peer-want-lists/index.ts

@@ -1,9 +1,9 @@
 import { trackedPeerMap } from '@libp2p/peer-collections'
 import { CID } from 'multiformats/cid'
-import { Ledger } from './ledger.js'
-import type { BitswapNotifyProgressEvents, PeerWantListEntry } from '../index.js'
-import type { Network } from '../network.js'
-import type { BitswapMessage } from '../pb/message.js'
+import { Ledger } from './ledger.ts'
+import type { BitswapNotifyProgressEvents, PeerWantListEntry } from '../index.ts'
+import type { Network } from '../network.ts'
+import type { BitswapMessage } from '../pb/message.ts'
 import type { AbortOptions, ComponentLogger, Libp2p, Logger, Metrics, PeerId } from '@libp2p/interface'
 import type { PeerMap } from '@libp2p/peer-collections'
 import type { Blockstore } from 'interface-blockstore'

package/src/peer-want-lists/ledger.ts

@@ -1,12 +1,12 @@
 import toBuffer from 'it-to-buffer'
 import { CID } from 'multiformats/cid'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import { DEFAULT_MAX_SIZE_REPLACE_HAS_WITH_BLOCK, DEFAULT_DO_NOT_RESEND_BLOCK_WINDOW, DEFAULT_MAX_WANTLIST_SIZE } from '../constants.js'
-import { BlockPresenceType, WantType } from '../pb/message.js'
-import { QueuedBitswapMessage } from '../utils/bitswap-message.js'
-import { cidToPrefix } from '../utils/cid-prefix.js'
-import type { Network } from '../network.js'
-import type { Wantlist } from '../pb/message.js'
+import { DEFAULT_MAX_SIZE_REPLACE_HAS_WITH_BLOCK, DEFAULT_DO_NOT_RESEND_BLOCK_WINDOW, DEFAULT_MAX_WANTLIST_SIZE } from '../constants.ts'
+import { BlockPresenceType, WantType } from '../pb/message.ts'
+import { QueuedBitswapMessage } from '../utils/bitswap-message.ts'
+import { cidToPrefix } from '../utils/cid-prefix.ts'
+import type { Network } from '../network.ts'
+import type { Wantlist } from '../pb/message.ts'
 import type { AbortOptions, ComponentLogger, Logger, PeerId } from '@libp2p/interface'
 import type { Blockstore } from 'interface-blockstore'
 

package/src/session.ts

@@ -1,9 +1,9 @@
 import { AbstractSession } from '@helia/utils'
 import { isPeerId } from '@libp2p/interface'
 import { CustomProgressEvent } from 'progress-events'
-import type { BitswapProvider, BitswapWantProgressEvents } from './index.js'
-import type { Network } from './network.js'
-import type { WantList } from './want-list.js'
+import type { BitswapProvider, BitswapWantProgressEvents } from './index.ts'
+import type { Network } from './network.ts'
+import type { WantList } from './want-list.ts'
 import type { BlockRetrievalOptions, CreateSessionOptions } from '@helia/interface'
 import type { ComponentLogger, Libp2p, PeerId } from '@libp2p/interface'
 import type { Multiaddr } from '@multiformats/multiaddr'
@@ -20,6 +20,7 @@ export interface BitswapSessionComponents {
 interface ProviderPeer {
   peerId: PeerId
   routing: string
+  toString(): string
 }
 
 class BitswapSession extends AbstractSession<ProviderPeer, BitswapWantProgressEvents> {
@@ -57,7 +58,8 @@ class BitswapSession extends AbstractSession<ProviderPeer, BitswapWantProgressEv
     for await (const provider of this.network.findProviders(cid, options)) {
       yield {
         peerId: provider.id,
-        routing: provider.routing
+        routing: provider.routing,
+        toString: () => `Bitswap(${provider.id})`
       }
     }
   }
@@ -74,7 +76,8 @@ class BitswapSession extends AbstractSession<ProviderPeer, BitswapWantProgressEv
     if (isPeerId(provider)) {
       return {
         peerId: provider,
-        routing
+        routing,
+        toString: () => `Bitswap(${provider})`
       }
     }
 
@@ -87,7 +90,8 @@ class BitswapSession extends AbstractSession<ProviderPeer, BitswapWantProgressEv
 
       return {
         peerId: connection.remotePeer,
-        routing
+        routing,
+        toString: () => `Bitswap(${connection.remotePeer})`
       }
     } catch {}
   }

package/src/utils/bitswap-message.ts

@@ -1,5 +1,5 @@
 import { base64 } from 'multiformats/bases/base64'
-import type { Block, BlockPresence, WantlistEntry } from '../pb/message.js'
+import type { Block, BlockPresence, WantlistEntry } from '../pb/message.ts'
 import type { CID } from 'multiformats'
 
 /**

package/src/utils/cid-prefix.ts

@@ -1,4 +1,4 @@
-import ve from './varint-encoder.js'
+import ve from './varint-encoder.ts'
 import type { CID } from 'multiformats/cid'
 
 export function cidToPrefix (cid: CID): Uint8Array {

package/src/utils/merge-messages.ts

@@ -1,4 +1,4 @@
-import type { QueuedBitswapMessage } from './bitswap-message.js'
+import type { QueuedBitswapMessage } from './bitswap-message.ts'
 
 export function mergeMessages (existingMessage: QueuedBitswapMessage, newMessage: QueuedBitswapMessage): QueuedBitswapMessage {
   for (const [key, entry] of newMessage.wantlist.entries()) {

package/src/utils/split-message.ts

@@ -1,7 +1,7 @@
 import { encodingLength } from 'uint8-varint'
-import { BlockTooLargeError } from '../errors.js'
-import { BitswapMessage, Block, BlockPresence, WantlistEntry } from '../pb/message.js'
-import type { QueuedBitswapMessage } from './bitswap-message.js'
+import { BlockTooLargeError } from '../errors.ts'
+import { BitswapMessage, Block, BlockPresence, WantlistEntry } from '../pb/message.ts'
+import type { QueuedBitswapMessage } from './bitswap-message.ts'
 
 /**
  * https://github.com/ipfs/kubo/issues/4473#issuecomment-350390693

package/src/want-list.ts

@@ -7,13 +7,13 @@ import pDefer from 'p-defer'
 import { raceEvent } from 'race-event'
 import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import { DEFAULT_MESSAGE_SEND_DELAY } from './constants.js'
-import { BlockPresenceType, WantType } from './pb/message.js'
-import { QueuedBitswapMessage } from './utils/bitswap-message.js'
-import vd from './utils/varint-decoder.js'
-import type { BitswapNotifyProgressEvents, MultihashHasherLoader } from './index.js'
-import type { BitswapNetworkWantProgressEvents, Network } from './network.js'
-import type { BitswapMessage } from './pb/message.js'
+import { DEFAULT_MESSAGE_SEND_DELAY } from './constants.ts'
+import { BlockPresenceType, WantType } from './pb/message.ts'
+import { QueuedBitswapMessage } from './utils/bitswap-message.ts'
+import vd from './utils/varint-decoder.ts'
+import type { BitswapNotifyProgressEvents, MultihashHasherLoader } from './index.ts'
+import type { BitswapNetworkWantProgressEvents, Network } from './network.ts'
+import type { BitswapMessage } from './pb/message.ts'
 import type { ComponentLogger, PeerId, Startable, AbortOptions, Libp2p, TypedEventTarget, Metrics } from '@libp2p/interface'
 import type { Logger } from '@libp2p/logger'
 import type { PeerMap } from '@libp2p/peer-collections'