@dxos/echo-pipeline 0.7.3 → 0.7.4-staging.99db212

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-pipeline",
-  "version": "0.7.3",
+  "version": "0.7.4-staging.99db212",
   "description": "ECHO database.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -37,44 +37,44 @@
     "crc-32": "^1.2.2",
     "level-transcoder": "^1.0.1",
     "lodash.isequal": "^4.5.0",
-    "@dxos/async": "0.7.3",
-    "@dxos/automerge": "0.7.3",
-    "@dxos/context": "0.7.3",
-    "@dxos/credentials": "0.7.3",
-    "@dxos/codec-protobuf": "0.7.3",
-    "@dxos/echo-protocol": "0.7.3",
-    "@dxos/crypto": "0.7.3",
-    "@dxos/debug": "0.7.3",
-    "@dxos/echo-schema": "0.7.3",
-    "@dxos/edge-client": "0.7.3",
-    "@dxos/feed-store": "0.7.3",
-    "@dxos/indexing": "0.7.3",
-    "@dxos/hypercore": "0.7.3",
-    "@dxos/invariant": "0.7.3",
-    "@dxos/keys": "0.7.3",
-    "@dxos/kv-store": "0.7.3",
-    "@dxos/log": "0.7.3",
-    "@dxos/network-manager": "0.7.3",
-    "@dxos/messaging": "0.7.3",
-    "@dxos/node-std": "0.7.3",
-    "@dxos/protocols": "0.7.3",
-    "@dxos/random-access-storage": "0.7.3",
-    "@dxos/teleport": "0.7.3",
-    "@dxos/teleport-extension-gossip": "0.7.3",
-    "@dxos/teleport-extension-replicator": "0.7.3",
-    "@dxos/teleport-extension-object-sync": "0.7.3",
-    "@dxos/timeframe": "0.7.3",
-    "@dxos/typings": "0.7.3",
-    "@dxos/teleport-extension-automerge-replicator": "0.7.3",
-    "@dxos/util": "0.7.3",
-    "@dxos/tracing": "0.7.3",
-    "@dxos/keyring": "0.7.3"
+    "@dxos/automerge": "0.7.4-staging.99db212",
+    "@dxos/async": "0.7.4-staging.99db212",
+    "@dxos/codec-protobuf": "0.7.4-staging.99db212",
+    "@dxos/context": "0.7.4-staging.99db212",
+    "@dxos/credentials": "0.7.4-staging.99db212",
+    "@dxos/debug": "0.7.4-staging.99db212",
+    "@dxos/echo-protocol": "0.7.4-staging.99db212",
+    "@dxos/echo-schema": "0.7.4-staging.99db212",
+    "@dxos/crypto": "0.7.4-staging.99db212",
+    "@dxos/edge-client": "0.7.4-staging.99db212",
+    "@dxos/feed-store": "0.7.4-staging.99db212",
+    "@dxos/hypercore": "0.7.4-staging.99db212",
+    "@dxos/indexing": "0.7.4-staging.99db212",
+    "@dxos/invariant": "0.7.4-staging.99db212",
+    "@dxos/kv-store": "0.7.4-staging.99db212",
+    "@dxos/log": "0.7.4-staging.99db212",
+    "@dxos/keys": "0.7.4-staging.99db212",
+    "@dxos/keyring": "0.7.4-staging.99db212",
+    "@dxos/messaging": "0.7.4-staging.99db212",
+    "@dxos/network-manager": "0.7.4-staging.99db212",
+    "@dxos/protocols": "0.7.4-staging.99db212",
+    "@dxos/node-std": "0.7.4-staging.99db212",
+    "@dxos/teleport": "0.7.4-staging.99db212",
+    "@dxos/teleport-extension-gossip": "0.7.4-staging.99db212",
+    "@dxos/random-access-storage": "0.7.4-staging.99db212",
+    "@dxos/teleport-extension-automerge-replicator": "0.7.4-staging.99db212",
+    "@dxos/teleport-extension-object-sync": "0.7.4-staging.99db212",
+    "@dxos/teleport-extension-replicator": "0.7.4-staging.99db212",
+    "@dxos/timeframe": "0.7.4-staging.99db212",
+    "@dxos/tracing": "0.7.4-staging.99db212",
+    "@dxos/typings": "0.7.4-staging.99db212",
+    "@dxos/util": "0.7.4-staging.99db212"
   },
   "devDependencies": {
     "@types/lodash.isequal": "^4.5.0",
     "fast-check": "^3.19.0",
     "get-port-please": "^3.1.1",
-    "@dxos/test-utils": "0.7.3"
+    "@dxos/test-utils": "0.7.4-staging.99db212"
   },
   "publishConfig": {
     "access": "public"

package/src/automerge/automerge-host.ts

@@ -453,6 +453,10 @@ export class AutomergeHost extends Resource {
     this._collectionSynchronizer.setLocalCollectionState(collectionId, { documents });
   }
 
+  async clearLocalCollectionState(collectionId: string) {
+    this._collectionSynchronizer.clearLocalCollectionState(collectionId);
+  }
+
   private _onCollectionStateQueried(collectionId: string, peerId: PeerId) {
     this._collectionSynchronizer.onCollectionStateQueried(collectionId, peerId);
   }

package/src/automerge/collection-synchronizer.ts

@@ -31,6 +31,7 @@ export class CollectionSynchronizer extends Resource {
    * CollectionId -> State.
    */
   private readonly _perCollectionStates = new Map<string, PerCollectionState>();
+  private readonly _activeCollections = new Set<string>();
 
   private readonly _connectedPeers = new Set<PeerId>();
 
@@ -48,8 +49,10 @@ export class CollectionSynchronizer extends Resource {
       this._ctx,
       async () => {
         for (const collectionId of this._perCollectionStates.keys()) {
-          this.refreshCollection(collectionId);
-          await asyncReturn();
+          if (this._activeCollections.has(collectionId)) {
+            this.refreshCollection(collectionId);
+            await asyncReturn();
+          }
         }
       },
       POLL_INTERVAL,
@@ -57,32 +60,40 @@ export class CollectionSynchronizer extends Resource {
   }
 
   getRegisteredCollectionIds(): string[] {
-    return [...this._perCollectionStates.keys()];
+    return [...this._activeCollections];
   }
 
   getLocalCollectionState(collectionId: string): CollectionState | undefined {
-    return this._getPerCollectionState(collectionId).localState;
+    return this._perCollectionStates.get(collectionId)?.localState;
   }
 
   setLocalCollectionState(collectionId: string, state: CollectionState) {
+    this._activeCollections.add(collectionId);
+
     log('setLocalCollectionState', { collectionId, state });
-    this._getPerCollectionState(collectionId).localState = state;
+    this._getOrCreatePerCollectionState(collectionId).localState = state;
 
     queueMicrotask(async () => {
-      if (!this._ctx.disposed) {
+      if (!this._ctx.disposed && this._activeCollections.has(collectionId)) {
         this._refreshInterestedPeers(collectionId);
         this.refreshCollection(collectionId);
       }
     });
   }
 
+  clearLocalCollectionState(collectionId: string) {
+    this._activeCollections.delete(collectionId);
+    this._perCollectionStates.delete(collectionId);
+    log('clearLocalCollectionState', { collectionId });
+  }
+
   getRemoteCollectionStates(collectionId: string): ReadonlyMap<PeerId, CollectionState> {
-    return this._getPerCollectionState(collectionId).remoteStates;
+    return this._getOrCreatePerCollectionState(collectionId).remoteStates;
   }
 
   refreshCollection(collectionId: string) {
     let scheduleAnotherRefresh = false;
-    const state = this._getPerCollectionState(collectionId);
+    const state = this._getOrCreatePerCollectionState(collectionId);
     for (const peerId of this._connectedPeers) {
       if (state.interestedPeers.has(peerId)) {
         const lastQueried = state.lastQueried.get(peerId) ?? 0;
@@ -134,7 +145,7 @@ export class CollectionSynchronizer extends Resource {
    * Callback when a peer queries the state of a collection.
    */
   onCollectionStateQueried(collectionId: string, peerId: PeerId) {
-    const perCollectionState = this._getPerCollectionState(collectionId);
+    const perCollectionState = this._getOrCreatePerCollectionState(collectionId);
 
     if (perCollectionState.localState) {
       this._sendCollectionState(collectionId, peerId, perCollectionState.localState);
@@ -147,12 +158,12 @@ export class CollectionSynchronizer extends Resource {
   onRemoteStateReceived(collectionId: string, peerId: PeerId, state: CollectionState) {
     log('onRemoteStateReceived', { collectionId, peerId, state });
     validateCollectionState(state);
-    const perCollectionState = this._getPerCollectionState(collectionId);
+    const perCollectionState = this._getOrCreatePerCollectionState(collectionId);
     perCollectionState.remoteStates.set(peerId, state);
     this.remoteStateUpdated.emit({ peerId, collectionId });
   }
 
-  private _getPerCollectionState(collectionId: string): PerCollectionState {
+  private _getOrCreatePerCollectionState(collectionId: string): PerCollectionState {
     return defaultMap(this._perCollectionStates, collectionId, () => ({
       localState: undefined,
       remoteStates: new Map(),
@@ -164,9 +175,9 @@ export class CollectionSynchronizer extends Resource {
   private _refreshInterestedPeers(collectionId: string) {
     for (const peerId of this._connectedPeers) {
       if (this._shouldSyncCollection(collectionId, peerId)) {
-        this._getPerCollectionState(collectionId).interestedPeers.add(peerId);
+        this._getOrCreatePerCollectionState(collectionId).interestedPeers.add(peerId);
       } else {
-        this._getPerCollectionState(collectionId).interestedPeers.delete(peerId);
+        this._getOrCreatePerCollectionState(collectionId).interestedPeers.delete(peerId);
       }
     }
   }

package/src/automerge/space-collection.ts

@@ -2,14 +2,16 @@
 // Copyright 2024 DXOS.org
 //
 
+import { type DocumentId } from '@dxos/automerge/automerge-repo';
 import type { CollectionId } from '@dxos/echo-protocol';
 import { invariant } from '@dxos/invariant';
 import { SpaceId } from '@dxos/keys';
 
-export const deriveCollectionIdFromSpaceId = (spaceId: SpaceId): CollectionId => `space:${spaceId}` as CollectionId;
+export const deriveCollectionIdFromSpaceId = (spaceId: SpaceId, rootDocumentId?: DocumentId): CollectionId =>
+  (rootDocumentId ? `space:${spaceId}:${rootDocumentId}` : `space:${spaceId}`) as CollectionId;
 
 export const getSpaceIdFromCollectionId = (collectionId: CollectionId): SpaceId => {
-  const spaceId = collectionId.replace(/^space:/, '');
+  const spaceId = collectionId.split(':')[1];
   invariant(SpaceId.isValid(spaceId));
   return spaceId;
 };

package/src/db-host/data-service.ts

@@ -25,10 +25,12 @@ import {
 } from '@dxos/protocols/proto/dxos/echo/service';
 
 import { DocumentsSynchronizer } from './documents-synchronizer';
+import { type SpaceStateManager } from './space-state-manager';
 import { deriveCollectionIdFromSpaceId, type AutomergeHost } from '../automerge';
 
 export type DataServiceParams = {
   automergeHost: AutomergeHost;
+  spaceStateManager: SpaceStateManager;
   updateIndexes: () => Promise<void>;
 };
 
@@ -44,10 +46,12 @@ export class DataServiceImpl implements DataService {
   private readonly _subscriptions = new Map<string, DocumentsSynchronizer>();
 
   private readonly _automergeHost: AutomergeHost;
+  private readonly _spaceStateManager: SpaceStateManager;
   private readonly _updateIndexes: () => Promise<void>;
 
   constructor(params: DataServiceParams) {
     this._automergeHost = params.automergeHost;
+    this._spaceStateManager = params.spaceStateManager;
     this._updateIndexes = params.updateIndexes;
   }
 
@@ -124,11 +128,21 @@ export class DataServiceImpl implements DataService {
 
   subscribeSpaceSyncState(request: GetSpaceSyncStateRequest): Stream<SpaceSyncState> {
     return new Stream<SpaceSyncState>(({ ctx, next, ready }) => {
-      invariant(SpaceId.isValid(request.spaceId));
-      const collectionId = deriveCollectionIdFromSpaceId(request.spaceId);
+      const spaceId = request.spaceId;
+      invariant(SpaceId.isValid(spaceId));
+
+      const rootDocumentId = this._spaceStateManager.getSpaceRootDocumentId(spaceId);
+      let collectionId = rootDocumentId && deriveCollectionIdFromSpaceId(spaceId, rootDocumentId);
+      this._spaceStateManager.spaceDocumentListUpdated.on(ctx, (event) => {
+        const newId = deriveCollectionIdFromSpaceId(spaceId, event.spaceRootId);
+        if (newId !== collectionId) {
+          collectionId = newId;
+          scheduler.trigger();
+        }
+      });
 
       const scheduler = new UpdateScheduler(ctx, async () => {
-        const state = await this._automergeHost.getCollectionSyncState(collectionId);
+        const state = collectionId ? await this._automergeHost.getCollectionSyncState(collectionId) : { peers: [] };
 
         next({
           peers: state.peers.map((peer) => ({

package/src/db-host/echo-host.ts

@@ -31,7 +31,6 @@ import {
   type LoadDocOptions,
   type CreateDocOptions,
   type EchoReplicator,
-  type CollectionSyncState,
   type EchoDataStats,
   type PeerIdProvider,
 } from '../automerge';
@@ -91,6 +90,7 @@ export class EchoHost extends Resource {
 
     this._dataService = new DataServiceImpl({
       automergeHost: this._automergeHost,
+      spaceStateManager: this._spaceStateManager,
       updateIndexes: async () => {
         await this._indexer.updateIndexes();
       },
@@ -163,7 +163,15 @@ export class EchoHost extends Resource {
     await this._spaceStateManager.open(ctx);
 
     this._spaceStateManager.spaceDocumentListUpdated.on(this._ctx, (e) => {
+      if (e.previousRootId) {
+        void this._automergeHost.clearLocalCollectionState(deriveCollectionIdFromSpaceId(e.spaceId, e.previousRootId));
+      }
+      // TODO(yaroslav): remove collection without spaceRootId after release (production<->staging interop)
       void this._automergeHost.updateLocalCollectionState(deriveCollectionIdFromSpaceId(e.spaceId), e.documentIds);
+      void this._automergeHost.updateLocalCollectionState(
+        deriveCollectionIdFromSpaceId(e.spaceId, e.spaceRootId),
+        e.documentIds,
+      );
     });
   }
 
@@ -249,11 +257,6 @@ export class EchoHost extends Resource {
   async removeReplicator(replicator: EchoReplicator): Promise<void> {
     await this._automergeHost.removeReplicator(replicator);
   }
-
-  async getSpaceSyncState(spaceId: SpaceId): Promise<CollectionSyncState> {
-    const collectionId = deriveCollectionIdFromSpaceId(spaceId);
-    return this._automergeHost.getCollectionSyncState(collectionId);
-  }
 }
 
 export type { EchoDataStats };

package/src/db-host/index.ts

@@ -8,3 +8,4 @@ export * from './echo-host';
 export * from './database-root';
 export * from './query-state';
 export * from './query-service';
+export * from './space-state-manager';

package/src/db-host/space-state-manager.ts

@@ -35,6 +35,10 @@ export class SpaceStateManager extends Resource {
     return this._roots.get(documentId);
   }
 
+  getSpaceRootDocumentId(spaceId: SpaceId): DocumentId | undefined {
+    return this._rootBySpace.get(spaceId);
+  }
+
   async assignRootToSpace(spaceId: SpaceId, handle: DocHandle<SpaceDoc>): Promise<DatabaseRoot> {
     let root: DatabaseRoot;
     if (this._roots.has(handle.documentId)) {
@@ -67,7 +71,9 @@ export class SpaceStateManager extends Resource {
         const documentIds = [root.documentId, ...root.getAllLinkedDocuments().map((url) => interpretAsDocumentId(url))];
         if (!isEqual(documentIds, this._lastSpaceDocumentList.get(spaceId))) {
           this._lastSpaceDocumentList.set(spaceId, documentIds);
-          this.spaceDocumentListUpdated.emit(new SpaceDocumentListUpdatedEvent(spaceId, documentIds));
+          this.spaceDocumentListUpdated.emit(
+            new SpaceDocumentListUpdatedEvent(spaceId, root.documentId, prevRootId, documentIds),
+          );
         }
       },
       { maxFrequency: 50 },
@@ -85,6 +91,8 @@ export class SpaceStateManager extends Resource {
 export class SpaceDocumentListUpdatedEvent {
   constructor(
     public readonly spaceId: SpaceId,
+    public readonly spaceRootId: DocumentId,
+    public readonly previousRootId: DocumentId | undefined,
     public readonly documentIds: DocumentId[],
   ) {}
 }