@blockcast/fec-worker 0.1.0-main.64a6b356bf43 → 0.1.0-main.6598eedfb039

package/src/fec-worker.ts

@@ -31,7 +31,7 @@ interface WasmFecDecoder {
 		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: repair ESI = configured K + rs_id, SBN = ss_start / configured K. */
 	add_repair(
 		ss_start: number,
 		ssb_length: number,
@@ -40,8 +40,12 @@ 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;
+	/**
+	 * 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;
 	/** Remove decoder blocks below its configured live-SBN interleave horizon. */
 	cleanup_by_sbn(current_sbn: number): Uint32Array;
 	flush(): void;
@@ -61,10 +65,7 @@ interface WasmFecDecoder {
 
 interface WasmBindings {
 	initSync(module: { module: WebAssembly.Module }): unknown;
-	MmtFecDecoder: new (
-		interleaveDepth: number,
-		greenFillEnabled: boolean,
-	) => WasmFecDecoder;
+	MmtFecDecoder: new (interleaveDepth: number) => WasmFecDecoder;
 }
 
 // --- Worker state (local to this Worker instance) ---
@@ -75,6 +76,8 @@ 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>();
@@ -95,7 +98,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<{
@@ -444,7 +446,6 @@ function buildStatsSnapshot(): FecTrackStats {
 		blocksComplete,
 		blocksRecovered,
 		blocksFailed,
-		greenFillFrames,
 		recoveryRate:
 			blocksComplete + blocksRecovered > 0
 				? Math.round(
@@ -478,6 +479,7 @@ function emitSnapshot(): void {
 }
 
 function emitBlockUpdate(block: FecBlockSnapshot): void {
+	if (!blockUpdatesSubscribed) return;
 	emit({ type: "blockUpdate", block: { ...block } });
 }
 
@@ -496,16 +498,19 @@ 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++) {
+	for (let i = 0; i < ssbLength; i++) {
 		const symbol = recoveredBlock.subarray(i * symbolSize, (i + 1) * symbolSize);
 
 		// Source authentication now runs once at router admission in
@@ -520,6 +525,7 @@ function emitRecoveredSymbols(
 			recovered: true,
 			sbn,
 			esi: i,
+			ssbLength,
 		};
 		emit({ type: "frame", data: buf, meta }, [buf]);
 	}
@@ -611,10 +617,7 @@ 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",
-	);
+	wasmDecoder = new wasm.MmtFecDecoder(cmd.config.interleaveDepth);
 	config = cmd.config;
 	altaEnabled = !!cmd.altaPublicKey;
 
@@ -662,6 +665,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();
 
@@ -716,9 +723,11 @@ function handleFeedSource(
 	// authenticated by the canonical manifest verifier at router admission.
 	if (altaEnabled) altaPending++;
 
-	// Check if block is complete (all K source symbols received)
+	// 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 >= block.k &&
+		block.sourceReceived >= authoredLength &&
 		block.state === "collecting"
 	) {
 		markBlockTerminal(block, "complete");
@@ -730,7 +739,7 @@ function handleFeedSource(
 		// 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) {
+		if (result && result.byteLength > 0 && block.sourceReceived < authoredLength) {
 			const recovered = new Uint8Array(toOwnedArrayBuffer(result));
 			const recoveryMs = performance.now() - block.firstSymbolTs;
 			recoveryTimes.push(recoveryMs);
@@ -759,10 +768,10 @@ function handleFeedRepair(
 		!isUint32(cmd.ssStart) ||
 		!isUint32(cmd.ssbLength) ||
 		cmd.ssbLength <= 0 ||
-		cmd.ssbLength !== config.k ||
-		cmd.ssStart % cmd.ssbLength !== 0 ||
+		cmd.ssbLength > config.k ||
+		cmd.ssStart % config.k !== 0 ||
 		!isUint32(cmd.rsId) ||
-		cmd.ssbLength + cmd.rsId > UINT24_MAX ||
+		config.k + cmd.rsId > UINT24_MAX ||
 		!(cmd.data instanceof ArrayBuffer)
 	) {
 		throw new Error("[FecWorker] feedRepair: invalid repair symbol");
@@ -780,12 +789,22 @@ function handleFeedRepair(
 		}
 		return;
 	}
-	const sbn = Math.floor(cmd.ssStart / cmd.ssbLength);
-	const repairEsi = cmd.ssbLength + cmd.rsId;
+	const sbn = Math.floor(cmd.ssStart / config.k);
+	const repairEsi = config.k + cmd.rsId;
 	if (sbn <= retiredSbnFrontier) 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,13 +821,20 @@ 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) {
+		// 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 >= cmd.ssbLength && block.state === "collecting") {
+			markBlockTerminal(block, "complete");
+			blocksComplete++;
+			emitBlockUpdate(block);
+		} else if (result && result.byteLength > 0) {
 			const recovered = new Uint8Array(toOwnedArrayBuffer(result));
 			const recoveryMs = performance.now() - block.firstSymbolTs;
 			recoveryTimes.push(recoveryMs);
@@ -855,21 +881,19 @@ function handleCleanup(
 			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)) {
@@ -886,12 +910,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 +918,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 +974,6 @@ function handleReset(): void {
 	blocksComplete = 0;
 	blocksRecovered = 0;
 	blocksFailed = 0;
-	greenFillFrames = 0;
 	altaVerified = 0;
 	altaFailed = 0;
 	altaFailedDetails.length = 0;
@@ -994,6 +988,38 @@ function handleReset(): void {
 	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 +1037,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 +1049,9 @@ async function dispatchCommand(cmd: FecWorkerCommand): Promise<void> {
 			case "reset":
 				handleReset();
 				break;
+			case "subscribeBlockUpdates":
+				blockUpdatesSubscribed = true;
+				break;
 			case "dispose":
 				handleDispose();
 				break;

package/src/index.ts

@@ -6,6 +6,8 @@
 
 export type {
 	FecWorkerCommand,
+	FecSymbolCommand,
+	FecWorkerOptionalCommand,
 	FecWorkerEvent,
 	FecWorkerErrorCode,
 	FecTrackConfig,