@dxos/network-manager 0.1.58-main.f5feb2a → 0.1.58-main.f69fa2f

package/dist/lib/browser/{chunk-CNQ55TFQ.mjs → chunk-3KLH55NB.mjs}

@@ -197,7 +197,7 @@ var Connection = class {
         this.closeReason = err?.message;
       }
       if (err instanceof ConnectionResetError) {
-        log("aborting due to transport ConnectionResetError", void 0, {
+        log.warn("aborting due to transport ConnectionResetError", void 0, {
           F: __dxlog_file,
           L: 197,
           S: this,
@@ -205,7 +205,7 @@ var Connection = class {
         });
         this.abort().catch((err2) => this.errors.raise(err2));
       } else if (err instanceof ConnectivityError) {
-        log("aborting due to transport ConnectivityError", void 0, {
+        log.warn("aborting due to transport ConnectivityError", void 0, {
           F: __dxlog_file,
           L: 200,
           S: this,
@@ -213,7 +213,7 @@ var Connection = class {
         });
         this.abort().catch((err2) => this.errors.raise(err2));
       } else if (err instanceof UnknownProtocolError) {
-        log("unsure what to do for UnknownProtocolError", {
+        log.warn("unsure what to do with UnknownProtocolError, will keep on truckin", {
           err
         }, {
           F: __dxlog_file,
@@ -244,14 +244,14 @@ var Connection = class {
       err
     }, {
       F: __dxlog_file,
-      L: 224,
+      L: 225,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._state === ConnectionState.CLOSED || this._state === ConnectionState.ABORTED) {
       log(`abort ignored: already ${this._state}`, this.closeReason, {
         F: __dxlog_file,
-        L: 226,
+        L: 227,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -267,7 +267,7 @@ var Connection = class {
         proto: this._protocol
       }, {
         F: __dxlog_file,
-        L: 239,
+        L: 240,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -275,7 +275,7 @@ var Connection = class {
     } catch (err2) {
       log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 242,
+        L: 243,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -285,7 +285,7 @@ var Connection = class {
     } catch (err2) {
       log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 249,
+        L: 250,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -295,7 +295,7 @@ var Connection = class {
     } catch (err2) {
       log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 255,
+        L: 256,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -316,7 +316,7 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 277,
+      L: 278,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -326,7 +326,7 @@ var Connection = class {
       } catch (err2) {
         log.catch(err2, void 0, {
           F: __dxlog_file,
-          L: 284,
+          L: 285,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -336,7 +336,7 @@ var Connection = class {
       } catch (err2) {
         log.catch(err2, void 0, {
           F: __dxlog_file,
-          L: 291,
+          L: 292,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -346,7 +346,7 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 295,
+      L: 296,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -389,7 +389,7 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 332,
+        L: 333,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -402,7 +402,7 @@ var Connection = class {
   async signal(msg) {
     invariant(msg.sessionId, void 0, {
       F: __dxlog_file,
-      L: 341,
+      L: 342,
       S: this,
       A: [
         "msg.sessionId",
@@ -412,7 +412,7 @@ var Connection = class {
     if (!msg.sessionId.equals(this.sessionId)) {
       log("dropping signal for incorrect session id", void 0, {
         F: __dxlog_file,
-        L: 343,
+        L: 344,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -420,7 +420,7 @@ var Connection = class {
     }
     invariant(msg.data.signal || msg.data.signalBatch, void 0, {
       F: __dxlog_file,
-      L: 346,
+      L: 347,
       S: this,
       A: [
         "msg.data.signal || msg.data.signalBatch",
@@ -429,7 +429,7 @@ var Connection = class {
     });
     invariant(msg.author?.equals(this.remoteId), void 0, {
       F: __dxlog_file,
-      L: 347,
+      L: 348,
       S: this,
       A: [
         "msg.author?.equals(this.remoteId)",
@@ -438,7 +438,7 @@ var Connection = class {
     });
     invariant(msg.recipient?.equals(this.ownId), void 0, {
       F: __dxlog_file,
-      L: 348,
+      L: 349,
       S: this,
       A: [
         "msg.recipient?.equals(this.ownId)",
@@ -462,7 +462,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 357,
+          L: 358,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -470,7 +470,7 @@ var Connection = class {
       } else {
         invariant(this._transport, "Connection not ready to accept signals.", {
           F: __dxlog_file,
-          L: 360,
+          L: 361,
           S: this,
           A: [
             "this._transport",
@@ -483,7 +483,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 361,
+          L: 362,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -501,13 +501,13 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 372,
+      L: 373,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant(state !== this._state, "Already in this state.", {
       F: __dxlog_file,
-      L: 373,
+      L: 374,
       S: this,
       A: [
         "state !== this._state",
@@ -814,6 +814,20 @@ var Peer = class {
   */
   async onOffer(message) {
     const remoteId = message.author;
+    if (this.connection && ![
+      ConnectionState.CREATED,
+      ConnectionState.INITIAL
+    ].includes(this.connection.state)) {
+      log3.info(`received offer when connection already in ${this.connection.state} state`, void 0, {
+        F: __dxlog_file3,
+        L: 112,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return {
+        accept: false
+      };
+    }
     if (this.connection || this.initiating) {
       if (remoteId.toHex() < this.localPeerId.toHex()) {
         log3("close local connection", {
@@ -823,7 +837,7 @@ var Peer = class {
           sessionId: this.connection?.sessionId
         }, {
           F: __dxlog_file3,
-          L: 117,
+          L: 121,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -840,7 +854,7 @@ var Peer = class {
       if (!this.connection) {
         invariant3(message.sessionId, void 0, {
           F: __dxlog_file3,
-          L: 137,
+          L: 141,
           S: this,
           A: [
             "message.sessionId",
@@ -861,7 +875,7 @@ var Peer = class {
               err
             }, {
               F: __dxlog_file3,
-              L: 147,
+              L: 151,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -883,7 +897,7 @@ var Peer = class {
   async initiateConnection() {
     invariant3(!this.initiating, "Initiation in progress.", {
       F: __dxlog_file3,
-      L: 164,
+      L: 168,
       S: this,
       A: [
         "!this.initiating",
@@ -892,7 +906,7 @@ var Peer = class {
     });
     invariant3(!this.connection, "Already connected.", {
       F: __dxlog_file3,
-      L: 165,
+      L: 169,
       S: this,
       A: [
         "!this.connection",
@@ -907,7 +921,7 @@ var Peer = class {
       sessionId
     }, {
       F: __dxlog_file3,
-      L: 167,
+      L: 171,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -932,14 +946,14 @@ var Peer = class {
         remoteId: this.id
       }, {
         F: __dxlog_file3,
-        L: 183,
+        L: 187,
         S: this,
         C: (f, a) => f(...a)
       });
       if (connection.state !== ConnectionState.INITIAL) {
         log3("ignoring response", void 0, {
           F: __dxlog_file3,
-          L: 185,
+          L: 189,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -959,11 +973,17 @@ var Peer = class {
         remoteId: this.id
       }, {
         F: __dxlog_file3,
-        L: 196,
+        L: 200,
         S: this,
         C: (f, a) => f(...a)
       });
       if (err instanceof TimeoutError) {
+        log3.warn("aborting connection due to signalling failure", void 0, {
+          F: __dxlog_file3,
+          L: 202,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         await connection.abort(err);
       }
       await this.closeConnection(err);
@@ -985,13 +1005,13 @@ var Peer = class {
       sessionId
     }, {
       F: __dxlog_file3,
-      L: 213,
+      L: 218,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant3(!this.connection, "Already connected.", {
       F: __dxlog_file3,
-      L: 220,
+      L: 225,
       S: this,
       A: [
         "!this.connection",
@@ -1027,7 +1047,7 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file3,
-            L: 239,
+            L: 244,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1040,14 +1060,14 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file3,
-            L: 248,
+            L: 253,
             S: this,
             C: (f, a) => f(...a)
           });
           this._connectionLimiter.doneConnecting(sessionId);
           invariant3(this.connection === connection, "Connection mismatch (race condition).", {
             F: __dxlog_file3,
-            L: 253,
+            L: 258,
             S: this,
             A: [
               "this.connection === connection",
@@ -1062,7 +1082,7 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file3,
-            L: 255,
+            L: 260,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1097,7 +1117,7 @@ var Peer = class {
         err
       }, {
         F: __dxlog_file3,
-        L: 295,
+        L: 300,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1110,7 +1130,7 @@ var Peer = class {
         err
       }, {
         F: __dxlog_file3,
-        L: 296,
+        L: 301,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1129,7 +1149,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       F: __dxlog_file3,
-      L: 321,
+      L: 326,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1139,7 +1159,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       F: __dxlog_file3,
-      L: 327,
+      L: 332,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1150,7 +1170,7 @@ var Peer = class {
         message
       }, {
         F: __dxlog_file3,
-        L: 332,
+        L: 337,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1165,7 +1185,7 @@ var Peer = class {
       topic: this.topic
     }, {
       F: __dxlog_file3,
-      L: 342,
+      L: 347,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1678,7 +1698,6 @@ var SwarmMapper = class {
   get peers() {
     return Array.from(this._peers.values());
   }
-  // prettier-ignore
   constructor(_swarm) {
     this._swarm = _swarm;
     this._subscriptions = new EventSubscriptions();
@@ -1701,7 +1720,7 @@ var SwarmMapper = class {
   _update() {
     log5("updating swarm", void 0, {
       F: __dxlog_file5,
-      L: 75,
+      L: 72,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1725,7 +1744,7 @@ var SwarmMapper = class {
       totalPeersInSwarm: this._peers.size
     }, {
       F: __dxlog_file5,
-      L: 116,
+      L: 113,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2289,7 +2308,6 @@ import { invariant as invariant9 } from "@dxos/invariant";
 import { log as log9 } from "@dxos/log";
 var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/star-topology.ts";
 var StarTopology = class {
-  // prettier-ignore
   constructor(_centralPeer) {
     this._centralPeer = _centralPeer;
   }
@@ -2299,7 +2317,7 @@ var StarTopology = class {
   init(controller) {
     invariant9(!this._controller, "Already initialized.", {
       F: __dxlog_file10,
-      L: 24,
+      L: 21,
       S: this,
       A: [
         "!this._controller",
@@ -2311,7 +2329,7 @@ var StarTopology = class {
   update() {
     invariant9(this._controller, "Not initialized.", {
       F: __dxlog_file10,
-      L: 29,
+      L: 26,
       S: this,
       A: [
         "this._controller",
@@ -2322,7 +2340,7 @@ var StarTopology = class {
     if (!ownPeerId.equals(this._centralPeer)) {
       log9("leaf peer dropping all connections apart from central peer.", void 0, {
         F: __dxlog_file10,
-        L: 32,
+        L: 29,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2332,7 +2350,7 @@ var StarTopology = class {
             peer
           }, {
             F: __dxlog_file10,
-            L: 37,
+            L: 34,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2346,7 +2364,7 @@ var StarTopology = class {
           peer
         }, {
           F: __dxlog_file10,
-          L: 46,
+          L: 43,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2357,7 +2375,7 @@ var StarTopology = class {
   async onOffer(peer) {
     invariant9(this._controller, "Not initialized.", {
       F: __dxlog_file10,
-      L: 53,
+      L: 50,
       S: this,
       A: [
         "this._controller",
@@ -2371,7 +2389,7 @@ var StarTopology = class {
       isSelfCentral: ownPeerId.equals(this._centralPeer)
     }, {
       F: __dxlog_file10,
-      L: 55,
+      L: 52,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2663,38 +2681,52 @@ var SimplePeerTransport = class {
         } else {
           this.errors.raise(new UnknownProtocolError2("unknown RTCError", err));
         }
-      } else if (err.name === "InvalidStateError") {
-        this.errors.raise(new ConnectionResetError2("safari WebRTC error", err));
       } else if ("code" in err) {
+        log11.info("simple-peer error", err, {
+          F: __dxlog_file12,
+          L: 77,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         switch (err.code) {
           case "ERR_WEBRTC_SUPPORT":
             this.errors.raise(new ProtocolError2("WebRTC not supported", err));
+            break;
           case "ERR_ICE_CONNECTION_FAILURE":
           case "ERR_DATA_CHANNEL":
           case "ERR_CONNECTION_FAILURE":
           case "ERR_SIGNALING":
             this.errors.raise(new ConnectivityError2("unknown communication failure", err));
+            break;
           case "ERR_CREATE_OFFER":
           case "ERR_CREATE_ANSWER":
           case "ERR_SET_LOCAL_DESCRIPTION":
           case "ERR_SET_REMOTE_DESCRIPTION":
           case "ERR_ADD_ICE_CANDIDATE":
             this.errors.raise(new UnknownProtocolError2("unknown simple-peer library failure", err));
+            break;
           default:
             this.errors.raise(new Error("unknown simple-peer error"));
+            break;
         }
       } else {
+        log11.info("unknown peer connection error", err, {
+          F: __dxlog_file12,
+          L: 101,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         this.errors.raise(err);
       }
       try {
-        if (typeof this._peer?._pc.getStats === "function") {
+        if (typeof this._peer?._pc?.getStats === "function") {
           this._peer._pc.getStats().then((stats) => {
             log11.warn("report after webrtc error", {
               config: this.params.webrtcConfig,
               stats
             }, {
               F: __dxlog_file12,
-              L: 106,
+              L: 109,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2703,7 +2735,7 @@ var SimplePeerTransport = class {
       } catch (err2) {
         log11.catch(err2, void 0, {
           F: __dxlog_file12,
-          L: 113,
+          L: 116,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2714,7 +2746,7 @@ var SimplePeerTransport = class {
       id: this._instanceId
     }), {
       F: __dxlog_file12,
-      L: 118,
+      L: 121,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2722,7 +2754,7 @@ var SimplePeerTransport = class {
   async destroy() {
     log11("closing...", void 0, {
       F: __dxlog_file12,
-      L: 122,
+      L: 125,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2732,7 +2764,7 @@ var SimplePeerTransport = class {
     this.closed.emit();
     log11("closed", void 0, {
       F: __dxlog_file12,
-      L: 127,
+      L: 130,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2765,7 +2797,6 @@ import { ConnectionState as ConnectionState3 } from "@dxos/protocols/proto/dxos/
 import { ComplexMap as ComplexMap8 } from "@dxos/util";
 var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/simplepeer-transport-service.ts";
 var SimplePeerTransportService = class {
-  // prettier-ignore
   constructor(_webrtcConfig) {
     this._webrtcConfig = _webrtcConfig;
     this.transports = new ComplexMap8(PublicKey11.hash);
@@ -2835,7 +2866,8 @@ var SimplePeerTransportService = class {
       const transportState = {
         transport,
         stream: duplex,
-        writeCallbacks: []
+        writeCallbacks: [],
+        state: "OPEN"
       };
       ready();
       this.transports.set(request.proxyId, transportState);
@@ -2845,7 +2877,7 @@ var SimplePeerTransportService = class {
   async sendSignal({ proxyId, signal }) {
     invariant12(this.transports.has(proxyId), void 0, {
       F: __dxlog_file13,
-      L: 113,
+      L: 112,
       S: this,
       A: [
         "this.transports.has(proxyId)",
@@ -2855,9 +2887,17 @@ var SimplePeerTransportService = class {
     await this.transports.get(proxyId).transport.signal(signal);
   }
   async sendData({ proxyId, payload }) {
+    if (this.transports.get(proxyId)?.state !== "OPEN") {
+      log12.debug("transport is closed", void 0, {
+        F: __dxlog_file13,
+        L: 118,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
     invariant12(this.transports.has(proxyId), void 0, {
       F: __dxlog_file13,
-      L: 118,
+      L: 120,
       S: this,
       A: [
         "this.transports.has(proxyId)",
@@ -2875,10 +2915,12 @@ var SimplePeerTransportService = class {
   async close({ proxyId }) {
     await this.transports.get(proxyId)?.transport.destroy();
     await this.transports.get(proxyId)?.stream.end();
-    this.transports.delete(proxyId);
+    if (this.transports.get(proxyId)) {
+      this.transports.get(proxyId).state = "CLOSED";
+    }
     log12("Closed.", void 0, {
       F: __dxlog_file13,
-      L: 132,
+      L: 136,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2898,7 +2940,6 @@ import { ConnectionState as ConnectionState4 } from "@dxos/protocols/proto/dxos/
 import { arrayToBuffer } from "@dxos/util";
 var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/simplepeer-transport-proxy.ts";
 var SimplePeerTransportProxy = class {
-  // prettier-ignore
   constructor(_params) {
     this._params = _params;
     this._proxyId = PublicKey12.random();
@@ -2915,7 +2956,7 @@ var SimplePeerTransportProxy = class {
       this._serviceStream.subscribe(async (event) => {
         log13("SimplePeerTransportProxy: event", event, {
           F: __dxlog_file14,
-          L: 58,
+          L: 55,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2944,7 +2985,7 @@ var SimplePeerTransportProxy = class {
       }));
     }, (error) => log13.catch(error, void 0, {
       F: __dxlog_file14,
-      L: 82,
+      L: 83,
       S: this,
       C: (f, a) => f(...a)
     }));
@@ -2990,7 +3031,7 @@ var SimplePeerTransportProxy = class {
     } catch (err) {
       log13.catch(err, void 0, {
         F: __dxlog_file14,
-        L: 133,
+        L: 134,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3026,7 +3067,7 @@ var SimplePeerTransportProxyFactory = class {
   createTransport(options) {
     invariant13(this._bridgeService, "SimplePeerTransportProxyFactory is not ready to open connections", {
       F: __dxlog_file14,
-      L: 170,
+      L: 171,
       S: this,
       A: [
         "this._bridgeService",
@@ -3044,15 +3085,15 @@ var SimplePeerTransportProxyFactory = class {
 };
 var decodeError = (err) => {
   const message = typeof err === "string" ? err : err.message;
-  if (message.includes("ConnectionResetError")) {
+  if (message.includes("CONNECTION_RESET")) {
     return new ConnectionResetError3(message);
-  } else if (message.includes("TimeoutError")) {
+  } else if (message.includes("TIMEOUT")) {
     return new TimeoutError2(message);
-  } else if (message.includes("ProtocolError")) {
+  } else if (message.includes("PROTOCOL_ERROR")) {
     return new ProtocolError3(message);
-  } else if (message.includes("ConnectivityError")) {
+  } else if (message.includes("CONNECTIVITY_ERROR")) {
     return new ConnectivityError3(message);
-  } else if (message.includes("UnknownProtocolError")) {
+  } else if (message.includes("UNKNOWN_PROTOCOL_ERROR")) {
     return new UnknownProtocolError3(message);
   } else {
     return typeof err === "string" ? new Error(err) : err;
@@ -3398,6 +3439,26 @@ var createLibDataChannelTransportFactory = (webrtcConfig) => ({
   })
 });
 
+// packages/core/mesh/network-manager/src/transport/tcp-transport.browser.ts
+import { Event as Event11 } from "@dxos/async";
+import { ErrorStream as ErrorStream7 } from "@dxos/debug";
+var TcpTransportFactory = {
+  createTransport: () => new TcpTransport()
+};
+var TcpTransport = class {
+  constructor() {
+    this.closed = new Event11();
+    this.connected = new Event11();
+    this.errors = new ErrorStream7();
+  }
+  async destroy() {
+    throw new Error("Method not implemented.");
+  }
+  signal() {
+    throw new Error("Method not implemented.");
+  }
+};
+
 // packages/core/mesh/network-manager/src/wire-protocol.ts
 import { Teleport } from "@dxos/teleport";
 var createTeleportProtocolFactory = (onConnection) => {
@@ -3443,6 +3504,8 @@ export {
   SimplePeerTransportProxyFactory,
   LibDataChannelTransport,
   createLibDataChannelTransportFactory,
+  TcpTransportFactory,
+  TcpTransport,
   createTeleportProtocolFactory
 };
-//# sourceMappingURL=chunk-CNQ55TFQ.mjs.map
+//# sourceMappingURL=chunk-3KLH55NB.mjs.map