@dxos/client-services 0.4.8-main.de30065 → 0.4.8-main.e23f3c5

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

@@ -1 +1 @@
-{"version":3,"file":"service-context.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/services/service-context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service-context.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/services/service-context.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.8-main.de30065";
+export declare const DXOS_VERSION = "0.4.8-main.e23f3c5";
 //# sourceMappingURL=version.d.ts.map

package/package.json

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

package/src/packlets/identity/identity.ts

@@ -97,6 +97,7 @@ export class Identity {
 
   @trace.span()
   async close(ctx: Context) {
+    await this._presence?.destroy();
     await this.authVerifier.close();
     await this.space.spaceState.removeCredentialProcessor(this._profileStateMachine);
     await this.space.spaceState.removeCredentialProcessor(this._deviceStateMachine);

package/src/packlets/indexing/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export * from './util';

package/src/packlets/indexing/util.ts

@@ -0,0 +1,89 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { getHeads } from '@dxos/automerge/automerge';
+import { type DocHandle } from '@dxos/automerge/automerge-repo';
+import { warnAfterTimeout } from '@dxos/debug';
+import { type AutomergeHost } from '@dxos/echo-pipeline';
+import { type ObjectSnapshot } from '@dxos/indexing';
+import { idCodec } from '@dxos/protocols';
+
+/**
+ * Factory for `loadDocuments` iterator.
+ */
+export const createLoadDocuments = (automergeHost: AutomergeHost) =>
+  /**
+   * Get object data blobs from Automerge Repo by ids.
+   * @param ids
+   */
+  // TODO(mykola): Unload automerge handles after usage.
+  async function* loadDocuments(ids: string[]) {
+    for (const id of ids) {
+      const { documentId, objectId } = idCodec.decode(id);
+      const handle = automergeHost.repo.find(documentId as any);
+      await warnAfterTimeout(5000, 'to long to load doc', () => handle.whenReady());
+      const doc = handle.docSync();
+      const heads = getHeads(doc);
+      yield [{ id, object: doc.objects[objectId], currentHash: heads.at(-1)! }];
+    }
+  };
+
+/**
+ * Factory for `getAllDocuments` iterator.
+ */
+export const createGetAllDocuments = (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;
+      }
+
+      await warnAfterTimeout(5000, 'to long to load doc', () => 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.at(-1)!,
+          };
+        });
+      }
+
+      if (doc.links) {
+        for (const id of Object.values(doc.links as { [echoId: string]: string })) {
+          if (visited.has(id)) {
+            continue;
+          }
+          const linkHandle = automergeHost.repo.find(id as any);
+          for await (const result of getObjectsFromHandle(linkHandle)) {
+            yield result;
+          }
+        }
+      }
+
+      visited.add(handle.documentId);
+    }
+
+    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

@@ -3,10 +3,9 @@
 //
 
 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, warnAfterTimeout } from '@dxos/debug';
+import { failUndefined } from '@dxos/debug';
 import {
   valueEncoding,
   MetadataStore,
@@ -24,7 +23,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, idCodec, trace } from '@dxos/protocols';
+import { InvalidStorageVersionError, STORAGE_VERSION, 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';
@@ -39,6 +38,7 @@ import {
   type IdentityManagerRuntimeParams,
   type JoinIdentityParams,
 } from '../identity';
+import { createGetAllDocuments, createLoadDocuments } from '../indexing';
 import {
   DeviceInvitationProtocol,
   InvitationsHandler,
@@ -136,19 +136,8 @@ export class ServiceContext {
     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);
-      },
+      loadDocuments: createLoadDocuments(this.automergeHost),
+      getAllDocuments: createGetAllDocuments(this.automergeHost),
     });
 
     this.invitations = new InvitationsHandler(this.networkManager);

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.4.8-main.de30065";
+export const DXOS_VERSION = "0.4.8-main.e23f3c5";