@automerge/automerge-repo 1.0.0-alpha.2 → 1.0.0-alpha.4

package/dist/Repo.js

@@ -1,15 +1,13 @@
+import debug from "debug";
 import { DocCollection } from "./DocCollection.js";
-import { EphemeralData } from "./EphemeralData.js";
 import { NetworkSubsystem } from "./network/NetworkSubsystem.js";
 import { StorageSubsystem } from "./storage/StorageSubsystem.js";
 import { CollectionSynchronizer } from "./synchronizer/CollectionSynchronizer.js";
-import debug from "debug";
 /** A Repo is a DocCollection with networking, syncing, and storage capabilities. */
 export class Repo extends DocCollection {
     #log;
     networkSubsystem;
     storageSubsystem;
-    ephemeralData;
     constructor({ storage, network, peerId, sharePolicy }) {
         super();
         this.#log = debug(`automerge-repo:repo`);
@@ -17,36 +15,60 @@ export class Repo extends DocCollection {
         // DOC COLLECTION
         // The `document` event is fired by the DocCollection any time we create a new document or look
         // up a document by ID. We listen for it in order to wire up storage and network synchronization.
-        this.on("document", async ({ handle }) => {
+        this.on("document", async ({ handle, isNew }) => {
             if (storageSubsystem) {
                 // Save when the document changes
                 handle.on("heads-changed", async ({ handle, doc }) => {
                     await storageSubsystem.saveDoc(handle.documentId, doc);
                 });
-                // Try to load from disk
-                const loadedDoc = await storageSubsystem.loadDoc(handle.documentId);
-                if (loadedDoc) {
-                    handle.update(() => loadedDoc);
+                if (isNew) {
+                    // this is a new document, immediately save it
+                    await storageSubsystem.saveDoc(handle.documentId, handle.docSync());
+                }
+                else {
+                    // Try to load from disk
+                    const loadedDoc = await storageSubsystem.loadDoc(handle.documentId);
+                    if (loadedDoc) {
+                        handle.update(() => loadedDoc);
+                    }
                 }
             }
-            handle.request();
+            handle.on("unavailable", () => {
+                this.#log("document unavailable", { documentId: handle.documentId });
+                this.emit("unavailable-document", {
+                    documentId: handle.documentId,
+                });
+            });
+            if (this.networkSubsystem.isReady()) {
+                handle.request();
+            }
+            else {
+                handle.awaitNetwork();
+                this.networkSubsystem.whenReady().then(() => {
+                    handle.networkReady();
+                }).catch(err => {
+                    this.#log("error waiting for network", { err });
+                });
+            }
             // Register the document with the synchronizer. This advertises our interest in the document.
             synchronizer.addDocument(handle.documentId);
         });
-        this.on("delete-document", ({ encodedDocumentId }) => {
+        this.on("delete-document", ({ documentId }) => {
             // TODO Pass the delete on to the network
             // synchronizer.removeDocument(documentId)
             if (storageSubsystem) {
-                storageSubsystem.remove(encodedDocumentId);
+                storageSubsystem.remove(documentId).catch(err => {
+                    this.#log("error deleting document", { documentId, err });
+                });
             }
         });
         // SYNCHRONIZER
         // The synchronizer uses the network subsystem to keep documents in sync with peers.
         const synchronizer = new CollectionSynchronizer(this);
         // When the synchronizer emits sync messages, send them to peers
-        synchronizer.on("message", ({ targetId, channelId, message, broadcast }) => {
-            this.#log(`sending sync message to ${targetId}`);
-            networkSubsystem.sendMessage(targetId, channelId, message, broadcast);
+        synchronizer.on("message", message => {
+            this.#log(`sending sync message to ${message.targetId}`);
+            networkSubsystem.send(message);
         });
         // STORAGE
         // The storage subsystem has access to some form of persistence, and deals with save and loading documents.
@@ -67,31 +89,7 @@ export class Repo extends DocCollection {
         });
         // Handle incoming messages
         networkSubsystem.on("message", async (msg) => {
-            const { senderId, channelId, message } = msg;
-            // TODO: this demands a more principled way of associating channels with recipients
-            // Ephemeral channel ids start with "m/"
-            if (channelId.startsWith("m/")) {
-                // Ephemeral message
-                this.#log(`receiving ephemeral message from ${senderId}`);
-                ephemeralData.receive(senderId, channelId, message);
-            }
-            else {
-                // Sync message
-                this.#log(`receiving sync message from ${senderId}`);
-                await synchronizer.receiveSyncMessage(senderId, channelId, message);
-            }
-        });
-        // We establish a special channel for sync messages
-        networkSubsystem.join();
-        // EPHEMERAL DATA
-        // The ephemeral data subsystem uses the network to send and receive messages that are not
-        // persisted to storage, e.g. cursor position, presence, etc.
-        const ephemeralData = new EphemeralData();
-        this.ephemeralData = ephemeralData;
-        // Send ephemeral messages to peers
-        ephemeralData.on("message", ({ targetId, channelId, message, broadcast }) => {
-            this.#log(`sending ephemeral message to ${targetId}`);
-            networkSubsystem.sendMessage(targetId, channelId, message, broadcast);
+            await synchronizer.receiveMessage(msg);
         });
     }
 }

package/dist/helpers/cbor.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="node" resolution-mode="require"/>
+export declare function encode(obj: any): Buffer;
+export declare function decode(buf: Buffer | Uint8Array): any;
+//# sourceMappingURL=cbor.d.ts.map

package/dist/helpers/cbor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cbor.d.ts","sourceRoot":"","sources":["../../src/helpers/cbor.ts"],"names":[],"mappings":";AAEA,wBAAgB,MAAM,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAGvC;AAED,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,GAAG,GAAG,CAEpD"}

package/dist/helpers/cbor.js

@@ -0,0 +1,8 @@
+import { Encoder, decode as cborXdecode } from "cbor-x";
+export function encode(obj) {
+    let encoder = new Encoder({ tagUint8Array: false });
+    return encoder.encode(obj);
+}
+export function decode(buf) {
+    return cborXdecode(buf);
+}

package/dist/helpers/eventPromise.d.ts

@@ -1,4 +1,4 @@
-import EventEmitter from "eventemitter3";
+import { EventEmitter } from "eventemitter3";
 /** Returns a promise that resolves when the given event is emitted on the given emitter. */
 export declare const eventPromise: (emitter: EventEmitter, event: string) => Promise<any>;
 export declare const eventPromises: (emitters: EventEmitter[], event: string) => Promise<any[]>;

package/dist/helpers/eventPromise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"eventPromise.d.ts","sourceRoot":"","sources":["../../src/helpers/eventPromise.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAA;AAExC,4FAA4F;AAC5F,eAAO,MAAM,YAAY,YAAa,YAAY,SAAS,MAAM,iBACE,CAAA;AAEnE,eAAO,MAAM,aAAa,aAAc,YAAY,EAAE,SAAS,MAAM,mBAGpE,CAAA"}
+{"version":3,"file":"eventPromise.d.ts","sourceRoot":"","sources":["../../src/helpers/eventPromise.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAE5C,4FAA4F;AAC5F,eAAO,MAAM,YAAY,YAAa,YAAY,SAAS,MAAM,iBACE,CAAA;AAEnE,eAAO,MAAM,aAAa,aAAc,YAAY,EAAE,SAAS,MAAM,mBAGpE,CAAA"}

package/dist/helpers/headsAreSame.d.ts

@@ -1,3 +1,2 @@
-import { Heads } from "@automerge/automerge";
 export declare const headsAreSame: (a: Heads, b: Heads) => boolean;
 //# sourceMappingURL=headsAreSame.d.ts.map

package/dist/helpers/headsAreSame.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"headsAreSame.d.ts","sourceRoot":"","sources":["../../src/helpers/headsAreSame.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,sBAAsB,CAAA;AAG1C,eAAO,MAAM,YAAY,iCAExB,CAAA"}
+{"version":3,"file":"headsAreSame.d.ts","sourceRoot":"","sources":["../../src/helpers/headsAreSame.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY,iCAExB,CAAA"}

package/dist/helpers/tests/network-adapter-tests.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"network-adapter-tests.d.ts","sourceRoot":"","sources":["../../../src/helpers/tests/network-adapter-tests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,cAAc,EAAa,MAAM,gBAAgB,CAAA;AAK7E;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CA2HrE;AAID,KAAK,OAAO,GAAG,cAAc,GAAG,cAAc,EAAE,CAAA;AAEhD,MAAM,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC;IAClC,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;IACrC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;CACtB,CAAC,CAAA"}
+{"version":3,"file":"network-adapter-tests.d.ts","sourceRoot":"","sources":["../../../src/helpers/tests/network-adapter-tests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,cAAc,EAAc,MAAM,gBAAgB,CAAA;AAM9E;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CA8HrE;AAID,KAAK,OAAO,GAAG,cAAc,GAAG,cAAc,EAAE,CAAA;AAEhD,MAAM,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC;IAClC,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;IACrC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;CACtB,CAAC,CAAA"}

package/dist/helpers/tests/network-adapter-tests.js

@@ -2,6 +2,7 @@ import { Repo } from "../../index.js";
 import { eventPromise, eventPromises } from "../eventPromise.js";
 import { assert } from "chai";
 import { describe, it } from "mocha";
+import { pause } from "../pause.js";
 /**
  * Runs a series of tests against a set of three peers, each represented by one or more instantiated
  * network adapters.
@@ -38,14 +39,14 @@ export function runAdapterTests(_setup, title) {
                 });
                 // Bob receives the change
                 await eventPromise(bobHandle, "change");
-                assert.equal((await bobHandle.doc()).foo, "bar");
+                assert.equal((await bobHandle.doc())?.foo, "bar");
                 // Bob changes the document
                 bobHandle.change(d => {
                     d.foo = "baz";
                 });
                 // Alice receives the change
                 await eventPromise(aliceHandle, "change");
-                assert.equal((await aliceHandle.doc()).foo, "baz");
+                assert.equal((await aliceHandle.doc())?.foo, "baz");
             };
             // Run the test in both directions, in case they're different types of adapters
             {
@@ -80,32 +81,33 @@ export function runAdapterTests(_setup, title) {
             });
             // Bob and Charlie receive the change
             await eventPromises([bobHandle, charlieHandle], "change");
-            assert.equal((await bobHandle.doc()).foo, "bar");
-            assert.equal((await charlieHandle.doc()).foo, "bar");
+            assert.equal((await bobHandle.doc())?.foo, "bar");
+            assert.equal((await charlieHandle.doc())?.foo, "bar");
             // Charlie changes the document
             charlieHandle.change(d => {
                 d.foo = "baz";
             });
             // Alice and Bob receive the change
             await eventPromises([aliceHandle, bobHandle], "change");
-            assert.equal((await bobHandle.doc()).foo, "baz");
-            assert.equal((await charlieHandle.doc()).foo, "baz");
+            assert.equal((await bobHandle.doc())?.foo, "baz");
+            assert.equal((await charlieHandle.doc())?.foo, "baz");
             teardown();
         });
-        // TODO: with BroadcastChannel, this test never ends, because it goes into an infinite loop,
-        // because the network has cycles (see #92)
-        it.skip("can broadcast a message", async () => {
+        it("can broadcast a message", async () => {
             const { adapters, teardown } = await setup();
             const [a, b, c] = adapters;
             const aliceRepo = new Repo({ network: a, peerId: alice });
             const bobRepo = new Repo({ network: b, peerId: bob });
             const charlieRepo = new Repo({ network: c, peerId: charlie });
             await eventPromises([aliceRepo, bobRepo, charlieRepo].map(r => r.networkSubsystem), "peer");
-            const channelId = "broadcast";
+            const aliceHandle = aliceRepo.create();
+            const charlieHandle = charlieRepo.find(aliceHandle.url);
+            // pause to give charlie a chance to let alice know it wants the doc
+            await pause(100);
             const alicePresenceData = { presence: "alice" };
-            aliceRepo.ephemeralData.broadcast(channelId, alicePresenceData);
-            const { data } = await eventPromise(charlieRepo.ephemeralData, "data");
-            assert.deepStrictEqual(data, alicePresenceData);
+            aliceHandle.broadcast(alicePresenceData);
+            const { message } = await eventPromise(charlieHandle, "ephemeral-message");
+            assert.deepStrictEqual(message, alicePresenceData);
             teardown();
         });
     });

package/dist/index.d.ts

@@ -2,7 +2,8 @@ export { DocCollection } from "./DocCollection.js";
 export { DocHandle, HandleState } from "./DocHandle.js";
 export type { DocHandleChangePayload } from "./DocHandle.js";
 export { NetworkAdapter } from "./network/NetworkAdapter.js";
-export type { InboundMessagePayload, MessagePayload, OpenPayload, PeerCandidatePayload, PeerDisconnectedPayload, } from "./network/NetworkAdapter.js";
+export type { OpenPayload, PeerCandidatePayload, PeerDisconnectedPayload, } from "./network/NetworkAdapter.js";
+export type { Message, NetworkAdapterMessage, EphemeralMessage, SyncMessage, } from "./network/messages.js";
 export { NetworkSubsystem } from "./network/NetworkSubsystem.js";
 export { Repo, type SharePolicy } from "./Repo.js";
 export { StorageAdapter, type StorageKey } from "./storage/StorageAdapter.js";
@@ -10,4 +11,5 @@ export { StorageSubsystem } from "./storage/StorageSubsystem.js";
 export { CollectionSynchronizer } from "./synchronizer/CollectionSynchronizer.js";
 export { parseAutomergeUrl, isValidAutomergeUrl, stringifyAutomergeUrl as generateAutomergeUrl, } from "./DocUrl.js";
 export * from "./types.js";
+export * as cbor from "./helpers/cbor.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACvD,YAAY,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,YAAY,EACV,qBAAqB,EACrB,cAAc,EACd,WAAW,EACX,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,6BAA6B,CAAA;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,IAAI,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,KAAK,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAA;AACjF,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,qBAAqB,IAAI,oBAAoB,GAC9C,MAAM,aAAa,CAAA;AACpB,cAAc,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACvD,YAAY,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,YAAY,EACV,WAAW,EACX,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,6BAA6B,CAAA;AAMpC,YAAY,EACV,OAAO,EACP,qBAAqB,EACrB,gBAAgB,EAChB,WAAW,GACZ,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,IAAI,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,KAAK,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAA;AACjF,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,qBAAqB,IAAI,oBAAoB,GAC9C,MAAM,aAAa,CAAA;AACpB,cAAc,YAAY,CAAA;AAE1B,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAA"}

package/dist/index.js

@@ -8,3 +8,4 @@ export { StorageSubsystem } from "./storage/StorageSubsystem.js";
 export { CollectionSynchronizer } from "./synchronizer/CollectionSynchronizer.js";
 export { parseAutomergeUrl, isValidAutomergeUrl, stringifyAutomergeUrl as generateAutomergeUrl, } from "./DocUrl.js";
 export * from "./types.js";
+export * as cbor from "./helpers/cbor.js";

package/dist/network/NetworkAdapter.d.ts

@@ -1,18 +1,19 @@
-import EventEmitter from "eventemitter3";
-import { PeerId, ChannelId } from "../types.js";
+import { EventEmitter } from "eventemitter3";
+import { PeerId } from "../types.js";
+import { Message } from "./messages.js";
 export declare abstract class NetworkAdapter extends EventEmitter<NetworkAdapterEvents> {
     peerId?: PeerId;
     abstract connect(url?: string): void;
-    abstract sendMessage(peerId: PeerId, channelId: ChannelId, message: Uint8Array, broadcast: boolean): void;
+    abstract send(message: Message): void;
     abstract join(): void;
     abstract leave(): void;
 }
 export interface NetworkAdapterEvents {
-    open: (payload: OpenPayload) => void;
+    ready: (payload: OpenPayload) => void;
     close: () => void;
     "peer-candidate": (payload: PeerCandidatePayload) => void;
     "peer-disconnected": (payload: PeerDisconnectedPayload) => void;
-    message: (payload: InboundMessagePayload) => void;
+    message: (payload: Message) => void;
 }
 export interface OpenPayload {
     network: NetworkAdapter;
@@ -20,16 +21,6 @@ export interface OpenPayload {
 export interface PeerCandidatePayload {
     peerId: PeerId;
 }
-export interface MessagePayload {
-    targetId: PeerId;
-    channelId: ChannelId;
-    message: Uint8Array;
-    broadcast: boolean;
-}
-export interface InboundMessagePayload extends MessagePayload {
-    type?: string;
-    senderId: PeerId;
-}
 export interface PeerDisconnectedPayload {
     peerId: PeerId;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"NetworkAdapter.d.ts","sourceRoot":"","sources":["../../src/network/NetworkAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAE/C,8BAAsB,cAAe,SAAQ,YAAY,CAAC,oBAAoB,CAAC;IAC7E,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IAEpC,QAAQ,CAAC,WAAW,CAClB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,OAAO,GACjB,IAAI;IAEP,QAAQ,CAAC,IAAI,IAAI,IAAI;IAErB,QAAQ,CAAC,KAAK,IAAI,IAAI;CACvB;AAID,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAA;IACpC,KAAK,EAAE,MAAM,IAAI,CAAA;IACjB,gBAAgB,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAA;IACzD,mBAAmB,EAAE,CAAC,OAAO,EAAE,uBAAuB,KAAK,IAAI,CAAA;IAC/D,OAAO,EAAE,CAAC,OAAO,EAAE,qBAAqB,KAAK,IAAI,CAAA;CAClD;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,cAAc,CAAA;CACxB;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,SAAS,CAAA;IACpB,OAAO,EAAE,UAAU,CAAA;IACnB,SAAS,EAAE,OAAO,CAAA;CACnB;AAED,MAAM,WAAW,qBAAsB,SAAQ,cAAc;IAC3D,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,MAAM,CAAA;CACf"}
+{"version":3,"file":"NetworkAdapter.d.ts","sourceRoot":"","sources":["../../src/network/NetworkAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAEvC,8BAAsB,cAAe,SAAQ,YAAY,CAAC,oBAAoB,CAAC;IAC7E,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IAEpC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAErC,QAAQ,CAAC,IAAI,IAAI,IAAI;IAErB,QAAQ,CAAC,KAAK,IAAI,IAAI;CACvB;AAID,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAA;IACrC,KAAK,EAAE,MAAM,IAAI,CAAA;IACjB,gBAAgB,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAA;IACzD,mBAAmB,EAAE,CAAC,OAAO,EAAE,uBAAuB,KAAK,IAAI,CAAA;IAC/D,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;CACpC;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,cAAc,CAAA;CACxB;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,MAAM,CAAA;CACf"}

package/dist/network/NetworkAdapter.js

@@ -1,4 +1,4 @@
-import EventEmitter from "eventemitter3";
+import { EventEmitter } from "eventemitter3";
 export class NetworkAdapter extends EventEmitter {
     peerId; // hmmm, maybe not
 }

package/dist/network/NetworkSubsystem.d.ts

@@ -1,20 +1,23 @@
-import EventEmitter from "eventemitter3";
-import { InboundMessagePayload, NetworkAdapter, PeerDisconnectedPayload } from "./NetworkAdapter.js";
-import { ChannelId, PeerId } from "../types.js";
+import { EventEmitter } from "eventemitter3";
+import { PeerId } from "../types.js";
+import { NetworkAdapter, PeerDisconnectedPayload } from "./NetworkAdapter.js";
+import { Message, MessageContents } from "./messages.js";
 export declare class NetworkSubsystem extends EventEmitter<NetworkSubsystemEvents> {
     #private;
-    private adapters;
     peerId: PeerId;
     constructor(adapters: NetworkAdapter[], peerId?: PeerId);
     addNetworkAdapter(networkAdapter: NetworkAdapter): void;
-    sendMessage(peerId: PeerId, channelId: ChannelId, message: Uint8Array, broadcast: boolean): void;
+    send(message: MessageContents): void;
     join(): void;
     leave(): void;
+    isReady: () => boolean;
+    whenReady: () => Promise<void>;
 }
 export interface NetworkSubsystemEvents {
     peer: (payload: PeerPayload) => void;
     "peer-disconnected": (payload: PeerDisconnectedPayload) => void;
-    message: (payload: InboundMessagePayload) => void;
+    message: (payload: Message) => void;
+    "ready": () => void;
 }
 export interface PeerPayload {
     peerId: PeerId;

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

@@ -1 +1 @@
-{"version":3,"file":"NetworkSubsystem.d.ts","sourceRoot":"","sources":["../../src/network/NetworkSubsystem.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAA;AACxC,OAAO,EACL,qBAAqB,EACrB,cAAc,EACd,uBAAuB,EACxB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAI/C,qBAAa,gBAAiB,SAAQ,YAAY,CAAC,sBAAsB,CAAC;;IAKtE,OAAO,CAAC,QAAQ;IACT,MAAM;gBADL,QAAQ,EAAE,cAAc,EAAE,EAC3B,MAAM,SAAiB;IAOhC,iBAAiB,CAAC,cAAc,EAAE,cAAc;IAsDhD,WAAW,CACT,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,OAAO;IAkBpB,IAAI;IAKJ,KAAK;CAIN;AAQD,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAA;IACpC,mBAAmB,EAAE,CAAC,OAAO,EAAE,uBAAuB,KAAK,IAAI,CAAA;IAC/D,OAAO,EAAE,CAAC,OAAO,EAAE,qBAAqB,KAAK,IAAI,CAAA;CAClD;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAA;CACf"}
+{"version":3,"file":"NetworkSubsystem.d.ts","sourceRoot":"","sources":["../../src/network/NetworkSubsystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,cAAc,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAE7E,OAAO,EAIL,OAAO,EACP,eAAe,EAChB,MAAM,eAAe,CAAA;AAUtB,qBAAa,gBAAiB,SAAQ,YAAY,CAAC,sBAAsB,CAAC;;IAY/D,MAAM;gBADb,QAAQ,EAAE,cAAc,EAAE,EACnB,MAAM,SAAiB;IAOhC,iBAAiB,CAAC,cAAc,EAAE,cAAc;IAkEhD,IAAI,CAAC,OAAO,EAAE,eAAe;IA2B7B,IAAI;IAKJ,KAAK;IAKL,OAAO,gBAEN;IAED,SAAS,sBAUR;CACF;AAQD,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAA;IACpC,mBAAmB,EAAE,CAAC,OAAO,EAAE,uBAAuB,KAAK,IAAI,CAAA;IAC/D,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;IACnC,OAAO,EAAE,MAAM,IAAI,CAAA;CACpB;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAA;CACf"}

package/dist/network/NetworkSubsystem.js

@@ -1,19 +1,31 @@
-import EventEmitter from "eventemitter3";
+import { EventEmitter } from "eventemitter3";
+import { isEphemeralMessage, isValidMessage, } from "./messages.js";
 import debug from "debug";
+const getEphemeralMessageSource = (message) => `${message.senderId}:${message.sessionId}`;
 export class NetworkSubsystem extends EventEmitter {
-    adapters;
     peerId;
     #log;
     #adaptersByPeer = {};
+    #count = 0;
+    #sessionId = Math.random().toString(36).slice(2);
+    #ephemeralSessionCounts = {};
+    #readyAdapterCount = 0;
+    #adapters = [];
     constructor(adapters, peerId = randomPeerId()) {
         super();
-        this.adapters = adapters;
         this.peerId = peerId;
         this.#log = debug(`automerge-repo:network:${this.peerId}`);
-        this.adapters.forEach(a => this.addNetworkAdapter(a));
+        adapters.forEach(a => this.addNetworkAdapter(a));
     }
     addNetworkAdapter(networkAdapter) {
-        networkAdapter.connect(this.peerId);
+        this.#adapters.push(networkAdapter);
+        networkAdapter.once("ready", () => {
+            this.#readyAdapterCount++;
+            this.#log("Adapters ready: ", this.#readyAdapterCount, "/", this.#adapters.length);
+            if (this.#readyAdapterCount === this.#adapters.length) {
+                this.emit("ready");
+            }
+        });
         networkAdapter.on("peer-candidate", ({ peerId }) => {
             this.#log(`peer candidate: ${peerId} `);
             // TODO: This is where authentication would happen
@@ -29,18 +41,19 @@ export class NetworkSubsystem extends EventEmitter {
             this.emit("peer-disconnected", { peerId });
         });
         networkAdapter.on("message", msg => {
-            const { senderId, channelId, broadcast, message } = msg;
-            this.#log(`message from ${senderId}`);
-            // If we receive a broadcast message from a network adapter we need to re-broadcast it to all
-            // our other peers. This is the world's worst gossip protocol.
-            // TODO: This relies on the network forming a tree! If there are cycles, this approach will
-            // loop messages around forever.
-            if (broadcast) {
-                Object.entries(this.#adaptersByPeer)
-                    .filter(([id]) => id !== senderId)
-                    .forEach(([id, peer]) => {
-                    peer.sendMessage(id, channelId, message, broadcast);
-                });
+            if (!isValidMessage(msg)) {
+                this.#log(`invalid message: ${JSON.stringify(msg)}`);
+                return;
+            }
+            this.#log(`message from ${msg.senderId}`);
+            if (isEphemeralMessage(msg)) {
+                const source = getEphemeralMessageSource(msg);
+                if (this.#ephemeralSessionCounts[source] === undefined ||
+                    msg.count > this.#ephemeralSessionCounts[source]) {
+                    this.#ephemeralSessionCounts[source] = msg.count;
+                    this.emit("message", msg);
+                }
+                return;
             }
             this.emit("message", msg);
         });
@@ -52,33 +65,57 @@ export class NetworkSubsystem extends EventEmitter {
                 }
             });
         });
+        networkAdapter.connect(this.peerId);
         networkAdapter.join();
     }
-    sendMessage(peerId, channelId, message, broadcast) {
-        if (broadcast) {
-            Object.entries(this.#adaptersByPeer).forEach(([id, peer]) => {
-                this.#log(`sending broadcast to ${id}`);
-                peer.sendMessage(id, channelId, message, true);
-            });
+    send(message) {
+        const peer = this.#adaptersByPeer[message.targetId];
+        if (!peer) {
+            this.#log(`Tried to send message but peer not found: ${message.targetId}`);
+            return;
+        }
+        this.#log(`Sending message to ${message.targetId}`);
+        if (isEphemeralMessage(message)) {
+            const outbound = "count" in message
+                ? message
+                : {
+                    ...message,
+                    count: ++this.#count,
+                    sessionId: this.#sessionId,
+                    senderId: this.peerId,
+                };
+            this.#log("Ephemeral message", outbound);
+            peer.send(outbound);
         }
         else {
-            const peer = this.#adaptersByPeer[peerId];
-            if (!peer) {
-                this.#log(`Tried to send message but peer not found: ${peerId}`);
-                return;
-            }
-            this.#log(`Sending message to ${peerId}`);
-            peer.sendMessage(peerId, channelId, message, false);
+            const outbound = { ...message, senderId: this.peerId };
+            this.#log("Sync message", outbound);
+            peer.send(outbound);
         }
     }
     join() {
         this.#log(`Joining network`);
-        this.adapters.forEach(a => a.join());
+        this.#adapters.forEach(a => a.join());
     }
     leave() {
         this.#log(`Leaving network`);
-        this.adapters.forEach(a => a.leave());
+        this.#adapters.forEach(a => a.leave());
     }
+    isReady = () => {
+        return this.#readyAdapterCount === this.#adapters.length;
+    };
+    whenReady = async () => {
+        if (this.isReady()) {
+            return;
+        }
+        else {
+            return new Promise(resolve => {
+                this.once("ready", () => {
+                    resolve();
+                });
+            });
+        }
+    };
 }
 function randomPeerId() {
     return `user-${Math.round(Math.random() * 100000)}`;

package/dist/network/messages.d.ts

@@ -0,0 +1,57 @@
+import { SessionId } from "../EphemeralData.js";
+import { DocumentId, PeerId } from "../types.js";
+export declare function isValidMessage(message: NetworkAdapterMessage): message is SyncMessage | EphemeralMessage | RequestMessage | DocumentUnavailableMessage;
+export declare function isDocumentUnavailableMessage(message: NetworkAdapterMessage): message is DocumentUnavailableMessage;
+export declare function isRequestMessage(message: NetworkAdapterMessage): message is RequestMessage;
+export declare function isSyncMessage(message: NetworkAdapterMessage): message is SyncMessage;
+export declare function isEphemeralMessage(message: NetworkAdapterMessage | MessageContents): message is EphemeralMessage | EphemeralMessageContents;
+export interface SyncMessageEnvelope {
+    senderId: PeerId;
+}
+export interface SyncMessageContents {
+    type: "sync";
+    data: Uint8Array;
+    targetId: PeerId;
+    documentId: DocumentId;
+}
+export type SyncMessage = SyncMessageEnvelope & SyncMessageContents;
+export interface EphemeralMessageEnvelope {
+    senderId: PeerId;
+    count: number;
+    sessionId: SessionId;
+}
+export interface EphemeralMessageContents {
+    type: "ephemeral";
+    targetId: PeerId;
+    documentId: DocumentId;
+    data: Uint8Array;
+}
+export type EphemeralMessage = EphemeralMessageEnvelope & EphemeralMessageContents;
+export interface DocumentUnavailableMessageContents {
+    type: "doc-unavailable";
+    documentId: DocumentId;
+    targetId: PeerId;
+}
+export type DocumentUnavailableMessage = SyncMessageEnvelope & DocumentUnavailableMessageContents;
+export interface RequestMessageContents {
+    type: "request";
+    data: Uint8Array;
+    targetId: PeerId;
+    documentId: DocumentId;
+}
+export type RequestMessage = SyncMessageEnvelope & RequestMessageContents;
+export type MessageContents = SyncMessageContents | EphemeralMessageContents | RequestMessageContents | DocumentUnavailableMessageContents;
+export type Message = SyncMessage | EphemeralMessage | RequestMessage | DocumentUnavailableMessage;
+export type SynchronizerMessage = SyncMessage | RequestMessage | DocumentUnavailableMessage | EphemeralMessage;
+type ArriveMessage = {
+    senderId: PeerId;
+    type: "arrive";
+};
+type WelcomeMessage = {
+    senderId: PeerId;
+    targetId: PeerId;
+    type: "welcome";
+};
+export type NetworkAdapterMessage = ArriveMessage | WelcomeMessage | Message;
+export {};
+//# sourceMappingURL=messages.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../src/network/messages.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEhD,wBAAgB,cAAc,CAC5B,OAAO,EAAE,qBAAqB,GAC7B,OAAO,IACN,WAAW,GACX,gBAAgB,GAChB,cAAc,GACd,0BAA0B,CAU7B;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,qBAAqB,GAC7B,OAAO,IAAI,0BAA0B,CAEvC;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,qBAAqB,GAC7B,OAAO,IAAI,cAAc,CAE3B;AAED,wBAAgB,aAAa,CAC3B,OAAO,EAAE,qBAAqB,GAC7B,OAAO,IAAI,WAAW,CAExB;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,qBAAqB,GAAG,eAAe,GAC/C,OAAO,IAAI,gBAAgB,GAAG,wBAAwB,CAExD;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,UAAU,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,UAAU,CAAA;CACvB;AAED,MAAM,MAAM,WAAW,GAAG,mBAAmB,GAAG,mBAAmB,CAAA;AAEnE,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,SAAS,CAAA;CACrB;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,WAAW,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,UAAU,CAAA;IACtB,IAAI,EAAE,UAAU,CAAA;CACjB;AAED,MAAM,MAAM,gBAAgB,GAAG,wBAAwB,GACrD,wBAAwB,CAAA;AAE1B,MAAM,WAAW,kCAAkC;IACjD,IAAI,EAAE,iBAAiB,CAAA;IACvB,UAAU,EAAE,UAAU,CAAA;IACtB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,MAAM,0BAA0B,GAAG,mBAAmB,GAC1D,kCAAkC,CAAA;AAEpC,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,EAAE,UAAU,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,UAAU,CAAA;CACvB;AAED,MAAM,MAAM,cAAc,GAAG,mBAAmB,GAAG,sBAAsB,CAAA;AAEzE,MAAM,MAAM,eAAe,GACvB,mBAAmB,GACnB,wBAAwB,GACxB,sBAAsB,GACtB,kCAAkC,CAAA;AAEtC,MAAM,MAAM,OAAO,GACf,WAAW,GACX,gBAAgB,GAChB,cAAc,GACd,0BAA0B,CAAA;AAE9B,MAAM,MAAM,mBAAmB,GAC3B,WAAW,GACX,cAAc,GACd,0BAA0B,GAC1B,gBAAgB,CAAA;AAEpB,KAAK,aAAa,GAAG;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,QAAQ,CAAA;CACf,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,SAAS,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG,aAAa,GAAG,cAAc,GAAG,OAAO,CAAA"}

package/dist/network/messages.js

@@ -0,0 +1,21 @@
+export function isValidMessage(message) {
+    return (typeof message === "object" &&
+        typeof message.type === "string" &&
+        typeof message.senderId === "string" &&
+        (isSyncMessage(message) ||
+            isEphemeralMessage(message) ||
+            isRequestMessage(message) ||
+            isDocumentUnavailableMessage(message)));
+}
+export function isDocumentUnavailableMessage(message) {
+    return message.type === "doc-unavailable";
+}
+export function isRequestMessage(message) {
+    return message.type === "request";
+}
+export function isSyncMessage(message) {
+    return message.type === "sync";
+}
+export function isEphemeralMessage(message) {
+    return message.type === "ephemeral";
+}

package/dist/storage/StorageSubsystem.d.ts

@@ -1,4 +1,4 @@
-import * as A from "@automerge/automerge";
+import * as A from "@automerge/automerge/next";
 import { StorageAdapter } from "./StorageAdapter.js";
 import { type DocumentId } from "../types.js";
 export type ChunkType = "snapshot" | "incremental";

package/dist/storage/StorageSubsystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StorageSubsystem.d.ts","sourceRoot":"","sources":["../../src/storage/StorageSubsystem.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,sBAAsB,CAAA;AACzC,OAAO,EAAE,cAAc,EAAc,MAAM,qBAAqB,CAAA;AAEhE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAA;AAa7C,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG,aAAa,CAAA;AAelD,qBAAa,gBAAgB;;gBAMf,cAAc,EAAE,cAAc;IAqDpC,OAAO,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;IA0B/D,OAAO,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAanE,MAAM,CAAC,UAAU,EAAE,UAAU;CAgCpC"}
+{"version":3,"file":"StorageSubsystem.d.ts","sourceRoot":"","sources":["../../src/storage/StorageSubsystem.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,2BAA2B,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAc,MAAM,qBAAqB,CAAA;AAEhE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAA;AAa7C,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG,aAAa,CAAA;AAelD,qBAAa,gBAAgB;;gBAMf,cAAc,EAAE,cAAc;IAqDpC,OAAO,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;IA0B/D,OAAO,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAanE,MAAM,CAAC,UAAU,EAAE,UAAU;CAgCpC"}

package/dist/storage/StorageSubsystem.js

@@ -1,4 +1,4 @@
-import * as A from "@automerge/automerge";
+import * as A from "@automerge/automerge/next";
 import * as sha256 from "fast-sha256";
 import { mergeArrays } from "../helpers/mergeArrays.js";
 import debug from "debug";
@@ -11,7 +11,7 @@ function keyHash(binary) {
 }
 function headsHash(heads) {
     let encoder = new TextEncoder();
-    let headsbinary = mergeArrays(heads.map(h => encoder.encode(h)));
+    let headsbinary = mergeArrays(heads.map((h) => encoder.encode(h)));
     return keyHash(headsbinary);
 }
 export class StorageSubsystem {