@libp2p/webrtc 5.0.16-7c085d10c → 5.0.16-7dcabb884

package/dist/src/private-to-private/listener.d.ts

@@ -10,7 +10,6 @@ export interface WebRTCPeerListenerInit {
     shutdownController: AbortController;
 }
 export declare class WebRTCPeerListener extends TypedEventEmitter<ListenerEvents> implements Listener {
-    private readonly peerId;
     private readonly transportManager;
     private readonly shutdownController;
     constructor(components: WebRTCPeerListenerComponents, init: WebRTCPeerListenerInit);

package/dist/src/private-to-private/listener.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"listener.d.ts","sourceRoot":"","sources":["../../../src/private-to-private/listener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAErD,OAAO,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,MAAM,CAAA;IACd,gBAAgB,EAAE,gBAAgB,CAAA;CACnC;AAED,MAAM,WAAW,sBAAsB;IACrC,kBAAkB,EAAE,eAAe,CAAA;CACpC;AAED,qBAAa,kBAAmB,SAAQ,iBAAiB,CAAC,cAAc,CAAE,YAAW,QAAQ;IAC3F,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkB;IACnD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAiB;gBAEvC,UAAU,EAAE,4BAA4B,EAAE,IAAI,EAAE,sBAAsB;IAS7E,MAAM,IAAK,OAAO,CAAC,IAAI,CAAC;IAI9B,QAAQ,IAAK,SAAS,EAAE;IAalB,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;CAI9B"}
+{"version":3,"file":"listener.d.ts","sourceRoot":"","sources":["../../../src/private-to-private/listener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAGrD,OAAO,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAIxD,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,MAAM,CAAA;IACd,gBAAgB,EAAE,gBAAgB,CAAA;CACnC;AAED,MAAM,WAAW,sBAAsB;IACrC,kBAAkB,EAAE,eAAe,CAAA;CACpC;AAED,qBAAa,kBAAmB,SAAQ,iBAAiB,CAAC,cAAc,CAAE,YAAW,QAAQ;IAC3F,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkB;IACnD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAiB;gBAEvC,UAAU,EAAE,4BAA4B,EAAE,IAAI,EAAE,sBAAsB;IAO7E,MAAM,IAAK,OAAO,CAAC,IAAI,CAAC;IAM9B,QAAQ,IAAK,SAAS,EAAE;IAalB,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;CAM9B"}

package/dist/src/private-to-private/listener.js

@@ -1,32 +1,36 @@
 import { TypedEventEmitter } from '@libp2p/interface';
-import { Circuit } from '@multiformats/mafmt';
+import { P2P } from '@multiformats/multiaddr-matcher';
+import { fmt, literal } from '@multiformats/multiaddr-matcher/utils';
+const Circuit = fmt(P2P.matchers[0], literal('p2p-circuit'));
 export class WebRTCPeerListener extends TypedEventEmitter {
-    peerId;
     transportManager;
     shutdownController;
     constructor(components, init) {
         super();
-        this.peerId = components.peerId;
         this.transportManager = components.transportManager;
         this.shutdownController = init.shutdownController;
     }
     async listen() {
-        this.safeDispatchEvent('listening', {});
+        queueMicrotask(() => {
+            this.safeDispatchEvent('listening');
+        });
     }
     getAddrs() {
         return this.transportManager
             .getListeners()
             .filter(l => l !== this)
             .map(l => l.getAddrs()
-            .filter(ma => Circuit.matches(ma))
+            .filter(ma => Circuit.exactMatch(ma))
             .map(ma => {
-            return ma.encapsulate(`/webrtc/p2p/${this.peerId}`);
+            return ma.encapsulate('/webrtc');
         }))
             .flat();
     }
     async close() {
         this.shutdownController.abort();
-        this.safeDispatchEvent('close', {});
+        queueMicrotask(() => {
+            this.safeDispatchEvent('close');
+        });
     }
 }
 //# sourceMappingURL=listener.js.map

package/dist/src/private-to-private/listener.js.map

@@ -1 +1 @@
-{"version":3,"file":"listener.js","sourceRoot":"","sources":["../../../src/private-to-private/listener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAc7C,MAAM,OAAO,kBAAmB,SAAQ,iBAAiC;IACtD,MAAM,CAAQ;IACd,gBAAgB,CAAkB;IAClC,kBAAkB,CAAiB;IAEpD,YAAa,UAAwC,EAAE,IAA4B;QACjF,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAA;QAC/B,IAAI,CAAC,gBAAgB,GAAG,UAAU,CAAC,gBAAgB,CAAA;QAEnD,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAA;IACnD,CAAC;IAED,KAAK,CAAC,MAAM;QACV,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;IACzC,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,gBAAgB;aACzB,YAAY,EAAE;aACd,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;aACvB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE;aACnB,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;aACjC,GAAG,CAAC,EAAE,CAAC,EAAE;YACR,OAAO,EAAE,CAAC,WAAW,CAAC,eAAe,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;QACrD,CAAC,CAAC,CACH;aACA,IAAI,EAAE,CAAA;IACX,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAA;QAC/B,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;IACrC,CAAC;CACF"}
+{"version":3,"file":"listener.js","sourceRoot":"","sources":["../../../src/private-to-private/listener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAA;AACrD,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,uCAAuC,CAAA;AAKpE,MAAM,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAA;AAW5D,MAAM,OAAO,kBAAmB,SAAQ,iBAAiC;IACtD,gBAAgB,CAAkB;IAClC,kBAAkB,CAAiB;IAEpD,YAAa,UAAwC,EAAE,IAA4B;QACjF,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,gBAAgB,GAAG,UAAU,CAAC,gBAAgB,CAAA;QACnD,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAA;IACnD,CAAC;IAED,KAAK,CAAC,MAAM;QACV,cAAc,CAAC,GAAG,EAAE;YAClB,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAA;QACrC,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,gBAAgB;aACzB,YAAY,EAAE;aACd,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;aACvB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE;aACnB,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;aACpC,GAAG,CAAC,EAAE,CAAC,EAAE;YACR,OAAO,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;QAClC,CAAC,CAAC,CACH;aACA,IAAI,EAAE,CAAA;IACX,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAA;QAC/B,cAAc,CAAC,GAAG,EAAE;YAClB,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;IACJ,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/webrtc",
-  "version": "5.0.16-7c085d10c",
+  "version": "5.0.16-7dcabb884",
   "description": "A libp2p transport using WebRTC connections",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/transport-webrtc#readme",
@@ -51,11 +51,10 @@
   },
   "dependencies": {
     "@chainsafe/libp2p-noise": "^16.0.0",
-    "@libp2p/interface": "2.2.0-7c085d10c",
-    "@libp2p/interface-internal": "2.0.10-7c085d10c",
-    "@libp2p/peer-id": "5.0.7-7c085d10c",
-    "@libp2p/utils": "6.1.3-7c085d10c",
-    "@multiformats/mafmt": "^12.1.6",
+    "@libp2p/interface": "2.2.0-7dcabb884",
+    "@libp2p/interface-internal": "2.0.10-7dcabb884",
+    "@libp2p/peer-id": "5.0.7-7dcabb884",
+    "@libp2p/utils": "6.1.3-7dcabb884",
     "@multiformats/multiaddr": "^12.2.3",
     "@multiformats/multiaddr-matcher": "^1.2.1",
     "detect-browser": "^5.3.0",
@@ -78,12 +77,12 @@
   },
   "devDependencies": {
     "@chainsafe/libp2p-yamux": "^7.0.0",
-    "@libp2p/circuit-relay-v2": "3.1.0-7c085d10c",
-    "@libp2p/crypto": "5.0.6-7c085d10c",
-    "@libp2p/identify": "3.0.10-7c085d10c",
-    "@libp2p/interface-compliance-tests": "6.1.8-7c085d10c",
-    "@libp2p/logger": "5.1.3-7c085d10c",
-    "@libp2p/websockets": "9.0.11-7c085d10c",
+    "@libp2p/circuit-relay-v2": "3.1.0-7dcabb884",
+    "@libp2p/crypto": "5.0.6-7dcabb884",
+    "@libp2p/identify": "3.0.10-7dcabb884",
+    "@libp2p/interface-compliance-tests": "6.1.8-7dcabb884",
+    "@libp2p/logger": "5.1.3-7dcabb884",
+    "@libp2p/websockets": "9.0.11-7dcabb884",
     "@types/sinon": "^17.0.3",
     "aegir": "^44.0.1",
     "delay": "^6.0.0",
@@ -93,7 +92,7 @@
     "it-pair": "^2.0.6",
     "it-pipe": "^3.0.1",
     "it-to-buffer": "^4.0.7",
-    "libp2p": "2.2.1-7c085d10c",
+    "libp2p": "2.2.1-7dcabb884",
     "p-retry": "^6.2.0",
     "protons": "^7.5.0",
     "sinon": "^18.0.0",

package/src/private-to-private/listener.ts

@@ -1,9 +1,12 @@
 import { TypedEventEmitter } from '@libp2p/interface'
-import { Circuit } from '@multiformats/mafmt'
+import { P2P } from '@multiformats/multiaddr-matcher'
+import { fmt, literal } from '@multiformats/multiaddr-matcher/utils'
 import type { PeerId, ListenerEvents, Listener } from '@libp2p/interface'
 import type { TransportManager } from '@libp2p/interface-internal'
 import type { Multiaddr } from '@multiformats/multiaddr'
 
+const Circuit = fmt(P2P.matchers[0], literal('p2p-circuit'))
+
 export interface WebRTCPeerListenerComponents {
   peerId: PeerId
   transportManager: TransportManager
@@ -14,21 +17,20 @@ export interface WebRTCPeerListenerInit {
 }
 
 export class WebRTCPeerListener extends TypedEventEmitter<ListenerEvents> implements Listener {
-  private readonly peerId: PeerId
   private readonly transportManager: TransportManager
   private readonly shutdownController: AbortController
 
   constructor (components: WebRTCPeerListenerComponents, init: WebRTCPeerListenerInit) {
     super()
 
-    this.peerId = components.peerId
     this.transportManager = components.transportManager
-
     this.shutdownController = init.shutdownController
   }
 
   async listen (): Promise<void> {
-    this.safeDispatchEvent('listening', {})
+    queueMicrotask(() => {
+      this.safeDispatchEvent('listening')
+    })
   }
 
   getAddrs (): Multiaddr[] {
@@ -36,9 +38,9 @@ export class WebRTCPeerListener extends TypedEventEmitter<ListenerEvents> implem
       .getListeners()
       .filter(l => l !== this)
       .map(l => l.getAddrs()
-        .filter(ma => Circuit.matches(ma))
+        .filter(ma => Circuit.exactMatch(ma))
         .map(ma => {
-          return ma.encapsulate(`/webrtc/p2p/${this.peerId}`)
+          return ma.encapsulate('/webrtc')
         })
       )
       .flat()
@@ -46,6 +48,8 @@ export class WebRTCPeerListener extends TypedEventEmitter<ListenerEvents> implem
 
   async close (): Promise<void> {
     this.shutdownController.abort()
-    this.safeDispatchEvent('close', {})
+    queueMicrotask(() => {
+      this.safeDispatchEvent('close')
+    })
   }
 }