Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 90 additions & 0 deletions tests/approved_native_m2_contract.test.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -1690,3 +1690,93 @@ test("native vendor editor retention follows current PCM ownership, not inactive
const change=main.slice(main.indexOf('void changeListenerCallback'),main.indexOf('void timerCallback()',main.indexOf('void changeListenerCallback')));
assert.doesNotMatch(change,/if\(routedEditorOwner_\)closePluginEditor/);
});


test("M5 logical-only editor proves the exact ACK revision and full FX/WIRE effect",()=>{
const id="9007199254740993",main="9007199254740994";
const initial={
revision:"10",mainChannelId:main,
channels:[
{id,role:"INPUT",name:"Vocal",processingFormat:"MONO",primaryOutId:main,
controls:{faderDb:-6,pan:0,mute:false,solo:false},fxRackBypassed:false,
inserts:[{id:"fx-slot-0",catalogId:"vendor.a",bypassed:false},
{id:"fx-slot-1",catalogId:"vendor.b",bypassed:false}]},
{id:main,role:"MAIN",name:"MAIN",processingFormat:"STEREO",
controls:{faderDb:0,pan:0,mute:false,solo:false},inserts:[]}
],
edges:[{edgeId:"101",from:id,to:main,primaryOutput:true,
enabled:true,tap:"POST_FADER",gainLinear:1}]
};
const originalCatalogs=["vendor.a","vendor.b"];
const beforeEdges=clone(initial.edges);
const next=()=>{const graph=clone(initial);graph.revision="11";return graph;};
const pending=(operation,payload={},extras={})=>({
operation,channelId:id,payload,ackRevision:"11",
beforeChannelExists:true,beforeInsertCatalogs:originalCatalogs,
beforeEdges,...extras
});
const proves=(p,g)=>protocol.logicalReadbackProves(p,g);
let g=next();g.channels[0].inserts.push({id:"fx-slot-2",catalogId:"vendor.a",bypassed:false});
assert.equal(proves(pending("ADD_FX_REFERENCE",{catalogId:"vendor.a"}),g),true);
g=next();assert.equal(proves(pending("ADD_FX_REFERENCE",{catalogId:"vendor.a"}),g),false,
"existing instance of same catalog cannot masquerade as new insert");
g=next();g.channels[0].inserts.splice(0,1);
assert.equal(proves(pending("REMOVE_FX_REFERENCE",{slot:0,beforeCount:2}),g),true);
g=next();g.channels[0].inserts.splice(1,1);
assert.equal(proves(pending("REMOVE_FX_REFERENCE",{slot:0,beforeCount:2}),g),false,
"identical rack length with wrong slot removed is not accepted");
g=next();g.channels[0].controls.faderDb=-12;
assert.equal(proves(pending("SET_FADER",{valueDb:-12}),g),true);
assert.equal(proves(pending("SET_FADER",{valueDb:"-12"}),g),false);
assert.equal(proves(pending("SET_FADER",{valueDb:-12}, {ackRevision:"12"}),g),false,
"same effect at wrong revision is not proof of this ACK");
assert.equal(proves(pending("SET_FADER",{valueDb:-12}),{revision:"11"}),false);
g=next();g.channels[0].controls.mute=true;
assert.equal(proves(pending("SET_MUTE",{enabled:true}),g),true);
assert.equal(proves(pending("SET_MUTE",{enabled:"true"}),g),false);
g=next();g.channels[0].inserts[1].bypassed=true;
assert.equal(proves(pending("SET_FX_SLOT_BYPASS",{slot:1,enabled:true}),g),true);
assert.equal(proves(pending("SET_FX_SLOT_BYPASS",{slot:2,enabled:true}),g),false);
g=next();g.channels[0].fxRackBypassed=true;
assert.equal(proves(pending("SET_FX_RACK_BYPASS",{enabled:true}),g),true);
g=next();g.channels[0].name="New Vocal";
assert.equal(proves(pending("RENAME_CHANNEL",{name:"New Vocal"}),g),true);
g=next();g.channels[0].processingFormat="STEREO";
assert.equal(proves(pending("SET_PROCESSING_FORMAT",{format:"STEREO"}),g),true);
g=next();g.channels.push({id:"9007199254740995",role:"GROUP"});
assert.equal(proves(pending("CREATE_GROUP",{},{
channelId:null,createdId:"9007199254740995"}),g),true);
assert.equal(proves(pending("CREATE_GROUP",{},{
channelId:null,createdId:"9007199254740996"}),g),false);
g=next();g.channels.shift();g.edges=[];
assert.equal(proves(pending("DELETE_CHANNEL"),g),true);
assert.equal(proves(pending("DELETE_CHANNEL",{},{
beforeChannelExists:false}),g),false);
const wire=change=>pending("WIRE_TRANSACTION",{changes:[change]});
g=next();g.channels[0].primaryOutId=undefined;g.edges=[];
assert.equal(proves(wire({op:"DISCONNECT",from:id}),g),true);
assert.equal(proves(wire({op:"REMOVE",from:id,edgeId:"101"}),g),true);
assert.equal(proves(wire({op:"REMOVE",from:id,edgeId:"999"}),g),false);
g=next();g.edges.push({edgeId:"102",from:id,to:main,primaryOutput:false,
enabled:true,tap:"POST_FADER",gainLinear:.5});
assert.equal(proves(wire({op:"CONNECT",from:id,to:main,gainLinear:.5}),g),true);
assert.equal(proves(wire({op:"CONNECT",from:id,to:main,gainLinear:.8}),g),false);
assert.equal(proves(wire({op:"CONNECT",from:id,to:main}),next()),false,
"existing edge to the destination is not evidence of a new send");
g=next();g.edges[0].to="9007199254740996";
assert.equal(proves(wire({op:"RETARGET",from:id,edgeId:"101",to:"9007199254740996"}),g),true);
assert.equal(proves(wire({op:"RETARGET",from:id,edgeId:"101",to:main}),next()),false);
assert.equal(proves(wire({op:"ROUTE_ONLY",from:id,to:main}),next()),true);
assert.equal(proves(wire({op:"ROUTE_ONLY",from:id,to:"9007199254740996"}),next()),false);
assert.equal(proves(pending("WIRE_TRANSACTION",{changes:[
{op:"ROUTE_ONLY",from:id,to:main},{op:"CONNECT",from:id,to:main}
]}),next()),false,"JUCE accepts one offline WIRE change, never just changes[0]");
assert.equal(proves(pending("WIRE_TRANSACTION",{changes:[
{op:"ROUTE_ONLY",from:main,to:main}
]}),next()),false,"cross-channel readback cannot prove another ChannelId");
const bridge=read("web/approved-native-bridge.js");
assert.match(bridge,/protocol\.logicalReadbackProves\(p,offline\.graph\)/);
assert.doesNotMatch(bridge,/function logicalReadbackProves\(/);
assert.match(bridge,/beforeInsertCatalogs:/);
assert.match(bridge,/beforeEdges:/);
});
47 changes: 13 additions & 34 deletions web/approved-native-bridge.js
Original file line number Diff line number Diff line change
Expand Up @@ -365,9 +365,16 @@
operation==="SET_PAN"?payload.value:
["SET_MUTE","SET_SOLO","SET_FX_RACK_BYPASS"].includes(operation)?
payload.enabled:undefined;
const previous=logicalView.graph.channels.find(ch=>ch.id===channelId);
pendingLogical={requestId,operation,channelId,payload,
workspaceToken:logicalView.workspaceToken,
beforeRevision:logicalView.graph.revision,ackRevision:null,createdId:null};
beforeRevision:logicalView.graph.revision,ackRevision:null,createdId:null,
beforeChannelExists:!!previous,
beforeInsertCatalogs:Array.isArray(previous?.inserts)?
previous.inserts.map(fx=>fx.catalogId):null,
beforeEdges:logicalView.graph.edges.filter(e=>e.from===channelId).map(e=>({
edgeId:e.edgeId,to:e.to,primaryOutput:e.primaryOutput,tap:e.tap
}))};
backend.emitEvent("arMixLogicalIntent",{
requestId,workspaceToken:logicalView.workspaceToken,
baseRevision:logicalView.graph.revision,operation,
Expand All @@ -382,37 +389,6 @@
},8000);
return {ok:true,requestId};
}
function logicalReadbackProves(p,graph) {
const row=graph.channels.find(ch=>ch.id===p.channelId),v=p.payload;
switch(p.operation) {
case "CREATE_CHANNEL":return graph.channels.some(ch=>ch.id===p.createdId&&ch.role==="INPUT");
case "CREATE_GROUP":return graph.channels.some(ch=>ch.id===p.createdId&&ch.role==="GROUP");
case "DELETE_CHANNEL":case "REMOVE_BUS":return !row;
case "RENAME_CHANNEL":return row?.name===v.name;
case "SET_PROCESSING_FORMAT":return row?.processingFormat===v.format;
case "SET_FADER":return !!row&&Math.abs(row.controls.faderDb-v.valueDb)<.11;
case "SET_PAN":return !!row&&Math.abs(row.controls.pan-v.value)<.011;
case "SET_MUTE":return row?.controls.mute===v.enabled;
case "SET_SOLO":return row?.controls.solo===v.enabled;
case "SET_FX_RACK_BYPASS":return row?.fxRackBypassed===v.enabled;
case "ADD_FX_REFERENCE":return row?.inserts?.some(fx=>fx.catalogId===v.catalogId);
case "REMOVE_FX_REFERENCE":return !!row&&
row.inserts.length===v.beforeCount-1;
case "SET_FX_SLOT_BYPASS":return row?.inserts?.[v.slot]?.bypassed===v.enabled;
case "WIRE_TRANSACTION": {
const change=v.changes?.[0];
if(!change)return false;
const edges=graph.edges.filter(e=>e.from===change.from);
if(change.op==="REMOVE")return !edges.some(e=>e.edgeId===change.edgeId);
if(change.op==="DISCONNECT")return !edges.some(e=>e.primaryOutput);
if(change.op==="ROUTE_ONLY")return edges.some(e=>e.to===change.to&&e.primaryOutput);
if(change.op==="CONNECT")return edges.some(e=>e.to===change.to&&!e.primaryOutput);
if(change.op==="RETARGET")return edges.some(e=>e.edgeId===change.edgeId&&e.to===change.to);
return false;
}
default:return false;
}
}
function queueWireGainFlush(){
if(wireGainFlushQueued)return;
wireGainFlushQueued=true;
Expand Down Expand Up @@ -2482,8 +2458,11 @@
if(pendingLogical) {
const p=pendingLogical;
if(!p.ackRevision)return; // no optimistic pre-ACK projection
if(BigInt(offline.revision)<BigInt(p.ackRevision))return;
if(!logicalReadbackProves(p,offline.graph)){
if(protocol.cmp(offline.revision,p.ackRevision)<0)return;
// A newer unrelated revision cannot prove THIS ACK's exact edit.
// Preserve the accepted document, then resubscribe rather than
// falsely animating a WIRE or confirming a different FX instance.
if(!protocol.logicalReadbackProves(p,offline.graph)){
pendingLogical=null;
status("Mixer change not verified · refreshing saved session");
controller?.subscribe();
Expand Down
100 changes: 99 additions & 1 deletion web/approved-native-contract.js
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,104 @@
selectedPin:pin?.port??null,nextAction,
readout:label+" "+dbfs(raw)+" · MAIN PCM "+dbfs(main)});
}

// LOGICAL_ONLY has no physical graph/PCM authority. An offline .smix ACK
// proves a committed revision, not the requested edit. Verify exactly the
// accepted logical graph effect before revealing a persisted edit in /preview/.
// Keep this deterministic alongside installed-native readback, outside DOM.
function logicalReadbackProves(p,graph) {
if (!object(p) || !object(p.payload) || !object(graph) ||
!Array.isArray(graph.channels) || !Array.isArray(graph.edges) ||
decimal(p.ackRevision) === null || graph.revision !== p.ackRevision) return false;
const v=p.payload, row=graph.channels.find(ch=>ch.id===p.channelId);
const validId=id=>decimal(id)!==null && id!=="0";
const catalogs=()=>Array.isArray(row?.inserts) ?
row.inserts.map(fx=>fx?.catalogId):null;
const equal=(a,b)=>Array.isArray(a)&&Array.isArray(b)&&
a.length===b.length&&a.every((value,i)=>value===b[i]);
switch(p.operation) {
case "CREATE_CHANNEL":
case "CREATE_GROUP":
return validId(p.createdId) && graph.channels.some(ch=>
ch.id===p.createdId && ch.role===(p.operation==="CREATE_CHANNEL"?"INPUT":"GROUP"));
case "DELETE_CHANNEL":
case "REMOVE_BUS":
return validId(p.channelId) && p.beforeChannelExists===true && !row;
case "RENAME_CHANNEL":
return !!row && typeof v.name==="string" && row.name===v.name;
case "SET_PROCESSING_FORMAT":
return !!row && ["MONO","STEREO"].includes(v.format) &&
row.processingFormat===v.format;
case "SET_FADER":
return !!row && Number.isFinite(v.valueDb) &&
Number.isFinite(row.controls?.faderDb) &&
Math.abs(row.controls.faderDb-v.valueDb)<0.11;
case "SET_PAN":
return !!row && Number.isFinite(v.value) &&
Number.isFinite(row.controls?.pan) &&
Math.abs(row.controls.pan-v.value)<0.011;
case "SET_MUTE":
case "SET_SOLO":
return !!row && isBool(v.enabled) &&
row.controls?.[p.operation==="SET_MUTE"?"mute":"solo"]===v.enabled;
case "SET_FX_RACK_BYPASS":
return !!row && isBool(v.enabled) && row.fxRackBypassed===v.enabled;
case "ADD_FX_REFERENCE":
// A pre-existing insert of the same catalog is NOT proof that a new
// slot was appended. The full ordered rack must match the intended edit.
return !!row && typeof v.catalogId==="string" && v.catalogId.length>0 &&
Array.isArray(p.beforeInsertCatalogs) &&
p.beforeInsertCatalogs.length<8 &&
equal(catalogs(),[...p.beforeInsertCatalogs,v.catalogId]);
case "REMOVE_FX_REFERENCE": {
const before=p.beforeInsertCatalogs,slot=v.slot;
if(!row || !Array.isArray(before) || !Number.isInteger(slot) ||
slot<0 || slot>=before.length || v.beforeCount!==before.length)return false;
const expected=before.slice();expected.splice(slot,1);
return equal(catalogs(),expected);
}
case "SET_FX_SLOT_BYPASS":
return !!row && Number.isInteger(v.slot) && v.slot>=0 &&
isBool(v.enabled) && row.inserts?.[v.slot]?.bypassed===v.enabled;
case "WIRE_TRANSACTION": {
// The JUCE logical workspace accepts EXACTLY one WIRE edit per
// transaction. More edits can never be silently accepted from [0].
if(!row || !Array.isArray(v.changes) || v.changes.length!==1 ||
!Array.isArray(p.beforeEdges))return false;
const change=v.changes[0];
if(!object(change) || !validId(change.from) ||
change.from!==p.channelId)return false;
const edges=graph.edges.filter(e=>e.from===p.channelId&&e.enabled!==false);
const before=p.beforeEdges;
const present=id=>before.some(e=>e.edgeId===id);
if(change.op==="REMOVE")
return validId(change.edgeId) && present(change.edgeId) &&
!edges.some(e=>e.edgeId===change.edgeId);
if(change.op==="DISCONNECT")
return before.some(e=>e.primaryOutput===true) &&
!edges.some(e=>e.primaryOutput===true) && !row.primaryOutId;
if(change.op==="ROUTE_ONLY")
return validId(change.to) && row.primaryOutId===change.to &&
edges.some(e=>e.to===change.to && e.primaryOutput===true);
if(change.op==="CONNECT")
return validId(change.to) && edges.some(e=>
e.to===change.to && e.primaryOutput===false &&
validId(e.edgeId) && !present(e.edgeId) &&
(change.tap===undefined || change.tap===e.tap) &&
(change.gainLinear===undefined ||
(Number.isFinite(change.gainLinear) &&
Number.isFinite(e.gainLinear) &&
Math.abs(e.gainLinear-change.gainLinear)<=0.0001)));
if(change.op==="RETARGET")
return validId(change.edgeId) && validId(change.to) &&
before.some(e=>e.edgeId===change.edgeId && e.to!==change.to) &&
edges.some(e=>e.edgeId===change.edgeId && e.to===change.to);
return false;
}
default:return false;
}
}

function createController({emit, onStatus=()=>{}, onAccepted=()=>{}}) {
if (typeof emit !== "function") throw Error("Native emitter required");
let current = null, pending = null, lastRequest = 0, lastError = "NATIVE_NOT_SUBSCRIBED";
Expand Down Expand Up @@ -440,5 +538,5 @@
}
return Object.freeze({subscribe,onSnapshot,onAck,intent,state,expire});
}
return Object.freeze({decimal,cmp,normalizeSnapshot,readbackProvesIntent,diagnoseFirstSound,createController});
return Object.freeze({decimal,cmp,normalizeSnapshot,readbackProvesIntent,logicalReadbackProves,diagnoseFirstSound,createController});
});
Loading