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
124 changes: 123 additions & 1 deletion tests/approved_native_m2_contract.test.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -1619,7 +1619,9 @@ test("P0 output-only Audio I/O is a real native configuration, never blocked by
assert.match(apply,/out\.countNumberOfSetBits\(\)<2/);
assert.doesNotMatch(cpp,/opened->getActiveInputChannels\(\)\.countNumberOfSetBits\(\)<1/);
assert.match(bridge,/No hardware input \(Player \/ FX\)/);
assert.match(bridge,/t\?\.separate\?\["",\.\.\.\(t\.inputs\|\|\[\]\)\]/);
assert.match(bridge,/view\.inputOptions/);
assert.match(read("web/approved-device-view-model.js"),
/type\?\.separate\?\["",\.\.\.\(type\.inputs\|\|\[\]\)\]/);
assert.doesNotMatch(bridge,/ack\.active\.enabledInputs\.length>0/);
assert.match(read("web/approved-device-view-model.js"),/Mixer ready · Output muted/);
});
Expand Down Expand Up @@ -2503,3 +2505,123 @@ test("Device Setup VM retains offline .smix and never promotes rollback to outpu
assert.doesNotMatch(text,/devicePanel\.dataset\.pendingRequest/);
assert.equal((text.match(/backend\.emitEvent\("arMixAction",begun\.request\)/g)||[]).length,1);
});


// MV-2: native Device Setup dropdown/pin draft is ONE pure presentation
// projection; the old approved bridge now only reads it and paints the DOM.
function nativeDeviceDraftFixture() {
const f=nativeDeviceSetupFixture();
const active={...f.active,inputNames:["Mic 1","Mic 2"],
outputNames:["L","R","AUX L","AUX R"],
mainOutputs:[0,1],enabledInputs:[0],enabledOutputs:[0,1],
rates:[48000,96000],buffers:[128,256]};
return {active,types:[
{name:"ASIO",separate:false,
inputs:["ASIO Test","ASIO4ALL v2"],outputs:["ASIO Test","ASIO4ALL v2"]},
{name:"Windows Audio",separate:true,
inputs:["Mic"],outputs:["Speakers"]}
]};
}
test("MV-2 native Device Setup initial draft and verified select options are pure",()=>{
const inventory=nativeDeviceDraftFixture(),prior=JSON.stringify(inventory);
const draft=deviceVM.setupDraft(inventory),untouched=JSON.stringify(draft);
assert.equal(draft.backend,"ASIO");
assert.equal(draft.capture,"ASIO Test");
assert.equal(draft.playback,"ASIO Test");
assert.deepEqual(draft.inputPins,[0]);
const view=deviceVM.setupPresentation(inventory,draft);
assert.equal(view.same,true);
assert.equal(view.canApply,true);
assert.equal(view.canAssignMain,true);
assert.deepEqual(view.backendOptions,["ASIO","Windows Audio"]);
assert.deepEqual(view.rateOptions,["0","48000","96000"]);
assert.deepEqual(view.bufferOptions,["0","128","256"]);
assert.deepEqual(view.outputPins,[0,1]);
assert.match(view.activeText,/MAIN L \/ R/);
assert.equal(view.asio4allHint,false);
assert.equal(JSON.stringify(draft),untouched);
assert.equal(JSON.stringify(inventory),prior,
"view must not mutate JUCE active inventory or .smix");
assert.equal(deviceVM.setupDraft(null),null);
});
test("MV-2 Device Setup backend/capture switches preserve output-only and duplex policy",()=>{
const inventory=nativeDeviceDraftFixture();
const from=deviceVM.setupDraft(inventory);
const external=deviceVM.setupEditDraft(from,inventory,{field:"backend",value:"Windows Audio"});
assert.equal(external.backend,"Windows Audio");
assert.equal(external.capture,"Mic");
assert.equal(external.playback,"Speakers");
assert.equal(external.rate,0);assert.equal(external.buffer,0);
assert.equal(external.inputPins,null);assert.equal(external.outputPins,null);
let outputOnly=deviceVM.setupEditDraft(external,inventory,{field:"capture",value:""});
const view=deviceVM.setupPresentation(inventory,outputOnly);
assert.equal(view.same,false);
assert.deepEqual(view.inputOptions,["","Mic"]);
assert.deepEqual(view.rateOptions,["0"]);
assert.equal(view.canApply,true,"no hardware input allowed for separate backend");
assert.equal(view.canAssignMain,false);
const request=deviceVM.setupBegin(deviceVM.setupInitial(),{
inventory,draft:outputOnly,requestId:"approved-io-output-only"});
assert.ok(request);assert.equal(request.request.config.captureDevice,"");
assert.deepEqual(request.request.config.enabledInputs,[]);
assert.deepEqual(request.request.config.enabledOutputs,[]);
assert.equal(deviceVM.setupEditDraft(outputOnly,inventory,{
field:"capture",value:"Ghost microphone"}),outputOnly);
assert.equal(deviceVM.setupEditDraft(outputOnly,inventory,{
field:"backend",value:"Unknown backend"}),outputOnly);
const invalidPair={...from,playback:"ASIO4ALL v2"};
assert.equal(deviceVM.setupPresentation(inventory,invalidPair).canApply,false);
assert.equal(deviceVM.setupBegin(deviceVM.setupInitial(),{
inventory,draft:invalidPair,requestId:"bad-pair"}),null);
assert.equal(from.backend,"ASIO","original selected device not mutated");
});
test("MV-2 Device Setup pin/rate edits are immutable, bounded and generation-scoped",()=>{
const inventory=nativeDeviceDraftFixture();
const original=deviceVM.setupDraft(inventory);
const extra=deviceVM.setupEditDraft(original,inventory,{
side:"output",index:2,checked:true});
assert.deepEqual(extra.outputPins,[0,1,2]);
assert.deepEqual(original.outputPins,[0,1]);
const pair1=deviceVM.setupEditDraft(extra,inventory,{side:"output",index:0,checked:false});
assert.deepEqual(pair1.outputPins,[1,2]);
assert.equal(deviceVM.setupPresentation(inventory,pair1).canAssignMain,true);
assert.equal(deviceVM.setupEditDraft(pair1,inventory,{
side:"output",index:63,checked:true}),pair1,"phantom jack cannot be drafted");
assert.equal(deviceVM.setupEditDraft(pair1,inventory,{
side:"output",index:1.5,checked:true}),pair1);
assert.equal(deviceVM.setupEditDraft(pair1,inventory,{
side:"output",index:-1,checked:true}),pair1);
assert.equal(deviceVM.setupEditDraft(pair1,inventory,{
field:"rate",value:"44100"}),pair1,"unsupported rate stays unchanged");
const rate=deviceVM.setupEditDraft(pair1,inventory,{field:"rate",value:"96000"});
const buffer=deviceVM.setupEditDraft(rate,inventory,{field:"buffer",value:"128"});
assert.equal(buffer.rate,96000);assert.equal(buffer.buffer,128);
const begun=deviceVM.setupBegin(deviceVM.setupInitial(),{
inventory,draft:buffer,requestId:"approved-io-pins"});
assert.deepEqual(begun.request.config.enabledOutputs,[1,2]);
assert.equal(begun.request.config.sampleRate,96000);
assert.equal(begun.request.config.bufferSize,128);
const stale={...inventory,active:{...inventory.active,deviceGeneration:15,
captureDevice:"Absent ASIO"}};
assert.equal(deviceVM.setupPresentation(stale,buffer).same,false);
assert.equal(deviceVM.setupEditDraft(buffer,stale,{
side:"output",index:3,checked:true}),buffer);
assert.deepEqual(stale.active.enabledOutputs,[0,1],
"draft never alters output permission or physical pin masks");
});
test("MV-2 render uses the existing one ViewModel and keeps native transport authority",()=>{
const bridge=read("web/approved-native-bridge.js");
const setup=bridge.slice(bridge.indexOf(" // Compact DAW-style device preferences"),
bridge.indexOf(" function installFirstSoundMenu()"));
assert.match(setup,/deviceVM\.setupDraft\(deviceInventory\)/);
assert.match(setup,/deviceVM\.setupEditDraft\(deviceChoice,deviceInventory,change\)/);
assert.match(setup,/deviceVM\.setupPresentation\(deviceInventory,deviceChoice,deviceState\)/);
assert.doesNotMatch(setup,/deviceChoice\.(backend|capture|playback|inputPins|outputPins|rate|buffer)\s*=/);
assert.doesNotMatch(setup,/const selected=types\.find/);
assert.equal((setup.match(/backend\.emitEvent\("arMixAction",begun\.request\)/g)||[]).length,1);
const vmText=read("web/approved-device-view-model.js");
assert.doesNotMatch(vmText,/AudioContext|AudioWorklet|document\.|window\.|localStorage/);
const inventory=nativeDeviceDraftFixture();
assert.equal(deviceVM.setupPresentation(inventory,deviceVM.setupDraft(inventory),{
...deviceVM.setupInitial(),remapGeneration:inventory.active.deviceGeneration}).canReusePins,true);
});
4 changes: 3 additions & 1 deletion tests/approved_operator_ux_smoke.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ def test_native_hooks_and_audio_input_default(self):
self.assertIn("STALE_CHANNEL_APPEARANCE_REVISION",appearance)
self.assertIn("CHANNEL_NAME_ALREADY_IN_USE",appearance)
self.assertIn("deviceManager_.initialise (2, 2, savedSettings, !savedRoute)",engine)
self.assertIn("active.enabledInputs",bridge)
device_vm=(ROOT/"web/approved-device-view-model.js").read_text(encoding="utf-8")
self.assertIn("active.enabledInputs",device_vm)
self.assertIn("view.inputPins",bridge)
self.assertIn("data-audio-asio4all-hint",bridge)
self.assertIn("armix-floating-close",bridge)
self.assertIn("viewportWidth:Math.round(window.innerWidth)",bridge)
Expand Down
109 changes: 99 additions & 10 deletions web/approved-device-view-model.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,100 @@
return {match,state,value,marker,title};
}

// One transient draft for the existing Device Setup dialog. All native
// inventory and installed PCM remain external readback, never owned here.
function setupSameEndpoint(active,draft) {
return active?.open===true&&active.backend===draft?.backend&&
active.captureDevice===draft.capture&&active.playbackDevice===draft.playback;
}
function setupDraft(inventory) {
if(!inventory?.active||!Array.isArray(inventory.types))return null;
const active=inventory.active,types=inventory.types;
const backend=active.backend||types[0]?.name||"";
const type=types.find(t=>t.name===backend);
const capture=active.open?String(active.captureDevice||""):
active.captureDevice||type?.inputs?.[0]||"";
return {backend,capture,
playback:active.playbackDevice||
(type?.separate?type?.outputs?.[0]:capture)||"",
inputPins:Array.isArray(active.enabledInputs)?active.enabledInputs.slice():null,
outputPins:Array.isArray(active.enabledOutputs)?active.enabledOutputs.slice():null,
rate:0,buffer:0};
}
function setupPresentation(inventory,draft,state=setupInitial()) {
const active=inventory?.active||{},types=inventory?.types||[];
const type=types.find(t=>t?.name===draft?.backend);
const same=setupSameEndpoint(active,draft);
const inputOptions=type?.separate?["",...(type.inputs||[])]:type?.inputs||[];
const outputOptions=type?.outputs||[];
const rates=same?active.rates||[]:[];
const buffers=same?active.buffers||[]:[];
const mainPins=Array.isArray(active.mainOutputs)?active.mainOutputs
.map(pin=>active.outputNames?.[pin]).filter(Boolean):[];
const noInput=type?.separate===true&&draft?.capture==="";
const inputValid=noInput||Boolean(type?.inputs?.includes(draft?.capture));
const outputValid=Boolean(outputOptions.includes(draft?.playback));
const canApply=Boolean(type && draft?.backend && inputValid&&outputValid&&
(type.separate===true||draft.capture===draft.playback));
const selectedPins=(key,enabled)=>Array.isArray(draft?.[key])?
draft[key]:Array.isArray(enabled)?enabled:[];
return {type,same,backendOptions:types.map(t=>t.name),
inputOptions,outputOptions,rateOptions:["0",...rates.map(String)],
bufferOptions:["0",...buffers.map(String)],
inputPins:selectedPins("inputPins",active.enabledInputs),
outputPins:selectedPins("outputPins",active.enabledOutputs),
canApply,canAssignMain:same&&draft?.outputPins?.length===2,
canReusePins:same&&state.remapGeneration===active.deviceGeneration,
asio4allHint:draft?.backend==="ASIO"&&/asio4all/i.test(draft?.capture||""),
activeText:state.message||(active.open?
"ACTIVE · "+active.backend+" · "+active.rate+" Hz / "+active.buffer+" samples"+
(mainPins.length===2?" · MAIN "+mainPins.join(" / "):""):
"No verified audio device. Select a supported input and output.")};
}
function setupEditDraft(draft,inventory,change) {
if(!draft||!inventory?.active||!change||
typeof change!=="object")return draft;
const view=setupPresentation(inventory,draft);
if(typeof change.side==="string") {
if(!view.same||!["input","output"].includes(change.side)||
!Number.isInteger(change.index)||change.index<0||change.index>=64||
typeof change.checked!=="boolean")return draft;
const key=change.side==="input"?"inputPins":"outputPins";
const names=inventory.active[change.side==="input"?"inputNames":"outputNames"];
if(!Array.isArray(names)||change.index>=names.length)return draft;
const selected=new Set(view[key]);
if(change.checked)selected.add(change.index);
else selected.delete(change.index);
return {...draft,[key]:[...selected].sort((a,b)=>a-b)};
}
const {field,value}=change;
if(typeof value!=="string")return draft;
if(field==="backend") {
const type=inventory.types?.find(t=>t.name===value);
if(!type)return draft;
const capture=type.inputs?.[0]||"";
return {...draft,backend:value,capture,
playback:type.separate?type.outputs?.[0]||"":capture,
inputPins:null,outputPins:null,rate:0,buffer:0};
}
if(field==="capture") {
if(!view.inputOptions.includes(value))return draft;
return {...draft,capture:value,
playback:view.type?.separate?draft.playback:value,
inputPins:null,outputPins:null};
}
if(field==="playback") {
if(!view.outputOptions.includes(value))return draft;
return {...draft,playback:value,inputPins:null,outputPins:null};
}
if(field==="rate"||field==="buffer") {
const options=field==="rate"?view.rateOptions:view.bufferOptions;
if(!view.same||!options.includes(value))return draft;
return {...draft,[field]:Number(value)||0};
}
return draft;
}

// Device Setup UI transaction: pure presentation only. The native
// coordinator remains the sole device apply/rollback and output authority.
// Never treat a successful ACK as installed hardware readback.
Expand All @@ -102,15 +196,9 @@
const active=inventory.active;
const generation=active.deviceGeneration;
if(!Number.isSafeInteger(generation)||generation<0)return null;
const type=inventory.types?.find(x=>x.name===draft.backend);
if(!type||!draft.backend||!draft.playback||
!type.outputs?.includes(draft.playback)||
(!type.separate&&!type.inputs?.includes(draft.capture))||
(type.separate&&draft.capture&&!type.inputs?.includes(draft.capture))||
(!type.separate&&draft.capture!==draft.playback))return null;
const same=active.open===true&&active.backend===draft.backend&&
active.captureDevice===draft.capture&&
active.playbackDevice===draft.playback;
const presentation=setupPresentation(inventory,draft,state);
if(!presentation.canApply)return null;
const same=presentation.same;
if(confirmRetainedPinMapping &&
(!same||state.remapGeneration!==generation))return null;
if(assignMain&&(!same||draft.outputPins?.length!==2))return null;
Expand Down Expand Up @@ -219,6 +307,7 @@
return {...state,phase:"IDLE",message:"",remapGeneration:null};
}
return Object.freeze({activeInputPins,inputChoices,inputLabel,outputChoices,
externalPresentation,setupInitial,setupBegin,setupAck,setupReadback,
externalPresentation,setupDraft,setupPresentation,setupEditDraft,
setupInitial,setupBegin,setupAck,setupReadback,
setupTimeout,setupClearResult});
});
Loading
Loading