aprsd 4.1.2__tar.gz → 4.2.1__tar.gz

{aprsd-4.1.2 → aprsd-4.2.1}/ChangeLog.md

@@ -4,11 +4,49 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [4.2.1](https://github.com/craigerl/aprsd/compare/4.2.0...4.2.1)
+
+> 7 October 2025
+
+- Sanity check around decoding packet [`58cb046`](https://github.com/craigerl/aprsd/commit/58cb046b3131f4300255c527dee4c7291a4aeed2)
+- Added CONF.is_digipi [`f3039eb`](https://github.com/craigerl/aprsd/commit/f3039ebfa153d0fbad4a390089fce360e6148854)
+- Fixed stats issue with tcpkiss client. [`556554b`](https://github.com/craigerl/aprsd/commit/556554b1a76743989fa88877e7f694b918f770cf)
+- Fixed missing f string [`8cd61a7`](https://github.com/craigerl/aprsd/commit/8cd61a72c8f16e8651533baf2d677d3345bd3712)
+- Added ThirdPartyPacket decoding in tcpkiss driver [`3961e1d`](https://github.com/craigerl/aprsd/commit/3961e1d1adf428ff0fa66ed5fe0d6192adf164bf)
+- refactored list-plugins [`c7c9a92`](https://github.com/craigerl/aprsd/commit/c7c9a92b153ccc673275dca628d485d1df88db12)
+- Added package [`e15322e`](https://github.com/craigerl/aprsd/commit/e15322ede384d6e463c42e9496502e2c6ea0886c)
+- Some client and driver cleanup. [`328c027`](https://github.com/craigerl/aprsd/commit/328c027ad3db594f3d5622a2cab7cafb21d1cfd6)
+- Fixed some unit tests [`af0feaf`](https://github.com/craigerl/aprsd/commit/af0feaf9c81b8b9f443e58fbe7d23f1ff7ba63d2)
+
+#### [4.2.0](https://github.com/craigerl/aprsd/compare/4.1.2...4.2.0)
+
+> 12 August 2025
+
+- Reworked the entire client and drivers [`#191`](https://github.com/craigerl/aprsd/pull/191)
+- Update the docker-compose.yml [`#193`](https://github.com/craigerl/aprsd/pull/193)
+- Use OpenWeatherMap One Call v3.0 API [`#186`](https://github.com/craigerl/aprsd/pull/186)
+- use OWM onecall v3.0 [`16bfda4`](https://github.com/craigerl/aprsd/commit/16bfda431c54a2ec6fbd011edd710c1d787ae1de)
+- Fixed a problem with WeatherPacket [`5469610`](https://github.com/craigerl/aprsd/commit/54696107797c3d788e5d0b2dad164e1a7cf439f2)
+- Ensure filter is set [`4c53c13`](https://github.com/craigerl/aprsd/commit/4c53c13e793356228f97e26a275d3d4c54b4bf54)
+- Remove flask_enabled [`ce79f01`](https://github.com/craigerl/aprsd/commit/ce79f0112ff0f80db8adfff03c9ec8e62655bcc0)
+- Make some catchall fields non hashable. [`acd639a`](https://github.com/craigerl/aprsd/commit/acd639a9100893a2e1d08d9ba65ef65ce6ed87e6)
+- Fixed setup for AVWXWeatherPlugin [`2fcd574`](https://github.com/craigerl/aprsd/commit/2fcd574f12d48eaec122f96b6b15e9408d395b72)
+- removed old flask_enabled global [`8f471c2`](https://github.com/craigerl/aprsd/commit/8f471c229c1073834c2ac66522fbaf2a561e296a)
+- Updated requirements [`211ac11`](https://github.com/craigerl/aprsd/commit/211ac1132b2f1e2736b1c680936711e114556e90)
+- Don't log an IOError on shutdown [`d41064b`](https://github.com/craigerl/aprsd/commit/d41064ba05faf6167c0d26db2ab525d0bb410bf8)
+- Honor quiet setting for log.setup_logging [`1ae4375`](https://github.com/craigerl/aprsd/commit/1ae437581f753d903c20a6ef54868438eb034800)
+- Make sure packet has addressee field [`034f11b`](https://github.com/craigerl/aprsd/commit/034f11b4f9f3392e003cfbd0e5f8b9fb5f594089)
+- Fix tox failures [`74887af`](https://github.com/craigerl/aprsd/commit/74887af507755cd7ee27f13129b177f4d58ca8e0)
+- log the exception when tx fails. [`fa5d0c6`](https://github.com/craigerl/aprsd/commit/fa5d0c643ae85fc9ad3f615f9d0afc590f422283)
+- Updated requirements for 4.2.0 [`2c476d8`](https://github.com/craigerl/aprsd/commit/2c476d8a04df8cebbaa50780688e58d8b9df2bc9)
+- Updated Changelog for 4.2.0 [`b9fea98`](https://github.com/craigerl/aprsd/commit/b9fea982f977e9cf60c4695ca1892adaeee64298)
+
 #### [4.1.2](https://github.com/craigerl/aprsd/compare/4.1.1...4.1.2)
 
 > 6 March 2025
 
 - Allow passing in a custom handler to setup_logging [`d262589`](https://github.com/craigerl/aprsd/commit/d2625893134f498748859da3b1684b04d456f790)
+- Changelog for 4.1.2 [`6dba56f`](https://github.com/craigerl/aprsd/commit/6dba56f74d27e418ed2e124e7a3592c274b2da1e)
 
 #### [4.1.1](https://github.com/craigerl/aprsd/compare/4.1.0...4.1.1)
 

{aprsd-4.1.2 → aprsd-4.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: aprsd
-Version: 4.1.2
+Version: 4.2.1
 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>
@@ -202,84 +202,83 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: AUTHORS
 Requires-Dist: aprslib==0.7.2
-Requires-Dist: attrs==25.1.0
+Requires-Dist: attrs==25.3.0
 Requires-Dist: ax253==0.1.5.post1
-Requires-Dist: bitarray==3.1.0
-Requires-Dist: certifi==2025.1.31
-Requires-Dist: charset-normalizer==3.4.1
-Requires-Dist: click==8.1.8
+Requires-Dist: bitarray==3.6.1
+Requires-Dist: certifi==2025.8.3
+Requires-Dist: charset-normalizer==3.4.3
+Requires-Dist: click==8.2.1
 Requires-Dist: dataclasses-json==0.6.7
-Requires-Dist: debtcollector==3.0.0
 Requires-Dist: haversine==2.9.0
 Requires-Dist: idna==3.10
-Requires-Dist: importlib-metadata==8.6.1
+Requires-Dist: importlib-metadata==8.7.0
 Requires-Dist: kiss3==8.0.0
 Requires-Dist: loguru==0.7.3
-Requires-Dist: markdown-it-py==3.0.0
+Requires-Dist: markdown-it-py==4.0.0
 Requires-Dist: marshmallow==3.26.1
 Requires-Dist: mdurl==0.1.2
-Requires-Dist: mypy-extensions==1.0.0
+Requires-Dist: mypy-extensions==1.1.0
 Requires-Dist: netaddr==1.3.0
-Requires-Dist: oslo-config==9.7.1
+Requires-Dist: oslo-config==10.0.0
 Requires-Dist: oslo-i18n==6.5.1
-Requires-Dist: packaging==24.2
+Requires-Dist: packaging==25.0
 Requires-Dist: pbr==6.1.1
-Requires-Dist: pluggy==1.5.0
-Requires-Dist: pygments==2.19.1
+Requires-Dist: pluggy==1.6.0
+Requires-Dist: pygments==2.19.2
 Requires-Dist: pyserial==3.5
 Requires-Dist: pyserial-asyncio==0.6
-Requires-Dist: pytz==2025.1
+Requires-Dist: pytz==2025.2
 Requires-Dist: pyyaml==6.0.2
-Requires-Dist: requests==2.32.3
+Requires-Dist: requests==2.32.4
 Requires-Dist: rfc3986==2.0.0
-Requires-Dist: rich==13.9.4
+Requires-Dist: rich==14.1.0
 Requires-Dist: rush==2021.4.0
-Requires-Dist: setuptools==75.8.2
+Requires-Dist: setuptools==80.9.0
 Requires-Dist: stevedore==5.4.1
 Requires-Dist: thesmuggler==1.0.1
 Requires-Dist: timeago==1.0.16
-Requires-Dist: typing-extensions==4.12.2
+Requires-Dist: typing-extensions==4.14.1
 Requires-Dist: typing-inspect==0.9.0
-Requires-Dist: tzlocal==5.3
+Requires-Dist: tzlocal==5.3.1
 Requires-Dist: update-checker==0.18.0
-Requires-Dist: urllib3==2.3.0
-Requires-Dist: wrapt==1.17.2
-Requires-Dist: zipp==3.21.0
+Requires-Dist: urllib3==2.5.0
+Requires-Dist: wrapt==1.17.3
+Requires-Dist: zipp==3.23.0
 Provides-Extra: dev
 Requires-Dist: alabaster==1.0.0; extra == "dev"
 Requires-Dist: babel==2.17.0; extra == "dev"
-Requires-Dist: build==1.2.2.post1; extra == "dev"
-Requires-Dist: cachetools==5.5.2; extra == "dev"
-Requires-Dist: certifi==2025.1.31; extra == "dev"
+Requires-Dist: build==1.3.0; extra == "dev"
+Requires-Dist: cachetools==6.1.0; extra == "dev"
+Requires-Dist: certifi==2025.8.3; extra == "dev"
 Requires-Dist: cfgv==3.4.0; extra == "dev"
 Requires-Dist: chardet==5.2.0; extra == "dev"
-Requires-Dist: charset-normalizer==3.4.1; extra == "dev"
-Requires-Dist: click==8.1.8; extra == "dev"
+Requires-Dist: charset-normalizer==3.4.3; extra == "dev"
+Requires-Dist: click==8.2.1; extra == "dev"
 Requires-Dist: colorama==0.4.6; extra == "dev"
-Requires-Dist: distlib==0.3.9; extra == "dev"
+Requires-Dist: distlib==0.4.0; extra == "dev"
 Requires-Dist: docutils==0.21.2; extra == "dev"
-Requires-Dist: filelock==3.17.0; extra == "dev"
-Requires-Dist: identify==2.6.8; extra == "dev"
+Requires-Dist: filelock==3.18.0; extra == "dev"
+Requires-Dist: identify==2.6.13; extra == "dev"
 Requires-Dist: idna==3.10; extra == "dev"
 Requires-Dist: imagesize==1.4.1; extra == "dev"
-Requires-Dist: jinja2==3.1.5; extra == "dev"
+Requires-Dist: jinja2==3.1.6; extra == "dev"
 Requires-Dist: m2r==0.3.1; extra == "dev"
 Requires-Dist: markupsafe==3.0.2; extra == "dev"
 Requires-Dist: mistune==0.8.4; extra == "dev"
 Requires-Dist: nodeenv==1.9.1; extra == "dev"
-Requires-Dist: packaging==24.2; extra == "dev"
-Requires-Dist: pip==25.0.1; extra == "dev"
-Requires-Dist: pip-tools==7.4.1; extra == "dev"
-Requires-Dist: platformdirs==4.3.6; extra == "dev"
-Requires-Dist: pluggy==1.5.0; extra == "dev"
-Requires-Dist: pre-commit==4.1.0; extra == "dev"
-Requires-Dist: pygments==2.19.1; extra == "dev"
-Requires-Dist: pyproject-api==1.9.0; extra == "dev"
+Requires-Dist: packaging==25.0; extra == "dev"
+Requires-Dist: pip==25.2; extra == "dev"
+Requires-Dist: pip-tools==7.5.0; extra == "dev"
+Requires-Dist: platformdirs==4.3.8; extra == "dev"
+Requires-Dist: pluggy==1.6.0; extra == "dev"
+Requires-Dist: pre-commit==4.3.0; extra == "dev"
+Requires-Dist: pygments==2.19.2; extra == "dev"
+Requires-Dist: pyproject-api==1.9.1; extra == "dev"
 Requires-Dist: pyproject-hooks==1.2.0; extra == "dev"
 Requires-Dist: pyyaml==6.0.2; extra == "dev"
-Requires-Dist: requests==2.32.3; extra == "dev"
-Requires-Dist: setuptools==75.8.2; extra == "dev"
-Requires-Dist: snowballstemmer==2.2.0; extra == "dev"
+Requires-Dist: requests==2.32.4; extra == "dev"
+Requires-Dist: setuptools==80.9.0; extra == "dev"
+Requires-Dist: snowballstemmer==3.0.1; 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"
@@ -288,11 +287,12 @@ Requires-Dist: sphinxcontrib-jsmath==1.0.1; extra == "dev"
 Requires-Dist: sphinxcontrib-qthelp==2.0.0; extra == "dev"
 Requires-Dist: sphinxcontrib-serializinghtml==2.0.0; extra == "dev"
 Requires-Dist: tomli==2.2.1; extra == "dev"
-Requires-Dist: tox==4.24.1; extra == "dev"
-Requires-Dist: typing-extensions==4.12.2; extra == "dev"
-Requires-Dist: urllib3==2.3.0; extra == "dev"
-Requires-Dist: virtualenv==20.29.2; extra == "dev"
+Requires-Dist: tox==4.28.4; extra == "dev"
+Requires-Dist: typing-extensions==4.14.1; extra == "dev"
+Requires-Dist: urllib3==2.5.0; extra == "dev"
+Requires-Dist: virtualenv==20.33.1; extra == "dev"
 Requires-Dist: wheel==0.45.1; extra == "dev"
+Dynamic: license-file
 
 # APRSD - Ham radio APRS-IS Message platform software
 

aprsd-4.2.1/aprsd/client/__init__.py

@@ -0,0 +1,5 @@
+# define the client transports here
+TRANSPORT_APRSIS = 'aprsis'
+TRANSPORT_TCPKISS = 'tcpkiss'
+TRANSPORT_SERIALKISS = 'serialkiss'
+TRANSPORT_FAKE = 'fake'

aprsd-4.2.1/aprsd/client/client.py

@@ -0,0 +1,156 @@
+import logging
+import threading
+from typing import Callable
+
+import timeago
+import wrapt
+from loguru import logger
+from oslo_config import cfg
+
+from aprsd.client import drivers  # noqa - ensure drivers are registered
+from aprsd.client.drivers.registry import DriverRegistry
+from aprsd.packets import core
+from aprsd.utils import keepalive_collector
+
+CONF = cfg.CONF
+LOG = logging.getLogger('APRSD')
+LOGU = logger
+
+
+class APRSDClient:
+    """APRSD client class.
+
+    This is a singleton class that provides a single instance of the APRSD client.
+    It is responsible for connecting to the appropriate APRSD client driver based on
+    the configuration.
+
+    """
+
+    _instance = None
+    driver = None
+    lock = threading.Lock()
+    filter = None
+
+    def __new__(cls, *args, **kwargs):
+        """This magic turns this into a singleton."""
+        if cls._instance is None:
+            cls._instance = super().__new__(cls)
+            keepalive_collector.KeepAliveCollector().register(cls)
+        return cls._instance
+
+    def __init__(self, auto_connect: bool = True):
+        self.auto_connect = auto_connect
+        self.connected = False
+        self.login_status = {
+            'success': False,
+            'message': None,
+        }
+        self.driver = DriverRegistry().get_driver()
+        if self.auto_connect:
+            self.connect()
+
+    def stats(self, serializable=False) -> dict:
+        stats = {}
+        if self.driver:
+            stats = self.driver.stats(serializable=serializable)
+        return stats
+
+    @staticmethod
+    def is_enabled():
+        for driver in DriverRegistry().drivers:
+            if driver.is_enabled():
+                return True
+        return False
+
+    @staticmethod
+    def is_configured():
+        """Check if ANY driver is configured."""
+        for driver in DriverRegistry().drivers:
+            if driver.is_configured():
+                return True
+        return False
+
+    # @property
+    # def is_connected(self):
+    #     if not self.driver:
+    #         return False
+    #     return self.driver.is_connected()
+
+    @property
+    def login_success(self):
+        if not self.driver:
+            return False
+        return self.driver.login_success
+
+    @property
+    def login_failure(self):
+        if not self.driver:
+            return None
+        return self.driver.login_failure
+
+    def set_filter(self, filter):
+        self.filter = filter
+        if not self.driver:
+            return
+        self.driver.set_filter(filter)
+
+    def get_filter(self):
+        if not self.driver:
+            return None
+        return self.driver.filter
+
+    def is_alive(self):
+        return self.driver.is_alive()
+
+    def connect(self):
+        if not self.driver:
+            self.driver = DriverRegistry().get_driver()
+        self.driver.setup_connection()
+
+    def close(self):
+        if not self.driver:
+            return
+        self.driver.close()
+
+    @wrapt.synchronized(lock)
+    def reset(self):
+        """Call this to force a rebuild/reconnect."""
+        LOG.info('Resetting client connection.')
+        if self.driver:
+            self.driver.close()
+            if not self.delay_connect:
+                self.driver.setup_connection()
+            if self.filter:
+                self.driver.set_filter(self.filter)
+        else:
+            LOG.warning('Client not initialized, nothing to reset.')
+
+    def send(self, packet: core.Packet) -> bool:
+        return self.driver.send(packet)
+
+    # For the keepalive collector
+    def keepalive_check(self):
+        # Don't check the first time through.
+        if not self.driver.is_alive and self._checks:
+            LOG.warning("Resetting client.  It's not alive.")
+            self.reset()
+        self._checks = True
+
+    # For the keepalive collector
+    def keepalive_log(self):
+        if ka := self.driver.keepalive:
+            keepalive = timeago.format(ka)
+        else:
+            keepalive = 'N/A'
+        LOGU.opt(colors=True).info(f'<green>Client keepalive {keepalive}</green>')
+
+    def consumer(self, callback: Callable, raw: bool = False):
+        return self.driver.consumer(callback=callback, raw=raw)
+
+    def decode_packet(self, *args, **kwargs) -> core.Packet:
+        try:
+            packet = self.driver.decode_packet(*args, **kwargs)
+        except Exception as e:
+            LOG.error(f'Error decoding packet: {e}')
+            return None
+        return packet

aprsd-4.2.1/aprsd/client/drivers/__init__.py

@@ -0,0 +1,10 @@
+# All client drivers must be registered here
+from aprsd.client.drivers.aprsis import APRSISDriver
+from aprsd.client.drivers.fake import APRSDFakeDriver
+from aprsd.client.drivers.registry import DriverRegistry
+from aprsd.client.drivers.tcpkiss import TCPKISSDriver
+
+driver_registry = DriverRegistry()
+driver_registry.register(APRSDFakeDriver)
+driver_registry.register(APRSISDriver)
+driver_registry.register(TCPKISSDriver)

{aprsd-4.1.2/aprsd/client → aprsd-4.2.1/aprsd/client/drivers}/aprsis.py

@@ -1,65 +1,40 @@
 import datetime
 import logging
 import time
+from typing import Callable
 
-import timeago
 from aprslib.exceptions import LoginError
 from loguru import logger
 from oslo_config import cfg
 
 from aprsd import client, exception
-from aprsd.client import base
-from aprsd.client.drivers import aprsis
+from aprsd.client.drivers.lib.aprslib import APRSLibClient
 from aprsd.packets import core
 
 CONF = cfg.CONF
-LOG = logging.getLogger("APRSD")
+LOG = logging.getLogger('APRSD')
 LOGU = logger
 
 
-class APRSISClient(base.APRSClient):
+# class APRSISDriver(metaclass=trace.TraceWrapperMetaclass):
+class APRSISDriver:
+    """This is the APRS-IS driver for the APRSD client.
+
+    This driver uses our modified aprslib.IS class to connect to the APRS-IS server.
+
+    """
+
     _client = None
     _checks = False
+    connected = False
 
     def __init__(self):
-        max_timeout = {"hours": 0.0, "minutes": 2, "seconds": 0}
+        max_timeout = {'hours': 0.0, 'minutes': 2, 'seconds': 0}
         self.max_delta = datetime.timedelta(**max_timeout)
-
-    def stats(self, serializable=False) -> dict:
-        stats = {}
-        if self.is_configured():
-            if self._client:
-                keepalive = self._client.aprsd_keepalive
-                server_string = self._client.server_string
-                if serializable:
-                    keepalive = keepalive.isoformat()
-            else:
-                keepalive = "None"
-                server_string = "None"
-            stats = {
-                "connected": self.is_connected,
-                "filter": self.filter,
-                "login_status": self.login_status,
-                "connection_keepalive": keepalive,
-                "server_string": server_string,
-                "transport": self.transport(),
-            }
-
-        return stats
-
-    def keepalive_check(self):
-        # Don't check the first time through.
-        if not self.is_alive() and self._checks:
-            LOG.warning("Resetting client.  It's not alive.")
-            self.reset()
-        self._checks = True
-
-    def keepalive_log(self):
-        if ka := self._client.aprsd_keepalive:
-            keepalive = timeago.format(ka)
-        else:
-            keepalive = "N/A"
-        LOGU.opt(colors=True).info(f"<green>Client keepalive {keepalive}</green>")
+        self.login_status = {
+            'success': False,
+            'message': None,
+        }
 
     @staticmethod
     def is_enabled():
@@ -71,37 +46,31 @@ class APRSISClient(base.APRSClient):
 
     @staticmethod
     def is_configured():
-        if APRSISClient.is_enabled():
+        if APRSISDriver.is_enabled():
             # Ensure that the config vars are correctly set
             if not CONF.aprs_network.login:
-                LOG.error("Config aprs_network.login not set.")
+                LOG.error('Config aprs_network.login not set.')
                 raise exception.MissingConfigOptionException(
-                    "aprs_network.login is not set.",
+                    'aprs_network.login is not set.',
                 )
             if not CONF.aprs_network.password:
-                LOG.error("Config aprs_network.password not set.")
+                LOG.error('Config aprs_network.password not set.')
                 raise exception.MissingConfigOptionException(
-                    "aprs_network.password is not set.",
+                    'aprs_network.password is not set.',
                 )
             if not CONF.aprs_network.host:
-                LOG.error("Config aprs_network.host not set.")
+                LOG.error('Config aprs_network.host not set.')
                 raise exception.MissingConfigOptionException(
-                    "aprs_network.host is not set.",
+                    'aprs_network.host is not set.',
                 )
 
             return True
         return True
 
-    def _is_stale_connection(self):
-        delta = datetime.datetime.now() - self._client.aprsd_keepalive
-        if delta > self.max_delta:
-            LOG.error(f"Connection is stale, last heard {delta} ago.")
-            return True
-        return False
-
+    @property
     def is_alive(self):
         if not self._client:
-            LOG.warning(f"APRS_CLIENT {self._client} alive? NO!!!")
+            LOG.warning(f'APRS_CLIENT {self._client} alive? NO!!!')
             return False
         return self._client.is_alive() and not self._is_stale_connection()
 
@@ -110,13 +79,8 @@ class APRSISClient(base.APRSClient):
             self._client.stop()
             self._client.close()
 
-    @staticmethod
-    def transport():
-        return client.TRANSPORT_APRSIS
-
-    def decode_packet(self, *args, **kwargs):
-        """APRS lib already decodes this."""
-        return core.factory(args[0])
+    def send(self, packet: core.Packet) -> bool:
+        return self._client.send(packet)
 
     def setup_connection(self):
         user = CONF.aprs_network.login
@@ -125,7 +89,6 @@ class APRSISClient(base.APRSClient):
         port = CONF.aprs_network.port
         self.connected = False
         backoff = 1
-        aprs_client = None
         retries = 3
         retry_count = 0
         while not self.connected:
@@ -134,27 +97,29 @@ class APRSISClient(base.APRSClient):
                 break
             try:
                 LOG.info(
-                    f"Creating aprslib client({host}:{port}) and logging in {user}."
+                    f'Creating aprslib client({host}:{port}) and logging in {user}.'
                 )
-                aprs_client = aprsis.Aprsdis(
+                self._client = APRSLibClient(
                     user, passwd=password, host=host, port=port
                 )
                 # Force the log to be the same
-                aprs_client.logger = LOG
-                aprs_client.connect()
-                self.connected = self.login_status["success"] = True
-                self.login_status["message"] = aprs_client.server_string
+                self._client.logger = LOG
+                self._client.connect()
+                self.connected = self.login_status['success'] = True
+                self.login_status['message'] = self._client.server_string
                 backoff = 1
             except LoginError as e:
                 LOG.error(f"Failed to login to APRS-IS Server '{e}'")
-                self.connected = self.login_status["success"] = False
-                self.login_status["message"] = e.message
-                LOG.error(e.message)
+                self.connected = self.login_status['success'] = False
+                self.login_status['message'] = (
+                    e.message if hasattr(e, 'message') else str(e)
+                )
+                LOG.error(self.login_status['message'])
                 time.sleep(backoff)
             except Exception as e:
                 LOG.error(f"Unable to connect to APRS-IS server. '{e}' ")
-                self.connected = self.login_status["success"] = False
-                self.login_status["message"] = e.message
+                self.connected = self.login_status['success'] = False
+                self.login_status['message'] = getattr(e, 'message', str(e))
                 time.sleep(backoff)
                 # Don't allow the backoff to go to inifinity.
                 if backoff > 5:
@@ -162,16 +127,50 @@ class APRSISClient(base.APRSClient):
                 else:
                     backoff += 1
                 continue
-        self._client = aprs_client
-        return aprs_client
 
-    def consumer(self, callback, blocking=False, immortal=False, raw=False):
-        if self._client:
+    def set_filter(self, filter):
+        self._client.set_filter(filter)
+
+    def login_success(self) -> bool:
+        return self.login_status.get('success', False)
+
+    def login_failure(self) -> str:
+        return self.login_status.get('message', None)
+
+    @property
+    def filter(self):
+        return self._client.filter
+
+    @property
+    def server_string(self):
+        return self._client.server_string
+
+    @property
+    def keepalive(self):
+        return self._client.aprsd_keepalive
+
+    def _is_stale_connection(self):
+        delta = datetime.datetime.now() - self._client.aprsd_keepalive
+        if delta > self.max_delta:
+            LOG.error(f'Connection is stale, last heard {delta} ago.')
+            return True
+        return False
+
+    @staticmethod
+    def transport():
+        return client.TRANSPORT_APRSIS
+
+    def decode_packet(self, *args, **kwargs):
+        """APRS lib already decodes this."""
+        return core.factory(args[0])
+
+    def consumer(self, callback: Callable, raw: bool = False):
+        if self._client and self.connected:
             try:
                 self._client.consumer(
                     callback,
-                    blocking=blocking,
-                    immortal=immortal,
+                    blocking=False,
+                    immortal=False,
                     raw=raw,
                 )
             except Exception as e:
@@ -179,5 +178,28 @@ class APRSISClient(base.APRSClient):
                 LOG.info(e.__cause__)
                 raise e
         else:
-            LOG.warning("client is None, might be resetting.")
             self.connected = False
+
+    def stats(self, serializable: bool = False) -> dict:
+        stats = {}
+        if self.is_configured():
+            if self._client:
+                keepalive = self._client.aprsd_keepalive
+                server_string = self._client.server_string
+                if serializable:
+                    keepalive = keepalive.isoformat()
+                filter = self.filter
+            else:
+                keepalive = 'None'
+                server_string = 'None'
+                filter = 'None'
+            stats = {
+                'connected': self.is_alive,
+                'filter': filter,
+                'login_status': self.login_status,
+                'connection_keepalive': keepalive,
+                'server_string': server_string,
+                'transport': self.transport(),
+            }
+
+        return stats