From 4612697805c4902e508bd9721b5a1431db5e8dc6 Mon Sep 17 00:00:00 2001 From: Ari Sulistiono Date: Wed, 18 Nov 2026 15:36:48 +0700 Subject: [PATCH 1/4] refactor(mv11): native Channel Identity ViewModel owns preflight and readback --- web/approved-channel-strip-view-model.js | 110 ++++++++++++++++- web/approved-native-bridge.js | 145 +++++++++-------------- 2 files changed, 165 insertions(+), 90 deletions(-) diff --git a/web/approved-channel-strip-view-model.js b/web/approved-channel-strip-view-model.js index 50c711c44..1ef989406 100644 --- a/web/approved-channel-strip-view-model.js +++ b/web/approved-channel-strip-view-model.js @@ -365,10 +365,118 @@ return pending.acked===true&&matches?"CONFIRMED":"WAIT"; } + + // MV-11: identity is ONLY a native-owned cosmetic document, independent + // of the PCM graph. The bridge owns pending requests and storage cleanup; + // these pure selectors own the validation, intent and settlement policy. + function identityReadback(snapshot,valid) { + const appearance=snapshot?.raw?.channelAppearance; + const channels=snapshot?.graph?.channels; + if(!appearance||appearance.schema!=="arsonmix.native.channel-appearance.v1"|| + !Array.isArray(appearance.entries)||!Array.isArray(channels)|| + !valid?.decimal||valid.decimal(appearance.revision)===null|| + typeof appearance.readOnly!=="boolean")return {kind:"INVALID"}; + const live=new Set(channels.map(ch=>ch?.id)),seen=new Set(),entries=[]; + if(live.size!==channels.length||appearance.entries.length>512)return {kind:"INVALID"}; + for(const p of appearance.entries){ + if(!p||!decimalId(p.id)||!live.has(p.id)||seen.has(p.id)|| + !valid.validPresentationName(p.name)|| + !valid.validPresentationColor(p.color)|| + !valid.validPresentationIcon(p.icon))return {kind:"INVALID"}; + seen.add(p.id); + entries.push({id:p.id,name:p.name,color:p.color,icon:p.icon}); + } + return {kind:"VALID",revision:appearance.revision, + writable:!appearance.readOnly,entries}; + } + function identityEditPlan({native,logical,channelId,rawName,color,icon, + appearance,appearanceRevision,appearanceWritable, + pending=false,valid}={}) { + const no={kind:"UNAVAILABLE"}; + const name=String(rawName??"").trim().replace(/\\s+/g," "); + if(!decimalId(channelId)||!valid?.validPresentationName?.(name)) + return no; + const current=logical||native; + const channels=current?.graph?.channels; + if(!Array.isArray(channels)||channels.filter(ch=>ch?.id===channelId).length!==1) + return no; + const names=channels.filter(ch=>ch.id!==channelId).map(ch=> + appearance?.get?.(ch.id)?.name||ch.name); + if(names.some(other=>typeof other==="string"&& + other.toLowerCase()===name.toLowerCase()))return {kind:"DUPLICATE"}; + if(logical) { + if(logical.readOnly===true||pending)return no; + return {kind:"LOGICAL",channelId,name,operation:"RENAME_CHANNEL", + payload:{name}}; + } + if(pending)return {kind:"BUSY"}; + if(native?.raw?.mixerSession?.authority!=="CHANNEL_ID"|| + !(native.admitted===true||native.retained===true)|| + appearanceWritable!==true||valid?.decimal?.(appearanceRevision)===null|| + !decimalId(native.device?.epoch)||!decimalId(native.graph?.revision)|| + !decimalId(native.graph?.rosterRevision)|| + !valid.validPresentationColor?.(color)|| + !valid.validPresentationIcon?.(icon))return no; + const payload={channelId,name,color,icon,appearanceRevision, + deviceEpoch:native.device.epoch,graphRevision:native.graph.revision, + rosterRevision:native.graph.rosterRevision}; + return {kind:"READY",payload,pending:{ + channelId,name,color,icon,acked:false, + deviceEpoch:payload.deviceEpoch,graphRevision:payload.graphRevision, + rosterRevision:payload.rosterRevision, + beforeAppearanceRevision:appearanceRevision}}; + } + function identityAckResult(pending,ack) { + if(!pending||ack?.requestId!==pending.requestId)return "IGNORE"; + return ack.ok===true?"ACKED":"REJECTED"; + } + function identitySettlement(pending,snapshot,projection) { + if(!pending)return "NONE"; + if(snapshot?.device?.epoch!==pending.deviceEpoch|| + snapshot?.graph?.revision!==pending.graphRevision|| + snapshot?.graph?.rosterRevision!==pending.rosterRevision|| + snapshot?.raw?.mixerSession?.authority!=="CHANNEL_ID"|| + !(snapshot?.admitted===true||snapshot?.retained===true)|| + !snapshot.graph.channels?.some(ch=>ch.id===pending.channelId)) + return "STALE"; + if(projection?.kind!=="VALID"|| + !decimalId(projection.revision)&&projection.revision!=="0"|| + (projection.revision!=="0"&& + !decimalId(projection.revision))|| + typeof pending.beforeAppearanceRevision!=="string"|| + !/^(0|[1-9][0-9]*)$/.test(pending.beforeAppearanceRevision)) + return "WAIT"; + if(BigInt(projection.revision)p.id===pending.channelId); + return matches.length===1&&matches[0].name===pending.name&& + matches[0].color===pending.color&& + matches[0].icon===pending.icon?"CONFIRMED":"WAIT"; + } + function legacyIdentityDecision({snapshot,id,identity,appearance,deferred, + writable,pending,valid}={}) { + if(!writable||pending||!(snapshot?.admitted||snapshot?.retained)|| + snapshot?.raw?.mixerSession?.authority!=="CHANNEL_ID"|| + !snapshot.graph?.channels?.some(ch=>ch.id===id)|| + deferred?.has?.(id))return {kind:"SKIP"}; + const original=appearance?.get?.(id); + if(original)return original.name===identity?.name&& + original.color===identity?.color&&original.icon===identity?.icon? + {kind:"RETIRE"}:{kind:"DEFER"}; + const plan=identityEditPlan({native:snapshot,channelId:id, + rawName:identity?.name,color:identity?.color,icon:identity?.icon, + appearance,appearanceRevision:snapshot?.raw?.channelAppearance?.revision, + appearanceWritable:writable,valid}); + if(plan.kind==="DUPLICATE")return {kind:"CONFLICT"}; + return plan.kind==="READY"?{kind:"SEND",plan}:{kind:"DEFER"}; + } + return Object.freeze({outputTargets,inputChoices,externalChoices, primaryChoices,resolvePrimarySelection,readbackBindings,externalPending, primaryOutMutation,externalOutputPlan,sourceQueueSelection, sourceDispatchPlan,sourceAckResult,sourceReadbackSettlement, scalarIdentityMatches,scalarVisualSettlement,m4ScalarAckResult, - m4ScalarReadbackSettlement}); + m4ScalarReadbackSettlement,identityReadback,identityEditPlan, + identityAckResult,identitySettlement,legacyIdentityDecision}); }); diff --git a/web/approved-native-bridge.js b/web/approved-native-bridge.js index 11b93e1bc..baf99df15 100644 --- a/web/approved-native-bridge.js +++ b/web/approved-native-bridge.js @@ -63,31 +63,24 @@ }catch(_){status("Native identity saved; legacy cache cleanup unavailable");} } function maybeMigrateLegacy(next){ - if(!appearanceWritable||pendingIdentity||!legacyImport.size|| - !(next?.admitted||next?.retained)|| - next?.raw?.mixerSession?.authority!=="CHANNEL_ID")return; + if(!legacyImport.size)return; for(const [id,p] of legacyImport){ - if(legacyDeferred.has(id)||!next.graph.channels.some(ch=>ch.id===id))continue; - const authoritative=channelPresentation.get(id); - if(authoritative){ - // Never overwrite a genuine native edit with older browser data. - if(authoritative.name===p.name&&authoritative.color===p.color&& - authoritative.icon===p.icon)retireLegacyRow(id); - else legacyDeferred.add(id); - continue; - } - if(next.graph.channels.some(ch=>ch.id!==id&& - displayNameFor(ch).toLowerCase()===p.name.toLowerCase())){ + const decision=stripVM.legacyIdentityDecision({snapshot:next,id, + identity:p,appearance:channelPresentation,deferred:legacyDeferred, + writable:appearanceWritable,pending:!!pendingIdentity,valid:protocol}); + if(decision.kind==="SKIP")continue; + if(decision.kind==="RETIRE"){retireLegacyRow(id);continue;} + if(decision.kind==="DEFER"||decision.kind==="CONFLICT"){ legacyDeferred.add(id); - status("Legacy channel identity name conflicts with native graph; cache preserved"); + if(decision.kind==="CONFLICT") + status("Legacy channel identity name conflicts with native graph; cache preserved"); continue; } + if(decision.kind!=="SEND")continue; const requestId="appearance-import-"+Date.now().toString(36)+"-"+(++identityRequestSerial); - pendingIdentity={requestId,channelId:id,...p,acked:false,migration:true}; + pendingIdentity={...decision.plan.pending,requestId,migration:true}; backend.emitEvent("arMixChannelIdentitySet",{ - requestId,channelId:id,...p,appearanceRevision, - deviceEpoch:next.device.epoch,graphRevision:next.graph.revision, - rosterRevision:next.graph.rosterRevision + ...decision.plan.payload,requestId }); window.setTimeout(()=>{ if(pendingIdentity?.requestId!==requestId)return; @@ -99,40 +92,32 @@ } } function appearanceFromNative(next){ - const data=next?.raw?.channelAppearance; - if(!data || data.schema!=="arsonmix.native.channel-appearance.v1" || - protocol.decimal(data.revision)===null || !Array.isArray(data.entries) || - typeof data.readOnly!=="boolean"){ - appearanceWritable=false;return; - } - const liveIds=new Set(next.graph.channels.map(ch=>ch.id)); - const observed=new Map(); - for(const p of data.entries){ - if(!p||!liveIds.has(p.id)||observed.has(p.id)|| - !legalName(p.name)||!legalColor(p.color)||!legalIcon(p.icon)){ - appearanceWritable=false; - status("Native channel identity readback invalid; no UI change"); - return; - } - observed.set(p.id,{name:p.name,color:p.color,icon:p.icon}); + const projection=stripVM.identityReadback(next,protocol); + if(projection.kind!=="VALID"){ + appearanceWritable=false; + status("Native channel identity readback invalid; no UI change"); + return; } + // Rendering cache is only a projection of the one accepted JUCE document. channelPresentation.clear(); - for(const [id,p] of observed)channelPresentation.set(id,p); - appearanceRevision=data.revision; - appearanceWritable=!data.readOnly; - if(pendingIdentity?.acked){ - const p=pendingIdentity,confirmed=channelPresentation.get(p.channelId); - if(confirmed?.name===p.name&&confirmed.color===p.color&&confirmed.icon===p.icon){ - pendingIdentity=null; - if(p.migration){ - retireLegacyRow(p.channelId); - status("Legacy channel identity migrated to native workspace · "+p.name); - }else{ - const apply=document.getElementById("identitySave"); - if(apply)apply.disabled=false; - scope?.closeChannelIdentity?.(); - status("Channel updated and stored in native workspace · "+p.name); - } + for(const row of projection.entries) + channelPresentation.set(row.id,{name:row.name,color:row.color,icon:row.icon}); + appearanceRevision=projection.revision; + appearanceWritable=projection.writable; + const verdict=stripVM.identitySettlement(pendingIdentity,next,projection); + if(verdict==="STALE"){ + if(pendingIdentity?.migration)legacyDeferred.add(pendingIdentity.channelId); + rejectIdentity("Channel identity transaction expired · native graph changed"); + }else if(verdict==="CONFIRMED"){ + const p=pendingIdentity;pendingIdentity=null; + if(p.migration){ + retireLegacyRow(p.channelId); + status("Legacy channel identity migrated to native workspace · "+p.name); + }else{ + const apply=document.getElementById("identitySave"); + if(apply)apply.disabled=false; + scope?.closeChannelIdentity?.(); + status("Channel updated and stored in native workspace · "+p.name); } } maybeMigrateLegacy(next); @@ -167,48 +152,29 @@ const localId=scope?.identityTrackId, track=scope?.tracks?.concat(scope.master||[])?.find(x=>x.id===localId), channelId=nativeIdFor(track),current=activeView(); - const rawName=String(document.getElementById("identityName")?.value||""); - const name=rawName.trim().replace(/\s+/g," "); - if(logicalView){ - const unique=logicalView.graph.channels.every(ch=>ch.id===channelId|| - ch.name.toLowerCase()!==name.toLowerCase()); - if(!channelId||!legalName(name)||!unique){ - status("Enter a unique valid channel name");return false; - } - const sent=logicalIntent("RENAME_CHANNEL",channelId,{name}); + const plan=stripVM.identityEditPlan({native:current,logical:logicalView, + channelId,rawName:document.getElementById("identityName")?.value, + color:scope?.identityColor,icon:scope?.identityIcon, + appearance:channelPresentation,appearanceRevision,appearanceWritable, + pending:!!(controller?.state()?.pending||pendingIdentity),valid:protocol}); + if(plan.kind==="LOGICAL"){ + const sent=logicalIntent(plan.operation,plan.channelId,plan.payload); if(!sent.ok){status("Channel rename not saved");return false;} logicalRenameId=channelId; return false; // Native ACK + later readback closes the editor } - if(!channelId||!current||(current?.raw?.mixerSession?.authority!=="CHANNEL_ID")|| - !(current.admitted||current.retained)||!appearanceWritable){ - status("Native channel identity unavailable · verify saved native graph"); - return false; - } - if(controller.state().pending||pendingIdentity){ - status("Finish the current native operation before editing identity"); + if(plan.kind!=="READY"){ + status(plan.kind==="DUPLICATE"?"Channel name is already used": + plan.kind==="BUSY"?"Finish the current native operation before editing identity": + "Native channel identity unavailable · verify saved native graph"); return false; } - const color=scope?.identityColor,icon=scope?.identityIcon; - if(!legalName(name)||!legalColor(color)||!legalIcon(icon)){ - status("Enter a valid channel name, color and icon");return false; - } - const seen=current.graph.channels.some(ch=> - ch.id!==channelId&&displayNameFor(ch).toLowerCase()===name.toLowerCase()); - if(seen){status("Channel name is already used");return false;} const requestId="appearance-"+Date.now().toString(36)+"-"+(++identityRequestSerial); - pendingIdentity={requestId,channelId,name,color,icon,acked:false, - deviceEpoch:current.device.epoch,graphRevision:current.graph.revision, - rosterRevision:current.graph.rosterRevision}; + pendingIdentity={...plan.pending,requestId}; const apply=document.getElementById("identitySave"); if(apply)apply.disabled=true; - backend.emitEvent("arMixChannelIdentitySet",{ - requestId,channelId,name,color,icon, - appearanceRevision,deviceEpoch:current.device.epoch, - graphRevision:current.graph.revision, - rosterRevision:current.graph.rosterRevision - }); - status("Saving native channel identity · "+name); + backend.emitEvent("arMixChannelIdentitySet",{...plan.payload,requestId}); + status("Saving native channel identity · "+plan.pending.name); window.setTimeout(()=>{ if(pendingIdentity?.requestId!==requestId)return; rejectIdentity("Native identity ACK/readback timed out; original identity retained"); @@ -2945,13 +2911,14 @@ controller?.subscribe(); }); backend.addEventListener("arMixChannelIdentityAck", ack=>{ - if(!pendingIdentity||ack?.requestId!==pendingIdentity.requestId)return; - if(ack.ok!==true){ + const decision=stripVM.identityAckResult(pendingIdentity,ack); + if(decision==="IGNORE")return; + if(decision==="REJECTED"){ if(pendingIdentity.migration)legacyDeferred.add(pendingIdentity.channelId); rejectIdentity("Native channel identity rejected · "+String(ack.error||"Unknown error")); - controller?.subscribe();return; - } - pendingIdentity.acked=true; + }else pendingIdentity.acked=true; + // ACK alone cannot change an editor; the next accepted native + // readback, same graph lease and appearance identity must prove it. controller?.subscribe(); }); backend.addEventListener("arMixNativeSourceAck",ack=>{ From 015ac5f8aabf887b933389f4d9c3742cb9010b5a Mon Sep 17 00:00:00 2001 From: Ari Sulistiono Date: Wed, 18 Nov 2026 15:38:08 +0700 Subject: [PATCH 2/4] fix(mv11): normalize channel names and fail closed on invalid identity revisions --- web/approved-channel-strip-view-model.js | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/web/approved-channel-strip-view-model.js b/web/approved-channel-strip-view-model.js index 1ef989406..df0bd2f51 100644 --- a/web/approved-channel-strip-view-model.js +++ b/web/approved-channel-strip-view-model.js @@ -393,9 +393,9 @@ appearance,appearanceRevision,appearanceWritable, pending=false,valid}={}) { const no={kind:"UNAVAILABLE"}; - const name=String(rawName??"").trim().replace(/\\s+/g," "); - if(!decimalId(channelId)||!valid?.validPresentationName?.(name)) - return no; + const name=String(rawName??"").trim().replace(/\s+/g," "); + if(!decimalId(channelId))return no; + if(!valid?.validPresentationName?.(name))return {kind:"INVALID_NAME"}; const current=logical||native; const channels=current?.graph?.channels; if(!Array.isArray(channels)||channels.filter(ch=>ch?.id===channelId).length!==1) @@ -414,9 +414,9 @@ !(native.admitted===true||native.retained===true)|| appearanceWritable!==true||valid?.decimal?.(appearanceRevision)===null|| !decimalId(native.device?.epoch)||!decimalId(native.graph?.revision)|| - !decimalId(native.graph?.rosterRevision)|| - !valid.validPresentationColor?.(color)|| - !valid.validPresentationIcon?.(icon))return no; + !decimalId(native.graph?.rosterRevision))return no; + if(!valid.validPresentationColor?.(color)|| + !valid.validPresentationIcon?.(icon))return {kind:"INVALID_FIELDS"}; const payload={channelId,name,color,icon,appearanceRevision, deviceEpoch:native.device.epoch,graphRevision:native.graph.revision, rosterRevision:native.graph.rosterRevision}; @@ -439,13 +439,10 @@ !(snapshot?.admitted===true||snapshot?.retained===true)|| !snapshot.graph.channels?.some(ch=>ch.id===pending.channelId)) return "STALE"; + const validRevision=x=>x==="0"||decimalId(x); if(projection?.kind!=="VALID"|| - !decimalId(projection.revision)&&projection.revision!=="0"|| - (projection.revision!=="0"&& - !decimalId(projection.revision))|| - typeof pending.beforeAppearanceRevision!=="string"|| - !/^(0|[1-9][0-9]*)$/.test(pending.beforeAppearanceRevision)) - return "WAIT"; + !validRevision(projection.revision)|| + !validRevision(pending.beforeAppearanceRevision))return "WAIT"; if(BigInt(projection.revision) Date: Wed, 18 Nov 2026 15:39:47 +0700 Subject: [PATCH 3/4] test(mv11): native channel identity lifecycle, migration and exact readback contracts --- tests/approved_native_m2_contract.test.cjs | 152 +++++++++++++++++++++ 1 file changed, 152 insertions(+) diff --git a/tests/approved_native_m2_contract.test.cjs b/tests/approved_native_m2_contract.test.cjs index bb7f0eb26..1761175fe 100644 --- a/tests/approved_native_m2_contract.test.cjs +++ b/tests/approved_native_m2_contract.test.cjs @@ -3808,3 +3808,155 @@ test("MV-9B Global FX ignores rejected post-ACK snapshot after a pre-ACK value r assert.equal(button.disabled,false); assert.ok(viewCalls>beforeInvalid); }); + +test("MV-11 channel appearance projection rejects partial, stale and forged identities",()=>{ + const big="9007199254740993",maximum="18446744073709551615"; + const snap={device:{epoch:"51"},graph:{revision:"21",rosterRevision:"5", + channels:[{id:big,name:"Vox"},{id:maximum,name:"MAIN"}]},raw:{mixerSession:{ + authority:"CHANNEL_ID"},channelAppearance:{schema:"arsonmix.native.channel-appearance.v1", + revision:"0",readOnly:false,entries:[{id:big,name:"Voice",color:"#aabbcc",icon:"🎙"}]}}}; + const before=JSON.stringify(snap),project=x=>stripVM.identityReadback(x,protocol); + const p=project(snap); + assert.deepEqual(p,{kind:"VALID",revision:"0",writable:true, + entries:[{id:big,name:"Voice",color:"#aabbcc",icon:"🎙"}]}); + assert.equal(project({...snap,raw:{...snap.raw,channelAppearance:{ + ...snap.raw.channelAppearance,readOnly:true}}}).writable,false); + for(const invalid of [ + {...snap,graph:{...snap.graph,channels:[snap.graph.channels[0],snap.graph.channels[0]]}}, + {...snap,raw:{...snap.raw,channelAppearance:{...snap.raw.channelAppearance, + revision:"18446744073709551616"}}}, + {...snap,raw:{...snap.raw,channelAppearance:{...snap.raw.channelAppearance, + entries:[...snap.raw.channelAppearance.entries,...snap.raw.channelAppearance.entries]}}}, + {...snap,raw:{...snap.raw,channelAppearance:{...snap.raw.channelAppearance, + entries:[{id:"9007199254740994",name:"Ghost",color:"#aabbcc",icon:"🎙"}]}}}, + {...snap,raw:{...snap.raw,channelAppearance:{...snap.raw.channelAppearance, + entries:[{id:big,name:"Voice",color:"wrong",icon:"🎙"}]}}}, + {...snap,raw:{...snap.raw,channelAppearance:{...snap.raw.channelAppearance, + entries:[{id:Number(big),name:"Voice",color:"#aabbcc",icon:"🎙"}]}}}, + {...snap,raw:{...snap.raw,channelAppearance:{...snap.raw.channelAppearance, + entries:[{id:big,name:"Voice",color:"#aabbcc",icon:"