@blockcast/mmt-container 2.0.0 → 2.0.1-main.57647cd30645

package/dist/mmtp-container-parser.no-modules.js

@@ -11633,7 +11633,6 @@ var BlockcastMmt = (() => {
   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)
@@ -11663,6 +11662,10 @@ var BlockcastMmt = (() => {
       __publicField(this, "verifySig");
       __publicField(this, "accepted");
       __publicField(this, "queueLimit");
+      /** Octets a held datagram is charged beyond its payload: the IPv4 or IPv6 plus UDP headers (step 2). */
+      __publicField(this, "headerOctets");
+      /** Budget refill, tokens per ms: V / 1000 (step 1). */
+      __publicField(this, "bucketRatePerMs");
       __publicField(this, "current", null);
       __publicField(this, "previous", null);
       __publicField(this, "graceStart", {});
@@ -11707,6 +11710,8 @@ var BlockcastMmt = (() => {
         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 },
@@ -11806,7 +11811,7 @@ var BlockcastMmt = (() => {
         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);
@@ -11873,12 +11878,12 @@ var BlockcastMmt = (() => {
     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);
@@ -11887,14 +11892,18 @@ var BlockcastMmt = (() => {
       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. */
@@ -11909,7 +11918,7 @@ var BlockcastMmt = (() => {
       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() {
@@ -11917,7 +11926,7 @@ var BlockcastMmt = (() => {
         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;
         });
       }
@@ -12002,7 +12011,7 @@ var BlockcastMmt = (() => {
     }
     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++;
@@ -12016,7 +12025,7 @@ var BlockcastMmt = (() => {
         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;
         });