6d5d23487a
- Server: _decode_iccid (nibble-swapped E.118 digits, trailing-F pad) and _read_iccid (best-effort MF/2FE2 read through the parent-scoped select helper; the previous selection is restored, the read never raises). The equip path records the digit string before the TERMINAL PROFILE, i.e. before any CAT session is active; a startup with a card does the same. The value is cleared on card removal and exposed as /api/status 'iccid' (only while connected). - PWA: when a connected status update reports a *new* ICCID, the matching card preset is selected in both SCP80 views - Secured Packet (sp-card-sel + form fill) and RAM (ram-card-sel + _ramCardIdx). Matching normalizes digits and accepts the raw EF hex form, leading zeros ignored; a manual choice for the same card is kept until the next equip, and a card removal re-arms the auto-selection. The status line shows the ICCID. - Tests: tests/test_iccid.py (decode variants, model + probe read, equip recording, disconnect clearing) and frontend/tests/cards_iccid.test.js (normalize, find, select, no-override, card swap); the card_state test harness stubs the new hook and covers the guard reset. - Docs: api.md /api/status fields, help EN+RU (SCP80 intro + Cards tab), READMEs, AGENTS. SW cache otaman-v183.
239 lines
9.2 KiB
JavaScript
239 lines
9.2 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;\nvar _pysimAdmVerified = null;\n'
|
|
+ 'var _cardsAutoIccid = 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 += extractFunc(html, 'pysimUpdateAdmIndicator') + '\n';
|
|
code += extractFunc(html, 'pysimSetServerAvailable') + '\n';
|
|
code += '\nglobalThis.esc = s => s;\n';
|
|
code += 'globalThis.t = s => s;\n';
|
|
eval(code);
|
|
|
|
function fakeIndicator() {
|
|
const classes = new Set();
|
|
const el = {
|
|
classes, textContent: '', title: null,
|
|
classList: {
|
|
add: (...c) => c.forEach(x => classes.add(x)),
|
|
remove: (...c) => c.forEach(x => classes.delete(x)),
|
|
contains: c => classes.has(c),
|
|
},
|
|
setAttribute: (k, v) => { if (k === 'title') el.title = v; },
|
|
removeAttribute: (k) => { if (k === 'title') el.title = null; },
|
|
};
|
|
return el;
|
|
}
|
|
|
|
function setup() {
|
|
const el = { textContent: 'status line', innerHTML: '' };
|
|
const adm = fakeIndicator();
|
|
const calls = { connected: [], resets: [], refreshStatus: [], proactive: 0, autoIccid: [] };
|
|
_pysimCardStateKey = null;
|
|
_pysimCardSession = null;
|
|
_pysimProactiveSeq = null;
|
|
_pysimAdmVerified = null;
|
|
_pysimServerAvailable = null;
|
|
_cardsAutoIccid = null;
|
|
globalThis.document = {
|
|
getElementById: id => id === 'state-indicator-adm' ? adm : 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++; };
|
|
globalThis.cardsAutoSelectByIccid = iccid => { calls.autoIccid.push(iccid); return -1; };
|
|
return { el, adm, 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, iccid: '8970119000004600098' }));
|
|
assert.deepStrictEqual(calls.connected, [true]);
|
|
assert.deepStrictEqual(calls.resets, [true]);
|
|
assert.deepStrictEqual(calls.autoIccid, ['8970119000004600098']);
|
|
});
|
|
|
|
test('a disconnect clears the ICCID auto-selection guard', () => {
|
|
setup();
|
|
_cardsAutoIccid = '8970119000004600098';
|
|
pysimCardStateUpdate(status({ connected: false, card_present: false, card_session: 5 }));
|
|
assert.strictEqual(_cardsAutoIccid, null);
|
|
});
|
|
|
|
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));
|
|
});
|
|
|
|
test('the header ADM badge shows verified / not verified / hidden', () => {
|
|
const { adm, calls } = setup();
|
|
pysimCardStateUpdate(status({ connected: true, adm_verified: true }));
|
|
assert.ok(!adm.classes.has('hidden'));
|
|
assert.strictEqual(adm.textContent, 'ADM ✓');
|
|
assert.ok(adm.classes.has('text-emerald-600'));
|
|
assert.ok(adm.classes.has('dark:text-emerald-400'));
|
|
assert.strictEqual(adm.title, 'ADM verified');
|
|
// an unchanged state must not rewrite the badge
|
|
adm.textContent = '';
|
|
pysimCardStateUpdate(status({ connected: true, adm_verified: true }));
|
|
assert.strictEqual(adm.textContent, '', 'unchanged ADM state rewrote the badge');
|
|
// verification lost (e.g. card reset)
|
|
pysimCardStateUpdate(status({ connected: true, adm_verified: false }));
|
|
assert.strictEqual(adm.textContent, 'ADM ✗');
|
|
assert.ok(adm.classes.has('text-red-500'));
|
|
assert.ok(!adm.classes.has('text-emerald-600'));
|
|
assert.strictEqual(adm.title, 'ADM not verified');
|
|
// no card session hides it
|
|
pysimCardStateUpdate(status({ connected: false }));
|
|
assert.ok(adm.classes.has('hidden'));
|
|
assert.strictEqual(adm.title, null);
|
|
// the ADM update must not disturb the connect/reset flow
|
|
assert.deepStrictEqual(calls.connected, [true, false]);
|
|
});
|
|
|
|
test('losing the server hides the ADM badge', () => {
|
|
const { adm } = setup();
|
|
pysimCardStateUpdate(status({ connected: true, adm_verified: true }));
|
|
assert.ok(!adm.classes.has('hidden'));
|
|
pysimSetServerAvailable(false);
|
|
assert.ok(adm.classes.has('hidden'));
|
|
});
|