Clean up repository and fix minor bugs

pyproject.toml

@@ -24,7 +24,7 @@ description = "A driver to facilitate communication between Synnax and Limelight
 readme = "README.md"
 
 [project.scripts]
-limewire = "limewire.__main__:main"
+limewire = "limewire:main"
 fc_simulator = "fc_simulator:main"
 hydrant = "hydrant:main"
 

src/fc_simulator/__init__.py

@@ -4,7 +4,6 @@
 
 from limewire.util import SocketAddress
 
-from . import errors as errors
 from .fc_simulator import FCSimulator
 
 

src/fc_simulator/fc_simulator.py

@@ -2,7 +2,6 @@
 import random
 import socket
 from functools import partial
-from typing import Tuple
 
 import asyncudp
 import synnax as sy
@@ -20,7 +19,7 @@
 from lmp.util import DeviceCommand
 
 
-def format_socket_address(addr: Tuple[str, int]) -> str:
+def format_socket_address(addr: tuple[str, int]) -> str:
     """Format of addr: [address, port]"""
 
     return addr[0] + ":" + str(addr[1])
@@ -116,14 +115,16 @@ async def handle_commands(
                 break
 
             response_msg = await self.get_response_msg(msg_bytes)
+            if not response_msg:
+                continue
 
             response_bytes = bytes(response_msg)
             writer.write(len(response_bytes).to_bytes(1) + response_bytes)
             await writer.drain()
 
     async def get_response_msg(
         self, msg_bytes: bytes
-    ) -> ValveStateMessage | DeviceCommandAckMessage:
+    ) -> ValveStateMessage | DeviceCommandAckMessage | None:
         """Return the response message associated with the command message.
 
         Args:
@@ -155,6 +156,8 @@ async def get_response_msg(
                         response.response_msg = (
                             "Build 6.7.67 (commit hash deadbeef)"
                         )
+                    case _:
+                        pass
 
                 return response
             case HeartbeatMessage.MSG_ID:

src/limewire/__init__.py

@@ -1,7 +1,26 @@
-from . import errors
+import asyncio
+
+import click
+
 from .limewire import Limewire
+from .logging import set_up_logging
+from .util import SocketAddress
+
+
+@click.command(context_settings={"help_option_names": ["--help", "-h"]})
+@click.argument(
+    "fc_address", type=SocketAddress(), default="141.212.192.170:5000"
+)
+@click.option("--debug", is_flag=True)
+@click.option("--overwrite-timestamps", is_flag=True)
+def main(fc_address: tuple[str, int], debug: bool, overwrite_timestamps: bool):
+    """Run Limewire."""
+
+    set_up_logging(debug)
+
+    limewire = Limewire(overwrite_timestamps)
 
-__all__ = [
-    "errors",
-    "Limewire",
-]
+    try:
+        asyncio.run(limewire.start(fc_address))  # pyright: ignore[reportPrivateLocalImportUsage]
+    except KeyboardInterrupt:
+        pass

src/limewire/limewire.py

@@ -280,6 +280,12 @@ async def _synnax_write(self) -> None:
                     self.synnax_writer.close()
                 except sy.ValidationError:
                     # Why oh why must you be this way Synnax :(
+                    #
+                    # (For context, if a ValidationError occurs, the
+                    # error state doesn't get cleared from the writer, so
+                    # when we try to close the writer it will re-raise the
+                    # error which is why we have to handle it a second time
+                    # here.)
                     pass
 
                 # Writer will get re-initialzed during next loop iteration
@@ -296,7 +302,7 @@ def _build_synnax_frame(
             try:
                 frame = self._build_telemetry_frame(msg)
             except KeyError as err:
-                logger.error(str(err), extra={"error_code": "0006"})
+                logger.error(str(err))
                 return None
         else:
             frame = self._build_valve_state_frame(msg)