@dxos/client-services 0.6.12-main.15a606f → 0.6.12-main.78ddbdf

package/dist/lib/browser/testing/index.mjs

@@ -7,7 +7,7 @@ import {
   InvitationsManager,
   ServiceContext,
   SpaceInvitationProtocol
-} from "../chunk-BDGSOBZV.mjs";
+} from "../chunk-XSFLJVDP.mjs";
 
 // packages/sdk/client-services/src/packlets/testing/credential-utils.ts
 import { createCredential } from "@dxos/credentials";

package/dist/lib/node/{chunk-EBZ7KFXS.cjs → chunk-F3WGFGEN.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_EBZ7KFXS_exports = {};
-__export(chunk_EBZ7KFXS_exports, {
+var chunk_F3WGFGEN_exports = {};
+__export(chunk_F3WGFGEN_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -70,7 +70,7 @@ __export(chunk_EBZ7KFXS_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_EBZ7KFXS_exports);
+module.exports = __toCommonJS(chunk_F3WGFGEN_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -107,6 +107,7 @@ var import_proto = require("@dxos/protocols/proto");
 var import_cbor_x = require("cbor-x");
 var import_async6 = require("@dxos/async");
 var import_context3 = require("@dxos/context");
+var import_edge_client = require("@dxos/edge-client");
 var import_invariant2 = require("@dxos/invariant");
 var import_keys3 = require("@dxos/keys");
 var import_log3 = require("@dxos/log");
@@ -316,7 +317,7 @@ var import_util14 = require("@dxos/util");
 var import_async20 = require("@dxos/async");
 var import_client_protocol8 = require("@dxos/client-protocol");
 var import_context16 = require("@dxos/context");
-var import_edge_client = require("@dxos/edge-client");
+var import_edge_client2 = require("@dxos/edge-client");
 var import_invariant21 = require("@dxos/invariant");
 var import_keys16 = require("@dxos/keys");
 var import_log22 = require("@dxos/log");
@@ -702,7 +703,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.6.12-main.15a606f";
+var DXOS_VERSION = "0.6.12-main.78ddbdf";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -1081,7 +1082,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
     this._spaceId = spaceId;
   }
   async _open() {
-    this._ctx.onDispose(this._messenger.addListener(async (message) => {
+    this._ctx.onDispose(this._messenger.addListener((message) => {
       if (!message.serviceId) {
         return;
       }
@@ -1096,7 +1097,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
           _spaceId: this._spaceId
         }, {
           F: __dxlog_file5,
-          L: 62,
+          L: 66,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1109,20 +1110,54 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
         type: payload.type
       }, {
         F: __dxlog_file5,
-        L: 67,
+        L: 71,
         S: this,
         C: (f, a) => f(...a)
       });
       this._onMessage(payload);
     }));
-    this._connected = true;
-    this._connectionCtx = this._ctx.derive();
-    for (const feed of this._feeds.values()) {
-      await this._replicateFeed(feed);
-    }
+    this._messenger.connected.on(this._ctx, async () => {
+      await this._resetConnection();
+      this._connected = true;
+      const connectionCtx = new import_context3.Context({
+        onError: async (err) => {
+          if (connectionCtx !== this._connectionCtx) {
+            return;
+          }
+          if (err instanceof import_edge_client.EdgeIdentityChangedError || err instanceof import_edge_client.EdgeConnectionClosedError) {
+            (0, import_log3.log)("resetting on reconnect", void 0, {
+              F: __dxlog_file5,
+              L: 86,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+            await this._resetConnection();
+          } else {
+            this._ctx.raise(err);
+          }
+        }
+      }, {
+        F: __dxlog_file5,
+        L: 80
+      });
+      this._connectionCtx = connectionCtx;
+      (0, import_log3.log)("connection context created", void 0, {
+        F: __dxlog_file5,
+        L: 94,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      (0, import_async6.scheduleMicroTask)(connectionCtx, async () => {
+        for (const feed of this._feeds.values()) {
+          await this._replicateFeed(connectionCtx, feed);
+        }
+      });
+    });
   }
   async _close() {
-    this._connected = false;
+    await this._resetConnection();
+  }
+  async _resetConnection() {
     this._connected = false;
     await this._connectionCtx?.dispose();
     this._connectionCtx = void 0;
@@ -1133,37 +1168,37 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       key: feed.key
     }, {
       F: __dxlog_file5,
-      L: 89,
+      L: 115,
       S: this,
       C: (f, a) => f(...a)
     });
     this._feeds.set(feed.key, feed);
-    if (this._connected) {
-      await this._replicateFeed(feed);
+    if (this._connected && this._connectionCtx) {
+      await this._replicateFeed(this._connectionCtx, feed);
     }
   }
   _getPushMutex(key) {
     return (0, import_util3.defaultMap)(this._pushMutex, key, () => new import_async6.Mutex());
   }
-  async _replicateFeed(feed) {
-    (0, import_invariant2.invariant)(this._connectionCtx, void 0, {
-      F: __dxlog_file5,
-      L: 102,
-      S: this,
-      A: [
-        "this._connectionCtx",
-        ""
-      ]
-    });
+  async _replicateFeed(ctx, feed) {
     await this._sendMessage({
       type: "get-metadata",
       feedKey: feed.key.toHex()
     });
-    import_async6.Event.wrap(feed.core, "append").on(this._connectionCtx, async () => {
+    import_async6.Event.wrap(feed.core, "append").on(ctx, async () => {
       await this._pushBlocksIfNeeded(feed);
     });
   }
   async _sendMessage(message) {
+    if (!this._connectionCtx) {
+      import_log3.log.info("message dropped because connection was disposed", void 0, {
+        F: __dxlog_file5,
+        L: 140,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
     const logPayload = message.type === "data" ? {
       feedKey: message.feedKey,
       blocks: message.blocks.map((b) => b.index)
@@ -1172,13 +1207,13 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
     };
     import_log3.log.info("sending message", logPayload, {
       F: __dxlog_file5,
-      L: 117,
+      L: 146,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant2.invariant)(message.feedKey, void 0, {
       F: __dxlog_file5,
-      L: 119,
+      L: 148,
       S: this,
       A: [
         "message.feedKey",
@@ -1198,7 +1233,16 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
     }));
   }
   _onMessage(message) {
-    (0, import_async6.scheduleMicroTask)(this._ctx, async () => {
+    if (!this._connectionCtx) {
+      import_log3.log.warn("received message after connection context was disposed", void 0, {
+        F: __dxlog_file5,
+        L: 165,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
+    (0, import_async6.scheduleMicroTask)(this._connectionCtx, async () => {
       switch (message.type) {
         case "metadata": {
           try {
@@ -1207,7 +1251,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
               message
             }, {
               F: __dxlog_file5,
-              L: 138,
+              L: 171,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1218,7 +1262,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
                 feedKey
               }, {
                 F: __dxlog_file5,
-                L: 143,
+                L: 176,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1251,7 +1295,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
             blocks: message.blocks.map((b) => b.index)
           }, {
             F: __dxlog_file5,
-            L: 165,
+            L: 198,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1262,7 +1306,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
               feedKey
             }, {
               F: __dxlog_file5,
-              L: 170,
+              L: 203,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1276,7 +1320,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
             ...message
           }, {
             F: __dxlog_file5,
-            L: 179,
+            L: 212,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1291,7 +1335,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       to
     }, {
       F: __dxlog_file5,
-      L: 186,
+      L: 219,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1301,7 +1345,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       });
       (0, import_invariant2.invariant)(data instanceof Uint8Array, void 0, {
         F: __dxlog_file5,
-        L: 191,
+        L: 224,
         S: this,
         A: [
           "data instanceof Uint8Array",
@@ -1329,7 +1373,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       blocks: blocks.length
     }, {
       F: __dxlog_file5,
-      L: 212,
+      L: 245,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1347,11 +1391,11 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
   async _pushBlocksIfNeeded(feed) {
     try {
       var _usingCtx = _using_ctx();
-      const _guard = _usingCtx.u(await this._getPushMutex(feed.key).acquire());
+      const _ = _usingCtx.u(await this._getPushMutex(feed.key).acquire());
       if (!this._remoteLength.has(feed.key)) {
         (0, import_log3.log)("blocks not pushed because remote length is unknown", void 0, {
           F: __dxlog_file5,
-          L: 233,
+          L: 266,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -7421,7 +7465,7 @@ var ClientServicesHost = class {
     const edgeEndpoint = config?.get("runtime.services.edge.url");
     if (edgeEndpoint) {
       const randomKey = import_keys16.PublicKey.random().toHex();
-      this._edgeConnection = new import_edge_client.EdgeClient(randomKey, randomKey, {
+      this._edgeConnection = new import_edge_client2.EdgeClient(randomKey, randomKey, {
         socketEndpoint: edgeEndpoint
       });
     }
@@ -7712,4 +7756,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-EBZ7KFXS.cjs.map
+//# sourceMappingURL=chunk-F3WGFGEN.cjs.map