aprsd 3.3.3__py2.py3-none-any.whl → 3.4.0__py2.py3-none-any.whl

aprsd/web/admin/templates/index.html

@@ -30,7 +30,6 @@
             var color = Chart.helpers.color;
 
             $(document).ready(function() {
-                console.log(initial_stats);
                 start_update();
                 start_charts();
                 init_messages();
@@ -82,6 +81,7 @@
             <div class="item" data-tab="seen-tab">Seen List</div>
             <div class="item" data-tab="watch-tab">Watch List</div>
             <div class="item" data-tab="plugin-tab">Plugins</div>
+            <div class="item" data-tab="threads-tab">Threads</div>
             <div class="item" data-tab="config-tab">Config</div>
             <div class="item" data-tab="log-tab">LogFile</div>
             <!-- <div class="item" data-tab="oslo-tab">OSLO CONFIG</div> //-->
@@ -99,21 +99,25 @@
                 </div>
                 <div class="row">
                     <div class="column">
-                        <div class="ui segment" style="height: 300px" id="packetTypesChart"></div>
+                        <div class="ui segment" style="height: 300px" id="messagesChart"></div>
+                    </div>
+                    <div class="column">
+                        <div class="ui segment" style="height: 300px" id="acksChart"></div>
                     </div>
                 </div>
                 <div class="row">
                     <div class="column">
-                        <div class="ui segment" style="height: 300px" id="messagesChart"></div>
+                        <div class="ui segment" style="height: 300px" id="packetTypesChart"></div>
                     </div>
+                </div>
+                <div class="row">
                     <div class="column">
-                        <div class="ui segment" style="height: 300px" id="acksChart"></div>
+                        <div class="ui segment" style="height: 300px" id="threadChart"></div>
                     </div>
                 </div>
                 <div class="row">
                     <div class="column">
-                        <div class="ui segment" style="height: 300px" id="memChart">
-                        </div>
+                        <div class="ui segment" style="height: 300px" id="memChart"></div>
                     </div>
                 </div>
           <!--      <div class="row">
@@ -156,6 +160,13 @@
             <div id="pluginDiv" class="ui mini text">Loading</div>
         </div>
 
+        <div class="ui bottom attached tab segment" data-tab="threads-tab">
+            <h3 class="ui dividing header">
+                Threads Loaded (<span id="thread_count">{{ thread_count }}</span>)
+            </h3>
+            <div id="threadsDiv" class="ui mini text">Loading</div>
+        </div>
+
         <div class="ui bottom attached tab segment" data-tab="config-tab">
           <h3 class="ui dividing header">Config</h3>
           <pre id="configjson" class="language-json">{{ config_json|safe }}</pre>
@@ -174,7 +185,7 @@
 
         <div class="ui bottom attached tab segment" data-tab="raw-tab">
           <h3 class="ui dividing header">Raw JSON</h3>
-          <pre id="jsonstats" class="language-yaml" style="height:600px;overflow-y:auto;">{{ stats|safe }}</pre>
+          <pre id="jsonstats" class="language-yaml" style="height:600px;overflow-y:auto;">{{ initial_stats|safe }}</pre>
         </div>
 
         <div class="ui text container">

aprsd/web/chat/static/js/gps.js

@@ -64,9 +64,11 @@ function showError(error) {
 
 function showPosition(position) {
   console.log("showPosition Called");
+  path = $('#pkt_path option:selected').val();
   msg = {
       'latitude': position.coords.latitude,
-      'longitude': position.coords.longitude
+      'longitude': position.coords.longitude,
+      'path': path,
   }
   console.log(msg);
   $.toast({

aprsd/web/chat/static/js/main.js

@@ -19,9 +19,10 @@ function show_aprs_icon(item, symbol) {
 function ord(str){return str.charCodeAt(0);}
 
 function update_stats( data ) {
-    $("#version").text( data["stats"]["aprsd"]["version"] );
+    console.log(data);
+    $("#version").text( data["stats"]["APRSDStats"]["version"] );
     $("#aprs_connection").html( data["aprs_connection"] );
-    $("#uptime").text( "uptime: " + data["stats"]["aprsd"]["uptime"] );
+    $("#uptime").text( "uptime: " + data["stats"]["APRSDStats"]["uptime"] );
     short_time = data["time"].split(/\s(.+)/)[1];
 }
 
@@ -37,7 +38,7 @@ function start_update() {
                     update_stats(data);
                 },
                 complete: function() {
-                    setTimeout(statsworker, 10000);
+                    setTimeout(statsworker, 60000);
                 }
             });
     })();

aprsd/web/chat/static/js/send-message.js

@@ -313,6 +313,7 @@ function create_callsign_tab(callsign, active=false) {
   //item_html += '<button onClick="callsign_select(\''+callsign+'\');" callsign="'+callsign+'" class="nav-link '+active_str+'" id="'+tab_id+'" data-bs-toggle="tab" data-bs-target="#'+tab_content+'" type="button" role="tab" aria-controls="'+callsign+'" aria-selected="true">';
   item_html += '<button onClick="callsign_select(\''+callsign+'\');" callsign="'+callsign+'" class="nav-link position-relative '+active_str+'" id="'+tab_id+'" data-bs-toggle="tab" data-bs-target="#'+tab_content+'" type="button" role="tab" aria-controls="'+callsign+'" aria-selected="true">';
   item_html += callsign+'&nbsp;&nbsp;';
+  item_html += '<span id="'+tab_notify_id+'" class="position-absolute top-0 start-80 translate-middle badge bg-danger border border-light rounded-pill visually-hidden">0</span>';
   item_html += '<span onclick="delete_tab(\''+callsign+'\');">×</span>';
   item_html += '</button></li>'
 
@@ -407,13 +408,15 @@ function append_message(callsign, msg, msg_html) {
       tab_notify_id = tab_notification_id(callsign, true);
       // get the current count of notifications
       count = parseInt($(tab_notify_id).text());
+      if (isNaN(count)) {
+          count = 0;
+      }
       count += 1;
       $(tab_notify_id).text(count);
       $(tab_notify_id).removeClass('visually-hidden');
   }
 
   // Find the right div to place the html
-
   new_callsign = add_callsign(callsign, msg);
   update_callsign_path(callsign, msg);
   append_message_html(callsign, msg_html, new_callsign);
@@ -502,7 +505,7 @@ function sent_msg(msg) {
     msg_html = create_message_html(d, t, msg['from_call'], msg['to_call'], msg['message_text'], ack_id, msg, false);
     append_message(msg['to_call'], msg, msg_html);
     save_data();
-    scroll_main_content(msg['from_call']);
+    scroll_main_content(msg['to_call']);
 }
 
 function from_msg(msg) {

aprsd/web/chat/templates/index.html

@@ -103,6 +103,7 @@
                                 <option value="WIDE1-1">WIDE1-1</option>
                                 <option value="WIDE1-1,WIDE2-1">WIDE1-1,WIDE2-1</option>
                                 <option value="ARISS">ARISS</option>
+                                <option value="GATE">GATE</option>
                             </select>
                         </div>
                         <div class="col-sm-3">

aprsd/wsgi.py

@@ -3,10 +3,10 @@ import importlib.metadata as imp
 import io
 import json
 import logging
-import time
+import queue
 
 import flask
-from flask import Flask
+from flask import Flask, request
 from flask_httpauth import HTTPBasicAuth
 from oslo_config import cfg, generator
 import socketio
@@ -15,14 +15,16 @@ from werkzeug.security import check_password_hash
 import aprsd
 from aprsd import cli_helper, client, conf, packets, plugin, threads
 from aprsd.log import log
-from aprsd.rpc import client as aprsd_rpc_client
+from aprsd.threads import stats as stats_threads
+from aprsd.utils import json as aprsd_json
 
 
 CONF = cfg.CONF
 LOG = logging.getLogger("gunicorn.access")
+logging_queue = queue.Queue()
 
 auth = HTTPBasicAuth()
-users = {}
+users: dict[str, str] = {}
 app = Flask(
     "aprsd",
     static_url_path="/static",
@@ -45,114 +47,40 @@ def verify_password(username, password):
 
 
 def _stats():
-    track = aprsd_rpc_client.RPCClient().get_packet_track()
+    stats_obj = stats_threads.StatsStore()
+    stats_obj.load()
     now = datetime.datetime.now()
-
     time_format = "%m-%d-%Y %H:%M:%S"
-
-    stats_dict = aprsd_rpc_client.RPCClient().get_stats_dict()
-    if not stats_dict:
-        stats_dict = {
-            "aprsd": {},
-            "aprs-is": {"server": ""},
-            "messages": {
-                "sent": 0,
-                "received": 0,
-            },
-            "email": {
-                "sent": 0,
-                "received": 0,
-            },
-            "seen_list": {
-                "sent": 0,
-                "received": 0,
-            },
-        }
-
-    # Convert the watch_list entries to age
-    wl = aprsd_rpc_client.RPCClient().get_watch_list()
-    new_list = {}
-    if wl:
-        for call in wl.get_all():
-            # call_date = datetime.datetime.strptime(
-            #    str(wl.last_seen(call)),
-            #    "%Y-%m-%d %H:%M:%S.%f",
-            # )
-
-            # We have to convert the RingBuffer to a real list
-            # so that json.dumps works.
-            # pkts = []
-            # for pkt in wl.get(call)["packets"].get():
-            #     pkts.append(pkt)
-
-            new_list[call] = {
-                "last": wl.age(call),
-                # "packets": pkts
-            }
-
-    stats_dict["aprsd"]["watch_list"] = new_list
-    packet_list = aprsd_rpc_client.RPCClient().get_packet_list()
-    rx = tx = 0
-    types = {}
-    if packet_list:
-        rx = packet_list.total_rx()
-        tx = packet_list.total_tx()
-        types_copy = packet_list.types.copy()
-
-        for key in types_copy:
-            types[str(key)] = dict(types_copy[key])
-
-    stats_dict["packets"] = {
-        "sent": tx,
-        "received": rx,
-        "types": types,
-    }
-    if track:
-        size_tracker = len(track)
-    else:
-        size_tracker = 0
-
-    result = {
+    stats = {
         "time": now.strftime(time_format),
-        "size_tracker": size_tracker,
-        "stats": stats_dict,
+        "stats": stats_obj.data,
     }
-
-    return result
+    return stats
 
 
 @app.route("/stats")
 def stats():
     LOG.debug("/stats called")
-    return json.dumps(_stats())
+    return json.dumps(_stats(), cls=aprsd_json.SimpleJSONEncoder)
 
 
 @app.route("/")
 def index():
     stats = _stats()
-    wl = aprsd_rpc_client.RPCClient().get_watch_list()
-    if wl and wl.is_enabled():
-        watch_count = len(wl)
-        watch_age = wl.max_delta()
-    else:
-        watch_count = 0
-        watch_age = 0
-
-    sl = aprsd_rpc_client.RPCClient().get_seen_list()
-    if sl:
-        seen_count = len(sl)
-    else:
-        seen_count = 0
-
     pm = plugin.PluginManager()
     plugins = pm.get_plugins()
     plugin_count = len(plugins)
+    client_stats = stats["stats"].get("APRSClientStats", {})
 
     if CONF.aprs_network.enabled:
         transport = "aprs-is"
+        if client_stats:
+            aprs_connection = client_stats.get("server_string", "")
+        else:
+            aprs_connection = "APRS-IS"
         aprs_connection = (
             "APRS-IS Server: <a href='http://status.aprs2.net' >"
-            "{}</a>".format(stats["stats"]["aprs-is"]["server"])
+            "{}</a>".format(aprs_connection)
         )
     else:
         # We might be connected to a KISS socket?
@@ -173,13 +101,20 @@ def index():
                     )
                 )
 
-    stats["transport"] = transport
-    stats["aprs_connection"] = aprs_connection
+    if client_stats:
+        stats["stats"]["APRSClientStats"]["transport"] = transport
+        stats["stats"]["APRSClientStats"]["aprs_connection"] = aprs_connection
     entries = conf.conf_to_dict()
 
+    thread_info = stats["stats"].get("APRSDThreadList", {})
+    if thread_info:
+        thread_count = len(thread_info)
+    else:
+        thread_count = "unknown"
+
     return flask.render_template(
         "index.html",
-        initial_stats=stats,
+        initial_stats=json.dumps(stats, cls=aprsd_json.SimpleJSONEncoder),
         aprs_connection=aprs_connection,
         callsign=CONF.callsign,
         version=aprsd.__version__,
@@ -187,10 +122,8 @@ def index():
             entries, indent=4,
             sort_keys=True, default=str,
         ),
-        watch_count=watch_count,
-        watch_age=watch_age,
-        seen_count=seen_count,
         plugin_count=plugin_count,
+        thread_count=thread_count,
         # oslo_out=generate_oslo()
     )
 
@@ -209,19 +142,10 @@ def messages():
 @auth.login_required
 @app.route("/packets")
 def get_packets():
-    LOG.debug("/packets called")
-    packet_list = aprsd_rpc_client.RPCClient().get_packet_list()
-    if packet_list:
-        tmp_list = []
-        pkts = packet_list.copy()
-        for key in pkts:
-            pkt = packet_list.get(key)
-            if pkt:
-                tmp_list.append(pkt.json)
-
-        return json.dumps(tmp_list)
-    else:
-        return json.dumps([])
+    stats = _stats()
+    stats_dict = stats["stats"]
+    packets = stats_dict.get("PacketList", {})
+    return json.dumps(packets, cls=aprsd_json.SimpleJSONEncoder)
 
 
 @auth.login_required
@@ -273,23 +197,34 @@ def save():
     return json.dumps({"messages": "saved"})
 
 
+@app.route("/log_entries", methods=["POST"])
+def log_entries():
+    """The url that the server can call to update the logs."""
+    entries = request.json
+    LOG.info(f"Log entries called {len(entries)}")
+    for entry in entries:
+        logging_queue.put(entry)
+    return json.dumps({"messages": "saved"})
+
+
 class LogUpdateThread(threads.APRSDThread):
 
-    def __init__(self):
+    def __init__(self, logging_queue=None):
         super().__init__("LogUpdate")
+        self.logging_queue = logging_queue
 
     def loop(self):
         if sio:
-            log_entries = aprsd_rpc_client.RPCClient().get_log_entries()
-
-            if log_entries:
-                LOG.info(f"Sending log entries! {len(log_entries)}")
-                for entry in log_entries:
+            try:
+                log_entry = self.logging_queue.get(block=True, timeout=1)
+                if log_entry:
                     sio.emit(
-                        "log_entry", entry,
+                        "log_entry",
+                        log_entry,
                         namespace="/logs",
                     )
-        time.sleep(5)
+            except queue.Empty:
+                pass
         return True
 
 
@@ -297,17 +232,17 @@ class LoggingNamespace(socketio.Namespace):
     log_thread = None
 
     def on_connect(self, sid, environ):
-        global sio
-        LOG.debug(f"LOG on_connect {sid}")
+        global sio, logging_queue
+        LOG.info(f"LOG on_connect {sid}")
         sio.emit(
             "connected", {"data": "/logs Connected"},
             namespace="/logs",
         )
-        self.log_thread = LogUpdateThread()
+        self.log_thread = LogUpdateThread(logging_queue=logging_queue)
         self.log_thread.start()
 
     def on_disconnect(self, sid):
-        LOG.debug(f"LOG Disconnected {sid}")
+        LOG.info(f"LOG Disconnected {sid}")
         if self.log_thread:
             self.log_thread.stop()
 
@@ -332,8 +267,8 @@ if __name__ == "__main__":
     async_mode = "threading"
     sio = socketio.Server(logger=True, async_mode=async_mode)
     app.wsgi_app = socketio.WSGIApp(sio, app.wsgi_app)
-    log_level = init_app(log_level="DEBUG")
-    log.setup_logging(app, log_level)
+    log_level = init_app()
+    log.setup_logging(log_level)
     sio.register_namespace(LoggingNamespace("/logs"))
     CONF.log_opt_values(LOG, logging.DEBUG)
     app.run(
@@ -352,12 +287,12 @@ if __name__ == "uwsgi_file_aprsd_wsgi":
     sio = socketio.Server(logger=True, async_mode=async_mode)
     app.wsgi_app = socketio.WSGIApp(sio, app.wsgi_app)
     log_level = init_app(
-        log_level="DEBUG",
+        # log_level="DEBUG",
         config_file="/config/aprsd.conf",
         # Commented out for local development.
         # config_file=cli_helper.DEFAULT_CONFIG_FILE
     )
-    log.setup_logging(app, log_level)
+    log.setup_logging(log_level)
     sio.register_namespace(LoggingNamespace("/logs"))
     CONF.log_opt_values(LOG, logging.DEBUG)
 
@@ -371,10 +306,10 @@ if __name__ == "aprsd.wsgi":
     app.wsgi_app = socketio.WSGIApp(sio, app.wsgi_app)
 
     log_level = init_app(
-        log_level="DEBUG",
+        # log_level="DEBUG",
         config_file="/config/aprsd.conf",
         # config_file=cli_helper.DEFAULT_CONFIG_FILE,
     )
-    log.setup_logging(app, log_level)
+    log.setup_logging(log_level)
     sio.register_namespace(LoggingNamespace("/logs"))
     CONF.log_opt_values(LOG, logging.DEBUG)

{aprsd-3.3.3.dist-info → aprsd-3.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aprsd
-Version: 3.3.3
+Version: 3.4.0
 Summary: Amateur radio APRS daemon which listens for messages and responds
 Home-page: http://aprsd.readthedocs.org
 Author: Craig Lamparter
@@ -31,14 +31,13 @@ Requires-Dist: click ==8.1.7
 Requires-Dist: click-completion ==0.5.2
 Requires-Dist: click-params ==0.5.0
 Requires-Dist: commonmark ==0.9.1
-Requires-Dist: dacite2 ==2.0.0
 Requires-Dist: dataclasses ==0.6
 Requires-Dist: dataclasses-json ==0.6.4
 Requires-Dist: debtcollector ==3.0.0
 Requires-Dist: deprecated ==1.2.14
 Requires-Dist: dnspython ==2.6.1
-Requires-Dist: eventlet ==0.35.2
-Requires-Dist: flask ==3.0.2
+Requires-Dist: eventlet ==0.36.1
+Requires-Dist: flask ==3.0.3
 Requires-Dist: flask-httpauth ==4.8.0
 Requires-Dist: flask-socketio ==5.3.6
 Requires-Dist: geographiclib ==2.0
@@ -46,10 +45,10 @@ Requires-Dist: geopy ==2.4.1
 Requires-Dist: gevent ==24.2.1
 Requires-Dist: greenlet ==3.0.3
 Requires-Dist: h11 ==0.14.0
-Requires-Dist: idna ==3.6
+Requires-Dist: idna ==3.7
 Requires-Dist: imapclient ==3.0.1
-Requires-Dist: importlib-metadata ==7.0.1
-Requires-Dist: itsdangerous ==2.1.2
+Requires-Dist: importlib-metadata ==7.1.0
+Requires-Dist: itsdangerous ==2.2.0
 Requires-Dist: jinja2 ==3.1.3
 Requires-Dist: kiss3 ==8.0.0
 Requires-Dist: loguru ==0.7.2
@@ -59,21 +58,19 @@ Requires-Dist: mypy-extensions ==1.0.0
 Requires-Dist: netaddr ==1.2.1
 Requires-Dist: oslo-config ==9.4.0
 Requires-Dist: oslo-i18n ==6.3.0
-Requires-Dist: packaging ==23.2
+Requires-Dist: packaging ==24.0
 Requires-Dist: pbr ==6.0.0
-Requires-Dist: pluggy ==1.4.0
-Requires-Dist: plumbum ==1.8.2
+Requires-Dist: pluggy ==1.5.0
 Requires-Dist: pygments ==2.17.2
 Requires-Dist: pyserial ==3.5
 Requires-Dist: pyserial-asyncio ==0.6
 Requires-Dist: python-engineio ==4.9.0
-Requires-Dist: python-socketio ==5.11.1
+Requires-Dist: python-socketio ==5.11.2
 Requires-Dist: pytz ==2024.1
 Requires-Dist: pyyaml ==6.0.1
 Requires-Dist: requests ==2.31.0
 Requires-Dist: rfc3986 ==2.0.0
 Requires-Dist: rich ==12.6.0
-Requires-Dist: rpyc ==6.0.0
 Requires-Dist: rush ==2021.4.0
 Requires-Dist: shellingham ==1.5.4
 Requires-Dist: simple-websocket ==1.0.0
@@ -82,17 +79,18 @@ Requires-Dist: soupsieve ==2.5
 Requires-Dist: stevedore ==5.2.0
 Requires-Dist: tabulate ==0.9.0
 Requires-Dist: thesmuggler ==1.0.1
-Requires-Dist: typing-extensions ==4.10.0
+Requires-Dist: typing-extensions ==4.11.0
 Requires-Dist: typing-inspect ==0.9.0
+Requires-Dist: tzlocal ==5.2
 Requires-Dist: update-checker ==0.18.0
 Requires-Dist: urllib3 ==2.2.1
 Requires-Dist: validators ==0.22.0
-Requires-Dist: werkzeug ==3.0.1
+Requires-Dist: werkzeug ==3.0.2
 Requires-Dist: wrapt ==1.16.0
 Requires-Dist: wsproto ==1.2.0
-Requires-Dist: zipp ==3.17.0
+Requires-Dist: zipp ==3.18.1
 Requires-Dist: zope-event ==5.0
-Requires-Dist: zope-interface ==6.2
+Requires-Dist: zope-interface ==6.3
 
 ===============================================
 APRSD - Ham radio APRS-IS Message plugin server