@blockcast/mmt-container 2.1.0 → 2.2.0-main.050b52fb9b00

package/dist/iso-block-locator.d.ts

@@ -32,16 +32,28 @@ export type IsoRepairPlacement<T> = {
         readonly lostSsId: number;
     };
 }
-/** Not a block this stream can use; the repair symbol is dropped. */
+/**
+ * Not a block this stream can use; the repair symbol is dropped. `ofSpan` is
+ * set when the repair stated only the first block of that repair-less span:
+ * the span holds more than one block, so no single repair group completes it.
+ */
  | {
     readonly status: 'conflict' | 'overlap' | 'stale' | 'ahead';
     readonly reason: string;
+    readonly ofSpan?: IsoBlockRange;
 };
 /**
  * Retention: the locator is never without one. Every call that can grow it
  * (`hold`, `placeRepair`) retires, behind the position it just saw, every
  * block, span and held source more than `retentionBlocks` blocks back, by the
- * one ISO horizon metric (`isoBlocksBehindLowerBound`). A block is measured
+ * one ISO horizon metric (`isoBlocksBehindLowerBound`). A held source stays
+ * while a pending hole holding it does: the hole's repair FETCH may still
+ * state its block, and closing the hole places it, so the span it leaves
+ * counts every source it received (BLO-52085). A pending hole the horizon
+ * passes stops being pending (its blocks can no longer be stated, and the
+ * release gate no longer waits for it), but keeps its sources until its
+ * owner closes it (`takeExpiredHoles`), so it still fails as the span it
+ * is. A block is measured
  * from its last SS_ID, so it stays while any SS_ID of it is inside the
  * horizon: a repair-less span has no length bound, and one measured from its
  * start could be retired the moment it is created, before the sources it
@@ -82,6 +94,15 @@ export declare class IsoBlockLocator<T> {
     get newest(): number | undefined;
     /** Advance `newest` to `position` if it is newer; retires nothing. */
     observe(position: number): void;
+    /**
+     * The newest source SS_ID noted with `noteSource` (RFC 1982 order). Unlike
+     * `newest`, a repair never moves it: a repair can run ahead of its sources,
+     * a source cannot run ahead of the sources sent before it except by
+     * reordering.
+     */
+    get newestSource(): number | undefined;
+    /** Note a received source's SS_ID; true when it is the newest one yet. */
+    noteSource(ssId: number): boolean;
     /** Held sources evicted by `heldCapacity` (never by the horizon itself). */
     get heldEvicted(): number;
     /** Number of known blocks and spans. */
@@ -95,8 +116,16 @@ export declare class IsoBlockLocator<T> {
         block: IsoBlockRange;
         esi: number;
     } | null;
-    /** Number of pending holes. */
+    /** Number of holes not closed yet, pending or past the horizon. */
     get holeCount(): number;
+    /**
+     * The pending holes the horizon has passed since the last call, in the
+     * order it passed them. Each is no longer pending: no repair states a block
+     * in it (that repair is `stale`, as for a span the horizon retired) and the
+     * release gate does not wait for it. Its owner must close it
+     * (`closeHolesWithin`), which turns it into a span that is not kept here.
+     */
+    takeExpiredHoles(): IsoBlockRange[];
     /** The stated block (never a span) ending exactly at `end`. */
     blockEndingAt(end: number): IsoBlockRange | undefined;
     /** The known block or span starting exactly at `start`. */
@@ -119,9 +148,11 @@ export declare class IsoBlockLocator<T> {
     /**
      * Apply one repair symbol's `(SS_Start, SSB_length)`. The first repair of a
      * block states its range and places every held source in it; later repair
-     * symbols of the same block change nothing. A range that contradicts a
-     * known block (a different length, or an overlap with another block or a
-     * span) fails closed: the repair symbol is dropped and no block changes.
+     * symbols of the same block change nothing. A repair whose range is exactly
+     * a repair-less span states that span's one block. A range that contradicts
+     * a known block (a different length, or an overlap with another block or
+     * with part of a span) fails closed: the repair symbol is dropped and no
+     * block changes.
      * A newly stated block retires behind its SS_Start (see the class note).
      * A block so far past `newest` that stating it would retire the position
      * `newest` is refused as `ahead`. When `newest` is a placed block's SS_Start
@@ -135,19 +166,23 @@ export declare class IsoBlockLocator<T> {
      */
     placeRepair(start: number, length: number): IsoRepairPlacement<T>;
     /**
-     * Turn every pending hole inside `[start, start + length)` into a
-     * repair-less span, claiming its held sources: its range FETCH ended, so
-     * nothing more will state its blocks. Returns the spans, in SS_ID order.
+     * Turn every hole inside `[start, start + length)` into a repair-less span,
+     * claiming its held sources: its range FETCH ended, so nothing more will
+     * state its blocks. A hole the horizon passed (`takeExpiredHoles`) leaves a
+     * span that is not kept among the blocks, as the horizon would retire it at
+     * once; only `locate` finds it, until the next retirement, so its sources
+     * can be fed. Returns the spans, in SS_ID order.
      */
     closeHolesWithin(start: number, length: number): {
         block: IsoBlockRange;
         placed: IsoPlacedSource<T>[];
     }[];
     /**
-     * Retire every block and span whose last SS_ID, and every held source,
-     * lies more than `retentionBlocks` blocks behind `position`, with the shared
-     * lower-bound metric (`isoBlocksBehindLowerBound`) every ISO interleave
-     * horizon uses. Returns the retired block starts.
+     * Retire every block and span whose last SS_ID, and every held source
+     * outside a hole, lies more than `retentionBlocks` blocks behind
+     * `position`, with the shared lower-bound metric (`isoBlocksBehindLowerBound`)
+     * every ISO interleave horizon uses; a pending hole so far behind expires
+     * (`takeExpiredHoles`). Returns the retired block starts.
      */
     retireBehind(position: number): number[];
     /** Forget everything (publisher restart, track reset). */

package/dist/iso-block-locator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"iso-block-locator.d.ts","sourceRoot":"","sources":["../src/iso-block-locator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"iso-block-locator.d.ts","sourceRoot":"","sources":["../src/iso-block-locator.ts"],"names":[],"mappings":"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"}

package/dist/iso-block-locator.js

@@ -71,6 +71,15 @@ var IsoBlockLocator = class _IsoBlockLocator {
     this.#heldEvicted = 0;
     /** Pending holes (see `deferIncompleteGaps`): unstated, sources still held. */
     this.#holes = [];
+    /** Holes the horizon passed while pending: sources held until closed. */
+    this.#expired = [];
+    /** Of `#expired`, those `takeExpiredHoles` has not handed out yet. */
+    this.#newlyExpired = [];
+    /**
+     * Spans closed from expired holes: behind the horizon, so kept only for
+     * `locate` while their sources are fed, until the next retirement.
+     */
+    this.#closedBehind = [];
     /**
      * Keep a gap that is missing a source as a pending hole rather than a span,
      * so a repair FETCHed for it (draft-ramadan-moq-fec §7.5) can still state
@@ -92,7 +101,11 @@ var IsoBlockLocator = class _IsoBlockLocator {
   #retentionBlocks;
   #heldEvicted;
   #newest;
+  #newestSource;
   #holes;
+  #expired;
+  #newlyExpired;
+  #closedBehind;
   static #checkedRetention(retentionBlocks) {
     if (!Number.isSafeInteger(retentionBlocks) || retentionBlocks <= 0) {
       throw new Error(
@@ -129,6 +142,21 @@ var IsoBlockLocator = class _IsoBlockLocator {
   observe(position) {
     if (this.#newest === void 0 || serial32Precedes(this.#newest, position)) this.#newest = position;
   }
+  /**
+   * The newest source SS_ID noted with `noteSource` (RFC 1982 order). Unlike
+   * `newest`, a repair never moves it: a repair can run ahead of its sources,
+   * a source cannot run ahead of the sources sent before it except by
+   * reordering.
+   */
+  get newestSource() {
+    return this.#newestSource;
+  }
+  /** Note a received source's SS_ID; true when it is the newest one yet. */
+  noteSource(ssId) {
+    if (this.#newestSource !== void 0 && !serial32Precedes(this.#newestSource, ssId)) return false;
+    this.#newestSource = ssId;
+    return true;
+  }
   /** Held sources evicted by `heldCapacity` (never by the horizon itself). */
   get heldEvicted() {
     return this.#heldEvicted;
@@ -147,17 +175,29 @@ var IsoBlockLocator = class _IsoBlockLocator {
   }
   /** The known block or span containing `ssId`, with its ESI. */
   locate(ssId) {
-    for (let i = this.#blocks.length - 1; i >= 0; i--) {
-      const block = this.#blocks[i];
-      if (isoBlockContains(block.start, block.length, ssId)) {
-        return { block, esi: serial32Distance(block.start, ssId) };
+    for (const blocks of [this.#blocks, this.#closedBehind]) {
+      for (let i = blocks.length - 1; i >= 0; i--) {
+        const block = blocks[i];
+        if (isoBlockContains(block.start, block.length, ssId)) {
+          return { block, esi: serial32Distance(block.start, ssId) };
+        }
       }
     }
     return null;
   }
-  /** Number of pending holes. */
+  /** Number of holes not closed yet, pending or past the horizon. */
   get holeCount() {
-    return this.#holes.length;
+    return this.#holes.length + this.#expired.length;
+  }
+  /**
+   * The pending holes the horizon has passed since the last call, in the
+   * order it passed them. Each is no longer pending: no repair states a block
+   * in it (that repair is `stale`, as for a span the horizon retired) and the
+   * release gate does not wait for it. Its owner must close it
+   * (`closeHolesWithin`), which turns it into a span that is not kept here.
+   */
+  takeExpiredHoles() {
+    return this.#newlyExpired.splice(0);
   }
   /** The stated block (never a span) ending exactly at `end`. */
   blockEndingAt(end) {
@@ -213,9 +253,11 @@ var IsoBlockLocator = class _IsoBlockLocator {
   /**
    * Apply one repair symbol's `(SS_Start, SSB_length)`. The first repair of a
    * block states its range and places every held source in it; later repair
-   * symbols of the same block change nothing. A range that contradicts a
-   * known block (a different length, or an overlap with another block or a
-   * span) fails closed: the repair symbol is dropped and no block changes.
+   * symbols of the same block change nothing. A repair whose range is exactly
+   * a repair-less span states that span's one block. A range that contradicts
+   * a known block (a different length, or an overlap with another block or
+   * with part of a span) fails closed: the repair symbol is dropped and no
+   * block changes.
    * A newly stated block retires behind its SS_Start (see the class note).
    * A block so far past `newest` that stating it would retire the position
    * `newest` is refused as `ahead`. When `newest` is a placed block's SS_Start
@@ -234,7 +276,16 @@ var IsoBlockLocator = class _IsoBlockLocator {
     const known = this.blockAt(start);
     if (known !== void 0) {
       if (known.span) {
-        return { status: "overlap", reason: `repair block ${start}+${length} falls inside a repair-less span` };
+        if (known.length === length) {
+          const block2 = { start, length, span: false };
+          this.#blocks[this.#blocks.indexOf(known)] = block2;
+          return { status: "placed", block: block2, placed: [] };
+        }
+        return length < known.length ? {
+          status: "overlap",
+          reason: `repair block ${start}+${length} is only the first block of repair-less span ${known.start}+${known.length}`,
+          ofSpan: known
+        } : { status: "overlap", reason: `repair block ${start}+${length} runs past repair-less span ${known.start}+${known.length}` };
       }
       if (known.length !== length) {
         return {
@@ -302,18 +353,28 @@ var IsoBlockLocator = class _IsoBlockLocator {
     return span === void 0 ? { status: "placed", block, placed } : { status: "placed", block, placed, span };
   }
   /**
-   * Turn every pending hole inside `[start, start + length)` into a
-   * repair-less span, claiming its held sources: its range FETCH ended, so
-   * nothing more will state its blocks. Returns the spans, in SS_ID order.
+   * Turn every hole inside `[start, start + length)` into a repair-less span,
+   * claiming its held sources: its range FETCH ended, so nothing more will
+   * state its blocks. A hole the horizon passed (`takeExpiredHoles`) leaves a
+   * span that is not kept among the blocks, as the horizon would retire it at
+   * once; only `locate` finds it, until the next retirement, so its sources
+   * can be fed. Returns the spans, in SS_ID order.
    */
   closeHolesWithin(start, length) {
     const closed = [];
-    for (const hole of [...this.#holes]) {
-      if (!isoBlockContains(start, length, hole.start)) continue;
-      this.#holes.splice(this.#holes.indexOf(hole), 1);
-      const spanBlock = { start: hole.start, length: hole.length, span: true };
-      closed.push({ block: spanBlock, placed: this.#claim(spanBlock) });
-      this.#blocks.push(spanBlock);
+    for (const holes of [this.#holes, this.#expired]) {
+      for (const hole of [...holes]) {
+        if (!isoBlockContains(start, length, hole.start)) continue;
+        holes.splice(holes.indexOf(hole), 1);
+        const spanBlock = { start: hole.start, length: hole.length, span: true };
+        closed.push({ block: spanBlock, placed: this.#claim(spanBlock) });
+        if (holes === this.#holes) {
+          this.#blocks.push(spanBlock);
+        } else {
+          this.#closedBehind.push(spanBlock);
+          if (this.#newlyExpired.includes(hole)) this.#newlyExpired.splice(this.#newlyExpired.indexOf(hole), 1);
+        }
+      }
     }
     return closed.sort((x, y) => serial32Distance(start, x.block.start) - serial32Distance(start, y.block.start));
   }
@@ -327,15 +388,17 @@ var IsoBlockLocator = class _IsoBlockLocator {
     return void 0;
   }
   /**
-   * Retire every block and span whose last SS_ID, and every held source,
-   * lies more than `retentionBlocks` blocks behind `position`, with the shared
-   * lower-bound metric (`isoBlocksBehindLowerBound`) every ISO interleave
-   * horizon uses. Returns the retired block starts.
+   * Retire every block and span whose last SS_ID, and every held source
+   * outside a hole, lies more than `retentionBlocks` blocks behind
+   * `position`, with the shared lower-bound metric (`isoBlocksBehindLowerBound`)
+   * every ISO interleave horizon uses; a pending hole so far behind expires
+   * (`takeExpiredHoles`). Returns the retired block starts.
    */
   retireBehind(position) {
     this.observe(position);
     const horizon = this.#retentionBlocks;
     const retired = [];
+    this.#closedBehind.length = 0;
     for (let i = this.#blocks.length - 1; i >= 0; i--) {
       const block = this.#blocks[i];
       const last = serial32Add(block.start, block.length - 1);
@@ -347,10 +410,15 @@ var IsoBlockLocator = class _IsoBlockLocator {
     for (let i = this.#holes.length - 1; i >= 0; i--) {
       const hole = this.#holes[i];
       const last = serial32Add(hole.start, hole.length - 1);
-      if (isoBlocksBehindLowerBound(last, position, this.#kMax) > horizon) this.#holes.splice(i, 1);
+      if (isoBlocksBehindLowerBound(last, position, this.#kMax) <= horizon) continue;
+      this.#holes.splice(i, 1);
+      this.#expired.push(hole);
+      this.#newlyExpired.push(hole);
     }
     for (const ssId of [...this.#held.keys()]) {
-      if (isoBlocksBehindLowerBound(ssId, position, this.#kMax) > horizon) this.#held.delete(ssId);
+      if (isoBlocksBehindLowerBound(ssId, position, this.#kMax) > horizon && !this.#holes.some((hole) => isoBlockContains(hole.start, hole.length, ssId)) && !this.#expired.some((hole) => isoBlockContains(hole.start, hole.length, ssId))) {
+        this.#held.delete(ssId);
+      }
     }
     return retired;
   }
@@ -358,9 +426,13 @@ var IsoBlockLocator = class _IsoBlockLocator {
   reset() {
     this.#blocks.length = 0;
     this.#holes.length = 0;
+    this.#expired.length = 0;
+    this.#newlyExpired.length = 0;
+    this.#closedBehind.length = 0;
     this.#held.clear();
     this.#coverageEnd = void 0;
     this.#newest = void 0;
+    this.#newestSource = void 0;
   }
   #claim(block) {
     const placed = [];