@automerge/automerge-repo-network-messagechannel 1.0.5 → 1.0.7

package/dist/index.d.ts

@@ -5,7 +5,7 @@
  *
  * @module
  */
-import { type Message, NetworkAdapter, type PeerId } from "@automerge/automerge-repo";
+import { type RepoMessage, NetworkAdapter, type PeerId } from "@automerge/automerge-repo";
 import { MessagePortRef } from "./MessagePortRef.js";
 export declare class MessageChannelNetworkAdapter extends NetworkAdapter {
     #private;
@@ -14,7 +14,7 @@ export declare class MessageChannelNetworkAdapter extends NetworkAdapter {
     messagePortRef: MessagePortRef;
     constructor(messagePort: MessagePort, config?: MessageChannelNetworkAdapterConfig);
     connect(peerId: PeerId): void;
-    send(message: Message): void;
+    send(message: RepoMessage): void;
     announceConnection(peerId: PeerId): void;
     disconnect(): void;
 }

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,OAAO,EACZ,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,OAAO;IAmBrB,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;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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automerge/automerge-repo-network-messagechannel",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "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>",
@@ -10,13 +10,13 @@
   "scripts": {
     "build": "tsc",
     "watch": "npm-watch",
-    "test": "mocha --no-warnings --experimental-specifier-resolution=node --exit"
+    "test": "vitest"
   },
   "dependencies": {
-    "@automerge/automerge-repo": "^1.0.5"
+    "@automerge/automerge-repo": "^1.0.7"
   },
   "peerDependencies": {
-    "@automerge/automerge": "^2.1.0"
+    "@automerge/automerge": "^2.1.5"
   },
   "watch": {
     "build": {
@@ -29,8 +29,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "devDependencies": {
-    "@automerge/automerge": "^2.1.0"
-  },
-  "gitHead": "09256d61e0e4e0afd5d8deb1e187b57cb2413e1e"
+  "gitHead": "71060981f168e511a99ab85b155a54a13fd04bcc"
 }

package/src/index.ts

@@ -6,10 +6,10 @@
  * @module
  */
 import {
-  type Message,
+  type RepoMessage,
   NetworkAdapter,
   type PeerId,
-  NetworkAdapterMessage,
+  type Message,
 } from "@automerge/automerge-repo"
 import { MessagePortRef } from "./MessagePortRef.js"
 import { StrongMessagePortRef } from "./StrongMessagePortRef.js"
@@ -41,45 +41,42 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
     log("messageport connecting")
     this.peerId = peerId
     this.messagePortRef.start()
-    this.messagePortRef.addListener(
-      "message",
-      (e: { data: NetworkAdapterMessage }) => {
-        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.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.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
-        }
+          }
+          break
       }
-    )
+    })
 
     this.messagePortRef.addListener("close", () => {
       this.emit("close")
@@ -101,7 +98,7 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
     }, 100)
   }
 
-  send(message: Message) {
+  send(message: RepoMessage) {
     if ("data" in message) {
       const data = message.data.buffer.slice(
         message.data.byteOffset,

package/test/index.test.ts

@@ -1,3 +1,4 @@
+import { describe } from "vitest"
 import { runAdapterTests } from "../../automerge-repo/src/helpers/tests/network-adapter-tests.js"
 import { MessageChannelNetworkAdapter as Adapter } from "../src/index.js"
 

package/typedoc.json

@@ -1,5 +1,5 @@
 {
-    "extends": "../../typedoc.base.json",
-    "entryPoints": ["src/index.ts"],
-    "readme": "none"
+  "extends": ["../../typedoc.base.json"],
+  "entryPoints": ["src/index.ts"],
+  "readme": "none"
 }

package/.mocharc.json

@@ -1,5 +0,0 @@
-{
-  "extension": ["ts"],
-  "spec": "test/*.test.ts",
-  "loader": "ts-node/esm"
-}