@dxos/client-services 0.4.8-main.c4e8b01 → 0.4.8-main.eb5ae94

package/package.json

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

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

@@ -3,9 +3,10 @@
 //
 
 import { Trigger } from '@dxos/async';
+import { getHeads } from '@dxos/automerge/automerge';
 import { Context } from '@dxos/context';
 import { type CredentialProcessor, getCredentialAssertion } from '@dxos/credentials';
-import { failUndefined } from '@dxos/debug';
+import { failUndefined, warnAfterTimeout } from '@dxos/debug';
 import {
   valueEncoding,
   MetadataStore,
@@ -14,8 +15,8 @@ import {
   SnapshotStore,
   AutomergeHost,
 } from '@dxos/echo-pipeline';
-import { IndexMetadataStore } from '@dxos/echo-schema';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
+import { IndexMetadataStore, IndexStore, Indexer } from '@dxos/indexing';
 import { invariant } from '@dxos/invariant';
 import { Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
@@ -23,7 +24,7 @@ import { log } from '@dxos/log';
 import { type SignalManager } from '@dxos/messaging';
 import { type ModelFactory } from '@dxos/model-factory';
 import { type NetworkManager } from '@dxos/network-manager';
-import { InvalidStorageVersionError, STORAGE_VERSION, trace } from '@dxos/protocols';
+import { InvalidStorageVersionError, STORAGE_VERSION, idCodec, trace } from '@dxos/protocols';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { type ProfileDocument, type Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
@@ -70,6 +71,7 @@ export class ServiceContext {
   public readonly invitations: InvitationsHandler;
   public readonly automergeHost: AutomergeHost;
   public readonly indexMetadata: IndexMetadataStore;
+  public readonly indexer: Indexer;
 
   // Initialized after identity is initialized.
   public dataSpaceManager?: DataSpaceManager;
@@ -92,7 +94,6 @@ export class ServiceContext {
   ) {
     // TODO(burdon): Move strings to constants.
     this.metadataStore = new MetadataStore(storage.createDirectory('metadata'));
-    this.indexMetadata = new IndexMetadataStore({ directory: storage.createDirectory('index-metadata') });
     this.snapshotStore = new SnapshotStore(storage.createDirectory('snapshots'));
     this.blobStore = new BlobStore(storage.createDirectory('blobs'));
 
@@ -125,11 +126,31 @@ export class ServiceContext {
       this._runtimeParams as IdentityManagerRuntimeParams,
     );
 
+    this.indexMetadata = new IndexMetadataStore({ directory: storage.createDirectory('index-metadata') });
+
     this.automergeHost = new AutomergeHost({
       directory: storage.createDirectory('automerge'),
       metadata: this.indexMetadata,
     });
 
+    this.indexer = new Indexer({
+      indexStore: new IndexStore({ directory: storage.createDirectory('index-store') }),
+      metadataStore: this.indexMetadata,
+      loadDocuments: async (ids: string[]) => {
+        const snapshots = await Promise.all(
+          ids.map(async (id) => {
+            const { documentId, objectId } = idCodec.decode(id);
+            const handle = this.automergeHost.repo.find(documentId as any);
+            await warnAfterTimeout(1000, 'to long to load doc', () => handle.whenReady());
+            const doc = handle.docSync();
+            const heads = getHeads(doc);
+            return { id, object: doc.objects[objectId], currentHash: heads.at(-1)! };
+          }),
+        );
+        return snapshots.filter((snapshot) => snapshot.object);
+      },
+    });
+
     this.invitations = new InvitationsHandler(this.networkManager);
 
     // TODO(burdon): _initialize called in multiple places.
@@ -178,6 +199,7 @@ export class ServiceContext {
     await this.signalManager.close();
     this.dataServiceSubscriptions.clear();
     await this.metadataStore.close();
+    await this.indexer.destroy();
     log('closed');
   }
 

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

@@ -9,6 +9,7 @@ import { Context } from '@dxos/context';
 import { DocumentModel } from '@dxos/document-model';
 import { DataServiceImpl } from '@dxos/echo-pipeline';
 import { type TypedObject, getRawDoc, type SpaceDoc, getAutomergeObjectCore } from '@dxos/echo-schema';
+import { IndexServiceImpl } from '@dxos/indexing';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -279,6 +280,11 @@ export class ClientServicesHost {
         this._serviceContext.automergeHost,
       ),
 
+      IndexService: new IndexServiceImpl({
+        indexer: this._serviceContext.indexer,
+        automergeHost: this._serviceContext.automergeHost,
+      }),
+
       NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
 
       LoggingService: this._loggingService,

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.4.8-main.c4e8b01";
+export const DXOS_VERSION = "0.4.8-main.eb5ae94";