@dxos/client-services 0.3.11-main.13264f1 → 0.3.11-main.1690b50

package/dist/lib/browser/{chunk-BRZQYU65.mjs → chunk-U3NZJDAP.mjs}

@@ -996,7 +996,7 @@ var IdentityManager = class {
         genesisFeedKey: spaceRecord.genesisFeedKey
       },
       swarmIdentity,
-      onNetworkConnection: () => {
+      onAuthorizedConnection: () => {
       },
       onAuthFailure: () => {
         log3.warn("auth failure", void 0, {
@@ -2563,7 +2563,7 @@ var getPlatform = () => {
 };
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.3.11-main.13264f1";
+var DXOS_VERSION = "0.3.11-main.1690b50";
 
 // packages/sdk/client-services/src/packlets/services/diagnostics.ts
 var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
@@ -2709,6 +2709,7 @@ import { AUTH_TIMEOUT as AUTH_TIMEOUT2 } from "@dxos/client-protocol";
 import { cancelWithContext as cancelWithContext2, Context as Context7 } from "@dxos/context";
 import { timed } from "@dxos/debug";
 import { createMappedFeedWriter } from "@dxos/echo-pipeline";
+import { failedInvariant } from "@dxos/invariant";
 import { PublicKey as PublicKey8 } from "@dxos/keys";
 import { log as log10 } from "@dxos/log";
 import { CancelledError, SystemError } from "@dxos/protocols";
@@ -2721,7 +2722,8 @@ import { ComplexSet as ComplexSet3 } from "@dxos/util";
 // packages/sdk/client-services/src/packlets/spaces/automerge-space-state.ts
 import { checkCredentialType } from "@dxos/credentials";
 var AutomergeSpaceState = class {
-  constructor() {
+  constructor(_onNewRoot) {
+    this._onNewRoot = _onNewRoot;
     this.rootUrl = void 0;
     this.lastEpoch = void 0;
   }
@@ -2732,6 +2734,7 @@ var AutomergeSpaceState = class {
     this.lastEpoch = credential;
     if (credential.subject.assertion.automergeRoot) {
       this.rootUrl = credential.subject.assertion.automergeRoot;
+      this._onNewRoot(this.rootUrl);
     }
   }
 };
@@ -3023,7 +3026,7 @@ var DataSpace = class {
     this._notarizationPlugin = new NotarizationPlugin();
     this._cache = void 0;
     // TODO(dmaretskyi): Move into Space?
-    this._automergeSpaceState = new AutomergeSpaceState();
+    this._automergeSpaceState = new AutomergeSpaceState((rootUrl) => this._onNewAutomergeRoot(rootUrl));
     this._state = SpaceState.CLOSED;
     /**
     * Error for _state === SpaceState.ERROR.
@@ -3052,7 +3055,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 137,
+      L: 138,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3099,7 +3102,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 189,
+      L: 190,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3117,7 +3120,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 203,
+      L: 204,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3149,7 +3152,7 @@ var DataSpace = class {
         if (err instanceof CancelledError) {
           log10("data pipeline initialization cancelled", err, {
             F: __dxlog_file12,
-            L: 236,
+            L: 237,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3157,7 +3160,7 @@ var DataSpace = class {
         }
         log10.error("Error initializing data pipeline", err, {
           F: __dxlog_file12,
-          L: 240,
+          L: 241,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3166,7 +3169,7 @@ var DataSpace = class {
           state: SpaceState[this._state]
         }, {
           F: __dxlog_file12,
-          L: 242,
+          L: 243,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3186,7 +3189,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 258,
+      L: 259,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3197,7 +3200,7 @@ var DataSpace = class {
     await cancelWithContext2(this._ctx, this._inner.dataPipeline.ensureEpochInitialized());
     log10("waiting for data pipeline to reach target timeframe", void 0, {
       F: __dxlog_file12,
-      L: 272,
+      L: 273,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3208,7 +3211,7 @@ var DataSpace = class {
     this.metrics.dataPipelineReady = /* @__PURE__ */ new Date();
     log10("data pipeline ready", void 0, {
       F: __dxlog_file12,
-      L: 281,
+      L: 282,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3218,7 +3221,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 285,
+      L: 286,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3234,7 +3237,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     log10("writable feeds created", void 0, {
       F: __dxlog_file12,
-      L: 301,
+      L: 302,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3291,6 +3294,40 @@ var DataSpace = class {
       await this._metadataStore.setWritableFeedKeys(this.key, this.inner.controlFeedKey, this.inner.dataFeedKey);
     }
   }
+  _onNewAutomergeRoot(rootUrl) {
+    log10.info("loading automerge root doc for space", {
+      space: this.key,
+      rootUrl
+    }, {
+      F: __dxlog_file12,
+      L: 368,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    const handle = this._automergeHost.repo.find(rootUrl);
+    queueMicrotask(async () => {
+      try {
+        await handle.whenReady();
+        const doc = handle.docSync() ?? failedInvariant();
+        if (!doc.experimental_spaceKey) {
+          handle.change((doc2) => {
+            doc2.experimental_spaceKey = this.key.toHex();
+          });
+        }
+      } catch (err) {
+        log10.warn("error loading automerge root doc", {
+          space: this.key,
+          rootUrl,
+          err
+        }, {
+          F: __dxlog_file12,
+          L: 381,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+    });
+  }
   // TODO(dmaretskyi): Use profile from signing context.
   async updateOwnProfile(profile) {
     const credential = await this._signingContext.credentialSigner.createCredential({
@@ -3374,7 +3411,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 450,
+      L: 470,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3633,12 +3670,15 @@ var DataSpaceManager = class {
     });
     const space = await this._constructSpace(metadata);
     const automergeRoot = this._automergeHost.repo.create();
+    automergeRoot.change((doc) => {
+      doc.experimental_spaceKey = spaceKey.toHex();
+    });
     const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, automergeRoot.url);
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
     invariant11(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file13,
-      L: 151,
+      L: 154,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -3656,13 +3696,13 @@ var DataSpaceManager = class {
       opts
     }, {
       F: __dxlog_file13,
-      L: 163,
+      L: 166,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant11(this._isOpen, "Not open.", {
       F: __dxlog_file13,
-      L: 164,
+      L: 167,
       S: this,
       A: [
         "this._isOpen",
@@ -3671,7 +3711,7 @@ var DataSpaceManager = class {
     });
     invariant11(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file13,
-      L: 165,
+      L: 168,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -3706,7 +3746,7 @@ var DataSpaceManager = class {
       metadata
     }, {
       F: __dxlog_file13,
-      L: 198,
+      L: 201,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3733,17 +3773,18 @@ var DataSpaceManager = class {
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
         credentialAuthenticator: deferFunction2(() => dataSpace.authVerifier.verifier)
       },
-      onNetworkConnection: (session) => {
+      onAuthorizedConnection: (session) => {
         session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
           remotePeerId: session.remotePeerId
         }));
         session.addExtension("dxos.mesh.teleport.notarization", dataSpace.notarizationPlugin.createExtension());
+        this._automergeHost.authorizeDevice(space.key, session.remotePeerId);
         session.addExtension("dxos.mesh.teleport.automerge", this._automergeHost.createExtension());
       },
       onAuthFailure: () => {
         log11.warn("auth failure", void 0, {
           F: __dxlog_file13,
-          L: 234,
+          L: 238,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3767,7 +3808,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 252,
+            L: 256,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3779,7 +3820,7 @@ var DataSpaceManager = class {
             open: this._isOpen
           }, {
             F: __dxlog_file13,
-            L: 259,
+            L: 263,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3792,7 +3833,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 265,
+            L: 269,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5222,4 +5263,4 @@ export {
   createDefaultModelFactory,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-BRZQYU65.mjs.map
+//# sourceMappingURL=chunk-U3NZJDAP.mjs.map