@dxos/client-services 0.4.10-main.30a328e → 0.4.10-main.32aef1b

package/dist/types/src/packlets/indexing/util.d.ts

@@ -1,5 +1,4 @@
 import { type AutomergeHost } from '@dxos/echo-pipeline';
-import { type ObjectSnapshot } from '@dxos/indexing';
 import { type ObjectPointerEncoded } from '@dxos/protocols';
 /**
  * Factory for `loadDocuments` iterator.
@@ -9,8 +8,4 @@ export declare const createSelectedDocumentsIterator: (automergeHost: AutomergeH
     object: any;
     currentHash: string;
 }[], void, unknown>;
-/**
- * Factory for `getAllDocuments` iterator.
- */
-export declare const createDocumentsIterator: (automergeHost: AutomergeHost) => () => AsyncGenerator<ObjectSnapshot[], void, 'done'>;
 //# sourceMappingURL=util.d.ts.map

package/dist/types/src/packlets/indexing/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/indexing/util.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,KAAK,oBAAoB,EAAW,MAAM,iBAAiB,CAAC;AAErE;;GAEG;AACH,eAAO,MAAM,+BAA+B,kBAAmB,aAAa,WAMvC,oBAAoB,EAAE;;;;mBAaxD,CAAC;AAEJ;;GAEG;AACH,eAAO,MAAM,uBAAuB,kBAAmB,aAAa,WAM/B,eAAe,cAAc,EAAE,EAAE,IAAI,EAAE,MAAM,CAoD/E,CAAC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/indexing/util.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,KAAK,oBAAoB,EAAW,MAAM,iBAAiB,CAAC;AAErE;;GAEG;AACH,eAAO,MAAM,+BAA+B,kBAAmB,aAAa,WAMvC,oBAAoB,EAAE;;;;mBAaxD,CAAC"}

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

@@ -1,2 +1,2 @@
-export declare const DXOS_VERSION = "0.4.10-main.30a328e";
+export declare const DXOS_VERSION = "0.4.10-main.32aef1b";
 //# sourceMappingURL=version.d.ts.map

package/package.json

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

package/src/packlets/indexing/util.ts

@@ -3,9 +3,8 @@
 //
 
 import { getHeads } from '@dxos/automerge/automerge';
-import { type DocumentId, type DocHandle } from '@dxos/automerge/automerge-repo';
+import { type DocumentId } 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';
 
 /**
@@ -31,66 +30,3 @@ export const createSelectedDocumentsIterator = (automergeHost: AutomergeHost) =>
       yield doc.objects?.[objectId] ? [{ id, object: doc.objects[objectId], currentHash: hash }] : [];
     }
   };
-
-/**
- * Factory for `getAllDocuments` iterator.
- */
-export const createDocumentsIterator = (automergeHost: AutomergeHost) =>
-  /**
-   * Recursively get all object data blobs from Automerge Repo.
-   * @param ids
-   */
-  // TODO(mykola): Unload automerge handles after usage.
-  async function* getAllDocuments(): AsyncGenerator<ObjectSnapshot[], void, 'done'> {
-    /** visited automerge handles */
-    const visited = new Set<string>();
-
-    async function* getObjectsFromHandle(handle: DocHandle<any>): AsyncGenerator<ObjectSnapshot[]> {
-      if (visited.has(handle.documentId)) {
-        return;
-      }
-
-      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();
-      }
-      const doc = handle.docSync();
-
-      const heads = getHeads(doc);
-
-      if (doc.objects) {
-        yield Object.entries(doc.objects as { [key: string]: any }).map(([objectId, object]) => {
-          return {
-            id: idCodec.encode({ documentId: handle.documentId, objectId }),
-            object,
-            currentHash: heads.join(''),
-          };
-        });
-      }
-
-      if (doc.links) {
-        for (const id of Object.values(doc.links as { [echoId: string]: string })) {
-          if (visited.has(id)) {
-            continue;
-          }
-          const linkHandle = automergeHost.repo.handles[id as DocumentId] ?? automergeHost.repo.find(id as DocumentId);
-          for await (const result of getObjectsFromHandle(linkHandle)) {
-            yield result;
-          }
-        }
-      }
-
-      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;
-      }
-      for await (const result of getObjectsFromHandle(handle)) {
-        yield result;
-      }
-      visited.add(handle.documentId);
-    }
-  };

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

@@ -32,7 +32,7 @@ import {
   type IdentityManagerRuntimeParams,
   type JoinIdentityParams,
 } from '../identity';
-import { createDocumentsIterator, createSelectedDocumentsIterator } from '../indexing';
+import { createSelectedDocumentsIterator } from '../indexing';
 import {
   DeviceInvitationProtocol,
   InvitationsHandler,
@@ -131,10 +131,10 @@ export class ServiceContext extends Resource {
     });
 
     this.indexer = new Indexer({
+      db: this.level,
       indexStore: new IndexStore({ db: level.sublevel('index-storage') }),
       metadataStore: this.indexMetadata,
       loadDocuments: createSelectedDocumentsIterator(this.automergeHost),
-      getAllDocuments: createDocumentsIterator(this.automergeHost),
     });
 
     this.invitations = new InvitationsHandler(this.networkManager);

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.4.10-main.30a328e";
+export const DXOS_VERSION = "0.4.10-main.32aef1b";