@dxos/client-services 0.4.10-main.6134ea4 → 0.4.10-main.697c7a4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.4.10-main.6134ea4",
+  "version": "0.4.10-main.697c7a4",
   "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/async": "0.4.10-main.6134ea4",
-    "@dxos/automerge": "0.4.10-main.6134ea4",
-    "@dxos/codec-protobuf": "0.4.10-main.6134ea4",
-    "@dxos/client-protocol": "0.4.10-main.6134ea4",
-    "@dxos/config": "0.4.10-main.6134ea4",
-    "@dxos/context": "0.4.10-main.6134ea4",
-    "@dxos/crypto": "0.4.10-main.6134ea4",
-    "@dxos/debug": "0.4.10-main.6134ea4",
-    "@dxos/credentials": "0.4.10-main.6134ea4",
-    "@dxos/echo-db": "0.4.10-main.6134ea4",
-    "@dxos/echo-pipeline": "0.4.10-main.6134ea4",
-    "@dxos/echo-schema": "0.4.10-main.6134ea4",
-    "@dxos/indexing": "0.4.10-main.6134ea4",
-    "@dxos/feed-store": "0.4.10-main.6134ea4",
-    "@dxos/invariant": "0.4.10-main.6134ea4",
-    "@dxos/keyring": "0.4.10-main.6134ea4",
-    "@dxos/keys": "0.4.10-main.6134ea4",
-    "@dxos/log": "0.4.10-main.6134ea4",
-    "@dxos/messaging": "0.4.10-main.6134ea4",
-    "@dxos/lock-file": "0.4.10-main.6134ea4",
-    "@dxos/network-manager": "0.4.10-main.6134ea4",
-    "@dxos/node-std": "0.4.10-main.6134ea4",
-    "@dxos/protocols": "0.4.10-main.6134ea4",
-    "@dxos/random-access-storage": "0.4.10-main.6134ea4",
-    "@dxos/teleport": "0.4.10-main.6134ea4",
-    "@dxos/teleport-extension-gossip": "0.4.10-main.6134ea4",
-    "@dxos/rpc": "0.4.10-main.6134ea4",
-    "@dxos/teleport-extension-object-sync": "0.4.10-main.6134ea4",
-    "@dxos/timeframe": "0.4.10-main.6134ea4",
-    "@dxos/tracing": "0.4.10-main.6134ea4",
-    "@dxos/util": "0.4.10-main.6134ea4",
-    "@dxos/websocket-rpc": "0.4.10-main.6134ea4"
+    "@dxos/async": "0.4.10-main.697c7a4",
+    "@dxos/automerge": "0.4.10-main.697c7a4",
+    "@dxos/client-protocol": "0.4.10-main.697c7a4",
+    "@dxos/codec-protobuf": "0.4.10-main.697c7a4",
+    "@dxos/config": "0.4.10-main.697c7a4",
+    "@dxos/credentials": "0.4.10-main.697c7a4",
+    "@dxos/context": "0.4.10-main.697c7a4",
+    "@dxos/crypto": "0.4.10-main.697c7a4",
+    "@dxos/debug": "0.4.10-main.697c7a4",
+    "@dxos/echo-db": "0.4.10-main.697c7a4",
+    "@dxos/echo-pipeline": "0.4.10-main.697c7a4",
+    "@dxos/feed-store": "0.4.10-main.697c7a4",
+    "@dxos/invariant": "0.4.10-main.697c7a4",
+    "@dxos/echo-schema": "0.4.10-main.697c7a4",
+    "@dxos/keyring": "0.4.10-main.697c7a4",
+    "@dxos/indexing": "0.4.10-main.697c7a4",
+    "@dxos/keys": "0.4.10-main.697c7a4",
+    "@dxos/lock-file": "0.4.10-main.697c7a4",
+    "@dxos/log": "0.4.10-main.697c7a4",
+    "@dxos/messaging": "0.4.10-main.697c7a4",
+    "@dxos/network-manager": "0.4.10-main.697c7a4",
+    "@dxos/node-std": "0.4.10-main.697c7a4",
+    "@dxos/protocols": "0.4.10-main.697c7a4",
+    "@dxos/rpc": "0.4.10-main.697c7a4",
+    "@dxos/random-access-storage": "0.4.10-main.697c7a4",
+    "@dxos/teleport": "0.4.10-main.697c7a4",
+    "@dxos/teleport-extension-gossip": "0.4.10-main.697c7a4",
+    "@dxos/teleport-extension-object-sync": "0.4.10-main.697c7a4",
+    "@dxos/timeframe": "0.4.10-main.697c7a4",
+    "@dxos/tracing": "0.4.10-main.697c7a4",
+    "@dxos/util": "0.4.10-main.697c7a4",
+    "@dxos/websocket-rpc": "0.4.10-main.697c7a4"
   },
   "devDependencies": {
     "@types/platform": "^1.3.4",
     "@types/readable-stream": "^2.3.9",
-    "@dxos/signal": "0.4.10-main.6134ea4"
+    "@dxos/signal": "0.4.10-main.697c7a4"
   },
   "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

@@ -6,8 +6,8 @@ import { Event, synchronized } from '@dxos/async';
 import { Properties, clientServiceBundle, defaultKey, type ClientServices } from '@dxos/client-protocol';
 import { type Config } from '@dxos/config';
 import { Context } from '@dxos/context';
-import { DataServiceImpl, type SpaceDoc } from '@dxos/echo-pipeline';
-import { getAutomergeObjectCore, getRawDoc, type TypedObject } from '@dxos/echo-schema';
+import { DataServiceImpl, type ObjectStructure, encodeReference, type SpaceDoc } from '@dxos/echo-pipeline';
+import * as E from '@dxos/echo-schema';
 import { IndexServiceImpl } from '@dxos/indexing';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
@@ -347,18 +347,30 @@ 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();
 
+    // TODO(dmaretskyi): Better API for low-level data access.
+    const properties: ObjectStructure = {
+      system: {
+        type: encodeReference(E.getTypeReference(Properties)!),
+      },
+      data: {
+        [defaultKey]: identity.identityKey.toHex(),
+      },
+      meta: {
+        keys: [],
+      },
+    };
+    const propertiesId = PublicKey.random().toHex();
     document.change((doc: SpaceDoc) => {
-      assignDeep(doc, ['objects', getAutomergeObjectCore(obj).id], getRawDoc(obj).handle.docSync());
+      assignDeep(doc, ['objects', propertiesId], properties);
     });
 
+    await this._serviceContext.automergeHost.repo.flush();
+
     return identity;
   }
 }

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.4.10-main.6134ea4";
+export const DXOS_VERSION = "0.4.10-main.697c7a4";