@dxos/client-services 0.4.10-main.4c7b3fa → 0.4.10-main.4c8c73c

package/dist/types/src/packlets/services/service-host.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-host.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/services/service-host.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service-host.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/services/service-host.ts"],"names":[],"mappings":"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"}

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

@@ -1,2 +1,2 @@
-export declare const DXOS_VERSION = "0.4.10-main.4c7b3fa";
+export declare const DXOS_VERSION = "0.4.10-main.4c8c73c";
 //# sourceMappingURL=version.d.ts.map

package/package.json

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

package/src/packlets/indexing/util.ts

@@ -3,7 +3,7 @@
 //
 
 import { getHeads } from '@dxos/automerge/automerge';
-import { type DocHandle } from '@dxos/automerge/automerge-repo';
+import { type DocumentId, type DocHandle } from '@dxos/automerge/automerge-repo';
 import { type AutomergeHost } from '@dxos/echo-pipeline';
 import { type ObjectSnapshot } from '@dxos/indexing';
 import { type ObjectPointerEncoded, idCodec } from '@dxos/protocols';
@@ -20,7 +20,8 @@ export const createSelectedDocumentsIterator = (automergeHost: AutomergeHost) =>
   async function* loadDocuments(ids: ObjectPointerEncoded[]) {
     for (const id of ids) {
       const { documentId, objectId } = idCodec.decode(id);
-      const handle = automergeHost.repo.find(documentId as any);
+      const handle =
+        automergeHost.repo.handles[documentId as DocumentId] ?? automergeHost.repo.find(documentId as DocumentId);
       if (!handle.isReady()) {
         // `whenReady` creates a timeout so we guard it with an if to skip it if the handle is already ready.
         await handle.whenReady();
@@ -72,7 +73,7 @@ export const createDocumentsIterator = (automergeHost: AutomergeHost) =>
           if (visited.has(id)) {
             continue;
           }
-          const linkHandle = automergeHost.repo.find(id as any);
+          const linkHandle = automergeHost.repo.handles[id as DocumentId] ?? automergeHost.repo.find(id as DocumentId);
           for await (const result of getObjectsFromHandle(linkHandle)) {
             yield result;
           }
@@ -82,6 +83,7 @@ export const createDocumentsIterator = (automergeHost: AutomergeHost) =>
       visited.add(handle.documentId);
     }
 
+    // TODO(mykola): Use list of roots instead of iterating over all handles.
     for (const handle of Object.values(automergeHost.repo.handles)) {
       if (visited.has(handle.documentId)) {
         continue;

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

@@ -16,7 +16,7 @@ import {
   type LevelDB,
 } from '@dxos/echo-pipeline';
 import { getTypeReference } from '@dxos/echo-schema';
-import { IndexServiceImpl } from '@dxos/indexing';
+import { QueryServiceImpl } from '@dxos/indexing';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -83,6 +83,7 @@ export class ClientServicesHost {
   private readonly _systemService: SystemServiceImpl;
   private readonly _loggingService: LoggingServiceImpl;
   private readonly _tracingService = TRACE_PROCESSOR.createTraceSender();
+  private _queryService!: QueryServiceImpl;
 
   private _config?: Config;
   private readonly _statusUpdate = new Event<void>();
@@ -262,6 +263,12 @@ export class ClientServicesHost {
       this._runtimeParams,
     );
 
+    this._queryService = new QueryServiceImpl({
+      indexer: this._serviceContext.indexer,
+      automergeHost: this._serviceContext.automergeHost,
+    });
+    await this._queryService.open(ctx);
+
     this._serviceRegistry.setServices({
       SystemService: this._systemService,
 
@@ -287,10 +294,7 @@ export class ClientServicesHost {
 
       DataService: new DataServiceImpl(this._serviceContext.automergeHost),
 
-      IndexService: new IndexServiceImpl({
-        indexer: this._serviceContext.indexer,
-        automergeHost: this._serviceContext.automergeHost,
-      }),
+      QueryService: this._queryService,
 
       NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
 
@@ -340,6 +344,7 @@ export class ClientServicesHost {
     await this._devtoolsProxy?.close();
     this._serviceRegistry.setServices({ SystemService: this._systemService });
     await this._loggingService.close();
+    await this._queryService.close();
     await this._serviceContext.close();
     await this._level?.close();
     this._open = false;

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.4.10-main.4c7b3fa";
+export const DXOS_VERSION = "0.4.10-main.4c8c73c";