@blockcast/fec-worker 0.1.0 → 0.3.0-main.d9354616fdf2

package/src/fec-worker.ts

@@ -18,20 +18,41 @@ import type {
 	FecTrackStats,
 	FecBlockSnapshot,
 	FrameMeta,
+	FecBlockProfile,
 } from "./fec-worker-types.js";
 import { toOwnedArrayBuffer } from "./transfer.js";
+import {
+	blockPrecedes,
+	blocksBehind,
+	isoBlockContains,
+	isoBlocksBehind,
+	isoBlocksOverlap,
+	serialDistance,
+	serialPrecedes,
+} from "./block-order.js";
 
 // --- WASM binding types (from mmt-wasm) ---
 // Signatures MUST match a freshly generated external mmt_wasm.d.ts exactly.
 // The decoder derives SBN/ESI internally — do not pre-compute.
 interface WasmFecDecoder {
-	/** ISO 23008-1 §C.5.2: ss_id is the flat 32-bit Source Symbol ID. */
+	/**
+	 * ISO 23008-1 §C.5.2: ss_id is the flat 32-bit Source Symbol ID.
+	 * `k-padded-v1`: data is the source symbol. `iso-ssbg1-v1`: data is the
+	 * protected packet, unpadded; the decoder builds the ssbg_mode1 symbol and
+	 * holds it until a repair names the block containing it.
+	 */
 	add_source(
 		ss_id: number,
 		data: Uint8Array,
 		timestamp: number,
 	): Uint8Array | undefined;
-	/** ISO 23008-1 §C.5.3: repair ESI = ssb_length + rs_id, SBN = ss_start / ssb_length. */
+	/**
+	 * ISO 23008-1 §C.5.3. `k-padded-v1`: repair ESI = configured K + rs_id,
+	 * SBN = ss_start / configured K. `iso-ssbg1-v1`: the block is
+	 * `[ss_start, ss_start + ssb_length)` with K' = ssb_length and repair
+	 * ESI = ssb_length + rs_id; a recovered block is ssb_length x T bytes of
+	 * ssbg_mode1 symbols.
+	 */
 	add_repair(
 		ss_start: number,
 		ssb_length: number,
@@ -40,10 +61,25 @@ interface WasmFecDecoder {
 		timestamp: number,
 	): Uint8Array | undefined;
 	configure_params(k: number, symbolSize: number): void;
-	/** Block-scoped counterpart driven by the manager's exact deadlines. */
-	cleanup_blocks_detailed(sbns: Uint32Array): Uint8Array;
-	/** Remove decoder blocks below its configured live-SBN interleave horizon. */
+	/**
+	 * Retire the named blocks (last-chance decode + stats), driven by the
+	 * manager's exact deadlines. Nothing is synthesised for a lost block:
+	 * concealment is the sink's hold-last-good-frame.
+	 */
+	cleanup_blocks_detailed(sbns: Uint32Array): void;
+	/**
+	 * `k-padded-v1` only (throws under `iso-ssbg1-v1`): remove decoder blocks
+	 * below its configured live-SBN interleave horizon; returns their SBNs.
+	 */
 	cleanup_by_sbn(current_sbn: number): Uint32Array;
+	/**
+	 * `iso-ssbg1-v1` only: remove decoder blocks, and held unplaced sources,
+	 * more than interleaveDepth `isoBlocksBehind` the live SS_ID; returns the
+	 * SS_Starts of the blocks it removed.
+	 */
+	cleanup_by_ss_start(current: number): Uint32Array;
+	/** The block profile the decoder was constructed with. */
+	get_block_profile(): string;
 	flush(): void;
 	pending_blocks(): number;
 	reset_stats(): void;
@@ -61,10 +97,7 @@ interface WasmFecDecoder {
 
 interface WasmBindings {
 	initSync(module: { module: WebAssembly.Module }): unknown;
-	MmtFecDecoder: new (
-		interleaveDepth: number,
-		greenFillEnabled: boolean,
-	) => WasmFecDecoder;
+	MmtFecDecoder: new (interleaveDepth: number, blockProfile: FecBlockProfile) => WasmFecDecoder;
 }
 
 // --- Worker state (local to this Worker instance) ---
@@ -75,13 +108,22 @@ let altaEnabled = false;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 let altaVerifier: any = null;  // JsAltaVerifier instance (loaded from ALTA WASM)
 let snapshotTimer: ReturnType<typeof setInterval> | null = null;
+// blockUpdate events are posted only after a client subscribes (BLO-36599).
+let blockUpdatesSubscribed = false;
 
 // Block tracking
 const blocks = new Map<number, FecBlockSnapshot>();
 const acceptedSourceEsis = new Map<number, Set<number>>();
 const acceptedRepairEsis = new Map<number, Set<number>>();
+// iso-ssbg1-v1: sources fed to the decoder before any repair named a block
+// containing them, keyed by SS_ID with their arrival time. Map order is
+// arrival order, which the horizon sweep relies on (retireUnplacedSources).
+const unplacedSources = new Map<number, number>();
 const UINT32_MAX = 0xffff_ffff;
 const UINT24_MAX = 0xff_ffff;
+const SS_ID_SPAN = 0x1_0000_0000;
+// ISO/IEC 23008-1 C.3.3 ssbg_mode1: the two-octet protected-packet length field.
+const SSBG1_LENGTH_FIELD_BYTES = 2;
 // ISO/IEC 23008-1 AL-FEC signaling carries interleave_depth in one byte.
 const MAX_INTERLEAVE_DEPTH = 0xff;
 // Rust stores T as u16 and this decoder profile fixes RFC 6330 Al=8.
@@ -95,7 +137,6 @@ let repairSymbols = 0;
 let blocksComplete = 0;
 let blocksRecovered = 0;
 let blocksFailed = 0;
-let greenFillFrames = 0;
 let altaVerified = 0;
 let altaFailed = 0;            // Crypto-confirmed tamper (MAC / sig / hash chain mismatch)
 const altaFailedDetails: Array<{
@@ -113,11 +154,36 @@ let altaInitFailed = false;    // ALTA configured but WASM init failed; altaEnab
 let relayBlocksVerified = 0;
 let relayBlocksFailed = 0;
 let liveSbn = 0;
-// Highest SBN that has fallen strictly below the decoder's retained
-// interleave window. Numeric ordering is per decoder epoch; reset/configure
-// starts a new epoch before the 32-bit source-symbol counter can wrap.
-let retiredSbnFrontier = -1;
+// Whether liveSbn has been set by a symbol of this decoder epoch. Block order
+// is serial on the 32-bit SS_ID (block-order.ts, BLO-35597 iso:5), where 0 is
+// a real position, so "nothing seen yet" needs its own state.
+let liveSbnKnown = false;
 let repairSymbolSizeMismatch = 0;
+// Source symbols dropped before WASM, by cause. All three sites below were
+// silent, which left the "block settles at exactly K-1 source symbols" shape
+// (BLO-35597 defect 2) with no evidence to attribute it to. A retired drop
+// means a late symbol past retention; a terminal drop means the block had
+// already settled — `state !== "collecting"`, so complete OR recovered OR
+// FAILED, and the failed arm is the one this issue is chasing (a block aged out
+// by synchronizeDecoderHorizon stays in `blocks` until its SBN retires, so a
+// late symbol for a short block lands here); a duplicate drop means a repeated
+// (SBN, ESI), which on this wire is usually a plain duplicate packet — the
+// router's ledger has deliberate gaps — and only sometimes an SBN/ESI
+// derivation collision.
+//
+// These narrow the cause; they do not uniquely attribute it. A symbol LOST IN
+// TRANSIT never reaches handleFeedSource and increments nothing, so all three
+// reading zero on a short block is NOT evidence of a publisher defect — wire
+// loss is the null hypothesis here, and it produces an identical shape. The
+// discriminator for that residual arm is `block.ssbLength` (set at the repair
+// symbol's declared SSB_length, conflict-checked on arrival):
+//   ssbLength < k                        → genuinely short authored block
+//   ssbLength === k, sourceReceived < k  → loss or a still-late symbol
+// With no repair symbol yet seen, ssbLength is undefined and both stay open.
+let sourceDroppedRetired = 0;
+let sourceDroppedTerminal = 0;
+let sourceDroppedDuplicate = 0;
+let sourceUnplacedRetired = 0;
 
 // Recovery timing
 const recoveryTimes: number[] = [];
@@ -174,10 +240,60 @@ function clearBlockTracking(): void {
 	blocks.clear();
 	acceptedSourceEsis.clear();
 	acceptedRepairEsis.clear();
+	unplacedSources.clear();
 	pendingVerify.clear();
 	recoveryTimes.length = 0;
 	liveSbn = 0;
-	retiredSbnFrontier = -1;
+	liveSbnKnown = false;
+}
+
+/**
+ * Whether `sbn` has fallen behind the decoder's retained interleave window:
+ * more than `interleaveDepth` blocks behind the live SBN. liveSbn only moves
+ * forward within a decoder epoch and configure() resets both, so this is the
+ * monotonic retirement frontier the decoder horizon implies.
+ */
+function isRetiredSbn(sbn: number): boolean {
+	if (config === null || !liveSbnKnown) return false;
+	// iso-ssbg1-v1: `sbn` is an SS_ID (a block's SS_Start or a source's own
+	// SS_ID) and liveSbn the live SS_ID; K is only the maximum block length.
+	return config.blockProfile === "iso-ssbg1-v1"
+		? isoBlocksBehind(sbn, liveSbn, config.k) > config.interleaveDepth
+		: blocksBehind(sbn, liveSbn, config.k) > config.interleaveDepth;
+}
+
+function isIsoProfile(): boolean {
+	return config?.blockProfile === "iso-ssbg1-v1";
+}
+
+/**
+ * iso-ssbg1-v1: the SS_IDs a known block certainly covers. Every block a
+ * repair created has its SSB_length; a cleanup tombstone for a block no
+ * repair declared certainly holds only its own SS_Start.
+ */
+function isoKnownLength(block: FecBlockSnapshot): number {
+	return block.ssbLength ?? 1;
+}
+
+/** iso-ssbg1-v1: the known block whose SS_ID range contains `ssId` (ranges never overlap). */
+function findIsoBlock(ssId: number): FecBlockSnapshot | undefined {
+	for (const block of blocks.values()) {
+		if (isoBlockContains(block.sbn, isoKnownLength(block), ssId)) return block;
+	}
+	return undefined;
+}
+
+/**
+ * Whether a terminal block's diagnostics may be deleted. Under iso-ssbg1-v1 a
+ * source carries no block identity, so a deleted block cannot refuse a late
+ * source of its own: that source would be admitted as unplaced and reopen the
+ * block in the decoder. The tombstone therefore stays until its LAST SS_ID is
+ * retired, after which the SS_ID retirement check refuses every member.
+ */
+function isRetiredBlock(key: number, block: FecBlockSnapshot): boolean {
+	return isIsoProfile()
+		? isRetiredSbn((key + isoKnownLength(block) - 1) % SS_ID_SPAN)
+		: isRetiredSbn(key);
 }
 
 /**
@@ -188,17 +304,23 @@ function clearBlockTracking(): void {
  */
 function trimBlockRetention(): void {
 	for (const [sbn, block] of blocks) {
-		if (!isTerminalBlock(block) || sbn > retiredSbnFrontier) continue;
+		if (!isTerminalBlock(block) || !isRetiredBlock(sbn, block)) continue;
 		blocks.delete(sbn);
 		retireAcceptedIds(sbn);
 	}
 }
 
+/** Advance the live position: an SBN (k-padded-v1) or an SS_ID / SS_Start (iso-ssbg1-v1). */
 function advanceMediaHorizon(sbn: number): void {
-	if (!config || sbn <= liveSbn) return;
+	if (!config) return;
+	if (liveSbnKnown) {
+		const ahead = config.blockProfile === "iso-ssbg1-v1"
+			? serialPrecedes(liveSbn, sbn)
+			: blockPrecedes(liveSbn, sbn, config.k);
+		if (!ahead) return;
+	}
 	liveSbn = sbn;
-	const firstRetainedSbn = Math.max(0, liveSbn - config.interleaveDepth);
-	retiredSbnFrontier = Math.max(retiredSbnFrontier, firstRetainedSbn - 1);
+	liveSbnKnown = true;
 	trimBlockRetention();
 }
 
@@ -213,8 +335,11 @@ function markBlockTerminal(
 }
 
 function synchronizeDecoderHorizon(): void {
-	if (!wasmDecoder) return;
-	const expired = wasmDecoder.cleanup_by_sbn(liveSbn);
+	if (!wasmDecoder || !liveSbnKnown) return;
+	const iso = isIsoProfile();
+	const expired = iso
+		? wasmDecoder.cleanup_by_ss_start(liveSbn)
+		: wasmDecoder.cleanup_by_sbn(liveSbn);
 	for (const sbn of expired) {
 		const block = blocks.get(sbn);
 		if (!block || isTerminalBlock(block)) {
@@ -225,9 +350,29 @@ function synchronizeDecoderHorizon(): void {
 		blocksFailed++;
 		emitBlockUpdate(block);
 	}
+	if (iso) retireUnplacedSources();
 	trimBlockRetention();
 }
 
+/**
+ * iso-ssbg1-v1: retire unplaced sources behind the horizon, by the same
+ * isoBlocksBehind metric as a block start, sweeping in arrival order and
+ * stopping at the first live one (amortised O(1) per symbol). A source that
+ * arrived out of order behind a newer live one is retired when it reaches the
+ * front; until then nothing can place it, because any repair range holding it
+ * starts at or before it and is itself retired. One the live position moved
+ * at least half the SS_ID space past no longer precedes it serially; it is
+ * retired too rather than pinning the sweep.
+ */
+function retireUnplacedSources(): void {
+	for (const ssId of unplacedSources.keys()) {
+		const unreachable = ssId !== liveSbn && !serialPrecedes(ssId, liveSbn);
+		if (!unreachable && !isRetiredSbn(ssId)) break;
+		unplacedSources.delete(ssId);
+		sourceUnplacedRetired++;
+	}
+}
+
 /**
  * Run detached ALTA verify against the current verifier. Four-state result:
  *   - "valid":   crypto passed, packet authentic. Caller increments altaVerified.
@@ -385,7 +530,11 @@ function drainPendingVerify(): void {
 	}
 }
 
-function getOrCreateBlock(sbn: number): FecBlockSnapshot {
+/**
+ * Look up or create a block. `isoSsbLength` creates an iso-ssbg1-v1 block,
+ * whose K' is its SSB_length (C.5.3); without it the block has the catalog K.
+ */
+function getOrCreateBlock(sbn: number, isoSsbLength?: number): FecBlockSnapshot {
 	let block = blocks.get(sbn);
 	if (!block) {
 		if (!config) throw new Error("[FecWorker] not configured");
@@ -395,7 +544,7 @@ function getOrCreateBlock(sbn: number): FecBlockSnapshot {
 			state: "collecting",
 			sourceReceived: 0,
 			repairReceived: 0,
-			k: config.k,
+			k: isoSsbLength ?? config.k,
 			repairCount: config.repairCount,
 			firstSymbolTs: now,
 			lastSymbolTs: now,
@@ -403,6 +552,7 @@ function getOrCreateBlock(sbn: number): FecBlockSnapshot {
 			altaVerified: 0,
 			relayBlockSigValid: null,
 		};
+		if (isoSsbLength !== undefined) block.ssbLength = isoSsbLength;
 		blocks.set(sbn, block);
 		trimBlockRetention();
 	}
@@ -444,7 +594,6 @@ function buildStatsSnapshot(): FecTrackStats {
 		blocksComplete,
 		blocksRecovered,
 		blocksFailed,
-		greenFillFrames,
 		recoveryRate:
 			blocksComplete + blocksRecovered > 0
 				? Math.round(
@@ -468,6 +617,10 @@ function buildStatsSnapshot(): FecTrackStats {
 		avgRecoveryMs: Math.round(avgRecoveryMs * 100) / 100,
 		maxRecoveryMs: Math.round(maxRecoveryMs * 100) / 100,
 		repairSymbolSizeMismatch,
+		sourceDroppedRetired,
+		sourceDroppedTerminal,
+		sourceDroppedDuplicate,
+		...(config.blockProfile === "iso-ssbg1-v1" ? { sourceUnplacedRetired } : {}),
 		decoder,
 	};
 }
@@ -478,6 +631,7 @@ function emitSnapshot(): void {
 }
 
 function emitBlockUpdate(block: FecBlockSnapshot): void {
+	if (!blockUpdatesSubscribed) return;
 	emit({ type: "blockUpdate", block: { ...block } });
 }
 
@@ -496,17 +650,35 @@ function emitRecoveredSymbols(
 		});
 		return;
 	}
-	if (recoveredBlock.byteLength < symbolSize * config.k) {
+	// The decoder returns only the block's authored source symbols
+	// (SSB_length x T); the encoder's zero padding is not media.
+	const ssbLength = block.ssbLength ?? config.k;
+	if (recoveredBlock.byteLength !== symbolSize * ssbLength) {
 		emit({
 			type: "error",
 			code: "recovered-block-too-short",
-			message: `[FecWorker] recovered block too short: got ${recoveredBlock.byteLength}B, expected at least ${symbolSize * config.k}B`,
+			message: `[FecWorker] recovered block has the wrong length: got ${recoveredBlock.byteLength}B, expected ${symbolSize * ssbLength}B (SSB_length=${ssbLength})`,
 		});
 		return;
 	}
 
-	for (let i = 0; i < config.k; i++) {
+	const iso = config.blockProfile === "iso-ssbg1-v1";
+	for (let i = 0; i < ssbLength; i++) {
 		const symbol = recoveredBlock.subarray(i * symbolSize, (i + 1) * symbolSize);
+		// ssbg_mode1 symbols are emitted whole: the router trims them by their
+		// length field. A field past T-2 or non-zero padding means the
+		// recovered symbol is not what was sent, so it is refused, not trimmed.
+		if (iso) {
+			const invalid = invalidSsbg1Symbol(symbol, symbolSize);
+			if (invalid !== null) {
+				emit({
+					type: "error",
+					code: "recovered-ssbg1-symbol-invalid",
+					message: `[FecWorker] Dropping recovered ssbg_mode1 symbol (ssStart=${sbn}, esi=${i}, SSB_length=${ssbLength}): ${invalid}`,
+				});
+				continue;
+			}
+		}
 
 		// Source authentication now runs once at router admission in
 		// @blockcast/mmt-manifest-verify. The worker only records that this
@@ -520,11 +692,25 @@ function emitRecoveredSymbols(
 			recovered: true,
 			sbn,
 			esi: i,
+			ssbLength,
 		};
 		emit({ type: "frame", data: buf, meta }, [buf]);
 	}
 }
 
+/** Why a T-byte ssbg_mode1 symbol is malformed (C.3.3), or null when it is well formed. */
+function invalidSsbg1Symbol(symbol: Uint8Array, symbolSize: number): string | null {
+	const length = (symbol[0]! << 8) | symbol[1]!;
+	const maxLength = symbolSize - SSBG1_LENGTH_FIELD_BYTES;
+	if (length > maxLength) {
+		return `length field ${length} exceeds T-2 = ${maxLength}`;
+	}
+	for (let j = SSBG1_LENGTH_FIELD_BYTES + length; j < symbolSize; j++) {
+		if (symbol[j] !== 0) return `non-zero padding at byte ${j} after a ${length}-byte packet`;
+	}
+	return null;
+}
+
 function startSnapshotTimer(): void {
 	if (snapshotTimer !== null) clearInterval(snapshotTimer);
 	snapshotTimer = setInterval(() => emitSnapshot(), 200);
@@ -541,6 +727,253 @@ function resolveWasmBindings(): WasmBindings {
 	return bindings;
 }
 
+/**
+ * Refuse a decoder that does not run the configured block profile: one that
+ * ignored or predates the constructor argument would apply one profile's
+ * block math to the other's wire.
+ */
+function verifyDecoderProfile(decoder: WasmFecDecoder, expected: FecBlockProfile): void {
+	let actual: unknown;
+	try {
+		actual = decoder.get_block_profile();
+	} catch (err) {
+		decoder.free();
+		throw new Error(
+			`[FecWorker] configure: decoder cannot report its block profile (${err instanceof Error ? err.message : String(err)})`,
+		);
+	}
+	if (actual !== expected) {
+		decoder.free();
+		throw new Error(
+			`[FecWorker] configure: decoder runs block profile ${JSON.stringify(actual)}, not the configured "${expected}"`,
+		);
+	}
+}
+
+function acceptId(ids: Map<number, Set<number>>, key: number, id: number): void {
+	let set = ids.get(key);
+	if (!set) {
+		set = new Set<number>();
+		ids.set(key, set);
+	}
+	set.add(id);
+}
+
+/** A block the decoder returned: record its recovery and emit its source symbols. */
+function recordRecovered(key: number, block: FecBlockSnapshot, result: Uint8Array): void {
+	const recovered = new Uint8Array(toOwnedArrayBuffer(result));
+	const recoveryMs = performance.now() - block.firstSymbolTs;
+	recoveryTimes.push(recoveryMs);
+	// Cap recovery times array at 1000 entries
+	if (recoveryTimes.length > 1000) recoveryTimes.shift();
+
+	if (block.state === "collecting") {
+		markBlockTerminal(block, "recovered");
+		blocksRecovered++;
+		emitBlockUpdate(block);
+	}
+	emitRecoveredSymbols(key, recovered, block);
+}
+
+/** Settle a block after one of its source symbols was accepted. */
+function settleSourceArrival(
+	key: number,
+	block: FecBlockSnapshot,
+	result: Uint8Array | undefined,
+): void {
+	// Check if block is complete (all authored source symbols received:
+	// SSB_length once a repair symbol declared it, otherwise K)
+	const authoredLength = block.ssbLength ?? block.k;
+	if (
+		block.sourceReceived >= authoredLength &&
+		block.state === "collecting"
+	) {
+		markBlockTerminal(block, "complete");
+		blocksComplete++;
+		emitBlockUpdate(block);
+	}
+
+	// A source-triggered return can be either clean block completion or recovery
+	// of earlier missing symbols after repair arrived. Clean completion is
+	// already routed by the source path, so only emit when the block did not
+	// reach K source arrivals.
+	if (result && result.byteLength > 0 && block.sourceReceived < authoredLength) {
+		recordRecovered(key, block, result);
+	}
+	synchronizeDecoderHorizon();
+}
+
+/** Settle a block after one of its repair symbols was accepted. */
+function settleRepairArrival(
+	key: number,
+	block: FecBlockSnapshot,
+	ssbLength: number,
+	result: Uint8Array | undefined,
+): void {
+	// Every authored source symbol already arrived: knowing SSB_length makes
+	// the block clean. The decoder's return is the source already routed.
+	// Otherwise, returned data is the recovered source block: its SSB_length
+	// fixed-width authored symbols concatenated. Split it before emitting so
+	// MmtpRouter gets the same one-symbol shape as a direct source packet.
+	if (block.sourceReceived >= ssbLength && block.state === "collecting") {
+		markBlockTerminal(block, "complete");
+		blocksComplete++;
+		emitBlockUpdate(block);
+	} else if (result && result.byteLength > 0) {
+		recordRecovered(key, block, result);
+	}
+	synchronizeDecoderHorizon();
+}
+
+/**
+ * iso-ssbg1-v1 source admission. A source inside a known block is accounted
+ * at ESI = SS_ID - SS_Start. One no repair has placed yet is held unplaced,
+ * deduplicated by SS_ID, and still fed to the decoder, which holds it too,
+ * until a repair names a range containing it.
+ */
+function feedIsoSource(
+	cmd: Extract<FecWorkerCommand, { type: "feedSource" }>,
+	view: Uint8Array,
+	decoder: WasmFecDecoder,
+	cfg: FecTrackConfig,
+): void {
+	const maxPacketLength = cfg.symbolSize - SSBG1_LENGTH_FIELD_BYTES;
+	if (view.byteLength > maxPacketLength) {
+		throw new Error(
+			`[FecWorker] feedSource: iso-ssbg1-v1 protected packet of ${view.byteLength}B exceeds T-2 = ${maxPacketLength}B`,
+		);
+	}
+	const block = findIsoBlock(cmd.ssId);
+	if (!block) {
+		if (isRetiredSbn(cmd.ssId)) {
+			sourceDroppedRetired++;
+			return;
+		}
+		if (unplacedSources.has(cmd.ssId)) {
+			sourceDroppedDuplicate++;
+			return;
+		}
+		const result = decoder.add_source(cmd.ssId, view, cmd.ts);
+		advanceMediaHorizon(cmd.ssId);
+		unplacedSources.set(cmd.ssId, performance.now());
+		sourceSymbols++;
+		if (altaEnabled) altaPending++;
+		// No repair has named this source's block, so the decoder cannot have
+		// one to recover; data here is a Worker/decoder disagreement that
+		// cannot be attributed to a block, and is refused rather than guessed.
+		if (result && result.byteLength > 0) {
+			emit({
+				type: "error",
+				code: "recovered-block-unplaced",
+				message: `[FecWorker] Dropping a ${result.byteLength}B recovered block returned for SS_ID ${cmd.ssId}, which no known block contains`,
+			});
+		}
+		synchronizeDecoderHorizon();
+		return;
+	}
+
+	const key = block.sbn;
+	if (isRetiredSbn(key)) {
+		sourceDroppedRetired++;
+		return;
+	}
+	if (isTerminalBlock(block)) {
+		sourceDroppedTerminal++;
+		return;
+	}
+	const esi = serialDistance(key, cmd.ssId);
+	if (acceptedSourceEsis.get(key)?.has(esi)) {
+		sourceDroppedDuplicate++;
+		return;
+	}
+
+	const result = decoder.add_source(cmd.ssId, view, cmd.ts);
+	advanceMediaHorizon(cmd.ssId);
+	acceptId(acceptedSourceEsis, key, esi);
+	block.sourceReceived++;
+	block.lastSymbolTs = performance.now();
+	sourceSymbols++;
+	if (altaEnabled) altaPending++;
+	settleSourceArrival(key, block, result);
+}
+
+/** iso-ssbg1-v1: a known block sharing an SS_ID with `[ssStart, ssStart + ssbLength)`. */
+function findOverlappingIsoBlock(
+	ssStart: number,
+	ssbLength: number,
+): FecBlockSnapshot | undefined {
+	for (const block of blocks.values()) {
+		if (isoBlocksOverlap(block.sbn, isoKnownLength(block), ssStart, ssbLength)) return block;
+	}
+	return undefined;
+}
+
+/**
+ * iso-ssbg1-v1: create the block a repair first named, with K' = SSB_length,
+ * and move every unplaced source in its range into its accounting.
+ */
+function placeIsoBlock(ssStart: number, ssbLength: number): FecBlockSnapshot {
+	const block = getOrCreateBlock(ssStart, ssbLength);
+	for (let esi = 0; esi < ssbLength; esi++) {
+		const ssId = (ssStart + esi) % SS_ID_SPAN;
+		const arrivalTs = unplacedSources.get(ssId);
+		if (arrivalTs === undefined) continue;
+		unplacedSources.delete(ssId);
+		acceptId(acceptedSourceEsis, ssStart, esi);
+		block.sourceReceived++;
+		if (arrivalTs < block.firstSymbolTs) block.firstSymbolTs = arrivalTs;
+	}
+	return block;
+}
+
+/**
+ * iso-ssbg1-v1 repair admission. The block is `[SS_Start, SS_Start +
+ * SSB_length)` keyed by SS_Start, with repair ESI = SSB_length + RS_ID. A
+ * known block's SSB_length is checked before deduplication because the
+ * dedup key depends on it.
+ */
+function feedIsoRepair(
+	cmd: Extract<FecWorkerCommand, { type: "feedRepair" }>,
+	view: Uint8Array,
+	decoder: WasmFecDecoder,
+): void {
+	const key = cmd.ssStart;
+	if (isRetiredSbn(key)) return;
+	const existingBlock = blocks.get(key);
+	if (existingBlock && isTerminalBlock(existingBlock)) return;
+	if (existingBlock) {
+		if (existingBlock.ssbLength !== cmd.ssbLength) {
+			emit({
+				type: "error",
+				code: "repair-ssb-length-conflict",
+				message: `[FecWorker] Dropping repair symbol whose SSB_length ${cmd.ssbLength} conflicts with ${existingBlock.ssbLength} (ssStart=${key})`,
+			});
+			return;
+		}
+	} else {
+		const overlapped = findOverlappingIsoBlock(key, cmd.ssbLength);
+		if (overlapped) {
+			emit({
+				type: "error",
+				code: "repair-block-overlap",
+				message: `[FecWorker] Dropping repair symbol whose block (ssStart=${key}, SSB_length=${cmd.ssbLength}) overlaps known block (ssStart=${overlapped.sbn}, SSB_length=${isoKnownLength(overlapped)})`,
+			});
+			return;
+		}
+	}
+	const repairEsi = cmd.ssbLength + cmd.rsId;
+	if (acceptedRepairEsis.get(key)?.has(repairEsi)) return;
+
+	const result = decoder.add_repair(key, cmd.ssbLength, cmd.rsId, view, cmd.ts);
+	advanceMediaHorizon(key);
+	const block = existingBlock ?? placeIsoBlock(key, cmd.ssbLength);
+	acceptId(acceptedRepairEsis, key, repairEsi);
+	block.repairReceived++;
+	block.lastSymbolTs = performance.now();
+	repairSymbols++;
+	settleRepairArrival(key, block, cmd.ssbLength, result);
+}
+
 // --- Command handlers ---
 
 async function handleConfigure(
@@ -552,6 +985,19 @@ async function handleConfigure(
 	if (!cmd.config) {
 		throw new Error("[FecWorker] configure: config required");
 	}
+	// The block profile is the one discriminator for two wire-identical block
+	// maths, so it is required and never defaulted (BLO-35597).
+	const blockProfile: unknown = cmd.config.blockProfile;
+	if (blockProfile === undefined) {
+		throw new Error(
+			'[FecWorker] configure: blockProfile is required: name the FEC block profile ("k-padded-v1" or "iso-ssbg1-v1")',
+		);
+	}
+	if (blockProfile !== "k-padded-v1" && blockProfile !== "iso-ssbg1-v1") {
+		throw new Error(
+			`[FecWorker] configure: blockProfile must be "k-padded-v1" or "iso-ssbg1-v1" (got ${JSON.stringify(blockProfile)})`,
+		);
+	}
 	if (
 		!Number.isFinite(cmd.config.interleaveDepth) ||
 		!Number.isInteger(cmd.config.interleaveDepth) ||
@@ -611,10 +1057,9 @@ async function handleConfigure(
 
 	// Decoder policy and geometry are explicit at the epoch boundary. The WASM
 	// module has no guessed K/T/interleave slow path.
-	wasmDecoder = new wasm.MmtFecDecoder(
-		cmd.config.interleaveDepth,
-		cmd.config.trackType === "video",
-	);
+	const decoder = new wasm.MmtFecDecoder(cmd.config.interleaveDepth, blockProfile);
+	verifyDecoderProfile(decoder, blockProfile);
+	wasmDecoder = decoder;
 	config = cmd.config;
 	altaEnabled = !!cmd.altaPublicKey;
 
@@ -662,6 +1107,10 @@ async function handleConfigure(
 
 	wasmDecoder.configure_params(config.k, config.symbolSize);
 
+	// Tell the client which optional commands this Worker accepts, so it can
+	// batch symbols without risking a Worker that predates the batch command.
+	emit({ type: "capabilities", commands: ["feedSymbols", "subscribeBlockUpdates"] });
+
 	// Start periodic snapshot emission (200ms floor)
 	startSnapshotTimer();
 
@@ -686,15 +1135,28 @@ function handleFeedSource(
 	}
 
 	const view = new Uint8Array(cmd.data);
+	if (config.blockProfile === "iso-ssbg1-v1") {
+		feedIsoSource(cmd, view, wasmDecoder, config);
+		return;
+	}
 
 	// Derive SBN locally for block-level accounting. WASM derives the same
 	// value internally (ISO 23008-1 §C.5.2: SBN = floor(SS_ID / K)).
 	const sbn = config.k > 0 ? Math.floor(cmd.ssId / config.k) : cmd.ssId;
 	const esi = cmd.ssId % config.k;
-	if (sbn <= retiredSbnFrontier) return;
+	if (isRetiredSbn(sbn)) {
+		sourceDroppedRetired++;
+		return;
+	}
 	const existingBlock = blocks.get(sbn);
-	if (existingBlock && isTerminalBlock(existingBlock)) return;
-	if (acceptedSourceEsis.get(sbn)?.has(esi)) return;
+	if (existingBlock && isTerminalBlock(existingBlock)) {
+		sourceDroppedTerminal++;
+		return;
+	}
+	if (acceptedSourceEsis.get(sbn)?.has(esi)) {
+		sourceDroppedDuplicate++;
+		return;
+	}
 
 	const result = wasmDecoder.add_source(cmd.ssId, view, cmd.ts);
 	advanceMediaHorizon(sbn);
@@ -716,35 +1178,8 @@ function handleFeedSource(
 	// authenticated by the canonical manifest verifier at router admission.
 	if (altaEnabled) altaPending++;
 
-	// Check if block is complete (all K source symbols received)
-	if (
-		block.sourceReceived >= block.k &&
-		block.state === "collecting"
-	) {
-		markBlockTerminal(block, "complete");
-		blocksComplete++;
-		emitBlockUpdate(block);
-	}
-
-		// A source-triggered return can be either clean block completion or recovery
-		// of earlier missing symbols after repair arrived. Clean completion is
-		// already routed by the source path, so only emit when the block did not
-		// reach K source arrivals.
-		if (result && result.byteLength > 0 && block.sourceReceived < block.k) {
-			const recovered = new Uint8Array(toOwnedArrayBuffer(result));
-			const recoveryMs = performance.now() - block.firstSymbolTs;
-			recoveryTimes.push(recoveryMs);
-			if (recoveryTimes.length > 1000) recoveryTimes.shift();
-
-			if (block.state === "collecting") {
-				markBlockTerminal(block, "recovered");
-				blocksRecovered++;
-				emitBlockUpdate(block);
-			}
-			emitRecoveredSymbols(sbn, recovered, block);
-		}
-		synchronizeDecoderHorizon();
-	}
+	settleSourceArrival(sbn, block, result);
+}
 
 function handleFeedRepair(
 	cmd: Extract<FecWorkerCommand, { type: "feedRepair" }>,
@@ -755,14 +1190,17 @@ function handleFeedRepair(
 	if (!config) {
 		throw new Error("[FecWorker] feedRepair: config missing");
 	}
+	// k-padded-v1 blocks start at multiples of K and repair ESI = K + RS_ID;
+	// iso-ssbg1-v1 blocks start at any SS_ID and repair ESI = SSB_length + RS_ID.
+	const iso = config.blockProfile === "iso-ssbg1-v1";
 	if (
 		!isUint32(cmd.ssStart) ||
 		!isUint32(cmd.ssbLength) ||
 		cmd.ssbLength <= 0 ||
-		cmd.ssbLength !== config.k ||
-		cmd.ssStart % cmd.ssbLength !== 0 ||
+		cmd.ssbLength > config.k ||
+		(!iso && cmd.ssStart % config.k !== 0) ||
 		!isUint32(cmd.rsId) ||
-		cmd.ssbLength + cmd.rsId > UINT24_MAX ||
+		(iso ? cmd.ssbLength : config.k) + cmd.rsId > UINT24_MAX ||
 		!(cmd.data instanceof ArrayBuffer)
 	) {
 		throw new Error("[FecWorker] feedRepair: invalid repair symbol");
@@ -780,12 +1218,30 @@ function handleFeedRepair(
 		}
 		return;
 	}
-	const sbn = Math.floor(cmd.ssStart / cmd.ssbLength);
-	const repairEsi = cmd.ssbLength + cmd.rsId;
-	if (sbn <= retiredSbnFrontier) return;
+	if (iso) {
+		feedIsoRepair(cmd, view, wasmDecoder);
+		return;
+	}
+	const sbn = Math.floor(cmd.ssStart / config.k);
+	const repairEsi = config.k + cmd.rsId;
+	// The repair path's mirror drops stay silent and uncounted: BLO-35597
+	// defect 2 is a source-symbol shortfall, so only the source side needed
+	// evidence. The asymmetry is deliberate, not an oversight — extend these
+	// the same way if a repair-side shortfall ever needs attributing.
+	if (isRetiredSbn(sbn)) return;
 	const existingBlock = blocks.get(sbn);
 	if (existingBlock && isTerminalBlock(existingBlock)) return;
 	if (acceptedRepairEsis.get(sbn)?.has(repairEsi)) return;
+	// One block has one authored SSB_length; a repair symbol naming another
+	// is dropped before it reaches the decoder (which rejects it too).
+	if (existingBlock?.ssbLength !== undefined && existingBlock.ssbLength !== cmd.ssbLength) {
+		emit({
+			type: "error",
+			code: "repair-ssb-length-conflict",
+			message: `[FecWorker] Dropping repair symbol whose SSB_length ${cmd.ssbLength} conflicts with ${existingBlock.ssbLength} (sbn=${sbn})`,
+		});
+		return;
+	}
 
 	const result = wasmDecoder.add_repair(
 		cmd.ssStart,
@@ -802,28 +1258,12 @@ function handleFeedRepair(
 	}
 	repairEsis.add(repairEsi);
 	const block = getOrCreateBlock(sbn);
+	block.ssbLength = cmd.ssbLength;
 	block.repairReceived++;
 	block.lastSymbolTs = performance.now();
 	repairSymbols++;
-		// If WASM returned data, it is the recovered source block: K fixed-width
-		// source symbols concatenated. Split it before emitting so MmtpRouter gets
-		// the same one-symbol shape as a direct source packet.
-		if (result && result.byteLength > 0) {
-			const recovered = new Uint8Array(toOwnedArrayBuffer(result));
-			const recoveryMs = performance.now() - block.firstSymbolTs;
-			recoveryTimes.push(recoveryMs);
-		// Cap recovery times array at 1000 entries
-		if (recoveryTimes.length > 1000) recoveryTimes.shift();
-
-		if (block.state === "collecting") {
-			markBlockTerminal(block, "recovered");
-			blocksRecovered++;
-				emitBlockUpdate(block);
-			}
-			emitRecoveredSymbols(sbn, recovered, block);
-		}
-		synchronizeDecoderHorizon();
-	}
+	settleRepairArrival(sbn, block, cmd.ssbLength, result);
+}
 
 function handleRelayBlockSig(
 	cmd: Extract<FecWorkerCommand, { type: "relayBlockSig" }>,
@@ -849,27 +1289,25 @@ function handleCleanup(
 		throw new Error("[FecWorker] cleanup: invalid SBNs");
 	}
 	const sbns = [...new Set(cmd.sbns)].sort((a, b) => a - b);
-	const pendingSbns = sbns.filter((sbn) => sbn > retiredSbnFrontier);
+	const pendingSbns = sbns.filter((sbn) => !isRetiredSbn(sbn));
 	try {
 		if (!wasmDecoder) {
 			throw new Error("[FecWorker] cleanup: not configured");
 		}
 
-		// Call WASM cleanup only after all earlier symbol commands have drained.
-		// The detailed API carries the true owner of every fill emitted by a
-		// single cleanup pass; command coalescing must not infer ownership from
-		// the largest timed-out SBN.
-		const cleanupRecords = pendingSbns.length > 0
-			? wasmDecoder.cleanup_blocks_detailed(Uint32Array.from(pendingSbns))
-			: new Uint8Array();
+		// Call WASM cleanup only after all earlier symbol commands have drained,
+		// and only for the exact SBNs the manager's deadlines named; command
+		// coalescing must not infer ownership from the largest timed-out SBN.
+		if (pendingSbns.length > 0) {
+			wasmDecoder.cleanup_blocks_detailed(Uint32Array.from(pendingSbns));
+		}
 		// Manager deadlines are block-scoped and may expire a newer SBN while an
 		// older interleaved block is still live. Only accepted media progression
 		// advances the shared JS/Rust horizon; cleanup creates exact tombstones.
 
 		// Rust already finalized every SBN behind the media frontier. For each
 		// remaining exact request, mirror the block-scoped WASM boundary immediately
-		// so JS never retains state for a decoder block that is gone, even if decoding
-		// the trusted cleanup framing were to fail.
+		// so JS never retains state for a decoder block that is gone.
 		for (const sbn of pendingSbns) {
 			let currentBlock = blocks.get(sbn);
 			if (currentBlock && isTerminalBlock(currentBlock)) {
@@ -877,7 +1315,11 @@ function handleCleanup(
 				continue;
 			}
 			currentBlock ??= getOrCreateBlock(sbn);
-			if (currentBlock.sourceReceived >= currentBlock.k) {
+			// k-padded-v1 compares with K, unchanged. iso-ssbg1-v1 compares with
+			// the block's SSB_length; a key no repair declared has none, so a
+			// block the Worker never knew can only have failed.
+			const authoredLength = isIsoProfile() ? currentBlock.ssbLength : currentBlock.k;
+			if (authoredLength !== undefined && currentBlock.sourceReceived >= authoredLength) {
 				markBlockTerminal(currentBlock, "complete");
 				blocksComplete++;
 			} else {
@@ -886,12 +1328,6 @@ function handleCleanup(
 			}
 			emitBlockUpdate(currentBlock);
 		}
-
-		const greenFills = decodeCleanupRecords(cleanupRecords);
-		for (const { sbn, data } of greenFills) {
-			greenFillFrames++;
-			emit({ type: "greenFill", sbn, data }, [data]);
-		}
 	} finally {
 		// Message ordering makes this an acknowledgement that every source/repair
 		// command posted before cleanup has completed. The main thread must not
@@ -900,29 +1336,6 @@ function handleCleanup(
 	}
 }
 
-function decodeCleanupRecords(
-	framed: Uint8Array,
-): Array<{ sbn: number; data: ArrayBuffer }> {
-	const records: Array<{ sbn: number; data: ArrayBuffer }> = [];
-	const view = new DataView(framed.buffer, framed.byteOffset, framed.byteLength);
-	let offset = 0;
-	while (offset < framed.byteLength) {
-		if (framed.byteLength - offset < 8) {
-			throw new Error("[FecWorker] cleanup_blocks_detailed: truncated record header");
-		}
-		const sbn = view.getUint32(offset, false);
-		const length = view.getUint32(offset + 4, false);
-		offset += 8;
-		if (length > framed.byteLength - offset) {
-			throw new Error("[FecWorker] cleanup_blocks_detailed: truncated record payload");
-		}
-		const data = toOwnedArrayBuffer(framed.subarray(offset, offset + length));
-		records.push({ sbn, data });
-		offset += length;
-	}
-	return records;
-}
-
 function handleDispose(): void {
 	// Clear snapshot timer (MUST clear to prevent leaks)
 	if (snapshotTimer !== null) {
@@ -979,7 +1392,6 @@ function handleReset(): void {
 	blocksComplete = 0;
 	blocksRecovered = 0;
 	blocksFailed = 0;
-	greenFillFrames = 0;
 	altaVerified = 0;
 	altaFailed = 0;
 	altaFailedDetails.length = 0;
@@ -990,10 +1402,46 @@ function handleReset(): void {
 	relayBlocksVerified = 0;
 	relayBlocksFailed = 0;
 	repairSymbolSizeMismatch = 0;
+	sourceDroppedRetired = 0;
+	sourceDroppedTerminal = 0;
+	sourceDroppedDuplicate = 0;
+	sourceUnplacedRetired = 0;
 	emit({ type: "resetComplete" });
 	if (config) emitSnapshot();
 }
 
+/**
+ * A batch of symbols fed in one page task (BLO-36599). Each record is
+ * handled exactly as its single-symbol command would be, in order, and a
+ * failing record reports the same `command-failed` error that command would
+ * without stopping the records after it.
+ */
+function handleFeedSymbols(
+	cmd: Extract<FecWorkerCommand, { type: "feedSymbols" }>,
+): void {
+	if (!Array.isArray(cmd.symbols)) {
+		throw new Error("[FecWorker] feedSymbols: symbols must be an array");
+	}
+	for (const symbol of cmd.symbols) {
+		try {
+			if (symbol?.type === "feedSource") handleFeedSource(symbol);
+			else if (symbol?.type === "feedRepair") handleFeedRepair(symbol);
+			else {
+				throw new Error(
+					`[FecWorker] feedSymbols: unknown symbol type ${String((symbol as { type?: unknown } | null)?.type)}`,
+				);
+			}
+		} catch (err) {
+			emit({
+				type: "error",
+				code: "command-failed",
+				message:
+					err instanceof Error ? err.message : `[FecWorker] ${String(err)}`,
+			});
+		}
+	}
+}
+
 // --- Main message handler ---
 
 async function dispatchCommand(cmd: FecWorkerCommand): Promise<void> {
@@ -1011,6 +1459,9 @@ async function dispatchCommand(cmd: FecWorkerCommand): Promise<void> {
 			case "feedRepair":
 				handleFeedRepair(cmd);
 				break;
+			case "feedSymbols":
+				handleFeedSymbols(cmd);
+				break;
 			case "relayBlockSig":
 				handleRelayBlockSig(cmd);
 				break;
@@ -1020,6 +1471,9 @@ async function dispatchCommand(cmd: FecWorkerCommand): Promise<void> {
 			case "reset":
 				handleReset();
 				break;
+			case "subscribeBlockUpdates":
+				blockUpdatesSubscribed = true;
+				break;
 			case "dispose":
 				handleDispose();
 				break;