@dxos/echo-pipeline 0.4.8-next.fff1521 → 0.4.9-main.1057b49

package/src/space/space.ts

@@ -2,22 +2,20 @@
 // Copyright 2022 DXOS.org
 //
 
-import { Event, synchronized, trackLeaks, Mutex } from '@dxos/async';
+import { Event, Mutex, synchronized, trackLeaks } from '@dxos/async';
 import { type Context } from '@dxos/context';
 import { type FeedInfo } from '@dxos/credentials';
 import { type FeedOptions, type FeedWrapper } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
 import { type PublicKey } from '@dxos/keys';
 import { log, logInfo } from '@dxos/log';
-import { type ModelFactory } from '@dxos/model-factory';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { AdmittedFeed, type Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { type Timeframe } from '@dxos/timeframe';
 import { trace } from '@dxos/tracing';
-import { type AsyncCallback, Callback } from '@dxos/util';
+import { Callback, type AsyncCallback } from '@dxos/util';
 
 import { ControlPipeline } from './control-pipeline';
-import { DataPipeline } from './data-pipeline';
 import { type SpaceProtocol } from './space-protocol';
 import { type SnapshotManager } from '../db-host';
 import { type MetadataStore } from '../metadata';
@@ -31,7 +29,6 @@ export type SpaceParams = {
   protocol: SpaceProtocol;
   genesisFeed: FeedWrapper<FeedMessage>;
   feedProvider: FeedProvider;
-  modelFactory: ModelFactory;
   metadataStore: MetadataStore;
   snapshotManager: SnapshotManager;
   memberKey: PublicKey;
@@ -65,9 +62,6 @@ export class Space {
   @trace.info()
   private readonly _controlPipeline: ControlPipeline;
 
-  @trace.info()
-  private readonly _dataPipeline: DataPipeline;
-
   private readonly _snapshotManager: SnapshotManager;
 
   private _isOpen = false;
@@ -93,17 +87,6 @@ export class Space {
       // Enable sparse replication to not download mutations covered by prior epochs.
       const sparse = info.assertion.designation === AdmittedFeed.Designation.DATA;
 
-      if (info.assertion.designation === AdmittedFeed.Designation.DATA) {
-        // We will add all existing data feeds when the data pipeline is initialized.
-        queueMicrotask(async () => {
-          if (this._dataPipeline.pipeline) {
-            if (!this._dataPipeline.pipeline.hasFeed(info.key)) {
-              return this._dataPipeline.pipeline.addFeed(await this._feedProvider(info.key, { sparse }));
-            }
-          }
-        });
-      }
-
       if (!info.key.equals(params.genesisFeed.key)) {
         queueMicrotask(async () => {
           this.protocol.addFeed(await params.feedProvider(info.key, { sparse }));
@@ -120,30 +103,6 @@ export class Space {
     // Start replicating the genesis feed.
     this.protocol = params.protocol;
     this.protocol.addFeed(params.genesisFeed);
-
-    this._dataPipeline = new DataPipeline({
-      modelFactory: params.modelFactory,
-      metadataStore: params.metadataStore,
-      snapshotManager: params.snapshotManager,
-      memberKey: params.memberKey,
-      spaceKey: this._key,
-      feedInfoProvider: (feedKey) => this._controlPipeline.spaceState.feeds.get(feedKey),
-      snapshotId: params.snapshotId,
-      onPipelineCreated: async (pipeline) => {
-        if (this._dataFeed) {
-          pipeline.setWriteFeed(this._dataFeed);
-        }
-
-        // Add existing feeds.
-        await this._addFeedMutex.executeSynchronized(async () => {
-          for (const feed of this._controlPipeline.spaceState.feeds.values()) {
-            if (feed.assertion.designation === AdmittedFeed.Designation.DATA && !pipeline.hasFeed(feed.key)) {
-              await pipeline.addFeed(await this._feedProvider(feed.key, { sparse: true }));
-            }
-          }
-        });
-      },
-    });
   }
 
   @logInfo
@@ -179,10 +138,6 @@ export class Space {
     return this._controlPipeline.pipeline;
   }
 
-  get dataPipeline(): DataPipeline {
-    return this._dataPipeline;
-  }
-
   get snapshotManager(): SnapshotManager {
     return this._snapshotManager;
   }
@@ -197,8 +152,6 @@ export class Space {
   async setDataFeed(feed: FeedWrapper<FeedMessage>) {
     invariant(!this._dataFeed, 'Data feed already set.');
     this._dataFeed = feed;
-    await this._dataPipeline.pipeline?.addFeed(feed);
-    this._dataPipeline.pipeline?.setWriteFeed(feed);
     return this;
   }
 
@@ -226,7 +179,6 @@ export class Space {
     // Order is important.
     await this._controlPipeline.start();
     await this.protocol.start();
-    await this._controlPipeline.spaceState.addCredentialProcessor(this._dataPipeline);
 
     this._isOpen = true;
     log('opened');
@@ -238,9 +190,6 @@ export class Space {
     if (!this._isOpen) {
       return;
     }
-    await this._controlPipeline.spaceState.removeCredentialProcessor(this._dataPipeline);
-
-    await this._dataPipeline.close();
 
     // Closes in reverse order to open.
     await this.protocol.stop();
@@ -249,11 +198,4 @@ export class Space {
     this._isOpen = false;
     log('closed');
   }
-
-  @synchronized
-  async initializeDataPipeline() {
-    log('initializeDataPipeline');
-    invariant(this._isOpen, 'Space must be open to initialize data pipeline.');
-    await this._dataPipeline.open();
-  }
 }

package/src/testing/index.ts

@@ -5,5 +5,3 @@
 export * from './change-metadata';
 export * from './test-agent-builder';
 export * from './test-feed-builder';
-export * from './util';
-export * from './database-test-rig';

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

@@ -4,17 +4,15 @@
 
 import { Context } from '@dxos/context';
 import { CredentialGenerator } from '@dxos/credentials';
-import { DocumentModel } from '@dxos/document-model';
 import { type FeedStore } from '@dxos/feed-store';
 import { type Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
 import { MemorySignalManager, MemorySignalManagerContext, WebsocketSignalManager } from '@dxos/messaging';
-import { ModelFactory } from '@dxos/model-factory';
-import { createSimplePeerTransportFactory, MemoryTransportFactory, NetworkManager } from '@dxos/network-manager';
+import { MemoryTransportFactory, NetworkManager, createSimplePeerTransportFactory } from '@dxos/network-manager';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { type SpaceMetadata } from '@dxos/protocols/proto/dxos/echo/metadata';
 import { AdmittedFeed } from '@dxos/protocols/proto/dxos/halo/credentials';
-import { createStorage, type Storage, StorageType } from '@dxos/random-access-storage';
+import { StorageType, createStorage, type Storage } from '@dxos/random-access-storage';
 import { Gossip, Presence } from '@dxos/teleport-extension-gossip';
 import { BlobStore } from '@dxos/teleport-extension-object-sync';
 import { ComplexMap } from '@dxos/util';
@@ -22,7 +20,7 @@ import { ComplexMap } from '@dxos/util';
 import { TestFeedBuilder } from './test-feed-builder';
 import { SnapshotStore } from '../db-host';
 import { MetadataStore } from '../metadata';
-import { MOCK_AUTH_PROVIDER, MOCK_AUTH_VERIFIER, type Space, SpaceManager, SpaceProtocol } from '../space';
+import { MOCK_AUTH_PROVIDER, MOCK_AUTH_VERIFIER, SpaceManager, SpaceProtocol, type Space } from '../space';
 
 export type NetworkManagerProvider = () => NetworkManager;
 
@@ -112,8 +110,6 @@ export class TestAgent {
     return (this._blobStore ??= new BlobStore(this.storage.createDirectory('blobs')));
   }
 
-  public modelFactory = new ModelFactory().registerModel(DocumentModel);
-
   constructor(
     private readonly _networkManagerProvider: NetworkManagerProvider,
     private readonly _feedBuilder: TestFeedBuilder,
@@ -142,7 +138,6 @@ export class TestAgent {
     return (this._spaceManager ??= new SpaceManager({
       feedStore: this.feedStore,
       networkManager: this._networkManagerProvider(),
-      modelFactory: this.modelFactory,
       metadataStore: this.metadataStore,
       snapshotStore: this.snapshotStore,
       blobStore: this.blobStore,