@dxos/network-manager 0.3.8-next.f4e0086 → 0.3.9-main.1d6fb54

package/dist/lib/browser/{chunk-UKYZHA5S.mjs → chunk-4HITD6WI.mjs}

@@ -10,7 +10,7 @@ import { ErrorStream } from "@dxos/debug";
 import { invariant } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
 import { log } from "@dxos/log";
-import { CancelledError, ProtocolError, ConnectionResetError, ConnectivityError, UnknownProtocolError, trace } from "@dxos/protocols";
+import { CancelledError, ProtocolError, ConnectionResetError, ConnectivityError, TimeoutError, UnknownProtocolError, trace } from "@dxos/protocols";
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -98,7 +98,7 @@ var Connection = class {
       initiator: this.initiator
     }, {
       F: __dxlog_file,
-      L: 129,
+      L: 130,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -118,7 +118,7 @@ var Connection = class {
   async openConnection() {
     invariant(this._state === ConnectionState.INITIAL, "Invalid state.", {
       F: __dxlog_file,
-      L: 154,
+      L: 155,
       S: this,
       A: [
         "this._state === ConnectionState.INITIAL",
@@ -129,7 +129,7 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 155,
+      L: 156,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -141,7 +141,7 @@ var Connection = class {
       initiator: this.initiator
     }, {
       F: __dxlog_file,
-      L: 156,
+      L: 157,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -152,24 +152,24 @@ var Connection = class {
     this._protocol.stream.on("close", () => {
       log("protocol stream closed", void 0, {
         F: __dxlog_file,
-        L: 173,
+        L: 174,
         S: this,
         C: (f, a) => f(...a)
       });
       this.close(new ProtocolError("protocol stream closed")).catch((err) => this.errors.raise(err));
     });
     scheduleTask(this.connectedTimeoutContext, async () => {
-      log.info("timeout waiting for transport to connect, aborting", void 0, {
+      log.info(`timeout waiting ${TRANSPORT_CONNECTION_TIMEOUT / 1e3}s for transport to connect, aborting`, void 0, {
         F: __dxlog_file,
-        L: 180,
+        L: 181,
         S: this,
         C: (f, a) => f(...a)
       });
-      await this.abort().catch((err) => this.errors.raise(err));
+      await this.abort(new TimeoutError(`${TRANSPORT_CONNECTION_TIMEOUT / 1e3}s for transport to connect`)).catch((err) => this.errors.raise(err));
     }, TRANSPORT_CONNECTION_TIMEOUT);
     invariant(!this._transport, void 0, {
       F: __dxlog_file,
-      L: 186,
+      L: 189,
       S: this,
       A: [
         "!this._transport",
@@ -190,7 +190,7 @@ var Connection = class {
       this._transport = void 0;
       log("abort triggered by transport close", void 0, {
         F: __dxlog_file,
-        L: 201,
+        L: 204,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -201,7 +201,7 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 206,
+        L: 209,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -211,7 +211,7 @@ var Connection = class {
       if (err instanceof ConnectionResetError) {
         log.info("aborting due to transport ConnectionResetError", void 0, {
           F: __dxlog_file,
-          L: 213,
+          L: 216,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -219,7 +219,7 @@ var Connection = class {
       } else if (err instanceof ConnectivityError) {
         log.info("aborting due to transport ConnectivityError", void 0, {
           F: __dxlog_file,
-          L: 216,
+          L: 219,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -229,7 +229,7 @@ var Connection = class {
           err
         }, {
           F: __dxlog_file,
-          L: 219,
+          L: 222,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -247,7 +247,7 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 235,
+      L: 238,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -257,14 +257,14 @@ var Connection = class {
       err
     }, {
       F: __dxlog_file,
-      L: 242,
+      L: 245,
       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: 244,
+        L: 247,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -279,7 +279,7 @@ var Connection = class {
     try {
       log("aborting protocol... ", void 0, {
         F: __dxlog_file,
-        L: 258,
+        L: 261,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -287,7 +287,7 @@ var Connection = class {
     } catch (err2) {
       log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 261,
+        L: 264,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -297,7 +297,7 @@ var Connection = class {
     } catch (err2) {
       log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 268,
+        L: 271,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -307,7 +307,7 @@ var Connection = class {
     } catch (err2) {
       log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 274,
+        L: 277,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -331,7 +331,7 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 299,
+      L: 302,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -341,7 +341,7 @@ var Connection = class {
       } catch (err2) {
         log.catch(err2, void 0, {
           F: __dxlog_file,
-          L: 306,
+          L: 309,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -351,7 +351,34 @@ var Connection = class {
       } catch (err2) {
         log.catch(err2, void 0, {
           F: __dxlog_file,
-          L: 313,
+          L: 316,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+    } else {
+      log.info(`graceful close requested when we were in ${lastState} state? aborting`, void 0, {
+        F: __dxlog_file,
+        L: 319,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      try {
+        await this._protocol.abort();
+      } catch (err2) {
+        log.catch(err2, void 0, {
+          F: __dxlog_file,
+          L: 323,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+      try {
+        await this._transport?.destroy();
+      } catch (err2) {
+        log.catch(err2, void 0, {
+          F: __dxlog_file,
+          L: 328,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -361,7 +388,7 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 317,
+      L: 332,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -404,7 +431,7 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 355,
+        L: 370,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -417,7 +444,7 @@ var Connection = class {
   async signal(msg) {
     invariant(msg.sessionId, void 0, {
       F: __dxlog_file,
-      L: 364,
+      L: 379,
       S: this,
       A: [
         "msg.sessionId",
@@ -427,7 +454,7 @@ var Connection = class {
     if (!msg.sessionId.equals(this.sessionId)) {
       log("dropping signal for incorrect session id", void 0, {
         F: __dxlog_file,
-        L: 366,
+        L: 381,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -435,7 +462,7 @@ var Connection = class {
     }
     invariant(msg.data.signal || msg.data.signalBatch, void 0, {
       F: __dxlog_file,
-      L: 369,
+      L: 384,
       S: this,
       A: [
         "msg.data.signal || msg.data.signalBatch",
@@ -444,7 +471,7 @@ var Connection = class {
     });
     invariant(msg.author?.equals(this.remoteId), void 0, {
       F: __dxlog_file,
-      L: 370,
+      L: 385,
       S: this,
       A: [
         "msg.author?.equals(this.remoteId)",
@@ -453,7 +480,7 @@ var Connection = class {
     });
     invariant(msg.recipient?.equals(this.ownId), void 0, {
       F: __dxlog_file,
-      L: 371,
+      L: 386,
       S: this,
       A: [
         "msg.recipient?.equals(this.ownId)",
@@ -477,7 +504,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 380,
+          L: 395,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -485,7 +512,7 @@ var Connection = class {
       } else {
         invariant(this._transport, "Connection not ready to accept signals.", {
           F: __dxlog_file,
-          L: 383,
+          L: 398,
           S: this,
           A: [
             "this._transport",
@@ -498,7 +525,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 384,
+          L: 399,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -516,13 +543,13 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 395,
+      L: 410,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant(state !== this._state, "Already in this state.", {
       F: __dxlog_file,
-      L: 396,
+      L: 411,
       S: this,
       A: [
         "state !== this._state",
@@ -545,7 +572,7 @@ import { Context as Context2 } from "@dxos/context";
 import { invariant as invariant2 } from "@dxos/invariant";
 import { PublicKey as PublicKey2 } from "@dxos/keys";
 import { log as log2 } from "@dxos/log";
-import { schema, TimeoutError } from "@dxos/protocols";
+import { schema, TimeoutError as TimeoutError2 } from "@dxos/protocols";
 import { ComplexMap } from "@dxos/util";
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/signal/swarm-messenger.ts";
 var SwarmMessage = schema.getCodecForType("dxos.mesh.swarm.SwarmMessage");
@@ -730,7 +757,7 @@ var SwarmMessenger = class {
         }
       });
     } catch (err) {
-      if (err instanceof TimeoutError) {
+      if (err instanceof TimeoutError2) {
         log2.info("timeout sending answer to offer", {
           err
         }, {
@@ -1930,6 +1957,7 @@ import { Event as Event5 } from "@dxos/async";
 import { raise } from "@dxos/debug";
 import { PublicKey as PublicKey7 } from "@dxos/keys";
 import { ComplexMap as ComplexMap5 } from "@dxos/util";
+var CONNECTION_GC_THRESHOLD = 1e3 * 60 * 15;
 var EventType;
 (function(EventType2) {
   EventType2["CONNECTION_STATE_CHANGED"] = "CONNECTION_STATE_CHANGED";
@@ -1970,13 +1998,15 @@ var ConnectionLog = class {
         sessionId: connection.sessionId,
         transport: connection.transport && Object.getPrototypeOf(connection.transport).constructor.name,
         protocolExtensions: [],
-        events: []
+        events: [],
+        lastUpdate: /* @__PURE__ */ new Date()
       };
       info.connections.push(connectionInfo);
       this.update.emit();
       connection.stateChanged.on((state) => {
         connectionInfo.state = state;
         connectionInfo.closeReason = connection.closeReason;
+        connectionInfo.lastUpdate = /* @__PURE__ */ new Date();
         connectionInfo.events.push({
           type: EventType.CONNECTION_STATE_CHANGED,
           newState: state
@@ -1987,8 +2017,10 @@ var ConnectionLog = class {
         connectionInfo.readBufferSize = stats.readBufferSize;
         connectionInfo.writeBufferSize = stats.writeBufferSize;
         connectionInfo.streams = stats.channels;
+        connectionInfo.lastUpdate = /* @__PURE__ */ new Date();
         this.update.emit();
       });
+      gcSwarm(info);
     });
   }
   leftSwarm(swarm) {
@@ -1996,6 +2028,11 @@ var ConnectionLog = class {
     this.update.emit();
   }
 };
+var gcSwarm = (swarm) => {
+  swarm.connections = swarm.connections?.filter((connection) => {
+    return connection.lastUpdate ? Date.now() - connection.lastUpdate.getTime() < CONNECTION_GC_THRESHOLD : true;
+  });
+};
 
 // packages/core/mesh/network-manager/src/network-manager.ts
 import { Event as Event6 } from "@dxos/async";
@@ -2771,12 +2808,20 @@ var SimplePeerTransport = class {
         if (err.errorDetail === "sctp-failure") {
           this.errors.raise(new ConnectionResetError2("sctp-failure from RTCError", err));
         } else {
+          log11.info("unknown RTCError", {
+            err
+          }, {
+            F: __dxlog_file12,
+            L: 74,
+            S: this,
+            C: (f, a) => f(...a)
+          });
           this.errors.raise(new UnknownProtocolError2("unknown RTCError", err));
         }
       } else if ("code" in err) {
         log11.info("simple-peer error", err, {
           F: __dxlog_file12,
-          L: 78,
+          L: 79,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2784,10 +2829,12 @@ var SimplePeerTransport = class {
           case "ERR_WEBRTC_SUPPORT":
             this.errors.raise(new ProtocolError2("WebRTC not supported", err));
             break;
+          case "ERR_SIGNALING":
+            this.errors.raise(new ConnectivityError2("signaling failure", 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":
@@ -2804,7 +2851,7 @@ var SimplePeerTransport = class {
       } else {
         log11.info("unknown peer connection error", err, {
           F: __dxlog_file12,
-          L: 102,
+          L: 105,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2818,7 +2865,7 @@ var SimplePeerTransport = class {
               stats
             }, {
               F: __dxlog_file12,
-              L: 110,
+              L: 113,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2827,7 +2874,7 @@ var SimplePeerTransport = class {
       } catch (err2) {
         log11.catch(err2, void 0, {
           F: __dxlog_file12,
-          L: 117,
+          L: 120,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2838,7 +2885,7 @@ var SimplePeerTransport = class {
       id: this._instanceId
     }), {
       F: __dxlog_file12,
-      L: 122,
+      L: 125,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2846,7 +2893,7 @@ var SimplePeerTransport = class {
   async destroy() {
     log11("closing...", void 0, {
       F: __dxlog_file12,
-      L: 126,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2859,7 +2906,7 @@ var SimplePeerTransport = class {
     this.closed.emit();
     log11("closed", void 0, {
       F: __dxlog_file12,
-      L: 134,
+      L: 137,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3032,7 +3079,7 @@ import { ErrorStream as ErrorStream5 } from "@dxos/debug";
 import { invariant as invariant13 } from "@dxos/invariant";
 import { PublicKey as PublicKey12 } from "@dxos/keys";
 import { log as log13 } from "@dxos/log";
-import { ConnectionResetError as ConnectionResetError3, TimeoutError as TimeoutError2, ProtocolError as ProtocolError3, ConnectivityError as ConnectivityError3, UnknownProtocolError as UnknownProtocolError3 } from "@dxos/protocols";
+import { ConnectionResetError as ConnectionResetError3, TimeoutError as TimeoutError3, ProtocolError as ProtocolError3, ConnectivityError as ConnectivityError3, UnknownProtocolError as UnknownProtocolError3 } from "@dxos/protocols";
 import { ConnectionState as ConnectionState4 } from "@dxos/protocols/proto/dxos/mesh/bridge";
 import { arrayToBuffer } from "@dxos/util";
 var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/simplepeer-transport-proxy.ts";
@@ -3088,9 +3135,9 @@ var SimplePeerTransportProxy = class {
             }
             this._timeoutCount = 0;
           }, (err) => {
-            if (err instanceof TimeoutError2 || err.constructor.name === "TimeoutError") {
+            if (err instanceof TimeoutError3 || err.constructor.name === "TimeoutError") {
               if (this._timeoutCount++ > TIMEOUT_THRESHOLD) {
-                throw new TimeoutError2(`too many timeoutes (${this._timeoutCount} > ${TIMEOUT_THRESHOLD}`);
+                throw new TimeoutError3(`too many timeoutes (${this._timeoutCount} > ${TIMEOUT_THRESHOLD}`);
               } else {
                 log13("timeout error, but still invoking callback", void 0, {
                   F: __dxlog_file14,
@@ -3227,7 +3274,7 @@ var decodeError = (err) => {
   if (message.includes("CONNECTION_RESET")) {
     return new ConnectionResetError3(message);
   } else if (message.includes("TIMEOUT")) {
-    return new TimeoutError2(message);
+    return new TimeoutError3(message);
   } else if (message.includes("PROTOCOL_ERROR")) {
     return new ProtocolError3(message);
   } else if (message.includes("CONNECTIVITY_ERROR")) {
@@ -3407,16 +3454,21 @@ var LibDataChannelTransport = class {
       const duplex = new Duplex2({
         read: () => {
         },
-        write: (chunk, encoding, callback) => {
+        write: async (chunk, encoding, callback) => {
           if (chunk.length > MAX_MESSAGE_SIZE) {
             this.errors.raise(new Error(`message too large: ${chunk.length} > ${MAX_MESSAGE_SIZE}`));
           }
-          dataChannel.send(chunk);
+          try {
+            dataChannel.send(chunk);
+          } catch (err) {
+            this.errors.raise(err);
+            await this._close();
+          }
           if (this._channel.bufferedAmount > MAX_BUFFERED_AMOUNT) {
             if (this._writeCallback !== null) {
               log14.error("consumer trying to write before we're ready for more data", void 0, {
                 F: __dxlog_file15,
-                L: 139,
+                L: 143,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -3441,7 +3493,7 @@ var LibDataChannelTransport = class {
         err
       }, {
         F: __dxlog_file15,
-        L: 159,
+        L: 163,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3478,7 +3530,7 @@ var LibDataChannelTransport = class {
               peer
             }, {
               F: __dxlog_file15,
-              L: 194,
+              L: 198,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3506,7 +3558,7 @@ var LibDataChannelTransport = class {
               err
             }, {
               F: __dxlog_file15,
-              L: 205,
+              L: 209,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3526,7 +3578,7 @@ var LibDataChannelTransport = class {
               err
             }, {
               F: __dxlog_file15,
-              L: 216,
+              L: 220,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3545,7 +3597,7 @@ var LibDataChannelTransport = class {
             signal
           }, {
             F: __dxlog_file15,
-            L: 227,
+            L: 231,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3554,7 +3606,7 @@ var LibDataChannelTransport = class {
     }).catch((err) => {
       log14.catch(err, void 0, {
         F: __dxlog_file15,
-        L: 232,
+        L: 236,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3647,4 +3699,4 @@ export {
   TcpTransport,
   createTeleportProtocolFactory
 };
-//# sourceMappingURL=chunk-UKYZHA5S.mjs.map
+//# sourceMappingURL=chunk-4HITD6WI.mjs.map