aprsd 4.2.0__py3-none-any.whl → 4.2.3__py3-none-any.whl

aprsd/client/client.py

@@ -10,14 +10,14 @@ 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
+from aprsd.utils import keepalive_collector, trace
 
 CONF = cfg.CONF
 LOG = logging.getLogger('APRSD')
 LOGU = logger
 
 
-class APRSDClient:
+class APRSDClient(metaclass=trace.TraceWrapperMetaclass):
     """APRSD client class.
 
     This is a singleton class that provides a single instance of the APRSD client.
@@ -38,15 +38,18 @@ class APRSDClient:
             keepalive_collector.KeepAliveCollector().register(cls)
         return cls._instance
 
-    def __init__(self):
+    def __init__(self, auto_connect: bool = True):
+        self.auto_connect = auto_connect
         self.connected = False
+        self.running = False
         self.login_status = {
             'success': False,
             'message': None,
         }
         if not self.driver:
             self.driver = DriverRegistry().get_driver()
-            self.driver.setup_connection()
+        if self.auto_connect:
+            self.connect()
 
     def stats(self, serializable=False) -> dict:
         stats = {}
@@ -54,17 +57,20 @@ class APRSDClient:
             stats = self.driver.stats(serializable=serializable)
         return stats
 
-    @property
-    def is_enabled(self):
-        if not self.driver:
-            return False
-        return self.driver.is_enabled()
-
-    @property
-    def is_configured(self):
-        if not self.driver:
-            return False
-        return self.driver.is_configured()
+    @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):
@@ -96,9 +102,20 @@ class APRSDClient:
         return self.driver.filter
 
     def is_alive(self):
-        return self.driver.is_alive()
+        return self.driver.is_alive
+
+    @wrapt.synchronized(lock)
+    def connect(self):
+        if not self.driver:
+            self.driver = DriverRegistry().get_driver()
+        if not self.connected:
+            self.driver.setup_connection()
+            self.connected = self.driver.is_alive
+        self.running = True
 
     def close(self):
+        self.running = False
+        self.connected = False
         if not self.driver:
             return
         self.driver.close()
@@ -106,17 +123,22 @@ class APRSDClient:
     @wrapt.synchronized(lock)
     def reset(self):
         """Call this to force a rebuild/reconnect."""
-        LOG.info('Resetting client connection.')
+        LOG.warning('Resetting client connection.')
         if self.driver:
             self.driver.close()
-            self.driver.setup_connection()
+            if self.auto_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)
+        if self.running:
+            return self.driver.send(packet)
+        else:
+            LOG.error('Client not running, not sending packet.')
+            return False
 
     # For the keepalive collector
     def keepalive_check(self):
@@ -135,7 +157,13 @@ class APRSDClient:
         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)
+        if self.running:
+            return self.driver.consumer(callback=callback, raw=raw)
 
     def decode_packet(self, *args, **kwargs) -> core.Packet:
-        return self.driver.decode_packet(*args, **kwargs)
+        try:
+            packet = self.driver.decode_packet(*args, **kwargs)
+        except Exception as e:
+            LOG.error(f'Error decoding packet: {e}')
+            return None
+        return packet

aprsd/client/drivers/aprsis.py

@@ -10,6 +10,7 @@ from oslo_config import cfg
 from aprsd import client, exception
 from aprsd.client.drivers.lib.aprslib import APRSLibClient
 from aprsd.packets import core
+from aprsd.utils import singleton
 
 CONF = cfg.CONF
 LOG = logging.getLogger('APRSD')
@@ -17,6 +18,7 @@ LOGU = logger
 
 
 # class APRSISDriver(metaclass=trace.TraceWrapperMetaclass):
+@singleton
 class APRSISDriver:
     """This is the APRS-IS driver for the APRSD client.
 
@@ -26,6 +28,7 @@ class APRSISDriver:
 
     _client = None
     _checks = False
+    connected = False
 
     def __init__(self):
         max_timeout = {'hours': 0.0, 'minutes': 2, 'seconds': 0}
@@ -77,16 +80,18 @@ class APRSISDriver:
         if self._client:
             self._client.stop()
             self._client.close()
+        self.connected = False
 
     def send(self, packet: core.Packet) -> bool:
         return self._client.send(packet)
 
     def setup_connection(self):
+        if self.connected:
+            return
         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
         retries = 3
         retry_count = 0
@@ -96,7 +101,7 @@ class APRSISDriver:
                 break
             try:
                 LOG.info(
-                    f'Creating aprslib client({host}:{port}) and logging in {user}.'
+                    f'Creating aprslib client({host}:{port}) and logging in {user}. try #{retry_count}'
                 )
                 self._client = APRSLibClient(
                     user, passwd=password, host=host, port=port
@@ -151,7 +156,7 @@ class APRSISDriver:
     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.')
+            LOG.warning(f'Connection is stale, last heard {delta} ago.')
             return True
         return False
 
@@ -164,7 +169,7 @@ class APRSISDriver:
         return core.factory(args[0])
 
     def consumer(self, callback: Callable, raw: bool = False):
-        if self._client:
+        if self._client and self.connected:
             try:
                 self._client.consumer(
                     callback,
@@ -177,10 +182,9 @@ class APRSISDriver:
                 LOG.info(e.__cause__)
                 raise e
         else:
-            LOG.warning('client is None, might be resetting.')
             self.connected = False
 
-    def stats(self, serializable=False) -> dict:
+    def stats(self, serializable: bool = False) -> dict:
         stats = {}
         if self.is_configured():
             if self._client:

aprsd/client/drivers/fake.py

@@ -64,7 +64,7 @@ class APRSDFakeDriver(metaclass=trace.TraceWrapperMetaclass):
         return None
 
     @wrapt.synchronized(lock)
-    def send(self, packet: core.Packet):
+    def send(self, packet: core.Packet) -> bool:
         """Send an APRS Message object."""
         LOG.info(f'Sending packet: {packet}')
         payload = None
@@ -84,6 +84,7 @@ class APRSDFakeDriver(metaclass=trace.TraceWrapperMetaclass):
             f"FAKE::Send '{payload}' TO '{packet.to_call}' From "
             f'\'{packet.from_call}\' with PATH "{self.path}"',
         )
+        return True
 
     def consumer(self, callback: Callable, raw: bool = False):
         LOG.debug('Start non blocking FAKE consumer')

aprsd/client/drivers/registry.py

@@ -20,6 +20,7 @@ class ClientDriver(Protocol):
     def is_configured(self) -> bool:
         pass
 
+    @property
     def is_alive(self) -> bool:
         pass
 

aprsd/client/drivers/tcpkiss.py

@@ -9,7 +9,6 @@ import datetime
 import logging
 import select
 import socket
-import time
 from typing import Any, Callable, Dict
 
 import aprslib
@@ -25,6 +24,7 @@ from aprsd import (  # noqa
     exception,
 )
 from aprsd.packets import core
+from aprsd.utils import trace
 
 CONF = cfg.CONF
 LOG = logging.getLogger('APRSD')
@@ -46,10 +46,12 @@ def handle_fend(buffer: bytes, strip_df_start: bool = True) -> bytes:
     return bytes(frame)
 
 
-# class TCPKISSDriver(metaclass=trace.TraceWrapperMetaclass):
-class TCPKISSDriver:
+class TCPKISSDriver(metaclass=trace.TraceWrapperMetaclass):
+    # class TCPKISSDriver:
     """APRSD client driver for TCP KISS connections."""
 
+    _instance = None
+
     # Class level attributes required by Client protocol
     packets_received = 0
     packets_sent = 0
@@ -62,6 +64,12 @@ class TCPKISSDriver:
     select_timeout = 1
     path = None
 
+    def __new__(cls, *args, **kwargs):
+        """This magic turns this into a singleton."""
+        if cls._instance is None:
+            cls._instance = super().__new__(cls)
+        return cls._instance
+
     def __init__(self):
         """Initialize the KISS client.
 
@@ -71,7 +79,6 @@ class TCPKISSDriver:
         super().__init__()
         self._connected = False
         self.keepalive = datetime.datetime.now()
-        self._running = False
         # This is initialized in setup_connection()
         self.socket = None
 
@@ -79,8 +86,8 @@ class TCPKISSDriver:
     def transport(self) -> str:
         return client.TRANSPORT_TCPKISS
 
-    @classmethod
-    def is_enabled(cls) -> bool:
+    @staticmethod
+    def is_enabled() -> bool:
         """Check if KISS is enabled in configuration.
 
         Returns:
@@ -111,7 +118,15 @@ class TCPKISSDriver:
 
     def close(self):
         """Close the connection."""
-        self.stop()
+        self._connected = False
+        if self.socket:
+            try:
+                self.socket.close()
+            except Exception as e:
+                LOG.error(f'close: error closing socket: {e}')
+                pass
+        else:
+            LOG.warning('close: socket not initialized. no reason to close.')
 
     def send(self, packet: core.Packet):
         """Send an APRS packet.
@@ -163,6 +178,10 @@ class TCPKISSDriver:
             LOG.error('KISS is not enabled in configuration')
             return
 
+        if self._connected:
+            LOG.warning('KISS interface already connected')
+            return
+
         try:
             # Configure for TCP KISS
             if self.is_enabled():
@@ -217,22 +236,18 @@ class TCPKISSDriver:
         Raises:
             Exception: If not connected to KISS TNC
         """
-        self._running = True
-        while self._running:
-            # Ensure connection
-            if not self._connected:
-                if not self.connect():
-                    time.sleep(1)
-                    continue
+        # Ensure connection
+        if not self._connected:
+            return
 
-            # Read frame
-            frame = self.read_frame()
-            if frame:
-                LOG.warning(f'GOT FRAME: {frame} calling {callback}')
-                kwargs = {
-                    'frame': frame,
-                }
-                callback(**kwargs)
+        # Read frame
+        frame = self.read_frame()
+        if frame:
+            LOG.info(f'GOT FRAME: {frame} calling {callback}')
+            kwargs = {
+                'frame': frame,
+            }
+            callback(**kwargs)
 
     def decode_packet(self, *args, **kwargs) -> core.Packet:
         """Decode a packet from an AX.25 frame.
@@ -245,24 +260,17 @@ class TCPKISSDriver:
             LOG.warning('No frame received to decode?!?!')
             return None
 
-        LOG.warning(f'FRAME: {str(frame)}')
         try:
             aprslib_frame = aprslib.parse(str(frame))
-            return core.factory(aprslib_frame)
+            packet = core.factory(aprslib_frame)
+            if isinstance(packet, core.ThirdPartyPacket):
+                return packet.subpacket
+            else:
+                return packet
         except Exception as e:
             LOG.error(f'Error decoding packet: {e}')
             return None
 
-    def stop(self):
-        """Stop the KISS interface."""
-        self._running = False
-        self._connected = False
-        if self.socket:
-            try:
-                self.socket.close()
-            except Exception:
-                pass
-
     def stats(self, serializable: bool = False) -> Dict[str, Any]:
         """Get client statistics.
 
@@ -271,8 +279,19 @@ class TCPKISSDriver:
         """
         if serializable:
             keepalive = self.keepalive.isoformat()
+            if self.last_packet_sent:
+                last_packet_sent = self.last_packet_sent.isoformat()
+            else:
+                last_packet_sent = 'None'
+            if self.last_packet_received:
+                last_packet_received = self.last_packet_received.isoformat()
+            else:
+                last_packet_received = 'None'
         else:
             keepalive = self.keepalive
+            last_packet_sent = self.last_packet_sent
+            last_packet_received = self.last_packet_received
+
         stats = {
             'client': self.__class__.__name__,
             'transport': self.transport,
@@ -280,8 +299,8 @@ class TCPKISSDriver:
             'path': self.path,
             'packets_sent': self.packets_sent,
             'packets_received': self.packets_received,
-            'last_packet_sent': self.last_packet_sent,
-            'last_packet_received': self.last_packet_received,
+            'last_packet_sent': last_packet_sent,
+            'last_packet_received': last_packet_received,
             'connection_keepalive': keepalive,
             'host': CONF.kiss_tcp.host,
             'port': CONF.kiss_tcp.port,
@@ -338,13 +357,19 @@ class TCPKISSDriver:
         """
         Generator for complete lines, received from the server
         """
+        if not self.socket:
+            return None
+
+        if not self._connected:
+            return None
+
         try:
             self.socket.setblocking(0)
         except OSError as e:
             LOG.error(f'socket error when setblocking(0): {str(e)}')
             raise aprslib.ConnectionDrop('connection dropped') from e
 
-        while self._running:
+        while self._connected:
             short_buf = b''
 
             try:
@@ -360,14 +385,14 @@ class TCPKISSDriver:
                     else:
                         continue
             except Exception as e:
+                # No need to log if we are not running.
+                # this happens when the client is stopped/closed.
                 LOG.error(f'Error in read loop: {e}')
                 self._connected = False
                 break
 
             try:
-                print('reading from socket')
                 short_buf = self.socket.recv(1024)
-                print(f'short_buf: {short_buf}')
                 # sock.recv returns empty if the connection drops
                 if not short_buf:
                     if not blocking:

aprsd/cmds/dev.py

@@ -4,11 +4,13 @@
 #
 # python included libs
 import logging
+import sys
 
 import click
 from oslo_config import cfg
 
-from aprsd import cli_helper, conf, packets, plugin
+import aprsd
+from aprsd import cli_helper, conf, packets, plugin, utils
 
 # local imports here
 from aprsd.main import cli
@@ -71,6 +73,9 @@ def test_plugin(
 ):
     """Test an individual APRSD plugin given a python path."""
 
+    LOG.info(f'Python version: {sys.version}')
+    LOG.info(f'APRSD DEV Started version: {aprsd.__version__}')
+    utils.package.log_installed_extensions_and_plugins()
     CONF.log_opt_values(LOG, logging.DEBUG)
 
     if not aprs_login:

aprsd/cmds/fetch_stats.py

@@ -1,5 +1,6 @@
 # Fetch active stats from a remote running instance of aprsd admin web interface.
 import logging
+import sys
 
 import click
 import requests
@@ -38,6 +39,7 @@ CONF = cfg.CONF
 def fetch_stats(ctx, host, port):
     """Fetch stats from a APRSD admin web interface."""
     console = Console()
+    console.print(f'Python version: {sys.version}')
     console.print(f'APRSD Fetch-Stats started version: {aprsd.__version__}')
 
     CONF.log_opt_values(LOG, logging.DEBUG)

aprsd/cmds/list_plugins.py

@@ -1,119 +1,18 @@
-import fnmatch
-import importlib
 import inspect
 import logging
-import os
-import pkgutil
-import sys
-from traceback import print_tb
 
 import click
-import requests
 from rich.console import Console
 from rich.table import Table
 from rich.text import Text
-from thesmuggler import smuggle
 
 from aprsd import cli_helper
 from aprsd import plugin as aprsd_plugin
 from aprsd.main import cli
 from aprsd.plugins import fortune, notify, ping, time, version, weather
+from aprsd.utils import package as aprsd_package
 
 LOG = logging.getLogger('APRSD')
-PYPI_URL = 'https://pypi.org/search/'
-
-
-def onerror(name):
-    print(f'Error importing module {name}')
-    type, value, traceback = sys.exc_info()
-    print_tb(traceback)
-
-
-def is_plugin(obj):
-    for c in inspect.getmro(obj):
-        if issubclass(c, aprsd_plugin.APRSDPluginBase):
-            return True
-
-    return False
-
-
-def plugin_type(obj):
-    for c in inspect.getmro(obj):
-        if issubclass(c, aprsd_plugin.APRSDRegexCommandPluginBase):
-            return 'RegexCommand'
-        if issubclass(c, aprsd_plugin.APRSDWatchListPluginBase):
-            return 'WatchList'
-        if issubclass(c, aprsd_plugin.APRSDPluginBase):
-            return 'APRSDPluginBase'
-
-    return 'Unknown'
-
-
-def walk_package(package):
-    return pkgutil.walk_packages(
-        package.__path__,
-        package.__name__ + '.',
-        onerror=onerror,
-    )
-
-
-def get_module_info(package_name, module_name, module_path):
-    if not os.path.exists(module_path):
-        return None
-
-    dir_path = os.path.realpath(module_path)
-    pattern = '*.py'
-
-    obj_list = []
-
-    for path, _subdirs, files in os.walk(dir_path):
-        for name in files:
-            if fnmatch.fnmatch(name, pattern):
-                module = smuggle(f'{path}/{name}')
-                for mem_name, obj in inspect.getmembers(module):
-                    if inspect.isclass(obj) and is_plugin(obj):
-                        obj_list.append(
-                            {
-                                'package': package_name,
-                                'name': mem_name,
-                                'obj': obj,
-                                'version': obj.version,
-                                'path': f'{".".join([module_name, obj.__name__])}',
-                            },
-                        )
-
-    return obj_list
-
-
-def _get_installed_aprsd_items():
-    # installed plugins
-    plugins = {}
-    extensions = {}
-    for _finder, name, ispkg in pkgutil.iter_modules():
-        if ispkg and name.startswith('aprsd_'):
-            module = importlib.import_module(name)
-            pkgs = walk_package(module)
-            for pkg in pkgs:
-                pkg_info = get_module_info(
-                    module.__name__, pkg.name, module.__path__[0]
-                )
-                if 'plugin' in name:
-                    plugins[name] = pkg_info
-                elif 'extension' in name:
-                    extensions[name] = pkg_info
-    return plugins, extensions
-
-
-def get_installed_plugins():
-    # installed plugins
-    plugins, extensions = _get_installed_aprsd_items()
-    return plugins
-
-
-def get_installed_extensions():
-    # installed plugins
-    plugins, extensions = _get_installed_aprsd_items()
-    return extensions
 
 
 def show_built_in_plugins(console):
@@ -157,34 +56,8 @@ def show_built_in_plugins(console):
     console.print(table)
 
 
-def _get_pypi_packages():
-    if simple_r := requests.get(
-        'https://pypi.org/simple',
-        headers={'Accept': 'application/vnd.pypi.simple.v1+json'},
-    ):
-        simple_response = simple_r.json()
-    else:
-        simple_response = {}
-
-    key = 'aprsd'
-    matches = [
-        p['name'] for p in simple_response['projects'] if p['name'].startswith(key)
-    ]
-
-    packages = []
-    for pkg in matches:
-        # Get info for first match
-        if r := requests.get(
-            f'https://pypi.org/pypi/{pkg}/json',
-            headers={'Accept': 'application/json'},
-        ):
-            packages.append(r.json())
-
-    return packages
-
-
 def show_pypi_plugins(installed_plugins, console):
-    packages = _get_pypi_packages()
+    packages = aprsd_package.get_pypi_packages()
 
     title = Text.assemble(
         ('Pypi.org APRSD Installable Plugin Packages\n\n', 'bold magenta'),
@@ -225,7 +98,7 @@ def show_pypi_plugins(installed_plugins, console):
 
 
 def show_pypi_extensions(installed_extensions, console):
-    packages = _get_pypi_packages()
+    packages = aprsd_package.get_pypi_packages()
 
     title = Text.assemble(
         ('Pypi.org APRSD Installable Extension Packages\n\n', 'bold magenta'),
@@ -282,7 +155,7 @@ def show_installed_plugins(installed_plugins, console):
                 name.replace('_', '-'),
                 plugin['name'],
                 plugin['version'],
-                plugin_type(plugin['obj']),
+                aprsd_package.plugin_type(plugin['obj']),
                 plugin['path'],
             )
 
@@ -302,7 +175,7 @@ def list_plugins(ctx):
         show_built_in_plugins(console)
 
         status.update('Fetching pypi.org plugins')
-        installed_plugins = get_installed_plugins()
+        installed_plugins = aprsd_package.get_installed_plugins()
         show_pypi_plugins(installed_plugins, console)
 
         status.update('Looking for installed APRSD plugins')
@@ -321,5 +194,5 @@ def list_extensions(ctx):
         status.update('Fetching pypi.org APRSD Extensions')
 
         status.update('Looking for installed APRSD Extensions')
-        installed_extensions = get_installed_extensions()
+        installed_extensions = aprsd_package.get_installed_extensions()
         show_pypi_extensions(installed_extensions, console)

aprsd/cmds/listen.py

@@ -221,7 +221,9 @@ def listen(
     # CONF.aprs_network.login = aprs_login
     # config["aprs"]["password"] = aprs_password
 
+    LOG.info(f'Python version: {sys.version}')
     LOG.info(f'APRSD Listen Started version: {aprsd.__version__}')
+    utils.package.log_installed_extensions_and_plugins()
 
     CONF.log_opt_values(LOG, logging.DEBUG)
     collector.Collector()

aprsd/cmds/send_message.py

@@ -13,6 +13,7 @@ from aprsd import (
     cli_helper,
     conf,  # noqa : F401
     packets,
+    utils,
 )
 from aprsd.client.client import APRSDClient
 from aprsd.main import cli
@@ -89,7 +90,9 @@ def send_message(
         else:
             aprs_password = CONF.aprs_network.password
 
-    LOG.info(f'APRSD LISTEN Started version: {aprsd.__version__}')
+    LOG.info(f'Python version: {sys.version}')
+    LOG.info(f'APRSD SEND_MESSAGE Started version: {aprsd.__version__}')
+    utils.package.log_installed_extensions_and_plugins()
     if type(command) is tuple:
         command = ' '.join(command)
     if not quiet:

aprsd/cmds/server.py

@@ -40,12 +40,14 @@ def server(ctx, flush):
 
     service_threads = service.ServiceThreads()
 
+    LOG.info(f'Python version: {sys.version}')
+    LOG.info(f'APRSD Started version: {aprsd.__version__}')
     level, msg = utils._check_version()
     if level:
         LOG.warning(msg)
     else:
         LOG.info(msg)
-    LOG.info(f'APRSD Started version: {aprsd.__version__}')
+    utils.package.log_installed_extensions_and_plugins()
 
     # Make sure we have 1 client transport enabled
     if not APRSDClient().is_enabled:

aprsd/conf/common.py

@@ -19,7 +19,7 @@ registry_group = cfg.OptGroup(
 aprsd_opts = [
     cfg.StrOpt(
         'callsign',
-        required=True,
+        default='NOCALL',
         help='Callsign to use for messages sent by APRSD',
     ),
     cfg.BoolOpt(
@@ -137,6 +137,12 @@ aprsd_opts = [
         help='Set this to False, to disable sending of ack packets. This will entirely stop'
         'APRSD from sending ack packets.',
     ),
+    cfg.BoolOpt(
+        'is_digipi',
+        default=False,
+        help='Set this to True, if APRSD is running on a Digipi.'
+        'This is useful for changing the behavior of APRSD to work with Digipi.',
+    ),
 ]
 
 watch_list_opts = [

aprsd/exception.py

@@ -13,3 +13,10 @@ class ConfigOptionBogusDefaultException(Exception):
             f"Config file option '{config_option}' needs to be "
             f"changed from provided default of '{default_fail}'"
         )
+
+
+class APRSClientNotConfiguredException(Exception):
+    """APRS client is not configured."""
+
+    def __init__(self):
+        self.message = 'APRS client is not configured.'

aprsd/main.py

@@ -72,6 +72,7 @@ def main():
 
 def signal_handler(sig, frame):
     click.echo('signal_handler: called')
+    collector.Collector().stop_all()
     threads.APRSDThreadList().stop_all()
     if 'subprocess' not in str(frame):
         LOG.info(

aprsd/stats/collector.py

@@ -44,3 +44,9 @@ class Collector:
         if not isinstance(producer_name, StatsProducer):
             raise TypeError(f'Producer {producer_name} is not a StatsProducer')
         self.producers.remove(producer_name)
+
+    def stop_all(self):
+        """Stop and unregister all registered stats producers."""
+        for producer in self.producers[:]:
+            LOG.info(f'Stopping Stats producer {producer}')
+            self.unregister_producer(producer)

aprsd/threads/rx.py

@@ -275,7 +275,7 @@ class APRSDProcessPacketThread(APRSDFilterThread):
     def process_other_packet(self, packet, for_us=False):
         """Process an APRS Packet that isn't a message or ack"""
         if not for_us:
-            LOG.info("Got a packet meant for someone else '{packet.to_call}'")
+            LOG.info(f"Got a packet meant for someone else '{packet.to_call}'")
         else:
             LOG.info('Got a non AckPacket/MessagePacket')
 

aprsd/utils/package.py

@@ -0,0 +1,176 @@
+import fnmatch
+import importlib
+import inspect
+import logging
+import os
+import pkgutil
+import sys
+from traceback import print_tb
+
+import requests
+from thesmuggler import smuggle
+
+from aprsd import plugin as aprsd_plugin
+
+LOG = logging.getLogger()
+
+
+def onerror(name):
+    type, value, traceback = sys.exc_info()
+    print_tb(traceback)
+
+
+def plugin_type(obj):
+    for c in inspect.getmro(obj):
+        if issubclass(c, aprsd_plugin.APRSDRegexCommandPluginBase):
+            return 'RegexCommand'
+        if issubclass(c, aprsd_plugin.APRSDWatchListPluginBase):
+            return 'WatchList'
+        if issubclass(c, aprsd_plugin.APRSDPluginBase):
+            return 'APRSDPluginBase'
+
+    return 'Unknown'
+
+
+def is_plugin(obj):
+    for c in inspect.getmro(obj):
+        if issubclass(c, aprsd_plugin.APRSDPluginBase):
+            return True
+
+    return False
+
+
+def walk_package(package):
+    return pkgutil.walk_packages(
+        package.__path__,
+        package.__name__ + '.',
+        onerror=onerror,
+    )
+
+
+def get_module_info(package_name, module_name, module_path):
+    if not os.path.exists(module_path):
+        return None
+
+    dir_path = os.path.realpath(module_path)
+    pattern = '*.py'
+
+    obj_list = []
+
+    for path, _subdirs, files in os.walk(dir_path):
+        for name in files:
+            if fnmatch.fnmatch(name, pattern):
+                module = smuggle(f'{path}/{name}')
+                for mem_name, obj in inspect.getmembers(module):
+                    if inspect.isclass(obj) and is_plugin(obj):
+                        obj_list.append(
+                            {
+                                'package': package_name,
+                                'name': mem_name,
+                                'obj': obj,
+                                'version': obj.version,
+                                'path': f'{".".join([module_name, obj.__name__])}',
+                            },
+                        )
+
+    return obj_list
+
+
+def is_aprsd_package(name):
+    if name.startswith('aprsd_'):
+        return True
+
+
+def is_aprsd_extension(name):
+    if name.startswith('aprsd_') and 'extension' in name:
+        # This is an installed package that is an extension of
+        # APRSD
+        return True
+    else:
+        # We might have an editable install of an extension
+        # of APRSD.
+        return '__editable__' in name and 'aprsd_' in name and 'extension' in name
+
+
+def get_installed_aprsd_items():
+    # installed plugins
+    plugins = {}
+    extensions = {}
+    for _finder, name, ispkg in pkgutil.iter_modules():
+        if ispkg and is_aprsd_package(name):
+            module = importlib.import_module(name)
+            pkgs = walk_package(module)
+            for pkg in pkgs:
+                pkg_info = get_module_info(
+                    module.__name__, pkg.name, module.__path__[0]
+                )
+                if 'plugin' in name:
+                    plugins[name] = pkg_info
+                elif 'extension' in name:
+                    mod = importlib.import_module(name)
+                    extensions[name] = mod
+        elif is_aprsd_extension(name):
+            # This isn't a package, so it could be an editable install
+            module = importlib.import_module(name)
+            key_name = next(iter(module.MAPPING.keys()))
+            module = importlib.import_module(key_name)
+            pkg_info = get_module_info(module.__name__, key_name, module.__path__[0])
+            extensions[key_name] = module
+    return plugins, extensions
+
+
+def get_installed_plugins():
+    # installed plugins
+    plugins, _ = get_installed_aprsd_items()
+    return plugins
+
+
+def get_installed_extensions():
+    # installed plugins
+    _, extensions = get_installed_aprsd_items()
+    return extensions
+
+
+def get_pypi_packages():
+    if simple_r := requests.get(
+        'https://pypi.org/simple',
+        headers={'Accept': 'application/vnd.pypi.simple.v1+json'},
+    ):
+        simple_response = simple_r.json()
+    else:
+        simple_response = {}
+
+    key = 'aprsd'
+    matches = [
+        p['name'] for p in simple_response['projects'] if p['name'].startswith(key)
+    ]
+
+    packages = []
+    for pkg in matches:
+        # Get info for first match
+        if r := requests.get(
+            f'https://pypi.org/pypi/{pkg}/json',
+            headers={'Accept': 'application/json'},
+        ):
+            packages.append(r.json())
+
+    return packages
+
+
+def log_installed_extensions_and_plugins():
+    plugins, extensions = get_installed_aprsd_items()
+
+    for name in extensions:
+        ext = extensions[name]
+        # print(f"Extension: {ext}")
+        # print(f"Extension: {ext.__dict__}")
+        if hasattr(ext, '__version__'):
+            version = ext.__version__
+        elif hasattr(ext, 'version'):
+            version = ext.version
+        else:
+            version = ext['version']
+        LOG.info(f'Extension: {name} version: {version}')
+
+    for plugin in plugins:
+        LOG.info(f'Plugin: {plugin} version: {plugins[plugin][0]["version"]}')

aprsd/utils/trace.py

@@ -5,11 +5,11 @@ import logging
 import time
 import types
 
-VALID_TRACE_FLAGS = {"method", "api"}
+VALID_TRACE_FLAGS = {'method', 'api'}
 TRACE_API = False
 TRACE_METHOD = False
 TRACE_ENABLED = False
-LOG = logging.getLogger("APRSD")
+LOG = logging.getLogger('APRSD')
 
 
 def trace(*dec_args, **dec_kwargs):
@@ -27,11 +27,12 @@ def trace(*dec_args, **dec_kwargs):
 
     def _decorator(f):
         func_name = f.__qualname__
-        func_file = "/".join(f.__code__.co_filename.split("/")[-4:])
+        func_file = '/'.join(f.__code__.co_filename.split('/')[-4:])
+        func_line_number = f.__code__.co_firstlineno
 
         @functools.wraps(f)
         def trace_logging_wrapper(*args, **kwargs):
-            filter_function = dec_kwargs.get("filter_function")
+            filter_function = dec_kwargs.get('filter_function')
             logger = LOG
 
             # NOTE(ameade): Don't bother going any further if DEBUG log level
@@ -40,16 +41,16 @@ def trace(*dec_args, **dec_kwargs):
                 return f(*args, **kwargs)
 
             all_args = inspect.getcallargs(f, *args, **kwargs)
-
             pass_filter = filter_function is None or filter_function(all_args)
 
             if pass_filter:
                 logger.debug(
-                    "==> %(func)s: call %(all_args)r file: %(file)s",
+                    '==> %(func)s: call %(all_args)r file: %(file)s:%(line_number)d',
                     {
-                        "func": func_name,
-                        "all_args": str(all_args),
-                        "file": func_file,
+                        'func': func_name,
+                        'all_args': str(all_args),
+                        'file': func_file,
+                        'line_number': func_line_number,
                     },
                 )
 
@@ -59,11 +60,11 @@ def trace(*dec_args, **dec_kwargs):
             except Exception as exc:
                 total_time = int(round(time.time() * 1000)) - start_time
                 logger.debug(
-                    "<== %(func)s: exception (%(time)dms) %(exc)r",
+                    '<== %(func)s: exception (%(time)dms) %(exc)r',
                     {
-                        "func": func_name,
-                        "time": total_time,
-                        "exc": exc,
+                        'func': func_name,
+                        'time': total_time,
+                        'exc': exc,
                     },
                 )
                 raise
@@ -78,11 +79,11 @@ def trace(*dec_args, **dec_kwargs):
 
             if pass_filter:
                 logger.debug(
-                    "<== %(func)s: return (%(time)dms) %(result)r",
+                    '<== %(func)s: return (%(time)dms) %(result)r',
                     {
-                        "func": func_name,
-                        "time": total_time,
-                        "result": mask_result,
+                        'func': func_name,
+                        'time': total_time,
+                        'result': mask_result,
                     },
                 )
             return result
@@ -174,7 +175,7 @@ def setup_tracing(trace_flags):
     except TypeError:  # Handle when trace_flags is None or a test mock
         trace_flags = []
     for invalid_flag in set(trace_flags) - VALID_TRACE_FLAGS:
-        LOG.warning("Invalid trace flag: %s", invalid_flag)
-    TRACE_METHOD = "method" in trace_flags
-    TRACE_API = "api" in trace_flags
+        LOG.warning('Invalid trace flag: %s', invalid_flag)
+    TRACE_METHOD = 'method' in trace_flags
+    TRACE_API = 'api' in trace_flags
     TRACE_ENABLED = True

{aprsd-4.2.0.dist-info → aprsd-4.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aprsd
-Version: 4.2.0
+Version: 4.2.3
 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>

{aprsd-4.2.0.dist-info → aprsd-4.2.3.dist-info}/RECORD

@@ -1,31 +1,31 @@
 aprsd/__init__.py,sha256=ci_49KK2a4GXyxcM2lFZfNAOsBfXzh0yayIGQazw56I,687
 aprsd/cli_helper.py,sha256=mKHww_cStwFBThjntFylrSnF6n9jOPHlR8r9SsrCxdY,4605
-aprsd/exception.py,sha256=Oi6w0ISPemX0UpLB40BYnZBT1YOU-Pnpj8yf-A0E4-E,504
-aprsd/main.py,sha256=sOzG4tKtm7FGxwvYWIwiPujzo5TV3F0cSkR7IWHlb8M,4719
+aprsd/exception.py,sha256=bzln7sP9USQ67tz5nQh6e4KMaS8X2uhPJMNVmCkKV30,679
+aprsd/main.py,sha256=JDI8VUGvi8KSG4hH125OlvdXC4xtwyakU0cB2YHpTXA,4756
 aprsd/plugin.py,sha256=pdyvKhSugFo4vRy7VflnaZ-BKozGa3GTTAHErskW3WU,17848
 aprsd/plugin_utils.py,sha256=beXQ1n_YI38rqDwswtE8NjFwFzjpaeve9W_JotX1n1A,2544
 aprsd/client/__init__.py,sha256=lh7mKBoSo2Tt82QoqlAARGm4LY6ffsn7d8x6M4B7n9g,154
-aprsd/client/client.py,sha256=i4KBGT_-6btH9e3X2moyGYz7OGHLHgbS8qqYMmlsH_o,3912
+aprsd/client/client.py,sha256=sTZaxduDyGYtBpxpOvYAGG6D6gz6CPsivou9eKnW0tw,4898
 aprsd/client/stats.py,sha256=dUqRZao04B2TTj9TGMSygdLHa3if3pEy86eK-fK4sj4,353
 aprsd/client/drivers/__init__.py,sha256=IWSSrAEMrJQzulCIAx-N7Du0HK9sQOXIh98aJRCtfdg,421
-aprsd/client/drivers/aprsis.py,sha256=upUqCYDVVvOfbX43h5ncXq7CdlMrJsnO2ghbA88RKAk,6665
-aprsd/client/drivers/fake.py,sha256=b3q9-4O9Gtd7XnEzgZ2NzR5Zv6szxKBe07nsXJXmSHw,3249
-aprsd/client/drivers/registry.py,sha256=AWDWqxjOYHDz8ow4fNSSJ7JR6Tgy1axG6r0I9Yk2nJ8,2213
-aprsd/client/drivers/tcpkiss.py,sha256=PIiBaj0j4KDcXKRi3gUYDp10tC6qLmUlGfTbkQKPN1M,12926
+aprsd/client/drivers/aprsis.py,sha256=DLtNgj1YAOiaHiALfHD6W-QF6JkzgQdmL7BmPXOa7KA,6763
+aprsd/client/drivers/fake.py,sha256=iCe7zRJxL3giADSX6PMNMcasr9g4GpPNFSGhrKlgCeg,3277
+aprsd/client/drivers/registry.py,sha256=vTKYTGAnVdBAyvCL51BadGFMNBsibzr9-xLPfXm_a9U,2227
+aprsd/client/drivers/tcpkiss.py,sha256=begkOCkrd1g5JpuPGgY-EMiy3NcMxZaHaaWZqoCIQ5w,13817
 aprsd/client/drivers/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aprsd/client/drivers/lib/aprslib.py,sha256=9KTEKlivGT1f1js-u-w1WNLhOs1kQxkr3COa1CI95oE,9439
 aprsd/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aprsd/cmds/completion.py,sha256=BMM8dSYUihYmj2fSsefo6LzgJZKbxHnNfRIhwVZW_U8,816
-aprsd/cmds/dev.py,sha256=iXjO0WBrEPE8wnuQU-7BpKOHsPLqyNZZ-67FvWiWOko,4097
-aprsd/cmds/fetch_stats.py,sha256=rE99ir67udprRLxOhWkZ1btgF5Vs8UX74S4ssjYi4lM,9621
+aprsd/cmds/dev.py,sha256=9znqGv8qUd1hRV_-Iit8ktxFhYFIIB4rOnluhurrv28,4296
+aprsd/cmds/fetch_stats.py,sha256=L8l-43GfZiWu9c9BgxpUV1PdrB8IG8z1FlsryAvPeAI,9684
 aprsd/cmds/healthcheck.py,sha256=swXb4LE1qdr3Z-417fv4LhWvscE4WUrqF9So1sWXiCU,2635
-aprsd/cmds/list_plugins.py,sha256=ongeK7gy_IxzLw_EfhclKMVHptyzIubV4PYxCxDMIqs,10415
-aprsd/cmds/listen.py,sha256=t_EOfy-qNRox6YwaeXHtynk_F5mShyDSjv2GZA9ca3I,9415
-aprsd/cmds/send_message.py,sha256=iJEteEWTPj3gQhSyBj8BvQr4WQzjrVbHWxaHgvIcpQM,4709
-aprsd/cmds/server.py,sha256=uZQawLzL5IKUPUHRleligJqlIokRwujcovhcivixY1g,4034
+aprsd/cmds/list_plugins.py,sha256=PzvoyXfV26xAiTHtgSiJyWAmdPd2BEua5ta5fGuspVQ,7010
+aprsd/cmds/listen.py,sha256=3M8eXIneEuM5wfskAFFYUZSfHTQveTAFSmnRZAfe9WY,9519
+aprsd/cmds/send_message.py,sha256=EVJ-VayxcSNYAJ8dM8-LM9HLbsanC2mOWA6bfZwcLn4,4830
+aprsd/cmds/server.py,sha256=hB3Tu0MbzEvg4XkoCFomvfMZqIitDKdIejQ6uwHDm0o,4138
 aprsd/conf/__init__.py,sha256=2ikrZahcS2EULQEJ5xErnzMVR2vcsDdMvixEPuNE-xE,1678
 aprsd/conf/client.py,sha256=9oheIUnotnbHmpKtxlw-00quW0o-3pZYtFmaim9bsjs,3013
-aprsd/conf/common.py,sha256=6bYna2bn0js6cq3c0h3KzbzgOWcpqeui5JEijx5rDj8,7386
+aprsd/conf/common.py,sha256=l5tUw6G5CNOiFMZQPoStkpsNa3d9xr4BunzZK0FNgV8,7605
 aprsd/conf/log.py,sha256=qBoF8ptGHK7G6NPHNZCE2PBH7S-L587wFkT-9ikUtfE,1656
 aprsd/conf/opts.py,sha256=kbZELePpBDoQrKbowbWHgmLksbREARU8T8UhX9FIhq8,2725
 aprsd/conf/plugin_common.py,sha256=H7LxiJL0Sl1D_dpAmJHEHSbPxaOK938M1WCOcTpOYN8,1990
@@ -52,12 +52,12 @@ aprsd/plugins/version.py,sha256=NAPFKQ0lQqgjoDyTVy8tZcRGmdcJE_ZogRElDz27V2U,839
 aprsd/plugins/weather.py,sha256=XOspEoAumUb35TW2RYqjRV0lp6hrR_kOMIT41iEUGQQ,13399
 aprsd/stats/__init__.py,sha256=ltAtUiEvpokBEtOpq0sxpDGOLQT2evgeZSVBzDzjkSo,808
 aprsd/stats/app.py,sha256=axqMA137zKqU03yO8XI5f1QE8ajmr9YK0J9O9m4iSzo,1378
-aprsd/stats/collector.py,sha256=7nx_KSP_PUeuX5q8xJhsB9G_JfgQFCAvrPNzO7uK4FM,1502
+aprsd/stats/collector.py,sha256=hIwJyw7P457NduqEzP0FPHEzf_HOuXepsBRmxiSCKKs,1743
 aprsd/threads/__init__.py,sha256=KPqAOhS4q995NCEWDnPCHiuu3guyuMZlyDUGx_h50z8,259
 aprsd/threads/aprsd.py,sha256=13AS7jAhcQBmTervBiADaC1Ins9C-6TrMDYjW1fQJkg,4794
 aprsd/threads/keepalive.py,sha256=E48_erNnqik5AAllMGx5gexAwPIaznCp0HCG45NltFw,3939
 aprsd/threads/registry.py,sha256=zWG4-SMBSx46NY93__Bt_F8vFrljxQvMHbi80WP5kY8,1690
-aprsd/threads/rx.py,sha256=u7SZ-YqINrnetusV7qFRWKVVoDMfj8-Z1bnSby3w3bI,14936
+aprsd/threads/rx.py,sha256=u0W3YgU83OaZcKyw60C3B-Chb6LXYXpDv9RsXKSKHcg,14937
 aprsd/threads/service.py,sha256=fGjyr34i2-CJdBynxachNaBrBsULwmAnewLHdTujfmk,1375
 aprsd/threads/stats.py,sha256=drKqHV2WxgXhyWXGrmRHQx7oKlrJ9bwEMtCInCzulPY,884
 aprsd/threads/tx.py,sha256=spuWk4E5HvTWYNyhKB1kxqVbVvxNapzYvi9tNScTAHs,9264
@@ -67,12 +67,13 @@ aprsd/utils/fuzzyclock.py,sha256=qKV8SYZhQGOHG9biF8TeueLb6RMppspx1Zg4IOy1Z10,326
 aprsd/utils/json.py,sha256=eHoBfXGcchO4Q1MXj6uKK9YU-H8HKPJ2cThLZ1dM_vo,2578
 aprsd/utils/keepalive_collector.py,sha256=r0oKCpKPGsivOKTQkTfwcJRESqMfbNawCyqrcHoJo8M,1807
 aprsd/utils/objectstore.py,sha256=0OivUeagncWGH7eWjTwZhauf-etweTabp8Oykt0hoF4,3541
+aprsd/utils/package.py,sha256=BtyIT6F5tPTFIATy5zDtYnB2k-rSFey5K2t9RPGenck,5025
 aprsd/utils/ring_buffer.py,sha256=lWWuw7lEbc2URhqAJfRLjpXBDLiK6UUWzk3j2VFnERQ,1111
-aprsd/utils/trace.py,sha256=lIuDZHOjvWbL2IMJ2tN_XW4Ch8oe4uQ7uLGylUByli0,5687
-aprsd-4.2.0.dist-info/licenses/AUTHORS,sha256=fGZhgXFMCfDPbp0hHllwmPyfiKPobLNA3sJA3BMIJVE,22
-aprsd-4.2.0.dist-info/licenses/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
-aprsd-4.2.0.dist-info/METADATA,sha256=eky_cPS4yV2IcaRxoiHCOc95g4UzL8pmMbnfzI5cxpU,45583
-aprsd-4.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aprsd-4.2.0.dist-info/entry_points.txt,sha256=4fReoJUB-bFqOUK6eeXYYCvTdVLprL7KVH0hWQRP9eM,171
-aprsd-4.2.0.dist-info/top_level.txt,sha256=v1O96niUcJOTMh9aQnFRknbScJ6mMOwqurdbxeaeSjs,6
-aprsd-4.2.0.dist-info/RECORD,,
+aprsd/utils/trace.py,sha256=3W4V14qg63x39l77H7iaCEacXd_otvz3oJKwbKqH_jM,5812
+aprsd-4.2.3.dist-info/licenses/AUTHORS,sha256=fGZhgXFMCfDPbp0hHllwmPyfiKPobLNA3sJA3BMIJVE,22
+aprsd-4.2.3.dist-info/licenses/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
+aprsd-4.2.3.dist-info/METADATA,sha256=PJmJ8nucsHVSdnJRPggmAhLIiKHqJWC0hLyEYiN6NHU,45583
+aprsd-4.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aprsd-4.2.3.dist-info/entry_points.txt,sha256=4fReoJUB-bFqOUK6eeXYYCvTdVLprL7KVH0hWQRP9eM,171
+aprsd-4.2.3.dist-info/top_level.txt,sha256=v1O96niUcJOTMh9aQnFRknbScJ6mMOwqurdbxeaeSjs,6
+aprsd-4.2.3.dist-info/RECORD,,