mirror of
https://github.com/smittix/intercept.git
synced 2026-04-24 06:40:00 -07:00
morse: add multimon decoder alias fallback and clear stale idle scope
This commit is contained in:
Smittix
496
routes/morse.py
496
routes/morse.py
@@ -114,6 +114,29 @@ def _queue_morse_event(payload: dict[str, Any]) -> None:
|
||||
app_module.morse_queue.put_nowait(payload)
|
||||
|
||||
|
||||
def _resolve_multimon_morse_modes(multimon_path: str) -> list[str]:
|
||||
preferred = ['MORSE_CW', 'MORSE']
|
||||
discovered: list[str] = []
|
||||
try:
|
||||
result = subprocess.run(
|
||||
[multimon_path, '-h'],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=2,
|
||||
check=False,
|
||||
)
|
||||
blob = f'{result.stdout}\n{result.stderr}'.upper()
|
||||
for mode in preferred:
|
||||
if mode in blob and mode not in discovered:
|
||||
discovered.append(mode)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
if not discovered:
|
||||
return preferred
|
||||
return discovered
|
||||
|
||||
|
||||
def _parse_multimon_morse_text(line: str) -> str | None:
|
||||
cleaned = str(line or '').strip()
|
||||
if not cleaned:
|
||||
@@ -601,7 +624,7 @@ def start_morse() -> Response:
|
||||
_set_state(MORSE_IDLE, 'Idle')
|
||||
return jsonify({'status': 'error', 'message': msg}), 400
|
||||
|
||||
multimon_cmd = [multimon_path, '-t', 'raw', '-a', 'MORSE_CW', '-f', 'alpha', '-']
|
||||
multimon_decoder_modes = _resolve_multimon_morse_modes(multimon_path)
|
||||
|
||||
def _build_rtl_cmd(device_index: int, direct_sampling_mode: int | None) -> list[str]:
|
||||
sdr_device = SDRFactory.create_default_device(sdr_type, index=device_index)
|
||||
@@ -645,6 +668,7 @@ def start_morse() -> Response:
|
||||
'active_device': active_device_index,
|
||||
'device_serial': str(device_catalog.get(active_device_index, {}).get('serial') or 'Unknown'),
|
||||
'candidate_devices': list(candidate_device_indices),
|
||||
'multimon_decoder_modes': list(multimon_decoder_modes),
|
||||
}
|
||||
|
||||
active_rtl_process: subprocess.Popen[bytes] | None = None
|
||||
@@ -706,255 +730,271 @@ def start_morse() -> Response:
|
||||
|
||||
try:
|
||||
startup_succeeded = False
|
||||
for device_pos, candidate_device_index in enumerate(candidate_device_indices, start=1):
|
||||
if candidate_device_index != active_device_index:
|
||||
prev_device = active_device_index
|
||||
claim_error = app_module.claim_sdr_device(candidate_device_index, 'morse')
|
||||
if claim_error:
|
||||
msg = f'{_device_label(candidate_device_index)} unavailable: {claim_error}'
|
||||
attempt_errors.append(msg)
|
||||
logger.warning('Morse startup device fallback skipped: %s', msg)
|
||||
_queue_morse_event({'type': 'info', 'text': f'[morse] {msg}'})
|
||||
continue
|
||||
|
||||
if prev_device is not None:
|
||||
app_module.release_sdr_device(prev_device)
|
||||
active_device_index = candidate_device_index
|
||||
with app_module.morse_lock:
|
||||
morse_active_device = active_device_index
|
||||
|
||||
for decoder_pos, decoder_mode in enumerate(multimon_decoder_modes, start=1):
|
||||
multimon_cmd = [multimon_path, '-t', 'raw', '-a', decoder_mode, '-f', 'alpha', '-']
|
||||
runtime_config['multimon_decoder'] = decoder_mode
|
||||
if decoder_pos > 1:
|
||||
_queue_morse_event({
|
||||
'type': 'info',
|
||||
'text': (
|
||||
f'[morse] switching to {_device_label(active_device_index)} '
|
||||
f'({device_pos}/{len(candidate_device_indices)})'
|
||||
),
|
||||
'text': f'[morse] retrying with multimon decoder {decoder_mode}',
|
||||
})
|
||||
|
||||
runtime_config['active_device'] = active_device_index
|
||||
runtime_config['device_serial'] = str(
|
||||
device_catalog.get(active_device_index, {}).get('serial') or 'Unknown'
|
||||
)
|
||||
runtime_config.pop('startup_waiting', None)
|
||||
runtime_config.pop('startup_warning', None)
|
||||
for device_pos, candidate_device_index in enumerate(candidate_device_indices, start=1):
|
||||
if candidate_device_index != active_device_index:
|
||||
prev_device = active_device_index
|
||||
claim_error = app_module.claim_sdr_device(candidate_device_index, 'morse')
|
||||
if claim_error:
|
||||
msg = f'{_device_label(candidate_device_index)} unavailable: {claim_error}'
|
||||
attempt_errors.append(msg)
|
||||
logger.warning('Morse startup device fallback skipped: %s', msg)
|
||||
_queue_morse_event({'type': 'info', 'text': f'[morse] {msg}'})
|
||||
continue
|
||||
|
||||
for attempt_index, direct_sampling_mode in enumerate(direct_sampling_attempts, start=1):
|
||||
rtl_process = None
|
||||
multimon_process = None
|
||||
stop_event = None
|
||||
control_queue = None
|
||||
decoder_thread = None
|
||||
stderr_thread = None
|
||||
relay_thread = None
|
||||
master_fd = None
|
||||
if prev_device is not None:
|
||||
app_module.release_sdr_device(prev_device)
|
||||
active_device_index = candidate_device_index
|
||||
with app_module.morse_lock:
|
||||
morse_active_device = active_device_index
|
||||
|
||||
rtl_cmd = _build_rtl_cmd(active_device_index, direct_sampling_mode)
|
||||
direct_mode_label = direct_sampling_mode if direct_sampling_mode is not None else 'none'
|
||||
full_cmd = ' '.join(rtl_cmd) + ' | ' + ' '.join(multimon_cmd)
|
||||
logger.info(
|
||||
'Morse decoder attempt device=%s (%s/%s) direct_mode=%s (%s/%s): %s',
|
||||
active_device_index,
|
||||
device_pos,
|
||||
len(candidate_device_indices),
|
||||
direct_mode_label,
|
||||
attempt_index,
|
||||
len(direct_sampling_attempts),
|
||||
full_cmd,
|
||||
_queue_morse_event({
|
||||
'type': 'info',
|
||||
'text': (
|
||||
f'[morse] switching to {_device_label(active_device_index)} '
|
||||
f'({device_pos}/{len(candidate_device_indices)})'
|
||||
),
|
||||
})
|
||||
|
||||
runtime_config['active_device'] = active_device_index
|
||||
runtime_config['device_serial'] = str(
|
||||
device_catalog.get(active_device_index, {}).get('serial') or 'Unknown'
|
||||
)
|
||||
_queue_morse_event({'type': 'info', 'text': f'[cmd] {full_cmd}'})
|
||||
runtime_config.pop('startup_waiting', None)
|
||||
runtime_config.pop('startup_warning', None)
|
||||
|
||||
rtl_process = subprocess.Popen(
|
||||
rtl_cmd,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
bufsize=0,
|
||||
)
|
||||
register_process(rtl_process)
|
||||
for attempt_index, direct_sampling_mode in enumerate(direct_sampling_attempts, start=1):
|
||||
rtl_process = None
|
||||
multimon_process = None
|
||||
stop_event = None
|
||||
control_queue = None
|
||||
decoder_thread = None
|
||||
stderr_thread = None
|
||||
relay_thread = None
|
||||
master_fd = None
|
||||
|
||||
stop_event = threading.Event()
|
||||
control_queue = queue.Queue(maxsize=16)
|
||||
pcm_ready_event = threading.Event()
|
||||
stderr_lines: list[str] = []
|
||||
|
||||
def monitor_stderr(
|
||||
proc: subprocess.Popen[bytes] = rtl_process,
|
||||
proc_stop_event: threading.Event = stop_event,
|
||||
capture_lines: list[str] = stderr_lines,
|
||||
) -> None:
|
||||
stderr_stream = proc.stderr
|
||||
if stderr_stream is None:
|
||||
return
|
||||
try:
|
||||
while not proc_stop_event.is_set():
|
||||
line = stderr_stream.readline()
|
||||
if not line:
|
||||
if proc.poll() is not None:
|
||||
break
|
||||
time.sleep(0.02)
|
||||
continue
|
||||
err_text = line.decode('utf-8', errors='replace').strip()
|
||||
if not err_text:
|
||||
continue
|
||||
if len(capture_lines) >= 40:
|
||||
del capture_lines[:10]
|
||||
capture_lines.append(err_text)
|
||||
_queue_morse_event({'type': 'info', 'text': f'[rtl_fm] {err_text}'})
|
||||
except (ValueError, OSError):
|
||||
return
|
||||
except Exception:
|
||||
return
|
||||
|
||||
stderr_thread = threading.Thread(target=monitor_stderr, daemon=True, name='morse-stderr')
|
||||
stderr_thread.start()
|
||||
|
||||
master_fd, slave_fd = pty.openpty()
|
||||
try:
|
||||
multimon_process = subprocess.Popen(
|
||||
multimon_cmd,
|
||||
stdin=subprocess.PIPE,
|
||||
stdout=slave_fd,
|
||||
stderr=slave_fd,
|
||||
close_fds=True,
|
||||
rtl_cmd = _build_rtl_cmd(active_device_index, direct_sampling_mode)
|
||||
direct_mode_label = direct_sampling_mode if direct_sampling_mode is not None else 'none'
|
||||
full_cmd = ' '.join(rtl_cmd) + ' | ' + ' '.join(multimon_cmd)
|
||||
logger.info(
|
||||
'Morse decoder attempt decoder=%s device=%s (%s/%s) direct_mode=%s (%s/%s): %s',
|
||||
decoder_mode,
|
||||
active_device_index,
|
||||
device_pos,
|
||||
len(candidate_device_indices),
|
||||
direct_mode_label,
|
||||
attempt_index,
|
||||
len(direct_sampling_attempts),
|
||||
full_cmd,
|
||||
)
|
||||
finally:
|
||||
with contextlib.suppress(OSError):
|
||||
os.close(slave_fd)
|
||||
register_process(multimon_process)
|
||||
_queue_morse_event({'type': 'info', 'text': f'[cmd] {full_cmd}'})
|
||||
|
||||
if rtl_process.stdout is None:
|
||||
raise RuntimeError('rtl_fm stdout unavailable')
|
||||
if multimon_process.stdin is None:
|
||||
raise RuntimeError('multimon-ng stdin unavailable')
|
||||
rtl_process = subprocess.Popen(
|
||||
rtl_cmd,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
bufsize=0,
|
||||
)
|
||||
register_process(rtl_process)
|
||||
|
||||
relay_thread = threading.Thread(
|
||||
target=_morse_audio_relay_thread,
|
||||
args=(
|
||||
rtl_process.stdout,
|
||||
multimon_process.stdin,
|
||||
app_module.morse_queue,
|
||||
stop_event = threading.Event()
|
||||
control_queue = queue.Queue(maxsize=16)
|
||||
pcm_ready_event = threading.Event()
|
||||
stderr_lines: list[str] = []
|
||||
|
||||
def monitor_stderr(
|
||||
proc: subprocess.Popen[bytes] = rtl_process,
|
||||
proc_stop_event: threading.Event = stop_event,
|
||||
capture_lines: list[str] = stderr_lines,
|
||||
) -> None:
|
||||
stderr_stream = proc.stderr
|
||||
if stderr_stream is None:
|
||||
return
|
||||
try:
|
||||
while not proc_stop_event.is_set():
|
||||
line = stderr_stream.readline()
|
||||
if not line:
|
||||
if proc.poll() is not None:
|
||||
break
|
||||
time.sleep(0.02)
|
||||
continue
|
||||
err_text = line.decode('utf-8', errors='replace').strip()
|
||||
if not err_text:
|
||||
continue
|
||||
if len(capture_lines) >= 40:
|
||||
del capture_lines[:10]
|
||||
capture_lines.append(err_text)
|
||||
_queue_morse_event({'type': 'info', 'text': f'[rtl_fm] {err_text}'})
|
||||
except (ValueError, OSError):
|
||||
return
|
||||
except Exception:
|
||||
return
|
||||
|
||||
stderr_thread = threading.Thread(target=monitor_stderr, daemon=True, name='morse-stderr')
|
||||
stderr_thread.start()
|
||||
|
||||
master_fd, slave_fd = pty.openpty()
|
||||
try:
|
||||
multimon_process = subprocess.Popen(
|
||||
multimon_cmd,
|
||||
stdin=subprocess.PIPE,
|
||||
stdout=slave_fd,
|
||||
stderr=slave_fd,
|
||||
close_fds=True,
|
||||
)
|
||||
finally:
|
||||
with contextlib.suppress(OSError):
|
||||
os.close(slave_fd)
|
||||
register_process(multimon_process)
|
||||
|
||||
if rtl_process.stdout is None:
|
||||
raise RuntimeError('rtl_fm stdout unavailable')
|
||||
if multimon_process.stdin is None:
|
||||
raise RuntimeError('multimon-ng stdin unavailable')
|
||||
|
||||
relay_thread = threading.Thread(
|
||||
target=_morse_audio_relay_thread,
|
||||
args=(
|
||||
rtl_process.stdout,
|
||||
multimon_process.stdin,
|
||||
app_module.morse_queue,
|
||||
stop_event,
|
||||
control_queue,
|
||||
runtime_config,
|
||||
pcm_ready_event,
|
||||
),
|
||||
daemon=True,
|
||||
name='morse-relay',
|
||||
)
|
||||
relay_thread.start()
|
||||
|
||||
decoder_thread = threading.Thread(
|
||||
target=_morse_multimon_output_thread,
|
||||
args=(master_fd, multimon_process, stop_event),
|
||||
daemon=True,
|
||||
name='morse-decoder',
|
||||
)
|
||||
decoder_thread.start()
|
||||
|
||||
startup_deadline = time.monotonic() + 4.0
|
||||
startup_ok = False
|
||||
startup_error = ''
|
||||
|
||||
while time.monotonic() < startup_deadline:
|
||||
if pcm_ready_event.is_set():
|
||||
startup_ok = True
|
||||
break
|
||||
if rtl_process.poll() is not None:
|
||||
startup_error = f'rtl_fm exited during startup (code {rtl_process.returncode})'
|
||||
break
|
||||
if multimon_process.poll() is not None:
|
||||
startup_error = f'multimon-ng exited during startup (code {multimon_process.returncode})'
|
||||
break
|
||||
time.sleep(0.05)
|
||||
|
||||
if not startup_ok:
|
||||
if not startup_error:
|
||||
startup_error = 'No PCM samples received within startup timeout'
|
||||
if stderr_lines:
|
||||
startup_error = f'{startup_error}; stderr: {stderr_lines[-1]}'
|
||||
is_last_decoder = decoder_pos == len(multimon_decoder_modes)
|
||||
is_last_device = device_pos == len(candidate_device_indices)
|
||||
is_last_attempt = attempt_index == len(direct_sampling_attempts)
|
||||
if (
|
||||
is_last_decoder
|
||||
and is_last_device
|
||||
and is_last_attempt
|
||||
and rtl_process.poll() is None
|
||||
and multimon_process.poll() is None
|
||||
):
|
||||
startup_ok = True
|
||||
runtime_config['startup_waiting'] = True
|
||||
runtime_config['startup_warning'] = startup_error
|
||||
logger.warning(
|
||||
'Morse startup continuing without PCM on %s: %s',
|
||||
_device_label(active_device_index),
|
||||
startup_error,
|
||||
)
|
||||
_queue_morse_event({
|
||||
'type': 'info',
|
||||
'text': '[morse] waiting for PCM stream...',
|
||||
})
|
||||
|
||||
if startup_ok:
|
||||
runtime_config['direct_sampling_mode'] = direct_sampling_mode
|
||||
runtime_config['direct_sampling'] = (
|
||||
int(direct_sampling_mode) if direct_sampling_mode is not None else 0
|
||||
)
|
||||
runtime_config['command'] = full_cmd
|
||||
runtime_config['active_device'] = active_device_index
|
||||
runtime_config['multimon_decoder'] = decoder_mode
|
||||
|
||||
active_rtl_process = rtl_process
|
||||
active_multimon_process = multimon_process
|
||||
active_stop_event = stop_event
|
||||
active_control_queue = control_queue
|
||||
active_decoder_thread = decoder_thread
|
||||
active_stderr_thread = stderr_thread
|
||||
active_relay_thread = relay_thread
|
||||
active_master_fd = master_fd
|
||||
startup_succeeded = True
|
||||
break
|
||||
|
||||
attempt_errors.append(
|
||||
f'{_device_label(active_device_index)} decoder={decoder_mode} '
|
||||
f'attempt {attempt_index}/{len(direct_sampling_attempts)} '
|
||||
f'(source=rtl_fm direct_mode={direct_mode_label}): {startup_error}'
|
||||
)
|
||||
logger.warning('Morse startup attempt failed: %s', attempt_errors[-1])
|
||||
_queue_morse_event({'type': 'info', 'text': f'[morse] startup attempt failed: {startup_error}'})
|
||||
|
||||
_cleanup_attempt(
|
||||
rtl_process,
|
||||
multimon_process,
|
||||
stop_event,
|
||||
control_queue,
|
||||
runtime_config,
|
||||
pcm_ready_event,
|
||||
),
|
||||
daemon=True,
|
||||
name='morse-relay',
|
||||
)
|
||||
relay_thread.start()
|
||||
|
||||
decoder_thread = threading.Thread(
|
||||
target=_morse_multimon_output_thread,
|
||||
args=(master_fd, multimon_process, stop_event),
|
||||
daemon=True,
|
||||
name='morse-decoder',
|
||||
)
|
||||
decoder_thread.start()
|
||||
|
||||
startup_deadline = time.monotonic() + 4.0
|
||||
startup_ok = False
|
||||
startup_error = ''
|
||||
|
||||
while time.monotonic() < startup_deadline:
|
||||
if pcm_ready_event.is_set():
|
||||
startup_ok = True
|
||||
break
|
||||
if rtl_process.poll() is not None:
|
||||
startup_error = f'rtl_fm exited during startup (code {rtl_process.returncode})'
|
||||
break
|
||||
if multimon_process.poll() is not None:
|
||||
startup_error = f'multimon-ng exited during startup (code {multimon_process.returncode})'
|
||||
break
|
||||
time.sleep(0.05)
|
||||
|
||||
if not startup_ok:
|
||||
if not startup_error:
|
||||
startup_error = 'No PCM samples received within startup timeout'
|
||||
if stderr_lines:
|
||||
startup_error = f'{startup_error}; stderr: {stderr_lines[-1]}'
|
||||
is_last_device = device_pos == len(candidate_device_indices)
|
||||
is_last_attempt = attempt_index == len(direct_sampling_attempts)
|
||||
if (
|
||||
is_last_device
|
||||
and is_last_attempt
|
||||
and rtl_process.poll() is None
|
||||
and multimon_process.poll() is None
|
||||
):
|
||||
startup_ok = True
|
||||
runtime_config['startup_waiting'] = True
|
||||
runtime_config['startup_warning'] = startup_error
|
||||
logger.warning(
|
||||
'Morse startup continuing without PCM on %s: %s',
|
||||
_device_label(active_device_index),
|
||||
startup_error,
|
||||
)
|
||||
_queue_morse_event({
|
||||
'type': 'info',
|
||||
'text': '[morse] waiting for PCM stream...',
|
||||
})
|
||||
|
||||
if startup_ok:
|
||||
runtime_config['direct_sampling_mode'] = direct_sampling_mode
|
||||
runtime_config['direct_sampling'] = (
|
||||
int(direct_sampling_mode) if direct_sampling_mode is not None else 0
|
||||
decoder_thread,
|
||||
stderr_thread,
|
||||
relay_thread,
|
||||
master_fd,
|
||||
)
|
||||
runtime_config['command'] = full_cmd
|
||||
runtime_config['active_device'] = active_device_index
|
||||
rtl_process = None
|
||||
multimon_process = None
|
||||
stop_event = None
|
||||
control_queue = None
|
||||
decoder_thread = None
|
||||
stderr_thread = None
|
||||
relay_thread = None
|
||||
master_fd = None
|
||||
|
||||
active_rtl_process = rtl_process
|
||||
active_multimon_process = multimon_process
|
||||
active_stop_event = stop_event
|
||||
active_control_queue = control_queue
|
||||
active_decoder_thread = decoder_thread
|
||||
active_stderr_thread = stderr_thread
|
||||
active_relay_thread = relay_thread
|
||||
active_master_fd = master_fd
|
||||
startup_succeeded = True
|
||||
if startup_succeeded:
|
||||
break
|
||||
|
||||
attempt_errors.append(
|
||||
f'{_device_label(active_device_index)} '
|
||||
f'attempt {attempt_index}/{len(direct_sampling_attempts)} '
|
||||
f'(source=rtl_fm direct_mode={direct_mode_label}): {startup_error}'
|
||||
)
|
||||
logger.warning('Morse startup attempt failed: %s', attempt_errors[-1])
|
||||
_queue_morse_event({'type': 'info', 'text': f'[morse] startup attempt failed: {startup_error}'})
|
||||
|
||||
_cleanup_attempt(
|
||||
rtl_process,
|
||||
multimon_process,
|
||||
stop_event,
|
||||
control_queue,
|
||||
decoder_thread,
|
||||
stderr_thread,
|
||||
relay_thread,
|
||||
master_fd,
|
||||
)
|
||||
rtl_process = None
|
||||
multimon_process = None
|
||||
stop_event = None
|
||||
control_queue = None
|
||||
decoder_thread = None
|
||||
stderr_thread = None
|
||||
relay_thread = None
|
||||
master_fd = None
|
||||
if device_pos < len(candidate_device_indices):
|
||||
next_device = candidate_device_indices[device_pos]
|
||||
_queue_morse_event({
|
||||
'type': 'status',
|
||||
'state': MORSE_STARTING,
|
||||
'status': MORSE_STARTING,
|
||||
'message': (
|
||||
f'No PCM on {_device_label(active_device_index)}. '
|
||||
f'Trying {_device_label(next_device)}...'
|
||||
),
|
||||
'session_id': morse_session_id,
|
||||
'timestamp': time.strftime('%H:%M:%S'),
|
||||
})
|
||||
|
||||
if startup_succeeded:
|
||||
break
|
||||
|
||||
if device_pos < len(candidate_device_indices):
|
||||
next_device = candidate_device_indices[device_pos]
|
||||
_queue_morse_event({
|
||||
'type': 'status',
|
||||
'state': MORSE_STARTING,
|
||||
'status': MORSE_STARTING,
|
||||
'message': (
|
||||
f'No PCM on {_device_label(active_device_index)}. '
|
||||
f'Trying {_device_label(next_device)}...'
|
||||
),
|
||||
'session_id': morse_session_id,
|
||||
'timestamp': time.strftime('%H:%M:%S'),
|
||||
})
|
||||
|
||||
if (
|
||||
active_rtl_process is None
|
||||
or active_multimon_process is None
|
||||
|
||||
@@ -832,6 +832,17 @@ var MorseMode = (function () {
|
||||
}
|
||||
|
||||
function stopScope() {
|
||||
var canvas = el('morseScopeCanvas');
|
||||
if (canvas) {
|
||||
var ctx = canvas.getContext('2d');
|
||||
if (ctx) {
|
||||
var w = canvas.clientWidth || canvas.width || 1;
|
||||
var h = canvas.clientHeight || 80;
|
||||
ctx.clearRect(0, 0, w, h);
|
||||
ctx.fillStyle = '#050510';
|
||||
ctx.fillRect(0, 0, w, h);
|
||||
}
|
||||
}
|
||||
if (scopeAnim) {
|
||||
cancelAnimationFrame(scopeAnim);
|
||||
scopeAnim = null;
|
||||
|
||||
Reference in New Issue
Block a user