Update SDR device claims

2026-06-20 03:14:21 -07:00 · 2026-02-10 18:07:52 +00:00
parent b4c47ed28b
commit 257de37dfe
9 changed files with 585 additions and 420 deletions
@@ -32,8 +32,9 @@ from utils.dependencies import get_tool_path

 pager_bp = Blueprint('pager', __name__)

-# Track which device is being used
-pager_active_device: int | None = None
+# Track which device is being used
+pager_active_device: int | None = None
+pager_active_sdr_type: str | None = None


 def parse_multimon_output(line: str) -> dict[str, str] | None:
@@ -205,7 +206,7 @@ def stream_decoder(master_fd: int, process: subprocess.Popen[bytes]) -> None:
    except Exception as e:
        app_module.output_queue.put({'type': 'error', 'text': str(e)})
    finally:
-        global pager_active_device
+        global pager_active_device, pager_active_sdr_type
        try:
            os.close(master_fd)
        except OSError:
@@ -233,14 +234,15 @@ def stream_decoder(master_fd: int, process: subprocess.Popen[bytes]) -> None:
        with app_module.process_lock:
            app_module.current_process = None
        # Release SDR device
-        if pager_active_device is not None:
-            app_module.release_sdr_device(pager_active_device)
-            pager_active_device = None
+        if pager_active_device is not None:
+            app_module.release_sdr_device(pager_active_device, pager_active_sdr_type or 'rtlsdr')
+            pager_active_device = None
+            pager_active_sdr_type = None


@pager_bp.route('/start', methods=['POST'])
-def start_decoding() -> Response:
-    global pager_active_device
+def start_decoding() -> Response:
+    global pager_active_device, pager_active_sdr_type

    with app_module.process_lock:
        if app_module.current_process:
@@ -262,33 +264,42 @@ def start_decoding() -> Response:
            squelch = int(squelch)
            if not 0 <= squelch <= 1000:
                raise ValueError("Squelch must be between 0 and 1000")
-        except (ValueError, TypeError):
-            return jsonify({'status': 'error', 'message': 'Invalid squelch value'}), 400
-
-        # Check for rtl_tcp (remote SDR) connection
-        rtl_tcp_host = data.get('rtl_tcp_host')
-        rtl_tcp_port = data.get('rtl_tcp_port', 1234)
-
-        # Claim local device if not using remote rtl_tcp
-        if not rtl_tcp_host:
-            device_int = int(device)
-            error = app_module.claim_sdr_device(device_int, 'pager')
-            if error:
-                return jsonify({
-                    'status': 'error',
-                    'error_type': 'DEVICE_BUSY',
-                    'message': error
-                }), 409
-            pager_active_device = device_int
+        except (ValueError, TypeError):
+            return jsonify({'status': 'error', 'message': 'Invalid squelch value'}), 400
+
+        # Get SDR type and build command via abstraction layer
+        sdr_type_str = data.get('sdr_type', 'rtlsdr')
+        try:
+            sdr_type = SDRType(sdr_type_str)
+        except ValueError:
+            sdr_type = SDRType.RTL_SDR
+
+        # Check for rtl_tcp (remote SDR) connection
+        rtl_tcp_host = data.get('rtl_tcp_host')
+        rtl_tcp_port = data.get('rtl_tcp_port', 1234)
+
+        # Claim local device if not using remote rtl_tcp
+        if not rtl_tcp_host:
+            device_int = int(device)
+            error = app_module.claim_sdr_device(device_int, 'pager', sdr_type.value)
+            if error:
+                return jsonify({
+                    'status': 'error',
+                    'error_type': 'DEVICE_BUSY',
+                    'message': error
+                }), 409
+            pager_active_device = device_int
+            pager_active_sdr_type = sdr_type.value

        # Validate protocols
        valid_protocols = ['POCSAG512', 'POCSAG1200', 'POCSAG2400', 'FLEX']
        protocols = data.get('protocols', valid_protocols)
-        if not isinstance(protocols, list):
-            if pager_active_device is not None:
-                app_module.release_sdr_device(pager_active_device)
-                pager_active_device = None
-            return jsonify({'status': 'error', 'message': 'Protocols must be a list'}), 400
+        if not isinstance(protocols, list):
+            if pager_active_device is not None:
+                app_module.release_sdr_device(pager_active_device, pager_active_sdr_type or 'rtlsdr')
+                pager_active_device = None
+                pager_active_sdr_type = None
+            return jsonify({'status': 'error', 'message': 'Protocols must be a list'}), 400
        protocols = [p for p in protocols if p in valid_protocols]
        if not protocols:
            protocols = valid_protocols
@@ -312,14 +323,7 @@ def start_decoding() -> Response:
            elif proto == 'FLEX':
                decoders.extend(['-a', 'FLEX'])

-        # Get SDR type and build command via abstraction layer
-        sdr_type_str = data.get('sdr_type', 'rtlsdr')
-        try:
-            sdr_type = SDRType(sdr_type_str)
-        except ValueError:
-            sdr_type = SDRType.RTL_SDR
-
-        if rtl_tcp_host:
+        if rtl_tcp_host:
            # Validate and create network device
            try:
                rtl_tcp_host = validate_rtl_tcp_host(rtl_tcp_host)
@@ -416,22 +420,23 @@ def start_decoding() -> Response:

            return jsonify({'status': 'started', 'command': full_cmd})

-        except FileNotFoundError as e:
-            # Kill orphaned rtl_fm process
-            try:
-                rtl_process.terminate()
-                rtl_process.wait(timeout=2)
+        except FileNotFoundError as e:
+            # Kill orphaned rtl_fm process
+            try:
+                rtl_process.terminate()
+                rtl_process.wait(timeout=2)
            except Exception:
                try:
                    rtl_process.kill()
                except Exception:
                    pass
-            # Release device on failure
-            if pager_active_device is not None:
-                app_module.release_sdr_device(pager_active_device)
-                pager_active_device = None
-            return jsonify({'status': 'error', 'message': f'Tool not found: {e.filename}'})
-        except Exception as e:
+            # Release device on failure
+            if pager_active_device is not None:
+                app_module.release_sdr_device(pager_active_device, pager_active_sdr_type or 'rtlsdr')
+                pager_active_device = None
+                pager_active_sdr_type = None
+            return jsonify({'status': 'error', 'message': f'Tool not found: {e.filename}'})
+        except Exception as e:
            # Kill orphaned rtl_fm process if it was started
            try:
                rtl_process.terminate()
@@ -441,16 +446,17 @@ def start_decoding() -> Response:
                    rtl_process.kill()
                except Exception:
                    pass
-            # Release device on failure
-            if pager_active_device is not None:
-                app_module.release_sdr_device(pager_active_device)
-                pager_active_device = None
-            return jsonify({'status': 'error', 'message': str(e)})
+            # Release device on failure
+            if pager_active_device is not None:
+                app_module.release_sdr_device(pager_active_device, pager_active_sdr_type or 'rtlsdr')
+                pager_active_device = None
+                pager_active_sdr_type = None
+            return jsonify({'status': 'error', 'message': str(e)})


@pager_bp.route('/stop', methods=['POST'])
-def stop_decoding() -> Response:
-    global pager_active_device
+def stop_decoding() -> Response:
+    global pager_active_device, pager_active_sdr_type

    with app_module.process_lock:
        if app_module.current_process:
@@ -485,10 +491,11 @@ def stop_decoding() -> Response:

            app_module.current_process = None

-            # Release device from registry
-            if pager_active_device is not None:
-                app_module.release_sdr_device(pager_active_device)
-                pager_active_device = None
+            # Release device from registry
+            if pager_active_device is not None:
+                app_module.release_sdr_device(pager_active_device, pager_active_sdr_type or 'rtlsdr')
+                pager_active_device = None
+                pager_active_sdr_type = None

            return jsonify({'status': 'stopped'})