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

v3.23.8: the command-grouped TERMINAL RESPONSE result list

Browse Source 
The step editor's result select offers the full TS 102 223 8.12.0 list; the
spec's applicability table (Tables 6.1/6.2/6.3, "Proactive commands versus
possible terminal response") now groups it by the selected command: the
command-relevant values first (an <optgroup> "relevant for <command>"), the
rest after ("all other results").

The grouping is ordering-only - nothing is hidden, the manual hex entry
covers everything, and ANY (the drain's respond/first too) stays a flat list,
so a stored result always matches an option and real-card deviations remain
reachable.

TR_RESULT_BY_COMMAND is parsed from the pinned PDF (41 commands) and pinned
by frontend/tests/tr_result_by_command.json; trCommandCode() resolves the
editor's command names to their type codes (the first code per name,
matching testCommandOptions) and testFormSelect gained the optgroup support.

Tests: the map vs the parsed fixture, the grouping and the union (nothing
lost), the optgroup rendering and the call-site pin.  861 frontend + 842
Python; sw cache simple-v421.
This commit is contained in:
Антон Трошин
2026-10-08 21:55:57 +03:00
parent c9ab15c392
commit 2b994a7a89
8 changed files with 220 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/index.html
+100 -8
View File
@@ -1905,7 +1905,7 @@
// ===== Version =====
// Single source of truth for the PWA version: shown in the header and used
// by the server version check in pysimConnect().
const SIMPLE_VERSION = '3.23.7';
const SIMPLE_VERSION = '3.23.8';
document.getElementById('app-version').textContent = 'v' + SIMPLE_VERSION;
// ===== view history (the browser Back/Forward buttons) =====
@@ -8028,6 +8028,58 @@ const TR_RESULT_ADD_INFO = [
{v: '0A', name: 'No NAA active'},
];
// TS 102 223 v18.3.0 Tables 6.1/6.2 ('Proactive commands versus possible
// terminal response'): the result values the spec lists for each proactive
// command, keyed by the command type code. The step editor GROUPS the result
// list with it - the command-relevant values first, the rest after; nothing
// is hidden (the manual entry covers everything). The fixture
// frontend/tests/tr_result_by_command.json is the pinned copy of the parsed
// table; some entries follow the printed table even where it looks surprising
// (e.g. the icon result listed for REFRESH).
const TR_RESULT_BY_COMMAND = {
'01': ['00', '01', '02', '03', '04', '08', '20', '30', '31', '32', '33', '36', '3C'],
'02': ['00', '01', '02', '20', '30', '31', '32', '33', '36'],
'03': ['00', '01', '02', '20', '30', '31', '32', '33', '36'],
'04': ['00', '01', '02', '20', '30', '31', '32', '33', '36'],
'05': ['00', '01', '02', '20', '30', '31', '32', '33', '36'],
'10': ['00', '01', '02', '04', '05', '10', '14', '20', '21', '22', '23', '25', '30', '31', '32', '33', '34', '36', '39', '3C'],
'14': ['00', '01', '02', '04', '10', '20', '30', '31', '32', '33', '36', '3C'],
'15': ['00', '01', '02', '20', '21', '26', '30', '31', '32', '33', '3C'],
'20': ['00', '01', '02', '04', '09', '10', '20', '30', '31', '32', '33', '36', '3C'],
'21': ['00', '01', '02', '04', '10', '11', '12', '20', '30', '31', '32', '33', '36', '3C'],
'22': ['00', '01', '02', '04', '10', '11', '12', '13', '20', '30', '31', '32', '33', '36', '3C'],
'23': ['00', '01', '02', '04', '10', '11', '12', '13', '20', '30', '31', '32', '33', '36', '3C'],
'24': ['00', '01', '02', '04', '10', '11', '12', '13', '20', '30', '31', '32', '33', '36', '3C'],
'25': ['00', '01', '02', '04', '20', '30', '31', '32', '33', '36'],
'26': ['00', '01', '02', '06', '20', '30', '31', '32', '33', '36'],
'27': ['00', '01', '02', '20', '24', '30', '31', '32', '33', '36'],
'28': ['00', '01', '02', '20', '30', '31', '32', '33', '36', '3C'],
'30': ['00', '01', '02', '20', '30', '31', '32', '33', '36', '38'],
'31': ['00', '01', '02', '20', '30', '31', '32', '33', '36', '38'],
'32': ['00', '01', '02', '20', '30', '31', '32', '33', '36', '38'],
'33': ['00', '01', '02', '20', '30', '31', '32', '33', '36', '38'],
'34': ['00', '01', '02', '20', '30', '31', '32', '33', '36', '3C'],
'35': ['00', '01', '02', '20', '30', '31', '32', '33', '36'],
'40': ['00', '01', '02', '04', '07', '10', '20', '21', '22', '25', '28', '30', '31', '32', '33', '36', '3A', '3B', '3C'],
'41': ['00', '01', '02', '04', '10', '20', '30', '31', '32', '33', '36', '3A', '3C'],
'42': ['00', '01', '02', '04', '10', '20', '30', '31', '32', '33', '36', '3A', '3C'],
'43': ['00', '01', '02', '04', '10', '20', '21', '22', '30', '31', '32', '33', '36', '3A', '3C'],
'44': ['00', '01', '02', '04', '10', '20', '30', '31', '32', '33', '36'],
'45': ['00', '01', '04', '10', '20', '30', '31', '32', '33', '36', '3A', '3B', '3C'],
'46': ['00', '01', '04', '10', '20', '30', '31', '32', '33', '36', '3A', '3B', '3C'],
'47': ['00', '01', '02', '07', '20', '30', '31', '32', '33', '36', '3A'],
'50': ['00', '01', '20', '30', '31', '32', '33', '36', '3C'],
'51': ['00', '01', '20', '30', '31', '32', '33', '36', '3C'],
'60': ['00', '01', '02', '27', '30', '31', '32', '33', '36', '3D'],
'61': ['00', '01', '02', '27', '30', '31', '32', '33', '36', '3D'],
'62': ['00', '01', '02', '10', '27', '30', '31', '32', '33', '36', '3D'],
'70': ['00', '01', '20', '30', '31', '32', '33', '36'],
'71': ['00', '01', '20', '30', '31', '32', '33'],
'72': ['00', '01', '20', '30', '31', '32', '33', '36'],
'73': ['00', '01', '20', '30', '31', '32', '33', '36'],
'79': ['00', '01', '20', '30', '31', '32', '36'],
};
// The script authoring aliases (the script may also use the hex value).
// `no_response` is kept for backward compatibility (12) but is not offered
// by the editor - 12's canonical alias is `timeout`.
@@ -8036,12 +8088,40 @@ const TR_RESULT_ALIASES = {
modified: '07', cancel: '10', back: '11', timeout: '12', no_response: '12',
};
// The command type code of a command name (the editor's select values are the
// names; CMD_NAMES maps the codes) - the first code wins, matching
// testCommandOptions' de-duplication.
function trCommandCode(name) {
const want = String(name === undefined || name === null ? '' : name).toUpperCase();
for (const k in CMD_NAMES) {
if (CMD_NAMES[k] === want) return parseInt(k, 16);
}
return NaN;
}
// The result select's options: 'hex - alias' where an alias exists, else
// 'hex - spec name', plus a manual hex entry.
function trResultOptions() {
const opts = TR_RESULTS.map(r => ({v: r.alias || r.v, l: r.v + ' - ' + (r.alias || r.name)}));
opts.push({v: 'manual', l: t('manual input')});
return opts;
// 'hex - spec name', plus a manual hex entry. With opts.command (a command
// name other than ANY) the list is GROUPED by TS 102 223 Tables 6.1/6.2: the
// command-relevant values first, the rest after - every value stays (the
// grouping is ordering-only).
function trResultOptions(opts) {
const label = r => ({v: r.alias || r.v, l: r.v + ' - ' + (r.alias || r.name)});
const code = opts && opts.command ? trCommandCode(opts.command) : NaN;
const key = Number.isInteger(code) ? code.toString(16).toUpperCase().padStart(2, '0') : '';
const relevant = key && TR_RESULT_BY_COMMAND[key];
let out;
if (relevant && relevant.length) {
const rel = TR_RESULTS.filter(r => relevant.indexOf(r.v) >= 0);
const rest = TR_RESULTS.filter(r => relevant.indexOf(r.v) < 0);
out = [{group: t('relevant for') + ' ' + opts.command}]
.concat(rel.map(label))
.concat([{group: t('all other results')}])
.concat(rest.map(label));
} else {
out = TR_RESULTS.map(label);
}
out.push({v: 'manual', l: t('manual input')});
return out;
}
// A stored result -> the select's value and the manual hex ('' unless the
@@ -8091,7 +8171,7 @@ function testTrResultChanged(sel, wrapId) {
function trResultRowHtml(selId, stored, addInfo, opts) {
const v = trResultFormValue(stored);
const wrapId = selId + '-hexwrap';
const options = (opts && opts.empty ? [{v: '', l: t(opts.empty)}] : []).concat(trResultOptions());
const options = (opts && opts.empty ? [{v: '', l: t(opts.empty)}] : []).concat(trResultOptions(opts));
let html = '<div class="flex gap-2">'
+ testFormSelect(selId, v.value, options, "testTrResultChanged(this, '" + wrapId + "')")
+ '<div id="' + wrapId + '" class="w-24' + (v.value === 'manual' ? '' : ' hidden') + '">'
@@ -8121,9 +8201,19 @@ function testFormInput(id, value, placeholder, extra) {
function testFormSelect(id, value, options, onchange) {
let html = '<select id="' + id + '"' + (onchange ? ' onchange="' + onchange + '"' : '') + ' class="w-full border border-gray-300 dark:border-slate-600 text-sm rounded px-2 py-1.5 dark:bg-slate-800">';
// a {group: label} entry opens an <optgroup> (the flat callers are
// unaffected; the result select groups by the command's applicability)
let open = false;
options.forEach(o => {
if (o.group !== undefined) {
if (open) html += '</optgroup>';
html += '<optgroup label="' + esc(String(o.group)) + '">';
open = true;
return;
}
html += '<option value="' + esc(String(o.v)) + '"' + (String(o.v) === String(value) ? ' selected' : '') + '>' + esc(o.l) + '</option>';
});
if (open) html += '</optgroup>';
return html + '</select>';
}
@@ -8274,7 +8364,7 @@ function testStepRender() {
const r = step.respond || {};
html += testFormRow('TERMINAL RESPONSE result',
trResultRowHtml('test-f-result', r.result === undefined ? 'ok' : r.result, r.additional_info,
{list: true}));
{list: true, command: step.command || 'ANY'}));
html += testFormRow('Item identifier (SELECT ITEM / SET UP MENU)', testFormInput('test-f-ritem', r.item_id, '1..255'));
html += testFormRow('Text (GET INKEY / GET INPUT)', '<div class="flex gap-2">'
+ testFormInput('test-f-rtext', r.text, 'text')
@@ -23065,6 +23155,8 @@ const LANG_RU = {
'Text': 'Текст',
'id': 'id',
'text': 'текст',
'relevant for': 'подходит для',
'all other results': 'остальные результаты',
'TERMINAL PROFILE re-sent \u2014 new CAT session': 'TERMINAL PROFILE отправлен заново \u2014 новая CAT-сессия',
'manual input': 'ручной ввод',
'Additional information (optional hex byte)': 'Дополнительная информация (необязательный hex-байт)',