RAM operations perform atomic GlobalPlatform commands over SCP80. Card keys are taken from the saved preset.
-
-
-
-
-
+
+
+
+
-
@@ -1747,7 +1746,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.6.45';
+const SIMPLE_VERSION = '3.6.46';
document.getElementById('app-version').textContent = 'v' + SIMPLE_VERSION;
// ===== Tab switching =====
diff --git a/frontend/sw.js b/frontend/sw.js
index c0f774f..b274058 100644
--- a/frontend/sw.js
+++ b/frontend/sw.js
@@ -1,4 +1,4 @@
-const CACHE = 'simple-v318';
+const CACHE = 'simple-v319';
const URLS = [
'index.html',
'help.html',
diff --git a/frontend/tests/html.test.js b/frontend/tests/html.test.js
index 7bb947b..5d1ee68 100644
--- a/frontend/tests/html.test.js
+++ b/frontend/tests/html.test.js
@@ -448,3 +448,41 @@ test('every data-l10n attribute resolves in LANG_RU after HTML decoding', () =>
const missing = [...new Set([...attrs, ...titles].filter(k => !(k in dict)))];
assert.deepStrictEqual(missing, [], 'data-l10n keys with no LANG_RU entry:\n' + missing.join('\n'));
});
+
+test('every tab-content lives inside the max-w-7xl page container', () => {
+ // SCP81 and Cards used to sit outside the container (its closing
+ // came before them), so they stretched to the whole window while the
+ // other tabs were capped - v3.6.46.
+ const markup = htmlOnly(html);
+ const re = /<(\/?)([a-zA-Z][a-zA-Z0-9-]*)\b([^>]*?)>/g;
+ let m;
+ let depth = 0;
+ let containerDepth = null;
+ const seen = new Set();
+ while ((m = re.exec(markup))) {
+ const closing = m[1] === '/';
+ const tag = m[2].toLowerCase();
+ const attrs = m[3] || '';
+ const selfClosing = attrs.trim().endsWith('/');
+ if (VOID_TAGS.has(tag) || selfClosing) continue;
+ if (closing) {
+ if (containerDepth !== null && depth === containerDepth) containerDepth = null;
+ depth--;
+ continue;
+ }
+ if (tag === 'div' && /class="[^"]*max-w-7xl/.test(attrs)) containerDepth = depth + 1;
+ if (tag === 'div' && /class="[^"]*tab-content/.test(attrs)) {
+ const id = (/id="([^"]+)"/.exec(attrs) || [])[1];
+ assert.notStrictEqual(containerDepth, null,
+ id + ' must be inside the max-w-7xl page container');
+ seen.add(id);
+ }
+ depth++;
+ }
+ assert.strictEqual(seen.size, 7, 'expected all seven tabs, saw ' + seen.size);
+});
+
+test('the RAM form shows Card preset and Operation in one row', () => {
+ const row = /
\s*
\s*]*data-l10n="Card preset"[\s\S]*?id="ram-card-sel"[\s\S]*?data-l10n="Operation"[\s\S]*?id="ram-op"[\s\S]*?data-l10n="Execute"/.exec(html);
+ assert.ok(row, 'Card preset + Operation + Execute must share one row');
+});
diff --git a/pyproject.toml b/pyproject.toml
index 272b249..e0a3591 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project]
name = "pysim-simple-server"
-version = "3.6.45"
+version = "3.6.46"
description = "HTTP REST server wrapping pysim for the SIMple PWA"
requires-python = ">=3.8"
# pysim is a git-only dependency installed explicitly by setup.bat/setup.sh.
diff --git a/pysim_simple_server/server.py b/pysim_simple_server/server.py
index 15ebcbb..20b664e 100644
--- a/pysim_simple_server/server.py
+++ b/pysim_simple_server/server.py
@@ -31,7 +31,7 @@ from osmocom.tlv import BER_TLV_IE
from osmocom.utils import rpad
-VERSION = '3.6.45'
+VERSION = '3.6.46'
MAX_ENVELOPE_SEGMENTS = 5 # max SMS segments for outgoing C-APDU in ENVELOPE