@automerge/automerge-repo-network-broadcastchannel 1.0.13 → 1.0.16

package/dist/index.d.ts

@@ -13,7 +13,7 @@
  * @module
  *
  */
-import { NetworkAdapter, PeerId, RepoMessage } from "@automerge/automerge-repo";
+import { Message, NetworkAdapter, PeerId } from "@automerge/automerge-repo";
 export type BroadcastChannelNetworkAdapterOptions = {
     channelName: string;
 };
@@ -21,7 +21,7 @@ export declare class BroadcastChannelNetworkAdapter extends NetworkAdapter {
     #private;
     constructor(options?: BroadcastChannelNetworkAdapterOptions);
     connect(peerId: PeerId): void;
-    send(message: RepoMessage): void;
+    send(message: Message): void;
     disconnect(): void;
 }
 //# 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;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,cAAc,EACd,MAAM,EACN,WAAW,EACZ,MAAM,2BAA2B,CAAA;AAElC,MAAM,MAAM,qCAAqC,GAAG;IAClD,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,qBAAa,8BAA+B,SAAQ,cAAc;;gBAKpD,OAAO,CAAC,EAAE,qCAAqC;IAK3D,OAAO,CAAC,MAAM,EAAE,MAAM;IAoDtB,IAAI,CAAC,OAAO,EAAE,WAAW;IAczB,UAAU;CAIX"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAE3E,MAAM,MAAM,qCAAqC,GAAG;IAClD,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,qBAAa,8BAA+B,SAAQ,cAAc;;gBAKpD,OAAO,CAAC,EAAE,qCAAqC;IAK3D,OAAO,CAAC,MAAM,EAAE,MAAM;IAoDtB,IAAI,CAAC,OAAO,EAAE,OAAO;IAcrB,UAAU;CAIX"}

package/dist/index.js

@@ -13,7 +13,7 @@
  * @module
  *
  */
-import { NetworkAdapter, } from "@automerge/automerge-repo";
+import { NetworkAdapter } from "@automerge/automerge-repo";
 export class BroadcastChannelNetworkAdapter extends NetworkAdapter {
     #broadcastChannel;
     #options;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automerge/automerge-repo-network-broadcastchannel",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "description": "BroadcastChannel network adapter for Automerge Repo",
   "repository": "https://github.com/automerge/automerge-repo/tree/master/packages/automerge-repo-network-broadcastchannel",
   "author": "Peter van Hardenberg <pvh@pvh.ca>",
@@ -16,7 +16,7 @@
     "@automerge/automerge": "^2.1.5"
   },
   "dependencies": {
-    "@automerge/automerge-repo": "^1.0.13"
+    "@automerge/automerge-repo": "^1.0.16"
   },
   "watch": {
     "build": {
@@ -29,5 +29,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "48ca7b968758d7fd95f13fa03dc69d452cdd15f5"
+  "gitHead": "d8334e6a3c2a8eb980fc78511c3d9672009cd6cb"
 }

package/src/index.ts

@@ -14,12 +14,7 @@
  *
  */
 
-import {
-  Message,
-  NetworkAdapter,
-  PeerId,
-  RepoMessage,
-} from "@automerge/automerge-repo"
+import { Message, NetworkAdapter, PeerId } from "@automerge/automerge-repo"
 
 export type BroadcastChannelNetworkAdapterOptions = {
   channelName: string
@@ -41,7 +36,7 @@ export class BroadcastChannelNetworkAdapter extends NetworkAdapter {
 
     this.#broadcastChannel.addEventListener(
       "message",
-      (e: { data: Message }) => {
+      (e: { data: BroadcastChannelMessage }) => {
         const message = e.data
         if ("targetId" in message && message.targetId !== this.peerId) {
           return
@@ -87,7 +82,7 @@ export class BroadcastChannelNetworkAdapter extends NetworkAdapter {
     this.emit("peer-candidate", { peerId })
   }
 
-  send(message: RepoMessage) {
+  send(message: Message) {
     if ("data" in message) {
       this.#broadcastChannel.postMessage({
         ...message,
@@ -106,3 +101,27 @@ export class BroadcastChannelNetworkAdapter extends NetworkAdapter {
     throw new Error("Unimplemented: leave on BroadcastChannelNetworkAdapter")
   }
 }
+
+/** Notify the network that we have arrived so everyone knows our peer ID */
+type ArriveMessage = {
+  type: "arrive"
+
+  /** The peer ID of the sender of this message */
+  senderId: PeerId
+
+  /** Arrive messages don't have a targetId */
+  targetId: never
+}
+
+/** Respond to an arriving peer with our peer ID */
+type WelcomeMessage = {
+  type: "welcome"
+
+  /** The peer ID of the recipient sender this message */
+  senderId: PeerId
+
+  /** The peer ID of the recipient of this message */
+  targetId: PeerId
+}
+
+type BroadcastChannelMessage = ArriveMessage | WelcomeMessage | Message