catarrh/simple
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

v3.22.0: the event action uses the Simulator's forms (all modelled events)

Browse Source 
The test-script event action edited its fields as a JSON textarea and only
accepted the four events events.py builds; every other event needed the raw
envelope action with hand-copied hex.  It now renders the same EVENT_FORMS
form the Phone tab's send dialog uses, for every modelled event (29; no
release gating - a script may target another card).

- PWA: the field renderer/collector is shared (eventFormFieldsHtml /
  eventFormValues / eventFormPatternError / eventFormSrc / eventFieldGroupsUpdate);
  the Phone tab keeps its ids, its release gating and its onchange updaters,
  the step editor uses test-f-ev- ids, the generic group updater and a live
  Event data (hex) preview with the one-ENVELOPE check.  The event select
  lists all EVENT_FORMS events (the numeric keys are decimal strings -
  parseInt(k, 10)); the action stores the collected fields, the built data
  and the event's source (fixed cfg.src or the cfg.srcField input - the
  action never carried src before, so MT call / IMS registration / slices
  could not be network-sourced).  The JSON textarea is gone.
- engine: the `event` action keeps `fields` validation for the four
  server-built events (a stray data hex is ignored) and accepts the
  form-built `data` for every other event - hex-validated and checked
  against events.EVENT_DATA_MAX (244, the one-ENVELOPE budget; server.py's
  _EVENT_DATA_MAX now reads it from events.py).  The runner builds the four
  at run time (fresh host clock) and sends the stored data for the rest.
- tests: the engine's data path (accepted / missing / malformed / oversized,
  the four still fields-built), the runner sending the data (fake scc), the
  editor's collect/prefill/patterns/source (Node), the shared helpers.
  Docs: test-scripts.md, api.md, help EN/RU.  Tests: 838 frontend +
  797 Python; sw cache simple-v401.
This commit is contained in:
Антон Трошин
2026-10-06 01:07:12 +03:00
parent bcd9fb9a4c
commit 40c1e0f148
11 changed files with 389 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/tests/testscripts.test.js
+80 -20
View File
@@ -29,7 +29,19 @@ function extractFunc(src, name, asyncFn) {
}
eval(extractBlock('const CMD_NAMES = {', 'function cmdQualifierShort').replace(/^const /gm, 'var '));
eval(extractBlock('const EVENT_NAMES = {', 'const REJECTION_CAUSES = [').replace(/^const /gm, 'var '));
eval(extractBlock('const EVENT_NAMES = {', 'const EVENT_FORMS = {').replace(/^const /gm, 'var '));
eval(extractBlock('const EVENT_FORMS = {', 'const PLI_QUALIFIERS = [').replace(/^const /gm, 'var '));
// the builders' pure helpers (eventFormFieldsHtml/Values are the shared form)
eval(extractFunc(html, 'bytesToHex'));
eval(extractFunc(html, 'eventAddressTlv'));
eval(extractFunc(html, 'encPlmn'));
eval(extractFunc(html, 'eventFormFieldsHtml'));
eval(extractFunc(html, 'eventFormValues'));
eval(extractFunc(html, 'eventFormPatternError'));
eval(extractFunc(html, 'eventFormSrc'));
eval(html.match(/const EVENT_INNER_MAX = \d+;/)[0].replace('const ', 'var '));
eval(extractFunc(html, 'eventEnvelopeSize'));
eval(extractFunc(html, 'eventFitsOneEnvelope'));
eval(extractBlock('const TEST_ACTION_KINDS = [', 'let _testScripts').replace(/^const /gm, 'var '));
eval(extractFunc(html, 'testTemplate'));
eval(extractFunc(html, 'testMenuSelectProblem'));
@@ -107,8 +119,14 @@ test('testScriptProblem accepts good scripts and names bad ones', () => {
params: {} }] }), /event is required/);
assert.match(testScriptProblem({ steps: [{ type: 'action', kind: 'event',
params: { event: '03', fields: [] } }] }), /object/);
assert.match(testScriptProblem({ steps: [{ type: 'action', kind: 'event',
params: { event: '00' } }] }), /event data is required/);
assert.match(testScriptProblem({ steps: [{ type: 'action', kind: 'event',
params: { event: '00', data: 'ZZ' } }] }), /hex/);
assert.strictEqual(testScriptProblem({ steps: [{ type: 'action', kind: 'event',
params: { event: '03', fields: { status: 0 } } }] }), '');
assert.strictEqual(testScriptProblem({ steps: [{ type: 'action', kind: 'event',
params: { event: '00', data: '1C0101', src: '83' } }] }), '');
assert.match(testScriptProblem({
steps: [{ type: 'action', kind: 'file-read', params: {} }] }), /file path/);
assert.match(testScriptProblem({ steps: [{ type: 'expect' }] }), /command is required/);
@@ -412,29 +430,63 @@ test('the envelope step collects the source override', () => {
assert.deepStrictEqual(_testEditStep.params, { event: 3, data: '9B0100', src: '83' });
});
test('the event step collects the type and the JSON fields', () => {
test('the event step collects the form values, the built data and the source', () => {
_testEditStep = { type: 'action', kind: 'event', params: {} };
_testEditChecks = [];
_testEditStepIndex = 0;
fakeForm({ 'test-step-kind': 'event', 'test-f-evtype': '12',
'test-f-evfields': '{"reg_type":"9","cause":"2"}',
// a server-built event: the fields travel for the server's own build
fakeForm({ 'test-step-kind': 'event', 'test-f-evtype': '03',
'test-f-ev-status': '0', 'test-f-ev-mcc': '250', 'test-f-ev-mnc': '01',
'test-f-sw': '', 'test-f-cdata': '', 'test-f-fail': 'error' });
testStepCollect();
assert.deepStrictEqual(_testEditStep.params,
{ event: '12', fields: { reg_type: '9', cause: '2' } });
assert.strictEqual(_testEditStep._eventFieldsError, undefined);
// invalid JSON marks the form and the save refuses with a clear message
_testEditStep = { type: 'action', kind: 'event', params: {} };
fakeForm({ 'test-step-kind': 'event', 'test-f-evtype': '03',
'test-f-evfields': '{oops', 'test-f-sw': '', 'test-f-cdata': '', 'test-f-fail': 'error' });
assert.match(testStepFormError(), /JSON object/);
// fixing the JSON saves again - the error flag is not sticky
fakeForm({ 'test-step-kind': 'event', 'test-f-evtype': '03',
'test-f-evfields': '{"status":0}', 'test-f-sw': '', 'test-f-cdata': '', 'test-f-fail': 'error' });
assert.strictEqual(_testEditStep.params.event, '03');
assert.strictEqual(_testEditStep.params.fields.status, '0');
assert.strictEqual(_testEditStep.params.fields.mcc, '250');
assert.match(_testEditStep.params.data, /^[0-9A-F]+$/);
assert.strictEqual(testStepFormError(), '');
// the summary names the event
// an event without a server builder (MT call): the built hex + its source
_testEditStep = { type: 'action', kind: 'event', params: {} };
fakeForm({ 'test-step-kind': 'event', 'test-f-evtype': '00', 'test-f-ev-ti': '01',
'test-f-sw': '', 'test-f-cdata': '', 'test-f-fail': 'error' });
testStepCollect();
assert.strictEqual(_testEditStep.params.event, '00');
assert.strictEqual(_testEditStep.params.data, '1C0101');
assert.strictEqual(_testEditStep.params.src, '83');
assert.strictEqual(testStepFormError(), '');
// a srcField event takes the source from the form (call disconnected)
_testEditStep = { type: 'action', kind: 'event', params: {} };
fakeForm({ 'test-step-kind': 'event', 'test-f-evtype': '02', 'test-f-ev-src': '83',
'test-f-ev-ti': '00', 'test-f-ev-cause_mode': 'rlt',
'test-f-sw': '', 'test-f-cdata': '', 'test-f-fail': 'error' });
testStepCollect();
assert.strictEqual(_testEditStep.params.src, '83');
assert.strictEqual(_testEditStep.params.data, '1C01009A00');
// a bad field pattern refuses the save; an empty build does too
fakeForm({ 'test-step-kind': 'event', 'test-f-evtype': '00', 'test-f-ev-ti': 'ZZZ',
'test-f-sw': '', 'test-f-cdata': '', 'test-f-fail': 'error' });
assert.match(testStepFormError(), /Invalid/);
// the summary names the event and its source
assert.strictEqual(testStepSummary({ type: 'action', kind: 'event',
params: { event: '03', fields: {} } }), 'EVENT Location status');
assert.strictEqual(testStepSummary({ type: 'action', kind: 'event',
params: { event: '00', data: '1C0101', src: '83' } }),
'EVENT MT call src=83');
});
test('the shared event-form helpers render, prefill and collect', () => {
const cfg = EVENT_FORMS[0x00];
const htmlOut = eventFormFieldsHtml(cfg, cfg.fields, {ti: 'AB', ton: 1}, 'x-', false);
assert.match(htmlOut, /id="x-ti"/);
assert.match(htmlOut, /value="AB"/);
assert.match(htmlOut, /id="x-ton"/);
assert.match(htmlOut, /value="1" selected/);
// a srcField event reports its source; a fixed-source event its own
assert.strictEqual(eventFormSrc(EVENT_FORMS[0x00], {}), '83');
assert.strictEqual(eventFormSrc(EVENT_FORMS[0x02], {src: '82'}), '82');
assert.strictEqual(eventFormSrc(EVENT_FORMS[0x03], {}), '');
// the pattern check names the first offending field
assert.strictEqual(eventFormPatternError(cfg, {ti: 'AB'}), '');
assert.strictEqual(eventFormPatternError(cfg, {ti: 'ZZZ'}), 'Transaction identifier');
});
test('two quick saves of a draft create one script, then update it', async () => {
@@ -508,7 +560,7 @@ test('the step form renders the chosen source and no pre-filled SW', () => {
assert.match(body, /id="test-f-sw" value=""/);
});
test('the event step form renders the event select and the JSON fields', () => {
test('the event step form renders the event select and the Simulator fields', () => {
const els = {
'test-step-modal': { classList: { add: () => {}, remove: () => {} } },
'test-step-title': {}, 'test-step-body': {},
@@ -516,15 +568,23 @@ test('the event step form renders the event select and the JSON fields', () => {
};
globalThis.document = { getElementById: id => els[id] || null };
_testEditStep = { type: 'action', kind: 'event',
params: { event: '12', fields: { reg_type: '9' } } };
params: { event: '12', fields: { reg_type: '9', mcc: '250' } } };
_testEditChecks = [];
_testEditStepIndex = 0;
testStepRender();
const body = els['test-step-body'].innerHTML;
assert.match(body, /id="test-f-evtype"/);
assert.match(body, /<option value="12" selected>/);
assert.match(body, /id="test-f-evfields"/);
assert.ok(body.includes('{"reg_type":"9"}'), body);
// the event's own form (EVENT_FORMS) with the stored values prefilled and
// the built hex preview, not a JSON textarea
assert.match(body, /id="test-f-ev-reg_type"/);
assert.match(body, /id="test-f-ev-mcc"/);
assert.match(body, /value="250"/);
assert.match(body, /id="test-f-evdata"/);
assert.doesNotMatch(body, /test-f-evfields/);
// every modelled event is selectable (the four server-built ones included)
assert.match(body, /<option value="00"/);
assert.match(body, /<option value="1F"/);
});
test('hex fields strip mask wildcards, check values keep them', () => {