Refactor client and drivers

this patch refactors the client, drivers and client factory to use the same Protocol mechanism used by the stats collector to construct the proper client to be used according to the configuration
Merge pull request #167 from craigerl/docker-rework
2024-11-21 23:55:17 -05:00 · 2024-05-23 11:38:27 -04:00 · 2024-05-23 11:37:50 -04:00 · 2024-05-23 10:59:46 -04:00 · 2024-05-23 10:58:46 -04:00 · 2024-05-21 05:54:04 +00:00
31 changed files with 980 additions and 728 deletions
--- a/.github/workflows/manual_build.yml
+++ b/.github/workflows/manual_build.yml
@ -43,8 +43,9 @@ jobs:
      with:
        context: "{{defaultContext}}:docker"
        platforms: linux/amd64,linux/arm64
-        file: ./Dockerfile-dev
+        file: ./Dockerfile
        build-args: |
            INSTALL_TYPE=github
            BRANCH=${{ steps.extract_branch.outputs.branch }}
            BUILDX_QEMU_ENV=true
        push: true
--- a/.github/workflows/master-build.yml
+++ b/.github/workflows/master-build.yml
@ -53,8 +53,9 @@ jobs:
      with:
        context: "{{defaultContext}}:docker"
        platforms: linux/amd64,linux/arm64
-        file: ./Dockerfile-dev
+        file: ./Dockerfile
        build-args: |
            INSTALL_TYPE=github
            BRANCH=${{ steps.branch-name.outputs.current_branch }}
            BUILDX_QEMU_ENV=true
        push: true
--- a/aprsd/client.py
+++ b/aprsd/client.py
@ -1,461 +0,0 @@
 import abc
 import datetime
 import logging
 import threading
 import time
 import aprslib
 from aprslib.exceptions import LoginError
 from oslo_config import cfg
 import wrapt
 from aprsd import exception
 from aprsd.clients import aprsis, fake, kiss
 from aprsd.packets import core
 from aprsd.utils import singleton, trace
 CONF = cfg.CONF
 LOG = logging.getLogger("APRSD")
 TRANSPORT_APRSIS = "aprsis"
 TRANSPORT_TCPKISS = "tcpkiss"
 TRANSPORT_SERIALKISS = "serialkiss"
 TRANSPORT_FAKE = "fake"
 # Main must create this from the ClientFactory
 # object such that it's populated with the
 # Correct config
 factory = None
@singleton
 class APRSClientStats:
    lock = threading.Lock()
    @wrapt.synchronized(lock)
    def stats(self, serializable=False):
        client = factory.create()
        stats = {
            "transport": client.transport(),
            "filter": client.filter,
            "connected": client.connected,
        }
        if client.transport() == TRANSPORT_APRSIS:
            stats["server_string"] = client.client.server_string
            keepalive = client.client.aprsd_keepalive
            if serializable:
                keepalive = keepalive.isoformat()
            stats["server_keepalive"] = keepalive
        elif client.transport() == TRANSPORT_TCPKISS:
            stats["host"] = CONF.kiss_tcp.host
            stats["port"] = CONF.kiss_tcp.port
        elif client.transport() == TRANSPORT_SERIALKISS:
            stats["device"] = CONF.kiss_serial.device
        return stats
 class Client:
    """Singleton client class that constructs the aprslib connection."""
    _instance = None
    _client = None
    connected = False
    filter = None
    lock = threading.Lock()
    def __new__(cls, *args, **kwargs):
        """This magic turns this into a singleton."""
        if cls._instance is None:
            cls._instance = super().__new__(cls)
            # Put any initialization here.
            cls._instance._create_client()
        return cls._instance
    @abc.abstractmethod
    def stats(self) -> dict:
        pass
    def set_filter(self, filter):
        self.filter = filter
        if self._client:
            self._client.set_filter(filter)
    @property
    def client(self):
        if not self._client:
            self._create_client()
        return self._client
    def _create_client(self):
        self._client = self.setup_connection()
        if self.filter:
            LOG.info("Creating APRS client filter")
            self._client.set_filter(self.filter)
    def stop(self):
        if self._client:
            LOG.info("Stopping client connection.")
            self._client.stop()
    def send(self, packet: core.Packet):
        """Send a packet to the network."""
        self.client.send(packet)
    @wrapt.synchronized(lock)
    def reset(self):
        """Call this to force a rebuild/reconnect."""
        LOG.info("Resetting client connection.")
        if self._client:
            self._client.close()
            del self._client
            self._create_client()
        else:
            LOG.warning("Client not initialized, nothing to reset.")
        # Recreate the client
        LOG.info(f"Creating new client {self.client}")
    @abc.abstractmethod
    def setup_connection(self):
        pass
    @staticmethod
    @abc.abstractmethod
    def is_enabled():
        pass
    @staticmethod
    @abc.abstractmethod
    def transport():
        pass
    @abc.abstractmethod
    def decode_packet(self, *args, **kwargs):
        pass
    @abc.abstractmethod
    def consumer(self, callback, blocking=False, immortal=False, raw=False):
        pass
    @abc.abstractmethod
    def is_alive(self):
        pass
    @abc.abstractmethod
    def close(self):
        pass
 class APRSISClient(Client):
    _client = None
    def __init__(self):
        max_timeout = {"hours": 0.0, "minutes": 2, "seconds": 0}
        self.max_delta = datetime.timedelta(**max_timeout)
    def stats(self) -> dict:
        stats = {}
        if self.is_configured():
            stats = {
                "server_string": self._client.server_string,
                "sever_keepalive": self._client.aprsd_keepalive,
                "filter": self.filter,
            }
        return stats
    @staticmethod
    def is_enabled():
        # Defaults to True if the enabled flag is non existent
        try:
            return CONF.aprs_network.enabled
        except KeyError:
            return False
    @staticmethod
    def is_configured():
        if APRSISClient.is_enabled():
            # Ensure that the config vars are correctly set
            if not CONF.aprs_network.login:
                LOG.error("Config aprs_network.login not set.")
                raise exception.MissingConfigOptionException(
                    "aprs_network.login is not set.",
                )
            if not CONF.aprs_network.password:
                LOG.error("Config aprs_network.password not set.")
                raise exception.MissingConfigOptionException(
                    "aprs_network.password is not set.",
                )
            if not CONF.aprs_network.host:
                LOG.error("Config aprs_network.host not set.")
                raise exception.MissingConfigOptionException(
                    "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
    def is_alive(self):
        if self._client:
            return self._client.is_alive() and not self._is_stale_connection()
        else:
            LOG.warning(f"APRS_CLIENT {self._client} alive? NO!!!")
            return False
    def close(self):
        if self._client:
            self._client.stop()
            self._client.close()
    @staticmethod
    def transport():
        return TRANSPORT_APRSIS
    def decode_packet(self, *args, **kwargs):
        """APRS lib already decodes this."""
        return core.factory(args[0])
    def setup_connection(self):
        user = CONF.aprs_network.login
        password = CONF.aprs_network.password
        host = CONF.aprs_network.host
        port = CONF.aprs_network.port
        self.connected = False
        backoff = 1
        aprs_client = None
        while not self.connected:
            try:
                LOG.info(f"Creating aprslib client({host}:{port}) and logging in {user}.")
                aprs_client = aprsis.Aprsdis(user, passwd=password, host=host, port=port)
                # Force the log to be the same
                aprs_client.logger = LOG
                aprs_client.connect()
                self.connected = True
                backoff = 1
            except LoginError as e:
                LOG.error(f"Failed to login to APRS-IS Server '{e}'")
                self.connected = False
                time.sleep(backoff)
            except Exception as e:
                LOG.error(f"Unable to connect to APRS-IS server. '{e}' ")
                self.connected = False
                time.sleep(backoff)
                # Don't allow the backoff to go to inifinity.
                if backoff > 5:
                    backoff = 5
                else:
                    backoff += 1
                continue
        self._client = aprs_client
        return aprs_client
    def consumer(self, callback, blocking=False, immortal=False, raw=False):
        self._client.consumer(
            callback, blocking=blocking,
            immortal=immortal, raw=raw,
        )
 class KISSClient(Client):
    _client = None
    def stats(self) -> dict:
        stats = {}
        if self.is_configured():
            return {
                "transport": self.transport(),
            }
        return stats
    @staticmethod
    def is_enabled():
        """Return if tcp or serial KISS is enabled."""
        if CONF.kiss_serial.enabled:
            return True
        if CONF.kiss_tcp.enabled:
            return True
        return False
    @staticmethod
    def is_configured():
        # Ensure that the config vars are correctly set
        if KISSClient.is_enabled():
            transport = KISSClient.transport()
            if transport == TRANSPORT_SERIALKISS:
                if not CONF.kiss_serial.device:
                    LOG.error("KISS serial enabled, but no device is set.")
                    raise exception.MissingConfigOptionException(
                        "kiss_serial.device is not set.",
                    )
            elif transport == TRANSPORT_TCPKISS:
                if not CONF.kiss_tcp.host:
                    LOG.error("KISS TCP enabled, but no host is set.")
                    raise exception.MissingConfigOptionException(
                        "kiss_tcp.host is not set.",
                    )
            return True
        return False
    def is_alive(self):
        if self._client:
            return self._client.is_alive()
        else:
            return False
    def close(self):
        if self._client:
            self._client.stop()
    @staticmethod
    def transport():
        if CONF.kiss_serial.enabled:
            return TRANSPORT_SERIALKISS
        if CONF.kiss_tcp.enabled:
            return TRANSPORT_TCPKISS
    def decode_packet(self, *args, **kwargs):
        """We get a frame, which has to be decoded."""
        LOG.debug(f"kwargs {kwargs}")
        frame = kwargs["frame"]
        LOG.debug(f"Got an APRS Frame '{frame}'")
        # try and nuke the * from the fromcall sign.
        # frame.header._source._ch = False
        # payload = str(frame.payload.decode())
        # msg = f"{str(frame.header)}:{payload}"
        # msg = frame.tnc2
        # LOG.debug(f"Decoding {msg}")
        raw = aprslib.parse(str(frame))
        packet = core.factory(raw)
        if isinstance(packet, core.ThirdParty):
            return packet.subpacket
        else:
            return packet
    def setup_connection(self):
        self._client = kiss.KISS3Client()
        self.connected = True
        return self._client
    def consumer(self, callback, blocking=False, immortal=False, raw=False):
        self._client.consumer(callback)
 class APRSDFakeClient(Client, metaclass=trace.TraceWrapperMetaclass):
    def stats(self) -> dict:
        return {}
    @staticmethod
    def is_enabled():
        if CONF.fake_client.enabled:
            return True
        return False
    @staticmethod
    def is_configured():
        return APRSDFakeClient.is_enabled()
    def is_alive(self):
        return True
    def close(self):
        pass
    def setup_connection(self):
        self.connected = True
        return fake.APRSDFakeClient()
    @staticmethod
    def transport():
        return TRANSPORT_FAKE
    def decode_packet(self, *args, **kwargs):
        LOG.debug(f"kwargs {kwargs}")
        pkt = kwargs["packet"]
        LOG.debug(f"Got an APRS Fake Packet '{pkt}'")
        return pkt
 class ClientFactory:
    _instance = None
    def __new__(cls, *args, **kwargs):
        """This magic turns this into a singleton."""
        if cls._instance is None:
            cls._instance = super().__new__(cls)
            # Put any initialization here.
        return cls._instance
    def __init__(self):
        self._builders = {}
    def register(self, key, builder):
        self._builders[key] = builder
    def create(self, key=None):
        if not key:
            if APRSISClient.is_enabled():
                key = TRANSPORT_APRSIS
            elif KISSClient.is_enabled():
                key = KISSClient.transport()
            elif APRSDFakeClient.is_enabled():
                key = TRANSPORT_FAKE
        builder = self._builders.get(key)
        if not builder:
            raise ValueError(key)
        return builder()
    def is_client_enabled(self):
        """Make sure at least one client is enabled."""
        enabled = False
        for key in self._builders.keys():
            try:
                enabled |= self._builders[key].is_enabled()
            except KeyError:
                pass
        return enabled
    def is_client_configured(self):
        enabled = False
        for key in self._builders.keys():
            try:
                enabled |= self._builders[key].is_configured()
            except KeyError:
                pass
            except exception.MissingConfigOptionException as ex:
                LOG.error(ex.message)
                return False
            except exception.ConfigOptionBogusDefaultException as ex:
                LOG.error(ex.message)
                return False
        return enabled
    @staticmethod
    def setup():
        """Create and register all possible client objects."""
        global factory
        factory = ClientFactory()
        factory.register(TRANSPORT_APRSIS, APRSISClient)
        factory.register(TRANSPORT_TCPKISS, KISSClient)
        factory.register(TRANSPORT_SERIALKISS, KISSClient)
        factory.register(TRANSPORT_FAKE, APRSDFakeClient)
--- a/aprsd/client/init.py
+++ b/aprsd/client/init.py
@ -0,0 +1,13 @@
 from aprsd.client import aprsis, factory, fake, kiss
 TRANSPORT_APRSIS = "aprsis"
 TRANSPORT_TCPKISS = "tcpkiss"
 TRANSPORT_SERIALKISS = "serialkiss"
 TRANSPORT_FAKE = "fake"
 client_factory = factory.ClientFactory()
 client_factory.register(aprsis.APRSISClient)
 client_factory.register(kiss.KISSClient)
 client_factory.register(fake.APRSDFakeClient)
--- a/aprsd/client/aprsis.py
+++ b/aprsd/client/aprsis.py
@ -0,0 +1,132 @@
 import datetime
 import logging
 import time
 from aprslib.exceptions import LoginError
 from oslo_config import cfg
 from aprsd import client, exception
 from aprsd.client import base
 from aprsd.client.drivers import aprsis
 from aprsd.packets import core
 CONF = cfg.CONF
 LOG = logging.getLogger("APRSD")
 class APRSISClient(base.APRSClient):
    _client = None
    def __init__(self):
        max_timeout = {"hours": 0.0, "minutes": 2, "seconds": 0}
        self.max_delta = datetime.timedelta(**max_timeout)
    def stats(self) -> dict:
        stats = {}
        if self.is_configured():
            stats = {
                "server_string": self._client.server_string,
                "sever_keepalive": self._client.aprsd_keepalive,
                "filter": self.filter,
            }
        return stats
    @staticmethod
    def is_enabled():
        # Defaults to True if the enabled flag is non existent
        try:
            return CONF.aprs_network.enabled
        except KeyError:
            return False
    @staticmethod
    def is_configured():
        if APRSISClient.is_enabled():
            # Ensure that the config vars are correctly set
            if not CONF.aprs_network.login:
                LOG.error("Config aprs_network.login not set.")
                raise exception.MissingConfigOptionException(
                    "aprs_network.login is not set.",
                )
            if not CONF.aprs_network.password:
                LOG.error("Config aprs_network.password not set.")
                raise exception.MissingConfigOptionException(
                    "aprs_network.password is not set.",
                )
            if not CONF.aprs_network.host:
                LOG.error("Config aprs_network.host not set.")
                raise exception.MissingConfigOptionException(
                    "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
    def is_alive(self):
        if self._client:
            return self._client.is_alive() and not self._is_stale_connection()
        else:
            LOG.warning(f"APRS_CLIENT {self._client} alive? NO!!!")
            return False
    def close(self):
        if self._client:
            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 setup_connection(self):
        user = CONF.aprs_network.login
        password = CONF.aprs_network.password
        host = CONF.aprs_network.host
        port = CONF.aprs_network.port
        self.connected = False
        backoff = 1
        aprs_client = None
        while not self.connected:
            try:
                LOG.info(f"Creating aprslib client({host}:{port}) and logging in {user}.")
                aprs_client = aprsis.Aprsdis(user, passwd=password, host=host, port=port)
                # Force the log to be the same
                aprs_client.logger = LOG
                aprs_client.connect()
                self.connected = True
                backoff = 1
            except LoginError as e:
                LOG.error(f"Failed to login to APRS-IS Server '{e}'")
                self.connected = False
                time.sleep(backoff)
            except Exception as e:
                LOG.error(f"Unable to connect to APRS-IS server. '{e}' ")
                self.connected = False
                time.sleep(backoff)
                # Don't allow the backoff to go to inifinity.
                if backoff > 5:
                    backoff = 5
                else:
                    backoff += 1
                continue
        self._client = aprs_client
        return aprs_client
    def consumer(self, callback, blocking=False, immortal=False, raw=False):
        self._client.consumer(
            callback, blocking=blocking,
            immortal=immortal, raw=raw,
        )
--- a/aprsd/client/base.py
+++ b/aprsd/client/base.py
@ -0,0 +1,105 @@
 import abc
 import logging
 import threading
 from oslo_config import cfg
 import wrapt
 from aprsd.packets import core
 CONF = cfg.CONF
 LOG = logging.getLogger("APRSD")
 class APRSClient:
    """Singleton client class that constructs the aprslib connection."""
    _instance = None
    _client = None
    connected = False
    filter = None
    lock = threading.Lock()
    def __new__(cls, *args, **kwargs):
        """This magic turns this into a singleton."""
        if cls._instance is None:
            cls._instance = super().__new__(cls)
            # Put any initialization here.
            cls._instance._create_client()
        return cls._instance
    @abc.abstractmethod
    def stats(self) -> dict:
        pass
    def set_filter(self, filter):
        self.filter = filter
        if self._client:
            self._client.set_filter(filter)
    @property
    def client(self):
        if not self._client:
            self._create_client()
        return self._client
    def _create_client(self):
        self._client = self.setup_connection()
        if self.filter:
            LOG.info("Creating APRS client filter")
            self._client.set_filter(self.filter)
    def stop(self):
        if self._client:
            LOG.info("Stopping client connection.")
            self._client.stop()
    def send(self, packet: core.Packet):
        """Send a packet to the network."""
        self.client.send(packet)
    @wrapt.synchronized(lock)
    def reset(self):
        """Call this to force a rebuild/reconnect."""
        LOG.info("Resetting client connection.")
        if self._client:
            self._client.close()
            del self._client
            self._create_client()
        else:
            LOG.warning("Client not initialized, nothing to reset.")
        # Recreate the client
        LOG.info(f"Creating new client {self.client}")
    @abc.abstractmethod
    def setup_connection(self):
        pass
    @staticmethod
    @abc.abstractmethod
    def is_enabled():
        pass
    @staticmethod
    @abc.abstractmethod
    def transport():
        pass
    @abc.abstractmethod
    def decode_packet(self, *args, **kwargs):
        pass
    @abc.abstractmethod
    def consumer(self, callback, blocking=False, immortal=False, raw=False):
        pass
    @abc.abstractmethod
    def is_alive(self):
        pass
    @abc.abstractmethod
    def close(self):
        pass
--- a/aprsd/client/drivers/init.py
+++ b/aprsd/client/drivers/init.py
--- a/aprsd/client/drivers/aprsis.py
+++ b/aprsd/client/drivers/aprsis.py
--- a/aprsd/client/drivers/fake.py
+++ b/aprsd/client/drivers/fake.py
--- a/aprsd/client/drivers/kiss.py
+++ b/aprsd/client/drivers/kiss.py
--- a/aprsd/client/factory.py
+++ b/aprsd/client/factory.py
@ -0,0 +1,88 @@
 import logging
 from typing import Callable, Protocol, runtime_checkable
 from aprsd import exception
 from aprsd.packets import core
 LOG = logging.getLogger("APRSD")
@runtime_checkable
 class Client(Protocol):
    def __init__(self):
        pass
    def connect(self) -> bool:
        pass
    def disconnect(self) -> bool:
        pass
    def decode_packet(self, *args, **kwargs) -> type[core.Packet]:
        pass
    def is_enabled(self) -> bool:
        pass
    def is_configured(self) -> bool:
        pass
    def transport(self) -> str:
        pass
    def send(self, message: str) -> bool:
        pass
    def setup_connection(self) -> None:
        pass
 class ClientFactory:
    _instance = None
    clients = []
    def __new__(cls, *args, **kwargs):
        """This magic turns this into a singleton."""
        if cls._instance is None:
            cls._instance = super().__new__(cls)
            # Put any initialization here.
        return cls._instance
    def __init__(self):
        self.clients: list[Callable] = []
    def register(self, aprsd_client: Callable):
        if isinstance(aprsd_client, Client):
            raise ValueError("Client must be a subclass of Client protocol")
        self.clients.append(aprsd_client)
    def create(self, key=None):
        for client in self.clients:
            if client.is_enabled():
                return client()
        raise Exception("No client is configured!!")
    def is_client_enabled(self):
        """Make sure at least one client is enabled."""
        enabled = False
        for client in self.clients:
            if client.is_enabled():
                enabled = True
        return enabled
    def is_client_configured(self):
        enabled = False
        for client in self.clients:
            try:
                if client.is_configured():
                    enabled = True
            except exception.MissingConfigOptionException as ex:
                LOG.error(ex.message)
                return False
            except exception.ConfigOptionBogusDefaultException as ex:
                LOG.error(ex.message)
                return False
        return enabled
--- a/aprsd/client/fake.py
+++ b/aprsd/client/fake.py
@ -0,0 +1,48 @@
 import logging
 from oslo_config import cfg
 from aprsd import client
 from aprsd.client import base
 from aprsd.client.drivers import fake as fake_driver
 from aprsd.utils import trace
 CONF = cfg.CONF
 LOG = logging.getLogger("APRSD")
 class APRSDFakeClient(base.APRSClient, metaclass=trace.TraceWrapperMetaclass):
    def stats(self) -> dict:
        return {}
    @staticmethod
    def is_enabled():
        if CONF.fake_client.enabled:
            return True
        return False
    @staticmethod
    def is_configured():
        return APRSDFakeClient.is_enabled()
    def is_alive(self):
        return True
    def close(self):
        pass
    def setup_connection(self):
        self.connected = True
        return fake_driver.APRSDFakeClient()
    @staticmethod
    def transport():
        return client.TRANSPORT_FAKE
    def decode_packet(self, *args, **kwargs):
        LOG.debug(f"kwargs {kwargs}")
        pkt = kwargs["packet"]
        LOG.debug(f"Got an APRS Fake Packet '{pkt}'")
        return pkt
--- a/aprsd/client/kiss.py
+++ b/aprsd/client/kiss.py
@ -0,0 +1,103 @@
 import logging
 import aprslib
 from oslo_config import cfg
 from aprsd import client, exception
 from aprsd.client import base
 from aprsd.client.drivers import kiss
 from aprsd.packets import core
 CONF = cfg.CONF
 LOG = logging.getLogger("APRSD")
 class KISSClient(base.APRSClient):
    _client = None
    def stats(self) -> dict:
        stats = {}
        if self.is_configured():
            return {
                "transport": self.transport(),
            }
        return stats
    @staticmethod
    def is_enabled():
        """Return if tcp or serial KISS is enabled."""
        if CONF.kiss_serial.enabled:
            return True
        if CONF.kiss_tcp.enabled:
            return True
        return False
    @staticmethod
    def is_configured():
        # Ensure that the config vars are correctly set
        if KISSClient.is_enabled():
            transport = KISSClient.transport()
            if transport == client.TRANSPORT_SERIALKISS:
                if not CONF.kiss_serial.device:
                    LOG.error("KISS serial enabled, but no device is set.")
                    raise exception.MissingConfigOptionException(
                        "kiss_serial.device is not set.",
                    )
            elif transport == client.TRANSPORT_TCPKISS:
                if not CONF.kiss_tcp.host:
                    LOG.error("KISS TCP enabled, but no host is set.")
                    raise exception.MissingConfigOptionException(
                        "kiss_tcp.host is not set.",
                    )
            return True
        return False
    def is_alive(self):
        if self._client:
            return self._client.is_alive()
        else:
            return False
    def close(self):
        if self._client:
            self._client.stop()
    @staticmethod
    def transport():
        if CONF.kiss_serial.enabled:
            return client.TRANSPORT_SERIALKISS
        if CONF.kiss_tcp.enabled:
            return client.TRANSPORT_TCPKISS
    def decode_packet(self, *args, **kwargs):
        """We get a frame, which has to be decoded."""
        LOG.debug(f"kwargs {kwargs}")
        frame = kwargs["frame"]
        LOG.debug(f"Got an APRS Frame '{frame}'")
        # try and nuke the * from the fromcall sign.
        # frame.header._source._ch = False
        # payload = str(frame.payload.decode())
        # msg = f"{str(frame.header)}:{payload}"
        # msg = frame.tnc2
        # LOG.debug(f"Decoding {msg}")
        raw = aprslib.parse(str(frame))
        packet = core.factory(raw)
        if isinstance(packet, core.ThirdParty):
            return packet.subpacket
        else:
            return packet
    def setup_connection(self):
        self._client = kiss.KISS3Client()
        self.connected = True
        return self._client
    def consumer(self, callback, blocking=False, immortal=False, raw=False):
        self._client.consumer(callback)
--- a/aprsd/client/stats.py
+++ b/aprsd/client/stats.py
@ -0,0 +1,38 @@
 import threading
 from oslo_config import cfg
 import wrapt
 from aprsd import client
 from aprsd.utils import singleton
 CONF = cfg.CONF
@singleton
 class APRSClientStats:
    lock = threading.Lock()
    @wrapt.synchronized(lock)
    def stats(self, serializable=False):
        cl = client.client_factory.create()
        stats = {
            "transport": cl.transport(),
            "filter": cl.filter,
            "connected": cl.connected,
        }
        if cl.transport() == client.TRANSPORT_APRSIS:
            stats["server_string"] = cl.client.server_string
            keepalive = cl.client.aprsd_keepalive
            if serializable:
                keepalive = keepalive.isoformat()
            stats["server_keepalive"] = keepalive
        elif cl.transport() == client.TRANSPORT_TCPKISS:
            stats["host"] = CONF.kiss_tcp.host
            stats["port"] = CONF.kiss_tcp.port
        elif cl.transport() == client.TRANSPORT_SERIALKISS:
            stats["device"] = CONF.kiss_serial.device
        return stats
--- a/aprsd/cmds/dev.py
+++ b/aprsd/cmds/dev.py
@ -8,8 +8,9 @@ import logging
 import click
 from oslo_config import cfg
 from aprsd import cli_helper, conf, packets, plugin
 # local imports here
-from aprsd import cli_helper, client, conf, packets, plugin
+from aprsd.client import base
 from aprsd.main import cli
 from aprsd.utils import trace
@ -96,7 +97,7 @@ def test_plugin(
    if CONF.trace_enabled:
        trace.setup_tracing(["method", "api"])
-    client.Client()
+    base.APRSClient()
    pm = plugin.PluginManager()
    if load_all:
--- a/aprsd/cmds/listen.py
+++ b/aprsd/cmds/listen.py
@ -15,7 +15,8 @@ from rich.console import Console
 # local imports here
 import aprsd
-from aprsd import cli_helper, client, packets, plugin, threads
+from aprsd import cli_helper, packets, plugin, threads
 from aprsd.client import client_factory
 from aprsd.main import cli
 from aprsd.packets import collector as packet_collector
 from aprsd.packets import log as packet_log
@ -179,15 +180,14 @@ def listen(
    # Initialize the client factory and create
    # The correct client object ready for use
    client.ClientFactory.setup()
    # Make sure we have 1 client transport enabled
-    if not client.factory.is_client_enabled():
+    if not client_factory.is_client_enabled():
        LOG.error("No Clients are enabled in config.")
        sys.exit(-1)
    # Creates the client object
    LOG.info("Creating client connection")
-    aprs_client = client.factory.create()
+    aprs_client = client_factory.create()
    LOG.info(aprs_client)
    LOG.debug(f"Filter by '{filter}'")
--- a/aprsd/cmds/send_message.py
+++ b/aprsd/cmds/send_message.py
@ -8,8 +8,9 @@ import click
 from oslo_config import cfg
 import aprsd
-from aprsd import cli_helper, client, packets
+from aprsd import cli_helper, packets
 from aprsd import conf  # noqa : F401
 from aprsd.client import client_factory
 from aprsd.main import cli
 from aprsd.packets import collector
 from aprsd.threads import tx
@ -102,7 +103,7 @@ def send_message(
    def rx_packet(packet):
        global got_ack, got_response
-        cl = client.factory.create()
+        cl = client_factory.create()
        packet = cl.decode_packet(packet)
        collector.PacketCollector().rx(packet)
        packet.log("RX")
@ -130,8 +131,7 @@ def send_message(
                sys.exit(0)
    try:
-        client.ClientFactory.setup()
+        client_factory.create().client
        client.factory.create().client
    except LoginError:
        sys.exit(-1)
@ -163,7 +163,7 @@ def send_message(
        # This will register a packet consumer with aprslib
        # When new packets come in the consumer will process
        # the packet
-        aprs_client = client.factory.create().client
+        aprs_client = client_factory.create().client
        aprs_client.consumer(rx_packet, raw=False)
    except aprslib.exceptions.ConnectionDrop:
        LOG.error("Connection dropped, reconnecting")
--- a/aprsd/cmds/server.py
+++ b/aprsd/cmds/server.py
@ -6,9 +6,10 @@ import click
 from oslo_config import cfg
 import aprsd
-from aprsd import cli_helper, client
+from aprsd import cli_helper
 from aprsd import main as aprsd_main
 from aprsd import packets, plugin, threads, utils
 from aprsd.client import client_factory
 from aprsd.main import cli
 from aprsd.packets import collector as packet_collector
 from aprsd.packets import seen_list
@ -49,14 +50,13 @@ def server(ctx, flush):
    # Initialize the client factory and create
    # The correct client object ready for use
-    client.ClientFactory.setup()
+    if not client_factory.is_client_enabled():
    if not client.factory.is_client_enabled():
        LOG.error("No Clients are enabled in config.")
        sys.exit(-1)
    # Creates the client object
    LOG.info("Creating client connection")
-    aprs_client = client.factory.create()
+    aprs_client = client_factory.create()
    LOG.info(aprs_client)
    # Create the initial PM singleton and Register plugins
@ -79,18 +79,14 @@ def server(ctx, flush):
        LOG.info(p)
    # Make sure we have 1 client transport enabled
-    if not client.factory.is_client_enabled():
+    if not client_factory.is_client_enabled():
        LOG.error("No Clients are enabled in config.")
        sys.exit(-1)
-    if not client.factory.is_client_configured():
+    if not client_factory.is_client_configured():
        LOG.error("APRS client is not properly configured in config file.")
        sys.exit(-1)
    # Creates the client object
    # LOG.info("Creating client connection")
    # client.factory.create().client
    # Now load the msgTrack from disk if any
    packets.PacketList()
    if flush:
--- a/aprsd/cmds/webchat.py
+++ b/aprsd/cmds/webchat.py
@ -21,6 +21,7 @@ import aprsd
 from aprsd import (
    cli_helper, client, packets, plugin_utils, stats, threads, utils,
 )
 from aprsd.client import client_factory, kiss
 from aprsd.main import cli
 from aprsd.threads import aprsd as aprsd_threads
 from aprsd.threads import keep_alive, rx, tx
@ -380,8 +381,8 @@ def _get_transport(stats):
            "APRS-IS Server: <a href='http://status.aprs2.net' >"
            "{}</a>".format(stats["APRSClientStats"]["server_string"])
        )
-    elif client.KISSClient.is_enabled():
+    elif kiss.KISSClient.is_enabled():
-        transport = client.KISSClient.transport()
+        transport = kiss.KISSClient.transport()
        if transport == client.TRANSPORT_TCPKISS:
            aprs_connection = (
                "TCPKISS://{}:{}".format(
@ -637,13 +638,12 @@ def webchat(ctx, flush, port):
    # Initialize the client factory and create
    # The correct client object ready for use
    client.ClientFactory.setup()
    # Make sure we have 1 client transport enabled
-    if not client.factory.is_client_enabled():
+    if not client_factory.is_client_enabled():
        LOG.error("No Clients are enabled in config.")
        sys.exit(-1)
-    if not client.factory.is_client_configured():
+    if not client_factory.is_client_configured():
        LOG.error("APRS client is not properly configured in config file.")
        sys.exit(-1)
--- a/aprsd/plugin.py
+++ b/aprsd/plugin.py
@ -148,7 +148,7 @@ class APRSDWatchListPluginBase(APRSDPluginBase, metaclass=abc.ABCMeta):
            watch_list = CONF.watch_list.callsigns
            # make sure the timeout is set or this doesn't work
            if watch_list:
-                aprs_client = client.factory.create().client
+                aprs_client = client.client_factory.create().client
                filter_str = "b/{}".format("/".join(watch_list))
                aprs_client.set_filter(filter_str)
            else:
--- a/aprsd/stats/init.py
+++ b/aprsd/stats/init.py
@ -1,5 +1,5 @@
 from aprsd import client as aprs_client
 from aprsd import plugin
 from aprsd.client import stats as client_stats
 from aprsd.packets import packet_list, seen_list, tracker, watch_list
 from aprsd.plugins import email
 from aprsd.stats import app, collector
@ -16,5 +16,5 @@ stats_collector.register_producer(tracker.PacketTrack)
 stats_collector.register_producer(plugin.PluginManager)
 stats_collector.register_producer(aprsd.APRSDThreadList)
 stats_collector.register_producer(email.EmailStats)
-stats_collector.register_producer(aprs_client.APRSClientStats)
+stats_collector.register_producer(client_stats.APRSClientStats)
 stats_collector.register_producer(seen_list.SeenList)
--- a/aprsd/threads/keep_alive.py
+++ b/aprsd/threads/keep_alive.py
@ -5,7 +5,8 @@ import tracemalloc
 from oslo_config import cfg
-from aprsd import client, packets, utils
+from aprsd import packets, utils
 from aprsd.client import client_factory
 from aprsd.log import log as aprsd_log
 from aprsd.stats import collector
 from aprsd.threads import APRSDThread, APRSDThreadList
@ -89,7 +90,7 @@ class KeepAliveThread(APRSDThread):
                    LOG.info(f"{key: <15} Alive? {str(alive): <5} {str(age): <20}")
            # check the APRS connection
-            cl = client.factory.create()
+            cl = client_factory.create()
            # Reset the connection if it's dead and this isn't our
            # First time through the loop.
            # The first time through the loop can happen at startup where
@ -97,7 +98,7 @@ class KeepAliveThread(APRSDThread):
            # to make it's connection the first time.
            if not cl.is_alive() and self.cntr > 0:
                LOG.error(f"{cl.__class__.__name__} is not alive!!! Resetting")
-                client.factory.create().reset()
+                client_factory.create().reset()
            # else:
            #     # See if we should reset the aprs-is client
            #     # Due to losing a keepalive from them
--- a/aprsd/threads/log_monitor.py
+++ b/aprsd/threads/log_monitor.py
@ -19,7 +19,6 @@ def send_log_entries(force=False):
    if CONF.admin.web_enabled:
        if force or LogEntries().is_purge_ready():
            entries = LogEntries().get_all_and_purge()
            print(f"Sending log entries {len(entries)}")
            if entries:
                try:
                    requests.post(
@ -27,9 +26,8 @@ def send_log_entries(force=False):
                        json=entries,
                        auth=(CONF.admin.user, CONF.admin.password),
                    )
-                except Exception as ex:
+                except Exception:
-                    LOG.warning(f"Failed to send log entries {len(entries)}")
+                    LOG.warning(f"Failed to send log entries. len={len(entries)}")
                    LOG.warning(ex)
 class LogEntries:
--- a/aprsd/threads/rx.py
+++ b/aprsd/threads/rx.py
@ -6,7 +6,8 @@ import time
 import aprslib
 from oslo_config import cfg
-from aprsd import client, packets, plugin
+from aprsd import packets, plugin
 from aprsd.client import client_factory
 from aprsd.packets import collector
 from aprsd.packets import log as packet_log
 from aprsd.threads import APRSDThread, tx
@ -20,7 +21,7 @@ class APRSDRXThread(APRSDThread):
    def __init__(self, packet_queue):
        super().__init__("RX_PKT")
        self.packet_queue = packet_queue
-        self._client = client.factory.create()
+        self._client = client_factory.create()
    def stop(self):
        self.thread_stop = True
@ -29,7 +30,7 @@ class APRSDRXThread(APRSDThread):
    def loop(self):
        if not self._client:
-            self._client = client.factory.create()
+            self._client = client_factory.create()
            time.sleep(1)
            return True
        # setup the consumer of messages and block until a messages
--- a/aprsd/threads/tx.py
+++ b/aprsd/threads/tx.py
@ -9,9 +9,9 @@ from rush.limiters import periodic
 from rush.stores import dictionary
 import wrapt
 from aprsd import client
 from aprsd import conf  # noqa
 from aprsd import threads as aprsd_threads
 from aprsd.client import client_factory
 from aprsd.packets import collector, core
 from aprsd.packets import log as packet_log
 from aprsd.packets import tracker
@ -80,7 +80,7 @@ def _send_direct(packet, aprs_client=None):
    if aprs_client:
        cl = aprs_client
    else:
-        cl = client.factory.create()
+        cl = client_factory.create()
    packet.update_timestamp()
    packet_log.log(packet, tx=True)
@ -247,7 +247,7 @@ class BeaconSendThread(aprsd_threads.APRSDThread):
                send(pkt, direct=True)
            except Exception as e:
                LOG.error(f"Failed to send beacon: {e}")
-                client.factory.create().reset()
+                client_factory.create().reset()
                time.sleep(5)
        self._loop_cnt += 1
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -1,10 +1,18 @@
 FROM python:3.11-slim as build
 ARG VERSION=3.4.0
 # pass this in as 'dev' if you want to install from github repo vs pypi
 ARG INSTALL_TYPE=pypi
 ARG BRANCH=master
 ARG BUILDX_QEMU_ENV
 ENV APRSD_BRANCH=${BRANCH:-master}
 ENV TZ=${TZ:-US/Eastern}
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 ENV APRSD_PIP_VERSION=${VERSION}
 ENV PATH="${PATH}:/app/.local/bin"
 ENV PIP_DEFAULT_TIMEOUT=100 \
    # Allow statements and log messages to immediately appear
@ -35,16 +43,22 @@ FROM build as final
 WORKDIR /app
 RUN pip3 install -U pip
 RUN pip3 install aprsd==$APRSD_PIP_VERSION
 RUN pip install gevent uwsgi
 RUN which aprsd
 RUN mkdir /config
 RUN chown -R appuser:appgroup /app
 RUN chown -R appuser:appgroup /config
 USER appuser
-RUN echo "PATH=\$PATH:/usr/games" >> /app/.bashrc
+RUN if [ "$INSTALL_TYPE" = "pypi" ]; then \
       pip3 install aprsd==$APRSD_PIP_VERSION; \
    elif [ "$INSTALL_TYPE" = "github" ]; then \
       git clone -b $APRSD_BRANCH https://github.com/craigerl/aprsd; \
       cd /app/aprsd && pip install -e .; \
       ls -al /app/.local/lib/python3.11/site-packages/aprsd*; \
    fi
 RUN pip install gevent uwsgi
 RUN echo "PATH=\$PATH:/usr/games:/app/.local/bin" >> /app/.bashrc
 RUN which aprsd
 RUN aprsd sample-config > /config/aprsd.conf
 RUN aprsd --version
 ADD bin/setup.sh /app
 ADD bin/admin.sh /app
--- a/docker/Dockerfile-dev
+++ b/docker/Dockerfile-dev
@ -1,60 +0,0 @@
 FROM python:3.11-slim as build
 ARG BRANCH=master
 ARG BUILDX_QEMU_ENV
 ENV APRSD_BRANCH=${BRANCH:-master}
 ENV PIP_DEFAULT_TIMEOUT=100 \
    # Allow statements and log messages to immediately appear
    PYTHONUNBUFFERED=1 \
    # disable a pip version check to reduce run-time & log-spam
    PIP_DISABLE_PIP_VERSION_CHECK=1 \
    # cache is useless in docker image, so disable to reduce image size
    PIP_NO_CACHE_DIR=1
 RUN set -ex \
    # Create a non-root user
    && addgroup --system --gid 1001 appgroup \
    && useradd --uid 1001 --gid 1001 -s /usr/bin/bash -m -d /app appuser \
    # Upgrade the package index and install security upgrades
    && apt-get update \
    && apt-get upgrade -y \
    && apt-get install -y git build-essential curl libffi-dev fortune \
    python3-dev libssl-dev libxml2-dev libxslt-dev telnet sudo \
    # Install dependencies
    # Clean up
    && apt-get autoremove -y \
    && apt-get clean -y
 ### Final stage
 FROM build as final
 WORKDIR /app
 RUN git clone -b $APRSD_BRANCH https://github.com/craigerl/aprsd
 RUN pip install -U pip
 RUN cd aprsd && pip install --no-cache-dir .
 RUN pip install gevent uwsgi==2.0.24
 RUN which aprsd
 RUN mkdir /config
 RUN chown -R appuser:appgroup /app
 RUN chown -R appuser:appgroup /config
 USER appuser
 RUN echo "PATH=\$PATH:/usr/games" >> /app/.bashrc
 RUN which aprsd
 RUN aprsd sample-config > /config/aprsd.conf
 ADD bin/setup.sh /app
 ADD bin/admin.sh /app
 EXPOSE 8000
 EXPOSE 8001
 VOLUME ["/config"]
 # CMD ["gunicorn", "aprsd.wsgi:app", "--host", "0.0.0.0", "--port", "8000"]
 ENTRYPOINT ["/app/setup.sh"]
 CMD ["server"]
 # Set the user to run the application
 USER appuser
--- a/docker/build.sh
+++ b/docker/build.sh
@ -90,7 +90,8 @@ then
    # Use this script to locally build the docker image
    docker buildx build --push --platform $PLATFORMS \
        -t hemna6969/aprsd:$TAG \
-        -f Dockerfile-dev --build-arg branch=$BRANCH \
+        --build-arg INSTALL_TYPE=github \
        --build-arg branch=$BRANCH \
        --build-arg BUILDX_QEMU_ENV=true \
        --no-cache .
 else
@ -101,6 +102,5 @@ else
        --build-arg BUILDX_QEMU_ENV=true \
        -t hemna6969/aprsd:$VERSION \
        -t hemna6969/aprsd:$TAG \
-        -t hemna6969/aprsd:latest \
+        -t hemna6969/aprsd:latest .
        -f Dockerfile .
 fi
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@ -4,80 +4,212 @@
 #
 #    pip-compile --annotation-style=line requirements-dev.in
 #
-add-trailing-comma==3.1.0  # via gray
+add-trailing-comma==3.1.0
-alabaster==0.7.16         # via sphinx
+    # via gray
-autoflake==1.5.3          # via gray
+alabaster==0.7.16
-babel==2.15.0             # via sphinx
+    # via sphinx
-black==24.4.2             # via gray
+autoflake==1.5.3
-build==1.2.1              # via -r requirements-dev.in, check-manifest, pip-tools
+    # via gray
-cachetools==5.3.3         # via tox
+babel==2.15.0
-certifi==2024.2.2         # via requests
+    # via sphinx
-cfgv==3.4.0               # via pre-commit
+black==24.4.2
-chardet==5.2.0            # via tox
+    # via gray
-charset-normalizer==3.3.2  # via requests
+build==1.2.1
-check-manifest==0.49      # via -r requirements-dev.in
+    # via
-click==8.1.7              # via black, fixit, moreorless, pip-tools
+    #   -r requirements-dev.in
-colorama==0.4.6           # via tox
+    #   check-manifest
-commonmark==0.9.1         # via rich
+    #   pip-tools
-configargparse==1.7       # via gray
+cachetools==5.3.3
-coverage[toml]==7.5.1     # via pytest-cov
+    # via tox
-distlib==0.3.8            # via virtualenv
+certifi==2024.2.2
-docutils==0.21.2          # via sphinx
+    # via requests
-exceptiongroup==1.2.1     # via pytest
+cfgv==3.4.0
-filelock==3.14.0          # via tox, virtualenv
+    # via pre-commit
-fixit==2.1.0              # via gray
+chardet==5.2.0
-flake8==7.0.0             # via -r requirements-dev.in, pep8-naming
+    # via tox
-gray==0.15.0              # via -r requirements-dev.in
+charset-normalizer==3.3.2
-identify==2.5.36          # via pre-commit
+    # via requests
-idna==3.7                 # via requests
+check-manifest==0.49
-imagesize==1.4.1          # via sphinx
+    # via -r requirements-dev.in
-iniconfig==2.0.0          # via pytest
+click==8.1.7
-isort==5.13.2             # via -r requirements-dev.in, gray
+    # via
-jinja2==3.1.4             # via sphinx
+    #   black
-libcst==1.3.1             # via fixit
+    #   fixit
-markupsafe==2.1.5         # via jinja2
+    #   moreorless
-mccabe==0.7.0             # via flake8
+    #   pip-tools
-moreorless==0.4.0         # via fixit
+colorama==0.4.6
-mypy==1.10.0              # via -r requirements-dev.in
+    # via tox
-mypy-extensions==1.0.0    # via black, mypy
+commonmark==0.9.1
-nodeenv==1.8.0            # via pre-commit
+    # via rich
-packaging==24.0           # via black, build, fixit, pyproject-api, pytest, sphinx, tox
+configargparse==1.7
-pathspec==0.12.1          # via black, trailrunner
+    # via gray
-pep8-naming==0.14.1       # via -r requirements-dev.in
+coverage[toml]==7.5.1
-pip-tools==7.4.1          # via -r requirements-dev.in
+    # via pytest-cov
-platformdirs==4.2.2       # via black, tox, virtualenv
+distlib==0.3.8
-pluggy==1.5.0             # via pytest, tox
+    # via virtualenv
-pre-commit==3.7.1         # via -r requirements-dev.in
+docutils==0.21.2
-pycodestyle==2.11.1       # via flake8
+    # via sphinx
-pyflakes==3.2.0           # via autoflake, flake8
+exceptiongroup==1.2.1
-pygments==2.18.0          # via rich, sphinx
+    # via pytest
-pyproject-api==1.6.1      # via tox
+filelock==3.14.0
-pyproject-hooks==1.1.0    # via build, pip-tools
+    # via
-pytest==8.2.0             # via -r requirements-dev.in, pytest-cov
+    #   tox
-pytest-cov==5.0.0         # via -r requirements-dev.in
+    #   virtualenv
-pyupgrade==3.15.2         # via gray
+fixit==2.1.0
-pyyaml==6.0.1             # via libcst, pre-commit
+    # via gray
-requests==2.31.0          # via sphinx
+flake8==7.0.0
-rich==12.6.0              # via gray
+    # via
-snowballstemmer==2.2.0    # via sphinx
+    #   -r requirements-dev.in
-sphinx==7.3.7             # via -r requirements-dev.in
+    #   pep8-naming
-sphinxcontrib-applehelp==1.0.8  # via sphinx
+gray==0.15.0
-sphinxcontrib-devhelp==1.0.6  # via sphinx
+    # via -r requirements-dev.in
-sphinxcontrib-htmlhelp==2.0.5  # via sphinx
+identify==2.5.36
-sphinxcontrib-jsmath==1.0.1  # via sphinx
+    # via pre-commit
-sphinxcontrib-qthelp==1.0.7  # via sphinx
+idna==3.7
-sphinxcontrib-serializinghtml==1.1.10  # via sphinx
+    # via requests
-tokenize-rt==5.2.0        # via add-trailing-comma, pyupgrade
+imagesize==1.4.1
-toml==0.10.2              # via autoflake
+    # via sphinx
-tomli==2.0.1              # via black, build, check-manifest, coverage, fixit, mypy, pip-tools, pyproject-api, pytest, sphinx, tox
+iniconfig==2.0.0
-tox==4.15.0               # via -r requirements-dev.in
+    # via pytest
-trailrunner==1.4.0        # via fixit
+isort==5.13.2
-typing-extensions==4.11.0  # via black, mypy
+    # via
-unify==0.5                # via gray
+    #   -r requirements-dev.in
-untokenize==0.1.1         # via unify
+    #   gray
-urllib3==2.2.1            # via requests
+jinja2==3.1.4
-virtualenv==20.26.2       # via pre-commit, tox
+    # via sphinx
-wheel==0.43.0             # via -r requirements-dev.in, pip-tools
+libcst==1.3.1
    # via fixit
 markupsafe==2.1.5
    # via jinja2
 mccabe==0.7.0
    # via flake8
 moreorless==0.4.0
    # via fixit
 mypy==1.10.0
    # via -r requirements-dev.in
 mypy-extensions==1.0.0
    # via
    #   black
    #   mypy
 nodeenv==1.8.0
    # via pre-commit
 packaging==24.0
    # via
    #   black
    #   build
    #   fixit
    #   pyproject-api
    #   pytest
    #   sphinx
    #   tox
 pathspec==0.12.1
    # via
    #   black
    #   trailrunner
 pep8-naming==0.14.1
    # via -r requirements-dev.in
 pip-tools==7.4.1
    # via -r requirements-dev.in
 platformdirs==4.2.2
    # via
    #   black
    #   tox
    #   virtualenv
 pluggy==1.5.0
    # via
    #   pytest
    #   tox
 pre-commit==3.7.1
    # via -r requirements-dev.in
 pycodestyle==2.11.1
    # via flake8
 pyflakes==3.2.0
    # via
    #   autoflake
    #   flake8
 pygments==2.18.0
    # via
    #   rich
    #   sphinx
 pyproject-api==1.6.1
    # via tox
 pyproject-hooks==1.1.0
    # via
    #   build
    #   pip-tools
 pytest==8.2.0
    # via
    #   -r requirements-dev.in
    #   pytest-cov
 pytest-cov==5.0.0
    # via -r requirements-dev.in
 pyupgrade==3.15.2
    # via gray
 pyyaml==6.0.1
    # via
    #   libcst
    #   pre-commit
 requests==2.32.0
    # via sphinx
 rich==12.6.0
    # via gray
 snowballstemmer==2.2.0
    # via sphinx
 sphinx==7.3.7
    # via -r requirements-dev.in
 sphinxcontrib-applehelp==1.0.8
    # via sphinx
 sphinxcontrib-devhelp==1.0.6
    # via sphinx
 sphinxcontrib-htmlhelp==2.0.5
    # via sphinx
 sphinxcontrib-jsmath==1.0.1
    # via sphinx
 sphinxcontrib-qthelp==1.0.7
    # via sphinx
 sphinxcontrib-serializinghtml==1.1.10
    # via sphinx
 tokenize-rt==5.2.0
    # via
    #   add-trailing-comma
    #   pyupgrade
 toml==0.10.2
    # via autoflake
 tomli==2.0.1
    # via
    #   black
    #   build
    #   check-manifest
    #   coverage
    #   fixit
    #   mypy
    #   pip-tools
    #   pyproject-api
    #   pytest
    #   sphinx
    #   tox
 tox==4.15.0
    # via -r requirements-dev.in
 trailrunner==1.4.0
    # via fixit
 typing-extensions==4.11.0
    # via
    #   black
    #   mypy
 unify==0.5
    # via gray
 untokenize==0.1.1
    # via unify
 urllib3==2.2.1
    # via requests
 virtualenv==20.26.2
    # via
    #   pre-commit
    #   tox
 wheel==0.43.0
    # via
    #   -r requirements-dev.in
    #   pip-tools
 # The following packages are considered to be unsafe in a requirements file:
 # pip
--- a/requirements.txt
+++ b/requirements.txt
@ -4,78 +4,179 @@
 #
 #    pip-compile --annotation-style=line requirements.in
 #
-aprslib==0.7.2            # via -r requirements.in
+aprslib==0.7.2
-attrs==23.2.0             # via ax253, kiss3, rush
+    # via -r requirements.in
-ax253==0.1.5.post1        # via kiss3
+attrs==23.2.0
-beautifulsoup4==4.12.3    # via -r requirements.in
+    # via
-bidict==0.23.1            # via python-socketio
+    #   ax253
-bitarray==2.9.2           # via ax253, kiss3
+    #   kiss3
-blinker==1.8.2            # via flask
+    #   rush
-certifi==2024.2.2         # via requests
+ax253==0.1.5.post1
-charset-normalizer==3.3.2  # via requests
+    # via kiss3
-click==8.1.7              # via -r requirements.in, click-params, flask
+beautifulsoup4==4.12.3
-click-params==0.5.0       # via -r requirements.in
+    # via -r requirements.in
-commonmark==0.9.1         # via rich
+bidict==0.23.1
-dataclasses==0.6          # via -r requirements.in
+    # via python-socketio
-dataclasses-json==0.6.6   # via -r requirements.in
+bitarray==2.9.2
-debtcollector==3.0.0      # via oslo-config
+    # via
-deprecated==1.2.14        # via click-params
+    #   ax253
-dnspython==2.6.1          # via eventlet
+    #   kiss3
-eventlet==0.36.1          # via -r requirements.in
+blinker==1.8.2
-flask==3.0.3              # via -r requirements.in, flask-httpauth, flask-socketio
+    # via flask
-flask-httpauth==4.8.0     # via -r requirements.in
+certifi==2024.2.2
-flask-socketio==5.3.6     # via -r requirements.in
+    # via requests
-geographiclib==2.0        # via geopy
+charset-normalizer==3.3.2
-geopy==2.4.1              # via -r requirements.in
+    # via requests
-gevent==24.2.1            # via -r requirements.in
+click==8.1.7
-greenlet==3.0.3           # via eventlet, gevent
+    # via
-h11==0.14.0               # via wsproto
+    #   -r requirements.in
-idna==3.7                 # via requests
+    #   click-params
-imapclient==3.0.1         # via -r requirements.in
+    #   flask
-importlib-metadata==7.1.0  # via ax253, kiss3
+click-params==0.5.0
-itsdangerous==2.2.0       # via flask
+    # via -r requirements.in
-jinja2==3.1.4             # via flask
+commonmark==0.9.1
-kiss3==8.0.0              # via -r requirements.in
+    # via rich
-loguru==0.7.2             # via -r requirements.in
+dataclasses==0.6
-markupsafe==2.1.5         # via jinja2, werkzeug
+    # via -r requirements.in
-marshmallow==3.21.2       # via dataclasses-json
+dataclasses-json==0.6.6
-mypy-extensions==1.0.0    # via typing-inspect
+    # via -r requirements.in
-netaddr==1.2.1            # via oslo-config
+debtcollector==3.0.0
-oslo-config==9.4.0        # via -r requirements.in
+    # via oslo-config
-oslo-i18n==6.3.0          # via oslo-config
+deprecated==1.2.14
-packaging==24.0           # via marshmallow
+    # via click-params
-pbr==6.0.0                # via oslo-i18n, stevedore
+dnspython==2.6.1
-pluggy==1.5.0             # via -r requirements.in
+    # via eventlet
-pygments==2.18.0          # via rich
+eventlet==0.36.1
-pyserial==3.5             # via pyserial-asyncio
+    # via -r requirements.in
-pyserial-asyncio==0.6     # via kiss3
+flask==3.0.3
-python-engineio==4.9.0    # via python-socketio
+    # via
-python-socketio==5.11.2   # via -r requirements.in, flask-socketio
+    #   -r requirements.in
-pytz==2024.1              # via -r requirements.in
+    #   flask-httpauth
-pyyaml==6.0.1             # via -r requirements.in, oslo-config
+    #   flask-socketio
-requests==2.31.0          # via -r requirements.in, oslo-config, update-checker
+flask-httpauth==4.8.0
-rfc3986==2.0.0            # via oslo-config
+    # via -r requirements.in
-rich==12.6.0              # via -r requirements.in
+flask-socketio==5.3.6
-rush==2021.4.0            # via -r requirements.in
+    # via -r requirements.in
-shellingham==1.5.4        # via -r requirements.in
+geographiclib==2.0
-simple-websocket==1.0.0   # via python-engineio
+    # via geopy
-six==1.16.0               # via -r requirements.in
+geopy==2.4.1
-soupsieve==2.5            # via beautifulsoup4
+    # via -r requirements.in
-stevedore==5.2.0          # via oslo-config
+gevent==24.2.1
-tabulate==0.9.0           # via -r requirements.in
+    # via -r requirements.in
-thesmuggler==1.0.1        # via -r requirements.in
+greenlet==3.0.3
-typing-extensions==4.11.0  # via typing-inspect
+    # via
-typing-inspect==0.9.0     # via dataclasses-json
+    #   eventlet
-tzlocal==5.2              # via -r requirements.in
+    #   gevent
-update-checker==0.18.0    # via -r requirements.in
+h11==0.14.0
-urllib3==2.2.1            # via requests
+    # via wsproto
-validators==0.22.0        # via click-params
+idna==3.7
-werkzeug==3.0.3           # via flask
+    # via requests
-wrapt==1.16.0             # via -r requirements.in, debtcollector, deprecated
+imapclient==3.0.1
-wsproto==1.2.0            # via simple-websocket
+    # via -r requirements.in
-zipp==3.18.2              # via importlib-metadata
+importlib-metadata==7.1.0
-zope-event==5.0           # via gevent
+    # via
-zope-interface==6.4       # via gevent
+    #   ax253
    #   kiss3
 itsdangerous==2.2.0
    # via flask
 jinja2==3.1.4
    # via flask
 kiss3==8.0.0
    # via -r requirements.in
 loguru==0.7.2
    # via -r requirements.in
 markupsafe==2.1.5
    # via
    #   jinja2
    #   werkzeug
 marshmallow==3.21.2
    # via dataclasses-json
 mypy-extensions==1.0.0
    # via typing-inspect
 netaddr==1.2.1
    # via oslo-config
 oslo-config==9.4.0
    # via -r requirements.in
 oslo-i18n==6.3.0
    # via oslo-config
 packaging==24.0
    # via marshmallow
 pbr==6.0.0
    # via
    #   oslo-i18n
    #   stevedore
 pluggy==1.5.0
    # via -r requirements.in
 pygments==2.18.0
    # via rich
 pyserial==3.5
    # via pyserial-asyncio
 pyserial-asyncio==0.6
    # via kiss3
 python-engineio==4.9.0
    # via python-socketio
 python-socketio==5.11.2
    # via
    #   -r requirements.in
    #   flask-socketio
 pytz==2024.1
    # via -r requirements.in
 pyyaml==6.0.1
    # via
    #   -r requirements.in
    #   oslo-config
 requests==2.32.0
    # via
    #   -r requirements.in
    #   oslo-config
    #   update-checker
 rfc3986==2.0.0
    # via oslo-config
 rich==12.6.0
    # via -r requirements.in
 rush==2021.4.0
    # via -r requirements.in
 shellingham==1.5.4
    # via -r requirements.in
 simple-websocket==1.0.0
    # via python-engineio
 six==1.16.0
    # via -r requirements.in
 soupsieve==2.5
    # via beautifulsoup4
 stevedore==5.2.0
    # via oslo-config
 tabulate==0.9.0
    # via -r requirements.in
 thesmuggler==1.0.1
    # via -r requirements.in
 typing-extensions==4.11.0
    # via typing-inspect
 typing-inspect==0.9.0
    # via dataclasses-json
 tzlocal==5.2
    # via -r requirements.in
 update-checker==0.18.0
    # via -r requirements.in
 urllib3==2.2.1
    # via requests
 validators==0.22.0
    # via click-params
 werkzeug==3.0.3
    # via flask
 wrapt==1.16.0
    # via
    #   -r requirements.in
    #   debtcollector
    #   deprecated
 wsproto==1.2.0
    # via simple-websocket
 zipp==3.18.2
    # via importlib-metadata
 zope-event==5.0
    # via gevent
 zope-interface==6.4
    # via gevent
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
--- a/tests/plugins/test_notify.py
+++ b/tests/plugins/test_notify.py
@ -62,9 +62,9 @@ class TestAPRSDWatchListPluginBase(TestWatchListPlugin):
        expected = packets.NULL_MESSAGE
        self.assertEqual(expected, actual)
-    @mock.patch("aprsd.client.ClientFactory", autospec=True)
+    @mock.patch("aprsd.client.factory.ClientFactory", autospec=True)
    def test_watchlist_not_in_watchlist(self, mock_factory):
-        client.factory = mock_factory
+        client.client_factory = mock_factory
        self.config_and_init()
        plugin = fake.FakeWatchListPlugin()
@ -92,9 +92,9 @@ class TestNotifySeenPlugin(TestWatchListPlugin):
        expected = packets.NULL_MESSAGE
        self.assertEqual(expected, actual)
-    @mock.patch("aprsd.client.ClientFactory", autospec=True)
+    @mock.patch("aprsd.client.factory.ClientFactory", autospec=True)
    def test_callsign_not_in_watchlist(self, mock_factory):
-        client.factory = mock_factory
+        client.client_factory = mock_factory
        self.config_and_init(watchlist_enabled=False)
        plugin = notify_plugin.NotifySeenPlugin()
@ -106,10 +106,10 @@ class TestNotifySeenPlugin(TestWatchListPlugin):
        expected = packets.NULL_MESSAGE
        self.assertEqual(expected, actual)
-    @mock.patch("aprsd.client.ClientFactory", autospec=True)
+    @mock.patch("aprsd.client.factory.ClientFactory", autospec=True)
    @mock.patch("aprsd.packets.WatchList.is_old")
    def test_callsign_in_watchlist_not_old(self, mock_is_old, mock_factory):
-        client.factory = mock_factory
+        client.client_factory = mock_factory
        mock_is_old.return_value = False
        self.config_and_init(
            watchlist_enabled=True,
@ -126,10 +126,10 @@ class TestNotifySeenPlugin(TestWatchListPlugin):
        expected = packets.NULL_MESSAGE
        self.assertEqual(expected, actual)
-    @mock.patch("aprsd.client.ClientFactory", autospec=True)
+    @mock.patch("aprsd.client.factory.ClientFactory", autospec=True)
    @mock.patch("aprsd.packets.WatchList.is_old")
    def test_callsign_in_watchlist_old_same_alert_callsign(self, mock_is_old, mock_factory):
-        client.factory = mock_factory
+        client.client_factory = mock_factory
        mock_is_old.return_value = True
        self.config_and_init(
            watchlist_enabled=True,
@ -147,10 +147,10 @@ class TestNotifySeenPlugin(TestWatchListPlugin):
        expected = packets.NULL_MESSAGE
        self.assertEqual(expected, actual)
-    @mock.patch("aprsd.client.ClientFactory", autospec=True)
+    @mock.patch("aprsd.client.factory.ClientFactory", autospec=True)
    @mock.patch("aprsd.packets.WatchList.is_old")
    def test_callsign_in_watchlist_old_send_alert(self, mock_is_old, mock_factory):
-        client.factory = mock_factory
+        client.client_factory = mock_factory
        mock_is_old.return_value = True
        notify_callsign = fake.FAKE_TO_CALLSIGN
        fromcall = "WB4BOR"
Author	SHA1	Message	Date
Hemna	b317d0eb63	Refactor client and drivers this patch refactors the client, drivers and client factory to use the same Protocol mechanism used by the stats collector to construct the proper client to be used according to the configuration	2024-05-23 11:38:27 -04:00
Walter A. Boring IV	63962acfe6	Merge pull request #167 from craigerl/docker-rework Refactor Dockerfile	2024-05-23 11:37:50 -04:00
Walter A. Boring IV	44a72e813e	Merge pull request #166 from craigerl/dependabot/pip/requests-2.32.0 Bump requests from 2.31.0 to 2.32.0	2024-05-23 10:59:46 -04:00
Hemna	afeb11a085	Refactor Dockerfile This patch reworks the main Dockerfile to do builds for both the pypi upstream release of aprsd as well as the github repo branch of aprsd for development. This eliminates the need for Dockerfile-dev. This patch also installs aprsd as a user in the container image instead of as root.	2024-05-23 10:58:46 -04:00
dependabot[bot]	18fb2a9e2b	--- updated-dependencies: - dependency-name: requests dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2024-05-21 05:54:04 +00:00