@fairfox/polly 0.73.1 → 0.74.1

package/dist/src/mesh.js

@@ -1563,10 +1563,9 @@ class MeshSignalingClient {
 
 // src/shared/lib/mesh-state.ts
 import {
-  Automerge as Automerge3,
-  interpretAsDocumentId
+  Automerge as Automerge3
 } from "@automerge/automerge-repo/slim";
-import nacl3 from "tweetnacl";
+import nacl4 from "tweetnacl";
 
 // src/shared/lib/crdt-specialised.ts
 import { Automerge, Counter, updateText } from "@automerge/automerge-repo/slim";
@@ -2041,6 +2040,19 @@ function fieldEquals(a, b) {
   }
 }
 
+// src/shared/lib/derive-document-id.ts
+import {
+  interpretAsDocumentId
+} from "@automerge/automerge-repo/slim";
+import nacl3 from "tweetnacl";
+var DOC_ID_DOMAIN = "polly/meshState/v1";
+var keyEncoder = new TextEncoder;
+function deriveDocumentId(key) {
+  const digest = nacl3.hash(keyEncoder.encode(`${DOC_ID_DOMAIN}:${key}`));
+  const bytes = digest.slice(0, 16);
+  return interpretAsDocumentId(bytes);
+}
+
 // src/shared/lib/mesh-state.ts
 var defaultRepo;
 var MESH_STATE_MODULE_ID = `mesh-state-${typeof crypto !== "undefined" && typeof crypto.randomUUID === "function" ? crypto.randomUUID() : Math.random().toString(36).slice(2) + Date.now().toString(36)}`;
@@ -2163,13 +2175,7 @@ function resolveRepo(option) {
   }
   return repo;
 }
-var DOC_ID_DOMAIN = "polly/meshState/v1";
-var keyEncoder = new TextEncoder;
-function deriveDocumentId(key) {
-  const digest = nacl3.hash(keyEncoder.encode(`${DOC_ID_DOMAIN}:${key}`));
-  const bytes = digest.slice(0, 16);
-  return interpretAsDocumentId(bytes);
-}
+var keyEncoder2 = new TextEncoder;
 var docIdResolver;
 function registerDocIdResolver(resolver) {
   docIdResolver = resolver;
@@ -2235,7 +2241,7 @@ function buildHandleFactory(repo, key, initialDoc) {
 var SEED_ACTOR_DOMAIN = "polly/meshState/seedActor/v1";
 function deriveSeedActor(documentId) {
   const docIdString = documentId;
-  const digest = nacl3.hash(keyEncoder.encode(`${SEED_ACTOR_DOMAIN}:${docIdString}`));
+  const digest = nacl4.hash(keyEncoder2.encode(`${SEED_ACTOR_DOMAIN}:${docIdString}`));
   let hex = "";
   for (let i = 0;i < 16; i++) {
     hex += (digest[i] ?? 0).toString(16).padStart(2, "0");
@@ -2696,6 +2702,7 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
   }
   handlePeerJoined(remotePeerId) {
     this.presentPeers.add(remotePeerId);
+    this.evictStaleSlotForRejoin(remotePeerId);
     if (!this.shouldInitiateTo(remotePeerId))
       return;
     this.tryCreateInitiatingSlot(remotePeerId);
@@ -2703,11 +2710,24 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
   handlePeersPresent(peerIds) {
     for (const remotePeerId of peerIds) {
       this.presentPeers.add(remotePeerId);
+      this.evictStaleSlotForRejoin(remotePeerId);
       if (!this.shouldInitiateTo(remotePeerId))
         continue;
       this.tryCreateInitiatingSlot(remotePeerId);
     }
   }
+  evictStaleSlotForRejoin(remotePeerId) {
+    const slot = this.slots.get(remotePeerId);
+    if (!slot)
+      return;
+    const state = slot.connection.connectionState;
+    if (state === "connected" && slot.channel?.readyState === "open")
+      return;
+    if (this.slotNeverConnectedTimeoutMs > 0 && (state === "new" || state === "connecting") && performance.now() - slot.createdAt < this.slotNeverConnectedTimeoutMs) {
+      return;
+    }
+    this.tearDownWedgedSlot(remotePeerId);
+  }
   tryCreateInitiatingSlot(remotePeerId) {
     try {
       this.createInitiatingSlot(remotePeerId);
@@ -4290,4 +4310,4 @@ export {
   $meshCounter
 };
 
-//# debugId=E57D210FDE704BCC64756E2164756E21
+//# debugId=0D84EA4EDCC2765464756E2164756E21