]*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');
});
+
+test('the RAM operation modal is wide enough for the step lines', () => {
+ const m = /
test('ramStepLine shows the PoR verdict and the remote status word', () => {
globalThis.t = s => s;
globalThis.lookupSw = (a, b) => (a + b === '6700' ? 'Wrong length in Lc' : '');
+ // successful steps are compact: verdict symbol, remote SW (no name),
+ // size; the SMS count only for concatenated packets
const okLine = ramStepLine({ name: 'INSTALL [for load]', por_status: 'por_ok',
por_sw: '9000', sw: '9000', bytes: 50, segments: 1 }, 0);
- assert.ok(okLine.startsWith('\u2705'), okLine);
- assert.ok(okLine.includes('PoR ok'), okLine);
- assert.ok(okLine.includes('remote SW 9000'), okLine);
- assert.ok(okLine.includes('50 bytes / 1 SMS'), okLine);
+ assert.strictEqual(okLine, '\u2705 Step 1: INSTALL [for load] \u2014 9000 \u00b7 50 B');
+ const multi = ramStepLine({ name: 'LOAD (1/64)', por_status: 'por_ok',
+ por_sw: '6101', bytes: 274, segments: 3 }, 1);
+ assert.strictEqual(multi, '\u2705 Step 2: LOAD (1/64) \u2014 6101 \u00b7 274 B / 3 SMS');
const badLine = ramStepLine({ name: 'LOAD (1/9)', por_status: 'por_ok', por_sw: '6700',
por_error: 'remote SW 6700', sw: '9000', bytes: 274, segments: 3 }, 1);
assert.ok(badLine.startsWith('\u274c'), badLine);
diff --git a/pyproject.toml b/pyproject.toml
index e0a3591..08edf1c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project]
name = "pysim-simple-server"
-version = "3.6.46"
+version = "3.6.47"
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 20b664e..d7646cb 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.46'
+VERSION = '3.6.47'
MAX_ENVELOPE_SEGMENTS = 5 # max SMS segments for outgoing C-APDU in ENVELOPE
@@ -4864,6 +4864,20 @@ _TEST_BLOCKED_PATHS = frozenset([
'/api/scp81/gen-install', '/api/scp81/log-clear',
'/api/bip/control', '/api/bip/log-clear',
])
+# GET endpoints that only read cached state (or the static file tree): served
+# without _CARD_LOCK so they stay answerable while a long card operation runs
+# (see do_GET). Card-touching GETs are deliberately absent: /api/cardinfo
+# (runs cardinfo on the card) and /api/esim/* (ES10 selection + STORE DATA).
+_CARD_FREE_GET = frozenset([
+ '/api/status', '/api/test/status', '/api/version',
+ '/api/stk-status', '/api/poll-status', '/api/proactive-log',
+ '/api/menu', '/api/events', '/api/terminal-profile',
+ '/api/pli-qualifiers', '/api/pli-dict', '/api/commands',
+ '/api/net-state', '/api/mcc-mnc',
+ '/api/scp81/status', '/api/bip/status', '/api/scp81/script',
+ '/api/scp81/log', '/api/bip/log',
+])
+
_TEST_COMMAND_TYPES = {name.upper(): code for code, name in PROACTIVE_TYPE_NAMES.items()}
@@ -5424,15 +5438,17 @@ class PysimHandler(BaseHTTPRequestHandler):
self._send_json({'error': 'test script running - card commands are '
'blocked until it finishes'}, 409)
return
- # /api/status and /api/test/status are pure cached state (no card I/O);
- # keeping them out of the lock lets the UI report 'initializing' while a
- # long equip (or a test script step) holds the card lock. Result-shaping
- # masks everything card-derived when the session is not connected.
- # Static PWA files are card-free too: they must stay answerable while a
- # long card operation holds the lock (the server is threaded, so this
- # bypass is what actually serves the modal's progress poll and page
- # assets during a RAM install).
- if self.path in ('/api/status', '/api/test/status') or not self.path.startswith('/api/'):
+ # Pure cached state (no card I/O) is served without the lock: the UI
+ # must be able to report 'initializing' while a long equip (or a test
+ # script step) holds the card lock. The list is deliberately wide:
+ # with a long RAM install the UI polls several of these every few
+ # seconds, and if they queued behind the install they would eat the
+ # browser's per-host connection budget - starving /api/status (the
+ # modal's progress bar froze around 70% and jumped to 100% at the end,
+ # live 2026-09-29). Static PWA files are card-free too. Card-touching
+ # GETs (cardinfo, esim/*) stay locked below.
+ path = self.path.split('?', 1)[0]
+ if path in _CARD_FREE_GET or not path.startswith('/api/'):
self._do_GET()
return
# Serialize all card access: the background STATUS poll runs in its own
diff --git a/tests/test_fetch_routes.py b/tests/test_fetch_routes.py
index 6fcc9d9..817c809 100644
--- a/tests/test_fetch_routes.py
+++ b/tests/test_fetch_routes.py
@@ -18,7 +18,7 @@ import urllib.error
import urllib.request
from pysim_simple_server.__main__ import _build_http_server
-from pysim_simple_server.server import PysimHandler
+from pysim_simple_server.server import PysimHandler, _CARD_FREE_GET, _CARD_LOCK
ROOT = pathlib.Path(__file__).resolve().parents[1]
@@ -109,3 +109,53 @@ class TestScriptHttpTests(unittest.TestCase):
if __name__ == '__main__':
unittest.main()
+
+
+class CardFreeGetTests(unittest.TestCase):
+ """Cached GETs must answer while the card lock is held.
+
+ During a long RAM install the UI polls several cached endpoints every few
+ seconds; while they queued behind the install they ate the browser's
+ per-host connection budget and starved /api/status - the modal's progress
+ bar froze around 70% and jumped to 100% at the end (live 2026-09-29).
+ """
+
+ def setUp(self):
+ self.server = _build_http_server('127.0.0.1', 0, PysimHandler)
+ self.server.log_requests = False
+ self.server.app = None
+ self.server.sl = None
+ self.server.scc = None
+ self.server.stk_pending = None
+ self.server.menu_active = False
+ self.server.sim_menu = None
+ self.server.event_list = None
+ self.server.terminal_profile = None
+ self.server.cli_terminal_profile = None
+ threading.Thread(target=self.server.serve_forever, daemon=True).start()
+ self.port = self.server.server_address[1]
+
+ def tearDown(self):
+ self.server.shutdown()
+ self.server.server_close()
+
+ def _get(self, path, timeout=2):
+ return urllib.request.urlopen(
+ 'http://127.0.0.1:%d%s' % (self.port, path), timeout=timeout)
+
+ def test_cached_endpoints_answer_while_the_card_lock_is_held(self):
+ with _CARD_LOCK:
+ for path in ('/api/status', '/api/stk-status', '/api/poll-status',
+ '/api/proactive-log', '/api/menu', '/api/events'):
+ with self.subTest(path=path):
+ with self._get(path) as res:
+ self.assertEqual(res.status, 200)
+
+ def test_card_touching_gets_stay_locked(self):
+ # cardinfo runs a card command; the ES10 endpoints select/STORE DATA
+ for path in ('/api/cardinfo', '/api/esim/chip', '/api/esim/profiles'):
+ self.assertNotIn(path, _CARD_FREE_GET)
+
+
+if __name__ == '__main__':
+ unittest.main()