aprsd 3.4.4__py3-none-any.whl → 4.0.1__py3-none-any.whl

aprsd/cmds/list_plugins.py

@@ -4,12 +4,9 @@ import inspect
 import logging
 import os
 import pkgutil
-import re
 import sys
 from traceback import print_tb
-from urllib.parse import urljoin
 
-from bs4 import BeautifulSoup
 import click
 import requests
 from rich.console import Console
@@ -20,17 +17,14 @@ 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 (
-    email, fortune, location, notify, ping, time, version, weather,
-)
+from aprsd.plugins import fortune, notify, ping, time, version, weather
 
-
-LOG = logging.getLogger("APRSD")
-PYPI_URL = "https://pypi.org/search/"
+LOG = logging.getLogger('APRSD')
+PYPI_URL = 'https://pypi.org/search/'
 
 
 def onerror(name):
-    print(f"Error importing module {name}")
+    print(f'Error importing module {name}')
     type, value, traceback = sys.exc_info()
     print_tb(traceback)
 
@@ -46,19 +40,19 @@ def is_plugin(obj):
 def plugin_type(obj):
     for c in inspect.getmro(obj):
         if issubclass(c, aprsd_plugin.APRSDRegexCommandPluginBase):
-            return "RegexCommand"
+            return 'RegexCommand'
         if issubclass(c, aprsd_plugin.APRSDWatchListPluginBase):
-            return "WatchList"
+            return 'WatchList'
         if issubclass(c, aprsd_plugin.APRSDPluginBase):
-            return "APRSDPluginBase"
+            return 'APRSDPluginBase'
 
-    return "Unknown"
+    return 'Unknown'
 
 
 def walk_package(package):
     return pkgutil.walk_packages(
         package.__path__,
-        package.__name__ + ".",
+        package.__name__ + '.',
         onerror=onerror,
     )
 
@@ -68,22 +62,23 @@ def get_module_info(package_name, module_name, module_path):
         return None
 
     dir_path = os.path.realpath(module_path)
-    pattern = "*.py"
+    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}")
+                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__])}",
+                                'package': package_name,
+                                'name': mem_name,
+                                'obj': obj,
+                                'version': obj.version,
+                                'path': f'{".".join([module_name, obj.__name__])}',
                             },
                         )
 
@@ -94,18 +89,18 @@ def _get_installed_aprsd_items():
     # installed plugins
     plugins = {}
     extensions = {}
-    for finder, name, ispkg in pkgutil.iter_modules():
-        if name.startswith("aprsd_"):
-            print(f"Found aprsd_ module: {name}")
-            if ispkg:
-                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
+    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
 
 
@@ -122,7 +117,7 @@ def get_installed_extensions():
 
 
 def show_built_in_plugins(console):
-    modules = [email, fortune, location, notify, ping, time, version, weather]
+    modules = [fortune, notify, ping, time, version, weather]
     plugins = []
 
     for module in modules:
@@ -131,132 +126,141 @@ def show_built_in_plugins(console):
             cls = entry[1]
             if issubclass(cls, aprsd_plugin.APRSDPluginBase):
                 info = {
-                    "name": cls.__qualname__,
-                    "path": f"{cls.__module__}.{cls.__qualname__}",
-                    "version": cls.version,
-                    "docstring": cls.__doc__,
-                    "short_desc": cls.short_description,
+                    'name': cls.__qualname__,
+                    'path': f'{cls.__module__}.{cls.__qualname__}',
+                    'version': cls.version,
+                    'docstring': cls.__doc__,
+                    'short_desc': cls.short_description,
                 }
 
                 if issubclass(cls, aprsd_plugin.APRSDRegexCommandPluginBase):
-                    info["command_regex"] = cls.command_regex
-                    info["type"] = "RegexCommand"
+                    info['command_regex'] = cls.command_regex
+                    info['type'] = 'RegexCommand'
 
                 if issubclass(cls, aprsd_plugin.APRSDWatchListPluginBase):
-                    info["type"] = "WatchList"
+                    info['type'] = 'WatchList'
 
                 plugins.append(info)
 
-    plugins = sorted(plugins, key=lambda i: i["name"])
+    plugins = sorted(plugins, key=lambda i: i['name'])
 
     table = Table(
-        title="[not italic]:snake:[/] [bold][magenta]APRSD Built-in Plugins [not italic]:snake:[/]",
+        title='[not italic]:snake:[/] [bold][magenta]APRSD Built-in Plugins [not italic]:snake:[/]',
     )
-    table.add_column("Plugin Name", style="cyan", no_wrap=True)
-    table.add_column("Info", style="bold yellow")
-    table.add_column("Type", style="bold green")
-    table.add_column("Plugin Path", style="bold blue")
+    table.add_column('Plugin Name', style='cyan', no_wrap=True)
+    table.add_column('Info', style='bold yellow')
+    table.add_column('Type', style='bold green')
+    table.add_column('Plugin Path', style='bold blue')
     for entry in plugins:
-        table.add_row(entry["name"], entry["short_desc"], entry["type"], entry["path"])
+        table.add_row(entry['name'], entry['short_desc'], entry['type'], entry['path'])
 
     console.print(table)
 
 
 def _get_pypi_packages():
-    query = "aprsd"
-    snippets = []
-    s = requests.Session()
-    for page in range(1, 3):
-        params = {"q": query, "page": page}
-        r = s.get(PYPI_URL, params=params)
-        soup = BeautifulSoup(r.text, "html.parser")
-        snippets += soup.select('a[class*="snippet"]')
-        if not hasattr(s, "start_url"):
-            s.start_url = r.url.rsplit("&page", maxsplit=1).pop(0)
-
-    return snippets
+    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):
-    snippets = _get_pypi_packages()
+    packages = _get_pypi_packages()
 
     title = Text.assemble(
-        ("Pypi.org APRSD Installable Plugin Packages\n\n", "bold magenta"),
-        ("Install any of the following plugins with\n", "bold yellow"),
-        ("'pip install ", "bold white"),
-        ("<Plugin Package Name>'", "cyan"),
+        ('Pypi.org APRSD Installable Plugin Packages\n\n', 'bold magenta'),
+        ('Install any of the following plugins with\n', 'bold yellow'),
+        ("'pip install ", 'bold white'),
+        ("<Plugin Package Name>'", 'cyan'),
     )
 
     table = Table(title=title)
-    table.add_column("Plugin Package Name", style="cyan", no_wrap=True)
-    table.add_column("Description", style="yellow")
-    table.add_column("Version", style="yellow", justify="center")
-    table.add_column("Released", style="bold green", justify="center")
-    table.add_column("Installed?", style="red", justify="center")
-    for snippet in snippets:
-        link = urljoin(PYPI_URL, snippet.get("href"))
-        package = re.sub(r"\s+", " ", snippet.select_one('span[class*="name"]').text.strip())
-        version = re.sub(r"\s+", " ", snippet.select_one('span[class*="version"]').text.strip())
-        created = re.sub(r"\s+", " ", snippet.select_one('span[class*="created"]').text.strip())
-        description = re.sub(r"\s+", " ", snippet.select_one('p[class*="description"]').text.strip())
-        emoji = ":open_file_folder:"
-
-        if "aprsd-" not in package or "-plugin" not in package:
+    table.add_column('Plugin Package Name', style='cyan', no_wrap=True)
+    table.add_column('Description', style='yellow')
+    table.add_column('Version', style='yellow', justify='center')
+    table.add_column('Released', style='bold green', justify='center')
+    table.add_column('Installed?', style='red', justify='center')
+    emoji = ':open_file_folder:'
+    for package in packages:
+        link = package['info']['package_url']
+        version = package['info']['version']
+        package_name = package['info']['name']
+        description = package['info']['summary']
+        created = package['releases'][version][0]['upload_time']
+
+        if 'aprsd-' not in package_name or '-plugin' not in package_name:
             continue
 
-        under = package.replace("-", "_")
-        if under in installed_plugins:
-            installed = "Yes"
-        else:
-            installed = "No"
-
+        under = package_name.replace('-', '_')
+        installed = 'Yes' if under in installed_plugins else 'No'
         table.add_row(
-            f"[link={link}]{emoji}[/link] {package}",
-            description, version, created, installed,
+            f'[link={link}]{emoji}[/link] {package_name}',
+            description,
+            version,
+            created,
+            installed,
         )
 
-    console.print("\n")
+    console.print('\n')
     console.print(table)
 
 
 def show_pypi_extensions(installed_extensions, console):
-    snippets = _get_pypi_packages()
+    packages = _get_pypi_packages()
 
     title = Text.assemble(
-        ("Pypi.org APRSD Installable Extension Packages\n\n", "bold magenta"),
-        ("Install any of the following extensions by running\n", "bold yellow"),
-        ("'pip install ", "bold white"),
-        ("<Plugin Package Name>'", "cyan"),
+        ('Pypi.org APRSD Installable Extension Packages\n\n', 'bold magenta'),
+        ('Install any of the following extensions by running\n', 'bold yellow'),
+        ("'pip install ", 'bold white'),
+        ("<Plugin Package Name>'", 'cyan'),
     )
     table = Table(title=title)
-    table.add_column("Extension Package Name", style="cyan", no_wrap=True)
-    table.add_column("Description", style="yellow")
-    table.add_column("Version", style="yellow", justify="center")
-    table.add_column("Released", style="bold green", justify="center")
-    table.add_column("Installed?", style="red", justify="center")
-    for snippet in snippets:
-        link = urljoin(PYPI_URL, snippet.get("href"))
-        package = re.sub(r"\s+", " ", snippet.select_one('span[class*="name"]').text.strip())
-        version = re.sub(r"\s+", " ", snippet.select_one('span[class*="version"]').text.strip())
-        created = re.sub(r"\s+", " ", snippet.select_one('span[class*="created"]').text.strip())
-        description = re.sub(r"\s+", " ", snippet.select_one('p[class*="description"]').text.strip())
-        emoji = ":open_file_folder:"
-
-        if "aprsd-" not in package or "-extension" not in package:
+    table.add_column('Extension Package Name', style='cyan', no_wrap=True)
+    table.add_column('Description', style='yellow')
+    table.add_column('Version', style='yellow', justify='center')
+    table.add_column('Released', style='bold green', justify='center')
+    table.add_column('Installed?', style='red', justify='center')
+    emoji = ':open_file_folder:'
+
+    for package in packages:
+        link = package['info']['package_url']
+        version = package['info']['version']
+        package_name = package['info']['name']
+        description = package['info']['summary']
+        created = package['releases'][version][0]['upload_time']
+        if 'aprsd-' not in package_name or '-extension' not in package_name:
             continue
 
-        under = package.replace("-", "_")
-        if under in installed_extensions:
-            installed = "Yes"
-        else:
-            installed = "No"
-
+        under = package_name.replace('-', '_')
+        installed = 'Yes' if under in installed_extensions else 'No'
         table.add_row(
-            f"[link={link}]{emoji}[/link] {package}",
-            description, version, created, installed,
+            f'[link={link}]{emoji}[/link] {package_name}',
+            description,
+            version,
+            created,
+            installed,
         )
 
-    console.print("\n")
+    console.print('\n')
     console.print(table)
 
 
@@ -265,24 +269,24 @@ def show_installed_plugins(installed_plugins, console):
         return
 
     table = Table(
-        title="[not italic]:snake:[/] [bold][magenta]APRSD Installed 3rd party Plugins [not italic]:snake:[/]",
+        title='[not italic]:snake:[/] [bold][magenta]APRSD Installed 3rd party Plugins [not italic]:snake:[/]',
     )
-    table.add_column("Package Name", style=" bold white", no_wrap=True)
-    table.add_column("Plugin Name", style="cyan", no_wrap=True)
-    table.add_column("Version", style="yellow", justify="center")
-    table.add_column("Type", style="bold green")
-    table.add_column("Plugin Path", style="bold blue")
+    table.add_column('Package Name', style=' bold white', no_wrap=True)
+    table.add_column('Plugin Name', style='cyan', no_wrap=True)
+    table.add_column('Version', style='yellow', justify='center')
+    table.add_column('Type', style='bold green')
+    table.add_column('Plugin Path', style='bold blue')
     for name in installed_plugins:
         for plugin in installed_plugins[name]:
             table.add_row(
-                name.replace("_", "-"),
-                plugin["name"],
-                plugin["version"],
-                plugin_type(plugin["obj"]),
-                plugin["path"],
+                name.replace('_', '-'),
+                plugin['name'],
+                plugin['version'],
+                plugin_type(plugin['obj']),
+                plugin['path'],
             )
 
-    console.print("\n")
+    console.print('\n')
     console.print(table)
 
 
@@ -294,14 +298,14 @@ def list_plugins(ctx):
     """List the built in plugins available to APRSD."""
     console = Console()
 
-    with console.status("Show Built-in Plugins") as status:
+    with console.status('Show Built-in Plugins') as status:
         show_built_in_plugins(console)
 
-        status.update("Fetching pypi.org plugins")
+        status.update('Fetching pypi.org plugins')
         installed_plugins = get_installed_plugins()
         show_pypi_plugins(installed_plugins, console)
 
-        status.update("Looking for installed APRSD plugins")
+        status.update('Looking for installed APRSD plugins')
         show_installed_plugins(installed_plugins, console)
 
 
@@ -313,7 +317,9 @@ def list_extensions(ctx):
     """List the built in plugins available to APRSD."""
     console = Console()
 
-    with console.status("Show APRSD Extensions") as status:
-        status.update("Fetching pypi.org APRSD Extensions")
+    with console.status('Show APRSD Extensions') as status:
+        status.update('Fetching pypi.org APRSD Extensions')
+
+        status.update('Looking for installed APRSD Extensions')
         installed_extensions = get_installed_extensions()
         show_pypi_extensions(installed_extensions, console)

aprsd/cmds/listen.py

@@ -23,11 +23,10 @@ from aprsd.packets import collector as packet_collector
 from aprsd.packets import log as packet_log
 from aprsd.packets import seen_list
 from aprsd.stats import collector
-from aprsd.threads import keep_alive, rx
+from aprsd.threads import keepalive, rx
 from aprsd.threads import stats as stats_thread
 from aprsd.threads.aprsd import APRSDThread
 
-
 # setup the global logger
 # log.basicConfig(level=log.DEBUG) # level=10
 LOG = logging.getLogger("APRSD")
@@ -51,8 +50,12 @@ def signal_handler(sig, frame):
 
 class APRSDListenThread(rx.APRSDRXThread):
     def __init__(
-        self, packet_queue, packet_filter=None, plugin_manager=None,
-        enabled_plugins=[], log_packets=False,
+        self,
+        packet_queue,
+        packet_filter=None,
+        plugin_manager=None,
+        enabled_plugins=[],
+        log_packets=False,
     ):
         super().__init__(packet_queue)
         self.packet_filter = packet_filter
@@ -88,7 +91,6 @@ class APRSDListenThread(rx.APRSDRXThread):
                     self.plugin_manager.run(packet)
         else:
             if self.log_packets:
-                LOG.error("PISS")
                 packet_log.log(packet)
             if self.plugin_manager:
                 # Don't do anything with the reply.
@@ -111,6 +113,7 @@ class ListenStatsThread(APRSDThread):
             stats_json = collector.Collector().collect()
             stats = stats_json["PacketList"]
             total_rx = stats["rx"]
+            packet_count = len(stats["packets"])
             rx_delta = total_rx - self._last_total_rx
             rate = rx_delta / 10
 
@@ -118,7 +121,8 @@ class ListenStatsThread(APRSDThread):
             LOGU.opt(colors=True).info(
                 f"<green>RX Rate: {rate} pps</green>  "
                 f"<yellow>Total RX: {total_rx}</yellow> "
-                f"<red>RX Last 10 secs: {rx_delta}</red>",
+                f"<red>RX Last 10 secs: {rx_delta}</red> "
+                f"<white>Packets in PacketList: {packet_count}</white>",
             )
             self._last_total_rx = total_rx
 
@@ -266,7 +270,7 @@ def listen(
     LOG.debug(f"Filter by '{filter}'")
     aprs_client.set_filter(filter)
 
-    keepalive = keep_alive.KeepAliveThread()
+    keepalive_thread = keepalive.KeepAliveThread()
 
     if not CONF.enable_seen_list:
         # just deregister the class from the packet collector
@@ -310,9 +314,9 @@ def listen(
         listen_stats = ListenStatsThread()
         listen_stats.start()
 
-    keepalive.start()
+    keepalive_thread.start()
     LOG.debug("keepalive Join")
-    keepalive.join()
+    keepalive_thread.join()
     LOG.debug("listen_thread Join")
     listen_thread.join()
     stats.join()

aprsd/cmds/server.py

@@ -6,22 +6,54 @@ import click
 from oslo_config import cfg
 
 import aprsd
-from aprsd import cli_helper
+from aprsd import cli_helper, plugin, threads, utils
 from aprsd import main as aprsd_main
-from aprsd import plugin, threads, utils
 from aprsd.client import client_factory
 from aprsd.main import cli
 from aprsd.packets import collector as packet_collector
 from aprsd.packets import seen_list
-from aprsd.threads import keep_alive, log_monitor, registry, rx
+from aprsd.threads import aprsd as aprsd_threads
+from aprsd.threads import keepalive, registry, rx, tx
 from aprsd.threads import stats as stats_thread
-from aprsd.threads import tx
-
+from aprsd.utils import singleton
 
 CONF = cfg.CONF
 LOG = logging.getLogger("APRSD")
 
 
+@singleton
+class ServerThreads:
+    """Registry for threads that the server command runs.
+
+    This enables extensions to register a thread to run during
+    the server command.
+
+    """
+
+    def __init__(self):
+        self.threads: list[aprsd_threads.APRSDThread] = []
+
+    def register(self, thread: aprsd_threads.APRSDThread):
+        if not isinstance(thread, aprsd_threads.APRSDThread):
+            raise TypeError(f"Thread {thread} is not an APRSDThread")
+        self.threads.append(thread)
+
+    def unregister(self, thread: aprsd_threads.APRSDThread):
+        if not isinstance(thread, aprsd_threads.APRSDThread):
+            raise TypeError(f"Thread {thread} is not an APRSDThread")
+        self.threads.remove(thread)
+
+    def start(self):
+        """Start all threads in the list."""
+        for thread in self.threads:
+            thread.start()
+
+    def join(self):
+        """Join all the threads in the list"""
+        for thread in self.threads:
+            thread.join()
+
+
 # main() ###
 @cli.command()
 @cli_helper.add_options(cli_helper.common_options)
@@ -41,6 +73,8 @@ def server(ctx, flush):
     signal.signal(signal.SIGINT, aprsd_main.signal_handler)
     signal.signal(signal.SIGTERM, aprsd_main.signal_handler)
 
+    server_threads = ServerThreads()
+
     level, msg = utils._check_version()
     if level:
         LOG.warning(msg)
@@ -110,36 +144,28 @@ def server(ctx, flush):
 
     # Now start all the main processing threads.
 
-    keepalive = keep_alive.KeepAliveThread()
-    keepalive.start()
-
-    stats_store_thread = stats_thread.APRSDStatsStoreThread()
-    stats_store_thread.start()
-
-    rx_thread = rx.APRSDPluginRXThread(
-        packet_queue=threads.packet_queue,
+    server_threads.register(keepalive.KeepAliveThread())
+    server_threads.register(stats_thread.APRSDStatsStoreThread())
+    server_threads.register(
+        rx.APRSDPluginRXThread(
+            packet_queue=threads.packet_queue,
+        ),
     )
-    process_thread = rx.APRSDPluginProcessPacketThread(
-        packet_queue=threads.packet_queue,
+    server_threads.register(
+        rx.APRSDPluginProcessPacketThread(
+            packet_queue=threads.packet_queue,
+        ),
     )
-    rx_thread.start()
-    process_thread.start()
 
     if CONF.enable_beacon:
         LOG.info("Beacon Enabled.  Starting Beacon thread.")
-        bcn_thread = tx.BeaconSendThread()
-        bcn_thread.start()
+        server_threads.register(tx.BeaconSendThread())
 
     if CONF.aprs_registry.enabled:
         LOG.info("Registry Enabled.  Starting Registry thread.")
-        registry_thread = registry.APRSRegistryThread()
-        registry_thread.start()
-
-    if CONF.admin.web_enabled:
-        log_monitor_thread = log_monitor.LogMonitorThread()
-        log_monitor_thread.start()
+        server_threads.register(registry.APRSRegistryThread())
 
-    rx_thread.join()
-    process_thread.join()
+    server_threads.start()
+    server_threads.join()
 
     return 0

aprsd/conf/__init__.py

@@ -1,6 +1,6 @@
 from oslo_config import cfg
 
-from aprsd.conf import client, common, log, plugin_common, plugin_email
+from aprsd.conf import client, common, log, plugin_common
 
 
 CONF = cfg.CONF
@@ -11,7 +11,6 @@ client.register_opts(CONF)
 
 # plugins
 plugin_common.register_opts(CONF)
-plugin_email.register_opts(CONF)
 
 
 def set_lib_defaults():

aprsd/conf/client.py

@@ -4,7 +4,6 @@ The options for log setup
 
 from oslo_config import cfg
 
-
 DEFAULT_LOGIN = "NOCALL"
 
 aprs_group = cfg.OptGroup(
@@ -31,7 +30,7 @@ aprs_opts = [
         "enabled",
         default=True,
         help="Set enabled to False if there is no internet connectivity."
-             "This is useful for a direwolf KISS aprs connection only.",
+        "This is useful for a direwolf KISS aprs connection only.",
     ),
     cfg.StrOpt(
         "login",
@@ -42,8 +41,8 @@ aprs_opts = [
         "password",
         secret=True,
         help="APRS Password "
-             "Get the passcode for your callsign here: "
-             "https://apps.magicbug.co.uk/passcode",
+        "Get the passcode for your callsign here: "
+        "https://apps.magicbug.co.uk/passcode",
     ),
     cfg.HostAddressOpt(
         "host",