@automerge/automerge-repo-network-messagechannel 2.0.4 → 2.0.6

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,EAEX,YAAY,EACb,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAOpD,qBAAa,4BAA6B,SAAQ,cAAc;;IAC9D,QAAQ,KAAK;IACb,cAAc;IACd,cAAc,EAAE,cAAc,CAAA;IAS9B,OAAO;IAIP,SAAS;gBAYP,WAAW,EAAE,WAAW,EACxB,MAAM,GAAE,kCAAuC;IAWjD,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,YAAY;IA4EnD,IAAI,CAAC,OAAO,EAAE,WAAW;IAmBzB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY;IAM7D,UAAU;CAUX;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,EAEX,YAAY,EACb,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAOpD,qBAAa,4BAA6B,SAAQ,cAAc;;IAC9D,QAAQ,KAAK;IACb,cAAc;IACd,cAAc,EAAE,cAAc,CAAA;IAS9B,OAAO;IAIP,SAAS;gBAYP,WAAW,EAAE,WAAW,EACxB,MAAM,GAAE,kCAAuC;IAWjD,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,YAAY;IA6EnD,IAAI,CAAC,OAAO,EAAE,WAAW;IAmBzB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY;IAM7D,UAAU;CAWX;AAED,MAAM,WAAW,kCAAkC;IACjD;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB"}

package/dist/index.js

@@ -73,6 +73,7 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
                 case "leave":
                     if (this.#remotePeerId === senderId) {
                         this.emit("peer-disconnected", { peerId: senderId });
+                        this.emit("close");
                     }
                     break;
                 default:
@@ -127,6 +128,7 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
                 senderId: this.peerId,
             });
             this.emit("peer-disconnected", { peerId: this.#remotePeerId });
+            this.emit("close");
         }
         this.messagePortRef.stop();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automerge/automerge-repo-network-messagechannel",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "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": "2.0.4",
+    "@automerge/automerge-repo": "2.0.6",
     "debug": "^4.3.4",
     "eventemitter3": "^5.0.1"
   },
@@ -28,5 +28,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7100c8827c5da9e04fd2dc4319d015f5e624f8fa"
+  "gitHead": "d90f3e51d9ed357fd6f3098ac11190996ae0c05a"
 }

package/src/index.ts

@@ -101,6 +101,7 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
           case "leave":
             if (this.#remotePeerId === senderId) {
               this.emit("peer-disconnected", { peerId: senderId })
+              this.emit("close")
             }
             break
           default:
@@ -167,6 +168,7 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
         senderId: this.peerId,
       })
       this.emit("peer-disconnected", { peerId: this.#remotePeerId })
+      this.emit("close")
     }
     this.messagePortRef.stop()
   }

package/test/index.test.ts

@@ -1,6 +1,10 @@
-import { describe } from "vitest"
+import { assert, describe, it } from "vitest"
 import { runNetworkAdapterTests } from "../../automerge-repo/src/helpers/tests/network-adapter-tests.js"
-import { MessageChannelNetworkAdapter as Adapter } from "../src/index.js"
+import {
+  MessageChannelNetworkAdapter as Adapter,
+  MessageChannelNetworkAdapter,
+} from "../src/index.js"
+import { Repo } from "@automerge/automerge-repo/slim"
 
 // bob is the hub, alice and charlie are spokes
 describe("MessageChannelNetworkAdapter", () => {
@@ -51,4 +55,31 @@ describe("MessageChannelNetworkAdapter", () => {
 
     return { adapters: [a, b, c], teardown }
   }, "all-to-all")
+
+  it("should close the network adapter when a 'leave' message is received", async () => {
+    const { port1: aliceToBob, port2: bobToAlice } = new MessageChannel()
+    const alice = new Repo({
+      network: [
+        new MessageChannelNetworkAdapter(aliceToBob, { useWeakRef: false }),
+      ],
+    })
+    const bob = new Repo({
+      network: [
+        new MessageChannelNetworkAdapter(bobToAlice, { useWeakRef: true }),
+      ],
+    })
+
+    await Promise.all([
+      alice.networkSubsystem.whenReady(),
+      bob.networkSubsystem.whenReady(),
+    ])
+
+    alice.networkSubsystem.disconnect()
+
+    // Wait for bob to process the leave message
+    await new Promise(r => setTimeout(r, 100))
+
+    assert.equal(bob.networkSubsystem.adapters.length, 0)
+    assert.equal(alice.networkSubsystem.adapters.length, 0)
+  })
 })