@blockcast/mmt-container 1.0.1 → 2.0.0-main.609e08d7e29f

package/test-vectors/catalog/section-codes.json

@@ -25,10 +25,9 @@
     "multicast-auth-endpoint-auth-without-object-auth.json": { "outOfSection": "multicast.auth" },
     "multicast-auth-endpoint-missing-auth.json": { "outOfSection": "multicast.auth" },
     "multicast-auth-endpoint-missing-bandwidth.json": { "outOfSection": "multicast.auth" },
-    "multicast-auth-manifest-port-equals-port.json": { "outOfSection": "multicast.auth" },
     "multicast-auth-manifest-timer-out-of-range.json": { "outOfSection": "multicast.auth" },
-    "multicast-auth-max-auth-delay-below-min.json": { "outOfSection": "multicast.auth" },
-    "multicast-auth-max-auth-delay-above-max.json": { "outOfSection": "multicast.auth" },
+    "multicast-auth-draft01-manifest-port.json": { "outOfSection": "multicast.auth" },
+    "multicast-auth-shared-sg-port.json": { "outOfSection": "multicast.auth" },
     "multicast-auth-padded-key.json": { "outOfSection": "multicast.auth" },
     "multicast-auth-reused-track-format.json": { "outOfSection": "multicast.auth" },
     "multicast-auth-root-dotted-key.json": { "outOfSection": "multicast.auth" },
@@ -37,6 +36,12 @@
     "multicast-auth-version-1.json": { "outOfSection": "multicast.auth" },
     "multicast-auth-version-3.json": { "outOfSection": "multicast.auth" },
     "multicast-auth-version-missing.json": { "outOfSection": "multicast.auth" },
+    "multicast-endpoint-address-family-mismatch.json": { "outOfSection": "multicast" },
+    "multicast-endpoint-address-host-name.json": { "outOfSection": "multicast" },
+    "multicast-endpoint-address-leading-zero.json": { "outOfSection": "multicast" },
+    "multicast-endpoint-address-ls32-leading-zero.json": { "outOfSection": "multicast" },
+    "multicast-endpoint-address-mapped-family-mismatch.json": { "outOfSection": "multicast" },
+    "multicast-endpoint-address-zone-id.json": { "outOfSection": "multicast" },
     "multicast-endpoint-foreign-namespace-track.json": { "outOfSection": "multicast" },
     "multicast-endpoint-protocol-amt.json": { "outOfSection": "multicast" },
     "multicast-endpoint-protocol-atsc3.json": { "outOfSection": "multicast" },

package/test-vectors/catalog-multicast-auth-v1.json

@@ -32,7 +32,6 @@
           }
         ],
         "auth": {
-          "manifestPort": 5005,
           "streamId": 2864434397,
           "maxAuthDelayMs": 200,
           "manifestTimerMs": 20,

package/test-vectors/catalog-validation.json

@@ -510,9 +510,9 @@
       }
     },
     {
-      "name": "multicast.auth other than bc-provenance version 2 is rejected (draft -01 7.2.6)",
-      "valid": false,
-      "error_code": "multicast_auth",
+      "name": "multicast.auth other than bc-provenance version 2 admits no multicast endpoint, and the catalog parses (multicast-02 7.2.6)",
+      "valid": true,
+      "admitted_multicast_endpoints": 0,
       "catalog": {
         "version": 1,
         "tracks": [

package/test-vectors/generate-bc-provenance-v2.mjs

@@ -1,7 +1,9 @@
 #!/usr/bin/env node
-// bc-provenance version 2 vectors, draft-ramadan-moq-multicast-01 (7.2.3,
+// bc-provenance version 2 vectors, draft-ramadan-moq-multicast-02 (7.2.3,
 // 7.2.4, 7.2.7 step 1, 7.2.10, Appendix A). Case "appendix-a" reproduces the
 // draft's Appendix A byte for byte; every other case is labelled beyond-draft.
+// No published vector covers m >= 2 FEC instances or an empty fec array, so
+// for those the TS, Rust and Go cells are each other's cross-check.
 // Only node:crypto is used (sha-256, Ed25519), so the output is deterministic.
 // Step 1 is read at join (no record of the flow verified yet), so the
 // previous-epoch deadline of 7.2.7 (the bound of 7.2.5 plus maxAuthDelayMs +
@@ -14,7 +16,16 @@ import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 const here = dirname(fileURLToPath(import.meta.url));
-const DRAFT_COMMIT = 'abf183bfb83e616909453872c4d788db4b3acd19';
+const DRAFT_COMMIT = '5f4917291e2f0e58bdee9e4a813ff248537695e2';
+// The 196-octet record of draft-ramadan-moq-multicast-01 Appendix A @ abf183bf.
+const APPENDIX_A_01_RECORD = Buffer.from(
+  '4d484d320000000100000011000000000000000100000000000003e800020100' +
+  '6ade9800fe68177dd329ee6fdd668cb43ebdeb6d2e4c2ae351fd25050ab68dd9' +
+  '8af192147ead4d8be7d24e08d7075bbac8fbe7779ab3b8f1c47d3f8be4d2a514' +
+  'f2ec20696f7d9007e81b73c9f54aff8c2f66bd6e8956bfa7e001789b986c328f' +
+  '9ed787519d5154a8e6beb7c472a09fa1e1d3d426b6042519343728835ed5c941' +
+  '6e615aad7ad335c0f0403aa8985e6b6979e5918d3d28e787ca29d55447930777' +
+  'c380d808', 'hex');
 
 const H = (...parts) => createHash('sha256').update(Buffer.concat(parts)).digest();
 const u8 = (n) => Buffer.from([n]);
@@ -45,12 +56,17 @@ const pseudoheader = (ep, len) =>
   Buffer.concat([ip(ep.S), ip(ep.G), u8(0), u8(0x11), u16(len), u16(ep.port), u16(ep.port), u32(ep.streamId)]);
 const digest = (ep, payload) => H(pseudoheader(ep, payload.length), payload);
 const signedPrefix = (ep) =>
-  Buffer.concat([Buffer.from('mcast-manifest-v2\0'), u32(ep.streamId), ip(ep.S), ip(ep.G), u16(ep.manifestPort)]);
+  Buffer.concat([Buffer.from('mcast-manifest-v2\0'), u32(ep.streamId), ip(ep.S), ip(ep.G), u16(ep.port)]);
 
+// 7.2.4: one tuple per instance of the entry's fec array in ascending
+// instanceId, no count and no instanceId; none (absent or empty) is
+// lp16("none") then four u32(0), and "none" is no scheme.
 function paramsHash(p) {
-  const fec = p.fec
-    ? Buffer.concat([lp16(p.fec.algorithm), u32(p.fec.sourceSymbols), u32(p.fec.repairSymbols),
-      u32(p.fec.symbolSize), u32(p.fec.interleaveDepthMs ?? 0)])
+  const instances = [...(p.fec ?? [])].sort((a, b) => (a.instanceId ?? 0) - (b.instanceId ?? 0));
+  if (instances.some((f) => f.scheme === 'none')) throw new Error('scheme "none" is reserved');
+  const fec = instances.length
+    ? Buffer.concat(instances.map((f) => Buffer.concat([lp16(f.scheme), u32(f.sourceSymbols), u32(f.repairSymbols),
+      u32(f.symbolSize), u32(f.interleaveDepthMs ?? 0)])))
     : Buffer.concat([lp16('none'), u32(0), u32(0), u32(0), u32(0)]);
   return H(Buffer.from('BCPV2-params'), lp16(p.codec), u32(p.timescale ?? 0), u32(p.groupDurationTicks ?? 0), fec);
 }
@@ -71,15 +87,18 @@ function record(ep, h, digests) {
   return Buffer.concat([body, sign(null, Buffer.concat([signedPrefix(ep), body]), privateKey)]);
 }
 
-const anchorEp = { S: '198.51.100.7', G: '232.10.20.30', port: 5004, manifestPort: 5005, streamId: 0xaabbccdd };
+const anchorEp = { S: '198.51.100.7', G: '232.10.20.30', port: 5004, streamId: 0xaabbccdd };
 const anchorCtx = {
   namespace: ['example.arena'],
   packetIds: [1, 2],
   params: {
     codec: 'avc1.640028', timescale: 90000, groupDurationTicks: 3000,
-    fec: { algorithm: 'raptorq', sourceSymbols: 32, repairSymbols: 16, symbolSize: 1312, interleaveDepthMs: 133 },
+    fec: [{ scheme: 'raptorq', sourceSymbols: 32, repairSymbols: 16, symbolSize: 1312, interleaveDepthMs: 133 }],
   },
 };
+// Base plus keyframe overlay instance (draft-ramadan-moq-mmt-02 7.4.1).
+const baseInstance = { instanceId: 0, ...anchorCtx.params.fec[0] };
+const overlayInstance = { instanceId: 1, scheme: 'raptorq', sourceSymbols: 256, repairSymbols: 32, symbolSize: 1312, interleaveDepthMs: 1000 };
 const anchorHdr = { kid: 1, epoch: 17, mseq: 1, firstSeq: 1000, flags: 0, sent: 1792972800 };
 
 // A synthetic FEC Type 1 source block (ISO/IEC 23008-1 C.5.2), replacing the
@@ -114,7 +133,7 @@ function positive(id, source, note, { ep = anchorEp, ctx = anchorCtx, hdr = {},
 
 const anchorDatagrams = [Buffer.alloc(1400, 0x11), Buffer.alloc(1400, 0x22)];
 const cases = [
-  positive('appendix-a', 'appendix-a', 'draft-ramadan-moq-multicast-01 Appendix A, byte for byte',
+  positive('appendix-a', 'appendix-a', 'draft-ramadan-moq-multicast-02 Appendix A, byte for byte',
     { datagrams: anchorDatagrams }),
   positive('twin', 'appendix-a', 'the twin of a record is byte-identical to it (7.2.5); equals appendix-a',
     { datagrams: anchorDatagrams }),
@@ -128,11 +147,21 @@ const cases = [
     { datagrams: anchorDatagrams, hdr: { mseq: 2, flags: 1 } }),
   positive('ipv6', 'beyond-draft', 'IPv6 S and G, 44-octet pseudoheader and 50-octet signed_message prefix',
     { ep: { ...anchorEp, S: '2001:db8::7', G: 'ff3e::8000:1e' }, datagrams: anchorDatagrams }),
-  positive('params-no-fec', 'beyond-draft', 'catalog entry with no fec object: lp16("none") then four u32(0)',
-    { ctx: { ...anchorCtx, params: { codec: 'avc1.640028', timescale: 90000, groupDurationTicks: 3000, fec: null } },
+  positive('params-no-fec', 'beyond-draft', 'catalog entry with no fec member: lp16("none") then four u32(0)',
+    { ctx: { ...anchorCtx, params: { codec: 'avc1.640028', timescale: 90000, groupDurationTicks: 3000 } },
       datagrams: anchorDatagrams }),
-  positive('params-no-interleave', 'beyond-draft', 'fec object without interleaveDepthMs: u32(0)',
-    { ctx: { ...anchorCtx, params: { ...anchorCtx.params, fec: { ...anchorCtx.params.fec, interleaveDepthMs: undefined } } },
+  positive('params-empty-fec-array', 'beyond-draft', 'empty fec array: hashes as the no-FEC encoding, params_hash equals params-no-fec',
+    { ctx: { ...anchorCtx, params: { codec: 'avc1.640028', timescale: 90000, groupDurationTicks: 3000, fec: [] } },
+      datagrams: anchorDatagrams }),
+  positive('params-no-interleave', 'beyond-draft', 'fec instance without interleaveDepthMs: u32(0)',
+    { ctx: { ...anchorCtx, params: { ...anchorCtx.params, fec: [{ ...anchorCtx.params.fec[0], interleaveDepthMs: undefined }] } },
+      datagrams: anchorDatagrams }),
+  positive('params-two-instances', 'beyond-draft', 'base and keyframe overlay instance (mmt-02 7.4.1): two tuples in ascending instanceId',
+    { ctx: { ...anchorCtx, params: { ...anchorCtx.params, fec: [baseInstance, overlayInstance] } },
+      datagrams: anchorDatagrams }),
+  positive('params-two-instances-listed-reversed', 'beyond-draft',
+    'the same instances listed instanceId 1 first: hashed in ascending instanceId, so params_hash equals params-two-instances; array order would not',
+    { ctx: { ...anchorCtx, params: { ...anchorCtx.params, fec: [overlayInstance, baseInstance] } },
       datagrams: anchorDatagrams }),
   positive('catalog-less', 'beyond-draft', 'flow carried without a MoQ catalog: ctx is 32 zero octets',
     { ctx: null, datagrams: anchorDatagrams }),
@@ -208,6 +237,9 @@ const negatives = [
   negative('ctx-mismatch', 'ctx', { receiver: { catalogCtxHex: hex(Buffer.alloc(32, 0xff)) } }),
   negative('budget-empty', 'budget', { receiver: { budgetTokens: 0 } }),
   negative('signature', 'signature', { mutate: (r) => { const b = Buffer.from(r); b[b.length - 1] ^= 1; return b; } }),
+  // multicast-01 Appendix A @ abf183b: signed under the -01 prefix, which bound
+  // u16(manifestPort) = 5005; under the -02 prefix (u16(port)) it must fail.
+  negative('appendix-a-01-record', 'signature', { mutate: () => APPENDIX_A_01_RECORD }),
 ];
 
 function boundary(id, receiver) {
@@ -236,11 +268,57 @@ boundaries.push(boundary('epoch-kid-range-top', {
   keys: [...baseReceiver.keys, { kid: 2, publicKeyHex: hex(publicKey), firstEpoch: 17 }], minEpoch: 16,
 }));
 boundaries[3].recordHex = hex(record(anchorEp, { ...anchorHdr, ctx: c0, epoch: 16 }, anchorDigests));
+// Highest mseq below the window: 0 + 64 > 10, so mseq 0 is above the floor.
+// An unsigned highest - 64 wraps and would drop it (7.2.1, 7.2.7 step 1).
+boundaries.push(boundary('mseq-floor-below-window', { highestMseq: { kid: 1, epoch: 17, mseq: 10 } }));
+boundaries[4].recordHex = hex(record(anchorEp, { ...anchorHdr, ctx: c0, mseq: 0 }, anchorDigests));
+
+// "none" is reserved (fec-core-00 15.2): an instance naming it is rejected,
+// never hashed as the no-FEC encoding.
+const paramsRejections = [
+  { id: 'scheme-none', note: 'a fec instance whose scheme is "none" is rejected',
+    params: { ...anchorCtx.params, fec: [{ ...anchorCtx.params.fec[0], scheme: 'none' }] } },
+];
+for (const r of paramsRejections) {
+  let threw = false;
+  try { paramsHash(r.params); } catch { threw = true; }
+  if (!threw) throw new Error(`${r.id} hashed`);
+}
+
+// 7.2.4 repair-only endpoint: params_hash comes from the source track of the
+// endpoint's lowest-packetId repair track, named by its `source` or, absent
+// that, by any instance (not only layer 0's) naming it as `repairTrack`.
+const catalogBase = (repair) => ({
+  version: 1,
+  streamingFormat: 'mmtp',
+  tracks: [
+    { name: 'video', packaging: 'mmtp', codec: 'avc1.640028', mmtpMode: 'mfu', timescale: 90000, groupDurationTicks: 3000,
+      fec: [
+        { instanceId: 1, scope: 'keyframe', scheme: 'raptorq', blockProfile: 'iso-ssbg1-v1', sourceSymbols: 256, repairSymbols: 32,
+          symbolSize: 1312, interleaveDepthMs: 1000, repairTrack: 'video/keyframe-repair' },
+        { instanceId: 0, scheme: 'raptorq', blockProfile: 'iso-ssbg1-v1', sourceSymbols: 32, repairSymbols: 16,
+          symbolSize: 1312, interleaveDepthMs: 133, reorderToleranceMs: 40, repairTrack: 'video/repair' },
+      ] },
+    { name: 'video/repair', packaging: 'fec-repair', source: 'video', instanceId: 0, priority: 240 },
+    repair,
+  ],
+});
+const resolvedVideo = { ...anchorCtx.params, fec: [baseInstance, overlayInstance] };
+const catalogResolutions = [
+  { id: 'repair-only-via-source', note: 'the repair track names its source track',
+    catalog: catalogBase({ name: 'video/keyframe-repair', packaging: 'fec-repair', source: 'video', instanceId: 1, priority: 242 }),
+    endpointTracks: [{ name: 'video/keyframe-repair', packetId: 9 }, { name: 'video/repair', packetId: 12 }],
+    resolvedParams: resolvedVideo },
+  { id: 'repair-only-via-instance-repair-track', note: 'the repair track carries no source; the instance 1 (keyframe overlay) repairTrack names it',
+    catalog: catalogBase({ name: 'video/keyframe-repair', packaging: 'fec-repair', instanceId: 1, priority: 242 }),
+    endpointTracks: [{ name: 'video/keyframe-repair', packetId: 9 }],
+    resolvedParams: resolvedVideo },
+].map((r) => ({ ...r, paramsHashHex: hex(paramsHash(r.resolvedParams)) }));
 
 const out = {
   version: 2,
   profile: 'bc-provenance',
-  draft: 'draft-ramadan-moq-multicast-01',
+  draft: 'draft-ramadan-moq-multicast-02',
   draftCommit: DRAFT_COMMIT,
   hashAlg: 1,
   key: { seedHex: hex(seed), publicKeyHex: hex(publicKey) },
@@ -248,5 +326,7 @@ const out = {
   recovered: recoveredCase,
   negatives,
   boundaries,
+  paramsRejections,
+  catalogResolutions,
 };
 writeFileSync(join(here, 'bc-provenance-v2.json'), `${JSON.stringify(out, null, 2)}\n`);