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

package/dist/types/src/version.d.ts

@@ -1,2 +1,2 @@
-export declare const DXOS_VERSION = "0.4.10-main.93fda5f";
+export declare const DXOS_VERSION = "0.4.10-main.94e3e06";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.4.10-main.93fda5f",
+  "version": "0.4.10-main.94e3e06",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -22,43 +22,43 @@
   ],
   "dependencies": {
     "platform": "^1.3.6",
-    "@dxos/automerge": "0.4.10-main.93fda5f",
-    "@dxos/async": "0.4.10-main.93fda5f",
-    "@dxos/client-protocol": "0.4.10-main.93fda5f",
-    "@dxos/config": "0.4.10-main.93fda5f",
-    "@dxos/codec-protobuf": "0.4.10-main.93fda5f",
-    "@dxos/context": "0.4.10-main.93fda5f",
-    "@dxos/credentials": "0.4.10-main.93fda5f",
-    "@dxos/crypto": "0.4.10-main.93fda5f",
-    "@dxos/debug": "0.4.10-main.93fda5f",
-    "@dxos/echo-pipeline": "0.4.10-main.93fda5f",
-    "@dxos/echo-schema": "0.4.10-main.93fda5f",
-    "@dxos/echo-db": "0.4.10-main.93fda5f",
-    "@dxos/feed-store": "0.4.10-main.93fda5f",
-    "@dxos/indexing": "0.4.10-main.93fda5f",
-    "@dxos/invariant": "0.4.10-main.93fda5f",
-    "@dxos/keyring": "0.4.10-main.93fda5f",
-    "@dxos/log": "0.4.10-main.93fda5f",
-    "@dxos/messaging": "0.4.10-main.93fda5f",
-    "@dxos/network-manager": "0.4.10-main.93fda5f",
-    "@dxos/keys": "0.4.10-main.93fda5f",
-    "@dxos/lock-file": "0.4.10-main.93fda5f",
-    "@dxos/node-std": "0.4.10-main.93fda5f",
-    "@dxos/protocols": "0.4.10-main.93fda5f",
-    "@dxos/rpc": "0.4.10-main.93fda5f",
-    "@dxos/random-access-storage": "0.4.10-main.93fda5f",
-    "@dxos/teleport-extension-object-sync": "0.4.10-main.93fda5f",
-    "@dxos/teleport-extension-gossip": "0.4.10-main.93fda5f",
-    "@dxos/timeframe": "0.4.10-main.93fda5f",
-    "@dxos/teleport": "0.4.10-main.93fda5f",
-    "@dxos/tracing": "0.4.10-main.93fda5f",
-    "@dxos/util": "0.4.10-main.93fda5f",
-    "@dxos/websocket-rpc": "0.4.10-main.93fda5f"
+    "@dxos/async": "0.4.10-main.94e3e06",
+    "@dxos/client-protocol": "0.4.10-main.94e3e06",
+    "@dxos/automerge": "0.4.10-main.94e3e06",
+    "@dxos/config": "0.4.10-main.94e3e06",
+    "@dxos/context": "0.4.10-main.94e3e06",
+    "@dxos/codec-protobuf": "0.4.10-main.94e3e06",
+    "@dxos/credentials": "0.4.10-main.94e3e06",
+    "@dxos/crypto": "0.4.10-main.94e3e06",
+    "@dxos/debug": "0.4.10-main.94e3e06",
+    "@dxos/echo-pipeline": "0.4.10-main.94e3e06",
+    "@dxos/echo-schema": "0.4.10-main.94e3e06",
+    "@dxos/echo-db": "0.4.10-main.94e3e06",
+    "@dxos/feed-store": "0.4.10-main.94e3e06",
+    "@dxos/indexing": "0.4.10-main.94e3e06",
+    "@dxos/invariant": "0.4.10-main.94e3e06",
+    "@dxos/keyring": "0.4.10-main.94e3e06",
+    "@dxos/keys": "0.4.10-main.94e3e06",
+    "@dxos/lock-file": "0.4.10-main.94e3e06",
+    "@dxos/log": "0.4.10-main.94e3e06",
+    "@dxos/messaging": "0.4.10-main.94e3e06",
+    "@dxos/network-manager": "0.4.10-main.94e3e06",
+    "@dxos/protocols": "0.4.10-main.94e3e06",
+    "@dxos/rpc": "0.4.10-main.94e3e06",
+    "@dxos/random-access-storage": "0.4.10-main.94e3e06",
+    "@dxos/teleport": "0.4.10-main.94e3e06",
+    "@dxos/node-std": "0.4.10-main.94e3e06",
+    "@dxos/timeframe": "0.4.10-main.94e3e06",
+    "@dxos/teleport-extension-gossip": "0.4.10-main.94e3e06",
+    "@dxos/util": "0.4.10-main.94e3e06",
+    "@dxos/tracing": "0.4.10-main.94e3e06",
+    "@dxos/teleport-extension-object-sync": "0.4.10-main.94e3e06",
+    "@dxos/websocket-rpc": "0.4.10-main.94e3e06"
   },
   "devDependencies": {
     "@types/platform": "^1.3.4",
     "@types/readable-stream": "^2.3.9",
-    "@dxos/signal": "0.4.10-main.93fda5f"
+    "@dxos/signal": "0.4.10-main.94e3e06"
   },
   "publishConfig": {
     "access": "public"

package/src/packlets/indexing/util.ts

@@ -12,7 +12,7 @@ import { idCodec } from '@dxos/protocols';
 /**
  * Factory for `loadDocuments` iterator.
  */
-export const createLoadDocuments = (automergeHost: AutomergeHost) =>
+export const createSelectedDocumentsIterator = (automergeHost: AutomergeHost) =>
   /**
    * Get object data blobs from Automerge Repo by ids.
    * @param ids
@@ -25,14 +25,14 @@ export const createLoadDocuments = (automergeHost: AutomergeHost) =>
       await warnAfterTimeout(5000, 'to long to load doc', () => handle.whenReady());
       const doc = handle.docSync();
       const hash = getHeads(doc).join('');
-      yield [{ id, object: doc.objects[objectId], currentHash: hash }];
+      yield doc.objects?.[objectId] ? [{ id, object: doc.objects[objectId], currentHash: hash }] : [];
     }
   };
 
 /**
  * Factory for `getAllDocuments` iterator.
  */
-export const createGetAllDocuments = (automergeHost: AutomergeHost) =>
+export const createDocumentsIterator = (automergeHost: AutomergeHost) =>
   /**
    * Recursively get all object data blobs from Automerge Repo.
    * @param ids
@@ -57,7 +57,7 @@ export const createGetAllDocuments = (automergeHost: AutomergeHost) =>
           return {
             id: idCodec.encode({ documentId: handle.documentId, objectId }),
             object,
-            currentHash: heads.at(-1)!,
+            currentHash: heads.join(''),
           };
         });
       }

package/src/packlets/services/service-context.ts

@@ -30,7 +30,7 @@ import {
   type IdentityManagerRuntimeParams,
   type JoinIdentityParams,
 } from '../identity';
-import { createGetAllDocuments, createLoadDocuments } from '../indexing';
+import { createDocumentsIterator, createSelectedDocumentsIterator } from '../indexing';
 import {
   DeviceInvitationProtocol,
   InvitationsHandler,
@@ -125,8 +125,8 @@ export class ServiceContext {
     this.indexer = new Indexer({
       indexStore: new IndexStore({ 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);

package/src/packlets/services/service-host.ts

@@ -2,12 +2,13 @@
 // Copyright 2021 DXOS.org
 //
 
-import { Event, synchronized } from '@dxos/async';
-import { Properties, clientServiceBundle, defaultKey, type ClientServices } from '@dxos/client-protocol';
+import { Event, sleep, synchronized } from '@dxos/async';
+import { clientServiceBundle, defaultKey, type ClientServices, PropertiesSchema } from '@dxos/client-protocol';
 import { type Config } from '@dxos/config';
 import { Context } from '@dxos/context';
-import { DataServiceImpl } from '@dxos/echo-pipeline';
-import { getAutomergeObjectCore, getRawDoc, type SpaceDoc, type TypedObject } from '@dxos/echo-schema';
+import { DataServiceImpl, type SpaceDoc } from '@dxos/echo-pipeline';
+import * as E from '@dxos/echo-schema';
+import { createRawObjectDoc } from '@dxos/echo-schema';
 import { IndexServiceImpl } from '@dxos/indexing';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
@@ -347,17 +348,20 @@ export class ClientServicesHost {
     await this._serviceContext.initialized.wait();
     const space = await this._serviceContext.dataSpaceManager!.createSpace();
 
-    const obj: TypedObject = new Properties(undefined);
-    obj[defaultKey] = identity.identityKey.toHex();
-
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant(automergeIndex);
     const document = await this._serviceContext.automergeHost.repo.find<SpaceDoc>(automergeIndex as any);
     await document.whenReady();
 
+    const objectDocument = createRawObjectDoc(
+      { [defaultKey]: identity.identityKey.toHex() },
+      { type: E.getTypeReference(PropertiesSchema) },
+    );
     document.change((doc: SpaceDoc) => {
-      assignDeep(doc, ['objects', getAutomergeObjectCore(obj).id], getRawDoc(obj).handle.docSync());
+      assignDeep(doc, ['objects', objectDocument.id], objectDocument.handle.docSync());
     });
+    // TODO: replace with flush when supported by automerge-repo
+    await sleep(200);
 
     return identity;
   }

package/src/packlets/spaces/data-space.ts

@@ -6,7 +6,15 @@ import { Event, asyncTimeout, scheduleTask, sleep, synchronized, trackLeaks } fr
 import { AUTH_TIMEOUT } from '@dxos/client-protocol';
 import { cancelWithContext, Context, ContextDisposedError } from '@dxos/context';
 import { timed, warnAfterTimeout } from '@dxos/debug';
-import { type MetadataStore, type Space, createMappedFeedWriter, type AutomergeHost } from '@dxos/echo-pipeline';
+import { TYPE_PROPERTIES } from '@dxos/echo-db';
+import {
+  type MetadataStore,
+  type Space,
+  createMappedFeedWriter,
+  type AutomergeHost,
+  type SpaceDoc,
+} from '@dxos/echo-pipeline';
+import { AutomergeDocumentLoaderImpl } from '@dxos/echo-pipeline';
 import { type FeedStore } from '@dxos/feed-store';
 import { failedInvariant, invariant } from '@dxos/invariant';
 import { type Keyring } from '@dxos/keyring';
@@ -26,7 +34,7 @@ import { type GossipMessage } from '@dxos/protocols/proto/dxos/mesh/teleport/gos
 import { type Gossip, type Presence } from '@dxos/teleport-extension-gossip';
 import { Timeframe } from '@dxos/timeframe';
 import { trace } from '@dxos/tracing';
-import { ComplexSet } from '@dxos/util';
+import { ComplexSet, assignDeep } from '@dxos/util';
 
 import { AutomergeSpaceState } from './automerge-space-state';
 import { type SigningContext } from './data-space-manager';
@@ -437,6 +445,47 @@ export class DataSpace {
           };
         }
         break;
+      case CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT:
+        {
+          log.info('Fragmenting');
+
+          const currentRootUrl = this._automergeSpaceState.rootUrl;
+          const rootHandle = this._automergeHost.repo.find<SpaceDoc>(currentRootUrl as any);
+          await cancelWithContext(this._ctx, asyncTimeout(rootHandle.whenReady(), 10_000));
+
+          // Find properties object.
+          const objects = Object.entries((rootHandle.docSync() as SpaceDoc).objects!);
+          const properties = objects.find(([_, value]) => value.system.type?.itemId === TYPE_PROPERTIES);
+          const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
+          invariant(properties, 'Properties not found');
+
+          // Create a new space doc with the properties object.
+          const newSpaceDoc: SpaceDoc = { ...rootHandle.docSync(), objects: Object.fromEntries([properties]) };
+          const newRoot = this._automergeHost.repo.create(newSpaceDoc);
+          invariant(typeof newRoot.url === 'string' && newRoot.url.length > 0);
+
+          // Create new automerge documents for all objects.
+          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: any) => {
+              assignDeep(doc, ['objects', key], value);
+            });
+          });
+
+          // TODO(mykola): Delete old root.
+
+          // TODO(dmaretskyi): Unify epoch construction.
+          epoch = {
+            previousId: this._automergeSpaceState.lastEpoch?.id,
+            number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
+            timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new Timeframe(),
+            automergeRoot: newRoot.url,
+          };
+        }
+        break;
     }
 
     if (!epoch) {

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.4.10-main.93fda5f";
+export const DXOS_VERSION = "0.4.10-main.94e3e06";