@dxos/network-manager 0.6.14-staging.54a8bab → 0.6.14-staging.8758a12

package/dist/lib/browser/{chunk-UEVA7BFW.mjs → chunk-MAR4A5JK.mjs}

@@ -3108,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;
@@ -3123,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)
     });
@@ -3136,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)
           });
@@ -3145,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)
         });
@@ -3163,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)
         });
@@ -3173,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)
           });
@@ -3202,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)
       });
@@ -3225,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)
         });
@@ -3241,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)
       });
@@ -3292,6 +3302,7 @@ function _ts_decorate6(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc/rtc-peer-connection.ts";
+var isLegacyInteropEnabled = () => Boolean(globalThis?.DEVICE_INVITE_INTEROP);
 var RtcPeerConnection = class {
   constructor(_factory, _options) {
     this._factory = _factory;
@@ -3301,7 +3312,7 @@ var RtcPeerConnection = class {
     this._dataChannels = /* @__PURE__ */ new Map();
     this._readyForCandidates = new Trigger3();
     this._offerProcessingMutex = new Mutex2();
-    this._initiator = chooseInitiatorPeer(_options.ownPeerKey, _options.remotePeerKey) === _options.ownPeerKey;
+    this._initiator = isLegacyInteropEnabled() ? Boolean(this._options.legacyInitiator) : chooseInitiatorPeer(_options.ownPeerKey, _options.remotePeerKey) === _options.ownPeerKey;
   }
   get transportChannelCount() {
     return this._transportChannels.size;
@@ -3310,30 +3321,31 @@ var RtcPeerConnection = class {
     return this._connection;
   }
   async createDataChannel(topic) {
+    const channelKey = isLegacyInteropEnabled() ? "dxos.mesh.transport" : topic;
     const connection = await this._openConnection();
-    if (!this._transportChannels.has(topic)) {
+    if (isLegacyInteropEnabled() ? this._transportChannels.size === 0 : !this._transportChannels.has(channelKey)) {
       if (!this._transportChannels.size) {
         this._lockAndCloseConnection();
       }
       throw new Error("Transport closed while connection was being open");
     }
     if (this._initiator) {
-      const channel = connection.createDataChannel(topic);
-      this._dataChannels.set(topic, channel);
+      const channel = connection.createDataChannel(channelKey);
+      this._dataChannels.set(channelKey, channel);
       return channel;
     } else {
-      const existingChannel = this._dataChannels.get(topic);
+      const existingChannel = this._dataChannels.get(channelKey);
       if (existingChannel) {
         return existingChannel;
       }
       log13("waiting for initiator-peer to open a data channel", void 0, {
         F: __dxlog_file14,
-        L: 90,
+        L: 104,
         S: this,
         C: (f, a) => f(...a)
       });
       return new Promise((resolve, reject) => {
-        this._channelCreatedCallbacks.set(topic, {
+        this._channelCreatedCallbacks.set(channelKey, {
           resolve,
           reject
         });
@@ -3359,7 +3371,7 @@ var RtcPeerConnection = class {
       remotePeer: this._options.remotePeerKey
     }), {
       F: __dxlog_file14,
-      L: 115,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3370,7 +3382,7 @@ var RtcPeerConnection = class {
       onnegotiationneeded: async () => {
         invariant12(this._initiator, void 0, {
           F: __dxlog_file14,
-          L: 130,
+          L: 144,
           S: this,
           A: [
             "this._initiator",
@@ -3383,7 +3395,7 @@ var RtcPeerConnection = class {
         }
         log13("onnegotiationneeded", void 0, {
           F: __dxlog_file14,
-          L: 137,
+          L: 151,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3407,7 +3419,7 @@ var RtcPeerConnection = class {
             candidate: event.candidate.candidate
           }, {
             F: __dxlog_file14,
-            L: 156,
+            L: 170,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3415,7 +3427,7 @@ var RtcPeerConnection = class {
         } else {
           log13("onicecandidate gathering complete", void 0, {
             F: __dxlog_file14,
-            L: 159,
+            L: 173,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3443,7 +3455,7 @@ var RtcPeerConnection = class {
           state: connection.iceConnectionState
         }, {
           F: __dxlog_file14,
-          L: 179,
+          L: 193,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3465,7 +3477,7 @@ var RtcPeerConnection = class {
           state: connection.connectionState
         }, {
           F: __dxlog_file14,
-          L: 196,
+          L: 210,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3478,7 +3490,7 @@ var RtcPeerConnection = class {
           state: connection.signalingState
         }, {
           F: __dxlog_file14,
-          L: 203,
+          L: 217,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3488,7 +3500,7 @@ var RtcPeerConnection = class {
       ondatachannel: (event) => {
         invariant12(!this._initiator, "Initiator is expected to create data channels.", {
           F: __dxlog_file14,
-          L: 209,
+          L: 223,
           S: this,
           A: [
             "!this._initiator",
@@ -3503,7 +3515,7 @@ var RtcPeerConnection = class {
           label: event.channel.label
         }, {
           F: __dxlog_file14,
-          L: 216,
+          L: 230,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3531,7 +3543,7 @@ var RtcPeerConnection = class {
         error
       }, {
         F: __dxlog_file14,
-        L: 241,
+        L: 255,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3552,7 +3564,7 @@ var RtcPeerConnection = class {
       reason: error.message
     }, {
       F: __dxlog_file14,
-      L: 255,
+      L: 269,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3560,7 +3572,7 @@ var RtcPeerConnection = class {
   _lockAndCloseConnection() {
     invariant12(this._transportChannels.size === 0, void 0, {
       F: __dxlog_file14,
-      L: 260,
+      L: 274,
       S: this,
       A: [
         "this._transportChannels.size === 0",
@@ -3571,7 +3583,7 @@ var RtcPeerConnection = class {
       this._safeCloseConnection();
       log13("connection closed", void 0, {
         F: __dxlog_file14,
-        L: 263,
+        L: 277,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3584,7 +3596,7 @@ var RtcPeerConnection = class {
         type: signal.payload.data.type
       }, {
         F: __dxlog_file14,
-        L: 271,
+        L: 285,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3651,7 +3663,7 @@ var RtcPeerConnection = class {
       type: data.type
     }, {
       F: __dxlog_file14,
-      L: 330,
+      L: 344,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3664,7 +3676,7 @@ var RtcPeerConnection = class {
           candidate
         }, {
           F: __dxlog_file14,
-          L: 338,
+          L: 352,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3673,7 +3685,7 @@ var RtcPeerConnection = class {
     } catch (err) {
       log13.catch(err, void 0, {
         F: __dxlog_file14,
-        L: 342,
+        L: 356,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3683,7 +3695,7 @@ var RtcPeerConnection = class {
     if (connection === this._connection) {
       log13("ready to process ice candidates", void 0, {
         F: __dxlog_file14,
-        L: 348,
+        L: 362,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3691,7 +3703,7 @@ var RtcPeerConnection = class {
     } else {
       log13.warn("session was negotiated after connection became inactive", void 0, {
         F: __dxlog_file14,
-        L: 351,
+        L: 365,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3703,7 +3715,7 @@ var RtcPeerConnection = class {
       state: connection.connectionState
     }, {
       F: __dxlog_file14,
-      L: 356,
+      L: 370,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3716,7 +3728,7 @@ var RtcPeerConnection = class {
     } catch (err) {
       log13.catch(err, void 0, {
         F: __dxlog_file14,
-        L: 368,
+        L: 382,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3727,7 +3739,7 @@ var RtcPeerConnection = class {
       this._readyForCandidates.wake();
       void this._factory.onConnectionDestroyed().catch((err) => log13.catch(err, void 0, {
         F: __dxlog_file14,
-        L: 374,
+        L: 388,
         S: this,
         C: (f, a) => f(...a)
       }));
@@ -3752,7 +3764,7 @@ var RtcPeerConnection = class {
     } catch (error) {
       log13.catch(error, void 0, {
         F: __dxlog_file14,
-        L: 390,
+        L: 404,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3779,7 +3791,7 @@ var RtcPeerConnection = class {
         err
       }, {
         F: __dxlog_file14,
-        L: 411,
+        L: 425,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3869,6 +3881,7 @@ var createRtcTransportFactory = (webrtcConfig, iceProvider) => {
         ownPeerKey: options.ownPeerKey,
         remotePeerKey: options.remotePeerKey,
         sendSignal: options.sendSignal,
+        legacyInitiator: options.initiator,
         webrtcConfig,
         iceProvider
       });
@@ -4222,7 +4235,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);
@@ -4241,13 +4253,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",
@@ -4260,7 +4279,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",
@@ -4275,7 +4294,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",
@@ -4290,7 +4309,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",
@@ -4324,7 +4343,7 @@ var RtcTransportService = class {
         message: error?.message
       }, {
         F: __dxlog_file16,
-        L: 172,
+        L: 174,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4336,14 +4355,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)
     });
@@ -4410,4 +4429,4 @@ export {
   RtcTransportService,
   createTeleportProtocolFactory
 };
-//# sourceMappingURL=chunk-UEVA7BFW.mjs.map
+//# sourceMappingURL=chunk-MAR4A5JK.mjs.map