@dxos/echo-pipeline 0.6.5 → 0.6.6-main.e1a6e1f

package/dist/types/src/space/space-protocol.d.ts

@@ -7,6 +7,7 @@ import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { type MuxerStats, Teleport } from '@dxos/teleport';
 import { type BlobStore, BlobSync } from '@dxos/teleport-extension-object-sync';
 import { ReplicatorExtension } from '@dxos/teleport-extension-replicator';
+import { CallbackCollection, type AsyncCallback } from '@dxos/util';
 import { type AuthProvider, type AuthVerifier } from './auth';
 export declare const MOCK_AUTH_PROVIDER: AuthProvider;
 export declare const MOCK_AUTH_VERIFIER: AuthVerifier;
@@ -20,12 +21,14 @@ export type SpaceProtocolOptions = {
     swarmIdentity: SwarmIdentity;
     networkManager: SwarmNetworkManager;
     blobStore: BlobStore;
+    onFeed?: (feed: FeedWrapper<FeedMessage>) => Promise<void>;
     /**
      * Called when new session is authenticated.
      * Additional extensions can be added here.
      */
     onSessionAuth?: (session: Teleport) => void;
     onAuthFailure?: (session: Teleport) => void;
+    disableP2pReplication?: boolean;
 };
 /**
  * Manages Teleport protocol stream creation and joining swarms with replication and presence extensions.
@@ -36,17 +39,19 @@ export declare class SpaceProtocol {
     private readonly _onSessionAuth?;
     private readonly _onAuthFailure?;
     readonly blobSync: BlobSync;
+    private readonly _disableP2pReplication;
     private readonly _topic;
     private readonly _spaceKey;
     private readonly _feeds;
     private readonly _sessions;
     private readonly _topology;
     private _connection?;
+    readonly feedAdded: CallbackCollection<AsyncCallback<FeedWrapper<FeedMessage>>>;
     get sessions(): ReadonlyMap<PublicKey, SpaceProtocolSession>;
     get feeds(): ReadonlySet<FeedWrapper<FeedMessage>>;
     private get _ownPeerKey();
-    constructor({ topic, swarmIdentity, networkManager, onSessionAuth, onAuthFailure, blobStore }: SpaceProtocolOptions);
-    addFeed(feed: FeedWrapper<FeedMessage>): void;
+    constructor({ topic, swarmIdentity, networkManager, onSessionAuth, onAuthFailure, blobStore, disableP2pReplication, }: SpaceProtocolOptions);
+    addFeed(feed: FeedWrapper<FeedMessage>): Promise<void>;
     start(): Promise<void>;
     updateTopology(): void;
     stop(): Promise<void>;
@@ -62,6 +67,7 @@ export type SpaceProtocolSessionParams = {
      */
     onSessionAuth?: (session: Teleport) => void;
     onAuthFailure?: (session: Teleport) => void;
+    disableP2pReplication?: boolean;
 };
 export declare enum AuthStatus {
     INITIAL = "INITIAL",
@@ -73,6 +79,7 @@ export declare enum AuthStatus {
  */
 export declare class SpaceProtocolSession implements WireProtocol {
     private readonly _wireParams;
+    private readonly _disableP2pReplication;
     private readonly _onSessionAuth?;
     private readonly _onAuthFailure?;
     private readonly _swarmIdentity;
@@ -82,7 +89,7 @@ export declare class SpaceProtocolSession implements WireProtocol {
     private _authStatus;
     get authStatus(): AuthStatus;
     get stats(): Event<MuxerStats>;
-    constructor({ wireParams, swarmIdentity, onSessionAuth, onAuthFailure, blobSync }: SpaceProtocolSessionParams);
+    constructor({ wireParams, swarmIdentity, onSessionAuth, onAuthFailure, blobSync, disableP2pReplication, }: SpaceProtocolSessionParams);
     get stream(): import("stream").Duplex;
     open(sessionId?: PublicKey): Promise<void>;
     close(): Promise<void>;

package/dist/types/src/space/space-protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"space-protocol.d.ts","sourceRoot":"","sources":["../../../../src/space/space-protocol.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAEL,KAAK,mBAAmB,EAExB,KAAK,YAAY,EACjB,KAAK,kBAAkB,EAExB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,KAAK,UAAU,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,KAAK,SAAS,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAI1E,OAAO,EAAiB,KAAK,YAAY,EAAE,KAAK,YAAY,EAAE,MAAM,QAAQ,CAAC;AAE7E,eAAO,MAAM,kBAAkB,EAAE,YAA+D,CAAC;AACjG,eAAO,MAAM,kBAAkB,EAAE,YAAwE,CAAC;AAG1G,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,SAAS,CAAC;IACnB,kBAAkB,EAAE,YAAY,CAAC;IACjC,uBAAuB,EAAE,YAAY,CAAC;CACvC;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,SAAS,CAAC;IACjB,aAAa,EAAE,aAAa,CAAC;IAC7B,cAAc,EAAE,mBAAmB,CAAC;IAEpC,SAAS,EAAE,SAAS,CAAC;IAErB;;;OAGG;IACH,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,CAAC;IAC5C,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,CAAC;CAC7C,CAAC;AAEF;;GAEG;AACH,qBACa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAsB;IACtD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAA8B;IAC9D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAA8B;IAE9D,SAAgB,QAAQ,EAAE,QAAQ,CAAC;IAInC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqB;IAG5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IAEtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;IAC9D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAmE;IAE7F,OAAO,CAAC,QAAQ,CAAC,SAAS,CAIvB;IAEH,OAAO,CAAC,WAAW,CAAC,CAAkB;IAEtC,IAAI,QAAQ,IAAI,WAAW,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAE3D;IAED,IAAI,KAAK,IAAI,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAEjD;IAGD,OAAO,KAAK,WAAW,GAEtB;gBAEW,EAAE,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa,EAAE,SAAS,EAAE,EAAE,oBAAoB;IAanH,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,WAAW,CAAC;IAUhC,KAAK;IAuBJ,cAAc;IAIf,IAAI;IAUV,OAAO,CAAC,uBAAuB;CAkBhC;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,UAAU,EAAE,kBAAkB,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;IAE7B,QAAQ,EAAE,QAAQ,CAAC;IAEnB;;;OAGG;IACH,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,CAAC;IAE5C,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,CAAC;CAC7C,CAAC;AAEF,oBAAY,UAAU;IACpB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;CACpB;AAGD;;GAEG;AACH,qBAAa,oBAAqB,YAAW,YAAY;IAEvD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IAEjD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAA8B;IAC9D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAA8B;IAC9D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IAErC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IAGrC,SAAgB,UAAU,sBAA0D;IAEpF,OAAO,CAAC,WAAW,CAAsB;IAEzC,IACI,UAAU,eAEb;IAED,IAAI,KAAK,IAAI,KAAK,CAAC,UAAU,CAAC,CAE7B;gBAGW,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,0BAA0B;IAU7G,IAAI,MAAM,4BAET;IAEK,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB1C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAKtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7B"}
+{"version":3,"file":"space-protocol.d.ts","sourceRoot":"","sources":["../../../../src/space/space-protocol.ts"],"names":[],"mappings":"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"}

package/dist/types/src/space/space.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"space.d.ts","sourceRoot":"","sources":["../../../../src/space/space.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"space.d.ts","sourceRoot":"","sources":["../../../../src/space/space.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-pipeline",
-  "version": "0.6.5",
+  "version": "0.6.6-main.e1a6e1f",
   "description": "ECHO database.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -41,38 +41,38 @@
     "crc-32": "^1.2.2",
     "level": "^8.0.1",
     "level-transcoder": "^1.0.1",
-    "@dxos/context": "0.6.5",
-    "@dxos/codec-protobuf": "0.6.5",
-    "@dxos/async": "0.6.5",
-    "@dxos/crypto": "0.6.5",
-    "@dxos/credentials": "0.6.5",
-    "@dxos/automerge": "0.6.5",
-    "@dxos/echo-protocol": "0.6.5",
-    "@dxos/feed-store": "0.6.5",
-    "@dxos/debug": "0.6.5",
-    "@dxos/echo-schema": "0.6.5",
-    "@dxos/indexing": "0.6.5",
-    "@dxos/hypercore": "0.6.5",
-    "@dxos/invariant": "0.6.5",
-    "@dxos/keyring": "0.6.5",
-    "@dxos/kv-store": "0.6.5",
-    "@dxos/keys": "0.6.5",
-    "@dxos/log": "0.6.5",
-    "@dxos/network-manager": "0.6.5",
-    "@dxos/messaging": "0.6.5",
-    "@dxos/node-std": "0.6.5",
-    "@dxos/random-access-storage": "0.6.5",
-    "@dxos/protocols": "0.6.5",
-    "@dxos/teleport": "0.6.5",
-    "@dxos/rpc": "0.6.5",
-    "@dxos/teleport-extension-automerge-replicator": "0.6.5",
-    "@dxos/teleport-extension-gossip": "0.6.5",
-    "@dxos/teleport-extension-object-sync": "0.6.5",
-    "@dxos/teleport-extension-replicator": "0.6.5",
-    "@dxos/timeframe": "0.6.5",
-    "@dxos/tracing": "0.6.5",
-    "@dxos/util": "0.6.5",
-    "@dxos/typings": "0.6.5"
+    "@dxos/context": "0.6.6-main.e1a6e1f",
+    "@dxos/async": "0.6.6-main.e1a6e1f",
+    "@dxos/codec-protobuf": "0.6.6-main.e1a6e1f",
+    "@dxos/credentials": "0.6.6-main.e1a6e1f",
+    "@dxos/crypto": "0.6.6-main.e1a6e1f",
+    "@dxos/debug": "0.6.6-main.e1a6e1f",
+    "@dxos/echo-protocol": "0.6.6-main.e1a6e1f",
+    "@dxos/echo-schema": "0.6.6-main.e1a6e1f",
+    "@dxos/feed-store": "0.6.6-main.e1a6e1f",
+    "@dxos/indexing": "0.6.6-main.e1a6e1f",
+    "@dxos/hypercore": "0.6.6-main.e1a6e1f",
+    "@dxos/invariant": "0.6.6-main.e1a6e1f",
+    "@dxos/keys": "0.6.6-main.e1a6e1f",
+    "@dxos/keyring": "0.6.6-main.e1a6e1f",
+    "@dxos/kv-store": "0.6.6-main.e1a6e1f",
+    "@dxos/network-manager": "0.6.6-main.e1a6e1f",
+    "@dxos/messaging": "0.6.6-main.e1a6e1f",
+    "@dxos/automerge": "0.6.6-main.e1a6e1f",
+    "@dxos/node-std": "0.6.6-main.e1a6e1f",
+    "@dxos/protocols": "0.6.6-main.e1a6e1f",
+    "@dxos/teleport": "0.6.6-main.e1a6e1f",
+    "@dxos/random-access-storage": "0.6.6-main.e1a6e1f",
+    "@dxos/rpc": "0.6.6-main.e1a6e1f",
+    "@dxos/teleport-extension-automerge-replicator": "0.6.6-main.e1a6e1f",
+    "@dxos/teleport-extension-gossip": "0.6.6-main.e1a6e1f",
+    "@dxos/teleport-extension-object-sync": "0.6.6-main.e1a6e1f",
+    "@dxos/timeframe": "0.6.6-main.e1a6e1f",
+    "@dxos/teleport-extension-replicator": "0.6.6-main.e1a6e1f",
+    "@dxos/typings": "0.6.6-main.e1a6e1f",
+    "@dxos/tracing": "0.6.6-main.e1a6e1f",
+    "@dxos/util": "0.6.6-main.e1a6e1f",
+    "@dxos/log": "0.6.6-main.e1a6e1f"
   },
   "devDependencies": {
     "fast-check": "^3.19.0",

package/src/automerge/echo-network-adapter.ts

@@ -22,6 +22,7 @@ import {
   type CollectionQueryMessage,
   type CollectionStateMessage,
 } from './network-protocol';
+import { createIdFromSpaceKey } from '../space';
 
 export interface NetworkDataMonitor {
   recordPeerConnected(peerId: string): void;
@@ -112,6 +113,10 @@ export class EchoNetworkAdapter extends NetworkAdapter {
       onConnectionClosed: this._onConnectionClosed.bind(this),
       onConnectionAuthScopeChanged: this._onConnectionAuthScopeChanged.bind(this),
       getContainingSpaceForDocument: this._params.getContainingSpaceForDocument,
+      getContainingSpaceIdForDocument: async (documentId) => {
+        const key = await this._params.getContainingSpaceForDocument(documentId);
+        return key ? createIdFromSpaceKey(key) : null;
+      },
     });
   }
 

package/src/automerge/echo-replicator.ts

@@ -3,7 +3,7 @@
 //
 
 import { type Message } from '@dxos/automerge/automerge-repo';
-import { type PublicKey } from '@dxos/keys';
+import { type PublicKey, type SpaceId } from '@dxos/keys';
 
 export interface EchoReplicator {
   /**
@@ -23,7 +23,11 @@ export interface EchoReplicatorContext {
    */
   get peerId(): string;
 
+  /**
+   * @deprecated Use `getContainingSpaceIdForDocument`.
+   */
   getContainingSpaceForDocument(documentId: string): Promise<PublicKey | null>;
+  getContainingSpaceIdForDocument(documentId: string): Promise<SpaceId | null>;
 
   onConnectionOpen(connection: ReplicatorConnection): void;
   onConnectionClosed(connection: ReplicatorConnection): void;

package/src/automerge/network-protocol.ts

@@ -2,44 +2,18 @@
 // Copyright 2024 DXOS.org
 //
 
-import type { Message, PeerId } from '@dxos/automerge/automerge-repo';
+import type { Message } from '@dxos/automerge/automerge-repo';
+import {
+  type CollectionQueryMessage,
+  type CollectionStateMessage,
+  MESSAGE_TYPE_COLLECTION_QUERY,
+  MESSAGE_TYPE_COLLECTION_STATE,
+} from '@dxos/protocols';
 
-export const MESSAGE_TYPE_COLLECTION_QUERY = 'collection-query';
-
-export type CollectionQueryMessage = {
-  type: typeof MESSAGE_TYPE_COLLECTION_QUERY;
-  senderId: PeerId;
-  targetId: PeerId;
-  collectionId: string;
-
-  /**
-   * Identifier of the current state.
-   * Remote peer will skip sending the state if it has the same tag.
-   */
-  stateTag?: string;
-};
+export { type CollectionStateMessage, type CollectionQueryMessage };
 
 export const isCollectionQueryMessage = (message: Message): message is CollectionQueryMessage =>
   message.type === MESSAGE_TYPE_COLLECTION_QUERY;
 
-export const MESSAGE_TYPE_COLLECTION_STATE = 'collection-state';
-
-export type CollectionStateMessage = {
-  type: typeof MESSAGE_TYPE_COLLECTION_STATE;
-  senderId: PeerId;
-  targetId: PeerId;
-  collectionId: string;
-
-  /**
-   *  State representation is implementation-defined.
-   */
-  state?: unknown;
-
-  /**
-   * Identifier of the current state.
-   */
-  stateTag?: string;
-};
-
 export const isCollectionStateMessage = (message: Message): message is CollectionStateMessage =>
   message.type === MESSAGE_TYPE_COLLECTION_STATE;

package/src/space/space-manager.ts

@@ -34,6 +34,8 @@ export type SpaceManagerParams = {
   snapshotStore: SnapshotStore;
 
   blobStore: BlobStore;
+
+  disableP2pReplication?: boolean;
 };
 
 export type ConstructSpaceParams = {
@@ -68,14 +70,23 @@ export class SpaceManager {
   private readonly _snapshotStore: SnapshotStore;
   private readonly _blobStore: BlobStore;
   private readonly _instanceId = PublicKey.random().toHex();
-
-  constructor({ feedStore, networkManager, metadataStore, snapshotStore, blobStore }: SpaceManagerParams) {
+  private readonly _disableP2pReplication: boolean;
+
+  constructor({
+    feedStore,
+    networkManager,
+    metadataStore,
+    snapshotStore,
+    blobStore,
+    disableP2pReplication,
+  }: SpaceManagerParams) {
     // TODO(burdon): Assert.
     this._feedStore = feedStore;
     this._networkManager = networkManager;
     this._metadataStore = metadataStore;
     this._snapshotStore = snapshotStore;
     this._blobStore = blobStore;
+    this._disableP2pReplication = disableP2pReplication ?? false;
   }
 
   // TODO(burdon): Remove.
@@ -115,6 +126,7 @@ export class SpaceManager {
       onSessionAuth: onAuthorizedConnection,
       onAuthFailure,
       blobStore: this._blobStore,
+      disableP2pReplication: this._disableP2pReplication,
     });
     const snapshotManager = new SnapshotManager(this._snapshotStore, this._blobStore, protocol.blobSync);
 
@@ -157,6 +169,7 @@ export class SpaceManager {
       },
       onAuthFailure: (session: Teleport) => session.close(),
       blobStore: this._blobStore,
+      disableP2pReplication: this._disableP2pReplication,
     });
 
     try {

package/src/space/space-protocol.ts

@@ -20,7 +20,7 @@ import { type MuxerStats, Teleport } from '@dxos/teleport';
 import { type BlobStore, BlobSync } from '@dxos/teleport-extension-object-sync';
 import { ReplicatorExtension } from '@dxos/teleport-extension-replicator';
 import { trace } from '@dxos/tracing';
-import { ComplexMap } from '@dxos/util';
+import { CallbackCollection, ComplexMap, type AsyncCallback } from '@dxos/util';
 
 import { AuthExtension, type AuthProvider, type AuthVerifier } from './auth';
 
@@ -41,12 +41,16 @@ export type SpaceProtocolOptions = {
 
   blobStore: BlobStore;
 
+  onFeed?: (feed: FeedWrapper<FeedMessage>) => Promise<void>;
+
   /**
    * Called when new session is authenticated.
    * Additional extensions can be added here.
    */
   onSessionAuth?: (session: Teleport) => void;
   onAuthFailure?: (session: Teleport) => void;
+
+  disableP2pReplication?: boolean;
 };
 
 /**
@@ -61,6 +65,8 @@ export class SpaceProtocol {
 
   public readonly blobSync: BlobSync;
 
+  private readonly _disableP2pReplication: boolean;
+
   @logInfo
   @trace.info()
   private readonly _topic: Promise<PublicKey>;
@@ -79,6 +85,8 @@ export class SpaceProtocol {
 
   private _connection?: SwarmConnection;
 
+  public readonly feedAdded = new CallbackCollection<AsyncCallback<FeedWrapper<FeedMessage>>>();
+
   get sessions(): ReadonlyMap<PublicKey, SpaceProtocolSession> {
     return this._sessions;
   }
@@ -92,7 +100,15 @@ export class SpaceProtocol {
     return this._swarmIdentity.peerKey;
   }
 
-  constructor({ topic, swarmIdentity, networkManager, onSessionAuth, onAuthFailure, blobStore }: SpaceProtocolOptions) {
+  constructor({
+    topic,
+    swarmIdentity,
+    networkManager,
+    onSessionAuth,
+    onAuthFailure,
+    blobStore,
+    disableP2pReplication,
+  }: SpaceProtocolOptions) {
     this._spaceKey = topic;
     this._networkManager = networkManager;
     this._swarmIdentity = swarmIdentity;
@@ -102,16 +118,20 @@ export class SpaceProtocol {
 
     // TODO(burdon): Async race condition? Move to start?
     this._topic = subtleCrypto.digest('SHA-256', topic.asBuffer()).then(discoveryKey).then(PublicKey.from);
+
+    this._disableP2pReplication = disableP2pReplication ?? false;
   }
 
   // TODO(burdon): Create abstraction for Space (e.g., add keys and have provider).
-  addFeed(feed: FeedWrapper<FeedMessage>) {
+  async addFeed(feed: FeedWrapper<FeedMessage>) {
     log('addFeed', { key: feed.key });
 
     this._feeds.add(feed);
     for (const session of this._sessions.values()) {
       session.replicator.addFeed(feed);
     }
+
+    await this.feedAdded.callSerial(feed);
   }
 
   // TODO(burdon): Rename open? Common open/close interfaces for all services?
@@ -160,6 +180,7 @@ export class SpaceProtocol {
         onSessionAuth: this._onSessionAuth,
         onAuthFailure: this._onAuthFailure,
         blobSync: this.blobSync,
+        disableP2pReplication: this._disableP2pReplication,
       });
       this._sessions.set(wireParams.remotePeerId, session);
 
@@ -185,6 +206,8 @@ export type SpaceProtocolSessionParams = {
   onSessionAuth?: (session: Teleport) => void;
 
   onAuthFailure?: (session: Teleport) => void;
+
+  disableP2pReplication?: boolean;
 };
 
 export enum AuthStatus {
@@ -201,6 +224,8 @@ export class SpaceProtocolSession implements WireProtocol {
   @logInfo
   private readonly _wireParams: WireProtocolParams;
 
+  private readonly _disableP2pReplication: boolean;
+
   private readonly _onSessionAuth?: (session: Teleport) => void;
   private readonly _onAuthFailure?: (session: Teleport) => void;
   private readonly _swarmIdentity: SwarmIdentity;
@@ -223,7 +248,14 @@ export class SpaceProtocolSession implements WireProtocol {
   }
 
   // TODO(dmaretskyi): Allow to pass in extra extensions.
-  constructor({ wireParams, swarmIdentity, onSessionAuth, onAuthFailure, blobSync }: SpaceProtocolSessionParams) {
+  constructor({
+    wireParams,
+    swarmIdentity,
+    onSessionAuth,
+    onAuthFailure,
+    blobSync,
+    disableP2pReplication,
+  }: SpaceProtocolSessionParams) {
     this._wireParams = wireParams;
     this._swarmIdentity = swarmIdentity;
     this._onSessionAuth = onSessionAuth;
@@ -231,6 +263,8 @@ export class SpaceProtocolSession implements WireProtocol {
     this._blobSync = blobSync;
 
     this._teleport = new Teleport(wireParams);
+
+    this._disableP2pReplication = disableP2pReplication ?? false;
   }
 
   get stream() {
@@ -256,7 +290,10 @@ export class SpaceProtocolSession implements WireProtocol {
         },
       }),
     );
-    this._teleport.addExtension('dxos.mesh.teleport.replicator', this.replicator);
+
+    if (!this._disableP2pReplication) {
+      this._teleport.addExtension('dxos.mesh.teleport.replicator', this.replicator);
+    }
     this._teleport.addExtension('dxos.mesh.teleport.blobsync', this._blobSync.createExtension());
   }
 

package/src/space/space.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import { Event, synchronized, trackLeaks } from '@dxos/async';
+import { Event, scheduleMicroTask, synchronized, trackLeaks } from '@dxos/async';
 import { type Context, LifecycleState, Resource } from '@dxos/context';
 import { type DelegateInvitationCredential, type FeedInfo, type MemberInfo } from '@dxos/credentials';
 import { subtleCrypto } from '@dxos/crypto';
@@ -93,8 +93,8 @@ export class Space extends Resource {
       const sparse = info.assertion.designation === AdmittedFeed.Designation.DATA;
 
       if (!info.key.equals(params.genesisFeed.key)) {
-        queueMicrotask(async () => {
-          this.protocol.addFeed(await params.feedProvider(info.key, { sparse }));
+        scheduleMicroTask(this._ctx, async () => {
+          await this.protocol.addFeed(await params.feedProvider(info.key, { sparse }));
         });
       }
     });
@@ -119,7 +119,6 @@ export class Space extends Resource {
 
     // Start replicating the genesis feed.
     this.protocol = params.protocol;
-    this.protocol.addFeed(params.genesisFeed);
   }
 
   @logInfo
@@ -192,6 +191,7 @@ export class Space extends Resource {
     // Order is important.
     await this._controlPipeline.start();
     await this.protocol.start();
+    await this.protocol.addFeed(await this._feedProvider(this._genesisFeedKey));
 
     log('opened');
   }