aprsd 3.4.1__py3-none-any.whl → 3.4.2__py3-none-any.whl

aprsd/client/drivers/aprsis.py

@@ -33,7 +33,11 @@ class Aprsdis(aprslib.IS):
 
     def stop(self):
         self.thread_stop = True
-        LOG.info("Shutdown Aprsdis client.")
+        LOG.warning("Shutdown Aprsdis client.")
+
+    def close(self):
+        LOG.warning("Closing Aprsdis client.")
+        super().close()
 
     @wrapt.synchronized(lock)
     def send(self, packet: core.Packet):

aprsd/cmds/listen.py

@@ -42,7 +42,8 @@ def signal_handler(sig, frame):
             ),
         )
         time.sleep(5)
-        LOG.info(collector.Collector().collect())
+        # Last save to disk
+        collector.Collector().collect()
 
 
 class APRSDListenThread(rx.APRSDRXThread):

aprsd/cmds/send_message.py

@@ -12,6 +12,7 @@ from aprsd import cli_helper, packets
 from aprsd import conf  # noqa : F401
 from aprsd.client import client_factory
 from aprsd.main import cli
+import aprsd.packets  # noqa : F401
 from aprsd.packets import collector
 from aprsd.threads import tx
 
@@ -94,10 +95,6 @@ def send_message(
         else:
             LOG.info(f"L'{aprs_login}' To'{tocallsign}' C'{command}'")
 
-    packets.PacketList()
-    packets.WatchList()
-    packets.SeenList()
-
     got_ack = False
     got_response = False
 

aprsd/cmds/server.py

@@ -8,7 +8,7 @@ from oslo_config import cfg
 import aprsd
 from aprsd import cli_helper
 from aprsd import main as aprsd_main
-from aprsd import packets, plugin, threads, utils
+from aprsd import plugin, threads, utils
 from aprsd.client import client_factory
 from aprsd.main import cli
 from aprsd.packets import collector as packet_collector
@@ -87,29 +87,24 @@ def server(ctx, flush):
         LOG.error("APRS client is not properly configured in config file.")
         sys.exit(-1)
 
+    if not CONF.enable_seen_list:
+        # just deregister the class from the packet collector
+        packet_collector.PacketCollector().unregister(seen_list.SeenList)
+
     # Now load the msgTrack from disk if any
-    packets.PacketList()
     if flush:
-        LOG.debug("Deleting saved MsgTrack.")
-        packets.PacketTrack().flush()
-        packets.WatchList().flush()
-        packets.SeenList().flush()
-        packets.PacketList().flush()
+        LOG.debug("Flushing All packet tracking objects.")
+        packet_collector.PacketCollector().flush()
     else:
         # Try and load saved MsgTrack list
-        LOG.debug("Loading saved MsgTrack object.")
-        packets.PacketTrack().load()
-        packets.WatchList().load()
-        packets.SeenList().load()
-        packets.PacketList().load()
+        LOG.debug("Loading saved packet tracking data.")
+        packet_collector.PacketCollector().load()
+
+    # Now start all the main processing threads.
 
     keepalive = keep_alive.KeepAliveThread()
     keepalive.start()
 
-    if not CONF.enable_seen_list:
-        # just deregister the class from the packet collector
-        packet_collector.PacketCollector().unregister(seen_list.SeenList)
-
     stats_store_thread = stats_thread.APRSDStatsStoreThread()
     stats_store_thread.start()
 

aprsd/cmds/webchat.py

@@ -62,9 +62,7 @@ def signal_handler(sig, frame):
     threads.APRSDThreadList().stop_all()
     if "subprocess" not in str(frame):
         time.sleep(1.5)
-        # packets.WatchList().save()
-        # packets.SeenList().save()
-        LOG.info(stats.stats_collector.collect())
+        stats.stats_collector.collect()
         LOG.info("Telling flask to bail.")
         signal.signal(signal.SIGTERM, sys.exit(0))
 
@@ -647,11 +645,6 @@ def webchat(ctx, flush, port):
         LOG.error("APRS client is not properly configured in config file.")
         sys.exit(-1)
 
-    packets.PacketList()
-    packets.PacketTrack()
-    packets.WatchList()
-    packets.SeenList()
-
     keepalive = keep_alive.KeepAliveThread()
     LOG.info("Start KeepAliveThread")
     keepalive.start()

aprsd/conf/common.py

@@ -205,7 +205,6 @@ enabled_plugins_opts = [
             "aprsd.plugins.fortune.FortunePlugin",
             "aprsd.plugins.location.LocationPlugin",
             "aprsd.plugins.ping.PingPlugin",
-            "aprsd.plugins.query.QueryPlugin",
             "aprsd.plugins.time.TimePlugin",
             "aprsd.plugins.weather.OWMWeatherPlugin",
             "aprsd.plugins.version.VersionPlugin",

aprsd/conf/plugin_common.py

@@ -31,13 +31,6 @@ aprsfi_opts = [
     ),
 ]
 
-query_plugin_opts = [
-    cfg.StrOpt(
-        "callsign",
-        help="The Ham callsign to allow access to the query plugin from RF.",
-    ),
-]
-
 owm_wx_opts = [
     cfg.StrOpt(
         "apiKey",
@@ -172,7 +165,6 @@ def register_opts(config):
     config.register_group(aprsfi_group)
     config.register_opts(aprsfi_opts, group=aprsfi_group)
     config.register_group(query_group)
-    config.register_opts(query_plugin_opts, group=query_group)
     config.register_group(owm_wx_group)
     config.register_opts(owm_wx_opts, group=owm_wx_group)
     config.register_group(avwx_group)
@@ -184,7 +176,6 @@ def register_opts(config):
 def list_opts():
     return {
         aprsfi_group.name: aprsfi_opts,
-        query_group.name: query_plugin_opts,
         owm_wx_group.name: owm_wx_opts,
         avwx_group.name: avwx_opts,
         location_group.name: location_opts,

aprsd/main.py

@@ -83,7 +83,7 @@ def signal_handler(sig, frame):
         packets.WatchList().save()
         packets.SeenList().save()
         packets.PacketList().save()
-        LOG.info(collector.Collector().collect())
+        collector.Collector().collect()
         # signal.signal(signal.SIGTERM, sys.exit(0))
         # sys.exit(0)
 

aprsd/packets/__init__.py

@@ -1,3 +1,4 @@
+from aprsd.packets import collector
 from aprsd.packets.core import (  # noqa: F401
     AckPacket, BeaconPacket, BulletinPacket, GPSPacket, MessagePacket,
     MicEPacket, ObjectPacket, Packet, RejectPacket, StatusPacket,
@@ -9,4 +10,11 @@ from aprsd.packets.tracker import PacketTrack  # noqa: F401
 from aprsd.packets.watch_list import WatchList  # noqa: F401
 
 
+# Register all the packet tracking objects.
+collector.PacketCollector().register(PacketList)
+collector.PacketCollector().register(SeenList)
+collector.PacketCollector().register(PacketTrack)
+collector.PacketCollector().register(WatchList)
+
+
 NULL_MESSAGE = -1

aprsd/packets/collector.py

@@ -20,6 +20,14 @@ class PacketMonitor(Protocol):
         """When we send a packet out the network."""
         ...
 
+    def flush(self) -> None:
+        """Flush out any data."""
+        ...
+
+    def load(self) -> None:
+        """Load any data."""
+        ...
+
 
 @singleton
 class PacketCollector:
@@ -27,30 +35,45 @@ class PacketCollector:
         self.monitors: list[Callable] = []
 
     def register(self, monitor: Callable) -> None:
+        if not isinstance(monitor, PacketMonitor):
+            raise TypeError(f"Monitor {monitor} is not a PacketMonitor")
         self.monitors.append(monitor)
 
     def unregister(self, monitor: Callable) -> None:
+        if not isinstance(monitor, PacketMonitor):
+            raise TypeError(f"Monitor {monitor} is not a PacketMonitor")
         self.monitors.remove(monitor)
 
     def rx(self, packet: type[core.Packet]) -> None:
         for name in self.monitors:
             cls = name()
-            if isinstance(cls, PacketMonitor):
-                try:
-                    cls.rx(packet)
-                except Exception as e:
-                    LOG.error(f"Error in monitor {name} (rx): {e}")
-
-            else:
-                raise TypeError(f"Monitor {name} is not a PacketMonitor")
+            try:
+                cls.rx(packet)
+            except Exception as e:
+                LOG.error(f"Error in monitor {name} (rx): {e}")
 
     def tx(self, packet: type[core.Packet]) -> None:
         for name in self.monitors:
             cls = name()
-            if isinstance(cls, PacketMonitor):
-                try:
-                    cls.tx(packet)
-                except Exception as e:
-                    LOG.error(f"Error in monitor {name} (tx): {e}")
-            else:
-                raise TypeError(f"Monitor {name} is not a PacketMonitor")
+            try:
+                cls.tx(packet)
+            except Exception as e:
+                LOG.error(f"Error in monitor {name} (tx): {e}")
+
+    def flush(self):
+        """Call flush on the objects. This is used to flush out any data."""
+        for name in self.monitors:
+            cls = name()
+            try:
+                cls.flush()
+            except Exception as e:
+                LOG.error(f"Error in monitor {name} (flush): {e}")
+
+    def load(self):
+        """Call load on the objects. This is used to load any data."""
+        for name in self.monitors:
+            cls = name()
+            try:
+                cls.load()
+            except Exception as e:
+                LOG.error(f"Error in monitor {name} (load): {e}")

aprsd/packets/log.py

@@ -1,10 +1,12 @@
 import logging
 from typing import Optional
 
+from geopy.distance import geodesic
 from loguru import logger
 from oslo_config import cfg
 
-from aprsd.packets.core import AckPacket, RejectPacket
+from aprsd import utils
+from aprsd.packets.core import AckPacket, GPSPacket, RejectPacket
 
 
 LOG = logging.getLogger()
@@ -16,6 +18,8 @@ TO_COLOR = "fg #D033FF"
 TX_COLOR = "red"
 RX_COLOR = "green"
 PACKET_COLOR = "cyan"
+DISTANCE_COLOR = "fg #FF5733"
+DEGREES_COLOR = "fg #FFA900"
 
 
 def log_multiline(packet, tx: Optional[bool] = False, header: Optional[bool] = True) -> None:
@@ -97,19 +101,19 @@ def log(packet, tx: Optional[bool] = False, header: Optional[bool] = True) -> No
     if header:
         if tx:
             via_color = "red"
-            arrow = f"<{via_color}>-></{via_color}>"
+            arrow = f"<{via_color}>\u2192</{via_color}>"
             logit.append(
-                f"<red>TX {arrow}</red> "
+                f"<red>TX\u2191</red> "
                 f"<cyan>{name}</cyan>"
                 f":{packet.msgNo}"
                 f" ({packet.send_count + 1} of {pkt_max_send_count})",
             )
         else:
-            via_color = "fg #828282"
-            arrow = f"<{via_color}>-></{via_color}>"
-            left_arrow = f"<{via_color}><-</{via_color}>"
+            via_color = "fg #1AA730"
+            arrow = f"<{via_color}>\u2192</{via_color}>"
+            f"<{via_color}><-</{via_color}>"
             logit.append(
-                f"<fg #1AA730>RX</fg #1AA730> {left_arrow} "
+                f"<fg #1AA730>RX\u2193</fg #1AA730> "
                 f"<cyan>{name}</cyan>"
                 f":{packet.msgNo}",
             )
@@ -139,5 +143,19 @@ def log(packet, tx: Optional[bool] = False, header: Optional[bool] = True) -> No
             msg = msg.replace("<", "\\<")
             logit.append(f"<light-yellow><b>{msg}</b></light-yellow>")
 
+    # is there distance information?
+    if isinstance(packet, GPSPacket) and CONF.latitude and CONF.longitude:
+        my_coords = (CONF.latitude, CONF.longitude)
+        packet_coords = (packet.latitude, packet.longitude)
+        try:
+            bearing = utils.calculate_initial_compass_bearing(my_coords, packet_coords)
+        except Exception as e:
+            LOG.error(f"Failed to calculate bearing: {e}")
+            bearing = 0
+        logit.append(
+            f" : <{DEGREES_COLOR}>{utils.degrees_to_cardinal(bearing, full_string=True)}</{DEGREES_COLOR}>"
+            f"<{DISTANCE_COLOR}>@{geodesic(my_coords, packet_coords).miles:.2f}miles</{DISTANCE_COLOR}>",
+        )
+
     LOGU.opt(colors=True).info(" ".join(logit))
     log_multiline(packet, tx, header)

aprsd/packets/packet_list.py

@@ -3,7 +3,7 @@ import logging
 
 from oslo_config import cfg
 
-from aprsd.packets import collector, core
+from aprsd.packets import core
 from aprsd.utils import objectstore
 
 
@@ -108,9 +108,3 @@ class PacketList(objectstore.ObjectStoreMixin):
                 "packets": pkts,
             }
             return stats
-
-
-# Now register the PacketList with the collector
-# every packet we RX and TX goes through the collector
-# for processing for whatever reason is needed.
-collector.PacketCollector().register(PacketList)

aprsd/packets/seen_list.py

@@ -3,7 +3,7 @@ import logging
 
 from oslo_config import cfg
 
-from aprsd.packets import collector, core
+from aprsd.packets import core
 from aprsd.utils import objectstore
 
 
@@ -47,8 +47,3 @@ class SeenList(objectstore.ObjectStoreMixin):
 
     def tx(self, packet: type[core.Packet]):
         """We don't care about TX packets."""
-
-
-# Register with the packet collector so we can process the packet
-# when we get it off the client (network)
-collector.PacketCollector().register(SeenList)

aprsd/packets/tracker.py

@@ -3,7 +3,7 @@ import logging
 
 from oslo_config import cfg
 
-from aprsd.packets import collector, core
+from aprsd.packets import core
 from aprsd.utils import objectstore
 
 
@@ -101,9 +101,3 @@ class PacketTrack(objectstore.ObjectStoreMixin):
                 del self.data[key]
             except KeyError:
                 pass
-
-
-# Now register the PacketList with the collector
-# every packet we RX and TX goes through the collector
-# for processing for whatever reason is needed.
-collector.PacketCollector().register(PacketTrack)

aprsd/packets/watch_list.py

@@ -4,7 +4,7 @@ import logging
 from oslo_config import cfg
 
 from aprsd import utils
-from aprsd.packets import collector, core
+from aprsd.packets import core
 from aprsd.utils import objectstore
 
 
@@ -117,6 +117,3 @@ class WatchList(objectstore.ObjectStoreMixin):
                 return False
         else:
             return False
-
-
-collector.PacketCollector().register(WatchList)

aprsd/plugin.py

@@ -25,7 +25,6 @@ CORE_MESSAGE_PLUGINS = [
     "aprsd.plugins.fortune.FortunePlugin",
     "aprsd.plugins.location.LocationPlugin",
     "aprsd.plugins.ping.PingPlugin",
-    "aprsd.plugins.query.QueryPlugin",
     "aprsd.plugins.time.TimePlugin",
     "aprsd.plugins.weather.USWeatherPlugin",
     "aprsd.plugins.version.VersionPlugin",

aprsd/stats/collector.py

@@ -25,14 +25,13 @@ class Collector:
         stats = {}
         for name in self.producers:
             cls = name()
-            if isinstance(cls, StatsProducer):
-                try:
-                    stats[cls.__class__.__name__] = cls.stats(serializable=serializable).copy()
-                except Exception as e:
-                    LOG.error(f"Error in producer {name} (stats): {e}")
-            else:
-                raise TypeError(f"{cls} is not an instance of StatsProducer")
+            try:
+                stats[cls.__class__.__name__] = cls.stats(serializable=serializable).copy()
+            except Exception as e:
+                LOG.error(f"Error in producer {name} (stats): {e}")
         return stats
 
     def register_producer(self, producer_name: Callable):
+        if not isinstance(producer_name, StatsProducer):
+            raise TypeError(f"Producer {producer_name} is not a StatsProducer")
         self.producers.append(producer_name)

aprsd/threads/keep_alive.py

@@ -3,6 +3,7 @@ import logging
 import time
 import tracemalloc
 
+from loguru import logger
 from oslo_config import cfg
 
 from aprsd import packets, utils
@@ -14,6 +15,7 @@ from aprsd.threads import APRSDThread, APRSDThreadList
 
 CONF = cfg.CONF
 LOG = logging.getLogger("APRSD")
+LOGU = logger
 
 
 class KeepAliveThread(APRSDThread):
@@ -87,7 +89,12 @@ class KeepAliveThread(APRSDThread):
                     key = thread["name"]
                     if not alive:
                         LOG.error(f"Thread {thread}")
-                    LOG.info(f"{key: <15} Alive? {str(alive): <5} {str(age): <20}")
+
+                    thread_hex = f"fg {utils.hex_from_name(key)}"
+                    t_name = f"<{thread_hex}>{key:<15}</{thread_hex}>"
+                    thread_msg = f"{t_name} Alive? {str(alive): <5} {str(age): <20}"
+                    LOGU.opt(colors=True).info(thread_msg)
+                    # LOG.info(f"{key: <15} Alive? {str(alive): <5} {str(age): <20}")
 
             # check the APRS connection
             cl = client_factory.create()

aprsd/utils/__init__.py

@@ -2,6 +2,7 @@
 
 import errno
 import functools
+import math
 import os
 import re
 import sys
@@ -82,6 +83,16 @@ def rgb_from_name(name):
     return red, green, blue
 
 
+def hextriplet(colortuple):
+    """Convert a color tuple to a hex triplet."""
+    return "#" + "".join(f"{i:02X}" for i in colortuple)
+
+
+def hex_from_name(name):
+    """Create a hex color from a string."""
+    return hextriplet(rgb_from_name(name))
+
+
 def human_size(bytes, units=None):
     """Returns a human readable string representation of bytes"""
     if not units:
@@ -161,3 +172,47 @@ def load_entry_points(group):
         except Exception as e:
             print(f"Extension {ep.name} of group {group} failed to load with {e}", file=sys.stderr)
             print(traceback.format_exc(), file=sys.stderr)
+
+
+def calculate_initial_compass_bearing(start, end):
+    if (type(start) != tuple) or (type(end) != tuple):  # noqa: E721
+        raise TypeError("Only tuples are supported as arguments")
+
+    lat1 = math.radians(float(start[0]))
+    lat2 = math.radians(float(end[0]))
+
+    diff_long = math.radians(float(end[1]) - float(start[1]))
+
+    x = math.sin(diff_long) * math.cos(lat2)
+    y = math.cos(lat1) * math.sin(lat2) - (
+        math.sin(lat1)
+        * math.cos(lat2) * math.cos(diff_long)
+    )
+
+    initial_bearing = math.atan2(x, y)
+
+    # Now we have the initial bearing but math.atan2 return values
+    # from -180° to + 180° which is not what we want for a compass bearing
+    # The solution is to normalize the initial bearing as shown below
+    initial_bearing = math.degrees(initial_bearing)
+    compass_bearing = (initial_bearing + 360) % 360
+
+    return compass_bearing
+
+
+def degrees_to_cardinal(bearing, full_string=False):
+    if full_string:
+        directions = [
+            "North", "North-Northeast", "Northeast", "East-Northeast", "East", "East-Southeast",
+            "Southeast", "South-Southeast", "South", "South-Southwest", "Southwest", "West-Southwest",
+            "West", "West-Northwest", "Northwest", "North-Northwest", "North",
+        ]
+    else:
+        directions = [
+            "N", "NNE", "NE", "ENE", "E", "ESE",
+            "SE", "SSE", "S", "SSW", "SW", "WSW",
+            "W", "WNW", "NW", "NNW", "N",
+        ]
+
+    cardinal = directions[round(bearing / 22.5)]
+    return cardinal

{aprsd-3.4.1.dist-info → aprsd-3.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aprsd
-Version: 3.4.1
+Version: 3.4.2
 Summary: APRSd is a APRS-IS server that can be used to connect to APRS-IS and send and receive APRS packets.
 Author-email: Craig Lamparter <craig@craiger.org>, "Walter A. Boring IV" <waboring@hemna.com>, Emre Saglam <emresaglam@gmail.com>, Jason Martin <jhmartin@toger.us>, John <johng42@users.noreply.github.com>, Martiros Shakhzadyan <vrzh@vrzh.net>, Zoe Moore <zoenb@mailbox.org>, ranguli <hello@joshmurphy.ca>
 Maintainer-email: Craig Lamparter <craig@craiger.org>, "Walter A. Boring IV" <waboring@hemna.com>
@@ -206,10 +206,10 @@ Requires-Dist: attrs==24.2.0
 Requires-Dist: ax253==0.1.5.post1
 Requires-Dist: beautifulsoup4==4.12.3
 Requires-Dist: bidict==0.23.1
-Requires-Dist: bitarray==2.9.2
+Requires-Dist: bitarray==3.0.0
 Requires-Dist: blinker==1.8.2
 Requires-Dist: certifi==2024.8.30
-Requires-Dist: charset-normalizer==3.3.2
+Requires-Dist: charset-normalizer==3.4.0
 Requires-Dist: click==8.1.7
 Requires-Dist: click-params==0.5.0
 Requires-Dist: commonmark==0.9.1
@@ -217,15 +217,11 @@ Requires-Dist: dataclasses==0.6
 Requires-Dist: dataclasses-json==0.6.7
 Requires-Dist: debtcollector==3.0.0
 Requires-Dist: deprecated==1.2.14
-Requires-Dist: dnspython==2.6.1
-Requires-Dist: eventlet==0.37.0
 Requires-Dist: flask==3.0.3
 Requires-Dist: flask-httpauth==4.8.0
-Requires-Dist: flask-socketio==5.3.7
+Requires-Dist: flask-socketio==5.4.1
 Requires-Dist: geographiclib==2.0
 Requires-Dist: geopy==2.4.1
-Requires-Dist: gevent==24.2.1
-Requires-Dist: greenlet==3.1.0
 Requires-Dist: h11==0.14.0
 Requires-Dist: idna==3.10
 Requires-Dist: imapclient==3.0.1
@@ -234,8 +230,8 @@ Requires-Dist: itsdangerous==2.2.0
 Requires-Dist: jinja2==3.1.4
 Requires-Dist: kiss3==8.0.0
 Requires-Dist: loguru==0.7.2
-Requires-Dist: markupsafe==2.1.5
-Requires-Dist: marshmallow==3.22.0
+Requires-Dist: markupsafe==3.0.2
+Requires-Dist: marshmallow==3.23.0
 Requires-Dist: mypy-extensions==1.0.0
 Requires-Dist: netaddr==1.3.0
 Requires-Dist: oslo-config==9.6.0
@@ -246,7 +242,7 @@ Requires-Dist: pluggy==1.5.0
 Requires-Dist: pygments==2.18.0
 Requires-Dist: pyserial==3.5
 Requires-Dist: pyserial-asyncio==0.6
-Requires-Dist: python-engineio==4.9.1
+Requires-Dist: python-engineio==4.10.1
 Requires-Dist: python-socketio==5.11.4
 Requires-Dist: pytz==2024.2
 Requires-Dist: pyyaml==6.0.2
@@ -255,7 +251,7 @@ Requires-Dist: rfc3986==2.0.0
 Requires-Dist: rich==12.6.0
 Requires-Dist: rush==2021.4.0
 Requires-Dist: shellingham==1.5.4
-Requires-Dist: simple-websocket==1.0.0
+Requires-Dist: simple-websocket==1.1.0
 Requires-Dist: six==1.16.0
 Requires-Dist: soupsieve==2.6
 Requires-Dist: stevedore==5.3.0
@@ -271,30 +267,28 @@ Requires-Dist: werkzeug==3.0.4
 Requires-Dist: wrapt==1.16.0
 Requires-Dist: wsproto==1.2.0
 Requires-Dist: zipp==3.20.2
-Requires-Dist: zope-event==5.0
-Requires-Dist: zope-interface==7.0.3
 Provides-Extra: dev
 Requires-Dist: add-trailing-comma==3.1.0; extra == "dev"
 Requires-Dist: alabaster==1.0.0; extra == "dev"
 Requires-Dist: autoflake==1.5.3; extra == "dev"
 Requires-Dist: babel==2.16.0; extra == "dev"
-Requires-Dist: black==24.8.0; extra == "dev"
-Requires-Dist: build==1.2.2; extra == "dev"
+Requires-Dist: black==24.10.0; extra == "dev"
+Requires-Dist: build==1.2.2.post1; extra == "dev"
 Requires-Dist: cachetools==5.5.0; extra == "dev"
 Requires-Dist: certifi==2024.8.30; extra == "dev"
 Requires-Dist: cfgv==3.4.0; extra == "dev"
 Requires-Dist: chardet==5.2.0; extra == "dev"
-Requires-Dist: charset-normalizer==3.3.2; extra == "dev"
-Requires-Dist: check-manifest==0.49; extra == "dev"
+Requires-Dist: charset-normalizer==3.4.0; extra == "dev"
+Requires-Dist: check-manifest==0.50; extra == "dev"
 Requires-Dist: click==8.1.7; extra == "dev"
 Requires-Dist: colorama==0.4.6; extra == "dev"
 Requires-Dist: commonmark==0.9.1; extra == "dev"
 Requires-Dist: configargparse==1.7; extra == "dev"
-Requires-Dist: coverage[toml]==7.6.1; extra == "dev"
-Requires-Dist: distlib==0.3.8; extra == "dev"
+Requires-Dist: coverage[toml]==7.6.3; extra == "dev"
+Requires-Dist: distlib==0.3.9; extra == "dev"
 Requires-Dist: docutils==0.21.2; extra == "dev"
 Requires-Dist: exceptiongroup==1.2.2; extra == "dev"
-Requires-Dist: filelock==3.16.0; extra == "dev"
+Requires-Dist: filelock==3.16.1; extra == "dev"
 Requires-Dist: fixit==2.1.0; extra == "dev"
 Requires-Dist: flake8==7.1.1; extra == "dev"
 Requires-Dist: gray==0.15.0; extra == "dev"
@@ -304,35 +298,35 @@ Requires-Dist: imagesize==1.4.1; extra == "dev"
 Requires-Dist: iniconfig==2.0.0; extra == "dev"
 Requires-Dist: isort==5.13.2; extra == "dev"
 Requires-Dist: jinja2==3.1.4; extra == "dev"
-Requires-Dist: libcst==1.4.0; extra == "dev"
+Requires-Dist: libcst==1.5.0; extra == "dev"
 Requires-Dist: m2r==0.3.1; extra == "dev"
-Requires-Dist: markupsafe==2.1.5; extra == "dev"
+Requires-Dist: markupsafe==3.0.2; extra == "dev"
 Requires-Dist: mccabe==0.7.0; extra == "dev"
 Requires-Dist: mistune==0.8.4; extra == "dev"
 Requires-Dist: moreorless==0.4.0; extra == "dev"
-Requires-Dist: mypy==1.11.2; extra == "dev"
+Requires-Dist: mypy==1.12.0; extra == "dev"
 Requires-Dist: mypy-extensions==1.0.0; extra == "dev"
 Requires-Dist: nodeenv==1.9.1; extra == "dev"
 Requires-Dist: packaging==24.1; extra == "dev"
 Requires-Dist: pathspec==0.12.1; extra == "dev"
 Requires-Dist: pep8-naming==0.14.1; extra == "dev"
 Requires-Dist: pip-tools==7.4.1; extra == "dev"
-Requires-Dist: platformdirs==4.3.3; extra == "dev"
+Requires-Dist: platformdirs==4.3.6; extra == "dev"
 Requires-Dist: pluggy==1.5.0; extra == "dev"
-Requires-Dist: pre-commit==3.8.0; extra == "dev"
+Requires-Dist: pre-commit==4.0.1; extra == "dev"
 Requires-Dist: pycodestyle==2.12.1; extra == "dev"
 Requires-Dist: pyflakes==3.2.0; extra == "dev"
 Requires-Dist: pygments==2.18.0; extra == "dev"
-Requires-Dist: pyproject-api==1.7.1; extra == "dev"
-Requires-Dist: pyproject-hooks==1.1.0; extra == "dev"
+Requires-Dist: pyproject-api==1.8.0; extra == "dev"
+Requires-Dist: pyproject-hooks==1.2.0; extra == "dev"
 Requires-Dist: pytest==8.3.3; extra == "dev"
 Requires-Dist: pytest-cov==5.0.0; extra == "dev"
-Requires-Dist: pyupgrade==3.17.0; extra == "dev"
+Requires-Dist: pyupgrade==3.18.0; extra == "dev"
 Requires-Dist: pyyaml==6.0.2; extra == "dev"
 Requires-Dist: requests==2.32.3; extra == "dev"
 Requires-Dist: rich==12.6.0; extra == "dev"
 Requires-Dist: snowballstemmer==2.2.0; extra == "dev"
-Requires-Dist: sphinx==8.0.2; extra == "dev"
+Requires-Dist: sphinx==8.1.3; extra == "dev"
 Requires-Dist: sphinxcontrib-applehelp==2.0.0; extra == "dev"
 Requires-Dist: sphinxcontrib-devhelp==2.0.0; extra == "dev"
 Requires-Dist: sphinxcontrib-htmlhelp==2.1.0; extra == "dev"
@@ -341,14 +335,14 @@ Requires-Dist: sphinxcontrib-qthelp==2.0.0; extra == "dev"
 Requires-Dist: sphinxcontrib-serializinghtml==2.0.0; extra == "dev"
 Requires-Dist: tokenize-rt==6.0.0; extra == "dev"
 Requires-Dist: toml==0.10.2; extra == "dev"
-Requires-Dist: tomli==2.0.1; extra == "dev"
-Requires-Dist: tox==4.18.1; extra == "dev"
+Requires-Dist: tomli==2.0.2; extra == "dev"
+Requires-Dist: tox==4.23.0; extra == "dev"
 Requires-Dist: trailrunner==1.4.0; extra == "dev"
 Requires-Dist: typing-extensions==4.12.2; extra == "dev"
 Requires-Dist: unify==0.5; extra == "dev"
 Requires-Dist: untokenize==0.1.1; extra == "dev"
 Requires-Dist: urllib3==2.2.3; extra == "dev"
-Requires-Dist: virtualenv==20.26.4; extra == "dev"
+Requires-Dist: virtualenv==20.27.0; extra == "dev"
 Requires-Dist: wheel==0.44.0; extra == "dev"
 
 ===============================================

{aprsd-3.4.1.dist-info → aprsd-3.4.2.dist-info}/RECORD

@@ -1,9 +1,8 @@
 aprsd/__init__.py,sha256=ci_49KK2a4GXyxcM2lFZfNAOsBfXzh0yayIGQazw56I,687
 aprsd/cli_helper.py,sha256=AgSSn6oTUdCDv4Ne1Jyg_0bi7GwINBBKotTLk_QE-cY,4568
 aprsd/exception.py,sha256=FyeehwYENwsRKyrU2WmgEPmcHsDLjdGRAe35f01Bu5A,502
-aprsd/main.py,sha256=aOVLKdTWVx9ahoG2UAqtPJVzy6sScekwBFkj6gjaIeM,4673
-aprsd/messaging.py,sha256=0zE2y0jJBTxTwwgt8_XmSeMZfBTO77ZBY0GyGe8DX_w,134
-aprsd/plugin.py,sha256=HGTuGUdtjOi4QBwLC1FQ4GPBBfRvGTxt1by0V9bCk1I,17366
+aprsd/main.py,sha256=lNK3vogRN2ikSgBl-5gMxN3kwGq_ePsSYKZFz6f0FDQ,4663
+aprsd/plugin.py,sha256=qgX_XW_U0LA0xcugMS2z6fdTGAm4DD2d3mo_JG3rfZU,17327
 aprsd/plugin_utils.py,sha256=xKQbliwikJxw_E5TGK_BcBPXkHeJ1PqVxSCFcDbf1xg,2507
 aprsd/wsgi.py,sha256=EsRRetouRSsQp5GCJdagybmgRXCBQeLl8rcdBUPDv7Y,8720
 aprsd/client/__init__.py,sha256=aajKndFPk259RLTUuobVDleJmOENHvdRVodfhY5BmX8,348
@@ -14,7 +13,7 @@ aprsd/client/fake.py,sha256=-IMMpGwoQLbm0uW2eLkAADNySPj5zntBOt-tEfoF-gQ,1028
 aprsd/client/kiss.py,sha256=y9qAJPmmtyWUy2BoMT_lrpw3fY0Ggv3smWvQabdImUI,2945
 aprsd/client/stats.py,sha256=0MUS3IVfYgEX0Aan-lMz3VDi7_jCzVhacSN9XIQVJfw,1040
 aprsd/client/drivers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aprsd/client/drivers/aprsis.py,sha256=PsIR77ao5QlaLR_Jq7uAkNUJQiw6q8swch2Pl8m2JyM,7257
+aprsd/client/drivers/aprsis.py,sha256=V3wuCavJC_c8zezQChFP2M7dV8IScHUOTAZOKGzkL1w,7353
 aprsd/client/drivers/fake.py,sha256=TyqwQ4XYzbT83r0jSBI-oyl9q6BK60TgVuFm2_nkrnw,2059
 aprsd/client/drivers/kiss.py,sha256=XvXvBgpv_i1kgV5MmdTR5DwRXEiT86M49Pa7vw8-gsA,3350
 aprsd/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -23,27 +22,27 @@ aprsd/cmds/dev.py,sha256=5RmGvdrObg1hjr93jLCpq2Fql6ZRPWvXcx9ZU2SNj2A,4393
 aprsd/cmds/fetch_stats.py,sha256=dVvhOWpATNGq0e_hbLe47MZ2dCLOO3XTd6zzqqQ1Lp8,4988
 aprsd/cmds/healthcheck.py,sha256=mVrBIasdCnw-_vzuh15p4H1TFmiGg80WVXgXBcd2PMg,2628
 aprsd/cmds/list_plugins.py,sha256=gSIa7uMZAvXylJ89GI3RU9wj6TPioREvBNfClVyfiOM,10653
-aprsd/cmds/listen.py,sha256=PH7wGporM8LJDVHyDsZ--kKZ0oIGoR3q9hhKu6FfE64,7142
-aprsd/cmds/send_message.py,sha256=cZ1fbWB9SeI5ga4_Omr-Ucq8QML1aenaO17N-QB1Abg,4706
-aprsd/cmds/server.py,sha256=Un5mTIN9ilUWwP-Wn8Gi_lMQ5O94EWVWmqJ5urno368,4321
-aprsd/cmds/webchat.py,sha256=EwIkr2QXpmOQLrTfuU2JaYv8frELww1I0vII-a7hNtE,20379
+aprsd/cmds/listen.py,sha256=1KIe2qD7cWXX58L1d57r2PtTccXPhuDz5KkkyqPlGWw,7160
+aprsd/cmds/send_message.py,sha256=lNIjlezdntAAqGwgXQ4sJwKnUBnKUyCwok68jc35MYs,4669
+aprsd/cmds/server.py,sha256=3WGfscWUK_b5OVOqEeAtrGB7Cu51Epa1xQo6GhgAewU,4168
+aprsd/cmds/webchat.py,sha256=1T70AI2bdwxWVSdP-DrqALsVPxJ6n4EvJdJzvCjLy2w,20197
 aprsd/conf/__init__.py,sha256=6j-N6jT49OYcp8dD8oZGt7mxWSOSUnWXeTIZW_C0bmw,1725
 aprsd/conf/client.py,sha256=w_Z6Pc5LUYzJzDsfhCcnMBLkPi9njNdCGOe3GfbpGaA,3029
-aprsd/conf/common.py,sha256=LTLVtz9fFXsnYIhq2Hv73r-tn-Y7nW4rRJj5KCLFtuA,9013
+aprsd/conf/common.py,sha256=qzOgKxby1I-9_fQEAZ7jjnA2f4FLZKby9rhTFSaQQLY,8966
 aprsd/conf/log.py,sha256=v5C2Lda6x39IdamHpelOY6tDHPkqHyx_qmPF3WEmeAE,1424
 aprsd/conf/opts.py,sha256=Jq1DPyDdNyN2rbuHq8O-lF2Entkb9tFTbh9gjZwWC5s,2701
-aprsd/conf/plugin_common.py,sha256=HKNV2JKCJOPUqTdoFgc96mGNZLU6zNii2syjuJj8tAo,6253
+aprsd/conf/plugin_common.py,sha256=pqYNKKwHTYVI-yUnrX3MZhrQz8fVx6arZN7VfAIbnzs,5999
 aprsd/conf/plugin_email.py,sha256=IB8G_vTCC-6HVGx9y1PP2vKXfXRzlEx9lEFXdIIGHzA,2332
 aprsd/log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aprsd/log/log.py,sha256=cd1bMGdlcWHW393btpAw1cc3oYD0nEzY5O596MO6H94,3884
-aprsd/packets/__init__.py,sha256=OK2qFCNscFcMlimHJvP__R-7Igre4b912t3gGflNqIw,510
-aprsd/packets/collector.py,sha256=qPk2vQZyBJSjgOsc_RTSWUsXMsKd6L4YJoVG5NjFV1c,1636
+aprsd/packets/__init__.py,sha256=ELcYtnQKDvdCRhQmhiHaKG4w5JYl2foeWxnqTqsB-08,786
+aprsd/packets/collector.py,sha256=VhuHj2CRxVtaC6QDKiYMnxRzNVj-fc7wkMyPpTl83Og,2322
 aprsd/packets/core.py,sha256=Ke6WDofzpMZSOdDfGsxZal8vdJrKUXLedDXGu7FcAZg,27400
-aprsd/packets/log.py,sha256=jCcZazhivzlo38nEE3qnUiaZGNhtpX3QUgG1ExofwrM,4545
-aprsd/packets/packet_list.py,sha256=s3b3uFyZYo_3xv4DFLTKU2qyQHTaTxAW6wotgZksc1o,3518
-aprsd/packets/seen_list.py,sha256=mH_yAN5KVajmF-W5G-uKPgZDhxy7lOI1Ds7n1mkBGdE,1543
-aprsd/packets/tracker.py,sha256=4uZJ7I1uAxOohF1LFxhsokNYKA7Am_XbAP3Kix_XLJw,3165
-aprsd/packets/watch_list.py,sha256=Fn6_eqkgWnXjEIx82roiWqJoPewcb7qdNjq_gpYqWD8,3789
+aprsd/packets/log.py,sha256=mqYq06mK4JgESPKZ4JQ6vWJqorTSp73u7IiITqdlWwE,5347
+aprsd/packets/packet_list.py,sha256=MGLatHvdKcQvuFmeWlHsHIB0jrYMD9eszeISaL8-GYw,3304
+aprsd/packets/seen_list.py,sha256=fV87eyXeFxaZKqWfY1GOCQ6zfnjI1Or6i3KS_qJLuoA,1375
+aprsd/packets/tracker.py,sha256=Fr7B9Ex2kikmAkUz0HNUEsx9p60ap9L7A96bkv9WaO0,2950
+aprsd/packets/watch_list.py,sha256=TcvQsleypvxI2o_fbTr4sAAlmjRb9YpC7LbyNxTwfic,3728
 aprsd/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aprsd/plugins/email.py,sha256=U0v4crh5uSDWrEes7HHPpXI6eyF7ySYyqqKp2j1klDs,23627
 aprsd/plugins/fortune.py,sha256=XCSIaZ9JXC3LZOMV5tSr3dAvbVvIn4xSUdWxpZHStfc,1573
@@ -55,16 +54,16 @@ aprsd/plugins/version.py,sha256=NAPFKQ0lQqgjoDyTVy8tZcRGmdcJE_ZogRElDz27V2U,839
 aprsd/plugins/weather.py,sha256=iZ4Zv_23-2dquNKXhsiimFVlMEVoBNKyom4LtORwuoU,13333
 aprsd/stats/__init__.py,sha256=AM4GoTleOfBBitcCd6E432-jlg2dKVnL5Yw4OtcW25E,892
 aprsd/stats/app.py,sha256=axqMA137zKqU03yO8XI5f1QE8ajmr9YK0J9O9m4iSzo,1378
-aprsd/stats/collector.py,sha256=NqThUI3d2WTwf2CbXooTIUWXlqt91cC4HTW3dPBt8jg,1219
+aprsd/stats/collector.py,sha256=RF4QvbXa3a96ejS5TPfrtSiShMJp208Cb81-K3o_iMo,1197
 aprsd/threads/__init__.py,sha256=b8Dma0cWE7356WU_Ehvm0RtL4-zCJNUchPFArJd2Gtw,274
 aprsd/threads/aprsd.py,sha256=r2WlvtND0YTpq8jotRacZegD4WjX8msPDpl3ccqZo_Y,3292
-aprsd/threads/keep_alive.py,sha256=pAhBdzBFcAgQ4_DEUdOVfrIpyM-Rz_rO9Hp8KI-Yyq8,4934
+aprsd/threads/keep_alive.py,sha256=9rvzPjgpipfk_Ze47w8rnmWomdrn3sd3uUBVk9rta_I,5258
 aprsd/threads/log_monitor.py,sha256=_-ku02-Sy8m2sG1HFHP2Q_KfzUQfwjd4xaJ5XQlNUTw,3368
 aprsd/threads/registry.py,sha256=5DuzNSwhOEwI0Gl5j9e286uqbxzKLSHzInfPy61r7PI,1702
 aprsd/threads/rx.py,sha256=_tO4agZpjb52snaIi3RbnEwaBTGIS0fzaK7pnn45QPk,13463
 aprsd/threads/stats.py,sha256=Yey3B2iuGUQsNuUiFxvXKJU_1pif8gfOb5uP_U2-hS8,959
 aprsd/threads/tx.py,sha256=W5mP2voefECb4UWf-BXfaFjrYLCbsjAcNmLWl10ntEo,8322
-aprsd/utils/__init__.py,sha256=X9tYE5o5Bn_dn-y0N33JEJ-GBQWr-isLn6GiEV1LCsg,4547
+aprsd/utils/__init__.py,sha256=n2LtDxMVyFrStSJYOFnWbt3blTSUDrM17-CPJJDDxw0,6336
 aprsd/utils/counter.py,sha256=obIO0d9qCuhlvZI8Xf4DrjFlgHh-EuMZTVGv6gzQBkM,1202
 aprsd/utils/fuzzyclock.py,sha256=qKV8SYZhQGOHG9biF8TeueLb6RMppspx1Zg4IOy1Z10,3265
 aprsd/utils/json.py,sha256=LR2g-sealCRyXnujjTNxNYUxBagrdBqYQxNLYJQGYaM,2487
@@ -125,10 +124,10 @@ aprsd/web/chat/static/js/upstream/jquery.toast.js,sha256=V4m4PbwAYUb9yr3uP64y2og
 aprsd/web/chat/static/js/upstream/semantic.min.js,sha256=AYdrntK9PGcU1ZsyD7fTBJ4o0j1bMeD4xn7P-UagMW4,403125
 aprsd/web/chat/static/js/upstream/socket.io.min.js,sha256=dYF5MG5zs6ekpbIOXBXelJXquX0gi_c48kkYm8tCaYE,64274
 aprsd/web/chat/templates/index.html,sha256=9z8JoF3W6SlPndf28iCgdHwiaG9_f9fnk5nXWEfx5wg,6633
-aprsd-3.4.1.dist-info/AUTHORS,sha256=-4JB7i9LE12SYMbLc4Rk6iXlQ0J7C4mC1RV6-vnO53E,467
-aprsd-3.4.1.dist-info/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
-aprsd-3.4.1.dist-info/METADATA,sha256=aSg0NUOpR19y8oJAtiT_rCzfOSO5-u7b7mm3IT3SQLc,40060
-aprsd-3.4.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-aprsd-3.4.1.dist-info/entry_points.txt,sha256=4fReoJUB-bFqOUK6eeXYYCvTdVLprL7KVH0hWQRP9eM,171
-aprsd-3.4.1.dist-info/top_level.txt,sha256=v1O96niUcJOTMh9aQnFRknbScJ6mMOwqurdbxeaeSjs,6
-aprsd-3.4.1.dist-info/RECORD,,
+aprsd-3.4.2.dist-info/AUTHORS,sha256=-4JB7i9LE12SYMbLc4Rk6iXlQ0J7C4mC1RV6-vnO53E,467
+aprsd-3.4.2.dist-info/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
+aprsd-3.4.2.dist-info/METADATA,sha256=G25erCky2XI69HPnI27Ia5ti-mK4u7Op3dff4zttSDY,39875
+aprsd-3.4.2.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+aprsd-3.4.2.dist-info/entry_points.txt,sha256=4fReoJUB-bFqOUK6eeXYYCvTdVLprL7KVH0hWQRP9eM,171
+aprsd-3.4.2.dist-info/top_level.txt,sha256=v1O96niUcJOTMh9aQnFRknbScJ6mMOwqurdbxeaeSjs,6
+aprsd-3.4.2.dist-info/RECORD,,

{aprsd-3.4.1.dist-info → aprsd-3.4.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

aprsd/messaging.py

@@ -1,4 +0,0 @@
-# What to return from a plugin if we have processed the message
-# and it's ok, but don't send a usage string back
-
-# REMOVE THIS FILE