@dxos/client-services 0.1.19 → 0.1.21

package/src/packlets/spaces/data-space.ts

@@ -4,25 +4,42 @@
 
 import assert from 'node:assert';
 
+import { trackLeaks } from '@dxos/async';
 import { Context } from '@dxos/context';
-import { Database, DataPipelineControllerImpl, ISpace, Space } from '@dxos/echo-db';
+import { Database, DataPipelineControllerImpl, ISpace, MetadataStore, Space, SnapshotManager } from '@dxos/echo-db';
 import { PublicKey } from '@dxos/keys';
 import { ModelFactory } from '@dxos/model-factory';
 import { Presence } from '@dxos/teleport-extension-presence';
 
+export type DataSpaceParams = {
+  inner: Space;
+  modelFactory: ModelFactory;
+  metadataStore: MetadataStore;
+  snapshotManager: SnapshotManager;
+  presence: Presence;
+  memberKey: PublicKey;
+  snapshotId?: string | undefined;
+};
+
+@trackLeaks('open', 'close')
 export class DataSpace implements ISpace {
   private readonly _ctx = new Context();
   private readonly _dataPipelineController: DataPipelineControllerImpl;
+  private readonly _inner: Space;
+  private readonly _presence: Presence;
 
-  constructor(
-    private readonly _inner: Space,
-    private readonly _modelFactory: ModelFactory,
-    private readonly _memberKey: PublicKey,
-    private readonly _presence: Presence
-  ) {
-    this._dataPipelineController = new DataPipelineControllerImpl(_modelFactory, _memberKey, (feedKey) =>
-      _inner.spaceState.feeds.get(feedKey)
-    );
+  constructor(params: DataSpaceParams) {
+    this._inner = params.inner;
+    this._presence = params.presence;
+    this._dataPipelineController = new DataPipelineControllerImpl({
+      modelFactory: params.modelFactory,
+      metadataStore: params.metadataStore,
+      snapshotManager: params.snapshotManager,
+      memberKey: params.memberKey,
+      spaceKey: this._inner.key,
+      feedInfoProvider: (feedKey) => this._inner.spaceState.feeds.get(feedKey),
+      snapshotId: params.snapshotId
+    });
   }
 
   get key() {
@@ -56,6 +73,7 @@ export class DataSpace implements ISpace {
 
   async open() {
     await this._inner.open();
+    await this._inner.initDataPipeline(this._dataPipelineController);
   }
 
   async close() {

package/src/packlets/spaces/spaces-service.ts

@@ -2,18 +2,25 @@
 // Copyright 2022 DXOS.org
 //
 
+import { scheduleTask } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';
+import { raise } from '@dxos/debug';
+import { SpaceManager, SpaceNotFoundError } from '@dxos/echo-db';
 import {
+  QueryCredentialsRequest,
   QueryMembersRequest,
   QueryMembersResponse,
   Space,
   SpacesService
 } from '@dxos/protocols/proto/dxos/client/services';
+import { Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
 
 /**
  *
  */
 export class SpacesServiceImpl implements SpacesService {
+  constructor(private readonly _spaceManager: SpaceManager) {}
+
   async createSpace(): Promise<Space> {
     throw new Error();
   }
@@ -25,4 +32,18 @@ export class SpacesServiceImpl implements SpacesService {
   queryMembers(query: QueryMembersRequest): Stream<QueryMembersResponse> {
     throw new Error();
   }
+
+  queryCredentials({ spaceKey }: QueryCredentialsRequest): Stream<Credential> {
+    return new Stream(({ ctx, next }) => {
+      const space = this._spaceManager.spaces.get(spaceKey) ?? raise(new SpaceNotFoundError(spaceKey));
+
+      const processor = space.spaceState.registerProcessor({
+        process: async (credential) => {
+          next(credential);
+        }
+      });
+      ctx.onDispose(() => processor.close());
+      scheduleTask(ctx, () => processor.open());
+    });
+  }
 }

package/src/packlets/storage/storage.ts

@@ -1,20 +1,15 @@
 //
-// Copyright 2021 DXOS.org
-//
 
-import jsondown from 'jsondown'; // TODO(burdon): Uses custom implementation.
-import leveljs from 'level-js';
-import memdown from 'memdown';
+//
+// Copyright 2023 DXOS.org
+//
 
 import { InvalidConfigError } from '@dxos/errors';
 import { Runtime } from '@dxos/protocols/proto/dxos/config';
 import { createStorage, StorageType } from '@dxos/random-access-storage';
-import { isNode } from '@dxos/util';
 
 import StorageDriver = Runtime.Client.Storage.StorageDriver;
 
-export type KeyStorageType = 'ram' | 'leveljs' | 'jsondown';
-
 // TODO(burdon): Factor out.
 export const createStorageObjects = (config: Runtime.Client.Storage) => {
   const {
@@ -41,27 +36,10 @@ export const createStorageObjects = (config: Runtime.Client.Storage) => {
     storage: createStorage({
       type: persistent ? toStorageType(storageType) : StorageType.RAM,
       root: `${path}/`
-    }),
-    keyStorage: createKeyStorage(`${path}/keystore`, persistent ? toKeyStorageType(keyStorage) : 'ram')
+    })
   };
 };
 
-// TODO(burdon): Factor out.
-const createKeyStorage = (path: string, type?: KeyStorageType) => {
-  const defaultedType = type ?? (isNode() ? 'jsondown' : 'leveljs');
-
-  switch (defaultedType) {
-    case 'leveljs':
-      return leveljs(path);
-    case 'jsondown':
-      return jsondown(path);
-    case 'ram':
-      return memdown();
-    default:
-      throw new InvalidConfigError(`Invalid key storage type: ${defaultedType}`);
-  }
-};
-
 const toStorageType = (type: StorageDriver | undefined): StorageType | undefined => {
   switch (type) {
     case undefined:
@@ -80,18 +58,3 @@ const toStorageType = (type: StorageDriver | undefined): StorageType | undefined
       throw new Error(`Invalid storage type: ${StorageDriver[type]}`);
   }
 };
-
-const toKeyStorageType = (type: StorageDriver | undefined): KeyStorageType | undefined => {
-  switch (type) {
-    case undefined:
-      return undefined;
-    case StorageDriver.RAM:
-      return 'ram';
-    case StorageDriver.LEVELJS:
-      return 'leveljs';
-    case StorageDriver.JSONDOWN:
-      return 'jsondown';
-    default:
-      throw new Error(`Invalid key storage type: ${StorageDriver[type]}`);
-  }
-};

package/src/packlets/vault/worker-session.ts

@@ -61,6 +61,7 @@ export class WorkerSession {
         DevicesService: async () => (await this._getServices()).services.DevicesService,
         SpaceInvitationsService: async () => (await this._getServices()).services.SpaceInvitationsService,
         SpacesService: async () => (await this._getServices()).services.SpacesService,
+        NetworkService: async () => (await this._getServices()).services.NetworkService,
         SpaceService: async () => (await this._getServices()).services.SpaceService,
         DataService: async () => (await this._getServices()).services.DataService,
         ProfileService: async () => (await this._getServices()).services.ProfileService,