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

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";

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"}

package/dist/network/NetworkAdapter.d.ts

@@ -1,9 +1,10 @@
 import EventEmitter from "eventemitter3";
-import { PeerId, ChannelId } from "../types.js";
+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;
 }
@@ -12,7 +13,7 @@ export interface NetworkAdapterEvents {
     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,YAAY,MAAM,eAAe,CAAA;AACxC,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,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,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/NetworkSubsystem.d.ts

@@ -1,20 +1,21 @@
 import EventEmitter from "eventemitter3";
-import { InboundMessagePayload, NetworkAdapter, PeerDisconnectedPayload } from "./NetworkAdapter.js";
-import { ChannelId, PeerId } from "../types.js";
+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;
 }
 export interface NetworkSubsystemEvents {
     peer: (payload: PeerPayload) => void;
     "peer-disconnected": (payload: PeerDisconnectedPayload) => void;
-    message: (payload: InboundMessagePayload) => void;
+    message: (payload: Message) => 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,YAAY,MAAM,eAAe,CAAA;AACxC,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;;IAStE,OAAO,CAAC,QAAQ;IACT,MAAM;gBADL,QAAQ,EAAE,cAAc,EAAE,EAC3B,MAAM,SAAiB;IAOhC,iBAAiB,CAAC,cAAc,EAAE,cAAc;IA0DhD,IAAI,CAAC,OAAO,EAAE,eAAe;IA2B7B,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,OAAO,KAAK,IAAI,CAAA;CACpC;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAA;CACf"}

package/dist/network/NetworkSubsystem.js

@@ -1,10 +1,15 @@
 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 = {};
     constructor(adapters, peerId = randomPeerId()) {
         super();
         this.adapters = adapters;
@@ -29,18 +34,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);
         });
@@ -54,21 +60,29 @@ export class NetworkSubsystem extends EventEmitter {
         });
         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() {

package/dist/network/messages.d.ts

@@ -0,0 +1,57 @@
+import { SessionId } from "../EphemeralData";
+import { DocumentId, PeerId } from "../types";
+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,kBAAkB,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAE7C,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/synchronizer/CollectionSynchronizer.d.ts

@@ -1,6 +1,7 @@
 import { DocCollection } from "../DocCollection.js";
-import { ChannelId, PeerId, DocumentId } from "../types.js";
+import { PeerId, DocumentId } from "../types.js";
 import { Synchronizer } from "./Synchronizer.js";
+import { SynchronizerMessage } from "../network/messages.js";
 /** A CollectionSynchronizer is responsible for synchronizing a DocCollection with peers. */
 export declare class CollectionSynchronizer extends Synchronizer {
     #private;
@@ -10,7 +11,7 @@ export declare class CollectionSynchronizer extends Synchronizer {
      * When we receive a sync message for a document we haven't got in memory, we
      * register it with the repo and start synchronizing
      */
-    receiveSyncMessage(peerId: PeerId, channelId: ChannelId, message: Uint8Array): Promise<void>;
+    receiveMessage(message: SynchronizerMessage): Promise<void>;
     /**
      * Starts synchronizing the given document with all peers that we share it generously with.
      */

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

@@ -1 +1 @@
-{"version":3,"file":"CollectionSynchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/CollectionSynchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAOnD,OAAO,EAAE,SAAS,EAAoB,MAAM,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAE7E,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAKhD,4FAA4F;AAC5F,qBAAa,sBAAuB,SAAQ,YAAY;;IAO1C,OAAO,CAAC,IAAI;gBAAJ,IAAI,EAAE,aAAa;IAiCvC;;;OAGG;IACG,kBAAkB,CACtB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,UAAU;IAmBrB;;OAEG;IACH,WAAW,CAAC,UAAU,EAAE,UAAU;IAUlC,cAAc,CAAC,UAAU,EAAE,UAAU;IAIrC,2DAA2D;IAC3D,OAAO,CAAC,MAAM,EAAE,MAAM;IAWtB,uDAAuD;IACvD,UAAU,CAAC,MAAM,EAAE,MAAM;CAQ1B"}
+{"version":3,"file":"CollectionSynchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/CollectionSynchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAOnD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAEhD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAGhD,OAAO,EAGL,mBAAmB,EAEpB,MAAM,wBAAwB,CAAA;AAG/B,4FAA4F;AAC5F,qBAAa,sBAAuB,SAAQ,YAAY;;IAU1C,OAAO,CAAC,IAAI;gBAAJ,IAAI,EAAE,aAAa;IAiCvC;;;OAGG;IACG,cAAc,CAAC,OAAO,EAAE,mBAAmB;IAyBjD;;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;CAQ1B"}

package/dist/synchronizer/CollectionSynchronizer.js

@@ -10,6 +10,8 @@ export class CollectionSynchronizer extends Synchronizer {
     #peers = new Set();
     /** A map of documentIds to their synchronizers */
     #docSynchronizers = {};
+    /** Used to determine if the document is know to the Collection and a synchronizer exists or is being set up */
+    #docSetUp = {};
     constructor(repo) {
         super();
         this.repo = repo;
@@ -44,29 +46,30 @@ export class CollectionSynchronizer extends Synchronizer {
      * When we receive a sync message for a document we haven't got in memory, we
      * register it with the repo and start synchronizing
      */
-    async receiveSyncMessage(peerId, channelId, message) {
-        log(`onSyncMessage: ${peerId}, ${channelId}, ${message.byteLength}bytes`);
-        const documentId = channelId;
+    async receiveMessage(message) {
+        log(`onSyncMessage: ${message.senderId}, ${message.documentId}, ${"data" in message ? message.data.byteLength + "bytes" : ""}`);
+        const documentId = message.documentId;
         if (!documentId) {
             throw new Error("received a message with an invalid documentId");
         }
-        const docSynchronizer = await this.#fetchDocSynchronizer(documentId);
-        await docSynchronizer.receiveSyncMessage(peerId, channelId, message);
+        this.#docSetUp[documentId] = true;
+        const docSynchronizer = this.#fetchDocSynchronizer(documentId);
+        docSynchronizer.receiveMessage(message);
         // Initiate sync with any new peers
         const peers = await this.#documentGenerousPeers(documentId);
-        peers
-            .filter(peerId => !docSynchronizer.hasPeer(peerId))
-            .forEach(peerId => docSynchronizer.beginSync(peerId));
+        docSynchronizer.beginSync(peers.filter(peerId => !docSynchronizer.hasPeer(peerId)));
     }
     /**
      * Starts synchronizing the given document with all peers that we share it generously with.
      */
     addDocument(documentId) {
+        // HACK: this is a hack to prevent us from adding the same document twice
+        if (this.#docSetUp[documentId]) {
+            return;
+        }
         const docSynchronizer = this.#fetchDocSynchronizer(documentId);
         void this.#documentGenerousPeers(documentId).then(peers => {
-            peers.forEach(peerId => {
-                docSynchronizer.beginSync(peerId);
-            });
+            docSynchronizer.beginSync(peers);
         });
     }
     // TODO: implement this
@@ -76,12 +79,15 @@ export class CollectionSynchronizer extends Synchronizer {
     /** Adds a peer and maybe starts synchronizing with them */
     addPeer(peerId) {
         log(`adding ${peerId} & synchronizing with them`);
+        if (this.#peers.has(peerId)) {
+            return;
+        }
         this.#peers.add(peerId);
         for (const docSynchronizer of Object.values(this.#docSynchronizers)) {
             const { documentId } = docSynchronizer;
-            void this.repo.sharePolicy(peerId, documentId).then(okToShare => {
+            this.repo.sharePolicy(peerId, documentId).then(okToShare => {
                 if (okToShare)
-                    docSynchronizer.beginSync(peerId);
+                    docSynchronizer.beginSync([peerId]);
             });
         }
     }

package/dist/synchronizer/DocSynchronizer.d.ts

@@ -1,6 +1,8 @@
 import { DocHandle } from "../DocHandle.js";
-import { ChannelId, PeerId } from "../types.js";
+import { PeerId } from "../types.js";
 import { Synchronizer } from "./Synchronizer.js";
+import { EphemeralMessage, RequestMessage, SynchronizerMessage, SyncMessage } from "../network/messages.js";
+type PeerDocumentStatus = "unknown" | "has" | "unavailable" | "wants";
 /**
  * DocSynchronizer takes a handle to an Automerge document, and receives & dispatches sync messages
  * to bring it inline with all other peers' versions.
@@ -9,10 +11,14 @@ export declare class DocSynchronizer extends Synchronizer {
     #private;
     private handle;
     constructor(handle: DocHandle<any>);
+    get peerStates(): Record<PeerId, PeerDocumentStatus>;
     get documentId(): import("../types.js").DocumentId;
     hasPeer(peerId: PeerId): boolean;
-    beginSync(peerId: PeerId): void;
+    beginSync(peerIds: PeerId[]): void;
     endSync(peerId: PeerId): void;
-    receiveSyncMessage(peerId: PeerId, channelId: ChannelId, message: Uint8Array): void;
+    receiveMessage(message: SynchronizerMessage): void;
+    receiveEphemeralMessage(message: EphemeralMessage): void;
+    receiveSyncMessage(message: SyncMessage | RequestMessage): void;
 }
+export {};
 //# sourceMappingURL=DocSynchronizer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"DocSynchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/DocSynchronizer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAqB,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAIhD;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,YAAY;;IAanC,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC;IAgB1C,IAAI,UAAU,qCAEb;IAwED,OAAO,CAAC,MAAM,EAAE,MAAM;IAItB,SAAS,CAAC,MAAM,EAAE,MAAM;IAkBxB,OAAO,CAAC,MAAM,EAAE,MAAM;IAKtB,kBAAkB,CAChB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,UAAU;CAsCtB"}
+{"version":3,"file":"DocSynchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/DocSynchronizer.ts"],"names":[],"mappings":"AACA,OAAO,EACL,SAAS,EAKV,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAGhD,OAAO,EACL,gBAAgB,EAIhB,cAAc,EACd,mBAAmB,EACnB,WAAW,EACZ,MAAM,wBAAwB,CAAA;AAE/B,KAAK,kBAAkB,GAAG,SAAS,GAAG,KAAK,GAAG,aAAa,GAAG,OAAO,CAAA;AAGrE;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,YAAY;;IAiBnC,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC;IAoB1C,IAAI,UAAU,uCAEb;IAED,IAAI,UAAU,qCAEb;IAiHD,OAAO,CAAC,MAAM,EAAE,MAAM;IAItB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE;IA8B3B,OAAO,CAAC,MAAM,EAAE,MAAM;IAKtB,cAAc,CAAC,OAAO,EAAE,mBAAmB;IAkB3C,uBAAuB,CAAC,OAAO,EAAE,gBAAgB;IAuBjD,kBAAkB,CAAC,OAAO,EAAE,WAAW,GAAG,cAAc;CA2EzD"}