@automerge/automerge-repo 1.1.0-alpha.3 → 1.1.0-alpha.5

package/dist/RemoteHeadsSubscriptions.d.ts

@@ -36,6 +36,7 @@ export declare class RemoteHeadsSubscriptions extends EventEmitter<RemoteHeadsSu
     handleImmediateRemoteHeadsChanged(documentId: DocumentId, storageId: StorageId, heads: A.Heads): void;
     addGenerousPeer(peerId: PeerId): void;
     removePeer(peerId: PeerId): void;
+    subscribePeerToDoc(peerId: PeerId, documentId: DocumentId): void;
 }
 export {};
 //# sourceMappingURL=RemoteHeadsSubscriptions.d.ts.map

package/dist/RemoteHeadsSubscriptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RemoteHeadsSubscriptions.d.ts","sourceRoot":"","sources":["../src/RemoteHeadsSubscriptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,CAAC,EAAE,MAAM,sBAAsB,CAAA;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAC/C,OAAO,EACL,kBAAkB,EAClB,gCAAgC,EACjC,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAItC,MAAM,MAAM,mCAAmC,GAAG;IAChD,UAAU,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,SAAS,CAAA;IACpB,WAAW,EAAE,CAAC,CAAC,KAAK,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAGD,MAAM,MAAM,wBAAwB,GAAG;IACrC,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,SAAS,CAAA;IACpB,KAAK,EAAE,CAAC,CAAC,KAAK,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,KAAK,6BAA6B,GAAG;IACnC,sBAAsB,EAAE,CAAC,OAAO,EAAE,mCAAmC,KAAK,IAAI,CAAA;IAC9E,oBAAoB,EAAE,CAAC,OAAO,EAAE;QAC9B,KAAK,EAAE,MAAM,EAAE,CAAA;QACf,GAAG,CAAC,EAAE,SAAS,EAAE,CAAA;QACjB,MAAM,CAAC,EAAE,SAAS,EAAE,CAAA;KACrB,KAAK,IAAI,CAAA;IACV,qBAAqB,EAAE,CAAC,OAAO,EAAE,wBAAwB,KAAK,IAAI,CAAA;CACnE,CAAA;AAED,qBAAa,wBAAyB,SAAQ,YAAY,CAAC,6BAA6B,CAAC;;IAWvF,kBAAkB,CAAC,OAAO,EAAE,SAAS,EAAE;IAkBvC,sBAAsB,CAAC,OAAO,EAAE,SAAS,EAAE;IAsB3C,oBAAoB,CAAC,OAAO,EAAE,gCAAgC;IA4C9D,sEAAsE;IACtE,iBAAiB,CAAC,GAAG,EAAE,kBAAkB;IA8CzC,kEAAkE;IAClE,iCAAiC,CAC/B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,CAAC,CAAC,KAAK;IA8BhB,eAAe,CAAC,MAAM,EAAE,MAAM;IAwB9B,UAAU,CAAC,MAAM,EAAE,MAAM;CA+D1B"}
+{"version":3,"file":"RemoteHeadsSubscriptions.d.ts","sourceRoot":"","sources":["../src/RemoteHeadsSubscriptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,CAAC,EAAE,MAAM,sBAAsB,CAAA;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAC/C,OAAO,EACL,kBAAkB,EAClB,gCAAgC,EACjC,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAItC,MAAM,MAAM,mCAAmC,GAAG;IAChD,UAAU,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,SAAS,CAAA;IACpB,WAAW,EAAE,CAAC,CAAC,KAAK,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAGD,MAAM,MAAM,wBAAwB,GAAG;IACrC,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,SAAS,CAAA;IACpB,KAAK,EAAE,CAAC,CAAC,KAAK,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,KAAK,6BAA6B,GAAG;IACnC,sBAAsB,EAAE,CAAC,OAAO,EAAE,mCAAmC,KAAK,IAAI,CAAA;IAC9E,oBAAoB,EAAE,CAAC,OAAO,EAAE;QAC9B,KAAK,EAAE,MAAM,EAAE,CAAA;QACf,GAAG,CAAC,EAAE,SAAS,EAAE,CAAA;QACjB,MAAM,CAAC,EAAE,SAAS,EAAE,CAAA;KACrB,KAAK,IAAI,CAAA;IACV,qBAAqB,EAAE,CAAC,OAAO,EAAE,wBAAwB,KAAK,IAAI,CAAA;CACnE,CAAA;AAED,qBAAa,wBAAyB,SAAQ,YAAY,CAAC,6BAA6B,CAAC;;IAcvF,kBAAkB,CAAC,OAAO,EAAE,SAAS,EAAE;IAkBvC,sBAAsB,CAAC,OAAO,EAAE,SAAS,EAAE;IAsB3C,oBAAoB,CAAC,OAAO,EAAE,gCAAgC;IA0E9D,sEAAsE;IACtE,iBAAiB,CAAC,GAAG,EAAE,kBAAkB;IAgDzC,kEAAkE;IAClE,iCAAiC,CAC/B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,CAAC,CAAC,KAAK;IAgChB,eAAe,CAAC,MAAM,EAAE,MAAM;IAwB9B,UAAU,CAAC,MAAM,EAAE,MAAM;IA2BzB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU;CAoE1D"}

package/dist/RemoteHeadsSubscriptions.js

@@ -9,6 +9,8 @@ export class RemoteHeadsSubscriptions extends EventEmitter {
     #theirSubscriptions = new Map();
     // Peers we will always share remote heads with even if they are not subscribed
     #generousPeers = new Set();
+    // Documents each peer has open, we need this information so we only send remote heads of documents that the peer knows
+    #subscribedDocsByPeer = new Map();
     #log = debug("automerge-repo:remote-heads-subscriptions");
     subscribeToRemotes(remotes) {
         this.#log("subscribeToRemotes", remotes);
@@ -47,10 +49,14 @@ export class RemoteHeadsSubscriptions extends EventEmitter {
     handleControlMessage(control) {
         const remotesToAdd = [];
         const remotesToRemove = [];
+        const addedRemotesWeKnow = [];
         this.#log("handleControlMessage", control);
         if (control.add) {
             for (const remote of control.add) {
                 let theirSubs = this.#theirSubscriptions.get(remote);
+                if (this.#ourSubscriptions.has(remote) || theirSubs) {
+                    addedRemotesWeKnow.push(remote);
+                }
                 if (!theirSubs) {
                     theirSubs = new Set();
                     this.#theirSubscriptions.set(remote, theirSubs);
@@ -80,6 +86,28 @@ export class RemoteHeadsSubscriptions extends EventEmitter {
                 remove: remotesToRemove,
             });
         }
+        // send all our stored heads of documents the peer knows for the remotes they've added
+        for (const remote of addedRemotesWeKnow) {
+            const subscribedDocs = this.#subscribedDocsByPeer.get(control.senderId);
+            if (subscribedDocs) {
+                for (const documentId of subscribedDocs) {
+                    const knownHeads = this.#knownHeads.get(documentId);
+                    if (!knownHeads) {
+                        continue;
+                    }
+                    const lastHeads = knownHeads.get(remote);
+                    if (lastHeads) {
+                        this.emit("notify-remote-heads", {
+                            targetId: control.senderId,
+                            documentId,
+                            heads: lastHeads.heads,
+                            timestamp: lastHeads.timestamp,
+                            storageId: remote,
+                        });
+                    }
+                }
+            }
+        }
     }
     /** A peer we are not directly connected to has changed their heads */
     handleRemoteHeads(msg) {
@@ -112,13 +140,15 @@ export class RemoteHeadsSubscriptions extends EventEmitter {
             const theirSubs = this.#theirSubscriptions.get(event.storageId);
             if (theirSubs) {
                 for (const peerId of theirSubs) {
-                    this.emit("notify-remote-heads", {
-                        targetId: peerId,
-                        documentId: event.documentId,
-                        heads: event.remoteHeads,
-                        timestamp: event.timestamp,
-                        storageId: event.storageId,
-                    });
+                    if (this.#isPeerSubscribedToDoc(peerId, event.documentId)) {
+                        this.emit("notify-remote-heads", {
+                            targetId: peerId,
+                            documentId: event.documentId,
+                            heads: event.remoteHeads,
+                            timestamp: event.timestamp,
+                            storageId: event.storageId,
+                        });
+                    }
                 }
             }
         }
@@ -140,13 +170,15 @@ export class RemoteHeadsSubscriptions extends EventEmitter {
         const theirSubs = this.#theirSubscriptions.get(storageId);
         if (theirSubs) {
             for (const peerId of theirSubs) {
-                this.emit("notify-remote-heads", {
-                    targetId: peerId,
-                    documentId: documentId,
-                    heads: heads,
-                    timestamp: timestamp,
-                    storageId: storageId,
-                });
+                if (this.#isPeerSubscribedToDoc(peerId, documentId)) {
+                    this.emit("notify-remote-heads", {
+                        targetId: peerId,
+                        documentId: documentId,
+                        heads: heads,
+                        timestamp: timestamp,
+                        storageId: storageId,
+                    });
+                }
             }
         }
     }
@@ -175,6 +207,7 @@ export class RemoteHeadsSubscriptions extends EventEmitter {
         this.#log("removePeer", peerId);
         const remotesToRemove = [];
         this.#generousPeers.delete(peerId);
+        this.#subscribedDocsByPeer.delete(peerId);
         for (const [storageId, peerIds] of this.#theirSubscriptions) {
             if (peerIds.has(peerId)) {
                 peerIds.delete(peerId);
@@ -191,6 +224,33 @@ export class RemoteHeadsSubscriptions extends EventEmitter {
             });
         }
     }
+    subscribePeerToDoc(peerId, documentId) {
+        let subscribedDocs = this.#subscribedDocsByPeer.get(peerId);
+        if (!subscribedDocs) {
+            subscribedDocs = new Set();
+            this.#subscribedDocsByPeer.set(peerId, subscribedDocs);
+        }
+        subscribedDocs.add(documentId);
+        const remoteHeads = this.#knownHeads.get(documentId);
+        if (remoteHeads) {
+            for (const [storageId, lastHeads] of remoteHeads) {
+                const subscribedPeers = this.#theirSubscriptions.get(storageId);
+                if (subscribedPeers && subscribedPeers.has(peerId)) {
+                    this.emit("notify-remote-heads", {
+                        targetId: peerId,
+                        documentId,
+                        heads: lastHeads.heads,
+                        timestamp: lastHeads.timestamp,
+                        storageId,
+                    });
+                }
+            }
+        }
+    }
+    #isPeerSubscribedToDoc(peerId, documentId) {
+        let subscribedDocs = this.#subscribedDocsByPeer.get(peerId);
+        return subscribedDocs && subscribedDocs.has(documentId);
+    }
     /** Returns the (document, storageId) pairs which have changed after processing msg */
     #changedHeads(msg) {
         const changedHeads = [];

package/dist/Repo.d.ts

@@ -34,6 +34,7 @@ export declare class Repo extends EventEmitter<RepoEvents> {
     get handles(): Record<DocumentId, DocHandle<any>>;
     /** Returns a list of all connected peer ids */
     get peers(): PeerId[];
+    getStorageIdOfPeer(peerId: PeerId): StorageId | undefined;
     /**
      * Creates a new document and returns a handle to it. The initial value of the document is
      * an empty object `{}`. Its documentId is generated by the system. we emit a `document` event

package/dist/Repo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Repo.d.ts","sourceRoot":"","sources":["../src/Repo.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAM5C,OAAO,EAAE,SAAS,EAAiC,MAAM,gBAAgB,CAAA;AAEzE,OAAO,EAAE,cAAc,EAAE,KAAK,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAEhE,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAEnE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAI9C,8FAA8F;AAC9F;;;;;;GAMG;AACH,qBAAa,IAAK,SAAQ,YAAY,CAAC,UAAU,CAAC;;IAGhD,cAAc;IACd,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,cAAc;IACd,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;IAEnC,mDAAmD;IACnD,cAAc;IACd,gBAAgB,SAAM;IAMtB,sDAAsD;IACtD,cAAc;IACd,WAAW,EAAE,WAAW,CAAmB;IAE3C,8GAA8G;IAC9G,cAAc;IACd,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAK;gBAI3C,EACV,OAAO,EACP,OAAO,EACP,MAAM,EACN,WAAW,EACX,WAAmC,GACpC,EAAE,UAAU;IAuQb,8CAA8C;IAC9C,IAAI,OAAO,uCAEV;IAED,+CAA+C;IAC/C,IAAI,KAAK,IAAI,MAAM,EAAE,CAEpB;IAED;;;;OAIG;IACH,MAAM,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC;IA0BzB;;;;;;;;;;;;;;OAcG;IACH,KAAK,CAAC,CAAC,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC,CAAC;IAuBnC;;;OAGG;IACH,IAAI,CAAC,CAAC;IACJ,sDAAsD;IACtD,EAAE,EAAE,aAAa,GAChB,SAAS,CAAC,CAAC,CAAC;IAqBf,MAAM;IACJ,oDAAoD;IACpD,EAAE,EAAE,aAAa;IAWnB,kBAAkB,YAAa,SAAS,EAAE,UAGzC;IAED,SAAS,QAAa,QAAQ,SAAS,GAAG,SAAS,CAAC,CAMnD;CACF;AAED,MAAM,WAAW,UAAU;IACzB,4BAA4B;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf;8DAC0D;IAC1D,WAAW,CAAC,EAAE,OAAO,CAAA;IAErB,gDAAgD;IAChD,OAAO,CAAC,EAAE,cAAc,CAAA;IAExB,oDAAoD;IACpD,OAAO,EAAE,cAAc,EAAE,CAAA;IAEzB;;;OAGG;IACH,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B;AAED;;;;;;;KAOK;AACL,MAAM,MAAM,WAAW,GAAG,CACxB,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,UAAU,KACpB,OAAO,CAAC,OAAO,CAAC,CAAA;AAGrB,MAAM,WAAW,UAAU;IACzB,+CAA+C;IAC/C,QAAQ,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,CAAA;IACxC,6BAA6B;IAC7B,iBAAiB,EAAE,CAAC,GAAG,EAAE,qBAAqB,KAAK,IAAI,CAAA;IACvD,4FAA4F;IAC5F,sBAAsB,EAAE,CAAC,GAAG,EAAE,qBAAqB,KAAK,IAAI,CAAA;CAC7D;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,CAAA;IACtB,KAAK,EAAE,OAAO,CAAA;CACf;AAED,MAAM,WAAW,qBAAqB;IACpC,UAAU,EAAE,UAAU,CAAA;CACvB"}
+{"version":3,"file":"Repo.d.ts","sourceRoot":"","sources":["../src/Repo.ts"],"names":[],"mappings":"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"}

package/dist/Repo.js

@@ -101,6 +101,9 @@ export class Repo extends EventEmitter {
             this.#log(`sending ${message.type} message to ${message.targetId}`);
             networkSubsystem.send(message);
         });
+        this.#synchronizer.on("open-doc", ({ peerId, documentId }) => {
+            this.#remoteHeadsSubscriptions.subscribePeerToDoc(peerId, documentId);
+        });
         // STORAGE
         // The storage subsystem has access to some form of persistence, and deals with save and loading documents.
         const storageSubsystem = storage ? new StorageSubsystem(storage) : undefined;
@@ -244,6 +247,9 @@ export class Repo extends EventEmitter {
     get peers() {
         return this.#synchronizer.peers;
     }
+    getStorageIdOfPeer(peerId) {
+        return this.peerMetadataByPeerId[peerId]?.storageId;
+    }
     /**
      * Creates a new document and returns a handle to it. The initial value of the document is
      * an empty object `{}`. Its documentId is generated by the system. we emit a `document` event

package/dist/network/messages.d.ts

@@ -111,6 +111,11 @@ export interface SyncStateMessage {
     documentId: DocumentId;
     syncState: SyncState;
 }
+/** Notify the repo that a peer started syncing with a doc */
+export interface OpenDocMessage {
+    peerId: PeerId;
+    documentId: DocumentId;
+}
 export declare const isValidRepoMessage: (message: Message) => message is RepoMessage;
 export declare const isDocumentUnavailableMessage: (msg: Message) => msg is DocumentUnavailableMessage;
 export declare const isRequestMessage: (msg: Message) => msg is RequestMessage;

package/dist/network/messages.d.ts.map

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

package/dist/synchronizer/CollectionSynchronizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CollectionSynchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/CollectionSynchronizer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACjC,OAAO,EAAE,UAAU,EAAe,MAAM,wBAAwB,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEhD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAIhD,4FAA4F;AAC5F,qBAAa,sBAAuB,SAAQ,YAAY;;IAU1C,OAAO,CAAC,IAAI;gBAAJ,IAAI,EAAE,IAAI;IAoD9B;;;OAGG;IACG,cAAc,CAAC,OAAO,EAAE,UAAU;IAyBxC;;OAEG;IACH,WAAW,CAAC,UAAU,EAAE,UAAU;IAYlC,cAAc,CAAC,UAAU,EAAE,UAAU;IAIrC,2DAA2D;IAC3D,OAAO,CAAC,MAAM,EAAE,MAAM;IAgBtB,uDAAuD;IACvD,UAAU,CAAC,MAAM,EAAE,MAAM;IASzB,+CAA+C;IAC/C,IAAI,KAAK,IAAI,MAAM,EAAE,CAEpB;CACF"}
+{"version":3,"file":"CollectionSynchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/CollectionSynchronizer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACjC,OAAO,EAAE,UAAU,EAAe,MAAM,wBAAwB,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEhD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAIhD,4FAA4F;AAC5F,qBAAa,sBAAuB,SAAQ,YAAY;;IAU1C,OAAO,CAAC,IAAI;gBAAJ,IAAI,EAAE,IAAI;IAqD9B;;;OAGG;IACG,cAAc,CAAC,OAAO,EAAE,UAAU;IAyBxC;;OAEG;IACH,WAAW,CAAC,UAAU,EAAE,UAAU;IAYlC,cAAc,CAAC,UAAU,EAAE,UAAU;IAIrC,2DAA2D;IAC3D,OAAO,CAAC,MAAM,EAAE,MAAM;IAgBtB,uDAAuD;IACvD,UAAU,CAAC,MAAM,EAAE,MAAM;IASzB,+CAA+C;IAC/C,IAAI,KAAK,IAAI,MAAM,EAAE,CAEpB;CACF"}

package/dist/synchronizer/CollectionSynchronizer.js

@@ -40,6 +40,7 @@ export class CollectionSynchronizer extends Synchronizer {
             },
         });
         docSynchronizer.on("message", event => this.emit("message", event));
+        docSynchronizer.on("open-doc", event => this.emit("open-doc", event));
         docSynchronizer.on("sync-state", event => this.emit("sync-state", event));
         return docSynchronizer;
     }

package/dist/synchronizer/DocSynchronizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DocSynchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/DocSynchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,2BAA2B,CAAA;AAG9C,OAAO,EACL,SAAS,EAKV,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAEL,gBAAgB,EAEhB,WAAW,EACX,cAAc,EACd,WAAW,EAEZ,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAIhD,KAAK,kBAAkB,GAAG,SAAS,GAAG,KAAK,GAAG,aAAa,GAAG,OAAO,CAAA;AAOrE,UAAU,qBAAqB;IAC7B,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,CAAA;IAC1B,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,CAAC,CAAC,SAAS,GAAG,SAAS,CAAA;CAC9D;AAED;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,YAAY;;IAE/C,gBAAgB,SAAM;gBAsBV,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,qBAAqB;IAyB9D,IAAI,UAAU,uCAEb;IAED,IAAI,UAAU,qCAEb;IAyHD,OAAO,CAAC,MAAM,EAAE,MAAM;IAItB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE;IA+C3B,OAAO,CAAC,MAAM,EAAE,MAAM;IAKtB,cAAc,CAAC,OAAO,EAAE,WAAW;IAkBnC,uBAAuB,CAAC,OAAO,EAAE,gBAAgB;IAuBjD,kBAAkB,CAAC,OAAO,EAAE,WAAW,GAAG,cAAc;CA8EzD"}
+{"version":3,"file":"DocSynchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/DocSynchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,2BAA2B,CAAA;AAG9C,OAAO,EACL,SAAS,EAKV,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAEL,gBAAgB,EAEhB,WAAW,EACX,cAAc,EACd,WAAW,EAEZ,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAGhD,KAAK,kBAAkB,GAAG,SAAS,GAAG,KAAK,GAAG,aAAa,GAAG,OAAO,CAAA;AAOrE,UAAU,qBAAqB;IAC7B,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,CAAA;IAC1B,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,CAAC,CAAC,SAAS,GAAG,SAAS,CAAA;CAC9D;AAED;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,YAAY;;IAE/C,gBAAgB,SAAM;gBAsBV,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,qBAAqB;IAyB9D,IAAI,UAAU,uCAEb;IAED,IAAI,UAAU,qCAEb;IA8HD,OAAO,CAAC,MAAM,EAAE,MAAM;IAItB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE;IA+C3B,OAAO,CAAC,MAAM,EAAE,MAAM;IAKtB,cAAc,CAAC,OAAO,EAAE,WAAW;IAkBnC,uBAAuB,CAAC,OAAO,EAAE,gBAAgB;IAuBjD,kBAAkB,CAAC,OAAO,EAAE,WAAW,GAAG,cAAc;CA8EzD"}

package/dist/synchronizer/DocSynchronizer.js

@@ -66,9 +66,7 @@ export class DocSynchronizer extends Synchronizer {
         this.emit("message", message);
     }
     #withSyncState(peerId, callback) {
-        if (!this.#peers.includes(peerId)) {
-            this.#peers.push(peerId);
-        }
+        this.#addPeer(peerId);
         if (!(peerId in this.#peerDocumentStatuses)) {
             this.#peerDocumentStatuses[peerId] = "unknown";
         }
@@ -86,6 +84,12 @@ export class DocSynchronizer extends Synchronizer {
         }
         pendingCallbacks.push(callback);
     }
+    #addPeer(peerId) {
+        if (!this.#peers.includes(peerId)) {
+            this.#peers.push(peerId);
+            this.emit("open-doc", { documentId: this.documentId, peerId });
+        }
+    }
     #initSyncState(peerId, syncState) {
         const pendingCallbacks = this.#pendingSyncStateCallbacks[peerId];
         if (pendingCallbacks) {

package/dist/synchronizer/Synchronizer.d.ts

@@ -1,10 +1,11 @@
 import { EventEmitter } from "eventemitter3";
-import { MessageContents, RepoMessage, SyncStateMessage } from "../network/messages.js";
+import { MessageContents, OpenDocMessage, RepoMessage, SyncStateMessage } from "../network/messages.js";
 export declare abstract class Synchronizer extends EventEmitter<SynchronizerEvents> {
     abstract receiveMessage(message: RepoMessage): void;
 }
 export interface SynchronizerEvents {
     message: (arg: MessageContents) => void;
     "sync-state": (arg: SyncStateMessage) => void;
+    "open-doc": (arg: OpenDocMessage) => void;
 }
 //# sourceMappingURL=Synchronizer.d.ts.map

package/dist/synchronizer/Synchronizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/Synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EACL,eAAe,EACf,WAAW,EACX,gBAAgB,EACjB,MAAM,wBAAwB,CAAA;AAE/B,8BAAsB,YAAa,SAAQ,YAAY,CAAC,kBAAkB,CAAC;IACzE,QAAQ,CAAC,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;CACpD;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,CAAA;IACvC,YAAY,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,IAAI,CAAA;CAC9C"}
+{"version":3,"file":"Synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/Synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EACL,eAAe,EACf,cAAc,EACd,WAAW,EACX,gBAAgB,EACjB,MAAM,wBAAwB,CAAA;AAE/B,8BAAsB,YAAa,SAAQ,YAAY,CAAC,kBAAkB,CAAC;IACzE,QAAQ,CAAC,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;CACpD;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,CAAA;IACvC,YAAY,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,IAAI,CAAA;IAC7C,UAAU,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,IAAI,CAAA;CAC1C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automerge/automerge-repo",
-  "version": "1.1.0-alpha.3",
+  "version": "1.1.0-alpha.5",
   "description": "A repository object to manage a collection of automerge documents",
   "repository": "https://github.com/automerge/automerge-repo/tree/master/packages/automerge-repo",
   "author": "Peter van Hardenberg <pvh@pvh.ca>",
@@ -19,10 +19,11 @@
     "crypto": false
   },
   "devDependencies": {
-    "http-server": "^14.1.0"
+    "http-server": "^14.1.0",
+    "vite": "^4.4.11"
   },
   "dependencies": {
-    "@automerge/automerge": "^2.1.8-alpha.2",
+    "@automerge/automerge": "^2.1.8",
     "bs58check": "^3.0.1",
     "cbor-x": "^1.3.0",
     "debug": "^4.3.4",
@@ -54,5 +55,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0d76620579403005a01d4205ee15fd08a85d445c"
+  "gitHead": "78e8cd7e0a6dae17c1bb293afcceaa40fcf02639"
 }

package/src/RemoteHeadsSubscriptions.ts

@@ -44,6 +44,9 @@ export class RemoteHeadsSubscriptions extends EventEmitter<RemoteHeadsSubscripti
   #theirSubscriptions: Map<StorageId, Set<PeerId>> = new Map()
   // Peers we will always share remote heads with even if they are not subscribed
   #generousPeers: Set<PeerId> = new Set()
+  // Documents each peer has open, we need this information so we only send remote heads of documents that the peer knows
+  #subscribedDocsByPeer: Map<PeerId, Set<DocumentId>> = new Map()
+
   #log = debug("automerge-repo:remote-heads-subscriptions")
 
   subscribeToRemotes(remotes: StorageId[]) {
@@ -89,11 +92,17 @@ export class RemoteHeadsSubscriptions extends EventEmitter<RemoteHeadsSubscripti
   handleControlMessage(control: RemoteSubscriptionControlMessage) {
     const remotesToAdd: StorageId[] = []
     const remotesToRemove: StorageId[] = []
+    const addedRemotesWeKnow: StorageId[] = []
 
     this.#log("handleControlMessage", control)
     if (control.add) {
       for (const remote of control.add) {
         let theirSubs = this.#theirSubscriptions.get(remote)
+
+        if (this.#ourSubscriptions.has(remote) || theirSubs) {
+          addedRemotesWeKnow.push(remote)
+        }
+
         if (!theirSubs) {
           theirSubs = new Set()
           this.#theirSubscriptions.set(remote, theirSubs)
@@ -128,6 +137,30 @@ export class RemoteHeadsSubscriptions extends EventEmitter<RemoteHeadsSubscripti
         remove: remotesToRemove,
       })
     }
+
+    // send all our stored heads of documents the peer knows for the remotes they've added
+    for (const remote of addedRemotesWeKnow) {
+      const subscribedDocs = this.#subscribedDocsByPeer.get(control.senderId)
+      if (subscribedDocs) {
+        for (const documentId of subscribedDocs) {
+          const knownHeads = this.#knownHeads.get(documentId)
+          if (!knownHeads) {
+            continue
+          }
+
+          const lastHeads = knownHeads.get(remote)
+          if (lastHeads) {
+            this.emit("notify-remote-heads", {
+              targetId: control.senderId,
+              documentId,
+              heads: lastHeads.heads,
+              timestamp: lastHeads.timestamp,
+              storageId: remote,
+            })
+          }
+        }
+      }
+    }
   }
 
   /** A peer we are not directly connected to has changed their heads */
@@ -165,13 +198,15 @@ export class RemoteHeadsSubscriptions extends EventEmitter<RemoteHeadsSubscripti
       const theirSubs = this.#theirSubscriptions.get(event.storageId)
       if (theirSubs) {
         for (const peerId of theirSubs) {
-          this.emit("notify-remote-heads", {
-            targetId: peerId,
-            documentId: event.documentId,
-            heads: event.remoteHeads,
-            timestamp: event.timestamp,
-            storageId: event.storageId,
-          })
+          if (this.#isPeerSubscribedToDoc(peerId, event.documentId)) {
+            this.emit("notify-remote-heads", {
+              targetId: peerId,
+              documentId: event.documentId,
+              heads: event.remoteHeads,
+              timestamp: event.timestamp,
+              storageId: event.storageId,
+            })
+          }
         }
       }
     }
@@ -200,13 +235,15 @@ export class RemoteHeadsSubscriptions extends EventEmitter<RemoteHeadsSubscripti
     const theirSubs = this.#theirSubscriptions.get(storageId)
     if (theirSubs) {
       for (const peerId of theirSubs) {
-        this.emit("notify-remote-heads", {
-          targetId: peerId,
-          documentId: documentId,
-          heads: heads,
-          timestamp: timestamp,
-          storageId: storageId,
-        })
+        if (this.#isPeerSubscribedToDoc(peerId, documentId)) {
+          this.emit("notify-remote-heads", {
+            targetId: peerId,
+            documentId: documentId,
+            heads: heads,
+            timestamp: timestamp,
+            storageId: storageId,
+          })
+        }
       }
     }
   }
@@ -241,6 +278,7 @@ export class RemoteHeadsSubscriptions extends EventEmitter<RemoteHeadsSubscripti
     const remotesToRemove = []
 
     this.#generousPeers.delete(peerId)
+    this.#subscribedDocsByPeer.delete(peerId)
 
     for (const [storageId, peerIds] of this.#theirSubscriptions) {
       if (peerIds.has(peerId)) {
@@ -261,6 +299,37 @@ export class RemoteHeadsSubscriptions extends EventEmitter<RemoteHeadsSubscripti
     }
   }
 
+  subscribePeerToDoc(peerId: PeerId, documentId: DocumentId) {
+    let subscribedDocs = this.#subscribedDocsByPeer.get(peerId)
+    if (!subscribedDocs) {
+      subscribedDocs = new Set()
+      this.#subscribedDocsByPeer.set(peerId, subscribedDocs)
+    }
+
+    subscribedDocs.add(documentId)
+
+    const remoteHeads = this.#knownHeads.get(documentId)
+    if (remoteHeads) {
+      for (const [storageId, lastHeads] of remoteHeads) {
+        const subscribedPeers = this.#theirSubscriptions.get(storageId)
+        if (subscribedPeers && subscribedPeers.has(peerId)) {
+          this.emit("notify-remote-heads", {
+            targetId: peerId,
+            documentId,
+            heads: lastHeads.heads,
+            timestamp: lastHeads.timestamp,
+            storageId,
+          })
+        }
+      }
+    }
+  }
+
+  #isPeerSubscribedToDoc(peerId: PeerId, documentId: DocumentId) {
+    let subscribedDocs = this.#subscribedDocsByPeer.get(peerId)
+    return subscribedDocs && subscribedDocs.has(documentId)
+  }
+
   /** Returns the (document, storageId) pairs which have changed after processing msg */
   #changedHeads(msg: RemoteHeadsChanged): {
     documentId: DocumentId

package/src/Repo.ts

@@ -140,6 +140,10 @@ export class Repo extends EventEmitter<RepoEvents> {
       networkSubsystem.send(message)
     })
 
+    this.#synchronizer.on("open-doc", ({ peerId, documentId }) => {
+      this.#remoteHeadsSubscriptions.subscribePeerToDoc(peerId, documentId)
+    })
+
     // STORAGE
     // The storage subsystem has access to some form of persistence, and deals with save and loading documents.
     const storageSubsystem = storage ? new StorageSubsystem(storage) : undefined
@@ -332,6 +336,10 @@ export class Repo extends EventEmitter<RepoEvents> {
     return this.#synchronizer.peers
   }
 
+  getStorageIdOfPeer(peerId: PeerId): StorageId | undefined {
+    return this.peerMetadataByPeerId[peerId]?.storageId
+  }
+
   /**
    * Creates a new document and returns a handle to it. The initial value of the document is
    * an empty object `{}`. Its documentId is generated by the system. we emit a `document` event

package/src/network/messages.ts

@@ -104,19 +104,19 @@ export type AuthMessage<TPayload = any> = {
 }
 
 export type RemoteSubscriptionControlMessage = {
-  type: "remote-subscription-change",
-  senderId: PeerId,
-  targetId: PeerId,
-  add?: StorageId[],
-  remove?: StorageId[],
+  type: "remote-subscription-change"
+  senderId: PeerId
+  targetId: PeerId
+  add?: StorageId[]
+  remove?: StorageId[]
 }
 
 export type RemoteHeadsChanged = {
-  type: "remote-heads-changed",
-  senderId: PeerId,
-  targetId: PeerId,
-  documentId: DocumentId,
-  newHeads: {[key: StorageId]: {heads: string[], timestamp: number}},
+  type: "remote-heads-changed"
+  senderId: PeerId
+  targetId: PeerId
+  documentId: DocumentId
+  newHeads: { [key: StorageId]: { heads: string[]; timestamp: number } }
 }
 
 /** These are message types that a {@link NetworkAdapter} surfaces to a {@link Repo}. */
@@ -128,7 +128,11 @@ export type RepoMessage =
   | RemoteSubscriptionControlMessage
   | RemoteHeadsChanged
 
-export type DocMessage = SyncMessage | EphemeralMessage | RequestMessage | DocumentUnavailableMessage
+export type DocMessage =
+  | SyncMessage
+  | EphemeralMessage
+  | RequestMessage
+  | DocumentUnavailableMessage
 
 /** These are all the message types that a {@link NetworkAdapter} might see. */
 export type Message = RepoMessage | AuthMessage
@@ -148,6 +152,12 @@ export interface SyncStateMessage {
   syncState: SyncState
 }
 
+/** Notify the repo that a peer started syncing with a doc */
+export interface OpenDocMessage {
+  peerId: PeerId
+  documentId: DocumentId
+}
+
 // TYPE GUARDS
 
 export const isValidRepoMessage = (message: Message): message is RepoMessage =>
@@ -174,7 +184,9 @@ export const isSyncMessage = (msg: Message): msg is SyncMessage =>
 export const isEphemeralMessage = (msg: Message): msg is EphemeralMessage =>
   msg.type === "ephemeral"
 
-export const isRemoteSubscriptionControlMessage = (msg: Message): msg is RemoteSubscriptionControlMessage =>
+export const isRemoteSubscriptionControlMessage = (
+  msg: Message
+): msg is RemoteSubscriptionControlMessage =>
   msg.type === "remote-subscription-change"
 
 export const isRemoteHeadsChanged = (msg: Message): msg is RemoteHeadsChanged =>

package/src/synchronizer/CollectionSynchronizer.ts

@@ -55,6 +55,7 @@ export class CollectionSynchronizer extends Synchronizer {
       },
     })
     docSynchronizer.on("message", event => this.emit("message", event))
+    docSynchronizer.on("open-doc", event => this.emit("open-doc", event))
     docSynchronizer.on("sync-state", event => this.emit("sync-state", event))
     return docSynchronizer
   }

package/src/synchronizer/DocSynchronizer.ts

@@ -20,7 +20,6 @@ import {
 import { PeerId } from "../types.js"
 import { Synchronizer } from "./Synchronizer.js"
 import { throttle } from "../helpers/throttle.js"
-import { headsAreSame } from "../helpers/headsAreSame.js"
 
 type PeerDocumentStatus = "unknown" | "has" | "unavailable" | "wants"
 
@@ -124,9 +123,7 @@ export class DocSynchronizer extends Synchronizer {
   }
 
   #withSyncState(peerId: PeerId, callback: (syncState: A.SyncState) => void) {
-    if (!this.#peers.includes(peerId)) {
-      this.#peers.push(peerId)
-    }
+    this.#addPeer(peerId)
 
     if (!(peerId in this.#peerDocumentStatuses)) {
       this.#peerDocumentStatuses[peerId] = "unknown"
@@ -149,6 +146,13 @@ export class DocSynchronizer extends Synchronizer {
     pendingCallbacks.push(callback)
   }
 
+  #addPeer(peerId: PeerId) {
+    if (!this.#peers.includes(peerId)) {
+      this.#peers.push(peerId)
+      this.emit("open-doc", { documentId: this.documentId, peerId })
+    }
+  }
+
   #initSyncState(peerId: PeerId, syncState: A.SyncState) {
     const pendingCallbacks = this.#pendingSyncStateCallbacks[peerId]
     if (pendingCallbacks) {

package/src/synchronizer/Synchronizer.ts

@@ -1,6 +1,7 @@
 import { EventEmitter } from "eventemitter3"
 import {
   MessageContents,
+  OpenDocMessage,
   RepoMessage,
   SyncStateMessage,
 } from "../network/messages.js"
@@ -12,4 +13,5 @@ export abstract class Synchronizer extends EventEmitter<SynchronizerEvents> {
 export interface SynchronizerEvents {
   message: (arg: MessageContents) => void
   "sync-state": (arg: SyncStateMessage) => void
+  "open-doc": (arg: OpenDocMessage) => void
 }

package/test/RemoteHeadsSubscriptions.test.ts

@@ -1,15 +1,14 @@
 import * as A from "@automerge/automerge"
 import assert from "assert"
 import { describe, it } from "vitest"
+import { generateAutomergeUrl, parseAutomergeUrl } from "../src/AutomergeUrl.js"
 import { RemoteHeadsSubscriptions } from "../src/RemoteHeadsSubscriptions.js"
 import { PeerId, StorageId } from "../src/index.js"
-import { generateAutomergeUrl, parseAutomergeUrl } from "../src/AutomergeUrl.js"
-import { pause } from "../src/helpers/pause.js"
-import { EventEmitter } from "eventemitter3"
 import {
   RemoteHeadsChanged,
   RemoteSubscriptionControlMessage,
 } from "../src/network/messages.js"
+import { waitForMessages } from "./helpers/waitForMessages.js"
 
 describe("RepoHeadsSubscriptions", () => {
   const storageA = "remote-a" as StorageId
@@ -224,6 +223,8 @@ describe("RepoHeadsSubscriptions", () => {
       remoteHeadsSubscriptions,
       "notify-remote-heads"
     )
+    remoteHeadsSubscriptions.subscribePeerToDoc(peerC, docA)
+    remoteHeadsSubscriptions.subscribePeerToDoc(peerC, docC)
 
     // change message for docA in storageB
     remoteHeadsSubscriptions.handleRemoteHeads(docAHeadsChangedForStorageB)
@@ -260,6 +261,32 @@ describe("RepoHeadsSubscriptions", () => {
     assert.strictEqual(messages.length, 0)
   })
 
+  it("should not send remote heads for docs that the peer is not subscribed to", async () => {
+    const remoteHeadsSubscriptions = new RemoteHeadsSubscriptions()
+    remoteHeadsSubscriptions.subscribeToRemotes([storageB])
+
+    // subscribe peer c to storage b
+    remoteHeadsSubscriptions.handleControlMessage(subscribePeerCToStorageB)
+    const messagesAfterSubscribePromise = waitForMessages(
+      remoteHeadsSubscriptions,
+      "notify-remote-heads"
+    )
+
+    // change message for docA in storageB
+    remoteHeadsSubscriptions.handleRemoteHeads(docAHeadsChangedForStorageB)
+
+    // change heads directly
+    remoteHeadsSubscriptions.handleImmediateRemoteHeadsChanged(
+      docC,
+      storageB,
+      []
+    )
+
+    // expect peer c to be notified both changes
+    let messages = await messagesAfterSubscribePromise
+    assert.strictEqual(messages.length, 0)
+  })
+
   it("should ignore sync states with an older timestamp", async () => {
     const remoteHeadsSubscription = new RemoteHeadsSubscriptions()
 
@@ -321,23 +348,3 @@ describe("RepoHeadsSubscriptions", () => {
     assert.deepStrictEqual(messages[2].peers, [])
   })
 })
-
-async function waitForMessages(
-  emitter: EventEmitter,
-  event: string,
-  timeout: number = 100
-): Promise<any[]> {
-  const messages = []
-
-  const onEvent = message => {
-    messages.push(message)
-  }
-
-  emitter.on(event, onEvent)
-
-  await pause(timeout)
-
-  emitter.off(event)
-
-  return messages
-}

package/test/helpers/waitForMessages.ts

@@ -0,0 +1,22 @@
+import { EventEmitter } from "eventemitter3"
+import { pause } from "../../src/helpers/pause.js"
+
+export async function waitForMessages(
+  emitter: EventEmitter,
+  event: string,
+  timeout: number = 100
+): Promise<any[]> {
+  const messages = []
+
+  const onEvent = message => {
+    messages.push(message)
+  }
+
+  emitter.on(event, onEvent)
+
+  await pause(timeout)
+
+  emitter.off(event)
+
+  return messages
+}

package/test/remoteHeads.test.ts

@@ -1,20 +1,19 @@
+import { MessageChannelNetworkAdapter } from "@automerge/automerge-repo-network-messagechannel"
 import * as A from "@automerge/automerge/next"
 import assert from "assert"
-import { decode } from "cbor-x"
+import { setTimeout } from "timers/promises"
 import { describe, it } from "vitest"
 import { generateAutomergeUrl, parseAutomergeUrl } from "../src/AutomergeUrl.js"
 import { eventPromise } from "../src/helpers/eventPromise.js"
-import { pause } from "../src/helpers/pause.js"
 import {
   DocHandle,
   DocHandleRemoteHeadsPayload,
   PeerId,
   Repo,
 } from "../src/index.js"
-import { TestDoc } from "./types.js"
-import { MessageChannelNetworkAdapter } from "@automerge/automerge-repo-network-messagechannel"
-import { setTimeout } from "timers/promises"
 import { DummyStorageAdapter } from "./helpers/DummyStorageAdapter.js"
+import { waitForMessages } from "./helpers/waitForMessages.js"
+import { TestDoc } from "./types.js"
 
 describe("DocHandle.remoteHeads", () => {
   const TEST_ID = parseAutomergeUrl(generateAutomergeUrl()).documentId
@@ -40,86 +39,207 @@ describe("DocHandle.remoteHeads", () => {
     assert.deepStrictEqual(handle.getRemoteHeads(bobStorageId), [])
   })
 
-  it("should report remoteHeads for peers who are several hops away", async () => {
-    // replicates a tab -> service worker -> sync server <- service worker <- tab scenario
-    const leftTab = new Repo({
-      peerId: "left-tab" as PeerId,
-      network: [],
-      sharePolicy: async () => true,
-    })
-    const leftServiceWorker = new Repo({
-      peerId: "left-service-worker" as PeerId,
-      network: [],
-      sharePolicy: async peer => peer === "sync-server",
-      storage: new DummyStorageAdapter(),
-      isEphemeral: false,
-    })
-    const syncServer = new Repo({
-      peerId: "sync-server" as PeerId,
-      network: [],
-      isEphemeral: false,
-      sharePolicy: async () => false,
-      storage: new DummyStorageAdapter(),
-    })
-    const rightServiceWorker = new Repo({
-      peerId: "right-service-worker" as PeerId,
-      network: [],
-      sharePolicy: async peer => peer === "sync-server",
-      isEphemeral: false,
-      storage: new DummyStorageAdapter(),
+  describe("multi hop sync", () => {
+    async function setup() {
+      // setup topology: tab -> service worker -> sync server <- service worker <- tab
+      const leftTab1 = new Repo({
+        peerId: "left-tab-1" as PeerId,
+        network: [],
+        sharePolicy: async () => true,
+      })
+      const leftTab2 = new Repo({
+        peerId: "left-tab-2" as PeerId,
+        network: [],
+        sharePolicy: async () => true,
+      })
+      const leftServiceWorker = new Repo({
+        peerId: "left-service-worker" as PeerId,
+        network: [],
+        sharePolicy: async peer => peer === "sync-server",
+        storage: new DummyStorageAdapter(),
+        isEphemeral: false,
+      })
+      const syncServer = new Repo({
+        peerId: "sync-server" as PeerId,
+        network: [],
+        isEphemeral: false,
+        sharePolicy: async () => false,
+        storage: new DummyStorageAdapter(),
+      })
+      const rightServiceWorker = new Repo({
+        peerId: "right-service-worker" as PeerId,
+        network: [],
+        sharePolicy: async peer => peer === "sync-server",
+        isEphemeral: false,
+        storage: new DummyStorageAdapter(),
+      })
+      const rightTab = new Repo({
+        peerId: "right-tab" as PeerId,
+        network: [],
+        sharePolicy: async () => true,
+      })
+
+      // connect them all up
+      connectRepos(leftTab1, leftServiceWorker)
+      connectRepos(leftTab2, leftServiceWorker)
+      connectRepos(leftServiceWorker, syncServer)
+      connectRepos(syncServer, rightServiceWorker)
+      connectRepos(rightServiceWorker, rightTab)
+
+      await setTimeout(100)
+
+      return {
+        leftTab1,
+        leftTab2,
+        leftServiceWorker,
+        syncServer,
+        rightServiceWorker,
+        rightTab,
+      }
+    }
+
+    it("should report remoteHeads for peers", async () => {
+      const { rightTab, rightServiceWorker, leftServiceWorker, leftTab1 } =
+        await setup()
+
+      // subscribe to the left service worker storage ID on the right tab
+      rightTab.subscribeToRemotes([await leftServiceWorker.storageId()!])
+
+      await setTimeout(100)
+
+      // create a doc in the left tab
+      const leftTabDoc = leftTab1.create<TestDoc>()
+      leftTabDoc.change(d => (d.foo = "bar"))
+
+      // wait for the document to arrive on the right tab
+      const rightTabDoc = rightTab.find<TestDoc>(leftTabDoc.url)
+      await rightTabDoc.whenReady()
+
+      // wait for the document to arrive in the left service worker
+      const leftServiceWorkerDoc = leftServiceWorker.find(leftTabDoc.documentId)
+      await leftServiceWorkerDoc.whenReady()
+
+      const leftServiceWorkerStorageId = await leftServiceWorker.storageId()
+      let leftSeenByRightPromise = new Promise<DocHandleRemoteHeadsPayload>(
+        resolve => {
+          rightTabDoc.on("remote-heads", message => {
+            if (message.storageId === leftServiceWorkerStorageId) {
+              resolve(message)
+            }
+          })
+        }
+      )
+
+      // make a change on the right
+      rightTabDoc.change(d => (d.foo = "baz"))
+
+      // wait for the change to be acknolwedged by the left
+      const leftSeenByRight = await leftSeenByRightPromise
+
+      assert.deepStrictEqual(
+        leftSeenByRight.heads,
+        A.getHeads(leftServiceWorkerDoc.docSync())
+      )
     })
-    const rightTab = new Repo({
-      peerId: "right-tab" as PeerId,
-      network: [],
-      sharePolicy: async () => true,
+
+    it("should report remoteHeads only for documents the subscriber has open", async () => {
+      const { leftTab1, rightTab, rightServiceWorker } = await setup()
+
+      // subscribe leftTab to storageId of rightServiceWorker
+      leftTab1.subscribeToRemotes([await rightServiceWorker.storageId()!])
+
+      await setTimeout(100)
+
+      // create 2 docs in right tab
+      const rightTabDocA = rightTab.create<TestDoc>()
+      rightTabDocA.change(d => (d.foo = "A"))
+
+      const rightTabDocB = rightTab.create<TestDoc>()
+      rightTabDocB.change(d => (d.foo = "B"))
+
+      // open doc b in left tab 1
+      const leftTabDocA = leftTab1.find<TestDoc>(rightTabDocA.url)
+
+      const remoteHeadsChangedMessages = (
+        await waitForMessages(leftTab1.networkSubsystem, "message")
+      ).filter(({ type }) => type === "remote-heads-changed")
+
+      // we should only be notified of the head changes of doc A
+      assert.strictEqual(remoteHeadsChangedMessages.length, 1)
+      assert.strictEqual(
+        remoteHeadsChangedMessages[0].documentId,
+        leftTabDocA.documentId
+      )
     })
 
-    // connect them all up
-    connectRepos(leftTab, leftServiceWorker)
-    connectRepos(leftServiceWorker, syncServer)
-    connectRepos(syncServer, rightServiceWorker)
-    connectRepos(rightServiceWorker, rightTab)
+    it("should report remote heads for doc on subscribe if peer already knows them", async () => {
+      const { leftTab1, leftTab2, rightTab, rightServiceWorker } = await setup()
 
-    await setTimeout(100)
+      // create 2 docs in right tab
+      const rightTabDocA = rightTab.create<TestDoc>()
+      rightTabDocA.change(d => (d.foo = "A"))
 
-    // subscribe to the left service worker storage ID on the right tab
-    rightTab.subscribeToRemotes([await leftServiceWorker.storageId()!])
+      const rightTabDocB = rightTab.create<TestDoc>()
+      rightTabDocB.change(d => (d.foo = "B"))
 
-    await setTimeout(100)
+      // open docs in left tab 1
+      const leftTab1DocA = leftTab1.find<TestDoc>(rightTabDocA.url)
+      const leftTab1DocB = leftTab1.find<TestDoc>(rightTabDocB.url)
 
-    // create a doc in the left tab
-    const leftTabDoc = leftTab.create<TestDoc>()
-    leftTabDoc.change(d => (d.foo = "bar"))
+      // subscribe leftTab 1 to storageId of rightServiceWorker
+      leftTab1.subscribeToRemotes([await rightServiceWorker.storageId()!])
 
-    // wait for the document to arrive on the right tab
-    const rightTabDoc = rightTab.find<TestDoc>(leftTabDoc.url)
-    await rightTabDoc.whenReady()
+      await setTimeout(200)
 
-    // wait for the document to arrive in the left service worker
-    const leftServiceWorkerDoc = leftServiceWorker.find(leftTabDoc.documentId)
-    await leftServiceWorkerDoc.whenReady()
+      // now the left service worker has the remote heads of the right service worker for both doc A and doc B
+      // if we subscribe from left tab 1 the left service workers should send it's stored remote heads immediately
 
-    const leftServiceWorkerStorageId = await leftServiceWorker.storageId()
-    let leftSeenByRightPromise = new Promise<DocHandleRemoteHeadsPayload>(
-      resolve => {
-        rightTabDoc.on("remote-heads", message => {
-          if (message.storageId === leftServiceWorkerStorageId) {
-            resolve(message)
-          }
-        })
-      }
-    )
+      // open doc and subscribe leftTab 2 to storageId of rightServiceWorker
+      const leftTab2DocA = leftTab2.find<TestDoc>(rightTabDocA.url)
+      leftTab2.subscribeToRemotes([await rightServiceWorker.storageId()!])
+
+      const remoteHeadsChangedMessages = (
+        await waitForMessages(leftTab2.networkSubsystem, "message")
+      ).filter(({ type }) => type === "remote-heads-changed")
 
-    // make a change on the right
-    rightTabDoc.change(d => (d.foo = "baz"))
+      // we should only be notified of the head changes of doc A
+      assert.strictEqual(remoteHeadsChangedMessages.length, 1)
+      assert.strictEqual(
+        remoteHeadsChangedMessages[0].documentId,
+        leftTab1DocA.documentId
+      )
+    })
+
+    it("should report remote heads for subscribed storage id once we open a new doc", async () => {
+      const { leftTab1, leftTab2, rightTab, rightServiceWorker } = await setup()
+
+      // create 2 docs in right tab
+      const rightTabDocA = rightTab.create<TestDoc>()
+      rightTabDocA.change(d => (d.foo = "A"))
+
+      const rightTabDocB = rightTab.create<TestDoc>()
+      rightTabDocB.change(d => (d.foo = "B"))
+
+      await setTimeout(200)
 
-    // wait for the change to be acknolwedged by the left
-    const leftSeenByRight = await leftSeenByRightPromise
+      // subscribe leftTab 1 to storageId of rightServiceWorker
+      leftTab1.subscribeToRemotes([await rightServiceWorker.storageId()!])
 
-    assert.deepStrictEqual(
-      leftSeenByRight.heads,
-      A.getHeads(leftServiceWorkerDoc.docSync())
-    )
+      // in leftTab 1 open doc A
+      const leftTab1DocA = leftTab1.find<TestDoc>(rightTabDocA.url)
+
+      const remoteHeadsChangedMessages = (
+        await waitForMessages(leftTab1.networkSubsystem, "message")
+      ).filter(({ type }) => type === "remote-heads-changed")
+
+      console.log(JSON.stringify(remoteHeadsChangedMessages, null, 2))
+
+      assert.strictEqual(remoteHeadsChangedMessages.length, 1)
+      assert.strictEqual(
+        remoteHeadsChangedMessages[0].documentId,
+        leftTab1DocA.documentId
+      )
+    })
   })
 })