libp2p 0.44.0 → 0.45.0-08d4c261

package/dist/src/circuit-relay/transport/listener.js

@@ -1,75 +1,75 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _CircuitRelayTransportListener_instances, _CircuitRelayTransportListener_removeRelayPeer;
-import { CustomEvent, EventEmitter } from '@libp2p/interfaces/events';
-import { multiaddr } from '@multiformats/multiaddr';
-import { PeerMap } from '@libp2p/peer-collections';
+import { CodeError } from '@libp2p/interfaces/errors';
+import { EventEmitter } from '@libp2p/interfaces/events';
 import { logger } from '@libp2p/logger';
+import { PeerMap } from '@libp2p/peer-collections';
+import { peerIdFromString } from '@libp2p/peer-id';
+import { multiaddr } from '@multiformats/multiaddr';
 const log = logger('libp2p:circuit-relay:transport:listener');
 class CircuitRelayTransportListener extends EventEmitter {
+    connectionManager;
+    relayStore;
+    listeningAddrs;
     constructor(components) {
         super();
-        _CircuitRelayTransportListener_instances.add(this);
         this.connectionManager = components.connectionManager;
         this.relayStore = components.relayStore;
         this.listeningAddrs = new PeerMap();
         // remove listening addrs when a relay is removed
         this.relayStore.addEventListener('relay:removed', (evt) => {
-            __classPrivateFieldGet(this, _CircuitRelayTransportListener_instances, "m", _CircuitRelayTransportListener_removeRelayPeer).call(this, evt.detail);
-        });
-        // remove listening addrs when a peer disconnects
-        this.connectionManager.addEventListener('peer:disconnect', (evt) => {
-            __classPrivateFieldGet(this, _CircuitRelayTransportListener_instances, "m", _CircuitRelayTransportListener_removeRelayPeer).call(this, evt.detail.remotePeer);
+            this.#removeRelayPeer(evt.detail);
         });
     }
     async listen(addr) {
         log('listen on %s', addr);
-        const addrString = addr.toString().split('/p2p-circuit').find(a => a !== '');
-        const ma = multiaddr(addrString);
-        const relayConn = await this.connectionManager.openConnection(ma);
+        const relayPeerStr = addr.getPeerId();
+        let relayConn;
+        // check if we already have a connection to the relay
+        if (relayPeerStr != null) {
+            const relayPeer = peerIdFromString(relayPeerStr);
+            const connections = this.connectionManager.getConnectionsMap().get(relayPeer) ?? [];
+            if (connections.length > 0) {
+                relayConn = connections[0];
+            }
+        }
+        // open a new connection as we don't already have one
+        if (relayConn == null) {
+            const addrString = addr.toString().split('/p2p-circuit').find(a => a !== '');
+            const ma = multiaddr(addrString);
+            relayConn = await this.connectionManager.openConnection(ma);
+        }
         if (!this.relayStore.hasReservation(relayConn.remotePeer)) {
             // addRelay calls transportManager.listen which calls this listen method
             await this.relayStore.addRelay(relayConn.remotePeer, 'configured');
             return;
         }
+        const reservation = this.relayStore.getReservation(relayConn.remotePeer);
+        if (reservation == null) {
+            throw new CodeError('Did not have reservation after making reservation', 'ERR_NO_RESERVATION');
+        }
         if (this.listeningAddrs.has(relayConn.remotePeer)) {
             log('already listening on relay %p', relayConn.remotePeer);
             return;
         }
-        this.listeningAddrs.set(relayConn.remotePeer, addr);
-        this.dispatchEvent(new CustomEvent('listening'));
+        // add all addresses from the relay reservation
+        this.listeningAddrs.set(relayConn.remotePeer, reservation.addrs.map(buf => {
+            return multiaddr(buf).encapsulate('/p2p-circuit');
+        }));
+        this.safeDispatchEvent('listening', {});
     }
-    /**
-     * Get fixed up multiaddrs
-     *
-     * NOTE: This method will grab the peers multiaddrs and expand them such that:
-     *
-     * a) If it's an existing /p2p-circuit address for a specific relay i.e.
-     * `/ip4/0.0.0.0/tcp/0/ipfs/QmRelay/p2p-circuit` this method will expand the
-     * address to `/ip4/0.0.0.0/tcp/0/ipfs/QmRelay/p2p-circuit/ipfs/QmPeer` where
-     * `QmPeer` is this peers id
-     * b) If it's not a /p2p-circuit address, it will encapsulate the address as a /p2p-circuit
-     * addr, such when dialing over a relay with this address, it will create the circuit using
-     * the encapsulated transport address. This is useful when for example, a peer should only
-     * be dialed over TCP rather than any other transport
-     */
     getAddrs() {
-        return [...this.listeningAddrs.values()];
+        return [...this.listeningAddrs.values()].flat();
     }
     async close() {
     }
-}
-_CircuitRelayTransportListener_instances = new WeakSet(), _CircuitRelayTransportListener_removeRelayPeer = function _CircuitRelayTransportListener_removeRelayPeer(peerId) {
-    const had = this.listeningAddrs.has(peerId);
-    this.listeningAddrs.delete(peerId);
-    if (had) {
-        // Announce listen addresses change
-        this.dispatchEvent(new CustomEvent('close'));
+    #removeRelayPeer(peerId) {
+        const had = this.listeningAddrs.has(peerId);
+        this.listeningAddrs.delete(peerId);
+        if (had) {
+            // Announce listen addresses change
+            this.safeDispatchEvent('close', {});
+        }
     }
-};
+}
 export function createListener(options) {
     return new CircuitRelayTransportListener(options);
 }

package/dist/src/circuit-relay/transport/listener.js.map

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

package/dist/src/circuit-relay/transport/reservation-store.d.ts

@@ -1,14 +1,17 @@
-import type { PeerId } from '@libp2p/interface-peer-id';
+import { EventEmitter } from '@libp2p/interfaces/events';
+import type { Reservation } from '../pb/index.js';
 import type { ConnectionManager } from '@libp2p/interface-connection-manager';
+import type { Libp2pEvents } from '@libp2p/interface-libp2p';
+import type { PeerId } from '@libp2p/interface-peer-id';
+import type { PeerStore } from '@libp2p/interface-peer-store';
 import type { TransportManager } from '@libp2p/interface-transport';
 import type { Startable } from '@libp2p/interfaces/startable';
-import { EventEmitter } from '@libp2p/interfaces/events';
-import type { PeerStore } from '@libp2p/interface-peer-store';
 export interface RelayStoreComponents {
     peerId: PeerId;
     connectionManager: ConnectionManager;
     transportManager: TransportManager;
     peerStore: PeerStore;
+    events: EventEmitter<Libp2pEvents>;
 }
 export interface RelayStoreInit {
     /**
@@ -36,6 +39,7 @@ export declare class ReservationStore extends EventEmitter<ReservationStoreEvent
     private readonly connectionManager;
     private readonly transportManager;
     private readonly peerStore;
+    private readonly events;
     private readonly reserveQueue;
     private readonly reservations;
     private readonly maxDiscoveredRelays;
@@ -52,9 +56,6 @@ export declare class ReservationStore extends EventEmitter<ReservationStoreEvent
      */
     addRelay(peerId: PeerId, type: RelayType): Promise<void>;
     hasReservation(peerId: PeerId): boolean;
-    /**
-     * Remove listen relay
-     */
-    removeRelay(peerId: PeerId): void;
+    getReservation(peerId: PeerId): Reservation | undefined;
 }
 //# sourceMappingURL=reservation-store.d.ts.map

package/dist/src/circuit-relay/transport/reservation-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reservation-store.d.ts","sourceRoot":"","sources":["../../../../src/circuit-relay/transport/reservation-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAMvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AAK7E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,EAAe,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACrE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAc7D,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,SAAS,EAAE,SAAS,CAAA;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B;;;;;;;OAOG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAA;IAE/B;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,MAAM,MAAM,SAAS,GAAG,YAAY,GAAG,YAAY,CAAA;AAQnD,MAAM,WAAW,sBAAsB;IACrC,yBAAyB,EAAE,WAAW,CAAA;IACtC,eAAe,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CACrC;AAED,qBAAa,gBAAiB,SAAQ,YAAY,CAAC,sBAAsB,CAAE,YAAW,SAAS;;IAC7F,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IACrD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkB;IACnD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAQ;IACrC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAClD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAQ;IAC5C,OAAO,CAAC,OAAO,CAAS;gBAEX,UAAU,EAAE,oBAAoB,EAAE,IAAI,CAAC,EAAE,cAAc;IAwBpE,SAAS,IAAK,OAAO;IAIf,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;IAIvB,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAS5B;;;;;OAKG;IACG,QAAQ,CAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAgF/D,cAAc,CAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAgCxC;;OAEG;IACH,WAAW,CAAE,MAAM,EAAE,MAAM,GAAG,IAAI;CAkBnC"}
+{"version":3,"file":"reservation-store.d.ts","sourceRoot":"","sources":["../../../../src/circuit-relay/transport/reservation-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AASxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAEjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AAC7E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAa7D,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,YAAY,CAAC,YAAY,CAAC,CAAA;CACnC;AAED,MAAM,WAAW,cAAc;IAC7B;;;;;;;OAOG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAA;IAE/B;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,MAAM,MAAM,SAAS,GAAG,YAAY,GAAG,YAAY,CAAA;AAQnD,MAAM,WAAW,sBAAsB;IACrC,yBAAyB,EAAE,WAAW,CAAA;IACtC,eAAe,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CACrC;AAED,qBAAa,gBAAiB,SAAQ,YAAY,CAAC,sBAAsB,CAAE,YAAW,SAAS;;IAC7F,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IACrD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkB;IACnD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4B;IACnD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAQ;IACrC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAClD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAQ;IAC5C,OAAO,CAAC,OAAO,CAAS;gBAEX,UAAU,EAAE,oBAAoB,EAAE,IAAI,CAAC,EAAE,cAAc;IAyBpE,SAAS,IAAK,OAAO;IAIf,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;IAIvB,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAS5B;;;;;OAKG;IACG,QAAQ,CAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAqF/D,cAAc,CAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAIxC,cAAc,CAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;CAsDzD"}

package/dist/src/circuit-relay/transport/reservation-store.js

@@ -1,18 +1,12 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _ReservationStore_instances, _ReservationStore_createReservation;
+import { EventEmitter } from '@libp2p/interfaces/events';
+import { logger } from '@libp2p/logger';
 import { PeerMap } from '@libp2p/peer-collections';
+import { multiaddr } from '@multiformats/multiaddr';
+import { pbStream } from 'it-pb-stream';
 import PQueue from 'p-queue';
 import { DEFAULT_RESERVATION_CONCURRENCY, RELAY_TAG, RELAY_V2_HOP_CODEC } from '../constants.js';
-import { logger } from '@libp2p/logger';
-import { pbStream } from 'it-pb-stream';
 import { HopMessage, Status } from '../pb/index.js';
 import { getExpirationMilliseconds } from '../utils.js';
-import { CustomEvent, EventEmitter } from '@libp2p/interfaces/events';
-import { multiaddr } from '@multiformats/multiaddr';
 const log = logger('libp2p:circuit-relay:transport:reservation-store');
 // allow refreshing a relay reservation if it will expire in the next 10 minutes
 const REFRESH_WINDOW = (60 * 1000) * 10;
@@ -21,13 +15,22 @@ const REFRESH_TIMEOUT = (60 * 1000) * 5;
 // minimum duration before which a reservation must not be refreshed
 const REFRESH_TIMEOUT_MIN = 30 * 1000;
 export class ReservationStore extends EventEmitter {
+    peerId;
+    connectionManager;
+    transportManager;
+    peerStore;
+    events;
+    reserveQueue;
+    reservations;
+    maxDiscoveredRelays;
+    started;
     constructor(components, init) {
         super();
-        _ReservationStore_instances.add(this);
         this.peerId = components.peerId;
         this.connectionManager = components.connectionManager;
         this.transportManager = components.transportManager;
         this.peerStore = components.peerStore;
+        this.events = components.events;
         this.reservations = new PeerMap();
         this.maxDiscoveredRelays = init?.discoverRelays ?? 0;
         this.started = false;
@@ -38,8 +41,8 @@ export class ReservationStore extends EventEmitter {
         // When a peer disconnects, if we had a reservation on that peer
         // remove the reservation and multiaddr and maybe trigger search
         // for new relays
-        this.connectionManager.addEventListener('peer:disconnect', (evt) => {
-            this.removeRelay(evt.detail.remotePeer);
+        this.events.addEventListener('peer:disconnect', (evt) => {
+            this.#removeRelay(evt.detail);
         });
     }
     isStarted() {
@@ -62,13 +65,13 @@ export class ReservationStore extends EventEmitter {
      * on the remote peer
      */
     async addRelay(peerId, type) {
-        log('add relay', this.reserveQueue.size);
+        if (this.peerId.equals(peerId)) {
+            log('not trying to use self as relay');
+            return;
+        }
+        log('add relay %p', peerId);
         await this.reserveQueue.add(async () => {
             try {
-                if (this.peerId.equals(peerId)) {
-                    log('not trying to use self as relay');
-                    return;
-                }
                 // allow refresh of an existing reservation if it is about to expire
                 const existingReservation = this.reservations.get(peerId);
                 if (existingReservation != null) {
@@ -93,7 +96,7 @@ export class ReservationStore extends EventEmitter {
                     log('not creating reservation over relayed connection');
                     return;
                 }
-                const reservation = await __classPrivateFieldGet(this, _ReservationStore_instances, "m", _ReservationStore_createReservation).call(this, connection);
+                const reservation = await this.#createReservation(connection);
                 log('created reservation on relay peer %p', peerId);
                 const expiration = getExpirationMilliseconds(reservation.expire);
                 // sets a lower bound on the timeout, and also don't let it go over
@@ -104,67 +107,77 @@ export class ReservationStore extends EventEmitter {
                         log.error('could not refresh reservation to relay %p', peerId, err);
                     });
                 }, timeoutDuration);
+                // we've managed to create a reservation successfully
                 this.reservations.set(peerId, {
                     timeout,
                     reservation,
                     type
                 });
                 // ensure we don't close the connection to the relay
-                await this.peerStore.tagPeer(peerId, RELAY_TAG, {
-                    value: 1,
-                    ttl: expiration
+                await this.peerStore.merge(peerId, {
+                    tags: {
+                        [RELAY_TAG]: {
+                            value: 1,
+                            ttl: expiration
+                        }
+                    }
                 });
-                await this.transportManager.listen(reservation.addrs.map(ma => {
-                    return multiaddr(ma).encapsulate('/p2p-circuit');
-                }));
+                // listen on multiaddr that only the circuit transport is listening for
+                await this.transportManager.listen([multiaddr(`/p2p/${peerId.toString()}/p2p-circuit`)]);
             }
             catch (err) {
                 log.error('could not reserve slot on %p', peerId, err);
+                // if listening failed, remove the reservation
+                this.reservations.delete(peerId);
             }
         });
     }
     hasReservation(peerId) {
         return this.reservations.has(peerId);
     }
+    getReservation(peerId) {
+        return this.reservations.get(peerId)?.reservation;
+    }
+    async #createReservation(connection) {
+        log('requesting reservation from %s', connection.remotePeer);
+        const stream = await connection.newStream(RELAY_V2_HOP_CODEC);
+        const pbstr = pbStream(stream);
+        const hopstr = pbstr.pb(HopMessage);
+        hopstr.write({ type: HopMessage.Type.RESERVE });
+        let response;
+        try {
+            response = await hopstr.read();
+        }
+        catch (err) {
+            log.error('error parsing reserve message response from %p because', connection.remotePeer, err);
+            throw err;
+        }
+        finally {
+            stream.close();
+        }
+        if (response.status === Status.OK && (response.reservation != null)) {
+            return response.reservation;
+        }
+        const errMsg = `reservation failed with status ${response.status ?? 'undefined'}`;
+        log.error(errMsg);
+        throw new Error(errMsg);
+    }
     /**
      * Remove listen relay
      */
-    removeRelay(peerId) {
+    #removeRelay(peerId) {
         const existingReservation = this.reservations.get(peerId);
         if (existingReservation == null) {
             return;
         }
-        log('removing relay %p', peerId);
+        log('connection to relay %p closed, removing reservation from local store', peerId);
         clearTimeout(existingReservation.timeout);
         this.reservations.delete(peerId);
         this.safeDispatchEvent('relay:removed', { detail: peerId });
         if (this.reservations.size < this.maxDiscoveredRelays) {
-            this.dispatchEvent(new CustomEvent('relay:not-enough-relays'));
+            log('not enough relays %d/%d', this.reservations.size, this.maxDiscoveredRelays);
+            this.safeDispatchEvent('relay:not-enough-relays', {});
         }
     }
 }
-_ReservationStore_instances = new WeakSet(), _ReservationStore_createReservation = async function _ReservationStore_createReservation(connection) {
-    log('requesting reservation from %s', connection.remotePeer);
-    const stream = await connection.newStream(RELAY_V2_HOP_CODEC);
-    const pbstr = pbStream(stream);
-    const hopstr = pbstr.pb(HopMessage);
-    hopstr.write({ type: HopMessage.Type.RESERVE });
-    let response;
-    try {
-        response = await hopstr.read();
-    }
-    catch (err) {
-        log.error('error parsing reserve message response from %p because', connection.remotePeer, err);
-        throw err;
-    }
-    finally {
-        stream.close();
-    }
-    if (response.status === Status.OK && (response.reservation != null)) {
-        return response.reservation;
-    }
-    const errMsg = `reservation failed with status ${response.status ?? 'undefined'}`;
-    log.error(errMsg);
-    throw new Error(errMsg);
-};
 //# sourceMappingURL=reservation-store.js.map

package/dist/src/circuit-relay/transport/reservation-store.js.map

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

package/dist/src/circuit-relay/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/circuit-relay/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAItC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAE1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAA;AA0F1D,wBAAgB,kBAAkB,CAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAQtH;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAKrE;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAE,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAM5E"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/circuit-relay/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAGtC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAA;AAyF1D,wBAAgB,kBAAkB,CAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAQtH;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAKrE;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAE,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAM5E"}

package/dist/src/circuit-relay/utils.js

@@ -1,9 +1,9 @@
-import { CID } from 'multiformats/cid';
-import { sha256 } from 'multiformats/hashes/sha2';
 import { logger } from '@libp2p/logger';
-import { DEFAULT_DATA_LIMIT, DEFAULT_DURATION_LIMIT } from './constants.js';
 import { abortableSource } from 'abortable-iterator';
 import { anySignal } from 'any-signal';
+import { CID } from 'multiformats/cid';
+import { sha256 } from 'multiformats/hashes/sha2';
+import { DEFAULT_DATA_LIMIT, DEFAULT_DURATION_LIMIT } from './constants.js';
 const log = logger('libp2p:circuit-relay:utils');
 async function* countStreamBytes(source, limit) {
     for await (const buf of source) {

package/dist/src/circuit-relay/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/circuit-relay/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/circuit-relay/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AAM3E,MAAM,GAAG,GAAG,MAAM,CAAC,4BAA4B,CAAC,CAAA;AAEhD,KAAK,SAAU,CAAC,CAAC,gBAAgB,CAAE,MAA2C,EAAE,KAA4B;IAC1G,IAAI,KAAK,EAAE,MAAM,GAAG,IAAI,MAAM,EAAE;QAC9B,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QAElC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE;YAC/B,iFAAiF;YACjF,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;YACzC,KAAK,CAAC,SAAS,GAAG,EAAE,CAAA;YAEpB,IAAI;gBACF,IAAI,SAAS,KAAK,CAAC,EAAE;oBACnB,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,SAAS,CAAC,CAAA;iBACjC;aACF;YAAC,OAAO,GAAQ,EAAE;gBACjB,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACf;YAED,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;SACvC;QAED,KAAK,CAAC,SAAS,IAAI,GAAG,CAAA;QACtB,MAAM,GAAG,CAAA;KACV;AACH,CAAC;AAED,MAAM,OAAO,GAAG,CAAC,GAAW,EAAE,GAAW,EAAE,WAAwB,EAAE,KAAsB,EAAQ,EAAE;IACnG,SAAS,YAAY,CAAE,GAAU;QAC/B,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACd,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACd,YAAY,CAAC,OAAO,CAAC,CAAA;IACvB,CAAC;IAED,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAC7C,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,WAAW,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC,CAAA;IAE/D,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;QAC9B,eAAe,CAAC,KAAK,EAAE,CAAA;IACzB,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;IAElB,IAAI,cAAc,GAAG,KAAK,CAAA;IAC1B,IAAI,cAAc,GAAG,KAAK,CAAA;IAE1B,MAAM,SAAS,GAAG;QAChB,SAAS,EAAE,KAAK,CAAC,IAAI;KACtB,CAAA;IAED,cAAc,CAAC,GAAG,EAAE;QAClB,KAAK,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE;YACjE,YAAY,EAAE,yBAAyB;SACxC,CAAC,EAAE,SAAS,CAAC,CAAC;aACZ,KAAK,CAAC,GAAG,CAAC,EAAE;YACX,GAAG,CAAC,KAAK,CAAC,yCAAyC,EAAE,GAAG,CAAC,CAAA;YACzD,YAAY,CAAC,GAAG,CAAC,CAAA;QACnB,CAAC,CAAC;aACD,OAAO,CAAC,GAAG,EAAE;YACZ,cAAc,GAAG,IAAI,CAAA;YAErB,IAAI,cAAc,EAAE;gBAClB,MAAM,CAAC,KAAK,EAAE,CAAA;gBACd,YAAY,CAAC,OAAO,CAAC,CAAA;aACtB;QACH,CAAC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,cAAc,CAAC,GAAG,EAAE;QAClB,KAAK,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE;YACjE,YAAY,EAAE,yBAAyB;SACxC,CAAC,EAAE,SAAS,CAAC,CAAC;aACZ,KAAK,CAAC,GAAG,CAAC,EAAE;YACX,GAAG,CAAC,KAAK,CAAC,yCAAyC,EAAE,GAAG,CAAC,CAAA;YACzD,YAAY,CAAC,GAAG,CAAC,CAAA;QACnB,CAAC,CAAC;aACD,OAAO,CAAC,GAAG,EAAE;YACZ,cAAc,GAAG,IAAI,CAAA;YAErB,IAAI,cAAc,EAAE;gBAClB,MAAM,CAAC,KAAK,EAAE,CAAA;gBACd,YAAY,CAAC,OAAO,CAAC,CAAA;aACtB;QACH,CAAC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,UAAU,kBAAkB,CAAE,MAAc,EAAE,WAAmB,EAAE,WAAwB,EAAE,KAAa;IAC9G,MAAM,SAAS,GAAG,KAAK,EAAE,IAAI,IAAI,MAAM,CAAC,kBAAkB,CAAC,CAAA;IAC3D,MAAM,aAAa,GAAG,KAAK,EAAE,QAAQ,IAAI,sBAAsB,CAAA;IAE/D,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE;QACxC,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,aAAa;KACxB,CAAC,CAAA;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAE,SAAiB;IACrD,MAAM,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IACjD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAEvC,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;AAC3B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,yBAAyB,CAAE,iBAAyB;IAClE,MAAM,gBAAgB,GAAG,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;IACzD,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAA;IAExC,4CAA4C;IAC5C,OAAO,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAA;AACvD,CAAC"}

package/dist/src/components.d.ts

@@ -1,20 +1,21 @@
+import { type Startable } from '@libp2p/interfaces/startable';
+import type { AddressManager } from '@libp2p/interface-address-manager';
 import type { ConnectionProtector } from '@libp2p/interface-connection';
+import type { ConnectionGater } from '@libp2p/interface-connection-gater';
+import type { ConnectionManager } from '@libp2p/interface-connection-manager';
 import type { ContentRouting } from '@libp2p/interface-content-routing';
-import type { AddressManager } from '@libp2p/interface-address-manager';
-import { Startable } from '@libp2p/interfaces/startable';
+import type { Libp2pEvents } from '@libp2p/interface-libp2p';
 import type { Metrics } from '@libp2p/interface-metrics';
 import type { PeerId } from '@libp2p/interface-peer-id';
 import type { PeerRouting } from '@libp2p/interface-peer-routing';
 import type { PeerStore } from '@libp2p/interface-peer-store';
 import type { Registrar } from '@libp2p/interface-registrar';
 import type { TransportManager, Upgrader } from '@libp2p/interface-transport';
+import type { EventEmitter } from '@libp2p/interfaces/events';
 import type { Datastore } from 'interface-datastore';
-import type { PubSub } from '@libp2p/interface-pubsub';
-import type { DualDHT } from '@libp2p/interface-dht';
-import type { ConnectionManager } from '@libp2p/interface-connection-manager';
-import type { ConnectionGater } from '@libp2p/interface-connection-gater';
-export interface Components {
+export interface Components extends Record<string, any>, Startable {
     peerId: PeerId;
+    events: EventEmitter<Libp2pEvents>;
     addressManager: AddressManager;
     peerStore: PeerStore;
     upgrader: Upgrader;
@@ -27,11 +28,10 @@ export interface Components {
     datastore: Datastore;
     connectionProtector?: ConnectionProtector;
     metrics?: Metrics;
-    dht?: DualDHT;
-    pubsub?: PubSub;
 }
 export interface ComponentsInit {
     peerId?: PeerId;
+    events?: EventEmitter<Libp2pEvents>;
     addressManager?: AddressManager;
     peerStore?: PeerStore;
     upgrader?: Upgrader;
@@ -44,63 +44,6 @@ export interface ComponentsInit {
     peerRouting?: PeerRouting;
     datastore?: Datastore;
     connectionProtector?: ConnectionProtector;
-    dht?: DualDHT;
-    pubsub?: PubSub;
-}
-export declare class DefaultComponents implements Components, Startable {
-    private _peerId?;
-    private _addressManager?;
-    private _peerStore?;
-    private _upgrader?;
-    private _metrics?;
-    private _registrar?;
-    private _connectionManager?;
-    private _transportManager?;
-    private _connectionGater?;
-    private _contentRouting?;
-    private _peerRouting?;
-    private _datastore?;
-    private _connectionProtector?;
-    private _dht?;
-    private _pubsub?;
-    private _started;
-    constructor(init?: ComponentsInit);
-    isStarted(): boolean;
-    beforeStart(): Promise<void>;
-    start(): Promise<void>;
-    afterStart(): Promise<void>;
-    beforeStop(): Promise<void>;
-    stop(): Promise<void>;
-    afterStop(): Promise<void>;
-    get peerId(): PeerId;
-    set peerId(peerId: PeerId);
-    get addressManager(): AddressManager;
-    set addressManager(addressManager: AddressManager);
-    get peerStore(): PeerStore;
-    set peerStore(peerStore: PeerStore);
-    get upgrader(): Upgrader;
-    set upgrader(upgrader: Upgrader);
-    get registrar(): Registrar;
-    set registrar(registrar: Registrar);
-    get connectionManager(): ConnectionManager;
-    set connectionManager(connectionManager: ConnectionManager);
-    get transportManager(): TransportManager;
-    set transportManager(transportManager: TransportManager);
-    get connectionGater(): ConnectionGater;
-    set connectionGater(connectionGater: ConnectionGater);
-    get contentRouting(): ContentRouting;
-    set contentRouting(contentRouting: ContentRouting);
-    get peerRouting(): PeerRouting;
-    set peerRouting(peerRouting: PeerRouting);
-    get datastore(): Datastore;
-    set datastore(datastore: Datastore);
-    get connectionProtector(): ConnectionProtector | undefined;
-    set connectionProtector(connectionProtector: ConnectionProtector | undefined);
-    get metrics(): Metrics | undefined;
-    set metrics(metrics: Metrics | undefined);
-    get dht(): DualDHT | undefined;
-    set dht(dht: DualDHT | undefined);
-    get pubsub(): PubSub | undefined;
-    set pubsub(pubsub: PubSub | undefined);
 }
+export declare function defaultComponents(init?: ComponentsInit): Components;
 //# sourceMappingURL=components.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"components.d.ts","sourceRoot":"","sources":["../../src/components.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AACvE,OAAO,EAAe,SAAS,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAA;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAC7E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAA;AAEzE,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,EAAE,cAAc,CAAA;IAC9B,SAAS,EAAE,SAAS,CAAA;IACpB,QAAQ,EAAE,QAAQ,CAAA;IAClB,SAAS,EAAE,SAAS,CAAA;IACpB,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,eAAe,EAAE,eAAe,CAAA;IAChC,cAAc,EAAE,cAAc,CAAA;IAC9B,WAAW,EAAE,WAAW,CAAA;IACxB,SAAS,EAAE,SAAS,CAAA;IACpB,mBAAmB,CAAC,EAAE,mBAAmB,CAAA;IACzC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,cAAc,CAAC,EAAE,cAAc,CAAA;IAC/B,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IACrC,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;IACnC,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,cAAc,CAAC,EAAE,cAAc,CAAA;IAC/B,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,mBAAmB,CAAC,EAAE,mBAAmB,CAAA;IACzC,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,qBAAa,iBAAkB,YAAW,UAAU,EAAE,SAAS;IAC7D,OAAO,CAAC,OAAO,CAAC,CAAQ;IACxB,OAAO,CAAC,eAAe,CAAC,CAAgB;IACxC,OAAO,CAAC,UAAU,CAAC,CAAW;IAC9B,OAAO,CAAC,SAAS,CAAC,CAAU;IAC5B,OAAO,CAAC,QAAQ,CAAC,CAAS;IAC1B,OAAO,CAAC,UAAU,CAAC,CAAW;IAC9B,OAAO,CAAC,kBAAkB,CAAC,CAAmB;IAC9C,OAAO,CAAC,iBAAiB,CAAC,CAAkB;IAC5C,OAAO,CAAC,gBAAgB,CAAC,CAAiB;IAC1C,OAAO,CAAC,eAAe,CAAC,CAAgB;IACxC,OAAO,CAAC,YAAY,CAAC,CAAa;IAClC,OAAO,CAAC,UAAU,CAAC,CAAW;IAC9B,OAAO,CAAC,oBAAoB,CAAC,CAAqB;IAClD,OAAO,CAAC,IAAI,CAAC,CAAS;IACtB,OAAO,CAAC,OAAO,CAAC,CAAQ;IACxB,OAAO,CAAC,QAAQ,CAAQ;gBAEX,IAAI,GAAE,cAAmB;IAkBtC,SAAS,IAAK,OAAO;IAIf,WAAW,IAAK,OAAO,CAAC,IAAI,CAAC;IAU7B,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;IAUvB,UAAU,IAAK,OAAO,CAAC,IAAI,CAAC;IAU5B,UAAU,IAAK,OAAO,CAAC,IAAI,CAAC;IAU5B,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAUtB,SAAS,IAAK,OAAO,CAAC,IAAI,CAAC;IAUjC,IAAI,MAAM,IAAK,MAAM,CAMpB;IAED,IAAI,MAAM,CAAE,MAAM,EAAE,MAAM,EAEzB;IAED,IAAI,cAAc,IAAK,cAAc,CAMpC;IAED,IAAI,cAAc,CAAE,cAAc,EAAE,cAAc,EAEjD;IAED,IAAI,SAAS,IAAK,SAAS,CAM1B;IAED,IAAI,SAAS,CAAE,SAAS,EAAE,SAAS,EAElC;IAED,IAAI,QAAQ,IAAK,QAAQ,CAMxB;IAED,IAAI,QAAQ,CAAE,QAAQ,EAAE,QAAQ,EAE/B;IAED,IAAI,SAAS,IAAK,SAAS,CAM1B;IAED,IAAI,SAAS,CAAE,SAAS,EAAE,SAAS,EAElC;IAED,IAAI,iBAAiB,IAAK,iBAAiB,CAM1C;IAED,IAAI,iBAAiB,CAAE,iBAAiB,EAAE,iBAAiB,EAE1D;IAED,IAAI,gBAAgB,IAAK,gBAAgB,CAMxC;IAED,IAAI,gBAAgB,CAAE,gBAAgB,EAAE,gBAAgB,EAEvD;IAED,IAAI,eAAe,IAAK,eAAe,CAMtC;IAED,IAAI,eAAe,CAAE,eAAe,EAAE,eAAe,EAEpD;IAED,IAAI,cAAc,IAAK,cAAc,CAMpC;IAED,IAAI,cAAc,CAAE,cAAc,EAAE,cAAc,EAEjD;IAED,IAAI,WAAW,IAAK,WAAW,CAM9B;IAED,IAAI,WAAW,CAAE,WAAW,EAAE,WAAW,EAExC;IAED,IAAI,SAAS,IAAK,SAAS,CAM1B;IAED,IAAI,SAAS,CAAE,SAAS,EAAE,SAAS,EAElC;IAED,IAAI,mBAAmB,IAAK,mBAAmB,GAAG,SAAS,CAE1D;IAED,IAAI,mBAAmB,CAAE,mBAAmB,EAAE,mBAAmB,GAAG,SAAS,EAE5E;IAED,IAAI,OAAO,IAAK,OAAO,GAAG,SAAS,CAElC;IAED,IAAI,OAAO,CAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAExC;IAED,IAAI,GAAG,IAAK,OAAO,GAAG,SAAS,CAE9B;IAED,IAAI,GAAG,CAAE,GAAG,EAAE,OAAO,GAAG,SAAS,EAEhC;IAED,IAAI,MAAM,IAAK,MAAM,GAAG,SAAS,CAEhC;IAED,IAAI,MAAM,CAAE,MAAM,EAAE,MAAM,GAAG,SAAS,EAErC;CACF"}
+{"version":3,"file":"components.d.ts","sourceRoot":"","sources":["../../src/components.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAA;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AAC7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAA;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAC7E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAEpD,MAAM,WAAW,UAAW,SAAQ,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,SAAS;IAChE,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,YAAY,CAAC,YAAY,CAAC,CAAA;IAClC,cAAc,EAAE,cAAc,CAAA;IAC9B,SAAS,EAAE,SAAS,CAAA;IACpB,QAAQ,EAAE,QAAQ,CAAA;IAClB,SAAS,EAAE,SAAS,CAAA;IACpB,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,eAAe,EAAE,eAAe,CAAA;IAChC,cAAc,EAAE,cAAc,CAAA;IAC9B,WAAW,EAAE,WAAW,CAAA;IACxB,SAAS,EAAE,SAAS,CAAA;IACpB,mBAAmB,CAAC,EAAE,mBAAmB,CAAA;IACzC,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,YAAY,CAAC,YAAY,CAAC,CAAA;IACnC,cAAc,CAAC,EAAE,cAAc,CAAA;IAC/B,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IACrC,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;IACnC,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,cAAc,CAAC,EAAE,cAAc,CAAA;IAC/B,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,mBAAmB,CAAC,EAAE,mBAAmB,CAAA;CAC1C;AAyED,wBAAgB,iBAAiB,CAAE,IAAI,GAAE,cAAmB,GAAG,UAAU,CA+BxE"}