@dxos/client-services 0.4.10-main.93fda5f → 0.4.10-main.94e3e06

package/dist/lib/browser/{chunk-ULO2U4N6.mjs → chunk-WRFCA2FV.mjs}

@@ -2769,7 +2769,7 @@ var getPlatform = () => {
 };
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.4.10-main.93fda5f";
+var DXOS_VERSION = "0.4.10-main.94e3e06";
 
 // 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";
@@ -2885,7 +2885,9 @@ import { Event as Event6, asyncTimeout, scheduleTask as scheduleTask5, sleep as
 import { AUTH_TIMEOUT as AUTH_TIMEOUT2 } from "@dxos/client-protocol";
 import { cancelWithContext as cancelWithContext2, Context as Context8, ContextDisposedError } from "@dxos/context";
 import { timed, warnAfterTimeout } from "@dxos/debug";
+import { TYPE_PROPERTIES } from "@dxos/echo-db";
 import { createMappedFeedWriter } from "@dxos/echo-pipeline";
+import { AutomergeDocumentLoaderImpl } from "@dxos/echo-pipeline";
 import { failedInvariant, invariant as invariant11 } from "@dxos/invariant";
 import { PublicKey as PublicKey8 } from "@dxos/keys";
 import { log as log9 } from "@dxos/log";
@@ -2894,7 +2896,7 @@ import { SpaceState, CreateEpochRequest } from "@dxos/protocols/proto/dxos/clien
 import { AdmittedFeed as AdmittedFeed3 } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Timeframe as Timeframe2 } from "@dxos/timeframe";
 import { trace as trace6 } from "@dxos/tracing";
-import { ComplexSet as ComplexSet3 } from "@dxos/util";
+import { ComplexSet as ComplexSet3, assignDeep } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/spaces/automerge-space-state.ts
 import { Event as Event4 } from "@dxos/async";
@@ -3249,7 +3251,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 132,
+      L: 140,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3299,7 +3301,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 190,
+      L: 198,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3317,7 +3319,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 204,
+      L: 212,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3349,7 +3351,7 @@ var DataSpace = class {
         if (err instanceof CancelledError || err instanceof ContextDisposedError) {
           log9("data pipeline initialization cancelled", err, {
             F: __dxlog_file12,
-            L: 237,
+            L: 245,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3357,7 +3359,7 @@ var DataSpace = class {
         }
         log9.error("Error initializing data pipeline", err, {
           F: __dxlog_file12,
-          L: 241,
+          L: 249,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3366,7 +3368,7 @@ var DataSpace = class {
           state: SpaceState[this._state]
         }, {
           F: __dxlog_file12,
-          L: 243,
+          L: 251,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3386,7 +3388,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 259,
+      L: 267,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3396,7 +3398,7 @@ var DataSpace = class {
     await cancelWithContext2(this._ctx, this.automergeSpaceState.ensureEpochInitialized());
     log9("data pipeline ready", void 0, {
       F: __dxlog_file12,
-      L: 271,
+      L: 279,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3406,7 +3408,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 275,
+      L: 283,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3422,7 +3424,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     log9("writable feeds created", void 0, {
       F: __dxlog_file12,
-      L: 291,
+      L: 299,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3485,7 +3487,7 @@ var DataSpace = class {
       rootUrl
     }, {
       F: __dxlog_file12,
-      L: 357,
+      L: 365,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3517,7 +3519,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file12,
-          L: 380,
+          L: 388,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3572,13 +3574,73 @@ var DataSpace = class {
           const newRoot = this._automergeHost.repo.create(rootHandle.docSync());
           invariant11(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
             F: __dxlog_file12,
-            L: 430,
+            L: 438,
+            S: this,
+            A: [
+              "typeof newRoot.url === 'string' && newRoot.url.length > 0",
+              ""
+            ]
+          });
+          epoch = {
+            previousId: this._automergeSpaceState.lastEpoch?.id,
+            number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
+            timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new Timeframe2(),
+            automergeRoot: newRoot.url
+          };
+        }
+        break;
+      case CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT:
+        {
+          log9.info("Fragmenting", void 0, {
+            F: __dxlog_file12,
+            L: 450,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          const currentRootUrl = this._automergeSpaceState.rootUrl;
+          const rootHandle = this._automergeHost.repo.find(currentRootUrl);
+          await cancelWithContext2(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 otherObjects = objects.filter(([key]) => key !== properties?.[0]);
+          invariant11(properties, "Properties not found", {
+            F: __dxlog_file12,
+            L: 460,
+            S: this,
+            A: [
+              "properties",
+              "'Properties not found'"
+            ]
+          });
+          const newSpaceDoc = {
+            ...rootHandle.docSync(),
+            objects: Object.fromEntries([
+              properties
+            ])
+          };
+          const newRoot = this._automergeHost.repo.create(newSpaceDoc);
+          invariant11(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
+            F: __dxlog_file12,
+            L: 465,
             S: this,
             A: [
               "typeof newRoot.url === 'string' && newRoot.url.length > 0",
               ""
             ]
           });
+          const docLoader = new AutomergeDocumentLoaderImpl(this.key, this._automergeHost.repo);
+          await docLoader.loadSpaceRootDocHandle(this._ctx, {
+            rootUrl: newRoot.url
+          });
+          otherObjects.forEach(([key, value]) => {
+            const handle = docLoader.createDocumentForObject(key);
+            handle.change((doc) => {
+              assignDeep(doc, [
+                "objects",
+                key
+              ], value);
+            });
+          });
           epoch = {
             previousId: this._automergeSpaceState.lastEpoch?.id,
             number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
@@ -3628,7 +3690,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 482,
+      L: 531,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4344,7 +4406,7 @@ import { safeInstanceof } from "@dxos/util";
 import { getHeads } from "@dxos/automerge/automerge";
 import { warnAfterTimeout as warnAfterTimeout2 } from "@dxos/debug";
 import { idCodec } from "@dxos/protocols";
-var createLoadDocuments = (automergeHost) => (
+var createSelectedDocumentsIterator = (automergeHost) => (
   /**
   * Get object data blobs from Automerge Repo by ids.
   * @param ids
@@ -4357,17 +4419,17 @@ var createLoadDocuments = (automergeHost) => (
       await warnAfterTimeout2(5e3, "to long to load doc", () => handle.whenReady());
       const doc = handle.docSync();
       const hash = getHeads(doc).join("");
-      yield [
+      yield doc.objects?.[objectId] ? [
         {
           id,
           object: doc.objects[objectId],
           currentHash: hash
         }
-      ];
+      ] : [];
     }
   }
 );
-var createGetAllDocuments = (automergeHost) => (
+var createDocumentsIterator = (automergeHost) => (
   /**
   * Recursively get all object data blobs from Automerge Repo.
   * @param ids
@@ -4390,7 +4452,7 @@ var createGetAllDocuments = (automergeHost) => (
               objectId
             }),
             object,
-            currentHash: heads.at(-1)
+            currentHash: heads.join("")
           };
         });
       }
@@ -4474,8 +4536,8 @@ var ServiceContext = class {
         directory: storage.createDirectory("index-store")
       }),
       metadataStore: this.indexMetadata,
-      loadDocuments: createLoadDocuments(this.automergeHost),
-      getAllDocuments: createGetAllDocuments(this.automergeHost)
+      loadDocuments: createSelectedDocumentsIterator(this.automergeHost),
+      getAllDocuments: createDocumentsIterator(this.automergeHost)
     });
     this.invitations = new InvitationsHandler(this.networkManager);
     this._handlerFactories.set(Invitation6.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? failUndefined2(), this._acceptIdentity.bind(this)));
@@ -4885,11 +4947,12 @@ var toStorageType = (type) => {
 };
 
 // packages/sdk/client-services/src/packlets/services/service-host.ts
-import { Event as Event9, synchronized as synchronized3 } from "@dxos/async";
-import { Properties, clientServiceBundle, defaultKey } from "@dxos/client-protocol";
+import { Event as Event9, sleep as sleep3, synchronized as synchronized3 } from "@dxos/async";
+import { clientServiceBundle, defaultKey, PropertiesSchema } from "@dxos/client-protocol";
 import { Context as Context11 } from "@dxos/context";
 import { DataServiceImpl } from "@dxos/echo-pipeline";
-import { getAutomergeObjectCore, getRawDoc } from "@dxos/echo-schema";
+import * as E from "@dxos/echo-schema";
+import { createRawObjectDoc } from "@dxos/echo-schema";
 import { IndexServiceImpl } from "@dxos/indexing";
 import { invariant as invariant16 } from "@dxos/invariant";
 import { PublicKey as PublicKey12 } from "@dxos/keys";
@@ -4899,7 +4962,7 @@ import { NetworkManager, createSimplePeerTransportFactory } from "@dxos/network-
 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 { assignDeep } from "@dxos/util";
+import { assignDeep as assignDeep2 } from "@dxos/util";
 import { WebsocketRpcClient } from "@dxos/websocket-rpc";
 
 // packages/sdk/client-services/src/packlets/devices/devices-service.ts
@@ -5296,7 +5359,7 @@ var ClientServicesHost = class {
   initialize({ config, ...options }) {
     invariant16(!this._open, "service host is open", {
       F: __dxlog_file18,
-      L: 179,
+      L: 180,
       S: this,
       A: [
         "!this._open",
@@ -5305,14 +5368,14 @@ var ClientServicesHost = class {
     });
     log15("initializing...", void 0, {
       F: __dxlog_file18,
-      L: 180,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
       invariant16(!this._config, "config already set", {
         F: __dxlog_file18,
-        L: 183,
+        L: 184,
         S: this,
         A: [
           "!this._config",
@@ -5327,7 +5390,7 @@ var ClientServicesHost = class {
     if (!options.signalManager) {
       log15.warn("running signaling without telemetry metadata.", void 0, {
         F: __dxlog_file18,
-        L: 191,
+        L: 192,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5338,7 +5401,7 @@ var ClientServicesHost = class {
     this._signalManager = signalManager;
     invariant16(!this._networkManager, "network manager already set", {
       F: __dxlog_file18,
-      L: 202,
+      L: 203,
       S: this,
       A: [
         "!this._networkManager",
@@ -5352,7 +5415,7 @@ var ClientServicesHost = class {
     });
     log15("initialized", void 0, {
       F: __dxlog_file18,
-      L: 209,
+      L: 210,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5366,13 +5429,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 220,
+      L: 221,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant16(this._config, "config not set", {
       F: __dxlog_file18,
-      L: 222,
+      L: 223,
       S: this,
       A: [
         "this._config",
@@ -5381,7 +5444,7 @@ var ClientServicesHost = class {
     });
     invariant16(this._storage, "storage not set", {
       F: __dxlog_file18,
-      L: 223,
+      L: 224,
       S: this,
       A: [
         "this._storage",
@@ -5390,7 +5453,7 @@ var ClientServicesHost = class {
     });
     invariant16(this._signalManager, "signal manager not set", {
       F: __dxlog_file18,
-      L: 224,
+      L: 225,
       S: this,
       A: [
         "this._signalManager",
@@ -5399,7 +5462,7 @@ var ClientServicesHost = class {
     });
     invariant16(this._networkManager, "network manager not set", {
       F: __dxlog_file18,
-      L: 225,
+      L: 226,
       S: this,
       A: [
         "this._networkManager",
@@ -5411,7 +5474,7 @@ var ClientServicesHost = class {
       lockKey: this._resourceLock?.lockKey
     }, {
       F: __dxlog_file18,
-      L: 228,
+      L: 229,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5445,7 +5508,7 @@ var ClientServicesHost = class {
     await this._serviceContext.open(ctx);
     invariant16(this.serviceRegistry.services.InvitationsService, void 0, {
       F: __dxlog_file18,
-      L: 289,
+      L: 290,
       S: this,
       A: [
         "this.serviceRegistry.services.InvitationsService",
@@ -5457,7 +5520,7 @@ var ClientServicesHost = class {
       count: loadedInvitations.invitations?.length
     }, {
       F: __dxlog_file18,
-      L: 292,
+      L: 293,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5479,7 +5542,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 309,
+      L: 310,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5487,7 +5550,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 310,
+      L: 311,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5501,7 +5564,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 321,
+      L: 322,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5517,7 +5580,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 328,
+      L: 329,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5528,13 +5591,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 333,
+      L: 334,
       S: this,
       C: (f, a) => f(...a)
     });
     log15("resetting...", void 0, {
       F: __dxlog_file18,
-      L: 335,
+      L: 336,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5542,7 +5605,7 @@ var ClientServicesHost = class {
     await this._storage.reset();
     log15("reset", void 0, {
       F: __dxlog_file18,
-      L: 338,
+      L: 339,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5550,7 +5613,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 339,
+      L: 340,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5560,12 +5623,10 @@ var ClientServicesHost = class {
     const identity = await this._serviceContext.createIdentity(params);
     await this._serviceContext.initialized.wait();
     const space = await this._serviceContext.dataSpaceManager.createSpace();
-    const obj = new Properties(void 0);
-    obj[defaultKey] = identity.identityKey.toHex();
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant16(automergeIndex, void 0, {
       F: __dxlog_file18,
-      L: 354,
+      L: 352,
       S: this,
       A: [
         "automergeIndex",
@@ -5574,12 +5635,18 @@ var ClientServicesHost = class {
     });
     const document = await this._serviceContext.automergeHost.repo.find(automergeIndex);
     await document.whenReady();
+    const objectDocument = createRawObjectDoc({
+      [defaultKey]: identity.identityKey.toHex()
+    }, {
+      type: E.getTypeReference(PropertiesSchema)
+    });
     document.change((doc) => {
-      assignDeep(doc, [
+      assignDeep2(doc, [
         "objects",
-        getAutomergeObjectCore(obj).id
-      ], getRawDoc(obj).handle.docSync());
+        objectDocument.id
+      ], objectDocument.handle.docSync());
     });
+    await sleep3(200);
     return identity;
   }
 };
@@ -5635,4 +5702,4 @@ export {
   createStorageObjects,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-ULO2U4N6.mjs.map
+//# sourceMappingURL=chunk-WRFCA2FV.mjs.map