Feature/multi port

src/infuse_iot/tools/annotate_events.py

@@ -25,10 +25,9 @@
     ClientNotificationConnectionDropped,
     GatewayRequestConnectionRequest,
     LocalClient,
-    default_multicast_address,
 )
 from infuse_iot.time import InfuseTime
-from infuse_iot.util.argparse import InfuseDeviceId, ValidFile
+from infuse_iot.util.argparse import InfuseDeviceId, ValidFile, add_server_port_parser
 from infuse_iot.util.console import choose_one
 from infuse_iot.zephyr.errno import errno
 
@@ -121,6 +120,8 @@ def add_parser(cls, parser):
 
         parser.add_argument("--id", type=InfuseDeviceId, help="Device to log events to")
 
+        add_server_port_parser(parser)
+
     def __init__(self, args):
         self._label_type = args.labels
         self._time_check = args.time or TimeCheckType.DEFAULT
@@ -153,7 +154,7 @@ def __init__(self, args):
             self._labels = []
 
         self._logger: rpc_enum_data_logger = args.logger
-        self._client = LocalClient(default_multicast_address(), 1.0)
+        self._client = LocalClient(args.server_sock, 1.0)
         self._device_id = args.id
         self.rpc_client: RpcClient | None = None
         self.connected = False

src/infuse_iot/tools/audio_record.py

@@ -19,10 +19,9 @@
     ClientNotificationEpacketReceived,
     GatewayRequestConnectionRequest,
     LocalClient,
-    default_multicast_address,
 )
 from infuse_iot.tdf import TDF
-from infuse_iot.util.argparse import InfuseDeviceId
+from infuse_iot.util.argparse import InfuseDeviceId, add_server_port_parser
 from infuse_iot.util.console import Console
 
 
@@ -32,7 +31,7 @@ class SubCommand(InfuseCommand):
     DESCRIPTION = "Record audio data to a file from TDF"
 
     def __init__(self, args):
-        self._client = LocalClient(default_multicast_address(), 1.0)
+        self._client = LocalClient(args.server_sock, 1.0)
         self._decoder = TDF()
         if args.gateway:
             self._id = InfuseID.GATEWAY
@@ -54,6 +53,8 @@ def add_parser(cls, parser):
         )
         parser.add_argument("--name", type=str, help="Filename prefix")
 
+        add_server_port_parser(parser)
+
     def handle_channel(self, channel: str, stack: ExitStack, tdf: TDF.Reading):
         if channel == "left":
             chan = self._left

src/infuse_iot/tools/auto_activate.py

@@ -18,9 +18,9 @@
 from infuse_iot.socket_comms import (
     GatewayRequestConnectionRequest,
     LocalClient,
-    default_multicast_address,
 )
 from infuse_iot.tdf import TDF
+from infuse_iot.util.argparse import add_server_port_parser
 
 
 class SubCommand(InfuseCommand):
@@ -31,7 +31,7 @@ class SubCommand(InfuseCommand):
     def __init__(self, args):
         self.app_ids = args.app
         self.active = args.active or False
-        self.client = LocalClient(default_multicast_address(), 1.0)
+        self.client = LocalClient(args.server_sock, 1.0)
         self.decoder = TDF()
         self.state = "Scanning"
         self.name = "Active" if args.active else "Inactive"
@@ -47,6 +47,8 @@ def add_parser(cls, parser):
         mode_group.add_argument("--active", action="store_true", help="Move all devices to active state")
         mode_group.add_argument("--inactive", action="store_true", help="Move all devices to inactive state")
 
+        add_server_port_parser(parser)
+
     def progress_table(self):
         table = Table()
         table.add_column()

src/infuse_iot/tools/bt_log.py

@@ -15,10 +15,9 @@
     ClientNotificationEpacketReceived,
     GatewayRequestConnectionRequest,
     LocalClient,
-    default_multicast_address,
 )
 from infuse_iot.tdf import TDF
-from infuse_iot.util.argparse import InfuseDeviceId
+from infuse_iot.util.argparse import InfuseDeviceId, add_server_port_parser
 from infuse_iot.util.console import Console
 
 
@@ -28,7 +27,7 @@ class SubCommand(InfuseCommand):
     DESCRIPTION = "Connect to remote Bluetooth device serial logs"
 
     def __init__(self, args):
-        self._client = LocalClient(default_multicast_address(), 1.0)
+        self._client = LocalClient(args.server_sock, 1.0)
         self._decoder = TDF()
         self._id = args.id
         self._data = args.data
@@ -41,6 +40,7 @@ def add_parser(cls, parser):
         parser.add_argument(
             "--conn-timeout", type=int, default=10000, help="Timeout to wait for a connection to the device (ms)"
         )
+        add_server_port_parser(parser)
 
     def run(self):
         if not self._client.comms_check():

src/infuse_iot/tools/data_logger_sync.py

@@ -28,9 +28,8 @@
 from infuse_iot.socket_comms import (
     GatewayRequestConnectionRequest,
     LocalClient,
-    default_multicast_address,
 )
-from infuse_iot.util.argparse import ValidDir
+from infuse_iot.util.argparse import ValidDir, add_server_port_parser
 
 
 class DeviceState:
@@ -65,7 +64,7 @@ class SubCommand(InfuseCommand):
     DESCRIPTION = "Synchronise data logger state from remote devices"
 
     def __init__(self, args):
-        self._client = LocalClient(default_multicast_address(), 1.0)
+        self._client = LocalClient(args.server_sock, 1.0)
         self._min_rssi: int | None = args.rssi
         self._app = args.app
         self._out = args.out
@@ -112,6 +111,8 @@ def add_parser(cls, parser):
             help="Synchronise removable loggers",
         )
 
+        add_server_port_parser(parser)
+
     def progress_table(self):
         table = Table()
         table.add_column("Device ID")

src/infuse_iot/tools/gateway.py

@@ -51,9 +51,8 @@
     GatewayRequestEpacketSend,
     GatewayRequestObservedDevices,
     LocalServer,
-    default_multicast_address,
 )
-from infuse_iot.util.argparse import ValidFile
+from infuse_iot.util.argparse import ValidFile, add_server_port_parser
 from infuse_iot.util.console import Console
 from infuse_iot.util.os import is_wsl
 from infuse_iot.util.threading import SignaledThread
@@ -529,7 +528,7 @@ def add_parser(cls, parser):
         )
         parser.add_argument("--baud", type=int, default=115200, help="Baudrate for serial port")
         parser.add_argument("--root", type=ValidFile, help="Root identity certificate to use instead of cloud")
-        parser.add_argument("--server-port", type=int, help="Alternate multicast port to use")
+        add_server_port_parser(parser)
 
     def __init__(self, args: argparse.Namespace):
         self.port: SerialLike
@@ -545,8 +544,7 @@ def __init__(self, args: argparse.Namespace):
         if args.display_only:
             self.server = None
         else:
-            addr = default_multicast_address(args.server_port) if args.server_port else default_multicast_address()
-            self.server = LocalServer(addr)
+            self.server = LocalServer(args.server_sock)
         self.rpc_server = LocalRpcServer(self.ddb)
         self._common = CommonThreadState(self.server, self.port, self.ddb, self.rpc_server)
         self.log = args.log

src/infuse_iot/tools/localhost.py

@@ -26,10 +26,10 @@
 from infuse_iot.socket_comms import (
     ClientNotificationEpacketReceived,
     LocalClient,
-    default_multicast_address,
 )
 from infuse_iot.tdf import TDF
 from infuse_iot.time import InfuseTime
+from infuse_iot.util.argparse import add_server_port_parser
 from infuse_iot.util.console import Console
 from infuse_iot.util.threading import SignaledThread
 
@@ -42,6 +42,7 @@ class SubCommand(InfuseCommand):
     @classmethod
     def add_parser(cls, parser):
         parser.add_argument("--port", "-p", type=int, default=8080, help="Port number for localhost server")
+        add_server_port_parser(parser)
 
     def __init__(self, args):
         self._data_lock = threading.Lock()
@@ -51,7 +52,7 @@ def __init__(self, args):
         self._data: dict[int, dict] = {}
         self._port: int = args.port
 
-        self._client = LocalClient(default_multicast_address(), 1.0)
+        self._client = LocalClient(args.server_sock, 1.0)
         self._decoder = TDF()
 
     # Serve the HTML file

src/infuse_iot/tools/native_bt.py

@@ -43,9 +43,8 @@
     GatewayRequestConnectionRequest,
     GatewayRequestEpacketSend,
     LocalServer,
-    default_multicast_address,
 )
-from infuse_iot.util.argparse import BtLeAddress, ValidFile
+from infuse_iot.util.argparse import BtLeAddress, ValidFile, add_server_port_parser
 from infuse_iot.util.console import Console
 
 
@@ -212,11 +211,12 @@ class SubCommand(InfuseCommand):
     @classmethod
     def add_parser(cls, parser):
         parser.add_argument("--root", type=ValidFile, help="Root identity certificate to use instead of cloud")
+        add_server_port_parser(parser)
 
     def __init__(self, args: argparse.Namespace):
         self.infuse_manu = 0x0DE4
         self.database = DeviceDatabase(args.root)
-        self.server = LocalServer(default_multicast_address())
+        self.server = LocalServer(args.server_sock)
         self.bleak_mapping: dict[int, BLEDevice] = {}
         self.unknown_networks: set[int] = set()
         Console.init()

src/infuse_iot/tools/ota_upgrade.py

@@ -28,9 +28,8 @@
 from infuse_iot.socket_comms import (
     GatewayRequestConnectionRequest,
     LocalClient,
-    default_multicast_address,
 )
-from infuse_iot.util.argparse import InfuseDeviceId, ValidFile, ValidRelease
+from infuse_iot.util.argparse import InfuseDeviceId, ValidFile, ValidRelease, add_server_port_parser
 from infuse_iot.util.crc import crc16_ccitt
 from infuse_iot.zephyr.errno import errno
 
@@ -41,7 +40,7 @@ class SubCommand(InfuseCommand):
     DESCRIPTION = "Automatically OTA upgrade observed devices"
 
     def __init__(self, args):
-        self._client = LocalClient(default_multicast_address(), 1.0)
+        self._client = LocalClient(args.server_sock, 1.0)
         self._conn_timeout = args.conn_timeout
         self._min_rssi: int | None = args.rssi
         self._explicit_ids: list[int] = []
@@ -107,6 +106,8 @@ def add_parser(cls, parser):
         explicit.add_argument("--id", type=InfuseDeviceId, help="Single device to upgrade")
         explicit.add_argument("--list", type=ValidFile, help="File containing a list of IDs to upgrade")
 
+        add_server_port_parser(parser)
+
     def progress_table(self):
         table = Table()
         table.add_column(f"{self._app_name}\n{self._new_ver}")

src/infuse_iot/tools/rpc.py

@@ -20,9 +20,8 @@
     ClientNotificationEpacketReceived,
     GatewayRequestConnectionRequest,
     LocalClient,
-    default_multicast_address,
 )
-from infuse_iot.util.argparse import InfuseDeviceId
+from infuse_iot.util.argparse import InfuseDeviceId, add_server_port_parser
 
 
 class SubCommand(InfuseCommand):
@@ -56,9 +55,11 @@ def add_parser(cls, parser):
             cmd_parser.set_defaults(rpc_class=cmd_cls)
             cmd_cls.add_parser(cmd_parser)
 
+        add_server_port_parser(parser)
+
     def __init__(self, args: argparse.Namespace):
         self._args = args
-        self._client = LocalClient(default_multicast_address(), 1.0)
+        self._client = LocalClient(args.server_sock, 1.0)
         self._command: InfuseRpcCommand = args.rpc_class(args)
         self._request_id = random.randint(0, 2**32 - 1)
         self._max_payload = 0

src/infuse_iot/tools/serial_throughput.py

@@ -19,9 +19,9 @@
     ClientNotificationEpacketReceived,
     GatewayRequestEpacketSend,
     LocalClient,
-    default_multicast_address,
 )
 from infuse_iot.time import InfuseTime
+from infuse_iot.util.argparse import add_server_port_parser
 
 
 class SubCommand(InfuseCommand):
@@ -37,9 +37,10 @@ def add_parser(cls, parser):
             default=20,
             help="Number of times to send each sized packet",
         )
+        add_server_port_parser(parser)
 
     def __init__(self, args):
-        self._client = LocalClient(default_multicast_address(), 1.0)
+        self._client = LocalClient(args.server_sock, 1.0)
         self._iterations = args.iterations
 
     def run_time_set(self):

src/infuse_iot/tools/tdf_csv.py

@@ -14,10 +14,10 @@
 from infuse_iot.socket_comms import (
     ClientNotificationEpacketReceived,
     LocalClient,
-    default_multicast_address,
 )
 from infuse_iot.tdf import TDF
 from infuse_iot.time import InfuseTime
+from infuse_iot.util.argparse import add_server_port_parser
 
 
 def _to_str(unix_time: float) -> str:
@@ -32,9 +32,10 @@ class SubCommand(InfuseCommand):
     @classmethod
     def add_parser(cls, parser):
         parser.add_argument("--unix", action="store_true", help="Save timestamps as unix")
+        add_server_port_parser(parser)
 
     def __init__(self, args):
-        self._client = LocalClient(default_multicast_address(), 1.0)
+        self._client = LocalClient(args.server_sock, 1.0)
         self._decoder = TDF()
         self.args = args
 

src/infuse_iot/tools/tdf_list.py

@@ -16,11 +16,10 @@
 from infuse_iot.socket_comms import (
     ClientNotificationEpacketReceived,
     LocalClient,
-    default_multicast_address,
 )
 from infuse_iot.tdf import TDF
 from infuse_iot.time import InfuseTime
-from infuse_iot.util.argparse import InfuseDeviceId
+from infuse_iot.util.argparse import InfuseDeviceId, add_server_port_parser
 
 
 class SubCommand(InfuseCommand):
@@ -35,9 +34,10 @@ def add_parser(cls, parser):
             "--id", type=InfuseDeviceId, action="append", default=[], help="Limit displayed TDFs by device ID"
         )
         parser.add_argument("--min-rssi", type=int, help="Minimum RSSI to display TDF")
+        add_server_port_parser(parser)
 
     def __init__(self, args):
-        self._client = LocalClient(default_multicast_address(), 1.0)
+        self._client = LocalClient(args.server_sock, 1.0)
         self._decoder = TDF()
         self._array_all = args.array_all
         self._ids = args.id

src/infuse_iot/util/argparse.py

@@ -8,6 +8,7 @@
 import yaml
 
 from infuse_iot.definitions.rpc import rpc_enum_bt_le_addr_type, rpc_struct_bt_addr_le
+from infuse_iot.socket_comms import default_multicast_address
 from infuse_iot.util.ctypes import bytes_to_uint8
 
 
@@ -99,3 +100,28 @@ def __new__(cls, string: str) -> bytes:  # type: ignore
             return bytes.fromhex(string)
         except ValueError as e:
             raise argparse.ArgumentTypeError(f"{string} is not a valid hex ID") from e
+
+class ServerPort:
+    """Server port number to socket tuple"""
+
+    def __new__(cls, string: str) -> tuple[str, int]:  # type: ignore
+        try:
+            port = int(string)
+        except ValueError as e:
+            raise argparse.ArgumentTypeError(f"{string} is not a valid port number") from e
+        if not (0 < port <= 65535):
+            raise argparse.ArgumentTypeError(f"{string} is not a valid port number")
+        if port % 2 == 0:
+            raise argparse.ArgumentError(None, f"`--server-port` must be odd: {port}")
+        return default_multicast_address(port)
+
+def add_server_port_parser(parser: argparse.ArgumentParser, multi_port: bool = False):
+    """Register `--server-port`with an argument parser. `multi_port` allows multiple port(s)"""
+    parser.add_argument(
+        '--server-port',
+        dest='server_sock',
+        default=[default_multicast_address()] if multi_port else default_multicast_address(),
+        type=ServerPort,
+        nargs= '+' if multi_port else None,
+        help="Alternate port to use for Gateway connections (default 8751)"
+    )