6. Симулятор телефона
Работа с сессией Card Application Toolkit. Две подвкладки: «Телефон» (меню STK, STATUS и опрос, подписанные события, журнал проактивных команд) и «Конфигурация TR» (данные ответов, подставляемые в TERMINAL RESPONSE для проактивных команд).
diff --git a/frontend/help.html b/frontend/help.html index 0d28186..f2b86a5 100644 --- a/frontend/help.html +++ b/frontend/help.html @@ -44,7 +44,7 @@- Header — the app version, an INSTALL PWA button (shown when the browser offers installation, enabling offline use), links to the project on GitHub and to this help, an EN/RU language toggle, and a dark/light theme toggle.
- Language and theme choices are stored in
localStorageand persist across reloads.
- - Top-level tabs: Remote APDU (SIM RFM, USIM RFM, Expanded Script, RAM/GP, HTTP OTA, C-APDU Parser, Response parser), SCP80 (Secured Packet, Cards, RAM), Card reader (File manager, Custom files, pySim command line, Raw APDU), Profiler, and Phone simulator. +
- Top-level tabs: Remote APDU (SIM RFM, USIM RFM, Expanded Script, RAM/GP, HTTP OTA, C-APDU Parser, Response parser), SCP80 (Secured Packet, Cards, RAM), Card reader (File manager, pySim command line, Raw APDU), Profiler (list tabs Profiles, Card snapshots, Custom files), and Phone simulator.
- The help link opens this documentation at the section matching the current view (e.g. the Profiler tab opens §5).
4. Card reader (pySim) tab
-Connects to a local pysim-otaman-server for live card operations: enter the server URL (default http://127.0.0.1:8080) and press Connect. The status area shows the reader/card state, and Equip card (re)initializes the card after insertion. Sub-tabs: File manager, Custom files, pySim command line, and Raw APDU. The Profiler and Phone simulator are separate top-level tabs.
Connects to a local pysim-otaman-server for live card operations: enter the server URL (default http://127.0.0.1:8080) and press Connect. The status area shows the reader/card state, and Equip card (re)initializes the card after insertion. Sub-tabs: File manager, pySim command line, and Raw APDU. The Profiler and Phone simulator are separate top-level tabs.
4.1 File manager
The file system tree is displayed on the left; selecting a file opens its detail pane on the right.
@@ -324,16 +324,13 @@4.2 Custom files
-Add files that pySim’s model does not cover: enter the full path (e.g. 3F00/7F20/6F46) and an alias (e.g. EF.SPN), then press Add; added files appear in the File manager tree. The list persists in localStorage and can be shared with Export as JSON / Export to file and restored with Import from file / Paste & import / Import JSON from clipboard.
4.3 pySim command line
+4.2 pySim command line
Execute any pySim-shell command with usage hints (300 ms) and autocomplete.
-4.4 Raw APDU
+4.3 Raw APDU
Send an arbitrary APDU and view the raw response.
-4.5 Usage scenarios
+4.4 Usage scenarios
Scenario A — Working with files not in pySim’s model (Custom files)
-
@@ -406,6 +403,10 @@
Custom files
+Add files that pySim’s model does not cover: enter the full path (e.g. 3F00/7F20/6F46) and an alias (e.g. EF.SPN), then press Add; added files appear in the File manager tree. The list persists in localStorage and can be shared with Export as JSON / Export to file and restored with Import from file / Paste & import / Import JSON from clipboard.
6. Phone simulator
Interacts with the Card Application Toolkit session. The view has two pills: Phone (STK menu, STATUS and polling, subscribed events, proactive command log) and TR Config (response data injected into TERMINAL RESPONSEs for proactive commands).
diff --git a/frontend/index.html b/frontend/index.html index fbb4dce..5210803 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -20,6 +20,7 @@OTAMan SIM OTA with a Human Face v2.0.0
- - + + @@ -597,7 +598,7 @@
@@ -752,9 +753,9 @@
@@ -793,24 +793,6 @@
-
-
-
-
+
+
+
@@ -764,7 +765,6 @@
-
@@ -779,13 +779,13 @@
File:
-
-
+
+
|
Raw
Decoded
-
+
-
Add known file paths and aliases to the file tree.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -819,7 +801,7 @@
-
+
@@ -828,7 +810,7 @@
-
+
+
-
+
@@ -855,13 +838,32 @@
-
+
+
Add known file paths and aliases to the file tree.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -907,17 +909,17 @@
@@ -932,7 +934,7 @@
STK menu
-
+
STATUS and Polling
-
+
|
Polling
-
+
PROVIDE LOCAL INFORMATION response data
-
+
Loading...
@@ -4367,6 +4369,77 @@ async function pysimFetch(path, body) {
return await res.json();
}
+// ===== UI availability (server / card) =====
+let _pysimServerAvailable = null; // null until probed
+let _pysimCardEquipped = false;
+let _pysimAvailabilityTimer = null;
+
+function pysimAvailabilityState() {
+ if (!_pysimServerAvailable) return 'server-down';
+ return _pysimCardEquipped ? 'card' : 'no-card';
+}
+
+function pysimControlDisabled(needs, state) {
+ if (needs === 'server') return state === 'server-down';
+ if (needs === 'card') return state !== 'card';
+ return false;
+}
+
+function pysimNeedsHint(needs, state) {
+ return state === 'server-down' ? t('Connect to server') : t('Insert and equip a card');
+}
+
+function pysimUpdateStateIndicator() {
+ const el = document.getElementById('state-indicator');
+ if (!el) return;
+ const state = pysimAvailabilityState();
+ const entry = {
+ 'server-down': ['text-red-500', t('No server connection')],
+ 'no-card': ['text-yellow-600', t('Server connected, no card equipped')],
+ 'card': ['text-emerald-600', t('Card equipped')],
+ }[state];
+ ['text-red-500', 'text-yellow-600', 'text-emerald-600', 'text-gray-400'].forEach(c => el.classList.remove(c));
+ el.classList.add(entry[0]);
+ el.setAttribute('title', entry[1]);
+}
+
+function pysimApplyAvailability() {
+ const state = pysimAvailabilityState();
+ document.querySelectorAll('[data-needs]').forEach(el => {
+ const needs = el.getAttribute('data-needs');
+ const disabled = pysimControlDisabled(needs, state);
+ el.disabled = disabled;
+ if (disabled) el.setAttribute('title', pysimNeedsHint(needs, state));
+ else el.removeAttribute('title');
+ });
+ pysimUpdateStateIndicator();
+}
+
+function pysimSetServerAvailable(available) {
+ if (_pysimServerAvailable === available) return;
+ _pysimServerAvailable = available;
+ pysimApplyAvailability();
+}
+
+function pysimStartAvailabilityProbe() {
+ if (_pysimAvailabilityTimer) return;
+ _pysimAvailabilityTimer = setInterval(async () => {
+ if (_pysimServerAvailable === true && _pysimCardEquipped) return; // 2s status poll covers this
+ try {
+ const ver = await pysimFetch('/api/version');
+ if (ver && typeof ver.version === 'string') {
+ _pysimServerAvailable = true;
+ try { pysimCardStateUpdate(await pysimFetch('/api/status')); } catch (e) { /* status still optional here */ }
+ pysimApplyAvailability();
+ } else {
+ pysimSetServerAvailable(false);
+ }
+ } catch (e) {
+ pysimSetServerAvailable(false);
+ }
+ }, 5000);
+}
+
function pysimTargetSpace() {
let h;
try { h = new URL(pysimBase).hostname.toLowerCase(); } catch (e) { return 'public'; }
@@ -4449,6 +4522,7 @@ async function pysimConnect() {
// Version check
const ver = await pysimFetch('/api/version');
if (!ver.version) throw new Error('No version');
+ _pysimServerAvailable = true;
const sv = (ver.version || '').split('.').map(Number);
if (sv[0] < 1 || (sv[0] === 1 && sv[1] < 0)) {
msgEl.innerHTML = 'Server version ' + esc(ver.version) + ' is outdated. Please update pysim-otaman-server.';
@@ -4463,6 +4537,7 @@ async function pysimConnect() {
if (!status.app_ready) {
throw new Error('Server not ready');
}
+ _pysimCardEquipped = !!status.connected;
const cmd = await pysimFetch('/api/command', { cmd: 'status' });
if (cmd.output && (cmd.output.includes('Exception') || cmd.output.includes('ProtocolError'))) {
pysimSetConnected(false);
@@ -4474,6 +4549,7 @@ async function pysimConnect() {
}
pysimSetConnected(true);
pysimShowConnected(true);
+ pysimApplyAvailability();
await pysimRefresh();
pysimLoadCommands();
pysimFsRefresh();
@@ -4484,6 +4560,9 @@ async function pysimConnect() {
} catch (e) {
if (wasAuto) _pysimAutoConnectAttempted = true;
pysimSetConnected(false);
+ _pysimServerAvailable = false;
+ _pysimCardEquipped = false;
+ pysimApplyAvailability();
const hint = t(pysimIsLikelyBlocked() ? 'pysim-blocked-hint' : 'pysim-unreachable-hint')
.replace('{url}', esc(pysimBase));
msgEl.innerHTML =
@@ -4500,6 +4579,9 @@ function pysimDisconnect() {
pysimShowConnected(false);
document.getElementById('pysim-status').textContent = '';
pysimSetConnected(false);
+ _pysimServerAvailable = null;
+ _pysimCardEquipped = false;
+ pysimApplyAvailability();
}
async function pysimRunCmd(cmd) {
@@ -4800,12 +4882,7 @@ async function ramSendOta(apduHex, sp) {
// RAM operations: send raw GP command + SCP80 params; server handles SCP80 wrapping
// Caller controls SPI2: 0x01 = PoR via ENVELOPE response, 0x21 = PoR via SMS-SUBMIT
const body = Object.assign({}, sp, { apdu: apduHex, sp: '', includeCpi: true });
- const res = await fetch('/api/send-ota', {
- method: 'POST',
- headers: { 'Content-Type': 'application/json' },
- body: JSON.stringify(body),
- });
- return await res.json();
+ return await pysimFetch('/api/send-ota', body);
}
// ===== TLV parsers for GET STATUS responses (P2=02 format) =====
@@ -5035,7 +5112,7 @@ function ramRenderExploreHtml(mem, isd, apps, elfs) {
html += '
';
html += '
';
}
el.innerHTML = html;
+ pysimApplyAvailability();
}
function profilerListSwitch(name) {
@@ -7266,6 +7345,9 @@ function profilerListSwitch(name) {
});
document.getElementById('profiler-list-profiles').classList.toggle('hidden', name !== 'profiles');
document.getElementById('profiler-list-snapshots').classList.toggle('hidden', name !== 'snapshots');
+ document.getElementById('profiler-list-custom').classList.toggle('hidden', name !== 'custom');
+ if (name === 'custom') pysimCustomRender();
+ setHelpAnchor({ profiles: 'profiler', snapshots: 'card-snapshots', custom: 'custom-files' }[name] || 'profiler');
}
function profilerSetView(view) {
@@ -8964,6 +9046,11 @@ const LANG_RU = {
'Verify vs pySim': 'Проверить в pySim',
'Send to Card': 'Отправить на карту',
'Phone simulator': 'Симулятор телефона',
+ 'No server connection': 'Нет соединения с сервером',
+ 'Server connected, no card equipped': 'Сервер подключён, карта не подключена',
+ 'Card equipped': 'Карта подключена',
+ 'Connect to server': 'Подключитесь к серверу',
+ 'Insert and equip a card': 'Вставьте и подключите карту',
'Files': 'Файлов',
'Records': 'Записей',
'Scan time': 'Время сканирования',
@@ -9153,12 +9240,13 @@ function isViewVisible(id) {
// visible ones after a language switch so they don't stay in the old language.
function refreshDynamicI18n() {
if (isViewVisible('tab-profiler')) {
- if (profilerView === 'list') { profilerRenderList(); profilerRenderSnapshotList(); }
+ if (profilerView === 'list') { profilerRenderList(); profilerRenderSnapshotList(); if (profilerListTab === 'custom') pysimCustomRender(); }
else if (profilerView === 'editor') profilerRenderEditor();
else if (profilerView === 'results') profilerRenderResultsView();
else if (profilerView === 'snapshot') profilerRenderSnapshotData();
}
if (isViewVisible('profiler-scan-modal')) profilerScanRefreshOptions();
+ pysimUpdateStateIndicator();
if (isViewVisible('scp80-sub-cards')) cardsRender();
if (isViewVisible('tab-phone')) {
if (isViewVisible('phone-sub-phone')) {
@@ -9176,6 +9264,7 @@ document.getElementById('lang-btn').textContent = currentLang.toUpperCase();
updateHelpLink();
cardsLoad();
+pysimStartAvailabilityProbe();
if (localStorage.getItem('theme') === 'dark' ||
(!localStorage.getItem('theme') && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
diff --git a/frontend/sw.js b/frontend/sw.js
index bcd5b57..7ae51c9 100644
--- a/frontend/sw.js
+++ b/frontend/sw.js
@@ -1,4 +1,4 @@
-const CACHE = 'otaman-v103';
+const CACHE = 'otaman-v104';
const URLS = [
'index.html',
'help.html',
diff --git a/frontend/tests/card_state.test.js b/frontend/tests/card_state.test.js
index ffc58f0..bd7af8e 100644
--- a/frontend/tests/card_state.test.js
+++ b/frontend/tests/card_state.test.js
@@ -21,8 +21,11 @@ function extractFunc(src, name) {
return src.slice(m.index, i + 1);
}
-let code = 'var _pysimCardStateKey = null;\nvar _pysimCardSession = null;\n';
+let code = 'var _pysimCardStateKey = null;\nvar _pysimCardSession = null;\n'
+ + 'var _pysimServerAvailable = null;\nvar _pysimCardEquipped = false;\n';
code += extractFunc(html, 'pysimCardStateUpdate') + '\n';
+code += extractFunc(html, 'pysimAvailabilityState') + '\n';
+code += extractFunc(html, 'pysimControlDisabled') + '\n';
code += '\nglobalThis.esc = s => s;\n';
code += 'globalThis.t = s => s;\n';
eval(code);
@@ -32,9 +35,10 @@ function setup() {
const calls = { connected: [], resets: [], refreshStatus: [] };
_pysimCardStateKey = null;
_pysimCardSession = null;
- globalThis.document = { getElementById: () => el };
+ globalThis.document = { getElementById: () => el, querySelectorAll: () => [] };
globalThis.pysimSetConnected = v => calls.connected.push(v);
globalThis.pysimResetCardData = refresh => calls.resets.push(refresh);
+ globalThis.pysimApplyAvailability = () => {};
return { el, calls };
}
@@ -98,3 +102,21 @@ test('payload without connected flag is ignored', () => {
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);
+});
diff --git a/frontend/tests/html.test.js b/frontend/tests/html.test.js
index 2cafea1..6d8e5ac 100644
--- a/frontend/tests/html.test.js
+++ b/frontend/tests/html.test.js
@@ -41,3 +41,10 @@ test('scan name input starts scanning on Enter', () => {
test('snapshot view has a timing summary block', () => {
assert.ok(html.includes('id="snapshot-summary"'));
});
+
+test('header state indicator and profiler custom-files tab', () => {
+ assert.ok(html.includes('id="state-indicator"'));
+ assert.ok(html.includes('id="profiler-list-custom"'));
+ assert.ok(html.includes('data-list-tab="custom"'));
+ assert.ok(!html.includes('data-pysim-sub="custom"'));
+});
diff --git a/frontend/tests/profiler.test.js b/frontend/tests/profiler.test.js
index 96e12c1..5ca7564 100644
--- a/frontend/tests/profiler.test.js
+++ b/frontend/tests/profiler.test.js
@@ -921,12 +921,15 @@ test('profilerListSwitch toggles the profiles/snapshots tabs', () => {
dataset: { listTab: tab },
classList: { _c: new Set(), toggle(c, on) { if (on) this._c.add(c); else this._c.delete(c); } },
});
- const btns = [mkBtn('profiles'), mkBtn('snapshots')];
+ const btns = [mkBtn('profiles'), mkBtn('snapshots'), mkBtn('custom')];
const profilesEl = { hidden: false, classList: { toggle(cls, on) { profilesEl.hidden = on; } } };
const snapsEl = { hidden: true, classList: { toggle(cls, on) { snapsEl.hidden = on; } } };
+ const customEl = { hidden: true, classList: { toggle(cls, on) { customEl.hidden = on; } } };
+ global.pysimCustomRender = () => {};
+ global.setHelpAnchor = () => {};
global.document = {
querySelectorAll: sel => (sel === '.profiler-list-tab' ? btns : []),
- getElementById: id => (id === 'profiler-list-profiles' ? profilesEl : id === 'profiler-list-snapshots' ? snapsEl : null),
+ getElementById: id => (id === 'profiler-list-profiles' ? profilesEl : id === 'profiler-list-snapshots' ? snapsEl : id === 'profiler-list-custom' ? customEl : null),
};
profilerListSwitch('snapshots');
@@ -941,7 +944,14 @@ test('profilerListSwitch toggles the profiles/snapshots tabs', () => {
assert.ok(btns[0].classList._c.has('bg-blue-600'));
assert.ok(btns[1].classList._c.has('bg-gray-200'));
+ profilerListSwitch('custom');
+ assert.strictEqual(customEl.hidden, false);
+ assert.strictEqual(profilesEl.hidden, true);
+ assert.strictEqual(snapsEl.hidden, true);
+
delete global.document;
+ delete global.pysimCustomRender;
+ delete global.setHelpAnchor;
});
test('profilerScanRefreshOptions re-translates mask labels without touching checkbox state', () => {
Application / Instance AID: ' + (o.aid || '?');
if (o.aid) {
- html += ' ';
+ html += ' ';
}
html += '
';
html += 'Lifecycle: ' + ramFmtLifecycle(o.lifecycle || '') + '
';
@@ -5054,8 +5131,8 @@ function ramRenderExploreHtml(mem, isd, apps, elfs) {
html += '';
html += '
';
});
el.innerHTML = html;
+ pysimApplyAvailability();
} catch (e) {
el.innerHTML = 'Error: ' + esc(e.message) + '';
}
@@ -6492,6 +6565,9 @@ async function pysimResetCardData(refreshStatus) {
function pysimCardStateUpdate(status) {
if (!status || typeof status.connected !== 'boolean') return;
+ _pysimServerAvailable = true;
+ _pysimCardEquipped = !!status.connected;
+ pysimApplyAvailability();
const key = [status.connected, !!status.card_present, !!status.equipping, !!status.auto_equip, status.card_session].join('|');
if (key === _pysimCardStateKey) return;
_pysimCardStateKey = key;
@@ -6525,7 +6601,9 @@ function pysimStartBackendPoll() {
_pysimStatusTimer = setInterval(async () => {
try {
pysimCardStateUpdate(await pysimFetch('/api/status'));
- } catch (e) { /* ignore */ }
+ } catch (e) {
+ pysimSetServerAvailable(false);
+ }
}, 2000);
_pysimPollTimer = setInterval(async () => {
try {
@@ -7241,7 +7319,7 @@ function profilerRenderList() {
html += '' + esc(new Date(p.created).toLocaleString()) + '';
html += '(' + p.rules.length + ' ' + esc(t('rules')) + ')';
html += '';
- html += '';
+ html += '';
html += '';
html += '';
html += '';
@@ -7249,6 +7327,7 @@ function profilerRenderList() {
html += 'Load File AID / Package AID: ' + (o.aid || '?');
if (o.aid) {
- html += ' ';
- html += ' ';
+ html += ' ';
+ html += ' ';
}
html += '
';
html += 'Lifecycle: ' + ramFmtLifecycle(o.lifecycle || '') + '
';
@@ -5190,6 +5267,7 @@ async function ramExplore(sp) {
const html = ramRenderExploreHtml(mem, isd, apps, elfs);
explorerEl.innerHTML = html || '(no data)';
explorerEl.classList.remove('hidden');
+ pysimApplyAvailability();
}
async function ramDeleteFromExplorer(aid, withCascade) {
@@ -5243,12 +5321,7 @@ async function ramInstallCap(sp) {
tar: sp.tar, cntr: sp.cntr, kicKey: sp.kicKey, kidKey: sp.kidKey,
};
- const res = await fetch('/api/ram-install', {
- method: 'POST',
- headers: { 'Content-Type': 'application/json' },
- body: JSON.stringify(body),
- });
- const data = await res.json();
+ const data = await pysimFetch('/api/ram-install', body);
ramHideProgress();
const resultEl = document.getElementById('ram-result');
@@ -5621,11 +5694,10 @@ function pysimSwitchSubtab(name) {
btn.classList.toggle('text-gray-700', !isActive);
btn.classList.toggle('dark:text-slate-300', !isActive);
});
- ['cmd', 'apdu', 'files', 'custom'].forEach(s => {
+ ['cmd', 'apdu', 'files'].forEach(s => {
document.getElementById('pysim-sub-' + s).classList.toggle('hidden', s !== name);
});
- if (name === 'custom') pysimCustomRender();
- pysimHelpAnchor = {cmd:'pysim-cmdline', apdu:'raw-apdu', files:'file-manager', custom:'custom-files'}[name] || 'card-reader';
+ pysimHelpAnchor = {cmd:'pysim-cmdline', apdu:'raw-apdu', files:'file-manager'}[name] || 'card-reader';
setHelpAnchor(pysimHelpAnchor);
}
@@ -6288,9 +6360,10 @@ async function pysimEventsRender() {
html += ''
+ e.toString(16).padStart(2, '0').toUpperCase()
+ ' ' + esc(name)
- + '
';
+ + '