Skip to content

Commit 14a17bd

Browse files
committed
refactor(mvvm): reconcile #767 device summary projection and stale inventory regressions
1 parent d302b6a commit 14a17bd

3 files changed

Lines changed: 28 additions & 7 deletions

File tree

‎tests/approved_native_m2_contract.test.cjs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2412,6 +2412,9 @@ test("MV-2 Device Setup draft keeps verified output-only selection and never inv
24122412
assert.deepEqual(draft.inputPins,[]);
24132413
assert.deepEqual(draft.outputPins,[0,1]);
24142414
const ui=deviceVM.setupUiModel(inventory,draft,deviceVM.setupInitial());
2415+
assert.deepEqual(ui.selectedInputPins,[]);
2416+
assert.deepEqual(ui.selectedOutputPins,[0,1]);
2417+
assert.match(ui.activeText,/ACTIVE · Windows Audio · 48000 Hz/);
24152418
assert.deepEqual(ui.captureChoices,["","Studio Mic"]);
24162419
assert.deepEqual(ui.rateChoices,["0","48000"]);
24172420
assert.equal(ui.canApply,true);
@@ -2478,6 +2481,16 @@ test("MV-2 pin/rate edits reject phantom endpoints and do not reset native ACK s
24782481
{pinSide:"output",pinIndex:29,checked:true}),pins);
24792482
assert.equal(deviceVM.setupEditDraft(f.inventory,pins,
24802483
{pinSide:"input",pinIndex:-1,checked:true}),pins);
2484+
const unplugged={...f.inventory,active:{...f.inventory.active,
2485+
deviceGeneration:20,captureDevice:"Disconnected endpoint"}};
2486+
assert.equal(deviceVM.setupUiModel(unplugged,pins,
2487+
deviceVM.setupInitial()).same,false);
2488+
assert.equal(deviceVM.setupEditDraft(unplugged,pins,
2489+
{pinSide:"output",pinIndex:2,checked:true}),pins,
2490+
"old physical pins cannot be retargeted against a new inventory");
2491+
const vmText=read("web/approved-device-view-model.js");
2492+
assert.doesNotMatch(vmText,/AudioContext|AudioWorklet|document\\.|window\\.|localStorage/,
2493+
"pure device selector has no DOM or audio authority");
24812494
assert.equal(deviceVM.setupEditDraft(f.inventory,pins,
24822495
{field:"rate",value:"96000"}),pins);
24832496
const sample=deviceVM.setupEditDraft(f.inventory,pins,

‎web/approved-device-view-model.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,19 @@
196196
const same=setupSameEndpoint(inventory,draft);
197197
const active=inventory?.active||{};
198198
const busy=!!state?.pending;
199+
const mainPins=Array.isArray(active.mainOutputs)?active.mainOutputs
200+
.map(pin=>active.outputNames?.[pin]).filter(Boolean):[];
201+
// Device status is presentation only. Hardware approval remains native.
202+
const activeText=state?.message||(active.open?
203+
"ACTIVE · "+active.backend+" · "+active.rate+" Hz / "+active.buffer+" samples"+
204+
(mainPins.length===2?" · MAIN "+mainPins.join(" / "):""):
205+
"No verified audio device. Select a supported input and output.");
206+
const selectedPins=(draftPins,enabled)=>Array.isArray(draftPins)?
207+
draftPins:Array.isArray(enabled)?enabled:[];
199208
return {
209+
activeText,
210+
selectedInputPins:selectedPins(draft?.inputPins,active.enabledInputs),
211+
selectedOutputPins:selectedPins(draft?.outputPins,active.enabledOutputs),
200212
backendChoices:(inventory?.types||[]).map(t=>t.name),
201213
captureChoices:type?.separate===true?["",...(type.inputs||[])]:
202214
type?.inputs||[],

‎web/approved-native-bridge.js‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2238,7 +2238,8 @@
22382238
const control=document.createElement("input");
22392239
control.type="checkbox";control.dataset.audioPin=side;
22402240
control.dataset.pinIndex=String(index);
2241-
control.checked=(deviceChoice[key]||enabled||[]).includes(index);
2241+
control.checked=(side==="input"?ui.selectedInputPins:
2242+
ui.selectedOutputPins).includes(index);
22422243
control.disabled=deviceBusy();
22432244
label.append(control,document.createTextNode(String(name)));
22442245
group.appendChild(label);
@@ -2249,12 +2250,7 @@
22492250
}else pins.textContent="Apply this device first to inspect its real enabled pins.";
22502251
}
22512252
const activeText=devicePanel.querySelector("[data-audio-active]");
2252-
const mainPins=Array.isArray(active.mainOutputs)?active.mainOutputs
2253-
.map(pin=>active.outputNames?.[pin]).filter(Boolean):[];
2254-
if(activeText && !deviceBusy())activeText.textContent=deviceState.message||(active.open?
2255-
"ACTIVE · "+active.backend+" · "+active.rate+" Hz / "+active.buffer+" samples"+
2256-
(mainPins.length===2?" · MAIN "+mainPins.join(" / "):""):
2257-
"No verified audio device. Select a supported input and output.");
2253+
if(activeText && !deviceBusy())activeText.textContent=ui.activeText;
22582254
devicePanel.querySelector("[data-audio-apply]").disabled=!ui.canApply;
22592255
const assignMain=devicePanel.querySelector("[data-audio-main-pins]");
22602256
assignMain.hidden=!ui.canAssignMain;

0 commit comments

Comments
 (0)