emergency responder block list

added autoPingInChannel = False
 # Allows auto-ping feature in a channel, False forces DM

also added node short name to all channel ping

README.md

@@ -31,6 +31,7 @@ Welcome to the Mesh Bot project! This feature-rich bot is designed to enhance yo
 - **NOAA location Data**: Get localized weather(alerts) and Tide information. Open-Meteo is used for wx only outside NOAA coverage. 
 - **Wiki Integration**: Look up data using Wikipedia results.
 - **Ollama LLM AI**: Interact with the [Ollama](https://github.com/ollama/ollama/tree/main/docs) LLM AI for advanced queries and responses.
+- **Satalite Pass Info**: Get passes for satalite at your location.
 
 ### Proximity Alerts
 - **Location-Based Alerts**: Get notified when members arrive back at a configured lat/long, perfect for remote locations like campsites.
@@ -64,6 +65,7 @@ This project is developed on Linux (specifically a Raspberry Pi) but should work
 ### Installation
 
 #### Clone the Repository
+If you dont have git you will need it `sudo apt-get install git`
 ```sh
 git clone https://github.com/spudgunman/meshing-around
 ```
@@ -209,9 +211,7 @@ alert_interface = 1
 To Alert on Mesh with the EAS API you can set the channels and enable, checks every 20min.
 
 #### FEMA iPAWS/EAS
-UNDER DEV..
-
-This uses the SAME code to locate the bot and alerts.
+This uses the SAME, FIPS, ZIP code to locate the alerts in the feed. By default ignoring Test messages. femaAlertBroadcastCh is currently not written, still under development. 
 
 ```ini
 # FEMA IPAWS/CAP Alert Broadcast
@@ -343,7 +343,7 @@ bbslink_whitelist = # list of whitelisted nodes numbers ex: 2813308004,425867530
 ```
 
 ### MQTT Notes
-There is no direct support for MQTT in the code, however, reports from Discord are that using [meshtasticd](https://meshtastic.org/docs/hardware/devices/linux-native-hardware/) with no radio and attaching the bot to the software node, which is MQTT-linked, allows routing. There also seems to be a quicker way to enable MQTT by having your bot node with the enabled [serial](https://meshtastic.org/docs/configuration/module/serial/) module with echo enabled and MQTT uplink and downlink. These two methods have been mentioned as allowing MQTT routing for the project. 
+There is no direct support for MQTT in the code, however, reports from Discord are that using [meshtasticd](https://meshtastic.org/docs/hardware/devices/linux-native-hardware/) with no radio and attaching the bot to the software node, which is MQTT-linked, allows routing.~~There also seems to be a quicker way to enable MQTT by having your bot node with the enabled [serial](https://meshtastic.org/docs/configuration/module/serial/) module with echo enabled and MQTT uplink and downlink. These two~~ methods have been mentioned as allowing MQTT routing for the project. Tested working fully Firmware:2.5.15.79da236 with [mosquitto](https://meshtastic.org/docs/software/integrations/mqtt/mosquitto/).
 
 ## Full list of commands for the bot
 
@@ -354,6 +354,7 @@ There is no direct support for MQTT in the code, however, reports from Discord a
 | `test` | Returns like ping but also can be used to test the limits of data buffers `test 4` sends data to the maxBuffer limit (default 220) | ✅ |
 | `whereami` | Returns the address of the sender's location if known |
 | `whoami` | Returns details of the node asking, also returned when position exchanged 📍 | ✅ |
+| `whois` | Returns details known about node, more data with bbsadmin node | ✅ |
 | `motd` | Displays the message of the day or sets it. Example: `motd $New Message Of the day` | ✅ |
 | `lheard` | Returns the last 5 heard nodes with SNR. Can also use `sitrep` | ✅ |
 | `history` | Returns the last commands run by user(s) | ✅ |
@@ -394,6 +395,7 @@ There is no direct support for MQTT in the code, however, reports from Discord a
 | `askai` and `ask:` | Ask Ollama LLM AI for a response. Example: `askai what temp do I cook chicken` | ✅ |
 | `messages` | Replays the last messages heard, like Store and Forward | ✅ |
 | `readnews` | returns the contents of a file (news.txt, by default) via the chunker on air | ✅ |
+| `satpass` | returns the pass info from API for defined NORAD ID in config or Example: `satpass 25544,33591`| |
 
 ### Games (via DM)
 | Command | Description | |

config.template

@@ -25,6 +25,8 @@ port = /dev/ttyUSB0
 [general]
 # if False will respond on all channels but the default channel
 respond_by_dm_only = True
+# Allows auto-ping feature in a channel, False forces DM
+autoPingInChannel = False
 # defaultChannel is the meshtastic default public channel, e.g. LongFast (if none use -1)
 defaultChannel = 0
 # ignoreDefaultChannel, the bot will ignore the default channel set above
@@ -138,20 +140,25 @@ IMAP_FOLDER = inbox
 enabled = True
 lat = 48.50
 lon = -123.0
+
+# Default to metric units rather than imperial
+useMetric = False
+
+# repeaterList lookup location (rbook / artsci)
+repeaterLookup = rbook
+
 # NOAA weather forecast days, the first two rows are today and tonight
 NOAAforecastDuration = 4
 # number of weather alerts to display
 NOAAalertCount = 2
 # use Open-Meteo API for weather data not NOAA useful for non US locations
 UseMeteoWxAPI = False
-# Default to metric units rather than imperial
-useMetric = False
-# repeaterList lookup location (rbook / artsci)
-repeaterLookup = rbook
+
 # EAS Alert Broadcast
 wxAlertBroadcastEnabled = False
 # EAS Alert Broadcast Channels
 wxAlertBroadcastCh = 2
+
 # FEMA IPAWS/CAP Alert Broadcast
 femaAlertBroadcastEnabled = False
 # FEMA IPAWS/CAP Alert Broadcast Channels
@@ -162,6 +169,12 @@ ignoreFEMAtest = True
 # find your SAME https://www.weather.gov/nwr/counties
 mySAME = 053029,053073
 
+# Satalite Pass Prediction
+# Register for free API https://www.n2yo.com/login/
+n2yoAPIKey = 
+# NORAD list https://www.n2yo.com/satellites/
+satList = 25544,7530
+
 # repeater module
 [repeater]
 enabled = False

entrypoint.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# instruction set the meshing-around docker container
 
 # Substitute environment variables in the config file
 envsubst < /app/config.ini > /app/config.tmp && mv /app/config.tmp /app/config.ini

etc/simulator.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # # Simulate meshing-around de K7MHI 2024
-from modules.log import * # Import the logger
+from modules.log import * # Import the logger; ### --> If you are reading this put the script in the project root <-- ###
 import time
 import random
 

install.sh

@@ -1,31 +1,51 @@
 #!/bin/bash
+# meshing-around install helper script
 
 # install.sh
 cd "$(dirname "$0")"
 program_path=$(pwd)
-cp etc/pong_bot.tmp etc/pong_bot.service
-cp etc/mesh_bot.tmp etc/mesh_bot.service
-cp etc/mesh_bot_reporting.tmp etc/mesh_bot_reporting.service
-
+printf "\n########################"
 printf "\nMeshing Around Installer\n"
-printf "\nThis script will install the Meshing Around bot and its dependencies works best in debian/ubuntu\n"
-printf "\nChecking for dependencies\n"
+printf "########################\n"
+printf "\nThis script will try and install the Meshing Around Bot and its dependencies."
+printf "Installer works best in raspian/debian/ubuntu, if there is a problem, try running the installer again.\n"
+printf "\nChecking for dependencies...\n"
 
+# Check and install dependencies
+if ! command -v python3 &> /dev/null
+then
+    printf "python3 not found, trying 'apt-get install python3 python3-pip'\n"
+    sudo apt-get install python3 python3-pip
+fi
+if ! command -v pip &> /dev/null
+then
+    printf "pip not found, trying 'apt-get install python3-pip'\n"
+    sudo apt-get install python3-pip
+fi
+
+# double check for python3 and pip
+if ! command -v python3 &> /dev/null
+then
+    printf "python3 not found, please install python3 with your OS\n"
+    exit 1
+fi
+if ! command -v pip &> /dev/null
+then
+    printf "pip not found, please install pip with your OS\n"
+    exit 1
+fi
+printf "\nDependencies installed\n"
 
 # add user to groups for serial access
-printf "\nAdding user to dialout and tty groups for serial access\n"
+printf "\nAdding user to dialout, bluetooth, and tty groups for serial access\n"
 sudo usermod -a -G dialout $USER
 sudo usermod -a -G tty $USER
 sudo usermod -a -G bluetooth $USER
 
-# check for pip
-if ! command -v pip &> /dev/null
-then
-    printf "pip not found, please install pip with your OS\n"
-    sudo apt-get install python3-pip
-else
-    printf "python pip found\n"
-fi
+# copy service files
+cp etc/pong_bot.tmp etc/pong_bot.service
+cp etc/mesh_bot.tmp etc/mesh_bot.service
+cp etc/mesh_bot_reporting.tmp etc/mesh_bot_reporting.service
 
 # generate config file, check if it exists
 if [ -f config.ini ]; then
@@ -34,34 +54,42 @@ if [ -f config.ini ]; then
 fi
 
 cp config.template config.ini
-printf "\nConfig file generated\n"
+printf "\nConfig files generated!\n"
 
-
-# set virtual environment and install dependencies
-printf "\nMeshing Around Installer\n"
-
-echo "Do you want to install the bot in a virtual environment? (y/n)"
+printf "\nDo you want to install the bot in a python virtual environment? (y/n)"
 read venv
 
 if [ $venv == "y" ]; then
     # set virtual environment
     if ! python3 -m venv --help &> /dev/null; then
-        printf "Python3 venv module not found, please install python3-venv with your OS\n"
+        printf "Python3/venv error, please install python3-venv with your OS\n"
         exit 1
     else
+        echo "The Following could be messy, or take some time on slower devices."
         echo "Creating virtual environment..."
-        python3 -m venv venv
-        source venv/bin/activate
-
         #check if python3 has venv module
         if [ -f venv/bin/activate ]; then
-            printf "\nFpund virtual environment for python\n"
+            printf "\nFound virtual environment for python\n"
+            python3 -m venv venv
+            source venv/bin/activate
         else
+            printf "\nVirtual environment not found, trying `sudo apt-get install python3-venv`\n"
             sudo apt-get install python3-venv
-            printf "\nPython3 venv module not found, please install python3-venv with your OS if not already done. re-run the script\n"
+        fi
+        # create virtual environment
+        python3 -m venv venv
+
+        # double check for python3-venv
+        if [ -f venv/bin/activate ]; then
+            printf "\nFound virtual environment for python\n"
+            source venv/bin/activate
+        else
+            printf "\nPython3 venv module not found, please install python3-venv with your OS\n"
             exit 1
         fi
 
+        printf "\nVirtual environment created\n"
+
         # config service files for virtual environment
         replace="s|python3 mesh_bot.py|/usr/bin/bash launch.sh mesh|g"
         sed -i "$replace" etc/mesh_bot.service
@@ -105,14 +133,6 @@ sed -i $replace etc/mesh_bot_reporting.service
 sudo systemctl daemon-reload
 printf "\n service files updated\n"
 
-# ask if emoji font should be installed for linux
-echo "Do you want to install the emoji font for debian/ubuntu linux? (y/n)"
-read emoji
-if [ $emoji == "y" ]; then
-    sudo apt-get install -y fonts-noto-color-emoji
-    echo "Emoji font installed!, reboot to load the font"
-fi
-
 if [ $bot == "pong" ]; then
     # install service for pong bot
     sudo cp etc/pong_bot.service /etc/systemd/system/
@@ -132,11 +152,19 @@ if [ $bot == "n" ]; then
     fi
 fi
 
-printf "\nOptionally if you want to install the LLM Ollama compnents we will execute the following commands\n"
+# ask if emoji font should be installed for linux
+printf "\nDo you want to install the emoji font for debian/ubuntu linux? (y/n)"
+read emoji
+if [ $emoji == "y" ]; then
+    sudo apt-get install -y fonts-noto-color-emoji
+    echo "Emoji font installed!, reboot to load the font"
+fi
+
+printf "\nOptionally if you want to install the multi gig LLM Ollama compnents we will execute the following commands\n"
 printf "\ncurl -fsSL https://ollama.com/install.sh | sh\n"
 
 # ask if the user wants to install the LLM Ollama components
-echo "Do you want to install the LLM Ollama components? (y/n)"
+printf "\nDo you want to install the LLM Ollama components? (y/n)"
 read ollama
 if [ $ollama == "y" ]; then
     curl -fsSL https://ollama.com/install.sh | sh
@@ -150,10 +178,16 @@ if [ $ollama == "y" ]; then
     fi
 fi
 
-echo "Good time to reboot? (y/n)"
+if [ $venv == "y" ]; then
+    printf "\nFor running in virtual, launch bot with './launch.sh mesh' in path $program_path\n"
+fi
+
+printf "\nGood time to reboot? (y/n)"
 read reboot
 if [ $reboot == "y" ]; then
     sudo reboot
 fi
 
+printf "\nInstallation complete!\n"
 exit 0
+

launch.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# This script launches the meshing-around bot or the report generator in python virtual environment
 
 # launch.sh
 cd "$(dirname "$0")"

mesh_bot.py

@@ -65,6 +65,7 @@ def auto_response(message, snr, rssi, hop, pkiStatus, message_from_id, channel_n
     "pong": lambda: "🏓PING!!🛜",
     "readnews": lambda: read_news(),
     "rlist": lambda: handle_repeaterQuery(message_from_id, deviceID, channel_number),
+    "satpass": lambda: handle_satpass(message_from_id, deviceID, channel_number, message),
     "setemail": lambda: handle_email(message_from_id, message),
     "setsms": lambda: handle_sms( message_from_id, message),
     "sitrep": lambda: handle_lheard(message, message_from_id, deviceID, isDM),
@@ -77,6 +78,7 @@ def auto_response(message, snr, rssi, hop, pkiStatus, message_from_id, channel_n
     "videopoker": lambda: handleVideoPoker(message, message_from_id, deviceID),
     "whereami": lambda: handle_whereami(message_from_id, deviceID, channel_number),
     "whoami": lambda: handle_whoami(message_from_id, deviceID, hop, snr, rssi, pkiStatus),
+    "whois": lambda: handle_whois(message, deviceID, channel_number, message_from_id),
     "wiki:": lambda: handle_wiki(message, isDM),
     "wiki?": lambda: handle_wiki(message, isDM),
     "wx": lambda: handle_wxc(message_from_id, deviceID, 'wx'),
@@ -170,6 +172,7 @@ def handle_ping(message_from_id, deviceID,  message, hop, snr, rssi, isDM, chann
         msg = msg + " #" + message.split("#")[1]
         type = type + " #" + message.split("#")[1]
 
+
     # check for multi ping request
     if " " in message:
         # if stop multi ping
@@ -179,27 +182,35 @@ def handle_ping(message_from_id, deviceID,  message, hop, snr, rssi, isDM, chann
                     multiPingList.pop(i)
                     msg = "🛑 auto-ping"
 
-        # if 3 or more entries (2 or more active), throttle the multi-ping for congestion
-        if len(multiPingList) > 2:
-            msg = "🚫⛔️ auto-ping, service busy. ⏳Try again soon."
-            pingCount = -1
-        else:
-            # set inital pingCount
-            try:
-                pingCount = int(message.split(" ")[1])
-                if pingCount == 123 or pingCount == 1234:
-                    pingCount =  1
-                if pingCount > 51:
-                    pingCount = 50
-            except:
+        # disabled in channel
+        if autoPingInChannel and not isDM:
+            # if 3 or more entries (2 or more active), throttle the multi-ping for congestion
+            if len(multiPingList) > 2:
+                msg = "🚫⛔️ auto-ping, service busy. ⏳Try again soon."
                 pingCount = -1
-    
-        if pingCount > 1:
-            multiPingList.append({'message_from_id': message_from_id, 'count': pingCount + 1, 'type': type, 'deviceID': deviceID, 'channel_number': channel_number, 'startCount': pingCount})
-            if type == "🎙TEST":
-                msg = f"🛜Initalizing BufferTest, using chunks of about {int(maxBuffer // pingCount)}, max length {maxBuffer} in {pingCount} messages"
             else:
-                msg = f"🚦Initalizing {pingCount} auto-ping"
+                # set inital pingCount
+                try:
+                    pingCount = int(message.split(" ")[1])
+                    if pingCount == 123 or pingCount == 1234:
+                        pingCount =  1
+                    if pingCount > 51:
+                        pingCount = 50
+                except:
+                    pingCount = -1
+        
+            if pingCount > 1:
+                multiPingList.append({'message_from_id': message_from_id, 'count': pingCount + 1, 'type': type, 'deviceID': deviceID, 'channel_number': channel_number, 'startCount': pingCount})
+                if type == "🎙TEST":
+                    msg = f"🛜Initalizing BufferTest, using chunks of about {int(maxBuffer // pingCount)}, max length {maxBuffer} in {pingCount} messages"
+                else:
+                    msg = f"🚦Initalizing {pingCount} auto-ping"
+        else:
+            msg = "🔊AutoPing via DM only⛔️"
+
+    # if not a DM add the username to the beginning of msg
+    if not isDM:
+        msg = get_name_from_number(message_from_id) + msg
             
     return msg
 
@@ -208,6 +219,11 @@ def handle_alertBell(message_from_id, deviceID, message):
     return random.choice(msg)
 
 def handle_emergency(message_from_id, deviceID, message):
+    # if user in bbs_ban_list return
+    if str(message_from_id) in bbs_ban_list:
+        # silent discard
+        logger.warning(f"System: {message_from_id} on spam list, no emergency responder alert sent")
+        return ''
     # trgger alert to emergency_responder_alert_channel
     if message_from_id != 0:
         if deviceID == 1: rxNode = myNodeNum1 
@@ -289,6 +305,34 @@ llmRunCounter = 0
 llmTotalRuntime = []
 llmLocationTable = [{'nodeID': 1234567890, 'location': 'No Location'},]
 
+def handle_satpass(message_from_id, deviceID, channel_number, message):
+    location = get_node_location(message_from_id, deviceID)
+    passes = ''
+    satList = satListConfig
+    message = message.lower()
+
+    # if user has a NORAD ID in the message
+    if "satpass " in message:
+        try:
+            userList = message.split("satpass ")[1].split(" ")[0]
+            #split userList and make into satList overrided the config.ini satList
+            satList = userList.split(",")
+        except:
+            return "example use:🛰️satpass 25544,33591"
+
+    # Detailed satellite pass
+    for bird in satList:
+        satPass = getNextSatellitePass(bird, str(location[0]), str(location[1]))
+        if satPass:
+            # append to passes
+            passes = passes + satPass + "\n"
+    # remove the last newline
+    passes = passes[:-1]
+
+    if passes == '':
+        passes = "No 🛰️ anytime soon"
+    return passes
+        
 def handle_llm(message_from_id, channel_number, deviceID, message, publicChannel):
     global llmRunCounter, llmLocationTable, llmTotalRuntime, cmdHistory
     location_name = 'no location provided'
@@ -813,6 +857,46 @@ def handle_whoami(message_from_id, deviceID, hop, snr, rssi, pkiStatus):
         msg = "Error in whoami"
     return msg
 
+def handle_whois(message, deviceID, channel_number, message_from_id):
+    #return data on a node name or number
+    if  "?" in message:
+        return message.split("?")[0].title() + " command returns information on a node."
+    else:
+        # get the nodeID from the message
+        msg = ''
+        node = ''
+        # find the requested node in db
+        if " " in message:
+            node = message.split(" ")[1]
+        if node.startswith("!") and len(node) == 9:
+            # mesh !hex
+            try:
+                node = int(node.strip("!"),16)
+            except ValueError as e:
+                node = 0
+        elif node.isalpha() or not node.isnumeric():
+            # try short name
+            node = get_num_from_short_name(node, deviceID)
+
+        # get details on the node
+        for i in range(len(seenNodes)):
+            if seenNodes[i]['nodeID'] == int(node):
+                msg = f"Node: {seenNodes[i]['nodeID']} is {get_name_from_number(seenNodes[i]['nodeID'], 'long', deviceID)}\n"
+                msg += f"Last 👀: {time.ctime(seenNodes[i]['lastSeen'])} "
+                break
+
+        if msg == '':
+            msg = "Provide a valid node number or short name"
+        else:
+            # if the user is an admin show the channel and interface and location
+            if str(message_from_id) in bbs_admin_list:
+                location = get_node_location(seenNodes[i]['nodeID'], deviceID, channel_number)
+                msg += f"Ch: {seenNodes[i]['channel']}, Int: {seenNodes[i]['rxInterface']}"
+                msg += f"Lat: {location[0]}, Lon: {location[1]}\n"
+                if location != [latitudeValue, longitudeValue]:
+                    msg += f"Loc: {where_am_i(str(location[0]), str(location[1]))}"
+        return msg
+
 def check_and_play_game(tracker, message_from_id, message_string, rxNode, channel_number, game_name, handle_game_func):
     global llm_enabled
 
@@ -964,6 +1048,9 @@ def onReceive(packet, interface):
             if hop_start == hop_limit:
                 hop = "Direct"
                 hop_count = 0
+            elif hop_start == 0 and hop_limit > 0:
+                hop = "MQTT"
+                hop_count = 0
             else:
                 # set hop to Direct if the message was sent directly otherwise set the hop count
                 if hop_away > 0:

modules/locationdata.py

@@ -457,7 +457,7 @@ def getIpawsAlert(lat=0, lon=0, shortAlerts = False):
     alerts = []
     
     # set the API URL for IPAWS
-    ipawsPIN = "000000"
+    namespace = "urn:oasis:names:tc:emergency:cap:1.2"
     alert_url = "https://apps.fema.gov/IPAWSOPEN_EAS_SERVICE/rest/feed"
     if ipawsPIN != "000000":
         alert_url += "?pin=" + ipawsPIN
@@ -482,6 +482,7 @@ def getIpawsAlert(lat=0, lon=0, shortAlerts = False):
             #pin check
             if ipawsPIN != "000000":
                 link += "?pin=" + ipawsPIN
+            # get the linked alert data from FEMA
             linked_data = requests.get(link, timeout=urlTimeoutSeconds)
             if not linked_data.ok:
                 #logger.warning(f"System: iPAWS Error fetching linked alert data from {link}")
@@ -495,21 +496,33 @@ def getIpawsAlert(lat=0, lon=0, shortAlerts = False):
 
         for info in linked_xml.getElementsByTagName("info"):
             # extract values from XML
-            eventCode_table = info.getElementsByTagName("eventCode")[0]
-            alertType = eventCode_table.getElementsByTagName("valueName")[0].childNodes[0].nodeValue
-            alertCode = eventCode_table.getElementsByTagName("value")[0].childNodes[0].nodeValue
-            headline = info.getElementsByTagName("headline")[0].childNodes[0].nodeValue
-            description = info.getElementsByTagName("description")[0].childNodes[0].nodeValue
-
-            area_table = info.getElementsByTagName("area")[0]
-            areaDesc = area_table.getElementsByTagName("areaDesc")[0].childNodes[0].nodeValue
-            
-            geocode_table = area_table.getElementsByTagName("geocode")[0]
-            geocode_type = geocode_table.getElementsByTagName("valueName")[0].childNodes[0].nodeValue
-            geocode_value = geocode_table.getElementsByTagName("value")[0].childNodes[0].nodeValue
             sameVal = "NONE"
-            if geocode_type == "SAME":
-                sameVal = geocode_value
+            geocode_value = "NONE"
+            description = ""
+            try:
+                eventCode_table = info.getElementsByTagName("eventCode")[0]
+                alertType = eventCode_table.getElementsByTagName("valueName")[0].childNodes[0].nodeValue
+                alertCode = eventCode_table.getElementsByTagName("value")[0].childNodes[0].nodeValue
+                headline = info.getElementsByTagName("headline")[0].childNodes[0].nodeValue
+                # use headline if no description
+                if info.getElementsByTagName("description") and info.getElementsByTagName("description")[0].childNodes:
+                    description = info.getElementsByTagName("description")[0].childNodes[0].nodeValue
+                else:
+                    logger.debug(f"System: report this to discord - iPAWS No description for alert: {headline}")
+                    description = headline
+
+                area_table = info.getElementsByTagName("area")[0]
+                areaDesc = area_table.getElementsByTagName("areaDesc")[0].childNodes[0].nodeValue
+                
+                geocode_table = area_table.getElementsByTagName("geocode")[0]
+                geocode_type = geocode_table.getElementsByTagName("valueName")[0].childNodes[0].nodeValue
+                geocode_value = geocode_table.getElementsByTagName("value")[0].childNodes[0].nodeValue
+                if geocode_type == "SAME":
+                    sameVal = geocode_value
+            except Exception as e:
+                logger.warning(f"System: iPAWS Error extracting alert data: {link}")
+                #print(f"DEBUG: {info.toprettyxml()}")
+                continue
 
             # check if the alert is for the current location, if wanted keep alert
             if (sameVal in mySAME) or (geocode_value in mySAME):
@@ -547,4 +560,3 @@ def getIpawsAlert(lat=0, lon=0, shortAlerts = False):
         alert = NO_ALERTS
 
     return alert
-

modules/log.py

@@ -74,4 +74,22 @@ if log_messages_to_file:
     file_handler = TimedRotatingFileHandler('logs/messages.log', when='midnight', backupCount=log_backup_count)
     file_handler.setLevel(logging.INFO) # INFO used for messages to disk
     file_handler.setFormatter(logging.Formatter(msgLogFormat))
-    msgLogger.addHandler(file_handler)
+    msgLogger.addHandler(file_handler)
+
+# Pretty Timestamp
+def getPrettyTime(seconds):
+    # convert unix time to minutes, hours, or days, or years for simple display
+    designator = "s"
+    if seconds > 0:
+        seconds = round(seconds / 60)
+        designator = "m"
+    if seconds > 60:
+        seconds = round(seconds / 60)
+        designator = "h"
+    if seconds > 24:
+        seconds = round(seconds / 24)
+        designator = "d"
+    if seconds > 365:
+        seconds = round(seconds / 365)
+        designator = "y"
+    return str(seconds) + designator

modules/settings.py

@@ -122,6 +122,7 @@ try:
     welcome_message = (f"{welcome_message}").replace('\\n', '\n') # allow for newlines in the welcome message
     motd_enabled = config['general'].getboolean('motdEnabled', True)
     MOTD = config['general'].get('motd', MOTD)
+    autoPingInChannel = config['general'].getboolean('autoPingInChannel', False)
     enableCmdHistory = config['general'].getboolean('enableCmdHistory', True)
     lheardCmdIgnoreNode = config['general'].get('lheardCmdIgnoreNode', '').split(',')
     whoami_enabled = config['general'].getboolean('whoami', True)
@@ -158,10 +159,13 @@ try:
     wxAlertsEnabled = config['location'].getboolean('NOAAalertsEnabled', True) # default True not enabled yet
     repeater_lookup = config['location'].get('repeaterLookup', 'rbook') # default repeater lookup source
     mySAME = config['location'].get('mySAME', '').split(',') # default empty
+    ipawsPIN = config['location'].get('ipawsPIN', '000000') # default 000000
     femaAlertBroadcastEnabled = config['location'].getboolean('femaAlertBroadcastEnabled', False) # default False
     femaAlertBroadcastCh = config['location'].get('femaAlertBroadcastCh', '2').split(',') # default Channel 2
     wxAlertBroadcastEnabled = config['location'].getboolean('wxAlertBroadcastEnabled', False) # default False
     ignoreFEMAtest = config['location'].getboolean('ignoreFEMAtest', True) # default True
+    n2yoAPIKey = config['location'].get('n2yoAPIKey', '') # default empty
+    satListConfig = config['location'].get('satList', '25544').split(',') # default 25544 ISS
     # brodcast channel for weather alerts
     wxAlertBroadcastChannel = config['location'].get('wxAlertBroadcastCh')
     if wxAlertBroadcastChannel:

modules/space.py

@@ -9,7 +9,7 @@ import ephem # pip install pyephem
 from datetime import timedelta
 from modules.log import *
 
-trap_list_solarconditions = ("sun", "solar", "hfcond")
+trap_list_solarconditions = ("sun", "solar", "hfcond", "satpass")
 
 def hf_band_conditions():
     # ham radio HF band conditions
@@ -140,3 +140,43 @@ def get_moon(lat=0, lon=0):
         + "\nFullMoon:" + moon_table['next_full_moon'] + "\nNewMoon:" + moon_table['next_new_moon']
     
     return moon_data
+
+def getNextSatellitePass(satellite, lat=0, lon=0):
+    pass_data = ''
+    # get the next satellite pass for a given satellite
+    visualPassAPI = "https://api.n2yo.com/rest/v1/satellite/visualpasses/"
+    if lat == 0 and lon == 0:
+        lat = latitudeValue
+        lon = longitudeValue
+    # API URL
+    if n2yoAPIKey == '':
+        logger.error("System: Missing API key free at https://www.n2yo.com/login/")
+        return "not configured, bug your sysop"
+    url = visualPassAPI + str(satellite) + "/" + str(lat) + "/" + str(lon) + "/0/2/300/" + "&apiKey=" + n2yoAPIKey
+    # get the next pass data
+    try:
+        if not int(satellite):
+            raise Exception("Invalid satellite number")
+        next_pass_data = requests.get(url, timeout=urlTimeoutSeconds)
+        if(next_pass_data.ok):
+            pass_json = next_pass_data.json()
+            if 'info' in pass_json and 'passescount' in pass_json['info'] and pass_json['info']['passescount'] > 0:
+                satname = pass_json['info']['satname']
+                pass_time = pass_json['passes'][0]['startUTC']
+                pass_duration = pass_json['passes'][0]['duration']
+                pass_maxEl = pass_json['passes'][0]['maxEl']
+                pass_rise_time = datetime.fromtimestamp(pass_time).strftime('%a %d %I:%M%p')
+                pass_startAzCompass = pass_json['passes'][0]['startAzCompass']
+                pass_set_time = datetime.fromtimestamp(pass_time + pass_duration).strftime('%a %d %I:%M%p')
+                pass__endAzCompass = pass_json['passes'][0]['endAzCompass']
+                pass_data = f"{satname} @{pass_rise_time} Az:{pass_startAzCompass} for{getPrettyTime(pass_duration)}, MaxEl:{pass_maxEl}° Set@{pass_set_time} Az:{pass__endAzCompass}"
+            elif pass_json['info']['passescount'] == 0:
+                satname = pass_json['info']['satname']
+                pass_data = f"{satname} has no upcoming passes"
+        else:
+            logger.error(f"System: Error fetching satellite pass data {satellite}")
+            pass_data = ERROR_FETCHING_DATA
+    except Exception as e:
+        logger.warning(f"System: User supplied value {satellite} unknown or invalid")
+        pass_data = "Provide NORAD# example use:🛰️satpass 25544,33591"
+    return pass_data

modules/system.py

@@ -13,7 +13,7 @@ from modules.log import *
 
 # Global Variables
 trap_list = ("cmd","cmd?") # default trap list
-help_message = "Bot CMD?:\n"
+help_message = "Bot CMD?:"
 asyncLoop = asyncio.new_event_loop()
 games_enabled = False
 multiPingList = [{'message_from_id': 0, 'count': 0, 'type': '', 'deviceID': 0, 'channel_number': 0, 'startCount': 0}]
@@ -51,15 +51,17 @@ if emergency_responder_enabled:
     
 # whoami Configuration
 if whoami_enabled:
-    trap_list_whoami = ("whoami", "📍")
+    trap_list_whoami = ("whoami", "📍", "whois")
     trap_list = trap_list + trap_list_whoami
     help_message = help_message + ", whoami"
 
 # Solar Conditions Configuration
 if solar_conditions_enabled:
-    from modules.solarconditions import * # from the spudgunman/meshing-around repo
+    from modules.space import * # from the spudgunman/meshing-around repo
     trap_list = trap_list + trap_list_solarconditions # items hfcond, solar, sun, moon
     help_message = help_message + ", sun, hfcond, solar, moon"
+    if n2yoAPIKey != "":
+        help_message = help_message + ", satpass"
 else:
     hf_band_conditions = False
 
@@ -191,6 +193,14 @@ if file_monitor_enabled or read_news_enabled:
         trap_list = trap_list + trap_list_filemon # items readnews
         help_message = help_message + ", readmail"
 
+# clean up the help message
+help_message = help_message.split(", ")
+help_message.sort()
+if len(help_message) > 20:
+    # split in half for formatting
+    help_message = help_message[:len(help_message)//2] + ["\nCMD?"] + help_message[len(help_message)//2:]
+help_message = ", ".join(help_message)
+
 # BLE dual interface prevention
 if interface1_type == 'ble' and interface2_type == 'ble':
     logger.critical(f"System: BLE Interface1 and Interface2 cannot both be BLE. Exiting")
@@ -513,7 +523,7 @@ def send_message(message, ch, nodeid=0, nodeInt=1, bypassChuncking=False):
             if nodeid == 0:
                 # Send to channel
                 if wantAck:
-                    logger.info(f"Device:{nodeInt} Channel:{ch} " + CustomFormatter.red + f"req.ACK " + "Chunker{chunkOf} SendingChannel: " + CustomFormatter.white + m.replace('\n', ' '))
+                    logger.info(f"Device:{nodeInt} Channel:{ch} " + CustomFormatter.red + f"req.ACK " + f"Chunker{chunkOf} SendingChannel: " + CustomFormatter.white + m.replace('\n', ' '))
                     interface.sendText(text=m, channelIndex=ch, wantAck=True)
                 else:
                     logger.info(f"Device:{nodeInt} Channel:{ch} " + CustomFormatter.red + f"Chunker{chunkOf} SendingChannel: " + CustomFormatter.white + m.replace('\n', ' '))
@@ -584,23 +594,6 @@ def get_wikipedia_summary(search_term):
     
     return summary
 
-def getPrettyTime(seconds):
-    # convert unix time to minutes, hours, or days, or years for simple display
-    designator = "s"
-    if seconds > 0:
-        seconds = round(seconds / 60)
-        designator = "m"
-    if seconds > 60:
-        seconds = round(seconds / 60)
-        designator = "h"
-    if seconds > 24:
-        seconds = round(seconds / 24)
-        designator = "d"
-    if seconds > 365:
-        seconds = round(seconds / 365)
-        designator = "y"
-    return str(seconds) + designator
-
 def messageTrap(msg):
     # Check if the message contains a trap word, this is the first filter for listning to messages
     # after this the message is passed to the command_handler in the bot.py which is switch case filter for applying word to function
@@ -1043,12 +1036,11 @@ async def handleSentinel(deviceID=1):
     
     if handleSentinel_loop >= sentry_holdoff and handleSentinel_spotted != enemySpotted:
         # check the positionMetadata for nodeID and get metadata
-        if positionMetadata and closest_nodes[0]['id'] in positionMetadata:
+        if closest_nodes and positionMetadata and closest_nodes[0]['id'] in positionMetadata:
             metadata = positionMetadata[closest_nodes[0]['id']]
             if metadata.get('precisionBits') is not None:
                 resolution = metadata.get('precisionBits')
                 
-
         logger.warning(f"System: {enemySpotted} is close to your location on Interface1 Accuracy is {resolution}bits")
         send_message(f"Sentry{deviceID}: {enemySpotted}", secure_channel, 0, deviceID)
         if enableSMTP and email_sentry_alerts:
@@ -1129,4 +1121,3 @@ async def watchdog():
                 except Exception as e:
                     logger.error(f"System: retrying interface2: {e}")
 
-

pong_bot.py

@@ -90,6 +90,7 @@ def handle_ping(message_from_id, deviceID,  message, hop, snr, rssi, isDM, chann
         msg = msg + " #" + message.split("#")[1]
         type = type + " #" + message.split("#")[1]
 
+
     # check for multi ping request
     if " " in message:
         # if stop multi ping
@@ -99,27 +100,35 @@ def handle_ping(message_from_id, deviceID,  message, hop, snr, rssi, isDM, chann
                     multiPingList.pop(i)
                     msg = "🛑 auto-ping"
 
-        # if 3 or more entries (2 or more active), throttle the multi-ping for congestion
-        if len(multiPingList) > 2:
-            msg = "🚫⛔️ auto-ping, service busy. ⏳Try again soon."
-            pingCount = -1
-        else:
-            # set inital pingCount
-            try:
-                pingCount = int(message.split(" ")[1])
-                if pingCount == 123 or pingCount == 1234:
-                    pingCount =  1
-                if pingCount > 51:
-                    pingCount = 50
-            except:
+        # disabled in channel
+        if autoPingInChannel and not isDM:
+            # if 3 or more entries (2 or more active), throttle the multi-ping for congestion
+            if len(multiPingList) > 2:
+                msg = "🚫⛔️ auto-ping, service busy. ⏳Try again soon."
                 pingCount = -1
-    
-        if pingCount > 1:
-            multiPingList.append({'message_from_id': message_from_id, 'count': pingCount + 1, 'type': type, 'deviceID': deviceID, 'channel_number': channel_number, 'startCount': pingCount})
-            if type == "🎙TEST":
-                msg = f"🛜Initalizing BufferTest, using chunks of about {int(maxBuffer // pingCount)}, max length {maxBuffer} in {pingCount} messages"
             else:
-                msg = f"🚦Initalizing {pingCount} auto-ping"
+                # set inital pingCount
+                try:
+                    pingCount = int(message.split(" ")[1])
+                    if pingCount == 123 or pingCount == 1234:
+                        pingCount =  1
+                    if pingCount > 51:
+                        pingCount = 50
+                except:
+                    pingCount = -1
+        
+            if pingCount > 1:
+                multiPingList.append({'message_from_id': message_from_id, 'count': pingCount + 1, 'type': type, 'deviceID': deviceID, 'channel_number': channel_number, 'startCount': pingCount})
+                if type == "🎙TEST":
+                    msg = f"🛜Initalizing BufferTest, using chunks of about {int(maxBuffer // pingCount)}, max length {maxBuffer} in {pingCount} messages"
+                else:
+                    msg = f"🚦Initalizing {pingCount} auto-ping"
+        else:
+            msg = "🔊AutoPing via DM only⛔️"
+
+    # if not a DM add the username to the beginning of msg
+    if not isDM:
+        msg = get_name_from_number(message_from_id) + msg
             
     return msg
 
@@ -229,6 +238,9 @@ def onReceive(packet, interface):
             if hop_start == hop_limit:
                 hop = "Direct"
                 hop_count = 0
+            elif hop_start == 0 and hop_limit > 0:
+                hop = "MQTT"
+                hop_count = 0
             else:
                 # set hop to Direct if the message was sent directly otherwise set the hop count
                 if hop_away > 0: