catarrh
6360dc5bae
Presets drop the card-wide SPI1/SPI2 and the fixed tar/uiccTar/usimTar fields: a preset now carries `tars` - the three mandatory role entries (isd/uiccRfm/usimRfm, spec defaults pre-settled) plus free TARs with an optional description, each with its MSL (Minimum SPI1, TS 102 226 8.2.1.3.2.4). v3.9.1 presets convert on load/import (the spi1 seeds all three MSLs); duplicate TARs and empty TAR/MSL values are refused; the store schema version is 3. Operations derive a packet's SPI1 from its TAR's MSL (_spi1_for_tar): the RAM ops, the test runner (per-step overrides still win), the counter probe and each TAR-probe row; the plain send keeps an explicit SPI1 with a `warning` when it is below the MSL, and a TAR outside the preset without an explicit SPI1 is refused with a hint. The TAR probe resolves per checked TAR before sending and reports the effective spi1 per row. The secured packet form's SPI2 default is 00 (the RAM/probe operations pin their own). PWA: the Cards form edits the TAR table (role rows with MSL inputs plus Add/Remove free rows with a description), the list shows a TARs (MSL) column, the SCP80 TAR field suggests the preset's entries (datalist) and a preset apply seeds the SPI1 from the operation TAR's MSL with an amber warning below it; the preset-wide SPI1/SPI2 fields and the header marker's SPI requirement are gone (completeness = a keyset + the three role entries with their MSLs). Help EN/RU, docs/api.md and AGENTS updated; sw cache simple-v358. Live: TAR probe 000000 at its MSL 16 (registered, por_ok, counter advanced); a send without spi1 derived 16 (por_ok, counter advanced); a send with spi1 0A returned the warning and the card refused it (6200, no counter consumed); an unknown TAR without spi1 was refused with the hint.
349 lines
14 KiB
JavaScript
349 lines
14 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 extractConst(src, name) {
|
|
const m = new RegExp('const\\s+' + name + '\\s*=\\s*([^;]+);').exec(src);
|
|
if (!m) throw new Error('const ' + name + ' not found');
|
|
return 'var ' + name + ' = ' + m[1] + ';\n';
|
|
}
|
|
|
|
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 _pysimServerAvailable = null;\nvar _pysimCardEquipped = false;\nvar _pysimEquipping = false;\nvar _pysimCardIccid = null;\nvar _pysimHeaderIccid = undefined;\nvar _pysimHeaderScp80 = undefined;\nvar _pysimHeaderScp81 = undefined;\n';
|
|
code += extractFunc(html, 'pysimAvailabilityState') + '\n';
|
|
code += extractFunc(html, 'pysimControlDisabled') + '\n';
|
|
code += extractFunc(html, 'pysimNeedsHint') + '\n';
|
|
code += extractFunc(html, 'pysimApplyAvailability') + '\n';
|
|
code += extractFunc(html, 'pysimUpdateCardActionLabels') + '\n';
|
|
code += extractFunc(html, 'pysimUpdateStateIndicator') + '\n';
|
|
code += extractFunc(html, 'pysimUpdateIccidIndicator') + '\n';
|
|
code += extractFunc(html, 'pysimUpdatePresetIndicator') + '\n';
|
|
code += extractFunc(html, 'pysimUpdatePresetIndicators') + '\n';
|
|
code += extractConst(html, 'CARDS_TAR_DEFAULTS') + extractConst(html, 'CARDS_TAR_ROLES') + extractConst(html, 'CARDS_MSL_DEFAULT');
|
|
code += extractFunc(html, 'cardsTarList') + '\n';
|
|
code += extractFunc(html, 'cardsScp80Complete') + '\n';
|
|
code += extractFunc(html, 'cardsScp81Complete') + '\n';
|
|
code += extractFunc(html, 'cardsMatchedPreset') + '\n';
|
|
code += extractFunc(html, 'spKeysetStartReady') + '\n';
|
|
code += extractFunc(html, 'spPresetIdx') + '\n';
|
|
code += extractFunc(html, 'ramPresetIdx') + '\n';
|
|
code += extractFunc(html, 'tarPresetIdx') + '\n';
|
|
code += extractFunc(html, 'spKeysetCheck') + '\n';
|
|
code += extractFunc(html, 'spKeysetFor') + '\n';
|
|
code += extractFunc(html, 'spKeysetList') + '\n';
|
|
code += extractFunc(html, 'spKeysetKvnOf') + '\n';
|
|
code += 'globalThis.t = s => s;\n';
|
|
code += 'globalThis.testRunActive = () => false;\n';
|
|
eval(code);
|
|
|
|
function fakeEl() {
|
|
const classes = new Set();
|
|
return {
|
|
classes,
|
|
attrs: {},
|
|
classList: {
|
|
add: (...cs) => cs.forEach(c => classes.add(c)),
|
|
remove: (...cs) => cs.forEach(c => classes.delete(c)),
|
|
contains: c => classes.has(c),
|
|
},
|
|
setAttribute(k, v) { this.attrs[k] = v; },
|
|
getAttribute(k) { return this.attrs[k]; },
|
|
hasAttribute(k) { return k in this.attrs; },
|
|
removeAttribute(k) { delete this.attrs[k]; },
|
|
};
|
|
}
|
|
|
|
function setup() {
|
|
const els = {
|
|
'state-indicator': fakeEl(),
|
|
'state-indicator-dot': fakeEl(),
|
|
'state-indicator-img': fakeEl(),
|
|
'state-indicator-iccid': fakeEl(),
|
|
'state-indicator-scp80': fakeEl(),
|
|
'state-indicator-scp81': fakeEl(),
|
|
};
|
|
els['state-indicator-img'].src = '';
|
|
globalThis.document = { getElementById: id => els[id] || null, querySelectorAll: () => [] };
|
|
_pysimServerAvailable = null;
|
|
_pysimCardEquipped = false;
|
|
_pysimEquipping = false;
|
|
_pysimCardIccid = null;
|
|
_pysimHeaderIccid = undefined;
|
|
_pysimHeaderScp80 = undefined;
|
|
_pysimHeaderScp81 = undefined;
|
|
globalThis.cards = [];
|
|
globalThis.cardsFindByIccid = () => -1;
|
|
return els;
|
|
}
|
|
|
|
test('unprobed server shows a gray dot and a Connecting title', () => {
|
|
const els = setup();
|
|
pysimUpdateStateIndicator();
|
|
const { 'state-indicator': wrap, 'state-indicator-dot': dot, 'state-indicator-img': img } = els;
|
|
assert.ok(dot.classes.has('text-gray-400'));
|
|
assert.ok(!dot.classes.has('hidden'));
|
|
assert.ok(img.classes.has('hidden'));
|
|
assert.strictEqual(wrap.attrs.title, 'Connecting...');
|
|
assert.strictEqual(dot.attrs.title, 'Connecting...');
|
|
});
|
|
|
|
test('unreachable server shows a red dot', () => {
|
|
const els = setup();
|
|
_pysimServerAvailable = false;
|
|
pysimUpdateStateIndicator();
|
|
const { 'state-indicator': wrap, 'state-indicator-dot': dot, 'state-indicator-img': img } = els;
|
|
assert.ok(dot.classes.has('text-red-500'));
|
|
assert.ok(!dot.classes.has('text-gray-400'));
|
|
assert.ok(img.classes.has('hidden'));
|
|
assert.strictEqual(wrap.attrs.title, 'No server connection');
|
|
assert.strictEqual(dot.attrs.title, 'No server connection');
|
|
});
|
|
|
|
test('server up without a card shows nosim.svg', () => {
|
|
const els = setup();
|
|
_pysimServerAvailable = true;
|
|
pysimUpdateStateIndicator();
|
|
const { 'state-indicator': wrap, 'state-indicator-dot': dot, 'state-indicator-img': img } = els;
|
|
assert.ok(dot.classes.has('hidden'));
|
|
assert.ok(!img.classes.has('hidden'));
|
|
assert.strictEqual(img.src, 'nosim.svg');
|
|
assert.strictEqual(wrap.attrs.title, 'Server connected, no card equipped');
|
|
assert.strictEqual(dot.attrs.title, undefined);
|
|
});
|
|
|
|
test('equipped card shows sim.svg', () => {
|
|
const els = setup();
|
|
_pysimServerAvailable = true;
|
|
_pysimCardEquipped = true;
|
|
pysimUpdateStateIndicator();
|
|
const { 'state-indicator': wrap, 'state-indicator-img': img } = els;
|
|
assert.strictEqual(img.src, 'sim.svg');
|
|
assert.strictEqual(wrap.attrs.title, 'Card equipped');
|
|
});
|
|
|
|
test('equipping shows the animated sim_anim.svg', () => {
|
|
const els = setup();
|
|
_pysimServerAvailable = true;
|
|
_pysimEquipping = true;
|
|
pysimUpdateStateIndicator();
|
|
const { 'state-indicator': wrap, 'state-indicator-img': img } = els;
|
|
assert.strictEqual(img.src, 'sim_anim.svg');
|
|
assert.strictEqual(wrap.attrs.title, 'Card inserted — initializing...');
|
|
});
|
|
|
|
test('dot color transitions do not accumulate', () => {
|
|
const els = setup();
|
|
_pysimServerAvailable = false;
|
|
pysimUpdateStateIndicator();
|
|
_pysimServerAvailable = null;
|
|
pysimUpdateStateIndicator();
|
|
const dot = els['state-indicator-dot'];
|
|
assert.ok(dot.classes.has('text-gray-400'));
|
|
assert.ok(!dot.classes.has('text-red-500'));
|
|
});
|
|
|
|
test('indicator markup carries the dot and image elements', () => {
|
|
assert.match(html, /id="state-indicator-dot"/);
|
|
assert.match(html, /id="state-indicator-img"[^>]*src="nosim\.svg"/);
|
|
});
|
|
|
|
test('header prints the equipped card ICCID next to the card image', () => {
|
|
const els = setup();
|
|
pysimUpdateIccidIndicator('89701450001700031958');
|
|
const el = els['state-indicator-iccid'];
|
|
assert.strictEqual(el.textContent, '89701450001700031958');
|
|
assert.ok(!el.classes.has('hidden'));
|
|
// no card session -> hidden again
|
|
pysimUpdateIccidIndicator(null);
|
|
assert.strictEqual(el.textContent, '');
|
|
assert.ok(el.classes.has('hidden'));
|
|
// markup order: image, ICCID, ADM badge, SCP80, SCP81
|
|
assert.ok(html.indexOf('id="state-indicator-img"') < html.indexOf('id="state-indicator-iccid"'));
|
|
assert.ok(html.indexOf('id="state-indicator-iccid"') < html.indexOf('id="state-indicator-adm"'));
|
|
assert.ok(html.indexOf('id="state-indicator-adm"') < html.indexOf('id="state-indicator-scp80"'));
|
|
assert.ok(html.indexOf('id="state-indicator-scp80"') < html.indexOf('id="state-indicator-scp81"'));
|
|
});
|
|
|
|
test('SCP80/SCP81 markers follow the matching preset completeness', () => {
|
|
const els = setup();
|
|
globalThis.cards = [{ name: 'C', kic: '15', kid: '15',
|
|
cntr: '0000000001', kicKey: 'AA', kidKey: 'BB', pskIdentity: 'id', pskKey: 'KEY',
|
|
tars: [{ role: 'isd', tar: '000000', msl: '16' },
|
|
{ role: 'uiccRfm', tar: 'B00000', msl: '16' },
|
|
{ role: 'usimRfm', tar: 'B00001', msl: '16' }] }];
|
|
globalThis.cardsFindByIccid = () => 0;
|
|
_pysimCardIccid = '89701450001700031958';
|
|
pysimUpdatePresetIndicators();
|
|
const e80 = els['state-indicator-scp80'];
|
|
const e81 = els['state-indicator-scp81'];
|
|
assert.strictEqual(e80.textContent, 'SCP80');
|
|
assert.strictEqual(e81.textContent, 'SCP81');
|
|
assert.ok(!e80.classes.has('hidden'));
|
|
assert.ok(!e81.classes.has('hidden'));
|
|
assert.strictEqual(e80.attrs.title, 'SCP80 preset complete');
|
|
assert.strictEqual(e81.attrs.title, 'SCP81 preset complete');
|
|
// SCP80 incomplete (missing key) -> only the SCP81 marker stays
|
|
globalThis.cards[0].kicKey = '';
|
|
pysimUpdatePresetIndicators();
|
|
assert.ok(e80.classes.has('hidden'));
|
|
assert.strictEqual(e80.textContent, '');
|
|
assert.strictEqual(e80.attrs.title, undefined);
|
|
assert.ok(!e81.classes.has('hidden'));
|
|
// no matching preset -> both hidden
|
|
globalThis.cardsFindByIccid = () => -1;
|
|
pysimUpdatePresetIndicators();
|
|
assert.ok(e81.classes.has('hidden'));
|
|
// explicit null ICCID (no card / server lost) hides them
|
|
globalThis.cardsFindByIccid = () => 0;
|
|
pysimUpdatePresetIndicators(null);
|
|
assert.ok(e80.classes.has('hidden'));
|
|
assert.ok(e81.classes.has('hidden'));
|
|
});
|
|
|
|
test('card-iccid controls need an equipped card with a readable ICCID', () => {
|
|
const check = (state, iccid) => {
|
|
const el = fakeEl();
|
|
el.setAttribute('data-needs', 'card-iccid');
|
|
globalThis.document = { querySelectorAll: () => [el], getElementById: () => null };
|
|
_pysimServerAvailable = state !== 'server-down';
|
|
_pysimCardEquipped = state === 'card';
|
|
_pysimCardIccid = iccid;
|
|
pysimApplyAvailability();
|
|
return el;
|
|
};
|
|
// no card -> disabled
|
|
let el = check('no-card', null);
|
|
assert.strictEqual(el.disabled, true);
|
|
assert.strictEqual(el.attrs.title, 'Insert and equip a card');
|
|
// equipped but unreadable ICCID -> disabled with its own hint
|
|
el = check('card', null);
|
|
assert.strictEqual(el.disabled, true);
|
|
assert.strictEqual(el.attrs.title, 'Card equipped but its ICCID is not readable');
|
|
// equipped with an ICCID -> enabled
|
|
el = check('card', '8970119000004600098');
|
|
assert.strictEqual(el.disabled, false);
|
|
assert.strictEqual(el.attrs.title, undefined);
|
|
// server down -> disabled
|
|
el = check('server-down', '8970119000004600098');
|
|
assert.strictEqual(el.disabled, true);
|
|
});
|
|
|
|
test('Read decoded needs a client-side decoder for the selected file', () => {
|
|
const run = (hasDecoder, cardEquipped) => {
|
|
const el = fakeEl();
|
|
el.setAttribute('data-needs', 'card');
|
|
el.setAttribute('data-needs-decoder', '');
|
|
globalThis.document = { querySelectorAll: () => [el], getElementById: () => null };
|
|
_pysimServerAvailable = true;
|
|
_pysimCardEquipped = cardEquipped;
|
|
globalThis.pysimFsHasDecoder = () => hasDecoder;
|
|
pysimApplyAvailability();
|
|
return el;
|
|
};
|
|
// decoder present, card equipped -> enabled, no tooltip
|
|
let el = run(true, true);
|
|
assert.strictEqual(el.disabled, false);
|
|
assert.strictEqual(el.attrs.title, undefined);
|
|
// no decoder -> disabled with its own hint
|
|
el = run(false, true);
|
|
assert.strictEqual(el.disabled, true);
|
|
assert.strictEqual(el.attrs.title, 'No decoder for this file');
|
|
// card missing and no decoder -> the card hint wins
|
|
el = run(false, false);
|
|
assert.strictEqual(el.disabled, true);
|
|
assert.strictEqual(el.attrs.title, 'Insert and equip a card');
|
|
});
|
|
|
|
test('indicator image stays within the 32px header row budget', () => {
|
|
const m = /id="state-indicator-img"[^>]*style="width:(\d+)px;height:(\d+)px"/.exec(html);
|
|
assert.ok(m, 'inline image size not found');
|
|
assert.strictEqual(m[1], m[2]);
|
|
const size = Number(m[1]);
|
|
assert.ok(size >= 24 && size <= 32, 'size ' + size + 'px would change the header height');
|
|
});
|
|
|
|
test('header badges are bordered chips with even spacing', () => {
|
|
for (const id of ['state-indicator-adm', 'state-indicator-scp80', 'state-indicator-scp81']) {
|
|
const m = new RegExp('id="' + id + '"[^>]*class="([^"]*)"').exec(html);
|
|
assert.ok(m, id + ' markup not found');
|
|
assert.match(m[1], /\bborder\b/);
|
|
assert.match(m[1], /\brounded\b/);
|
|
}
|
|
assert.match(html, /id="state-indicator-scp80"[^>]*class="[^"]*ml-1/);
|
|
assert.match(html, /id="state-indicator-scp81"[^>]*class="[^"]*ml-1/);
|
|
});
|
|
|
|
test('card action labels carry the equipped ICCID', () => {
|
|
setup();
|
|
const plain = fakeEl();
|
|
const colon = fakeEl();
|
|
colon.attrs['data-iccid-sep'] = ': ';
|
|
globalThis.document.querySelectorAll = sel => sel === '.profiler-iccid-label' ? [plain, colon] : [];
|
|
_pysimCardIccid = '89701450001700031958';
|
|
pysimUpdateCardActionLabels();
|
|
assert.strictEqual(plain.textContent, ' 89701450001700031958');
|
|
assert.strictEqual(colon.textContent, ': 89701450001700031958');
|
|
_pysimCardIccid = null;
|
|
pysimUpdateCardActionLabels();
|
|
assert.strictEqual(plain.textContent, '');
|
|
assert.strictEqual(colon.textContent, '');
|
|
});
|
|
|
|
test('the start buttons wait for a preset and a keyset defined in it', () => {
|
|
const run = (presetIdx, kic, kid) => {
|
|
const el = fakeEl();
|
|
el.setAttribute('data-needs', 'card');
|
|
el.setAttribute('data-needs-keyset', 'sp');
|
|
const els = {
|
|
'sp-card-sel': { value: presetIdx },
|
|
'sp-kic-hex': { value: kic },
|
|
'sp-kid-hex': { value: kid },
|
|
};
|
|
globalThis.document = { querySelectorAll: () => [el], getElementById: id => els[id] || null };
|
|
globalThis.cards = [{ name: 'EP', keysets: [
|
|
{ kic: '15', kid: '15', kicKey: 'AA', kidKey: 'BB', cntr: '0000000001' }] }];
|
|
_pysimServerAvailable = true;
|
|
_pysimCardEquipped = true;
|
|
pysimApplyAvailability();
|
|
return el;
|
|
};
|
|
// no preset selected -> disabled with the hint
|
|
let el = run('', '15', '15');
|
|
assert.strictEqual(el.disabled, true);
|
|
assert.strictEqual(el.attrs.title, 'Select a card preset and its keyset');
|
|
// a keyset number the preset does not define -> disabled
|
|
el = run('0', '35', '35');
|
|
assert.strictEqual(el.disabled, true);
|
|
// a keyset of the preset -> enabled, no tooltip
|
|
el = run('0', '15', '15');
|
|
assert.strictEqual(el.disabled, false);
|
|
assert.strictEqual(el.attrs.title, undefined);
|
|
});
|
|
|
|
test('the SCP80/RAM/TAR start buttons carry the keyset gate', () => {
|
|
const sp = /<button[^>]*id="sp-send-btn"[^>]*>/.exec(html)[0];
|
|
assert.match(sp, /data-needs-keyset="sp"/);
|
|
const ram = /<button[^>]*onclick="ramExecute\(\)"[^>]*>/.exec(html)[0];
|
|
assert.match(ram, /data-needs-keyset="ram"/);
|
|
const tar = /<button[^>]*onclick="tarExecute\(\)"[^>]*>/.exec(html)[0];
|
|
assert.match(tar, /data-needs-keyset="tar"/);
|
|
});
|