@dxos/client-services 0.5.3-main.f9b873d → 0.5.3-main.fffc127

package/dist/lib/browser/{chunk-ZGHJHSHA.mjs → chunk-OYIJIAJI.mjs}

@@ -3307,18 +3307,16 @@ ClientRpcServer = _ts_decorate3([
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
 import { Event as Event6, asyncTimeout, scheduleTask as scheduleTask5, sleep as sleep2, synchronized, trackLeaks } from "@dxos/async";
 import { AUTH_TIMEOUT as AUTH_TIMEOUT2 } from "@dxos/client-protocol";
-import { cancelWithContext as cancelWithContext4, Context as Context8, ContextDisposedError as ContextDisposedError3 } from "@dxos/context";
+import { Context as Context8, ContextDisposedError as ContextDisposedError3, cancelWithContext as cancelWithContext4 } from "@dxos/context";
 import { timed, warnAfterTimeout } from "@dxos/debug";
-import { createMappedFeedWriter } from "@dxos/echo-pipeline";
-import { AutomergeDocumentLoaderImpl } from "@dxos/echo-pipeline";
+import { AutomergeDocumentLoaderImpl, createMappedFeedWriter } from "@dxos/echo-pipeline";
 import { TYPE_PROPERTIES } from "@dxos/echo-schema";
 import { failedInvariant, invariant as invariant12 } from "@dxos/invariant";
 import { PublicKey as PublicKey10 } from "@dxos/keys";
 import { log as log11 } from "@dxos/log";
 import { CancelledError, SystemError } from "@dxos/protocols";
-import { SpaceState, CreateEpochRequest } from "@dxos/protocols/proto/dxos/client/services";
-import { SpaceMember as SpaceMember3 } from "@dxos/protocols/proto/dxos/halo/credentials";
-import { AdmittedFeed as AdmittedFeed3 } from "@dxos/protocols/proto/dxos/halo/credentials";
+import { CreateEpochRequest, SpaceState } from "@dxos/protocols/proto/dxos/client/services";
+import { AdmittedFeed as AdmittedFeed3, SpaceMember as SpaceMember3 } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Timeframe as Timeframe2 } from "@dxos/timeframe";
 import { trace as trace6 } from "@dxos/tracing";
 import { ComplexSet as ComplexSet5, assignDeep } from "@dxos/util";
@@ -3676,7 +3674,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file13,
-      L: 137,
+      L: 141,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3726,7 +3724,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file13,
-      L: 195,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3744,7 +3742,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file13,
-      L: 209,
+      L: 213,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3776,7 +3774,7 @@ var DataSpace = class {
         if (err instanceof CancelledError || err instanceof ContextDisposedError3) {
           log11("data pipeline initialization cancelled", err, {
             F: __dxlog_file13,
-            L: 242,
+            L: 246,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3784,7 +3782,7 @@ var DataSpace = class {
         }
         log11.error("Error initializing data pipeline", err, {
           F: __dxlog_file13,
-          L: 246,
+          L: 250,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3793,7 +3791,7 @@ var DataSpace = class {
           state: SpaceState[this._state]
         }, {
           F: __dxlog_file13,
-          L: 248,
+          L: 252,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3813,7 +3811,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file13,
-      L: 264,
+      L: 268,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3823,7 +3821,7 @@ var DataSpace = class {
     await cancelWithContext4(this._ctx, this.automergeSpaceState.ensureEpochInitialized());
     log11("data pipeline ready", void 0, {
       F: __dxlog_file13,
-      L: 276,
+      L: 280,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3833,7 +3831,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file13,
-      L: 280,
+      L: 284,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3849,7 +3847,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     log11("writable feeds created", void 0, {
       F: __dxlog_file13,
-      L: 296,
+      L: 300,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3912,7 +3910,7 @@ var DataSpace = class {
       rootUrl
     }, {
       F: __dxlog_file13,
-      L: 362,
+      L: 366,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3934,6 +3932,19 @@ var DataSpace = class {
             };
           });
         }
+        if (!this._echoHost.roots.has(handle.documentId)) {
+          await this._echoHost.openSpaceRoot(handle.url);
+        } else {
+          log11.warn("echo database root already exists", {
+            space: this.key,
+            rootUrl
+          }, {
+            F: __dxlog_file13,
+            L: 393,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+        }
       } catch (err) {
         if (err instanceof ContextDisposedError3) {
           return;
@@ -3944,7 +3955,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file13,
-          L: 387,
+          L: 399,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3999,7 +4010,7 @@ var DataSpace = class {
           const newRoot = this._echoHost.automergeRepo.create(rootHandle.docSync());
           invariant12(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
             F: __dxlog_file13,
-            L: 437,
+            L: 449,
             S: this,
             A: [
               "typeof newRoot.url === 'string' && newRoot.url.length > 0",
@@ -4018,7 +4029,7 @@ var DataSpace = class {
         {
           log11.info("Fragmenting", void 0, {
             F: __dxlog_file13,
-            L: 449,
+            L: 461,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4026,11 +4037,11 @@ var DataSpace = class {
           const rootHandle = this._echoHost.automergeRepo.find(currentRootUrl);
           await cancelWithContext4(this._ctx, asyncTimeout(rootHandle.whenReady(), 1e4));
           const objects = Object.entries(rootHandle.docSync().objects);
-          const properties = objects.find(([_, value]) => value.system.type?.itemId === TYPE_PROPERTIES);
+          const properties = findPropertiesObject(rootHandle.docSync());
           const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
           invariant12(properties, "Properties not found", {
             F: __dxlog_file13,
-            L: 459,
+            L: 471,
             S: this,
             A: [
               "properties",
@@ -4046,7 +4057,7 @@ var DataSpace = class {
           const newRoot = this._echoHost.automergeRepo.create(newSpaceDoc);
           invariant12(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
             F: __dxlog_file13,
-            L: 464,
+            L: 476,
             S: this,
             A: [
               "typeof newRoot.url === 'string' && newRoot.url.length > 0",
@@ -4115,7 +4126,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file13,
-      L: 530,
+      L: 542,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4167,6 +4178,18 @@ DataSpace = _ts_decorate4([
   trackLeaks("open", "close"),
   trace6.resource()
 ], DataSpace);
+var findPropertiesObject = (spaceDoc) => {
+  for (const id in spaceDoc.objects ?? {}) {
+    const obj = spaceDoc.objects[id];
+    if (obj.system.type?.itemId === TYPE_PROPERTIES) {
+      return [
+        id,
+        obj
+      ];
+    }
+  }
+  return void 0;
+};
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
 import { Event as Event7, synchronized as synchronized2, trackLeaks as trackLeaks2 } from "@dxos/async";
@@ -4176,10 +4199,11 @@ import { AuthStatus } from "@dxos/echo-pipeline";
 import { invariant as invariant13 } from "@dxos/invariant";
 import { PublicKey as PublicKey11 } from "@dxos/keys";
 import { log as log12 } from "@dxos/log";
-import { trace as trace7 } from "@dxos/protocols";
+import { trace as Trace2 } from "@dxos/protocols";
 import { Invitation as Invitation7, SpaceState as SpaceState2 } from "@dxos/protocols/proto/dxos/client/services";
 import { SpaceMember as SpaceMember5 } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Gossip as Gossip2, Presence as Presence2 } from "@dxos/teleport-extension-gossip";
+import { trace as trace7 } from "@dxos/tracing";
 import { ComplexMap as ComplexMap3, deferFunction as deferFunction2, forEachAsync } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/spaces/genesis.ts
@@ -4283,6 +4307,28 @@ var DataSpaceManager = class {
     const { spaceMemberPresenceAnnounceInterval = PRESENCE_ANNOUNCE_INTERVAL, spaceMemberPresenceOfflineTimeout = PRESENCE_OFFLINE_TIMEOUT } = params ?? {};
     this._spaceMemberPresenceAnnounceInterval = spaceMemberPresenceAnnounceInterval;
     this._spaceMemberPresenceOfflineTimeout = spaceMemberPresenceOfflineTimeout;
+    trace7.diagnostic({
+      id: "spaces",
+      name: "Spaces",
+      fetch: async () => {
+        return Array.from(this._spaces.values()).map((space) => {
+          const rootUrl = space.automergeSpaceState.rootUrl;
+          const rootHandle = rootUrl ? this._echoHost.automergeRepo.find(rootUrl) : void 0;
+          const rootDoc = rootHandle?.docSync();
+          const properties = rootDoc && findPropertiesObject(rootDoc);
+          return {
+            key: space.key.toHex(),
+            state: SpaceState2[space.state],
+            name: properties?.[1].data.name ?? null,
+            inlineObjects: rootDoc ? Object.keys(rootDoc.objects ?? {}).length : null,
+            linkedObjects: rootDoc ? Object.keys(rootDoc.links ?? {}).length : null,
+            credentials: space.inner.spaceState.credentials.length,
+            members: space.inner.spaceState.members.size,
+            rootUrl
+          };
+        });
+      }
+    });
   }
   // TODO(burdon): Remove.
   get spaces() {
@@ -4291,15 +4337,15 @@ var DataSpaceManager = class {
   async open() {
     log12("open", void 0, {
       F: __dxlog_file14,
-      L: 115,
+      L: 144,
       S: this,
       C: (f, a) => f(...a)
     });
-    log12.trace("dxos.echo.data-space-manager.open", trace7.begin({
+    log12.trace("dxos.echo.data-space-manager.open", Trace2.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file14,
-      L: 116,
+      L: 145,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4307,7 +4353,7 @@ var DataSpaceManager = class {
       spaces: this._metadataStore.spaces.length
     }, {
       F: __dxlog_file14,
-      L: 117,
+      L: 146,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4317,7 +4363,7 @@ var DataSpaceManager = class {
           spaceMetadata
         }, {
           F: __dxlog_file14,
-          L: 121,
+          L: 150,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4328,7 +4374,7 @@ var DataSpaceManager = class {
           err
         }, {
           F: __dxlog_file14,
-          L: 124,
+          L: 153,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4341,11 +4387,11 @@ var DataSpaceManager = class {
         space.initializeDataPipelineAsync();
       }
     }
-    log12.trace("dxos.echo.data-space-manager.open", trace7.end({
+    log12.trace("dxos.echo.data-space-manager.open", Trace2.end({
       id: this._instanceId
     }), {
       F: __dxlog_file14,
-      L: 137,
+      L: 166,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4353,7 +4399,7 @@ var DataSpaceManager = class {
   async close() {
     log12("close", void 0, {
       F: __dxlog_file14,
-      L: 142,
+      L: 171,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4369,7 +4415,7 @@ var DataSpaceManager = class {
   async createSpace() {
     invariant13(this._isOpen, "Not open.", {
       F: __dxlog_file14,
-      L: 155,
+      L: 184,
       S: this,
       A: [
         "this._isOpen",
@@ -4390,18 +4436,18 @@ var DataSpaceManager = class {
       spaceKey
     }, {
       F: __dxlog_file14,
-      L: 167,
+      L: 196,
       S: this,
       C: (f, a) => f(...a)
     });
-    const automergeRootUrl = await this._echoHost.createSpaceRoot(spaceKey);
+    const root = await this._echoHost.createSpaceRoot(spaceKey);
     const space = await this._constructSpace(metadata);
-    const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, automergeRootUrl);
+    const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, root.url);
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
     invariant13(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file14,
-      L: 176,
+      L: 205,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -4419,13 +4465,13 @@ var DataSpaceManager = class {
       opts
     }, {
       F: __dxlog_file14,
-      L: 188,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant13(this._isOpen, "Not open.", {
       F: __dxlog_file14,
-      L: 189,
+      L: 218,
       S: this,
       A: [
         "this._isOpen",
@@ -4434,7 +4480,7 @@ var DataSpaceManager = class {
     });
     invariant13(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file14,
-      L: 190,
+      L: 219,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -4469,7 +4515,7 @@ var DataSpaceManager = class {
       metadata
     }, {
       F: __dxlog_file14,
-      L: 223,
+      L: 252,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4507,7 +4553,7 @@ var DataSpaceManager = class {
       onAuthFailure: () => {
         log12.warn("auth failure", void 0, {
           F: __dxlog_file14,
-          L: 260,
+          L: 289,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4540,7 +4586,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file14,
-            L: 287,
+            L: 316,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4551,7 +4597,7 @@ var DataSpaceManager = class {
             open: this._isOpen
           }, {
             F: __dxlog_file14,
-            L: 290,
+            L: 319,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4570,7 +4616,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file14,
-            L: 298,
+            L: 327,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4614,7 +4660,7 @@ var DataSpaceManager = class {
       closedSessions
     }, {
       F: __dxlog_file14,
-      L: 338,
+      L: 367,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4629,7 +4675,7 @@ var DataSpaceManager = class {
           peerId: peerState.peerId
         }, {
           F: __dxlog_file14,
-          L: 352,
+          L: 381,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4962,7 +5008,7 @@ import { log as log14 } from "@dxos/log";
 import { InvalidStorageVersionError, STORAGE_VERSION, trace as trace8 } from "@dxos/protocols";
 import { Invitation as Invitation8 } from "@dxos/protocols/proto/dxos/client/services";
 import { BlobStore } from "@dxos/teleport-extension-object-sync";
-import { trace as Trace2 } from "@dxos/tracing";
+import { trace as Trace3 } from "@dxos/tracing";
 import { safeInstanceof } from "@dxos/util";
 function _ts_decorate6(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -5222,14 +5268,14 @@ var ServiceContext = class extends Resource {
   }
 };
 _ts_decorate6([
-  Trace2.span()
+  Trace3.span()
 ], ServiceContext.prototype, "_open", null);
 _ts_decorate6([
-  Trace2.span()
+  Trace3.span()
 ], ServiceContext.prototype, "_initialize", null);
 ServiceContext = _ts_decorate6([
   safeInstanceof("dxos.client-services.ServiceContext"),
-  Trace2.resource()
+  Trace3.resource()
 ], ServiceContext);
 
 // packages/sdk/client-services/src/packlets/services/service-registry.ts
@@ -5266,7 +5312,7 @@ import { SpaceMember as SpaceMember7 } from "@dxos/protocols/proto/dxos/client/s
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.5.3-main.f9b873d";
+var DXOS_VERSION = "0.5.3-main.fffc127";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -5530,7 +5576,7 @@ import { WebsocketSignalManager } from "@dxos/messaging";
 import { NetworkManager, createSimplePeerTransportFactory } from "@dxos/network-manager";
 import { trace as trace9 } from "@dxos/protocols";
 import { SystemStatus } from "@dxos/protocols/proto/dxos/client/services";
-import { TRACE_PROCESSOR as TRACE_PROCESSOR2, trace as Trace3 } from "@dxos/tracing";
+import { TRACE_PROCESSOR as TRACE_PROCESSOR2, trace as Trace4 } from "@dxos/tracing";
 import { assignDeep as assignDeep2 } from "@dxos/util";
 import { WebsocketRpcClient } from "@dxos/websocket-rpc";
 
@@ -6414,21 +6460,21 @@ var ClientServicesHost = class {
   }
 };
 _ts_decorate8([
-  Trace3.info()
+  Trace4.info()
 ], ClientServicesHost.prototype, "_opening", void 0);
 _ts_decorate8([
-  Trace3.info()
+  Trace4.info()
 ], ClientServicesHost.prototype, "_open", void 0);
 _ts_decorate8([
   synchronized3,
-  Trace3.span()
+  Trace4.span()
 ], ClientServicesHost.prototype, "open", null);
 _ts_decorate8([
   synchronized3,
-  Trace3.span()
+  Trace4.span()
 ], ClientServicesHost.prototype, "close", null);
 ClientServicesHost = _ts_decorate8([
-  Trace3.resource()
+  Trace4.resource()
 ], ClientServicesHost);
 
 // packages/sdk/client-services/src/packlets/services/util.ts
@@ -6497,6 +6543,7 @@ export {
   InvitationsManager,
   ClientRpcServer,
   DataSpace,
+  findPropertiesObject,
   DataSpaceManager,
   SpacesServiceImpl,
   ServiceContext,
@@ -6512,4 +6559,4 @@ export {
   ClientServicesHost,
   ClientServicesProviderResource
 };
-//# sourceMappingURL=chunk-ZGHJHSHA.mjs.map
+//# sourceMappingURL=chunk-OYIJIAJI.mjs.map