@blockcast/mmt-container 2.0.0 → 2.0.1

package/dist/no-modules.js

@@ -11454,7 +11454,6 @@ _RistrettoPoint.Fn = /* @__PURE__ */ (() => Fn)();
 var BCPV2_LEAD_BOUND_MS = 5e3;
 var REPLAY_WINDOW = 64n;
 var BUCKET_DEPTH = 64;
-var BUCKET_RATE_PER_MS = 1;
 var hex = (bytes) => Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
 function sameBytes(a, b) {
   if (a.byteLength !== b.byteLength)
@@ -11483,6 +11482,10 @@ var BcProvenanceV2Receiver = class {
   verifySig;
   accepted;
   queueLimit;
+  /** Octets a held datagram is charged beyond its payload: the IPv4 or IPv6 plus UDP headers (step 2). */
+  headerOctets;
+  /** Budget refill, tokens per ms: V / 1000 (step 1). */
+  bucketRatePerMs;
   current = null;
   previous = null;
   graceStart = {};
@@ -11528,6 +11531,8 @@ var BcProvenanceV2Receiver = class {
       multicast: this.maxAuthDelayMs * bandwidth / 8e3,
       unicast: (this.maxAuthDelayMs + this.widenMs) * bandwidth / 8e3
     };
+    this.headerOctets = parseBcProvenanceV2Address(cfg.endpoint.groupAddress).byteLength === 16 ? 48 : 28;
+    this.bucketRatePerMs = Math.max(1e3, 1.25 * bandwidth / (8 * 512 * 37)) / 1e3;
     const t = this.now();
     this.buckets = {
       multicast: { tokens: BUCKET_DEPTH, last: t, dropped: 0 },
@@ -11626,7 +11631,7 @@ var BcProvenanceV2Receiver = class {
       arrival: now,
       sent,
       digest: hex(sha2562(bytes)),
-      pairs: record.digests.map((d, i) => ({ digest: hex(d), seq: record.firstSeq + BigInt(i), admitted: false })),
+      pairs: record.digests.map((d, i) => ({ digest: hex(d), epoch, seq: record.firstSeq + BigInt(i), admitted: false })),
       awaitingMulticast: path === "mirror"
     };
     this.verified.set(id, entry);
@@ -11693,12 +11698,12 @@ var BcProvenanceV2Receiver = class {
   digest(datagram) {
     return hex(bcProvenanceV2DatagramDigest(this.cfg.endpoint, datagram));
   }
-  /** Consume the lowest-seq pending entry for `digest`, admitting it. */
+  /** Consume the pending entry for `digest` lowest in (epoch, sequence) order, admitting it. */
   consumePending(digest, now) {
     const list = this.pending.get(digest);
     if (!list?.length)
       return false;
-    list.sort((a, b) => a.pair.seq < b.pair.seq ? -1 : a.pair.seq > b.pair.seq ? 1 : 0);
+    list.sort((a, b) => a.pair.epoch - b.pair.epoch || (a.pair.seq < b.pair.seq ? -1 : a.pair.seq > b.pair.seq ? 1 : 0));
     const hit = list.shift();
     if (list.length === 0)
       this.pending.delete(digest);
@@ -11707,14 +11712,18 @@ var BcProvenanceV2Receiver = class {
     this.admittedUntil.set(digest, now + this.maxAuthDelayMs + this.leadMs);
     return true;
   }
+  /** A held datagram's charge against its queue: payload plus IP and UDP headers. */
+  charge(held) {
+    return held.datagram.byteLength + this.headerOctets;
+  }
   enqueue(held, path, now) {
-    if (this.holdBytes[path] + held.datagram.byteLength > this.queueLimit[path]) {
+    if (this.holdBytes[path] + this.charge(held) > this.queueLimit[path]) {
       return { verdict: "overflow", admitted: [] };
     }
     held.expiry = now + this.maxAuthDelayMs + (path === "unicast" ? this.widenMs : 0);
     held.order = this.order++;
     this.hold[path].push(held);
-    this.holdBytes[path] += held.datagram.byteLength;
+    this.holdBytes[path] += this.charge(held);
     return { verdict: "held", admitted: [] };
   }
   /** Remove and return the oldest held datagram with `digest`, across both queues. */
@@ -11729,7 +11738,7 @@ var BcProvenanceV2Receiver = class {
     if (!best)
       return void 0;
     const [held] = this.hold[best.path].splice(best.index, 1);
-    this.holdBytes[best.path] -= held.datagram.byteLength;
+    this.holdBytes[best.path] -= this.charge(held);
     return held.datagram;
   }
   dropAdmittedHeld() {
@@ -11737,7 +11746,7 @@ var BcProvenanceV2Receiver = class {
       this.hold[path] = this.hold[path].filter((h) => {
         const keep = h.digest === void 0 || !this.admittedUntil.has(h.digest);
         if (!keep)
-          this.holdBytes[path] -= h.datagram.byteLength;
+          this.holdBytes[path] -= this.charge(h);
         return keep;
       });
     }
@@ -11821,7 +11830,7 @@ var BcProvenanceV2Receiver = class {
   }
   take(path, now) {
     const b = this.buckets[path];
-    b.tokens = Math.min(BUCKET_DEPTH, b.tokens + (now - b.last) * BUCKET_RATE_PER_MS);
+    b.tokens = Math.min(BUCKET_DEPTH, b.tokens + (now - b.last) * this.bucketRatePerMs);
     b.last = now;
     if (b.tokens < 1) {
       b.dropped++;
@@ -11835,7 +11844,7 @@ var BcProvenanceV2Receiver = class {
       this.hold[path] = this.hold[path].filter((h) => {
         if (h.expiry > now)
           return true;
-        this.holdBytes[path] -= h.datagram.byteLength;
+        this.holdBytes[path] -= this.charge(h);
         this.expired[path]++;
         return false;
       });