' + esc(t('Static image:')) + ' ' + esc(capMemBytes(nv.static_image)) +
+ html += '
' + esc(t('Code image (load file):')) + ' ' + esc(capMemBytes(loadFile)) +
+ ' · ' + esc(t('bytecode (Method.cap):')) + ' ' + esc(capMemBytes(methodBytes)) +
+ ' · ' + esc(t('other components:')) + ' ' + esc(capMemBytes(otherComponents)) + '
' + esc(t('Persistent data (NVRAM):')) + ' ' + esc(capMemBytes(nvramData)) +
+ ' · ' + esc(t('Static image:')) + ' ' + esc(capMemBytes(nv.static_image)) +
' · ' + esc(t('Static array init:')) + ' ' + esc(capMemBytes(nv.array_init)) +
' · ' + esc(t('Install-time objects:')) + ' ' + esc(capMemBytes(nv.install_objects)) +
' · ' + esc(t('Object headers:')) + ' ' + esc(capMemBytes(nv.header_overhead)) +
' · ' + esc(t('Reference storage:')) + ' ' + esc(capMemBytes(nv.ref_storage)) + '
' + esc(t('Transient arrays:')) + ' ' + esc(capMemBytes(ram.transient_arrays)) +
+ html += '
' + esc(t('RAM (volatile):')) + ' ' + esc(capMemBytes(ram.total)) +
+ ' · ' + esc(t('Transient arrays:')) + ' ' + esc(capMemBytes(ram.transient_arrays)) +
' · ' + esc(t('Runtime transient:')) + ' ' + esc(capMemBytes(ram.runtime_transient)) +
' · ' + esc(t('Peak method frame:')) + ' ' + esc(capMemBytes(ram.peak_frame)) + '
';
html += '
' + esc(t('Suggested install quotas (informational):')) +
' C6=' + esc(String(Number(sug.c6) || 0)) + ' C7=0x' + esc(hex2(sug.c7)) + ' C8=0x' + esc(hex2(sug.c8)) + '
';
+ html += '
' + esc(t('NVRAM = code image + persistent data (GP Card Spec v2.3.1 Table 11-48, C6+C8 style); card memory management, rounding and the registry entry are not included, and the static field image appears in both parts.')) + '
';
html += '
' + esc(t('Estimate only — memory values are not used for installation')) + '
';
html += '';
(mem.warnings || []).forEach(w => {
@@ -16012,6 +16027,14 @@ const LANG_RU = {
'Retry': 'Повторить',
'Analyze the CAP file first': 'Сначала проанализируйте CAP-файл',
'CAP requirements (estimate)': 'Требования CAP (оценка)',
+ 'NVRAM requirement ≈': 'Требование NVRAM ≈',
+ 'code image': 'образ кода',
+ 'data': 'данные',
+ 'Code image (load file):': 'Образ кода (load-файл):',
+ 'bytecode (Method.cap):': 'байткод (Method.cap):',
+ 'other components:': 'прочие компоненты:',
+ 'Persistent data (NVRAM):': 'Постоянные данные (NVRAM):',
+ 'NVRAM = code image + persistent data (GP Card Spec v2.3.1 Table 11-48, C6+C8 style); card memory management, rounding and the registry entry are not included, and the static field image appears in both parts.': 'NVRAM = образ кода + постоянные данные (GP Card Spec v2.3.1 Table 11-48, стиль C6+C8); управление памятью карты, округление и запись в реестре не учтены, а образ статических полей входит в обе части.',
'Code (Method.cap):': 'Код (Method.cap):',
'Persistent (NVRAM):': 'Энергонезависимая память (NVRAM):',
'RAM (volatile):': 'ОЗУ (volatile):',
diff --git a/frontend/sw.js b/frontend/sw.js
index 6462e17..dca5e1b 100644
--- a/frontend/sw.js
+++ b/frontend/sw.js
@@ -1,4 +1,4 @@
-const CACHE = 'simple-v267';
+const CACHE = 'simple-v268';
const URLS = [
'index.html',
'help.html',
diff --git a/frontend/tests/capmem.test.js b/frontend/tests/capmem.test.js
index eabee96..3a26f64 100644
--- a/frontend/tests/capmem.test.js
+++ b/frontend/tests/capmem.test.js
@@ -48,10 +48,10 @@ function resetState() {
function memFixture() {
return {
- code: { method_component: 2048 },
- nvram: { static_image: 12, array_init: 4, install_objects: 100, header_overhead: 12, ref_storage: 8, total: 136, runtime: 0 },
+ code: { method_component: 2048, load_file: 3000 },
+ nvram: { static_image: 12, array_init: 4, install_objects: 100, header_overhead: 12, ref_storage: 8, total: 136, runtime: 0, requirement: 3136 },
ram: { transient_arrays: 16, runtime_transient: 0, peak_frame: 8, total: 24 },
- suggested: { c6: 2048, c7: 272, c8: 136 },
+ suggested: { c6: 3000, c7: 272, c8: 136 },
warnings: [],
};
}
@@ -64,23 +64,36 @@ test('capMemBytes formats bytes and kilobytes', () => {
assert.strictEqual(capMemBytes(null), '0 B');
});
-test('capMemHtml renders the summary, breakdown and warnings', () => {
+test('capMemHtml renders the NVRAM requirement, breakdown and warnings', () => {
const mem = memFixture();
mem.warnings = ['method class[0].token[1]: unknown opcode 0xAA, scan stopped'];
const out = capMemHtml(mem);
assert.ok(out.includes('CAP requirements (estimate)'), out);
- assert.ok(out.includes('Code (Method.cap): 2.0 kB'), out);
- assert.ok(out.includes('Persistent (NVRAM): 136 B'), out);
+ // C6+C8-style total: load file + persistent data
+ assert.ok(out.includes('NVRAM requirement ≈ 3.1 kB (code image 2.9 kB + data 136 B)'), out);
assert.ok(out.includes('RAM (volatile): 24 B'), out);
+ assert.ok(out.includes('Code image (load file): 2.9 kB'), out);
+ assert.ok(out.includes('bytecode (Method.cap): 2.0 kB'), out);
+ assert.ok(out.includes('other components: 952 B'), out);
+ assert.ok(out.includes('Persistent data (NVRAM): 136 B'), out);
assert.ok(out.includes('Static image: 12 B'), out);
assert.ok(out.includes('Reference storage: 8 B'), out);
assert.ok(out.includes('Peak method frame: 8 B'), out);
- assert.ok(out.includes('C6=2048 C7=0x0110 C8=0x0088'), out);
+ assert.ok(out.includes('C6=3000 C7=0x0110 C8=0x0088'), out);
+ assert.ok(out.includes('Table 11-48'), out);
assert.ok(out.includes('Estimate only'), out);
assert.ok(out.includes('unknown opcode 0xAA'), out);
assert.strictEqual(capMemHtml(null), '');
});
+test('capMemHtml falls back to the bytecode size on older server responses', () => {
+ const mem = memFixture();
+ delete mem.code.load_file;
+ delete mem.nvram.requirement;
+ const out = capMemHtml(mem);
+ assert.ok(out.includes('NVRAM requirement ≈ 2.1 kB (code image 2.0 kB + data 136 B)'), out);
+});
+
test('capGateOk gates the RAM install op and the scripts form', () => {
resetState();
globalThis.document = { getElementById: id => (id === 'ram-op' ? { value: 'install-cap' } : null) };
diff --git a/pyproject.toml b/pyproject.toml
index 59e1fdf..4c4ffd5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project]
name = "pysim-simple-server"
-version = "3.5.14"
+version = "3.5.15"
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/capmem.py b/pysim_simple_server/capmem.py
index fe6f608..41e95a6 100755
--- a/pysim_simple_server/capmem.py
+++ b/pysim_simple_server/capmem.py
@@ -1629,11 +1629,24 @@ def compute_memory(report):
return result
-def memory_json(report, memory):
- """Compact, stable JSON shape for the API/PWA (all byte counts)."""
+def memory_json(report, memory, load_file_bytes=None):
+ """Compact, stable JSON shape for the API/PWA (all byte counts).
+
+ ``load_file_bytes`` is the concatenated CAP load file (all components) -
+ the package image the card stores, our proxy for the GP Card Spec v2.3.1
+ Table 11-48 "non-volatile code" minimum memory requirement. With it the
+ suggested C6 becomes the load file and ``nvram.requirement`` reports the
+ C6+C8-style total (code image + persistent data, per 11.5.2.3.7: "If both
+ tags 'C6' and 'C8' are present and the implementation does not make any
+ distinction between Non-Volatile Code and Non-Volatile Data Memory then
+ the required minimum shall be the sum of both values"); without it the
+ tool's bytecode-only C6 is kept."""
ram_transient = memory.get('ram_transient_arrays', 0)
ram_runtime = memory.get('runtime_transient_bytes', 0)
ram_frame = memory.get('ram_frame_bytes', 0)
+ nvram_total = memory.get('nvram_with_ref_storage', 0)
+ load_file = max(0, int(load_file_bytes or 0))
+ method_component = report.get('method_component_size', 0)
return {
'cap_version': report.get('cap_version'),
'package_version': report.get('package_version'),
@@ -1643,7 +1656,8 @@ def memory_json(report, memory):
'class_count': report.get('class_count', 0),
'method_count': report.get('method_count', 0),
'code': {
- 'method_component': report.get('method_component_size', 0),
+ 'method_component': method_component,
+ 'load_file': load_file,
},
'nvram': {
'static_image': memory.get('nvram_static_image', 0),
@@ -1651,8 +1665,11 @@ def memory_json(report, memory):
'install_objects': memory.get('nvram_persistent_objects', 0),
'header_overhead': memory.get('nvram_object_header_overhead', 0),
'ref_storage': memory.get('reference_storage', 0),
- 'total': memory.get('nvram_with_ref_storage', 0),
+ 'total': nvram_total,
'runtime': memory.get('runtime_persistent_bytes', 0),
+ # C6+C8-style total: package image + persistent data (None when
+ # the caller did not provide the load file size)
+ 'requirement': (load_file + nvram_total) if load_file else None,
},
'ram': {
'transient_arrays': ram_transient,
@@ -1661,9 +1678,9 @@ def memory_json(report, memory):
'total': ram_transient + ram_runtime + ram_frame,
},
'suggested': {
- 'c6': report.get('method_component_size', 0),
+ 'c6': load_file or method_component,
'c7': ram_transient + 256,
- 'c8': memory.get('nvram_with_ref_storage', 0),
+ 'c8': nvram_total,
},
'warnings': list(report.get('warnings', [])),
}
diff --git a/pysim_simple_server/server.py b/pysim_simple_server/server.py
index 6cd1e6c..cb617cd 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.5.14'
+VERSION = '3.5.15'
MAX_ENVELOPE_SEGMENTS = 5 # max SMS segments for outgoing C-APDU in ENVELOPE
@@ -2564,7 +2564,9 @@ def _cap_info_body(body):
return {'ok': False, 'error': 'cap parse failed: %s' % e}
try:
report, memory = capmem.analyze_bytes(bytes.fromhex(cap_hex))
- info = capmem.memory_json(report, memory)
+ # the load file (all components) is our proxy for the GP "non-volatile
+ # code" requirement, so the JSON can report the C6+C8-style total
+ info = capmem.memory_json(report, memory, load_file_bytes=len(loadfile_data) // 2)
except Exception as e:
return {'ok': False, 'error': 'cap analysis failed: %s' % e}
return {'ok': True, 'load_file_aid': loadfile_aid, 'module_aid': module_aid,
diff --git a/tests/test_cap_memory.py b/tests/test_cap_memory.py
index 23b4b30..31e99c3 100644
--- a/tests/test_cap_memory.py
+++ b/tests/test_cap_memory.py
@@ -198,6 +198,18 @@ class TestCapAnalyzer(unittest.TestCase):
self.assertEqual(info['suggested']['c8'], memory['nvram_with_ref_storage'])
self.assertEqual(info['warnings'], [])
self.assertIn('applets', info)
+ # without the load file the tool's bytecode-only C6 is kept and no
+ # C6+C8-style total is reported
+ self.assertEqual(info['code']['load_file'], 0)
+ self.assertIsNone(info['nvram']['requirement'])
+
+ def test_memory_json_nvram_requirement_uses_the_load_file(self):
+ report, memory = capmem.analyze_bytes(rich_cap())
+ info = capmem.memory_json(report, memory, load_file_bytes=1000)
+ self.assertEqual(info['code']['load_file'], 1000)
+ self.assertEqual(info['suggested']['c6'], 1000)
+ self.assertEqual(info['nvram']['requirement'],
+ 1000 + memory['nvram_with_ref_storage'])
def test_unknown_opcode_stops_the_scan_with_a_warning(self):
bytecode = _method_header(1, 0, 0) + b'\xee' # 0xEE is not a JC 2.1 opcode
@@ -224,6 +236,12 @@ class TestCapInfoBody(unittest.TestCase):
self.assertTrue(resp['load_file_bytes'] > 0)
self.assertEqual(resp['memory']['package_aid'], '0102030405')
self.assertTrue(resp['memory']['nvram']['total'] > 0)
+ # the endpoint feeds the load file size in: C6 = package image and
+ # nvram.requirement = code image + persistent data (GP C6+C8 style)
+ self.assertEqual(resp['memory']['code']['load_file'], resp['load_file_bytes'])
+ self.assertEqual(resp['memory']['suggested']['c6'], resp['load_file_bytes'])
+ self.assertEqual(resp['memory']['nvram']['requirement'],
+ resp['load_file_bytes'] + resp['memory']['nvram']['total'])
def test_bad_hex_and_corrupt_archives_are_rejected(self):
self.assertFalse(_cap_info_body({})['ok'])