aprsd 3.2.2__py2.py3-none-any.whl → 3.3.1__py2.py3-none-any.whl

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

@@ -1,5 +1,6 @@
 var cleared = false;
 var callsign_list = {};
+var callsign_location = {};
 var message_list = {};
 var from_msg_list = {};
 var selected_tab_callsign = null;
@@ -9,6 +10,35 @@ MSG_TYPE_TX = "tx";
 MSG_TYPE_RX = "rx";
 MSG_TYPE_ACK = "ack";
 
+function reload_popovers() {
+    $('[data-bs-toggle="popover"]').popover(
+        {html: true, animation: true}
+    );
+}
+
+function build_location_string(msg) {
+   dt = new Date(parseInt(msg['lasttime']) * 1000);
+   loc = "Last Location Update: " + dt.toLocaleString();
+   loc += "<br>Latitude: " + msg['lat'] + "<br>Longitude: " + msg['lon'];
+   loc += "<br>" + "Altitude: " + msg['altitude'] + " m";
+   loc += "<br>" + "Speed: " + msg['speed'] + " kph";
+   loc += "<br>" + "Bearing: " + msg['course'] + "°";
+   loc += "<br>" + "distance: " + msg['distance'] + " km";
+   return loc;
+}
+
+function build_location_string_small(msg) {
+
+   dt = new Date(parseInt(msg['lasttime']) * 1000);
+
+    loc = "" + msg['distance'] + "km";
+    //loc += "Lat " + msg['lat'] + "&nbsp;Lon " + msg['lon'];
+    loc += "@" + msg['course'] + "°";
+    //loc += "&nbsp;Distance " + msg['distance'] + " km";
+    loc += "&nbsp;" + dt.toLocaleString();
+    return loc;
+}
+
 function size_dict(d){c=0; for (i in d) ++c; return c}
 
 function raise_error(msg) {
@@ -31,8 +61,6 @@ function init_chat() {
    });
 
    socket.on("sent", function(msg) {
-       console.log("SENT: ");
-       console.log(msg);
        if (cleared === false) {
            var msgsdiv = $("#msgsTabsDiv");
            msgsdiv.html('');
@@ -57,6 +85,20 @@ function init_chat() {
        from_msg(msg);
    });
 
+   socket.on("callsign_location", function(msg) {
+       console.log("CALLSIGN Location!");
+       console.log(msg);
+       now = new Date();
+       msg['last_updated'] = now;
+       callsign_location[msg['callsign']] = msg;
+
+       location_id = callsign_location_content(msg['callsign'], true);
+       location_string = build_location_string_small(msg);
+       $(location_id).html(location_string);
+       $(location_id+"Spinner").addClass('d-none');
+       save_data();
+   });
+
    $("#sendform").submit(function(event) {
        event.preventDefault();
        to_call = $('#to_call').val();
@@ -71,7 +113,7 @@ function init_chat() {
                return false;
            }
            msg = {'to': to_call, 'message': message, 'path': path};
-           console.log(msg);
+           //console.log(msg);
            socket.emit("send", msg);
            $('#message').val('');
        }
@@ -82,6 +124,7 @@ function init_chat() {
    init_messages();
 }
 
+
 function tab_string(callsign, id=false) {
     name = "msgs"+callsign;
     if (id) {
@@ -121,6 +164,14 @@ function callsign_tab(callsign) {
     return "#"+tab_string(callsign);
 }
 
+function callsign_location_popover(callsign, id=false) {
+    return tab_string(callsign, id)+"Location";
+}
+
+function callsign_location_content(callsign, id=false) {
+    return tab_string(callsign, id)+"LocationContent";
+}
+
 function bubble_msg_id(msg, id=false) {
     // The id of the div that contains a specific message
     name = msg["from_call"] + "_" + msg["msgNo"];
@@ -155,20 +206,26 @@ function save_data() {
   // Save the relevant data to local storage
   localStorage.setItem('callsign_list', JSON.stringify(callsign_list));
   localStorage.setItem('message_list', JSON.stringify(message_list));
+  localStorage.setItem('callsign_location', JSON.stringify(callsign_location));
 }
 
 function init_messages() {
     // This tries to load any previous conversations from local storage
     callsign_list = JSON.parse(localStorage.getItem('callsign_list'));
     message_list = JSON.parse(localStorage.getItem('message_list'));
+    callsign_location = JSON.parse(localStorage.getItem('callsign_location'));
     if (callsign_list == null) {
        callsign_list = {};
     }
     if (message_list == null) {
        message_list = {};
     }
-    //console.log(callsign_list);
-    //console.log(message_list);
+    if (callsign_location == null) {
+       callsign_location = {};
+    }
+    console.log(callsign_list);
+    console.log(message_list);
+    console.log(callsign_location);
 
     // Now loop through each callsign and add the tabs
     first_callsign = null;
@@ -245,6 +302,7 @@ function create_callsign_tab(callsign, active=false) {
   tab_id_li = tab_li_string(callsign);
   tab_notify_id = tab_notification_id(callsign);
   tab_content = tab_content_name(callsign);
+  popover_id = callsign_location_popover(callsign);
   if (active) {
     active_str = "active";
   } else {
@@ -255,9 +313,9 @@ 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>'
+
   callsignTabs.append(item_html);
   create_callsign_tab_content(callsign, active);
 }
@@ -273,7 +331,22 @@ function create_callsign_tab_content(callsign, active=false) {
     active_str = '';
   }
 
+  location_str = "Unknown Location"
+  if (callsign in callsign_location) {
+    location_str = build_location_string_small(callsign_location[callsign]);
+    location_class = '';
+  }
+
+  location_id = callsign_location_content(callsign);
+
   item_html = '<div class="tab-pane fade '+active_str+'" id="'+tab_content+'" role="tabpanel" aria-labelledby="'+tab_id+'">';
+  item_html += '<div class="" style="border: 1px solid #999999;background-color:#aaaaaa;">';
+  item_html += '<div class="row" style="padding-top:4px;padding-bottom:4px;background-color:#aaaaaa;margin:0px;">';
+  item_html +=   '<div class="d-flex col-md-10 justify-content-left" style="padding:0px;margin:0px;">';
+  item_html +=     '<button onclick="call_callsign_location(\''+callsign+'\');" style="margin-left:2px;padding: 0px 4px 0px 4px;" type="button" class="btn btn-primary">';
+  item_html +=     '<span id="'+location_id+'Spinner" class="d-none spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>Update</button>';
+  item_html +=   '&nbsp;<span id="'+location_id+'">'+location_str+'</span></div>';
+  item_html += '</div>';
   item_html += '<div class="speech-wrapper" id="'+wrapper_id+'"></div>';
   item_html += '</div>';
   callsignTabsContent.append(item_html);
@@ -288,6 +361,7 @@ function delete_tab(callsign) {
     $(tab_content).remove();
     delete callsign_list[callsign];
     delete message_list[callsign];
+    delete callsign_location[callsign];
 
     // Now select the first tab
     first_tab = $("#msgsTabList").children().first().children().first();
@@ -312,10 +386,9 @@ function add_callsign(callsign, msg) {
   return true;
 }
 
-function update_callsign_path(callsign, path) {
+function update_callsign_path(callsign, msg) {
   //Get the selected path to save for this callsign
   path = msg['path']
-  console.log("Path is " + path);
   $('#pkt_path').val(path);
   callsign_list[callsign] = path;
 
@@ -324,7 +397,6 @@ function update_callsign_path(callsign, path) {
 function append_message(callsign, msg, msg_html) {
   new_callsign = false
   if (!message_list.hasOwnProperty(callsign)) {
-       //message_list[callsign] = new Array();
        message_list[callsign] = {};
   }
   ts_id = message_ts_id(msg);
@@ -343,10 +415,11 @@ function append_message(callsign, msg, msg_html) {
   // Find the right div to place the html
 
   new_callsign = add_callsign(callsign, msg);
-  update_callsign_path(callsign, msg['path']);
+  update_callsign_path(callsign, msg);
   append_message_html(callsign, msg_html, new_callsign);
-  if (new_callsign) {
-      //Now click the tab
+  len = Object.keys(callsign_list).length;
+  if (new_callsign && len == 1) {
+      //Now click the tab if and only if there is only one tab
       callsign_tab_id = callsign_tab(callsign);
       $(callsign_tab_id).click();
       callsign_select(callsign);
@@ -382,11 +455,23 @@ function create_message_html(date, time, from, to, message, ack_id, msg, acked=f
     date_str = date + " " + time;
     sane_date_str = date_str.replace(/ /g,"").replaceAll("/","").replaceAll(":","");
 
+    bubble_msg_class = "bubble-message";
+    if (ack_id) {
+      bubble_arrow_class = "bubble-arrow alt";
+      popover_placement = "left";
+    } else {
+      bubble_arrow_class = "bubble-arrow";
+      popover_placement = "right";
+    }
+
     msg_html = '<div class="bubble-row'+alt+'">';
-    msg_html += '<div id="'+bubble_msgid+'" class="'+ bubble_class + '" data-bs-toggle="popover" data-bs-content="'+msg['raw']+'">';
+    msg_html += '<div id="'+bubble_msgid+'" class="'+ bubble_class + '" ';
+    msg_html +=  'title="APRS Raw Packet" data-bs-placement="'+popover_placement+'" data-bs-toggle="popover" ';
+    msg_html +=  'data-bs-trigger="hover" data-bs-content="'+msg['raw']+'">';
     msg_html += '<div class="bubble-text">';
     msg_html += '<p class="'+ bubble_name_class +'">'+from+'&nbsp;&nbsp;';
     msg_html += '<span class="bubble-timestamp">'+date_str+'</span>';
+
     if (ack_id) {
         if (acked) {
             msg_html += '<span class="material-symbols-rounded md-10" id="' + ack_id + '">thumb_up</span>';
@@ -395,24 +480,11 @@ function create_message_html(date, time, from, to, message, ack_id, msg, acked=f
         }
     }
     msg_html += "</p>";
-    bubble_msg_class = "bubble-message"
-    if (ack_id) {
-      bubble_arrow_class = "bubble-arrow alt"
-      popover_placement = "left"
-    } else {
-      bubble_arrow_class = "bubble-arrow"
-      popover_placement = "right"
-    }
-
     msg_html += '<p class="' +bubble_msg_class+ '">'+message+'</p>';
     msg_html += '<div class="'+ bubble_arrow_class + '"></div>';
     msg_html += "</div></div></div>";
 
-    popover_html = '\n<script>$(function () {$(\'[data-bs-toggle="popover"]\').popover('
-    popover_html += '{title: "APRS Raw Packet", html: false, trigger: \'hover\', placement: \''+popover_placement+'\'});})';
-    popover_html += '</script>'
-
-    return msg_html+popover_html
+    return msg_html
 }
 
 function flash_message(msg) {
@@ -440,12 +512,11 @@ function from_msg(msg) {
 
    if (msg["msgNo"] in from_msg_list[msg["from_call"]]) {
        // We already have this message
-       console.log("We already have this message msgNo=" + msg["msgNo"]);
+       //console.log("We already have this message msgNo=" + msg["msgNo"]);
        // Do some flashy thing?
        flash_message(msg);
        return false
    } else {
-       console.log("Adding message " + msg["msgNo"] + " to " + msg["from_call"]);
        from_msg_list[msg["from_call"]][msg["msgNo"]] = msg
    }
    info = time_ack_from_msg(msg);
@@ -502,3 +573,10 @@ function callsign_select(callsign) {
     // Now update the path
     $('#pkt_path').val(callsign_list[callsign]);
 }
+
+function call_callsign_location(callsign) {
+    msg = {'callsign': callsign};
+    socket.emit("get_callsign_location", msg);
+    location_id = callsign_location_content(callsign, true)+"Spinner";
+    $(location_id).removeClass('d-none');
+}

aprsd/web/chat/templates/index.html

@@ -64,8 +64,12 @@
                 to_call.val(callsign);
                 selected_tab_callsign = callsign;
             });
-        });
 
+            /*$('[data-bs-toggle="popover"]').popover(
+                {html: true, animation: true}
+            );*/
+            reload_popovers();
+        });
     </script>
 </head>
 
@@ -95,7 +99,7 @@
                         <div class="col-auto">
                             <label for="pkt_path" class="visually-hidden">PATH</label>
                             <select class="form-control mb-2 mr-sm-2" name="pkt_path" id="pkt_path" style="width:auto;">
-                                <option value="" selected>Default Path</option>
+                                <option value="" disabled selected>Default Path</option>
                                 <option value="WIDE1-1">WIDE1-1</option>
                                 <option value="WIDE1-1,WIDE2-1">WIDE1-1,WIDE2-1</option>
                                 <option value="ARISS">ARISS</option>

aprsd/wsgi.py

@@ -3,12 +3,10 @@ import importlib.metadata as imp
 import io
 import json
 import logging
-from logging.handlers import RotatingFileHandler
 import time
 
 import flask
 from flask import Flask
-from flask.logging import default_handler
 from flask_httpauth import HTTPBasicAuth
 from oslo_config import cfg, generator
 import socketio
@@ -16,7 +14,7 @@ from werkzeug.security import check_password_hash
 
 import aprsd
 from aprsd import cli_helper, client, conf, packets, plugin, threads
-from aprsd.log import rich as aprsd_logging
+from aprsd.log import log
 from aprsd.rpc import client as aprsd_rpc_client
 
 
@@ -314,39 +312,6 @@ class LoggingNamespace(socketio.Namespace):
             self.log_thread.stop()
 
 
-def setup_logging(flask_app, loglevel):
-    global app, LOG
-    log_level = conf.log.LOG_LEVELS[loglevel]
-    app.logger.setLevel(log_level)
-    flask_app.logger.removeHandler(default_handler)
-
-    date_format = CONF.logging.date_format
-
-    if CONF.logging.rich_logging:
-        log_format = "%(message)s"
-        log_formatter = logging.Formatter(fmt=log_format, datefmt=date_format)
-        rh = aprsd_logging.APRSDRichHandler(
-            show_thread=True, thread_width=15,
-            rich_tracebacks=True, omit_repeated_times=False,
-        )
-        rh.setFormatter(log_formatter)
-        app.logger.addHandler(rh)
-
-    log_file = CONF.logging.logfile
-
-    if log_file:
-        log_format = CONF.logging.logformat
-        log_formatter = logging.Formatter(fmt=log_format, datefmt=date_format)
-        fh = RotatingFileHandler(
-            log_file, maxBytes=(10248576 * 5),
-            backupCount=4,
-        )
-        fh.setFormatter(log_formatter)
-        app.logger.addHandler(fh)
-
-    LOG = app.logger
-
-
 def init_app(config_file=None, log_level=None):
     default_config_file = cli_helper.DEFAULT_CONFIG_FILE
     if not config_file:
@@ -368,7 +333,7 @@ if __name__ == "__main__":
     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")
-    setup_logging(app, log_level)
+    log.setup_logging(app, log_level)
     sio.register_namespace(LoggingNamespace("/logs"))
     CONF.log_opt_values(LOG, logging.DEBUG)
     app.run(
@@ -392,7 +357,7 @@ if __name__ == "uwsgi_file_aprsd_wsgi":
         # Commented out for local development.
         # config_file=cli_helper.DEFAULT_CONFIG_FILE
     )
-    setup_logging(app, log_level)
+    log.setup_logging(app, log_level)
     sio.register_namespace(LoggingNamespace("/logs"))
     CONF.log_opt_values(LOG, logging.DEBUG)
 
@@ -410,6 +375,6 @@ if __name__ == "aprsd.wsgi":
         config_file="/config/aprsd.conf",
         # config_file=cli_helper.DEFAULT_CONFIG_FILE,
     )
-    setup_logging(app, log_level)
+    log.setup_logging(app, log_level)
     sio.register_namespace(LoggingNamespace("/logs"))
     CONF.log_opt_values(LOG, logging.DEBUG)