@automerge/automerge-repo 2.5.0 → 2.5.2-alpha.0

package/dist/synchronizer/CollectionSynchronizer.js

@@ -14,6 +14,7 @@ export class CollectionSynchronizer extends Synchronizer {
     /** Used to determine if the document is know to the Collection and a synchronizer exists or is being set up */
     #docSetUp = {};
     #denylist;
+    #hasRequested = new Map();
     constructor(repo, denylist = []) {
         super();
         this.repo = repo;
@@ -83,6 +84,15 @@ export class CollectionSynchronizer extends Synchronizer {
             });
             return;
         }
+        // Record the request so that even if access is denied now, we know that the
+        // peer requested the document so that if the share policy changes we know
+        // to begin syncing with this peer
+        if (message.type === "request") {
+            if (!this.#hasRequested.has(documentId)) {
+                this.#hasRequested.set(documentId, new Set());
+            }
+            this.#hasRequested.get(documentId)?.add(message.senderId);
+        }
         const hasAccess = await this.repo.shareConfig.access(message.senderId, documentId);
         if (!hasAccess) {
             log("access denied");
@@ -111,6 +121,7 @@ export class CollectionSynchronizer extends Synchronizer {
         if (this.#docSetUp[handle.documentId]) {
             return;
         }
+        this.#docSetUp[handle.documentId] = true;
         const docSynchronizer = this.#fetchDocSynchronizer(handle);
         void this.#documentGenerousPeers(handle.documentId).then(peers => {
             void docSynchronizer.beginSync(peers);
@@ -145,6 +156,9 @@ export class CollectionSynchronizer extends Synchronizer {
     removePeer(peerId) {
         log(`removing peer ${peerId}`);
         this.#peers.delete(peerId);
+        for (const requested of this.#hasRequested.values()) {
+            requested.delete(peerId);
+        }
         for (const docSynchronizer of Object.values(this.docSynchronizers)) {
             docSynchronizer.endSync(peerId);
         }
@@ -153,6 +167,38 @@ export class CollectionSynchronizer extends Synchronizer {
     get peers() {
         return Array.from(this.#peers);
     }
+    /**
+     * Re-evaluates share policy for a document and updates sync accordingly
+     *
+     * @remarks
+     * This is called when the share policy for a document has changed. It re-evaluates
+     * which peers should have access and starts/stops synchronization as needed.
+     */
+    async reevaluateDocumentShare() {
+        const peers = Array.from(this.#peers);
+        const docPromises = [];
+        for (const docSynchronizer of Object.values(this.docSynchronizers)) {
+            const documentId = docSynchronizer.documentId;
+            docPromises.push((async () => {
+                for (const peerId of peers) {
+                    const shouldShare = await this.#shouldShare(peerId, documentId);
+                    const isAlreadySyncing = docSynchronizer.hasPeer(peerId);
+                    log(`reevaluateDocumentShare: ${peerId} for ${documentId}, shouldShare: ${shouldShare}, isAlreadySyncing: ${isAlreadySyncing}`);
+                    if (shouldShare && !isAlreadySyncing) {
+                        log(`reevaluateDocumentShare: starting sync with ${peerId} for ${documentId}`);
+                        void docSynchronizer.beginSync([peerId]);
+                    }
+                    else if (!shouldShare && isAlreadySyncing) {
+                        log(`reevaluateDocumentShare: stopping sync with ${peerId} for ${documentId}`);
+                        docSynchronizer.endSync(peerId);
+                    }
+                }
+            })().catch(e => {
+                console.log(`error reevaluating document share for ${documentId}: ${e}`);
+            }));
+        }
+        await Promise.allSettled(docPromises);
+    }
     metrics() {
         return Object.fromEntries(Object.entries(this.docSynchronizers).map(([documentId, synchronizer]) => {
             return [documentId, synchronizer.metrics()];
@@ -163,6 +209,7 @@ export class CollectionSynchronizer extends Synchronizer {
             this.repo.shareConfig.announce(peerId, documentId),
             this.repo.shareConfig.access(peerId, documentId),
         ]);
-        return announce && access;
+        const hasRequested = this.#hasRequested.get(documentId)?.has(peerId) ?? false;
+        return announce || (access && hasRequested);
     }
 }

package/dist/synchronizer/DocSynchronizer.js

@@ -130,8 +130,8 @@ export class DocSynchronizer extends Synchronizer {
                 durationMillis: end - start,
                 forPeer: peerId,
             });
+            this.#setSyncState(peerId, newSyncState);
             if (message) {
-                this.#setSyncState(peerId, newSyncState);
                 const isNew = A.getHeads(doc).length === 0;
                 if (!this.#handle.isReady() &&
                     isNew &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automerge/automerge-repo",
-  "version": "2.5.0",
+  "version": "2.5.2-alpha.0",
   "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>",
@@ -59,5 +59,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fffb5789bfc7a18b3d9f1e668395c7c465e34be1"
+  "gitHead": "ba4493efcd7819fe841d3647f28090837792d964"
 }