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

package/dist/DocCollection.d.ts

@@ -33,12 +33,13 @@ export declare class DocCollection extends EventEmitter<DocCollectionEvents> {
 interface DocCollectionEvents {
     document: (arg: DocumentPayload) => void;
     "delete-document": (arg: DeleteDocumentPayload) => void;
+    "unavailable-document": (arg: DeleteDocumentPayload) => void;
 }
 interface DocumentPayload {
     handle: DocHandle<any>;
 }
 interface DeleteDocumentPayload {
-    encodedDocumentId: DocumentId;
+    documentId: DocumentId;
 }
 export {};
 //# sourceMappingURL=DocCollection.d.ts.map

package/dist/DocCollection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DocCollection.d.ts","sourceRoot":"","sources":["../src/DocCollection.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAyB,YAAY,EAAE,MAAM,YAAY,CAAA;AAC5E,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAA;AAS5C;;;KAGK;AACL,qBAAa,aAAc,SAAQ,YAAY,CAAC,mBAAmB,CAAC;;IAGlE,sDAAsD;IACtD,WAAW,EAAE,WAAW,CAAmB;;IAwB3C,8CAA8C;IAC9C,IAAI,OAAO,uCAEV;IAED;;;;OAIG;IACH,MAAM,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC;IA0BzB;;;OAGG;IACH,IAAI,CAAC,CAAC;IACJ,+CAA+C;IAC/C,YAAY,EAAE,YAAY,GACzB,SAAS,CAAC,CAAC,CAAC;IAef,MAAM;IACJ,6CAA6C;IAC7C,EAAE,EAAE,UAAU,GAAG,YAAY;CAchC;AAGD,UAAU,mBAAmB;IAC3B,QAAQ,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,CAAA;IACxC,iBAAiB,EAAE,CAAC,GAAG,EAAE,qBAAqB,KAAK,IAAI,CAAA;CACxD;AAED,UAAU,eAAe;IACvB,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,CAAA;CACvB;AAED,UAAU,qBAAqB;IAC7B,iBAAiB,EAAE,UAAU,CAAA;CAC9B"}
+{"version":3,"file":"DocCollection.d.ts","sourceRoot":"","sources":["../src/DocCollection.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAyB,YAAY,EAAE,MAAM,YAAY,CAAA;AAC5E,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAA;AAS5C;;;KAGK;AACL,qBAAa,aAAc,SAAQ,YAAY,CAAC,mBAAmB,CAAC;;IAGlE,sDAAsD;IACtD,WAAW,EAAE,WAAW,CAAmB;;IAwB3C,8CAA8C;IAC9C,IAAI,OAAO,uCAEV;IAED;;;;OAIG;IACH,MAAM,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC;IA0BzB;;;OAGG;IACH,IAAI,CAAC,CAAC;IACJ,+CAA+C;IAC/C,YAAY,EAAE,YAAY,GACzB,SAAS,CAAC,CAAC,CAAC;IAwBf,MAAM;IACJ,6CAA6C;IAC7C,EAAE,EAAE,UAAU,GAAG,YAAY;CAchC;AAGD,UAAU,mBAAmB;IAC3B,QAAQ,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,CAAA;IACxC,iBAAiB,EAAE,CAAC,GAAG,EAAE,qBAAqB,KAAK,IAAI,CAAA;IACvD,sBAAsB,EAAE,CAAC,GAAG,EAAE,qBAAqB,KAAK,IAAI,CAAA;CAC7D;AAED,UAAU,eAAe;IACvB,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,CAAA;CACvB;AAED,UAAU,qBAAqB;IAC7B,UAAU,EAAE,UAAU,CAAA;CACvB"}

package/dist/DocCollection.js

@@ -53,8 +53,8 @@ export class DocCollection extends EventEmitter {
         // or
         // - pass a "reify" function that takes a `<any>` and returns `<T>`
         // Generate a new UUID and store it in the buffer
-        const { encodedDocumentId } = parseAutomergeUrl(generateAutomergeUrl());
-        const handle = this.#getHandle(encodedDocumentId, true);
+        const { documentId } = parseAutomergeUrl(generateAutomergeUrl());
+        const handle = this.#getHandle(documentId, true);
         this.emit("document", { handle });
         return handle;
     }
@@ -68,11 +68,20 @@ export class DocCollection extends EventEmitter {
         if (!isValidAutomergeUrl(automergeUrl)) {
             throw new Error(`Invalid AutomergeUrl: '${automergeUrl}'`);
         }
-        const { encodedDocumentId } = parseAutomergeUrl(automergeUrl);
+        const { documentId } = parseAutomergeUrl(automergeUrl);
         // If we have the handle cached, return it
-        if (this.#handleCache[encodedDocumentId])
-            return this.#handleCache[encodedDocumentId];
-        const handle = this.#getHandle(encodedDocumentId, false);
+        if (this.#handleCache[documentId]) {
+            if (this.#handleCache[documentId].isUnavailable()) {
+                // this ensures that the event fires after the handle has been returned
+                setTimeout(() => {
+                    this.#handleCache[documentId].emit("unavailable", {
+                        handle: this.#handleCache[documentId],
+                    });
+                });
+            }
+            return this.#handleCache[documentId];
+        }
+        const handle = this.#getHandle(documentId, false);
         this.emit("document", { handle });
         return handle;
     }
@@ -81,13 +90,13 @@ export class DocCollection extends EventEmitter {
     id) {
         if (isValidAutomergeUrl(id)) {
             ;
-            ({ encodedDocumentId: id } = parseAutomergeUrl(id));
+            ({ documentId: id } = parseAutomergeUrl(id));
         }
         const handle = this.#getHandle(id, false);
         handle.delete();
         delete this.#handleCache[id];
         this.emit("delete-document", {
-            encodedDocumentId: id,
+            documentId: id,
         });
     }
 }

package/dist/DocHandle.d.ts

@@ -1,7 +1,7 @@
 import * as A from "@automerge/automerge";
 import EventEmitter from "eventemitter3";
 import { StateValue } from "xstate";
-import type { ChannelId, DocumentId, PeerId, AutomergeUrl } from "./types.js";
+import type { DocumentId, PeerId, AutomergeUrl } from "./types.js";
 /** DocHandle is a wrapper around a single Automerge document that lets us listen for changes. */
 export declare class DocHandle<T>//
  extends EventEmitter<DocHandleEvents<T>> {
@@ -22,6 +22,7 @@ export declare class DocHandle<T>//
      * @returns true if the document has been marked as deleted
      */
     isDeleted: () => boolean;
+    isUnavailable: () => boolean;
     inState: (states: HandleState[]) => boolean;
     get state(): StateValue;
     /**
@@ -38,7 +39,7 @@ export declare class DocHandle<T>//
      *
      * @param {awaitStates=[READY]} optional states to wait for, such as "LOADING". mostly for internal use.
      */
-    doc(awaitStates?: HandleState[]): Promise<A.Doc<T>>;
+    doc(awaitStates?: HandleState[]): Promise<A.Doc<T> | undefined>;
     /**
      * Returns the current state of the Automerge document this handle manages, or undefined.
      * Useful in a synchronous context. Consider using `await handle.doc()` instead, check `isReady()`,
@@ -55,10 +56,18 @@ export declare class DocHandle<T>//
     /** `change` is called by the repo when the document is changed locally  */
     change(callback: A.ChangeFn<T>, options?: A.ChangeOptions<T>): void;
     changeAt(heads: A.Heads, callback: A.ChangeFn<T>, options?: A.ChangeOptions<T>): void;
+    unavailable(): void;
     /** `request` is called by the repo when the document is not found in storage */
     request(): void;
     /** `delete` is called by the repo when the document is deleted */
     delete(): void;
+    /** `broadcast` sends an arbitrary ephemeral message out to all reachable peers who would receive sync messages from you
+     * it has no guarantee of delivery, and is not persisted to the underlying automerge doc in any way.
+     * messages will have a sending PeerId but this is *not* a useful user identifier.
+     * a user could have multiple tabs open and would appear as multiple PeerIds.
+     * every message source must have a unique PeerId.
+     */
+    broadcast(message: any): void;
 }
 interface DocHandleOptions {
     isNew?: boolean;
@@ -66,7 +75,7 @@ interface DocHandleOptions {
 }
 export interface DocHandleMessagePayload {
     destinationId: PeerId;
-    channelId: ChannelId;
+    documentId: DocumentId;
     data: Uint8Array;
 }
 export interface DocHandleEncodedChangePayload<T> {
@@ -82,10 +91,22 @@ export interface DocHandleChangePayload<T> {
     patches: A.Patch[];
     patchInfo: A.PatchInfo<T>;
 }
+export interface DocHandleEphemeralMessagePayload {
+    handle: DocHandle<any>;
+    senderId: PeerId;
+    message: unknown;
+}
+export interface DocHandleOutboundEphemeralMessagePayload {
+    handle: DocHandle<any>;
+    data: Uint8Array;
+}
 export interface DocHandleEvents<T> {
     "heads-changed": (payload: DocHandleEncodedChangePayload<T>) => void;
     change: (payload: DocHandleChangePayload<T>) => void;
     delete: (payload: DocHandleDeletePayload<T>) => void;
+    unavailable: (payload: DocHandleDeletePayload<T>) => void;
+    "ephemeral-message": (payload: DocHandleEphemeralMessagePayload) => void;
+    "ephemeral-message-outbound": (payload: DocHandleOutboundEphemeralMessagePayload) => void;
 }
 export declare const HandleState: {
     readonly IDLE: "idle";
@@ -94,6 +115,7 @@ export declare const HandleState: {
     readonly READY: "ready";
     readonly FAILED: "failed";
     readonly DELETED: "deleted";
+    readonly UNAVAILABLE: "unavailable";
 };
 export type HandleState = (typeof HandleState)[keyof typeof HandleState];
 export declare const Event: {
@@ -104,7 +126,8 @@ export declare const Event: {
     readonly UPDATE: "UPDATE";
     readonly TIMEOUT: "TIMEOUT";
     readonly DELETE: "DELETE";
+    readonly MARK_UNAVAILABLE: "MARK_UNAVAILABLE";
 };
-export declare const IDLE: "idle", LOADING: "loading", REQUESTING: "requesting", READY: "ready", FAILED: "failed", DELETED: "deleted";
+export declare const IDLE: "idle", LOADING: "loading", REQUESTING: "requesting", READY: "ready", FAILED: "failed", DELETED: "deleted", UNAVAILABLE: "unavailable";
 export {};
 //# sourceMappingURL=DocHandle.d.ts.map

package/dist/DocHandle.d.ts.map

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

package/dist/DocHandle.js

@@ -7,6 +7,7 @@ import { headsAreSame } from "./helpers/headsAreSame.js";
 import { pause } from "./helpers/pause.js";
 import { TimeoutError, withTimeout } from "./helpers/withTimeout.js";
 import { stringifyAutomergeUrl } from "./DocUrl.js";
+import { encode } from "cbor-x";
 /** DocHandle is a wrapper around a single Automerge document that lets us listen for changes. */
 export class DocHandle//
  extends EventEmitter {
@@ -69,6 +70,10 @@ export class DocHandle//
                 },
                 requesting: {
                     on: {
+                        MARK_UNAVAILABLE: {
+                            target: UNAVAILABLE,
+                            actions: "onUnavailable",
+                        },
                         // UPDATE is called by the Repo when we receive changes from the network
                         UPDATE: { actions: "onUpdate" },
                         // REQUEST_COMPLETE is called from `onUpdate` when the doc has been fully loaded from the network
@@ -95,6 +100,14 @@ export class DocHandle//
                 deleted: {
                     type: "final",
                 },
+                unavailable: {
+                    on: {
+                        UPDATE: { actions: "onUpdate" },
+                        // REQUEST_COMPLETE is called from `onUpdate` when the doc has been fully loaded from the network
+                        REQUEST_COMPLETE: { target: READY },
+                        DELETE: { actions: "onDelete", target: DELETED },
+                    },
+                },
             },
         }, {
             actions: {
@@ -109,13 +122,20 @@ export class DocHandle//
                     this.emit("delete", { handle: this });
                     return { doc: undefined };
                 }),
+                onUnavailable: assign(context => {
+                    const { doc } = context;
+                    this.emit("unavailable", { handle: this });
+                    return { doc };
+                }),
             },
         }))
             .onTransition(({ value: state, history, context }, event) => {
             const oldDoc = history?.context?.doc;
             const newDoc = context.doc;
-            console.log(`${event} → ${state}`, newDoc);
-            const docChanged = newDoc && oldDoc && !headsAreSame(A.getHeads(newDoc), A.getHeads(oldDoc));
+            this.#log(`${history?.value}: ${event.type} → ${state}`, newDoc);
+            const docChanged = newDoc &&
+                oldDoc &&
+                !headsAreSame(A.getHeads(newDoc), A.getHeads(oldDoc));
             if (docChanged) {
                 this.emit("heads-changed", { handle: this, doc: newDoc });
                 const patches = A.diff(newDoc, A.getHeads(oldDoc), A.getHeads(newDoc));
@@ -167,6 +187,7 @@ export class DocHandle//
      * @returns true if the document has been marked as deleted
      */
     isDeleted = () => this.inState([HandleState.DELETED]);
+    isUnavailable = () => this.inState([HandleState.UNAVAILABLE]);
     inState = (states) => states.some(this.#machine?.getSnapshot().matches);
     get state() {
         return this.#machine?.getSnapshot().value;
@@ -187,7 +208,7 @@ export class DocHandle//
      *
      * @param {awaitStates=[READY]} optional states to wait for, such as "LOADING". mostly for internal use.
      */
-    async doc(awaitStates = [READY]) {
+    async doc(awaitStates = [READY, UNAVAILABLE]) {
         await pause(); // yield one tick because reasons
         try {
             // wait for the document to enter one of the desired states
@@ -200,7 +221,7 @@ export class DocHandle//
                 throw error;
         }
         // Return the document
-        return this.#doc;
+        return !this.isUnavailable() ? this.#doc : undefined;
     }
     /**
      * Returns the current state of the Automerge document this handle manages, or undefined.
@@ -249,6 +270,9 @@ export class DocHandle//
             },
         });
     }
+    unavailable() {
+        this.#machine.send(MARK_UNAVAILABLE);
+    }
     /** `request` is called by the repo when the document is not found in storage */
     request() {
         if (this.#state === LOADING)
@@ -258,6 +282,18 @@ export class DocHandle//
     delete() {
         this.#machine.send(DELETE);
     }
+    /** `broadcast` sends an arbitrary ephemeral message out to all reachable peers who would receive sync messages from you
+     * it has no guarantee of delivery, and is not persisted to the underlying automerge doc in any way.
+     * messages will have a sending PeerId but this is *not* a useful user identifier.
+     * a user could have multiple tabs open and would appear as multiple PeerIds.
+     * every message source must have a unique PeerId.
+     */
+    broadcast(message) {
+        this.emit("ephemeral-message-outbound", {
+            handle: this,
+            data: encode(message),
+        });
+    }
 }
 // STATE MACHINE TYPES
 // state
@@ -268,6 +304,7 @@ export const HandleState = {
     READY: "ready",
     FAILED: "failed",
     DELETED: "deleted",
+    UNAVAILABLE: "unavailable",
 };
 // events
 export const Event = {
@@ -278,7 +315,8 @@ export const Event = {
     UPDATE: "UPDATE",
     TIMEOUT: "TIMEOUT",
     DELETE: "DELETE",
+    MARK_UNAVAILABLE: "MARK_UNAVAILABLE",
 };
 // CONSTANTS
-export const { IDLE, LOADING, REQUESTING, READY, FAILED, DELETED } = HandleState;
-const { CREATE, FIND, REQUEST, UPDATE, TIMEOUT, DELETE, REQUEST_COMPLETE } = Event;
+export const { IDLE, LOADING, REQUESTING, READY, FAILED, DELETED, UNAVAILABLE, } = HandleState;
+const { CREATE, FIND, REQUEST, UPDATE, TIMEOUT, DELETE, REQUEST_COMPLETE, MARK_UNAVAILABLE, } = Event;

package/dist/DocUrl.d.ts

@@ -4,11 +4,11 @@ export declare const urlPrefix = "automerge:";
  * given an Automerge URL, return a decoded DocumentId (and the encoded DocumentId)
  *
  * @param url
- * @returns { documentId: Uint8Array(16), encodedDocumentId: bs58check.encode(documentId) }
+ * @returns { binaryDocumentId: BinaryDocumentId, documentId: DocumentId }
  */
 export declare const parseAutomergeUrl: (url: AutomergeUrl) => {
     binaryDocumentId: BinaryDocumentId;
-    encodedDocumentId: DocumentId;
+    documentId: DocumentId;
 };
 interface StringifyAutomergeUrlOptions {
     documentId: DocumentId | BinaryDocumentId;
@@ -17,7 +17,7 @@ interface StringifyAutomergeUrlOptions {
  * Given a documentId in either canonical form, return an Automerge URL
  * Throws on invalid input.
  * Note: this is an object because we anticipate adding fields in the future.
- * @param { documentId: EncodedDocumentId | DocumentId }
+ * @param { documentId: BinaryDocumentId | DocumentId }
  * @returns AutomergeUrl
  */
 export declare const stringifyAutomergeUrl: ({ documentId, }: StringifyAutomergeUrlOptions) => AutomergeUrl;

package/dist/DocUrl.js

@@ -5,19 +5,19 @@ export const urlPrefix = "automerge:";
  * given an Automerge URL, return a decoded DocumentId (and the encoded DocumentId)
  *
  * @param url
- * @returns { documentId: Uint8Array(16), encodedDocumentId: bs58check.encode(documentId) }
+ * @returns { binaryDocumentId: BinaryDocumentId, documentId: DocumentId }
  */
 export const parseAutomergeUrl = (url) => {
-    const { binaryDocumentId: binaryDocumentId, encodedDocumentId } = parts(url);
+    const { binaryDocumentId, documentId } = parts(url);
     if (!binaryDocumentId)
         throw new Error("Invalid document URL: " + url);
-    return { binaryDocumentId, encodedDocumentId };
+    return { binaryDocumentId, documentId };
 };
 /**
  * Given a documentId in either canonical form, return an Automerge URL
  * Throws on invalid input.
  * Note: this is an object because we anticipate adding fields in the future.
- * @param { documentId: EncodedDocumentId | DocumentId }
+ * @param { documentId: BinaryDocumentId | DocumentId }
  * @returns AutomergeUrl
  */
 export const stringifyAutomergeUrl = ({ documentId, }) => {
@@ -56,12 +56,12 @@ export const binaryToDocumentId = (docId) => bs58check.encode(docId);
  * eventually this could include things like heads, so we use this structure
  * we return both a binary & string-encoded version of the document ID
  * @param str
- * @returns { binaryDocumentId, encodedDocumentId }
+ * @returns { binaryDocumentId, documentId }
  */
 const parts = (str) => {
     const regex = new RegExp(`^${urlPrefix}(\\w+)$`);
-    const [m, docMatch] = str.match(regex) || [];
-    const encodedDocumentId = docMatch;
-    const binaryDocumentId = documentIdToBinary(encodedDocumentId);
-    return { binaryDocumentId, encodedDocumentId };
+    const [_, docMatch] = str.match(regex) || [];
+    const documentId = docMatch;
+    const binaryDocumentId = documentIdToBinary(documentId);
+    return { binaryDocumentId, documentId };
 };

package/dist/EphemeralData.d.ts

@@ -1,27 +1,19 @@
-import EventEmitter from "eventemitter3";
-import { ChannelId, PeerId } from "./index.js";
-import { MessagePayload } from "./network/NetworkAdapter.js";
-/**
- * EphemeralData provides a mechanism to broadcast short-lived data — cursor positions, presence,
- * heartbeats, etc. — that is useful in the moment but not worth persisting.
- */
-export declare class EphemeralData extends EventEmitter<EphemeralDataMessageEvents> {
-    /** Broadcast an ephemeral message */
-    broadcast(channelId: ChannelId, message: unknown): void;
-    /** Receive an ephemeral message */
-    receive(senderId: PeerId, grossChannelId: ChannelId, message: Uint8Array): void;
-}
+import { DocumentId, PeerId } from "./index.js";
+import { EphemeralMessageContents } from "./network/messages.js";
+export type SessionId = string & {
+    __SessionId: false;
+};
 export interface EphemeralDataPayload {
-    channelId: ChannelId;
+    documentId: DocumentId;
     peerId: PeerId;
     data: {
         peerId: PeerId;
-        channelId: ChannelId;
+        documentId: DocumentId;
         data: unknown;
     };
 }
 export type EphemeralDataMessageEvents = {
-    message: (event: MessagePayload) => void;
+    message: (event: EphemeralMessageContents) => void;
     data: (event: EphemeralDataPayload) => void;
 };
 //# sourceMappingURL=EphemeralData.d.ts.map

package/dist/EphemeralData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EphemeralData.d.ts","sourceRoot":"","sources":["../src/EphemeralData.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAE5D;;;GAGG;AACH,qBAAa,aAAc,SAAQ,YAAY,CAAC,0BAA0B,CAAC;IACzE,qCAAqC;IACrC,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO;IAWhD,mCAAmC;IACnC,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU;CASzE;AAID,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,SAAS,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE,CAAA;CAC9D;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAA;IACxC,IAAI,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAA;CAC5C,CAAA"}
+{"version":3,"file":"EphemeralData.d.ts","sourceRoot":"","sources":["../src/EphemeralData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAC/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAA;AAGhE,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG;IAAE,WAAW,EAAE,KAAK,CAAA;CAAE,CAAA;AAEvD,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,UAAU,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE,CAAA;CAChE;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,OAAO,EAAE,CAAC,KAAK,EAAE,wBAAwB,KAAK,IAAI,CAAA;IAClD,IAAI,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAA;CAC5C,CAAA"}

package/dist/EphemeralData.js

@@ -1,28 +1 @@
-import { decode, encode } from "cbor-x";
-import EventEmitter from "eventemitter3";
-/**
- * EphemeralData provides a mechanism to broadcast short-lived data — cursor positions, presence,
- * heartbeats, etc. — that is useful in the moment but not worth persisting.
- */
-export class EphemeralData extends EventEmitter {
-    /** Broadcast an ephemeral message */
-    broadcast(channelId, message) {
-        const messageBytes = encode(message);
-        this.emit("message", {
-            targetId: "*",
-            channelId: ("m/" + channelId),
-            message: messageBytes,
-            broadcast: true,
-        });
-    }
-    /** Receive an ephemeral message */
-    receive(senderId, grossChannelId, message) {
-        const data = decode(message);
-        const channelId = grossChannelId.slice(2);
-        this.emit("data", {
-            peerId: senderId,
-            channelId,
-            data,
-        });
-    }
-}
+export {};

package/dist/Repo.d.ts

@@ -1,5 +1,4 @@
 import { DocCollection } from "./DocCollection.js";
-import { EphemeralData } from "./EphemeralData.js";
 import { NetworkAdapter } from "./network/NetworkAdapter.js";
 import { NetworkSubsystem } from "./network/NetworkSubsystem.js";
 import { StorageAdapter } from "./storage/StorageAdapter.js";
@@ -10,7 +9,6 @@ export declare class Repo extends DocCollection {
     #private;
     networkSubsystem: NetworkSubsystem;
     storageSubsystem?: StorageSubsystem;
-    ephemeralData: EphemeralData;
     constructor({ storage, network, peerId, sharePolicy }: RepoConfig);
 }
 export interface RepoConfig {

package/dist/Repo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Repo.d.ts","sourceRoot":"","sources":["../src/Repo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,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,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAI/C,oFAAoF;AACpF,qBAAa,IAAK,SAAQ,aAAa;;IAGrC,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;IACnC,aAAa,EAAE,aAAa,CAAA;gBAEhB,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,UAAU;CAgHlE;AAED,MAAM,WAAW,UAAU;IACzB,4BAA4B;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf,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,MAAM,MAAM,WAAW,GAAG,CACxB,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,UAAU,KACpB,OAAO,CAAC,OAAO,CAAC,CAAA"}
+{"version":3,"file":"Repo.d.ts","sourceRoot":"","sources":["../src/Repo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,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,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAE/C,oFAAoF;AACpF,qBAAa,IAAK,SAAQ,aAAa;;IAGrC,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;gBAEvB,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,UAAU;CAiFlE;AAED,MAAM,WAAW,UAAU;IACzB,4BAA4B;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf,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,MAAM,MAAM,WAAW,GAAG,CACxB,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,UAAU,KACpB,OAAO,CAAC,OAAO,CAAC,CAAA"}

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`);
@@ -29,24 +27,30 @@ export class Repo extends DocCollection {
                     handle.update(() => loadedDoc);
                 }
             }
+            handle.on("unavailable", () => {
+                this.#log("document unavailable", { documentId: handle.documentId });
+                this.emit("unavailable-document", {
+                    documentId: handle.documentId,
+                });
+            });
             handle.request();
             // 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);
             }
         });
         // 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 +71,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/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();
         });
     });