@fairfox/polly 0.77.3 → 0.79.0

package/dist/src/mesh.js

@@ -257,6 +257,17 @@ var init_encryption = __esm(() => {
   };
 });
 
+// src/shared/lib/guards.ts
+function hasKeyInObject(input, key) {
+  return typeof input === "object" && input !== null && Object.hasOwn(input, key);
+}
+function isRecord(input) {
+  return typeof input === "object" && input !== null && !Array.isArray(input);
+}
+function assertNever(value) {
+  throw new Error(`assertNever: unexpected value ${JSON.stringify(value)}`);
+}
+
 // src/shared/lib/wasm-init.ts
 import wasmPath from "@automerge/automerge/automerge.wasm";
 import { initializeWasm } from "@automerge/automerge-repo/slim";
@@ -437,7 +448,7 @@ class IndexedDBBlobCache {
       totalSize += value.size;
       if (!value.pinned) {
         candidates.push({
-          hash: key,
+          hash: String(key),
           accessedAt: value.accessedAt,
           size: value.size
         });
@@ -1251,6 +1262,10 @@ class MeshNetworkAdapter extends NetworkAdapter {
       return;
     }
     const tag = payload[0];
+    if (tag === undefined) {
+      emitMeshDiagnostic({ kind: "drop:empty-control-payload", senderId });
+      return;
+    }
     const body = payload.subarray(1);
     switch (tag) {
       case MESH_CONTROL_TYPE.Sync:
@@ -2476,15 +2491,17 @@ function partitionStats(report) {
     retransmittedPacketsSent: undefined,
     retransmittedBytesSent: undefined
   };
-  const iter = report.values?.() ?? [];
+  const iter = hasStatsIterator(report) ? report.values() : [];
   for (const raw of iter) {
-    if (!raw || typeof raw !== "object")
+    if (!isRecord(raw))
       continue;
-    const stat = raw;
-    ingestStat(stat, out);
+    ingestStat(raw, out);
   }
   return out;
 }
+function hasStatsIterator(report) {
+  return report !== null && typeof report === "object" && "values" in report && typeof report.values === "function";
+}
 function ingestStat(stat, out) {
   const id = String(stat["id"]);
   switch (stat["type"]) {
@@ -3630,11 +3647,13 @@ function decodeRevocationSummary(bytes) {
     if (!item || typeof item !== "object") {
       throw new Error(`decodeRevocationSummary: entry ${index} is not an object`);
     }
-    const e = item;
-    if (typeof e.r !== "string" || typeof e.i !== "string" || typeof e.t !== "number") {
+    const r = "r" in item ? item.r : undefined;
+    const i = "i" in item ? item.i : undefined;
+    const t = "t" in item ? item.t : undefined;
+    if (typeof r !== "string" || typeof i !== "string" || typeof t !== "number") {
       throw new Error(`decodeRevocationSummary: entry ${index} has missing or wrong-typed fields`);
     }
-    return { revokedPeerId: e.r, issuerPeerId: e.i, issuedAt: e.t };
+    return { revokedPeerId: r, issuerPeerId: i, issuedAt: t };
   });
 }
 function compareSummaryEntries(a, b) {
@@ -3761,6 +3780,39 @@ function findLazyWrapperDocIdDuplicates(records) {
   }
   return duplicates;
 }
+function shouldReplaceRevocation(existing, record) {
+  return existing === undefined || record.issuedAt > existing.entry.issuedAt;
+}
+function storeRevocationInto(store, record, bytes) {
+  const existing = store.get(record.revokedPeerId);
+  if (!shouldReplaceRevocation(existing, record))
+    return;
+  store.set(record.revokedPeerId, {
+    bytes,
+    entry: {
+      revokedPeerId: record.revokedPeerId,
+      issuerPeerId: record.issuerPeerId,
+      issuedAt: record.issuedAt
+    }
+  });
+}
+function revocationsMissingFromSummary(store, summary) {
+  const remoteKeys = new Set(summary.map((entry) => entry.revokedPeerId));
+  const missing = [];
+  for (const stored of store.values()) {
+    if (remoteKeys.has(stored.entry.revokedPeerId))
+      continue;
+    missing.push(stored.bytes);
+  }
+  return missing;
+}
+function classifyIncomingRevocation(record, localPeerId, revokedPeers) {
+  if (record.revokedPeerId === localPeerId)
+    return "self";
+  if (revokedPeers.has(record.revokedPeerId))
+    return "duplicate";
+  return "apply";
+}
 function installPolly107SyncReevaluation(networkAdapter, repo) {
   const disable = typeof process !== "undefined" && process.env?.["POLLY_107_DISABLE_FIX"] === "1";
   if (disable)
@@ -3838,17 +3890,7 @@ async function createMeshClient(options) {
   const localPeerId = options.signaling.peerId;
   const revocationStore = new Map;
   function storeRevocation(record, bytes) {
-    const existing = revocationStore.get(record.revokedPeerId);
-    if (existing && existing.entry.issuedAt >= record.issuedAt)
-      return;
-    revocationStore.set(record.revokedPeerId, {
-      bytes,
-      entry: {
-        revokedPeerId: record.revokedPeerId,
-        issuerPeerId: record.issuerPeerId,
-        issuedAt: record.issuedAt
-      }
-    });
+    storeRevocationInto(revocationStore, record, bytes);
   }
   const handleRevocationControl = (body, senderId) => {
     const keyring2 = keyringSource();
@@ -3860,28 +3902,30 @@ async function createMeshClient(options) {
       emitMeshDiagnostic({ kind: "revoke:rejected", senderId, reason });
       return;
     }
-    if (record.revokedPeerId === localPeerId) {
-      selfRevocation = record;
-      emitMeshDiagnostic({
-        kind: "revoke:self-targeted",
-        issuerId: record.issuerPeerId,
-        ...record.reason !== undefined && { reason: record.reason },
-        issuedAt: record.issuedAt
-      });
-      return;
-    }
-    if (keyring2.revokedPeers.has(record.revokedPeerId)) {
-      storeRevocation(record, body);
-      emitMeshDiagnostic({
-        kind: "revoke:duplicate",
-        revokedPeerId: record.revokedPeerId,
-        issuerId: record.issuerPeerId
-      });
-      return;
+    switch (classifyIncomingRevocation(record, localPeerId, keyring2.revokedPeers)) {
+      case "self":
+        selfRevocation = record;
+        emitMeshDiagnostic({
+          kind: "revoke:self-targeted",
+          issuerId: record.issuerPeerId,
+          ...record.reason !== undefined && { reason: record.reason },
+          issuedAt: record.issuedAt
+        });
+        return;
+      case "duplicate":
+        storeRevocation(record, body);
+        emitMeshDiagnostic({
+          kind: "revoke:duplicate",
+          revokedPeerId: record.revokedPeerId,
+          issuerId: record.issuerPeerId
+        });
+        return;
+      case "apply":
+        applyRevocation(record, keyring2);
+        storeRevocation(record, body);
+        emitMeshDiagnostic({ kind: "revoke:applied", revokedPeerId: record.revokedPeerId });
+        return;
     }
-    applyRevocation(record, keyring2);
-    storeRevocation(record, body);
-    emitMeshDiagnostic({ kind: "revoke:applied", revokedPeerId: record.revokedPeerId });
   };
   const handleRevocationSummary = (body, senderId) => {
     let summary;
@@ -3895,12 +3939,9 @@ async function createMeshClient(options) {
       });
       return;
     }
-    const remoteKeys = new Set(summary.map((entry) => entry.revokedPeerId));
     const senderPeerId = senderId;
-    for (const stored of revocationStore.values()) {
-      if (remoteKeys.has(stored.entry.revokedPeerId))
-        continue;
-      networkAdapter.sendControlMessage(MESH_CONTROL_TYPE.Revocation, stored.bytes, [senderPeerId]);
+    for (const bytes of revocationsMissingFromSummary(revocationStore, summary)) {
+      networkAdapter.sendControlMessage(MESH_CONTROL_TYPE.Revocation, bytes, [senderPeerId]);
     }
   };
   const networkAdapter = new MeshNetworkAdapter({
@@ -4310,4 +4351,4 @@ export {
   $meshCounter
 };
 
-//# debugId=0D84EA4EDCC2765464756E2164756E21
+//# debugId=7FA8CE30CEE539D264756E2164756E21