@dxos/client-services 0.4.9-main.4fd47cd → 0.4.9-main.7750cb2

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

@@ -6,18 +6,18 @@ import { EventSubscriptions, UpdateScheduler, scheduleTask } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';
 import { type CredentialProcessor } from '@dxos/credentials';
 import { raise } from '@dxos/debug';
-import { type DataServiceSubscriptions, type SpaceManager } from '@dxos/echo-pipeline';
+import { type SpaceManager } from '@dxos/echo-pipeline';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { ApiError, SpaceNotFoundError, encodeError } from '@dxos/protocols';
 import {
+  SpaceMember,
+  SpaceState,
   type CreateEpochRequest,
   type PostMessageRequest,
   type QueryCredentialsRequest,
   type QuerySpacesResponse,
   type Space,
-  SpaceMember,
-  SpaceState,
   type SpacesService,
   type SubscribeMessagesRequest,
   type UpdateSpaceRequest,
@@ -35,7 +35,6 @@ export class SpacesServiceImpl implements SpacesService {
   constructor(
     private readonly _identityManager: IdentityManager,
     private readonly _spaceManager: SpaceManager,
-    private readonly _dataServiceSubscriptions: DataServiceSubscriptions,
     private readonly _getDataSpaceManager: Provider<Promise<DataSpaceManager>>,
   ) {}
 
@@ -96,13 +95,10 @@ export class SpacesServiceImpl implements SpacesService {
             subscriptions.add(space.stateUpdate.on(ctx, () => scheduler.forceTrigger()));
 
             subscriptions.add(space.presence.updated.on(ctx, () => scheduler.trigger()));
-            subscriptions.add(space.dataPipeline.onNewEpoch.on(ctx, () => scheduler.trigger()));
+            subscriptions.add(space.automergeSpaceState.onNewEpoch.on(ctx, () => scheduler.trigger()));
 
             // Pipeline progress.
             subscriptions.add(space.inner.controlPipeline.state.timeframeUpdate.on(ctx, () => scheduler.trigger()));
-            if (space.dataPipeline.pipelineState) {
-              subscriptions.add(space.dataPipeline.pipelineState.timeframeUpdate.on(ctx, () => scheduler.trigger()));
-            }
           }
         };
 
@@ -190,19 +186,19 @@ export class SpacesServiceImpl implements SpacesService {
       state: space.state,
       error: space.error ? encodeError(space.error) : undefined,
       pipeline: {
-        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,
 
-        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,
+        dataFeeds: undefined,
+        startDataTimeframe: undefined,
+        currentDataTimeframe: undefined,
+        targetDataTimeframe: undefined,
+        totalDataTimeframe: undefined,
       },
       members: Array.from(space.inner.spaceState.members.values()).map((member) => {
         const peers = space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key));

package/src/packlets/testing/test-builder.ts

@@ -6,21 +6,12 @@ import { type Config } from '@dxos/config';
 import { Context } from '@dxos/context';
 import { createCredentialSignerWithChain, CredentialGenerator } from '@dxos/credentials';
 import { failUndefined } from '@dxos/debug';
-import {
-  SnapshotStore,
-  type DataPipeline,
-  MetadataStore,
-  SpaceManager,
-  valueEncoding,
-  DataServiceSubscriptions,
-  AutomergeHost,
-} from '@dxos/echo-pipeline';
-import { testLocalDatabase } from '@dxos/echo-pipeline/testing';
+import { AutomergeHost, MetadataStore, SnapshotStore, SpaceManager, valueEncoding } from '@dxos/echo-pipeline';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
 import { MemorySignalManager, MemorySignalManagerContext } from '@dxos/messaging';
 import { MemoryTransportFactory, NetworkManager } from '@dxos/network-manager';
-import { createStorage, type Storage, StorageType } from '@dxos/random-access-storage';
+import { createStorage, StorageType, type Storage } from '@dxos/random-access-storage';
 import { BlobStore } from '@dxos/teleport-extension-object-sync';
 
 import { ClientServicesHost, createDefaultModelFactory, ServiceContext } from '../services';
@@ -72,16 +63,6 @@ export const createIdentity = async (peer: ServiceContext) => {
   return peer;
 };
 
-// TODO(burdon): Remove @dxos/client-testing.
-// TODO(burdon): Create builder and make configurable.
-/**
- * @deprecated
- */
-export const syncItemsLocal = async (db1: DataPipeline, db2: DataPipeline) => {
-  await testLocalDatabase(db1, db2);
-  await testLocalDatabase(db2, db1);
-};
-
 export class TestBuilder {
   public readonly signalContext = new MemorySignalManagerContext();
   private readonly _ctx = new Context();
@@ -189,7 +170,6 @@ export class TestPeer {
     return (this._props.dataSpaceManager ??= new DataSpaceManager(
       this.spaceManager,
       this.metadataStore,
-      new DataServiceSubscriptions(),
       this.keyring,
       this.identity,
       this.feedStore,

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.4.9-main.4fd47cd";
+export const DXOS_VERSION = "0.4.9-main.7750cb2";