@dxos/client-services 0.3.11-main.a757f8c → 0.3.11-main.a8c932f

package/dist/lib/browser/{chunk-VO55YITH.mjs → chunk-NVEOTS4E.mjs}

@@ -996,7 +996,7 @@ var IdentityManager = class {
         genesisFeedKey: spaceRecord.genesisFeedKey
       },
       swarmIdentity,
-      onNetworkConnection: () => {
+      onAuthorizedConnection: () => {
       },
       onAuthFailure: () => {
         log3.warn("auth failure", void 0, {
@@ -2533,29 +2533,32 @@ import { invariant as invariant9 } from "@dxos/invariant";
 import { log as log8 } from "@dxos/log";
 import { STORAGE_VERSION } from "@dxos/protocols";
 import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
+import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
+import { Platform } from "@dxos/protocols/proto/dxos/client/services";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
       const { userAgent } = window.navigator;
       return {
-        type: "browser",
+        type: Platform.PLATFORM_TYPE.BROWSER,
         userAgent,
         uptime: Math.floor((Date.now() - window.performance.timeOrigin) / 1e3)
       };
     } else {
       return {
-        type: "shared-worker",
+        type: Platform.PLATFORM_TYPE.SHARED_WORKER,
         uptime: Math.floor((Date.now() - performance.timeOrigin) / 1e3)
       };
     }
   } else {
     const { platform: platform2, version, arch } = process;
     return {
-      type: "node",
-      platform: `${platform2} ${version} ${arch}`,
-      runtime: process.version,
+      type: Platform.PLATFORM_TYPE.NODE,
+      platform: platform2,
+      arch,
+      runtime: version,
       uptime: Math.floor(process.uptime()),
       memory: process.memoryUsage()
     };
@@ -2563,7 +2566,7 @@ var getPlatform = () => {
 };
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.3.11-main.a757f8c";
+var DXOS_VERSION = "0.3.11-main.a8c932f";
 
 // 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";
@@ -2577,12 +2580,13 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
       storage: {
         version: STORAGE_VERSION
       }
-    }
+    },
+    trace: TRACE_PROCESSOR.getDiagnostics()
   };
   {
     invariant9(clientServices.LoggingService, "SystemService is not available.", {
       F: __dxlog_file10,
-      L: 93,
+      L: 111,
       S: void 0,
       A: [
         "clientServices.LoggingService",
@@ -2648,7 +2652,7 @@ var getProperties = (space) => {
   } catch (err) {
     log8.warn(err.message, void 0, {
       F: __dxlog_file10,
-      L: 178,
+      L: 196,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -2704,11 +2708,12 @@ var getSpaceStats = async (space) => {
 };
 
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
-import { Event as Event5, scheduleTask as scheduleTask4, sleep as sleep2, synchronized, trackLeaks } from "@dxos/async";
+import { Event as Event5, asyncTimeout, scheduleTask as scheduleTask4, sleep as sleep2, synchronized, trackLeaks } from "@dxos/async";
 import { AUTH_TIMEOUT as AUTH_TIMEOUT2 } from "@dxos/client-protocol";
-import { cancelWithContext as cancelWithContext2, Context as Context7 } from "@dxos/context";
+import { cancelWithContext as cancelWithContext2, Context as Context7, ContextDisposedError } 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 +2726,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 +2738,7 @@ var AutomergeSpaceState = class {
     this.lastEpoch = credential;
     if (credential.subject.assertion.automergeRoot) {
       this.rootUrl = credential.subject.assertion.automergeRoot;
+      this._onNewRoot(this.rootUrl);
     }
   }
 };
@@ -3023,7 +3030,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 +3059,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 137,
+      L: 141,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3085,6 +3092,12 @@ var DataSpace = class {
   get automergeSpaceState() {
     return this._automergeSpaceState;
   }
+  get _automergeInfo() {
+    return {
+      rootUrl: this._automergeSpaceState.rootUrl,
+      lastEpoch: this._automergeSpaceState.lastEpoch
+    };
+  }
   async open() {
     await this._open();
   }
@@ -3099,7 +3112,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 189,
+      L: 203,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3117,7 +3130,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 203,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3146,10 +3159,10 @@ var DataSpace = class {
         this.metrics.pipelineInitBegin = /* @__PURE__ */ new Date();
         await this.initializeDataPipeline();
       } catch (err) {
-        if (err instanceof CancelledError) {
+        if (err instanceof CancelledError || err instanceof ContextDisposedError) {
           log10("data pipeline initialization cancelled", err, {
             F: __dxlog_file12,
-            L: 236,
+            L: 250,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3157,7 +3170,7 @@ var DataSpace = class {
         }
         log10.error("Error initializing data pipeline", err, {
           F: __dxlog_file12,
-          L: 240,
+          L: 254,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3166,7 +3179,7 @@ var DataSpace = class {
           state: SpaceState[this._state]
         }, {
           F: __dxlog_file12,
-          L: 242,
+          L: 256,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3186,7 +3199,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 258,
+      L: 272,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3197,7 +3210,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: 286,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3208,7 +3221,7 @@ var DataSpace = class {
     this.metrics.dataPipelineReady = /* @__PURE__ */ new Date();
     log10("data pipeline ready", void 0, {
       F: __dxlog_file12,
-      L: 281,
+      L: 295,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3218,7 +3231,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 285,
+      L: 299,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3234,7 +3247,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     log10("writable feeds created", void 0, {
       F: __dxlog_file12,
-      L: 301,
+      L: 315,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3291,6 +3304,40 @@ var DataSpace = class {
       await this._metadataStore.setWritableFeedKeys(this.key, this.inner.controlFeedKey, this.inner.dataFeedKey);
     }
   }
+  _onNewAutomergeRoot(rootUrl) {
+    log10("loading automerge root doc for space", {
+      space: this.key,
+      rootUrl
+    }, {
+      F: __dxlog_file12,
+      L: 381,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    const handle = this._automergeHost.repo.find(rootUrl);
+    queueMicrotask(async () => {
+      try {
+        await asyncTimeout(handle.whenReady(), 5e3);
+        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: 394,
+          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,13 +3421,29 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 450,
+      L: 483,
       S: this,
       C: (f, a) => f(...a)
     });
     this.stateUpdate.emit();
   }
 };
+_ts_decorate4([
+  trace6.info()
+], DataSpace.prototype, "_inner", void 0);
+_ts_decorate4([
+  trace6.info()
+], DataSpace.prototype, "key", null);
+_ts_decorate4([
+  trace6.info({
+    enum: SpaceState
+  })
+], DataSpace.prototype, "state", null);
+_ts_decorate4([
+  trace6.info({
+    depth: null
+  })
+], DataSpace.prototype, "_automergeInfo", null);
 _ts_decorate4([
   synchronized
 ], DataSpace.prototype, "open", null);
@@ -3407,7 +3470,8 @@ _ts_decorate4([
   synchronized
 ], DataSpace.prototype, "deactivate", null);
 DataSpace = _ts_decorate4([
-  trackLeaks("open", "close")
+  trackLeaks("open", "close"),
+  trace6.resource()
 ], DataSpace);
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
@@ -3633,12 +3697,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 +3723,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 +3738,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 +3773,7 @@ var DataSpaceManager = class {
       metadata
     }, {
       F: __dxlog_file13,
-      L: 198,
+      L: 201,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3733,17 +3800,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 +3835,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 252,
+            L: 256,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3779,7 +3847,7 @@ var DataSpaceManager = class {
             open: this._isOpen
           }, {
             F: __dxlog_file13,
-            L: 259,
+            L: 263,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3792,7 +3860,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 265,
+            L: 269,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4348,7 +4416,7 @@ var ServiceRegistry = class {
 };
 
 // packages/sdk/client-services/src/packlets/locks/browser.ts
-import { asyncTimeout, Trigger as Trigger6 } from "@dxos/async";
+import { asyncTimeout as asyncTimeout2, Trigger as Trigger6 } from "@dxos/async";
 import { RESOURCE_LOCK_TIMEOUT } from "@dxos/client-protocol";
 import { log as log14, logInfo } from "@dxos/log";
 function _ts_decorate7(decorators, target, key, desc) {
@@ -4389,7 +4457,7 @@ var Lock = class {
         S: this,
         C: (f, a) => f(...a)
       });
-      await asyncTimeout(this._requestLock(), RESOURCE_LOCK_TIMEOUT);
+      await asyncTimeout2(this._requestLock(), RESOURCE_LOCK_TIMEOUT);
       log14("acquired lock", void 0, {
         F: __dxlog_file16,
         L: 44,
@@ -4536,7 +4604,7 @@ import { createSimplePeerTransportFactory, NetworkManager } from "@dxos/network-
 import { trace as trace9 } from "@dxos/protocols";
 import { SystemStatus } from "@dxos/protocols/proto/dxos/client/services";
 import { TextModel } from "@dxos/text-model";
-import { TRACE_PROCESSOR, trace as Trace3 } from "@dxos/tracing";
+import { TRACE_PROCESSOR as TRACE_PROCESSOR2, trace as Trace3 } from "@dxos/tracing";
 import { WebsocketRpcClient } from "@dxos/websocket-rpc";
 
 // packages/sdk/client-services/src/packlets/devices/devices-service.ts
@@ -4712,6 +4780,7 @@ var NetworkServiceImpl = class {
       const update = () => {
         next({
           swarm: this.networkManager.connectionState,
+          connectionInfo: this.networkManager.connectionLog?.swarms,
           signaling: this.signalManager.getStatus().map(({ host, state }) => ({
             server: host,
             state
@@ -4761,6 +4830,9 @@ var SystemServiceImpl = class {
       })))
     };
   }
+  async getPlatform() {
+    return getPlatform();
+  }
   async updateStatus({ status }) {
     await this._onUpdateStatus(status);
   }
@@ -4824,7 +4896,7 @@ var ClientServicesHost = class {
     lockKey,
     callbacks
   } = {}) {
-    this._tracingService = TRACE_PROCESSOR.createTraceSender();
+    this._tracingService = TRACE_PROCESSOR2.createTraceSender();
     this._statusUpdate = new Event8();
     this._opening = false;
     this._open = false;
@@ -5222,4 +5294,4 @@ export {
   createDefaultModelFactory,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-VO55YITH.mjs.map
+//# sourceMappingURL=chunk-NVEOTS4E.mjs.map