@dxos/client-services 0.4.9-main.a108ade → 0.4.9-main.a3cfaa7

package/src/packlets/indexing/util.ts

@@ -24,8 +24,8 @@ export const createLoadDocuments = (automergeHost: AutomergeHost) =>
       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)! }];
+      const hash = getHeads(doc).join('');
+      yield [{ id, object: doc.objects[objectId], currentHash: hash }];
     }
   };
 

package/src/packlets/invitations/space-invitation-protocol.test.ts

@@ -6,13 +6,12 @@ import { expect } from 'chai';
 
 import { asyncChain, Trigger } from '@dxos/async';
 import { raise } from '@dxos/debug';
-import { testLocalDatabase } from '@dxos/echo-pipeline/testing';
 import { AlreadyJoinedError } from '@dxos/protocols';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import { afterTest, describe, test } from '@dxos/test';
 
 import { type ServiceContext } from '../services';
-import { createIdentity, createPeers, syncItemsLocal } from '../testing';
+import { createIdentity, createPeers } from '../testing';
 import { performInvitation } from '../testing/invitation-utils';
 
 const closeAfterTest = async (peer: ServiceContext) => {
@@ -40,14 +39,6 @@ describe('services/space-invitations-protocol', () => {
     await space.close();
   });
 
-  test('genesis with database mutations', async () => {
-    const [peer] = await asyncChain<ServiceContext>([createIdentity, closeAfterTest])(createPeers(1));
-    const space = await peer.dataSpaceManager!.createSpace();
-    afterTest(() => space.close());
-
-    await testLocalDatabase(space.dataPipeline);
-  });
-
   test('invitation with no auth', async () => {
     const [host, guest] = await asyncChain<ServiceContext>([createIdentity, closeAfterTest])(createPeers(2));
 
@@ -65,7 +56,7 @@ describe('services/space-invitations-protocol', () => {
       await host.dataSpaceManager?.waitUntilSpaceReady(space1.key);
       await guest.dataSpaceManager?.waitUntilSpaceReady(space2.key);
 
-      await syncItemsLocal(space1.dataPipeline, space2.dataPipeline);
+      await space2.inner.controlPipeline.state.waitUntilTimeframe(space1.inner.controlPipeline.state.timeframe);
 
       await space1.close();
       await space2.close();
@@ -149,7 +140,7 @@ describe('services/space-invitations-protocol', () => {
       await host.dataSpaceManager?.waitUntilSpaceReady(space1.key);
       await guest.dataSpaceManager?.waitUntilSpaceReady(space2.key);
 
-      await syncItemsLocal(space1.dataPipeline, space2.dataPipeline);
+      await space2.inner.controlPipeline.state.waitUntilTimeframe(space1.inner.controlPipeline.state.timeframe);
 
       await space1.close();
       await space2.close();

package/src/packlets/invitations/space-invitation-protocol.ts

@@ -72,7 +72,6 @@ export class SpaceInvitationProtocol implements InvitationProtocol {
       space: {
         credential: spaceMemberCredential,
         controlTimeframe: space.inner.controlPipeline.state.timeframe,
-        dataTimeframe: space.dataPipeline.pipelineState?.timeframe,
       },
     };
   }

package/src/packlets/services/automerge-host.test.ts

@@ -5,7 +5,7 @@
 import { expect } from 'chai';
 
 import { asyncTimeout, sleep } from '@dxos/async';
-import { AutomergeHost, DataServiceImpl, type DataServiceSubscriptions } from '@dxos/echo-pipeline';
+import { AutomergeHost, DataServiceImpl } from '@dxos/echo-pipeline';
 import { AutomergeContext } from '@dxos/echo-schema';
 import { StorageType, createStorage } from '@dxos/random-access-storage';
 import { afterTest, describe, test } from '@dxos/test';
@@ -23,10 +23,7 @@ describe('AutomergeHost', () => {
 
     const host = new AutomergeHost({ directory: storageDirectory });
     afterTest(() => host.close());
-    const dataService = new DataServiceImpl(
-      {} as DataServiceSubscriptions, // is not used in this test, just required argument
-      host,
-    );
+    const dataService = new DataServiceImpl(host);
     const client = new AutomergeContext(dataService);
     afterTest(() => client.close());
 

package/src/packlets/services/diagnostics.ts

@@ -6,21 +6,18 @@ import { type ClientServices } from '@dxos/client-protocol';
 import { getFirstStreamValue } from '@dxos/codec-protobuf';
 import { type Config, type ConfigProto } from '@dxos/config';
 import { credentialTypeFilter } from '@dxos/credentials';
-import { DocumentModel, type DocumentModelState } from '@dxos/document-model';
-import { TYPE_PROPERTIES } from '@dxos/echo-db';
 import { invariant } from '@dxos/invariant';
 import { type PublicKey } from '@dxos/keys';
-import { log } from '@dxos/log';
 import { STORAGE_VERSION } from '@dxos/protocols';
 import {
+  SpaceMember,
   type Device,
   type Identity,
+  type LogEntry,
   type Metrics,
   type NetworkStatus,
-  type Space as SpaceProto,
   type Platform,
-  SpaceMember,
-  type LogEntry,
+  type Space as SpaceProto,
 } from '@dxos/protocols/proto/dxos/client/services';
 import { type SubscribeToFeedsResponse } from '@dxos/protocols/proto/dxos/devtools/host';
 import { type SwarmInfo } from '@dxos/protocols/proto/dxos/devtools/swarm';
@@ -180,25 +177,6 @@ export const createDiagnostics = async (
   return diagnostics;
 };
 
-const getProperties = (space: DataSpace) => {
-  let properties: any = {};
-  try {
-    // Add properties to cache.
-    const propertiesItem = space.dataPipeline.itemManager.items.find(
-      (item) =>
-        item.modelMeta?.type === DocumentModel.meta.type &&
-        (item.state as DocumentModelState)?.type?.itemId === TYPE_PROPERTIES,
-    );
-
-    const state = propertiesItem?.state as DocumentModelState;
-    properties = state?.data;
-  } catch (err: any) {
-    log.warn(err.message);
-  }
-
-  return properties;
-};
-
 const getSpaceStats = async (space: DataSpace): Promise<SpaceStats> => {
   const stats: SpaceStats = {
     key: space.key,
@@ -226,33 +204,16 @@ const getSpaceStats = async (space: DataSpace): Promise<SpaceStats> => {
 
     pipeline: {
       // TODO(burdon): Pick properties from credentials if needed.
-      // currentEpoch: space.dataPipeline.currentEpoch,
-      // appliedEpoch: space.dataPipeline.appliedEpoch,
+      currentEpoch: space.automergeSpaceState.lastEpoch,
+      appliedEpoch: space.automergeSpaceState.lastEpoch,
 
       controlFeeds: space.inner.controlPipeline.state.feeds.map((feed) => feed.key),
       currentControlTimeframe: space.inner.controlPipeline.state.timeframe,
       targetControlTimeframe: space.inner.controlPipeline.state.targetTimeframe,
       totalControlTimeframe: space.inner.controlPipeline.state.endTimeframe,
-
-      // TODO(burdon): Empty?
-      dataFeeds: space.dataPipeline.pipelineState?.feeds.map((feed) => feed.key) ?? [],
-      startDataTimeframe: space.dataPipeline.pipelineState?.startTimeframe,
-      currentDataTimeframe: space.dataPipeline.pipelineState?.timeframe,
-      targetDataTimeframe: space.dataPipeline.pipelineState?.targetTimeframe,
-      totalDataTimeframe: space.dataPipeline.pipelineState?.endTimeframe,
     },
   };
 
-  // TODO(burdon): May not be open?
-  if (space.dataPipeline.itemManager) {
-    Object.assign(stats, {
-      properties: getProperties(space),
-      db: {
-        objects: space.dataPipeline.itemManager.entities.size,
-      },
-    } as SpaceStats);
-  }
-
   // TODO(burdon): Factor out.
   if (stats.metrics) {
     const { open, ready } = stats.metrics;

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

@@ -2,87 +2,14 @@
 // Copyright 2023 DXOS.org
 //
 
-import { expect } from 'chai';
-
-import { DocumentModel, type DocumentModelState, MutationBuilder } from '@dxos/document-model';
-import { createModelMutation, encodeModelMutation, genesisMutation } from '@dxos/echo-db';
-import { type WriteReceipt } from '@dxos/feed-store';
-import { PublicKey } from '@dxos/keys';
-import { log } from '@dxos/log';
 import { MemorySignalManagerContext } from '@dxos/messaging';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import { describe, test } from '@dxos/test';
-import { Timeframe } from '@dxos/timeframe';
-import { range } from '@dxos/util';
 
-import { createServiceContext, syncItemsLocal } from '../testing';
+import { createServiceContext } from '../testing';
 import { performInvitation } from '../testing/invitation-utils';
 
 describe('services/ServiceContext', () => {
-  test('existing space is synchronized on device invitations', async () => {
-    const networkContext = new MemorySignalManagerContext();
-    const device1 = createServiceContext({ signalContext: networkContext });
-    await device1.createIdentity();
-    const space1 = await device1.dataSpaceManager!.createSpace();
-
-    const itemId = PublicKey.random().toHex();
-    await space1.dataPipeline.databaseHost!.getWriteStream()?.write({
-      batch: genesisMutation(itemId, DocumentModel.meta.type),
-    });
-
-    let counter = 0;
-
-    for (const _ in range(5)) {
-      const receipts: WriteReceipt[] = [];
-      for (const _ in range(50)) {
-        receipts.push(
-          await space1.dataPipeline.databaseHost!.getWriteStream()!.write({
-            batch: createModelMutation(
-              itemId,
-              encodeModelMutation(DocumentModel.meta, new MutationBuilder().set('counter', ++counter).build()),
-            ),
-          }),
-        );
-      }
-
-      await space1.dataPipeline.pipelineState!.waitUntilTimeframe(
-        Timeframe.merge(...receipts.map((receipt) => new Timeframe([[receipt.feedKey, receipt.seq]]))),
-      );
-
-      await space1.createEpoch();
-      log('epoch', { number: space1.dataPipeline.currentEpoch?.subject.assertion.number });
-    }
-
-    const device2 = createServiceContext({ signalContext: networkContext });
-    await Promise.all(performInvitation({ host: device1, guest: device2, options: { kind: Invitation.Kind.DEVICE } }));
-
-    await device2.dataSpaceManager!.waitUntilSpaceReady(space1!.key);
-    const space2 = await device2.dataSpaceManager!.spaces.get(space1.key);
-
-    log('peer 2', {
-      currentEpoch: space2!.dataPipeline.currentEpoch?.subject.assertion.number,
-      appliedEpoch: space2!.dataPipeline.appliedEpoch?.subject.assertion.number,
-    });
-
-    await space2?.dataPipeline.onNewEpoch.waitForCondition(
-      () =>
-        space2!.dataPipeline.appliedEpoch?.subject.assertion.number ===
-        space1.dataPipeline.currentEpoch?.subject.assertion.number,
-    );
-
-    expect(space2!.dataPipeline.currentEpoch!.subject.assertion.number).to.equal(
-      space1.dataPipeline.currentEpoch!.subject.assertion.number,
-    );
-    expect(space2!.dataPipeline.appliedEpoch!.subject.assertion.number).to.equal(
-      space1.dataPipeline.appliedEpoch!.subject.assertion.number,
-    );
-
-    const item2 = space2!.dataPipeline.itemManager.entities.get(itemId);
-    expect((item2!.state as DocumentModelState).data.counter).to.equal(counter);
-
-    await syncItemsLocal(space1.dataPipeline, space2!.dataPipeline);
-  });
-
   test('new space is synchronized on device invitations', async () => {
     const networkContext = new MemorySignalManagerContext();
     const device1 = createServiceContext({ signalContext: networkContext });
@@ -94,7 +21,7 @@ describe('services/ServiceContext', () => {
     const space1 = await device1.dataSpaceManager!.createSpace();
     await device2.dataSpaceManager!.waitUntilSpaceReady(space1!.key);
     const space2 = await device2.dataSpaceManager!.spaces.get(space1.key);
-    await syncItemsLocal(space1.dataPipeline, space2!.dataPipeline);
+    await space2!.inner.controlPipeline.state.waitUntilTimeframe(space1.inner.controlPipeline.state.timeframe);
   }).tag('flaky');
 
   test('joined space is synchronized on device invitations', async () => {
@@ -118,6 +45,6 @@ describe('services/ServiceContext', () => {
 
     await device2.dataSpaceManager!.waitUntilSpaceReady(space1!.key);
     const space2 = await device2.dataSpaceManager!.spaces.get(space1.key);
-    await syncItemsLocal(space1.dataPipeline, space2!.dataPipeline);
+    await space2!.inner.controlPipeline.state.waitUntilTimeframe(space1.inner.controlPipeline.state.timeframe);
   });
 });

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

@@ -4,16 +4,9 @@
 
 import { Trigger } from '@dxos/async';
 import { Context } from '@dxos/context';
-import { type CredentialProcessor, getCredentialAssertion } from '@dxos/credentials';
+import { getCredentialAssertion, type CredentialProcessor } from '@dxos/credentials';
 import { failUndefined } from '@dxos/debug';
-import {
-  valueEncoding,
-  MetadataStore,
-  SpaceManager,
-  DataServiceSubscriptions,
-  SnapshotStore,
-  AutomergeHost,
-} from '@dxos/echo-pipeline';
+import { AutomergeHost, MetadataStore, SnapshotStore, SpaceManager, valueEncoding } from '@dxos/echo-pipeline';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { IndexMetadataStore, IndexStore, Indexer } from '@dxos/indexing';
 import { invariant } from '@dxos/invariant';
@@ -21,20 +14,19 @@ import { Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
 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 { 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';
+import { type Credential, type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { type Storage } from '@dxos/random-access-storage';
 import { BlobStore } from '@dxos/teleport-extension-object-sync';
 import { trace as Trace } from '@dxos/tracing';
 import { safeInstanceof } from '@dxos/util';
 
 import {
-  type CreateIdentityOptions,
   IdentityManager,
+  type CreateIdentityOptions,
   type IdentityManagerRuntimeParams,
   type JoinIdentityParams,
 } from '../identity';
@@ -42,8 +34,8 @@ import { createGetAllDocuments, createLoadDocuments } from '../indexing';
 import {
   DeviceInvitationProtocol,
   InvitationsHandler,
-  type InvitationProtocol,
   SpaceInvitationProtocol,
+  type InvitationProtocol,
 } from '../invitations';
 import { DataSpaceManager, type DataSpaceManagerRuntimeParams, type SigningContext } from '../spaces';
 
@@ -57,7 +49,6 @@ export type ServiceContextRuntimeParams = IdentityManagerRuntimeParams & DataSpa
 @Trace.resource()
 export class ServiceContext {
   public readonly initialized = new Trigger();
-  public readonly dataServiceSubscriptions = new DataServiceSubscriptions();
   public readonly metadataStore: MetadataStore;
   /**
    * @deprecated
@@ -89,7 +80,6 @@ export class ServiceContext {
     public readonly storage: Storage,
     public readonly networkManager: NetworkManager,
     public readonly signalManager: SignalManager,
-    public readonly modelFactory: ModelFactory,
     public readonly _runtimeParams?: IdentityManagerRuntimeParams & DataSpaceManagerRuntimeParams,
   ) {
     // TODO(burdon): Move strings to constants.
@@ -114,7 +104,6 @@ export class ServiceContext {
       networkManager: this.networkManager,
       blobStore: this.blobStore,
       metadataStore: this.metadataStore,
-      modelFactory: this.modelFactory,
       snapshotStore: this.snapshotStore,
     });
 
@@ -186,7 +175,6 @@ export class ServiceContext {
     await this.feedStore.close();
     await this.networkManager.close();
     await this.signalManager.close();
-    this.dataServiceSubscriptions.clear();
     await this.metadataStore.close();
     await this.indexer.destroy();
     log('closed');
@@ -246,7 +234,6 @@ export class ServiceContext {
     this.dataSpaceManager = new DataSpaceManager(
       this.spaceManager,
       this.metadataStore,
-      this.dataServiceSubscriptions,
       this.keyring,
       signingContext,
       this.feedStore,

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

@@ -3,23 +3,20 @@
 //
 
 import { Event, synchronized } from '@dxos/async';
-import { clientServiceBundle, type ClientServices, defaultKey, Properties } from '@dxos/client-protocol';
+import { Properties, clientServiceBundle, defaultKey, type ClientServices } from '@dxos/client-protocol';
 import { type Config } from '@dxos/config';
 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 { getAutomergeObjectCore, getRawDoc, type SpaceDoc, type TypedObject } from '@dxos/echo-schema';
 import { IndexServiceImpl } from '@dxos/indexing';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { type SignalManager, WebsocketSignalManager } from '@dxos/messaging';
-import { ModelFactory } from '@dxos/model-factory';
-import { createSimplePeerTransportFactory, NetworkManager, type TransportFactory } from '@dxos/network-manager';
+import { WebsocketSignalManager, type SignalManager } from '@dxos/messaging';
+import { NetworkManager, createSimplePeerTransportFactory, type TransportFactory } from '@dxos/network-manager';
 import { trace } from '@dxos/protocols';
 import { SystemStatus } from '@dxos/protocols/proto/dxos/client/services';
 import { type Storage } from '@dxos/random-access-storage';
-import { TextModel } from '@dxos/text-model';
 import { TRACE_PROCESSOR, trace as Trace } from '@dxos/tracing';
 import { assignDeep } from '@dxos/util';
 import { WebsocketRpcClient } from '@dxos/websocket-rpc';
@@ -28,7 +25,7 @@ import { createDiagnostics } from './diagnostics';
 import { ServiceContext, type ServiceContextRuntimeParams } from './service-context';
 import { ServiceRegistry } from './service-registry';
 import { DevicesServiceImpl } from '../devices';
-import { DevtoolsServiceImpl, DevtoolsHostEvents } from '../devtools';
+import { DevtoolsHostEvents, DevtoolsServiceImpl } from '../devtools';
 import { IdentityServiceImpl, type CreateIdentityOptions } from '../identity';
 import { InvitationsServiceImpl } from '../invitations';
 import { Lock, type ResourceLock } from '../locks';
@@ -38,17 +35,11 @@ import { SpacesServiceImpl } from '../spaces';
 import { createStorageObjects } from '../storage';
 import { SystemServiceImpl } from '../system';
 
-// TODO(burdon): Factor out to spaces.
-export const createDefaultModelFactory = () => {
-  return new ModelFactory().registerModel(DocumentModel).registerModel(TextModel);
-};
-
 export type ClientServicesHostParams = {
   /**
    * Can be omitted if `initialize` is later called.
    */
   config?: Config;
-  modelFactory?: ModelFactory;
   transportFactory?: TransportFactory;
   signalManager?: SignalManager;
   connectionLog?: boolean;
@@ -82,7 +73,6 @@ export class ClientServicesHost {
 
   private _config?: Config;
   private readonly _statusUpdate = new Event<void>();
-  private readonly _modelFactory: ModelFactory;
   private _signalManager?: SignalManager;
   private _networkManager?: NetworkManager;
   private _storage?: Storage;
@@ -100,7 +90,6 @@ export class ClientServicesHost {
 
   constructor({
     config,
-    modelFactory = createDefaultModelFactory(),
     transportFactory,
     signalManager,
     storage,
@@ -110,7 +99,6 @@ export class ClientServicesHost {
     runtimeParams,
   }: ClientServicesHostParams = {}) {
     this._storage = storage;
-    this._modelFactory = modelFactory;
     this._callbacks = callbacks;
     this._runtimeParams = runtimeParams;
 
@@ -243,7 +231,6 @@ export class ClientServicesHost {
       this._storage,
       this._networkManager,
       this._signalManager,
-      this._modelFactory,
       this._runtimeParams,
     );
 
@@ -268,17 +255,13 @@ export class ClientServicesHost {
       SpacesService: new SpacesServiceImpl(
         this._serviceContext.identityManager,
         this._serviceContext.spaceManager,
-        this._serviceContext.dataServiceSubscriptions,
         async () => {
           await this._serviceContext.initialized.wait();
           return this._serviceContext.dataSpaceManager!;
         },
       ),
 
-      DataService: new DataServiceImpl(
-        this._serviceContext.dataServiceSubscriptions,
-        this._serviceContext.automergeHost,
-      ),
+      DataService: new DataServiceImpl(this._serviceContext.automergeHost),
 
       IndexService: new IndexServiceImpl({
         indexer: this._serviceContext.indexer,

package/src/packlets/spaces/automerge-space-state.ts

@@ -2,6 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
+import { Event } from '@dxos/async';
 import { type CredentialProcessor, type SpecificCredential, checkCredentialType } from '@dxos/credentials';
 import { type Credential, type Epoch } from '@dxos/protocols/proto/dxos/halo/credentials';
 
@@ -9,6 +10,8 @@ export class AutomergeSpaceState implements CredentialProcessor {
   public rootUrl: string | undefined = undefined;
   public lastEpoch: SpecificCredential<Epoch> | undefined = undefined;
 
+  public readonly onNewEpoch = new Event<SpecificCredential<Epoch>>();
+
   private _isProcessingRootDocs = false;
 
   constructor(private readonly _onNewRoot: (rootUrl: string) => void) {}
@@ -26,6 +29,8 @@ export class AutomergeSpaceState implements CredentialProcessor {
         this._onNewRoot(this.rootUrl);
       }
     }
+
+    this.onNewEpoch.emit(credential);
   }
 
   startProcessingRootDocs() {
@@ -38,4 +43,8 @@ export class AutomergeSpaceState implements CredentialProcessor {
     }
     this._isProcessingRootDocs = true;
   }
+
+  async ensureEpochInitialized() {
+    await this.onNewEpoch.waitForCondition(() => !!this.lastEpoch);
+  }
 }