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

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EACL,KAAK,WAAW,EAChB,cAAc,EACd,KAAK,MAAM,EAEZ,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAOpD,qBAAa,4BAA6B,SAAQ,cAAc;;IAC9D,QAAQ,KAAK;IACb,cAAc;IACd,cAAc,EAAE,cAAc,CAAA;gBAI5B,WAAW,EAAE,WAAW,EACxB,MAAM,GAAE,kCAAuC;IAWjD,OAAO,CAAC,MAAM,EAAE,MAAM;IA6DtB,IAAI,CAAC,OAAO,EAAE,WAAW;IAmBzB,kBAAkB,CAAC,MAAM,EAAE,MAAM;IAQjC,UAAU;CAIX;AAED,MAAM,WAAW,kCAAkC;IACjD;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EACL,KAAK,WAAW,EAChB,cAAc,EACd,KAAK,MAAM,EAEZ,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAOpD,qBAAa,4BAA6B,SAAQ,cAAc;;IAC9D,QAAQ,KAAK;IACb,cAAc;IACd,cAAc,EAAE,cAAc,CAAA;gBAI5B,WAAW,EAAE,WAAW,EACxB,MAAM,GAAE,kCAAuC;IAWjD,OAAO,CAAC,MAAM,EAAE,MAAM;IAgEtB,IAAI,CAAC,OAAO,EAAE,WAAW;IAmBzB,kBAAkB,CAAC,MAAM,EAAE,MAAM;IAQjC,UAAU;CAIX;AAED,MAAM,WAAW,kCAAkC;IACjD;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB"}

package/package.json

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

package/src/index.ts

@@ -41,42 +41,45 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
     log("messageport connecting")
     this.peerId = peerId
     this.messagePortRef.start()
-    this.messagePortRef.addListener("message", (e: { data: Message }) => {
-      log("message port received", e.data)
-
-      const message = e.data
-      if ("targetId" in message && message.targetId !== this.peerId) {
-        throw new Error(
-          "MessagePortNetwork should never receive messages for a different peer."
-        )
-      }
-
-      const { senderId, type } = message
-
-      switch (type) {
-        case "arrive":
-          this.messagePortRef.postMessage({
-            senderId: this.peerId,
-            targetId: senderId,
-            type: "welcome",
-          })
-          this.announceConnection(senderId)
-          break
-        case "welcome":
-          this.announceConnection(senderId)
-          break
-        default:
-          if (!("data" in message)) {
-            this.emit("message", message)
-          } else {
-            this.emit("message", {
-              ...message,
-              data: new Uint8Array(message.data),
+    this.messagePortRef.addListener(
+      "message",
+      (e: { data: MessageChannelMessage }) => {
+        log("message port received", e.data)
+
+        const message = e.data
+        if ("targetId" in message && message.targetId !== this.peerId) {
+          throw new Error(
+            "MessagePortNetwork should never receive messages for a different peer."
+          )
+        }
+
+        const { senderId, type } = message
+
+        switch (type) {
+          case "arrive":
+            this.messagePortRef.postMessage({
+              senderId: this.peerId,
+              targetId: senderId,
+              type: "welcome",
             })
-          }
-          break
+            this.announceConnection(senderId)
+            break
+          case "welcome":
+            this.announceConnection(senderId)
+            break
+          default:
+            if (!("data" in message)) {
+              this.emit("message", message)
+            } else {
+              this.emit("message", {
+                ...message,
+                data: new Uint8Array(message.data),
+              })
+            }
+            break
+        }
       }
-    })
+    )
 
     this.messagePortRef.addListener("close", () => {
       this.emit("close")
@@ -142,3 +145,27 @@ export interface MessageChannelNetworkAdapterConfig {
    */
   useWeakRef?: boolean
 }
+
+/** 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 MessageChannelMessage = ArriveMessage | WelcomeMessage | Message