@dxos/network-manager 0.6.14-staging.e15392e → 0.7.1-staging.599df14

package/dist/lib/browser/{chunk-RUNQZNCV.mjs → chunk-6O74LX7U.mjs}

@@ -197,7 +197,7 @@ var Connection = class {
           S: this,
           C: (f, a) => f(...a)
         });
-        this.abort().catch((err2) => this.errors.raise(err2));
+        this.abort(err).catch((err2) => this.errors.raise(err2));
       } else if (err instanceof ConnectivityError) {
         log.info("aborting due to transport ConnectivityError", void 0, {
           F: __dxlog_file,
@@ -205,7 +205,7 @@ var Connection = class {
           S: this,
           C: (f, a) => f(...a)
         });
-        this.abort().catch((err2) => this.errors.raise(err2));
+        this.abort(err).catch((err2) => this.errors.raise(err2));
       }
       if (this._state !== "CLOSED" && this._state !== "CLOSING") {
         await this.connectedTimeoutContext.dispose();
@@ -1183,21 +1183,22 @@ var Peer = class {
           });
         },
         onClosed: (err) => {
-          log4("connection closed", {
+          const logMeta = {
             topic: this.topic,
             peerId: this.localInfo,
             remoteId: this.remoteInfo,
             initiator
-          }, {
+          };
+          log4("connection closed", logMeta, {
             F: __dxlog_file4,
-            L: 288,
+            L: 289,
             S: this,
             C: (f, a) => f(...a)
           });
           this._connectionLimiter.doneConnecting(sessionId);
           invariant3(this.connection === connection, "Connection mismatch (race condition).", {
             F: __dxlog_file4,
-            L: 293,
+            L: 294,
             S: this,
             A: [
               "this.connection === connection",
@@ -1212,7 +1213,7 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file4,
-            L: 295,
+            L: 296,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1227,6 +1228,12 @@ var Peer = class {
             }
             this._callbacks.onDisconnected();
             scheduleTask2(this._connectionCtx, () => {
+              log4("peer became available", logMeta, {
+                F: __dxlog_file4,
+                L: 320,
+                S: this,
+                C: (f, a) => f(...a)
+              });
               this.availableToConnect = true;
               this._callbacks.onPeerAvailable();
             }, this._availableAfter);
@@ -1247,7 +1254,7 @@ var Peer = class {
         err
       }, {
         F: __dxlog_file4,
-        L: 335,
+        L: 338,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1260,7 +1267,7 @@ var Peer = class {
         err
       }, {
         F: __dxlog_file4,
-        L: 342,
+        L: 345,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1279,7 +1286,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       F: __dxlog_file4,
-      L: 367,
+      L: 370,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1289,7 +1296,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       F: __dxlog_file4,
-      L: 373,
+      L: 376,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1300,7 +1307,7 @@ var Peer = class {
         message
       }, {
         F: __dxlog_file4,
-        L: 378,
+        L: 381,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1315,7 +1322,7 @@ var Peer = class {
       topic: this.topic
     }, {
       F: __dxlog_file4,
-      L: 388,
+      L: 391,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1533,10 +1540,16 @@ var Swarm = class {
       const peer = this._peers.get(swarmEvent.peerLeft.peer);
       if (peer) {
         peer.advertizing = false;
-        if (peer.connection?.state !== ConnectionState.CONNECTED) {
+        if (this._isConnectionEstablishmentInProgress(peer)) {
+          log5(`destroying peer, state: ${peer.connection?.state}`, void 0, {
+            F: __dxlog_file5,
+            L: 195,
+            S: this,
+            C: (f, a) => f(...a)
+          });
           void this._destroyPeer(swarmEvent.peerLeft.peer, "peer left").catch((err) => log5.catch(err, void 0, {
             F: __dxlog_file5,
-            L: 194,
+            L: 196,
             S: this,
             C: (f, a) => f(...a)
           }));
@@ -1546,7 +1559,7 @@ var Swarm = class {
           peer: swarmEvent.peerLeft.peer.peerKey
         }, {
           F: __dxlog_file5,
-          L: 197,
+          L: 199,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1559,14 +1572,14 @@ var Swarm = class {
       message
     }, {
       F: __dxlog_file5,
-      L: 206,
+      L: 208,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
       log5("ignored for disposed swarm", void 0, {
         F: __dxlog_file5,
-        L: 208,
+        L: 210,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1576,7 +1589,7 @@ var Swarm = class {
     }
     invariant4(message.author, void 0, {
       F: __dxlog_file5,
-      L: 213,
+      L: 215,
       S: this,
       A: [
         "message.author",
@@ -1588,7 +1601,7 @@ var Swarm = class {
         message
       }, {
         F: __dxlog_file5,
-        L: 215,
+        L: 217,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1601,7 +1614,7 @@ var Swarm = class {
         message
       }, {
         F: __dxlog_file5,
-        L: 219,
+        L: 221,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1619,14 +1632,14 @@ var Swarm = class {
       message
     }, {
       F: __dxlog_file5,
-      L: 230,
+      L: 232,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
       log5.info("ignored for offline swarm", void 0, {
         F: __dxlog_file5,
-        L: 232,
+        L: 234,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1634,7 +1647,7 @@ var Swarm = class {
     }
     invariant4(message.recipient.peerKey === this._ownPeer.peerKey, `Invalid signal peer id expected=${this.ownPeerId}, actual=${message.recipient}`, {
       F: __dxlog_file5,
-      L: 235,
+      L: 237,
       S: this,
       A: [
         "message.recipient.peerKey === this._ownPeer.peerKey",
@@ -1643,7 +1656,7 @@ var Swarm = class {
     });
     invariant4(message.topic?.equals(this._topic), void 0, {
       F: __dxlog_file5,
-      L: 239,
+      L: 241,
       S: this,
       A: [
         "message.topic?.equals(this._topic)",
@@ -1652,7 +1665,7 @@ var Swarm = class {
     });
     invariant4(message.author, void 0, {
       F: __dxlog_file5,
-      L: 240,
+      L: 242,
       S: this,
       A: [
         "message.author",
@@ -1673,13 +1686,13 @@ var Swarm = class {
   async goOnline() {
     this._ctx = new Context4(void 0, {
       F: __dxlog_file5,
-      L: 256
+      L: 258
     });
   }
   _getOrCreatePeer(peerInfo) {
     invariant4(peerInfo.peerKey, "PeerInfo.peerKey is required", {
       F: __dxlog_file5,
-      L: 260,
+      L: 262,
       S: this,
       A: [
         "peerInfo.peerKey",
@@ -1697,6 +1710,12 @@ var Swarm = class {
         },
         onDisconnected: async () => {
           if (this._isUnregistered(peer)) {
+            log5.verbose("ignored onDisconnected for unregistered peer", void 0, {
+              F: __dxlog_file5,
+              L: 282,
+              S: this,
+              C: (f, a) => f(...a)
+            });
             return;
           }
           if (!peer.advertizing) {
@@ -1711,7 +1730,7 @@ var Swarm = class {
               peerInfo
             }, {
               F: __dxlog_file5,
-              L: 293,
+              L: 296,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1733,10 +1752,19 @@ var Swarm = class {
     return peer;
   }
   async _destroyPeer(peerInfo, reason) {
+    log5("destroy peer", {
+      peerKey: peerInfo.peerKey,
+      reason
+    }, {
+      F: __dxlog_file5,
+      L: 318,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     const peer = this._peers.get(peerInfo);
     invariant4(peer, void 0, {
       F: __dxlog_file5,
-      L: 316,
+      L: 320,
       S: this,
       A: [
         "peer",
@@ -1766,7 +1794,7 @@ var Swarm = class {
           } catch (err) {
             log5("initiation error", err, {
               F: __dxlog_file5,
-              L: 343,
+              L: 347,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1797,7 +1825,7 @@ var Swarm = class {
         remotePeer
       }, {
         F: __dxlog_file5,
-        L: 371,
+        L: 375,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1816,7 +1844,7 @@ var Swarm = class {
       remotePeer
     }, {
       F: __dxlog_file5,
-      L: 387,
+      L: 391,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1826,7 +1854,7 @@ var Swarm = class {
       remotePeer
     }, {
       F: __dxlog_file5,
-      L: 390,
+      L: 394,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1838,6 +1866,16 @@ var Swarm = class {
     }
     await peer.closeConnection();
   }
+  _isConnectionEstablishmentInProgress(peer) {
+    if (!peer.connection) {
+      return true;
+    }
+    return [
+      ConnectionState.INITIAL,
+      ConnectionState.CREATED,
+      ConnectionState.CONNECTING
+    ].includes(peer.connection.state);
+  }
   _isUnregistered(peer) {
     return !peer || this._peers.get(peer.remoteInfo) !== peer;
   }
@@ -3070,7 +3108,17 @@ var RtcTransportChannel = class extends Resource {
       }
     }).catch((err) => {
       if (this.isOpen) {
-        this.errors.raise(new ConnectivityError2(`Failed to create a channel: ${err?.message ?? "unknown reason."}`));
+        const error = err instanceof Error ? err : new ConnectivityError2(`Failed to create a channel: ${JSON.stringify(err?.message)}`);
+        this.errors.raise(error);
+      } else {
+        log12.verbose("connection establishment failed after transport was closed", {
+          err
+        }, {
+          F: __dxlog_file13,
+          L: 76,
+          S: this,
+          C: (f, a) => f(...a)
+        });
       }
     }).finally(() => {
       this._isChannelCreationInProgress = false;
@@ -3085,7 +3133,7 @@ var RtcTransportChannel = class extends Resource {
     this.closed.emit();
     log12("closed", void 0, {
       F: __dxlog_file13,
-      L: 86,
+      L: 92,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3098,7 +3146,7 @@ var RtcTransportChannel = class extends Resource {
             topic: this._options.topic
           }, {
             F: __dxlog_file13,
-            L: 93,
+            L: 99,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3107,7 +3155,7 @@ var RtcTransportChannel = class extends Resource {
         }
         log12("onopen", void 0, {
           F: __dxlog_file13,
-          L: 98,
+          L: 104,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3125,7 +3173,7 @@ var RtcTransportChannel = class extends Resource {
       onclose: async () => {
         log12("onclose", void 0, {
           F: __dxlog_file13,
-          L: 111,
+          L: 117,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3135,7 +3183,7 @@ var RtcTransportChannel = class extends Resource {
         if (!this._stream) {
           log12.warn("ignoring message on a closed channel", void 0, {
             F: __dxlog_file13,
-            L: 117,
+            L: 123,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3164,7 +3212,7 @@ var RtcTransportChannel = class extends Resource {
     if (!this._channel) {
       log12.warn("writing to a channel after a connection was closed", void 0, {
         F: __dxlog_file13,
-        L: 145,
+        L: 151,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3187,7 +3235,7 @@ var RtcTransportChannel = class extends Resource {
       if (this._streamDataFlushedCallback !== null) {
         log12.error("consumer trying to write before we are ready for more data", void 0, {
           F: __dxlog_file13,
-          L: 166,
+          L: 172,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3203,7 +3251,7 @@ var RtcTransportChannel = class extends Resource {
     } catch (error) {
       log12.catch(error, void 0, {
         F: __dxlog_file13,
-        L: 178,
+        L: 184,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3290,7 +3338,7 @@ var RtcPeerConnection = class {
       }
       log13("waiting for initiator-peer to open a data channel", void 0, {
         F: __dxlog_file14,
-        L: 90,
+        L: 95,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3321,7 +3369,7 @@ var RtcPeerConnection = class {
       remotePeer: this._options.remotePeerKey
     }), {
       F: __dxlog_file14,
-      L: 115,
+      L: 120,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3332,7 +3380,7 @@ var RtcPeerConnection = class {
       onnegotiationneeded: async () => {
         invariant12(this._initiator, void 0, {
           F: __dxlog_file14,
-          L: 130,
+          L: 135,
           S: this,
           A: [
             "this._initiator",
@@ -3345,7 +3393,7 @@ var RtcPeerConnection = class {
         }
         log13("onnegotiationneeded", void 0, {
           F: __dxlog_file14,
-          L: 137,
+          L: 142,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3369,7 +3417,7 @@ var RtcPeerConnection = class {
             candidate: event.candidate.candidate
           }, {
             F: __dxlog_file14,
-            L: 156,
+            L: 161,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3377,7 +3425,7 @@ var RtcPeerConnection = class {
         } else {
           log13("onicecandidate gathering complete", void 0, {
             F: __dxlog_file14,
-            L: 159,
+            L: 164,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3405,7 +3453,7 @@ var RtcPeerConnection = class {
           state: connection.iceConnectionState
         }, {
           F: __dxlog_file14,
-          L: 179,
+          L: 184,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3427,7 +3475,7 @@ var RtcPeerConnection = class {
           state: connection.connectionState
         }, {
           F: __dxlog_file14,
-          L: 196,
+          L: 201,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3440,7 +3488,7 @@ var RtcPeerConnection = class {
           state: connection.signalingState
         }, {
           F: __dxlog_file14,
-          L: 203,
+          L: 208,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3450,7 +3498,7 @@ var RtcPeerConnection = class {
       ondatachannel: (event) => {
         invariant12(!this._initiator, "Initiator is expected to create data channels.", {
           F: __dxlog_file14,
-          L: 209,
+          L: 214,
           S: this,
           A: [
             "!this._initiator",
@@ -3465,7 +3513,7 @@ var RtcPeerConnection = class {
           label: event.channel.label
         }, {
           F: __dxlog_file14,
-          L: 216,
+          L: 221,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3493,7 +3541,7 @@ var RtcPeerConnection = class {
         error
       }, {
         F: __dxlog_file14,
-        L: 241,
+        L: 246,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3514,7 +3562,7 @@ var RtcPeerConnection = class {
       reason: error.message
     }, {
       F: __dxlog_file14,
-      L: 255,
+      L: 260,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3522,7 +3570,7 @@ var RtcPeerConnection = class {
   _lockAndCloseConnection() {
     invariant12(this._transportChannels.size === 0, void 0, {
       F: __dxlog_file14,
-      L: 260,
+      L: 265,
       S: this,
       A: [
         "this._transportChannels.size === 0",
@@ -3533,7 +3581,7 @@ var RtcPeerConnection = class {
       this._safeCloseConnection();
       log13("connection closed", void 0, {
         F: __dxlog_file14,
-        L: 263,
+        L: 268,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3546,7 +3594,7 @@ var RtcPeerConnection = class {
         type: signal.payload.data.type
       }, {
         F: __dxlog_file14,
-        L: 271,
+        L: 276,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3609,9 +3657,11 @@ var RtcPeerConnection = class {
         this._abortConnection(connection, new Error(`Unknown signal type ${data.type}.`));
         break;
     }
-    log13("signal processed", void 0, {
+    log13("signal processed", {
+      type: data.type
+    }, {
       F: __dxlog_file14,
-      L: 330,
+      L: 335,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3624,7 +3674,7 @@ var RtcPeerConnection = class {
           candidate
         }, {
           F: __dxlog_file14,
-          L: 338,
+          L: 343,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3633,7 +3683,7 @@ var RtcPeerConnection = class {
     } catch (err) {
       log13.catch(err, void 0, {
         F: __dxlog_file14,
-        L: 342,
+        L: 347,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3643,7 +3693,7 @@ var RtcPeerConnection = class {
     if (connection === this._connection) {
       log13("ready to process ice candidates", void 0, {
         F: __dxlog_file14,
-        L: 348,
+        L: 353,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3651,7 +3701,7 @@ var RtcPeerConnection = class {
     } else {
       log13.warn("session was negotiated after connection became inactive", void 0, {
         F: __dxlog_file14,
-        L: 351,
+        L: 356,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3663,7 +3713,7 @@ var RtcPeerConnection = class {
       state: connection.connectionState
     }, {
       F: __dxlog_file14,
-      L: 356,
+      L: 361,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3676,7 +3726,7 @@ var RtcPeerConnection = class {
     } catch (err) {
       log13.catch(err, void 0, {
         F: __dxlog_file14,
-        L: 368,
+        L: 373,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3687,7 +3737,7 @@ var RtcPeerConnection = class {
       this._readyForCandidates.wake();
       void this._factory.onConnectionDestroyed().catch((err) => log13.catch(err, void 0, {
         F: __dxlog_file14,
-        L: 374,
+        L: 379,
         S: this,
         C: (f, a) => f(...a)
       }));
@@ -3712,7 +3762,7 @@ var RtcPeerConnection = class {
     } catch (error) {
       log13.catch(error, void 0, {
         F: __dxlog_file14,
-        L: 390,
+        L: 395,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3739,7 +3789,7 @@ var RtcPeerConnection = class {
         err
       }, {
         F: __dxlog_file14,
-        L: 411,
+        L: 416,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3829,6 +3879,7 @@ var createRtcTransportFactory = (webrtcConfig, iceProvider) => {
         ownPeerKey: options.ownPeerKey,
         remotePeerKey: options.remotePeerKey,
         sendSignal: options.sendSignal,
+        legacyInitiator: options.initiator,
         webrtcConfig,
         iceProvider
       });
@@ -4182,7 +4233,6 @@ var RtcTransportService = class {
         connectorStream: transportStream,
         writeProcessedCallbacks: []
       };
-      pushNewState(ConnectionState4.CONNECTING);
       transport.connected.on(() => pushNewState(ConnectionState4.CONNECTED));
       transport.errors.handle(async (err) => {
         pushNewState(ConnectionState4.CLOSED, err);
@@ -4201,13 +4251,20 @@ var RtcTransportService = class {
         close(err);
       });
       ready();
+      log15("stream ready", void 0, {
+        F: __dxlog_file16,
+        L: 115,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      pushNewState(ConnectionState4.CONNECTING);
     });
   }
   async sendSignal({ proxyId, signal }) {
     const transport = this._openTransports.get(proxyId);
     invariant14(transport, void 0, {
       F: __dxlog_file16,
-      L: 121,
+      L: 123,
       S: this,
       A: [
         "transport",
@@ -4220,7 +4277,7 @@ var RtcTransportService = class {
     const transport = this._openTransports.get(proxyId);
     invariant14(transport, void 0, {
       F: __dxlog_file16,
-      L: 128,
+      L: 130,
       S: this,
       A: [
         "transport",
@@ -4235,7 +4292,7 @@ var RtcTransportService = class {
     const transport = this._openTransports.get(proxyId);
     invariant14(transport, void 0, {
       F: __dxlog_file16,
-      L: 135,
+      L: 137,
       S: this,
       A: [
         "transport",
@@ -4250,7 +4307,7 @@ var RtcTransportService = class {
     const transport = this._openTransports.get(proxyId);
     invariant14(transport, void 0, {
       F: __dxlog_file16,
-      L: 142,
+      L: 144,
       S: this,
       A: [
         "transport",
@@ -4284,7 +4341,7 @@ var RtcTransportService = class {
         message: error?.message
       }, {
         F: __dxlog_file16,
-        L: 172,
+        L: 174,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4296,14 +4353,14 @@ var RtcTransportService = class {
         message: error?.message
       }, {
         F: __dxlog_file16,
-        L: 177,
+        L: 179,
         S: this,
         C: (f, a) => f(...a)
       });
     }
     log15("closed", void 0, {
       F: __dxlog_file16,
-      L: 179,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4370,4 +4427,4 @@ export {
   RtcTransportService,
   createTeleportProtocolFactory
 };
-//# sourceMappingURL=chunk-RUNQZNCV.mjs.map
+//# sourceMappingURL=chunk-6O74LX7U.mjs.map