@dxos/echo-pipeline 0.6.14-staging.e15392e → 0.7.0

package/dist/lib/browser/index.mjs

@@ -3028,7 +3028,10 @@ var EchoHost = class extends Resource9 {
       version: SpaceDocVersion3.CURRENT,
       access: {
         spaceKey: spaceKey.toHex()
-      }
+      },
+      // Better to initialize them right away to avoid merge conflicts and data loss that can occur if those maps get created on the fly.
+      objects: {},
+      links: {}
     });
     await this._automergeHost.flush({
       documentIds: [
@@ -3041,7 +3044,7 @@ var EchoHost = class extends Resource9 {
   async openSpaceRoot(spaceId, automergeUrl) {
     invariant11(this._lifecycleState === LifecycleState4.OPEN, void 0, {
       F: __dxlog_file15,
-      L: 221,
+      L: 225,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -3111,7 +3114,7 @@ var findInlineObjectOfType = (spaceDoc, typename) => {
 };
 
 // packages/core/echo/echo-pipeline/src/edge/echo-edge-replicator.ts
-import { Mutex, scheduleTask as scheduleTask2 } from "@dxos/async";
+import { Mutex, scheduleTask as scheduleTask2, scheduleMicroTask } from "@dxos/async";
 import * as A5 from "@dxos/automerge/automerge";
 import { cbor as cbor2 } from "@dxos/automerge/automerge-repo";
 import { Context as Context6, Resource as Resource10 } from "@dxos/context";
@@ -3214,30 +3217,30 @@ var EchoEdgeReplicator = class {
       F: __dxlog_file16,
       L: 63
     });
-    this._edgeConnection.reconnect.on(this._ctx, async () => {
-      try {
-        var _usingCtx = _using_ctx();
-        const _guard = _usingCtx.u(await this._mutex.acquire());
-        const spaces = [
-          ...this._connectedSpaces
-        ];
-        for (const connection of this._connections.values()) {
-          await connection.close();
-        }
-        this._connections.clear();
-        if (this._context !== null) {
-          for (const spaceId of spaces) {
-            await this._openConnection(spaceId);
-          }
+    this._ctx.onDispose(this._edgeConnection.onReconnected(() => {
+      this._ctx && scheduleMicroTask(this._ctx, () => this._handleReconnect());
+    }));
+  }
+  async _handleReconnect() {
+    try {
+      var _usingCtx = _using_ctx();
+      const _guard = _usingCtx.u(await this._mutex.acquire());
+      const spaces = [
+        ...this._connectedSpaces
+      ];
+      for (const connection of this._connections.values()) {
+        await connection.close();
+      }
+      this._connections.clear();
+      if (this._context !== null) {
+        for (const spaceId of spaces) {
+          await this._openConnection(spaceId);
         }
-      } catch (_) {
-        _usingCtx.e = _;
-      } finally {
-        _usingCtx.d();
       }
-    });
-    for (const spaceId of this._connectedSpaces) {
-      await this._openConnection(spaceId);
+    } catch (_) {
+      _usingCtx.e = _;
+    } finally {
+      _usingCtx.d();
     }
   }
   async disconnect() {
@@ -3288,7 +3291,7 @@ var EchoEdgeReplicator = class {
   async _openConnection(spaceId, reconnects = 0) {
     invariant12(this._context, void 0, {
       F: __dxlog_file16,
-      L: 119,
+      L: 121,
       S: this,
       A: [
         "this._context",
@@ -3297,7 +3300,7 @@ var EchoEdgeReplicator = class {
     });
     invariant12(!this._connections.has(spaceId), void 0, {
       F: __dxlog_file16,
-      L: 120,
+      L: 122,
       S: this,
       A: [
         "!this._connections.has(spaceId)",
@@ -3327,7 +3330,7 @@ var EchoEdgeReplicator = class {
           restartDelay
         }, {
           F: __dxlog_file16,
-          L: 143,
+          L: 145,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3385,11 +3388,11 @@ var EdgeReplicatorConnection = class extends Resource10 {
   async _open(ctx) {
     log11("open", void 0, {
       F: __dxlog_file16,
-      L: 237,
+      L: 239,
       S: this,
       C: (f, a) => f(...a)
     });
-    this._ctx.onDispose(this._edgeConnection.addListener((msg) => {
+    this._ctx.onDispose(this._edgeConnection.onMessage((msg) => {
       this._onMessage(msg);
     }));
     await this._onRemoteConnected();
@@ -3397,7 +3400,7 @@ var EdgeReplicatorConnection = class extends Resource10 {
   async _close() {
     log11("close", void 0, {
       F: __dxlog_file16,
-      L: 249,
+      L: 251,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3407,7 +3410,7 @@ var EdgeReplicatorConnection = class extends Resource10 {
   get peerId() {
     invariant12(this._remotePeerId, "Not connected", {
       F: __dxlog_file16,
-      L: 255,
+      L: 257,
       S: this,
       A: [
         "this._remotePeerId",
@@ -3447,7 +3450,7 @@ var EdgeReplicatorConnection = class extends Resource10 {
       };
     }, {
       F: __dxlog_file16,
-      L: 286,
+      L: 288,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3470,7 +3473,7 @@ var EdgeReplicatorConnection = class extends Resource10 {
       documentId: message.documentId
     }, {
       F: __dxlog_file16,
-      L: 316,
+      L: 318,
       S: this,
       C: (f, a) => f(...a)
     });