catarrh
ab373aff30
The bulk workflow: one .cap and one set of install parameters applied to card after card - swap cards and each one installs as soon as it is equipped. The server owns the loop, so closing the tab or reloading the page does not interrupt it. The install chain is now shared: _ram_install_plan(body) builds the card-independent part (the parsed .cap, the INSTALL/LOAD sequence, the block size, the transport knobs) and _ram_install_run(server, body, plan, scc) runs one chain (the per-card preset/keyset/counter resolution included); the /api/ram-install handler is the plan + run + response, and the batch worker calls the same pair. The plan is built once at Start, so a bad .cap or parameter combination is a 400 there (a malformed archive included - a zip parse error is the caller's, never a dropped connection), not a per-card failure. _op_keyset_resolve() is the module form of the handler's _op_keyset() (the dead _keyset_guard method is gone). The worker (_ram_batch_worker, state _RAM_BATCH) polls the card state every 0.5 s and acts on a new card session while connected; a card already equipped at Start installs immediately. Per card the preset is matched by ICCID and its ISD role TAR supplies the keyset (v3.26.0) and the counter seed (v3.20.0); a card with no readable ICCID, no matching preset or no usable ISD keyset is recorded as skipped with its reason. A card is attempted once per run (any outcome): re-equipping it records "already processed in this batch (<outcome>)" and never installs again - restarting the batch is the retry. Failures carry the failing step and the remote SW, are never retried and never stop the run; an unexpected card-handling error is recorded and the loop keeps waiting. Endpoints: POST /api/ram-batch/start (no card needed; 400/409), GET /api/ram-batch/status (card-free - the panel polls it during an install), POST /api/ram-batch/stop (the first _CARD_FREE_POST: it only sets a flag, so the button works while the worker holds the card lock; a running install always finishes first) and POST /api/ram-batch/clear (409 while active). /api/status carries the ram_batch summary (the detailed state minus the attempts list), so the panel's headline - the live phase, the current card, the counts - rides the 2 s poll; the attempts report (the last 500 kept, the total counted) is fetched only when it changed. The batch and a test run exclude each other (409 both ways); the state is in memory - a server restart ends a run. PWA: the Batch install (.cap file, per card) RAM operation shares the install form (ramInstallCapFields(); the single install uses it too and now sends ram_format, and the block-size validation moved before the modal), hides the preset selector + Execute and the preset-mismatch banner, and renders Start/Stop/Clear, the phase headline (equip the next card / installing card + live step / stopping after the current card), the counts and the attempts table (newest first). The panel only works inside the visible SCP80 RAM pill. Docs: help EN/RU, api.md (a section + the four table rows), the repo AGENTS. Tests: the state/report helpers, the per-card decisions, the worker loop (a real thread + a fake install), the lifecycle and guards, the HTTP endpoints (the malformed .cap, the stop under a held card lock, the test-run refusal) and the PWA panel helpers/wiring. 914 frontend + 919 Python; sw cache simple-v438.
85 lines
3.3 KiB
JavaScript
85 lines
3.3 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 = '';
|
|
for (const fn of ['swapNibbles', 'encIccid', 'decIccid', 'cardsNormIccid',
|
|
'spPresetWarning']) {
|
|
code += extractFunc(html, fn) + '\n';
|
|
}
|
|
code += 'function t(s){return s;}\n';
|
|
eval(code);
|
|
|
|
const DIGITS = '8970119000004600098';
|
|
const RAW_HEX = '980711090000640090F8';
|
|
const OTHER = '89390100000129506903';
|
|
const CARDS = [
|
|
{ name: 'Card A', iccid: DIGITS },
|
|
{ name: 'Card B', iccid: OTHER },
|
|
];
|
|
|
|
test('no warning without a card session or a readable ICCID', () => {
|
|
assert.strictEqual(spPresetWarning(null, CARDS, 0), '');
|
|
assert.strictEqual(spPresetWarning('', CARDS, 0), '');
|
|
assert.strictEqual(spPresetWarning(undefined, CARDS, 0), '');
|
|
});
|
|
|
|
test('no warning when the equipped card matches a preset', () => {
|
|
assert.strictEqual(spPresetWarning(DIGITS, CARDS, 0), '');
|
|
// the preset's ICCID may be stored in any form
|
|
assert.strictEqual(spPresetWarning(DIGITS, [{ name: 'A', iccid: RAW_HEX }], 0), '');
|
|
// the match does not depend on the selection
|
|
assert.strictEqual(spPresetWarning(DIGITS, CARDS, 1) === '', false);
|
|
});
|
|
|
|
test('a card with no matching preset gets the strong warning', () => {
|
|
const text = spPresetWarning('8945001234567890123', CARDS, 0);
|
|
assert.match(text, /8945001234567890123/);
|
|
assert.match(text, /does not match any card preset/);
|
|
assert.match(text, /From card/);
|
|
// no presets at all: the other wording
|
|
const none = spPresetWarning(DIGITS, [], 0);
|
|
assert.match(none, /No card presets defined/);
|
|
assert.match(spPresetWarning(DIGITS, null, -1), /No card presets defined/);
|
|
});
|
|
|
|
test('a manually selected preset of another card gets the softer hint', () => {
|
|
const text = spPresetWarning(DIGITS, CARDS, 1);
|
|
assert.match(text, /selected preset is not the equipped card/);
|
|
assert.match(text, /Card A/);
|
|
// an empty / out-of-range selection is not the softer case (the strong
|
|
// warning above covers a card with no preset)
|
|
assert.strictEqual(spPresetWarning(DIGITS, CARDS, -1), '');
|
|
assert.strictEqual(spPresetWarning(DIGITS, CARDS, 5), '');
|
|
});
|
|
|
|
test('both SCP80 views carry the warning banner', () => {
|
|
assert.match(html, /id="sp-preset-warning" class="hidden mb-3 px-3 py-2 rounded border border-amber-400/);
|
|
assert.match(html, /id="ram-preset-warning" class="hidden mb-3 px-3 py-2 rounded border border-amber-400/);
|
|
// ... and the renderer is wired into the card state, the preset load and
|
|
// the preset selection
|
|
assert.ok(html.includes('spPresetWarningRender();'));
|
|
assert.ok(html.includes("show('sp-preset-warning', spPresetWarning(iccid, cards, spPresetIdx()));"));
|
|
// the batch resolves the preset per card: the RAM banner is suppressed there
|
|
assert.ok(html.includes("batchMode ? '' : spPresetWarning(iccid, cards, ramPresetIdx())"));
|
|
});
|