8459040856
The proactive command list only re-rendered on tab/pill switches, so new fetched commands (background STATUS polling, menu traffic) stayed invisible while the Phone view was open. - /api/status now exposes proactive_seq (_PROACTIVE_ENTRY_ID, monotonic and not reset with the log), so the existing 2s status poll detects changes with no extra request; pysimCardStateUpdate() re-renders the log when the sequence changed and the Phone/Phone view is visible - the 5s backend timer no longer fetches the log (it was discarded) and now uses the already-fetched stk-status: when active/pending changes while the Phone tab is visible, stkCheckMenu() refreshes the menu button without a tab switch - pysimProactiveLogRender() keeps its scroll position and only shows Loading... on a first/empty paint - tests: proactive seq + STK signature helpers and poll-driven render behaviour in card_state.test.js; SW cache v123 -> v124.
171 lines
6.5 KiB
JavaScript
171 lines
6.5 KiB
JavaScript
const { test } = require('node:test');
|
|
const assert = require('node:assert');
|
|
const fs = require('node:fs');
|
|
const path = require('node:path');
|
|
|
|
const html = fs.readFileSync(path.join(__dirname, '..', 'index.html'), 'utf8');
|
|
|
|
function extractFunc(src, name) {
|
|
const re = new RegExp('function\\s+' + name + '\\s*\\([^)]*\\)\\s*\\{');
|
|
const m = re.exec(src);
|
|
if (!m) throw new Error('function ' + name + ' not found');
|
|
let i = m.index + m[0].length - 1;
|
|
let depth = 0;
|
|
for (; i < src.length; i++) {
|
|
if (src[i] === '{') depth++;
|
|
else if (src[i] === '}') {
|
|
depth--;
|
|
if (depth === 0) break;
|
|
}
|
|
}
|
|
return src.slice(m.index, i + 1);
|
|
}
|
|
|
|
let code = 'var _pysimCardStateKey = null;\nvar _pysimCardSession = null;\n'
|
|
+ 'var _pysimServerAvailable = null;\nvar _pysimCardEquipped = false;\n'
|
|
+ 'var _pysimProactiveSeq = null;\nvar _pysimStkSig = null;\n';
|
|
code += extractFunc(html, 'pysimCardStateUpdate') + '\n';
|
|
code += extractFunc(html, 'pysimAvailabilityState') + '\n';
|
|
code += extractFunc(html, 'pysimControlDisabled') + '\n';
|
|
code += extractFunc(html, 'pysimProactiveSeqChanged') + '\n';
|
|
code += extractFunc(html, 'pysimStkStatusChanged') + '\n';
|
|
code += '\nglobalThis.esc = s => s;\n';
|
|
code += 'globalThis.t = s => s;\n';
|
|
eval(code);
|
|
|
|
function setup() {
|
|
const el = { textContent: 'status line', innerHTML: '' };
|
|
const calls = { connected: [], resets: [], refreshStatus: [], proactive: 0 };
|
|
_pysimCardStateKey = null;
|
|
_pysimCardSession = null;
|
|
_pysimProactiveSeq = null;
|
|
globalThis.document = { getElementById: () => el, querySelectorAll: () => [] };
|
|
globalThis.pysimSetConnected = v => calls.connected.push(v);
|
|
globalThis.pysimResetCardData = refresh => calls.resets.push(refresh);
|
|
globalThis.pysimApplyAvailability = () => {};
|
|
globalThis.isViewVisible = () => true;
|
|
globalThis.pysimProactiveLogRender = () => { calls.proactive++; };
|
|
return { el, calls };
|
|
}
|
|
|
|
function status(extra) {
|
|
return Object.assign({ connected: false, card_present: false, equipping: false, auto_equip: false, card_session: 1 }, extra);
|
|
}
|
|
|
|
test('disconnect without card shows the no-card message', () => {
|
|
const { el, calls } = setup();
|
|
pysimCardStateUpdate(status({}));
|
|
assert.deepStrictEqual(calls.connected, [false]);
|
|
assert.ok(el.innerHTML.includes('No card detected'), el.innerHTML);
|
|
});
|
|
|
|
test('disconnect with card present shows the Equip hint when auto-equip is off', () => {
|
|
const { el } = setup();
|
|
pysimCardStateUpdate(status({ card_present: true }));
|
|
assert.ok(el.innerHTML.includes('Card inserted — press Equip'), el.innerHTML);
|
|
});
|
|
|
|
test('disconnect with auto-equip shows the initializing message', () => {
|
|
const { el } = setup();
|
|
pysimCardStateUpdate(status({ card_present: true, auto_equip: true }));
|
|
assert.ok(el.innerHTML.includes('initializing'), el.innerHTML);
|
|
});
|
|
|
|
test('unchanged state key does not touch the UI again', () => {
|
|
const { el, calls } = setup();
|
|
pysimCardStateUpdate(status({ card_session: 7 }));
|
|
el.innerHTML = 'unchanged';
|
|
calls.connected.length = 0;
|
|
pysimCardStateUpdate(status({ card_session: 7 }));
|
|
assert.deepStrictEqual(calls.connected, []);
|
|
assert.strictEqual(el.innerHTML, 'unchanged');
|
|
});
|
|
|
|
test('connected restores the UI and reloads card data', () => {
|
|
const { calls } = setup();
|
|
pysimCardStateUpdate(status({ connected: true, card_present: true, card_session: 2 }));
|
|
assert.deepStrictEqual(calls.connected, [true]);
|
|
assert.deepStrictEqual(calls.resets, [true]);
|
|
});
|
|
|
|
test('card session change triggers a data reset', () => {
|
|
const { calls } = setup();
|
|
pysimCardStateUpdate(status({ card_session: 3 }));
|
|
calls.resets.length = 0;
|
|
pysimCardStateUpdate(status({ card_session: 4 }));
|
|
assert.deepStrictEqual(calls.resets, [false]);
|
|
});
|
|
|
|
test('first observation does not trigger a reset on its own', () => {
|
|
const { calls } = setup();
|
|
pysimCardStateUpdate(status({ card_session: 9 }));
|
|
assert.deepStrictEqual(calls.resets, []);
|
|
});
|
|
|
|
test('payload without connected flag is ignored', () => {
|
|
const { calls } = setup();
|
|
pysimCardStateUpdate({ reader: 'x' });
|
|
pysimCardStateUpdate(null);
|
|
assert.deepStrictEqual(calls.connected, []);
|
|
});
|
|
|
|
test('availability state and control gating follow server/card state', () => {
|
|
_pysimServerAvailable = null;
|
|
assert.strictEqual(pysimAvailabilityState(), 'server-down');
|
|
assert.strictEqual(pysimControlDisabled('server', 'server-down'), true);
|
|
assert.strictEqual(pysimControlDisabled('card', 'server-down'), true);
|
|
|
|
_pysimServerAvailable = true;
|
|
_pysimCardEquipped = false;
|
|
assert.strictEqual(pysimAvailabilityState(), 'no-card');
|
|
assert.strictEqual(pysimControlDisabled('server', 'no-card'), false);
|
|
assert.strictEqual(pysimControlDisabled('card', 'no-card'), true);
|
|
|
|
_pysimCardEquipped = true;
|
|
assert.strictEqual(pysimAvailabilityState(), 'card');
|
|
assert.strictEqual(pysimControlDisabled('card', 'card'), false);
|
|
assert.strictEqual(pysimControlDisabled('server', 'card'), false);
|
|
});
|
|
|
|
test('no card with auto-equip enabled still shows the no-card message', () => {
|
|
const { el } = setup();
|
|
pysimCardStateUpdate(status({ connected: false, card_present: false, auto_equip: true }));
|
|
assert.ok(el.innerHTML.includes('No card detected'), el.innerHTML);
|
|
assert.ok(!el.innerHTML.includes('initializing'), el.innerHTML);
|
|
});
|
|
|
|
test('proactive log refreshes when the status sequence changes', () => {
|
|
const { calls } = setup();
|
|
pysimCardStateUpdate(status({ proactive_seq: 7 }));
|
|
pysimCardStateUpdate(status({ proactive_seq: 7 }));
|
|
assert.strictEqual(calls.proactive, 1);
|
|
pysimCardStateUpdate(status({ proactive_seq: 8 }));
|
|
assert.strictEqual(calls.proactive, 2);
|
|
});
|
|
|
|
test('proactive log is not refreshed while the phone view is hidden', () => {
|
|
const { calls } = setup();
|
|
globalThis.isViewVisible = () => false;
|
|
pysimCardStateUpdate(status({ proactive_seq: 3 }));
|
|
assert.strictEqual(calls.proactive, 0);
|
|
});
|
|
|
|
test('pysimProactiveSeqChanged tracks the last sequence', () => {
|
|
_pysimProactiveSeq = null;
|
|
assert.ok(pysimProactiveSeqChanged(4));
|
|
assert.ok(!pysimProactiveSeqChanged(4));
|
|
assert.ok(pysimProactiveSeqChanged(5));
|
|
assert.ok(!pysimProactiveSeqChanged(undefined));
|
|
assert.ok(!pysimProactiveSeqChanged(null));
|
|
});
|
|
|
|
test('pysimStkStatusChanged detects menu state transitions', () => {
|
|
_pysimStkSig = null;
|
|
assert.ok(pysimStkStatusChanged({ active: false, pending: false }));
|
|
assert.ok(!pysimStkStatusChanged({ active: false, pending: false }));
|
|
assert.ok(pysimStkStatusChanged({ active: true, pending: true, pending_type: 'select_item' }));
|
|
assert.ok(!pysimStkStatusChanged({ active: true, pending: true, pending_type: 'select_item' }));
|
|
assert.ok(pysimStkStatusChanged({ active: true, pending: false }));
|
|
assert.ok(!pysimStkStatusChanged(null));
|
|
});
|