feat(nbstore): improve nbstore (#9512)

packages/common/nbstore/src/sync/index.ts

@@ -1,65 +1,63 @@
-import { combineLatest, map, type Observable, of } from 'rxjs';
+import { map, type Observable } from 'rxjs';
 
-import type {
-  AwarenessStorage,
-  BlobStorage,
-  DocStorage,
-  SpaceStorage,
-} from '../storage';
+import type { SpaceStorage } from '../storage';
 import { AwarenessSyncImpl } from './awareness';
 import { BlobSyncImpl } from './blob';
 import { DocSyncImpl, type DocSyncState } from './doc';
+import type { PeerStorageOptions } from './types';
+
+export type { BlobSyncState } from './blob';
+export type { DocSyncDocState, DocSyncState } from './doc';
 
 export interface SyncState {
   doc?: DocSyncState;
 }
 
 export class Sync {
-  readonly doc: DocSyncImpl | null;
-  readonly blob: BlobSyncImpl | null;
-  readonly awareness: AwarenessSyncImpl | null;
+  readonly doc: DocSyncImpl;
+  readonly blob: BlobSyncImpl;
+  readonly awareness: AwarenessSyncImpl;
 
   readonly state$: Observable<SyncState>;
 
-  constructor(
-    readonly local: SpaceStorage,
-    readonly peers: SpaceStorage[]
-  ) {
-    const doc = local.tryGet('doc');
-    const blob = local.tryGet('blob');
-    const sync = local.tryGet('sync');
-    const awareness = local.tryGet('awareness');
+  constructor(readonly storages: PeerStorageOptions<SpaceStorage>) {
+    const doc = storages.local.get('doc');
+    const blob = storages.local.get('blob');
+    const sync = storages.local.get('sync');
+    const awareness = storages.local.get('awareness');
 
-    this.doc =
-      doc && sync
-        ? new DocSyncImpl(
-            doc,
-            sync,
-            peers
-              .map(peer => peer.tryGet('doc'))
-              .filter((v): v is DocStorage => !!v)
-          )
-        : null;
-    this.blob = blob
-      ? new BlobSyncImpl(
-          blob,
-          peers
-            .map(peer => peer.tryGet('blob'))
-            .filter((v): v is BlobStorage => !!v)
-        )
-      : null;
-    this.awareness = awareness
-      ? new AwarenessSyncImpl(
-          awareness,
-          peers
-            .map(peer => peer.tryGet('awareness'))
-            .filter((v): v is AwarenessStorage => !!v)
-        )
-      : null;
-
-    this.state$ = combineLatest([this.doc?.state$ ?? of(undefined)]).pipe(
-      map(([doc]) => ({ doc }))
+    this.doc = new DocSyncImpl(
+      {
+        local: doc,
+        remotes: Object.fromEntries(
+          Object.entries(storages.remotes).map(([peerId, remote]) => [
+            peerId,
+            remote.get('doc'),
+          ])
+        ),
+      },
+      sync
     );
+    this.blob = new BlobSyncImpl({
+      local: blob,
+      remotes: Object.fromEntries(
+        Object.entries(storages.remotes).map(([peerId, remote]) => [
+          peerId,
+          remote.get('blob'),
+        ])
+      ),
+    });
+    this.awareness = new AwarenessSyncImpl({
+      local: awareness,
+      remotes: Object.fromEntries(
+        Object.entries(storages.remotes).map(([peerId, remote]) => [
+          peerId,
+          remote.get('awareness'),
+        ])
+      ),
+    });
+
+    this.state$ = this.doc.state$.pipe(map(doc => ({ doc })));
   }
 
   start() {