Update install.sh

config register set in config.ini for hop logs

README.md

@@ -54,6 +54,7 @@ Welcome to the Mesh Bot project! This feature-rich bot is designed to enhance yo
 ### EAS Alerts
 - **FEMA iPAWS/EAS Alerts via API**: Use an internet-connected node to message Emergency Alerts from FEMA
 - **NOAA EAS Alerts via API**: Use an internet-connected node to message Emergency Alerts from NOAA.
+- **USGS Volcano Alerts via API**: Use an internet-connected node to message Emergency Alerts from USGS.
 - **EAS Alerts over the air**: Utilizing external tools to report EAS alerts offline over mesh.
 - **NINA alerts for Germany**: Emergency Alerts from xrepository.de feed
 
@@ -235,6 +236,8 @@ enableDEalerts = False # Use DE Alert Broadcast Data see template for filters
 wxAlertBroadcastEnabled = True
 # EAS Alert Broadcast Channels
 wxAlertBroadcastCh = 2,4
+ignoreEASenable = True # Ignore any headline that includes followig word list
+ignoreEASwords = test,advisory
 ```
 
 ### Repeater Settings
@@ -333,9 +336,20 @@ In the config.ini enable the module
 ```ini
 [scheduler]
 # enable or disable the scheduler module
-enabled = True
+enabled = False
+# interface to send the message to
+interface = 1
+# channel to send the message to
+channel = 2
+message = "MeshBot says Hello! DM for more info."
+# value can be min,hour,day,mon,tue,wed,thu,fri,sat,sun
+value =
+# interval to use when time is not set (e.g. every 2 days)
+interval = 
+# time of day in 24:00 hour format when value is 'day' and interval is not set
+time =
 ```
- The actions are via code only at this time. See mesh_bot.py around line [1097](https://github.com/SpudGunMan/meshing-around/blob/e94581936530c76ea43500eebb43f32ba7ed5e19/mesh_bot.py#L1097) to edit the schedule. See [schedule documentation](https://schedule.readthedocs.io/en/stable/) for more. Recomend to backup changes so they dont get lost.
+ The basic brodcast message can be setup in condig.ini. For advanced, See mesh_bot.py around the bottom of file, line [1491](https://github.com/SpudGunMan/meshing-around/blob/e94581936530c76ea43500eebb43f32ba7ed5e19/mesh_bot.py#L1491) to edit the schedule. See [schedule documentation](https://schedule.readthedocs.io/en/stable/) for more. Recomend to backup changes so they dont get lost.
 
 ```python
 #Send WX every Morning at 08:00 using handle_wxc function to channel 2 on device 1
@@ -386,7 +400,8 @@ There is no direct support for MQTT in the code, however, reports from Discord a
 | `riverflow` | Return information from NOAA for river flow info. Example: `riverflow modules/settings.py`| |
 | `solar` | Gives an idea of the x-ray flux | |
 | `sun` and `moon` | Return info on rise and set local time | ✅ |
-| `tide` | Returns the local tides (NOAA data source) |
+| `tide` | Returns the local tides (NOAA data source) | |
+| `valert` | Returns USGS Volcano Data | |
 | `wx` and `wxc` | Return local weather forecast (wxc is metric value), NOAA or Open Meteo for weather forecasting | |
 | `wxa` and `wxalert` | Return NOAA alerts. Short title or expanded details | |
 
@@ -460,11 +475,11 @@ I used ideas and snippets from other responder bots and want to call them out!
 - **[https://github.com/A-c0rN](A-c0rN)**: Assistance with iPAWS and EAS
 - **Mike O'Connell/skrrt**: For [eas_alert_parser](etc/eas_alert_parser.py) enhanced by **sheer.cold**
 - **PiDiBi**: For looking at test functions and other suggestions like wxc, CPU use, and alerting ideas.
-- **WH6GXZ nurse dude**: For bashing on installer
+- **WH6GXZ nurse dude**: For bashing on installer, Volcano Alerts 🌋
 - **Josh**: For more bashing on installer!
 - **dj505**: trying it on windows!
 - **mikecarper**: ideas, and testing. hamtest
-- **Cisien, bitflip, **Woof**, **propstg**, **Josh** and Hailo1999**: For testing and feature ideas on Discord and GitHub.
+- **Cisien, bitflip, **Woof**, **propstg**, **trs2982**, **Josh** and Hailo1999**: For testing and feature ideas on Discord and GitHub.
 - **Meshtastic Discord Community**: For tossing out ideas and testing code.
 
 ### Tools

config.template

@@ -140,6 +140,9 @@ riverListDefault =
 
 # NOAA EAS Alert Broadcast
 wxAlertBroadcastEnabled = False
+#  Enable Ignore any message that includes following word list
+ignoreEASenable = False
+ignoreEASwords = test,advisory
 # EAS Alert Broadcast Channels
 wxAlertBroadcastCh = 2
 # Add extra location to the weather alert
@@ -151,13 +154,20 @@ eAlertBroadcastEnabled = False
 eAlertBroadcastCh = 2
 
 # FEMA Alert Broadcast Settings
-#  Enable Ignore any headline that includes followig word list
+#  Enable Ignore any headline that includes following word list
 ignoreFEMAenable = True
 ignoreFEMAwords = test,exercise
 # comma separated list of codes (e.g., SAME,FIPS,ZIP) trigger local alert.
 # find your SAME https://www.weather.gov/nwr/counties
 mySAME = 053029,053073
 
+# USGS Volcano alerts Enable USGS Volcano Alert Broadcast
+volcanoAlertBroadcastEnabled = False
+volcanoAlertBroadcastCh = 2
+# Enable Ignore any message that includes following word list
+ignoreUSGSEnable = False
+ignoreUSGSWords = test,advisory
+
 # Use DE Alert Broadcast Data
 enableDEalerts = False
 # comma separated list of regional codes trigger local alert.
@@ -196,6 +206,17 @@ repeater_channels =
 [scheduler]
 # enable or disable the scheduler module
 enabled = False
+# interface to send the message to
+interface = 1
+# channel to send the message to
+channel = 2
+message = "MeshBot says Hello! DM for more info."
+# value can be min,hour,day,mon,tue,wed,thu,fri,sat,sun
+value =
+# interval to use when time is not set (e.g. every 2 days)
+interval = 
+# time of day in 24:00 hour format when value is 'day' and interval is not set
+time =
 
 [radioMon]
 # using Hamlib rig control will monitor and alert on channel use
@@ -272,5 +293,7 @@ MESSAGE_CHUNK_SIZE = 160
 wantAck = False
 # Max limit buffer for radio testing. 233 is hard limit 2.5+ firmware
 maxBuffer = 200
+#Enable Extra logging of Hop count data
+enableHopLogs = False
 
 

install.sh

@@ -4,6 +4,7 @@
 # install.sh
 cd "$(dirname "$0")"
 program_path=$(pwd)
+chronjob="0 1 * * * /usr/bin/python3 $program_path/etc/report_generator5.py"
 printf "\n########################"
 printf "\nMeshing Around Installer\n"
 printf "########################\n"
@@ -193,17 +194,19 @@ if [[ $(echo "${meshbotservice}" | grep -i "^y") ]] || [[ $(echo "${embedded}" |
     sudo usermod -a -G meshbot meshbot
     whoami="meshbot"
     echo "Added user meshbot with no home directory"
-    sudo usermod -a -G dialout $whoami
-    sudo usermod -a -G tty $whoami
-    sudo usermod -a -G bluetooth $whoami
-    echo "Added meshbot to dialout, tty, and bluetooth groups"
-
-    sudo chown -R $whoami:$whoami $program_path/logs
-    sudo chown -R $whoami:$whoami $program_path/data
-    echo "Permissions set for meshbot on logs and data directories"
 else
     whoami=$(whoami)
 fi
+# set basic permissions for the bot user
+sudo usermod -a -G dialout $whoami
+sudo usermod -a -G tty $whoami
+sudo usermod -a -G bluetooth $whoami
+echo "Added user $whoami to dialout, tty, and bluetooth groups"
+
+sudo chown -R $whoami:$whoami $program_path/logs
+sudo chown -R $whoami:$whoami $program_path/data
+echo "Permissions set for meshbot on logs and data directories"
+
 # set the correct user in the service file
 replace="s|User=pi|User=$whoami|g"
 sed -i $replace etc/pong_bot.service
@@ -276,6 +279,8 @@ if [[ $(echo "${embedded}" | grep -i "^n") ]]; then
     printf "sudo journalctl -u %s.service\n" "$service" >> install_notes.txt
     printf "sudo systemctl stop %s.service\n" "$service" >> install_notes.txt
     printf "sudo systemctl disable %s.service\n" "$service" >> install_notes.txt
+    printf "Reporting chron job added to run report_generator5.py\n" >> install_notes.txt
+    printf "chronjob: %s\n" "$chronjob" >> install_notes.txt
     
     if [[ $(echo "${venv}" | grep -i "^y") ]]; then
         printf "\nFor running on venv, virtual launch bot with './launch.sh mesh' in path $program_path\n" >> install_notes.txt
@@ -305,6 +310,14 @@ else
     sudo systemctl daemon-reload
     sudo systemctl enable $service.service
     sudo systemctl start $service.service
+    # check if the cron job already exists
+    if ! crontab -l | grep -q "$chronjob"; then
+        # add the cron job to run the report_generator5.py script
+        (crontab -l 2>/dev/null; echo "$chronjob") | crontab -
+        printf "\nAdded cron job to run report_generator5.py\n"
+    else
+        printf "\nCron job already exists, skipping\n"
+    fi
     printf "Reference following commands:\n\n" "$service" > install_notes.txt
     printf "sudo systemctl status %s.service\n" "$service" >> install_notes.txt
     printf "sudo systemctl start %s.service\n" "$service" >> install_notes.txt
@@ -328,7 +341,6 @@ exit 0
 # sudo systemctl stop mesh_bot_reporting
 # sudo systemctl disable mesh_bot_reporting
 # sudo rm /etc/systemd/system/mesh_bot.service
-# sudo rm /etc/systemd/system/mesh_bot_reporting.service
 # sudo rm /etc/systemd/system/mesh_bot_w3.service
 # sudo rm /etc/systemd/system/pong_bot.service
 # sudo systemctl daemon-reload

logs/README.md

@@ -24,4 +24,18 @@ log_backup_count = 32
 ## Web Reporting WebServer
 There is a web-server module. You can run `python3 modules/web.py` from the project root directory and it will serve up the web content.
 
-find it at. http://localhost:8420
+find it at. http://localhost:8420
+
+If you have linux-native running and errors such as..
+```bash
+  File "/usr/lib/python3.11/http/server.py", line 136, in server_bind
+    socketserver.TCPServer.server_bind(self)
+  File "/usr/lib/python3.11/socketserver.py", line 472, in server_bind
+    self.socket.bind(self.server_address)
+```
+modify the modules/web.py to use a real IP address, meshtasticD-native is binding to 127.0.0.1
+
+```python
+# Set the desired IP address
+server_ip = '127.0.0.1'
+```

mesh_bot.py

@@ -20,7 +20,6 @@ restrictedResponse = "🤖only available in a Direct Message📵" # "" for none
 
 # Global Variables
 DEBUGpacket = False # Debug print the packet rx
-DEBUGhops = False # Debug print hop info and bad hop count packets
 
 def auto_response(message, snr, rssi, hop, pkiStatus, message_from_id, channel_number, deviceID, isDM):
     global cmdHistory
@@ -85,6 +84,7 @@ def auto_response(message, snr, rssi, hop, pkiStatus, message_from_id, channel_n
     "test": lambda: handle_ping(message_from_id, deviceID, message, hop, snr, rssi, isDM, channel_number),
     "testing": lambda: handle_ping(message_from_id, deviceID, message, hop, snr, rssi, isDM, channel_number),
     "tide": lambda: handle_tide(message_from_id, deviceID, channel_number),
+    "valert": lambda: get_volcano_usgs(),
     "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),
@@ -857,8 +857,12 @@ def sysinfo(message, message_from_id, deviceID):
         if enable_runShellCmd and file_monitor_enabled:
             # get the system information from the shell script
             # this is an example of how to run a shell script and return the data
-            shellData = call_external_script(None, "script/sysEnv.sh").rstrip()
-            return get_sysinfo(message_from_id, deviceID) + "\n" + shellData
+            shellData = call_external_script(None, "script/sysEnv.sh")
+            # check if the script returned data
+            if shellData == "" or shellData == None:
+                # no data returned from the script
+                shellData = "shell script data missing"
+            return get_sysinfo(message_from_id, deviceID) + "\n" + shellData.rstrip()
         else:
             return get_sysinfo(message_from_id, deviceID)
 
@@ -899,7 +903,7 @@ def handle_history(message, nodeid, deviceID, isDM, lheard=False):
             prettyTime = getPrettyTime(cmdTime)
 
             # history display output
-            if nodeid in bbs_admin_list and cmdHistory[i]['nodeID'] not in lheardCmdIgnoreNode:
+            if str(nodeid) in bbs_admin_list and cmdHistory[i]['nodeID'] not in lheardCmdIgnoreNode:
                 buffer.append((get_name_from_number(cmdHistory[i]['nodeID'], 'short', deviceID), cmdHistory[i]['cmd'], prettyTime))
             elif cmdHistory[i]['nodeID'] == nodeid and cmdHistory[i]['nodeID'] not in lheardCmdIgnoreNode:
                 buffer.append((get_name_from_number(nodeid, 'short', deviceID), cmdHistory[i]['cmd'], prettyTime))
@@ -1189,7 +1193,7 @@ def onReceive(packet, interface):
                 else:
                     hop_start = 0
             
-            if DEBUGhops:
+            if enableHopLogs:
                 logger.debug(f"System: Packet HopDebugger: hop_away:{hop_away} hop_limit:{hop_limit} hop_start:{hop_start}")
                 if hop_away == 0 and hop_limit == 0 and hop_start == 0:
                     logger.debug(f"System: Packet HopDebugger: No hop count found in PACKET {packet} END PACKET")
@@ -1336,14 +1340,18 @@ def onReceive(packet, interface):
                     # if QRZ enabled check if we have said hello
                     if qrz_hello_enabled:
                         if never_seen_before(message_from_id):
-                            name = {get_name_from_number(message_from_id, 'short', rxNode)}
-                            # add to qrz_hello list
-                            hello(message_from_id, name)
-                            # send a hello message as a DM
-                            if not train_qrz:
-                                time.sleep(responseDelay)
-                                send_message(f"Hello {name} {qrz_hello_string}", channel_number, message_from_id, rxNode)
-                                time.sleep(responseDelay)
+                            name = get_name_from_number(message_from_id, 'short', rxNode)
+                            if isinstance(name, str) and name.startswith("!") and len(name) == 9:
+                                # we didnt get a info packet yet so wait and ingore this go around
+                                logger.debug(f"System: QRZ Hello ignored, no info packet yet")
+                            else:
+                                # add to qrz_hello list
+                                hello(message_from_id, name)
+                                # send a hello message as a DM
+                                if not train_qrz:
+                                    time.sleep(responseDelay)
+                                    send_message(f"Hello {name} {qrz_hello_string}", channel_number, message_from_id, rxNode)
+                                    time.sleep(responseDelay)
         else:
             # Evaluate non TEXT_MESSAGE_APP packets
             consumeMetadata(packet, rxNode)
@@ -1366,8 +1374,9 @@ async def start_rx():
     
     if llm_enabled:
         logger.debug(f"System: Ollama LLM Enabled, loading model {llmModel} please wait")
-        llm_query(" ")
-        logger.debug(f"System: LLM model {llmModel} loaded")
+        llmLoad = llm_query(" ")
+        if "trouble" not in llmLoad:
+            logger.debug(f"System: LLM Model {llmModel} loaded")
 
     if log_messages_to_file:
         logger.debug("System: Logging Messages to disk")
@@ -1419,6 +1428,8 @@ async def start_rx():
         logger.debug(f"System: Emergency Alert Broadcast Enabled on channels {emergencyAlertBroadcastCh}")
     if emergency_responder_enabled:
         logger.debug(f"System: Emergency Responder Enabled on channels {emergency_responder_alert_channel} for interface {emergency_responder_alert_interface}")
+    if volcanoAlertBroadcastEnabled:
+        logger.debug(f"System: Volcano Alert Broadcast Enabled on channels {volcanoAlertBroadcastChannel}")
     if qrz_hello_enabled and train_qrz:
         logger.debug(f"System: QRZ Welcome/Hello Enabled with training mode")
     if qrz_hello_enabled and not train_qrz:
@@ -1433,11 +1444,51 @@ async def start_rx():
         else:
             logger.debug(f"System: SMTP Email Alerting Enabled")
     if scheduler_enabled:
-        # Examples of using the scheduler, Times here are in 24hr format
-        # https://schedule.readthedocs.io/en/stable/
-        
         # Reminder Scheduler is enabled every Monday at noon send a log message
-        schedule.every().monday.at("12:00").do(lambda: logger.info("System: Scheduled Broadcast Reminder"))
+        schedule.every().monday.at("12:00").do(lambda: logger.info("System: Scheduled Broadcast Enabled Reminder"))
+
+        # basic scheduler
+        if schedulerValue != '':
+            logger.debug(f"System: Starting the broadcast scheduler from config.ini")
+            if schedulerValue.lower() == 'day':
+                if schedulerTime != '':
+                    # Send a message every day at the time set in schedulerTime
+                    schedule.every().day.at(schedulerTime).do(lambda: send_message(schedulerMessage, schedulerChannel, 0, schedulerInterface))
+                else:
+                    # Send a message every day at the time set in schedulerInterval
+                    schedule.every(int(schedulerInterval)).days.do(lambda: send_message(schedulerMessage, schedulerChannel, 0, schedulerInterface))
+            elif 'mon' in schedulerValue.lower() and schedulerTime != '':
+                # Send a message every Monday at the time set in schedulerTime
+                schedule.every().monday.at(schedulerTime).do(lambda: send_message(schedulerMessage, schedulerChannel, 0, schedulerInterface))
+            elif 'tue' in schedulerValue.lower() and schedulerTime != '':
+                # Send a message every Tuesday at the time set in schedulerTime
+                schedule.every().tuesday.at(schedulerTime).do(lambda: send_message(schedulerMessage, schedulerChannel, 0, schedulerInterface))
+            elif 'wed' in schedulerValue.lower() and schedulerTime != '':
+                # Send a message every Wednesday at the time set in schedulerTime
+                schedule.every().wednesday.at(schedulerTime).do(lambda: send_message(schedulerMessage, schedulerChannel, 0, schedulerInterface))
+            elif 'thu' in schedulerValue.lower() and schedulerTime != '':
+                # Send a message every Thursday at the time set in schedulerTime
+                schedule.every().thursday.at(schedulerTime).do(lambda: send_message(schedulerMessage, schedulerChannel, 0, schedulerInterface))
+            elif 'fri' in schedulerValue.lower() and schedulerTime != '':
+                # Send a message every Friday at the time set in schedulerTime
+                schedule.every().friday.at(schedulerTime).do(lambda: send_message(schedulerMessage, schedulerChannel, 0, schedulerInterface))
+            elif 'sat' in schedulerValue.lower() and schedulerTime != '':
+                # Send a message every Saturday at the time set in schedulerTime
+                schedule.every().saturday.at(schedulerTime).do(lambda: send_message(schedulerMessage, schedulerChannel, 0, schedulerInterface))
+            elif 'sun' in schedulerValue.lower() and schedulerTime != '':
+                # Send a message every Sunday at the time set in schedulerTime
+                schedule.every().sunday.at(schedulerTime).do(lambda: send_message(schedulerMessage, schedulerChannel, 0, schedulerInterface))
+            elif 'hour' in schedulerValue.lower():
+                # Send a message every hour at the time set in schedulerTime
+                schedule.every(int(schedulerInterval)).hours.do(lambda: send_message(schedulerMessage, schedulerChannel, 0, schedulerInterface))
+            elif 'min' in schedulerValue.lower():
+                # Send a message every minute at the time set in schedulerTime
+                schedule.every(int(schedulerInterval)).minutes.do(lambda: send_message(schedulerMessage, schedulerChannel, 0, schedulerInterface))
+        else:
+            logger.debug(f"System: Starting the broadcast scheduler")
+
+        # Enhanced Examples of using the scheduler, Times here are in 24hr format
+        # https://schedule.readthedocs.io/en/stable/
 
         # Good Morning Every day at 09:00 using send_message function to channel 2 on device 1
         #schedule.every().day.at("09:00").do(lambda: send_message("Good Morning", 2, 0, 1))
@@ -1471,7 +1522,6 @@ async def start_rx():
 
         # Send bbslink looking for peers every other day at 10:00 using send_message function to channel 3 on device 1
         #schedule.every(2).days.at("10:00").do(lambda: send_message("bbslink MeshBot looking for peers", 3, 0, 1))
-        logger.debug("System: Starting the broadcast scheduler")
         await BroadcastScheduler()
 
     # here we go loopty loo

modules/README.md

@@ -39,4 +39,16 @@ To help with code testing see `etc/simulator.py` to simulate a bot. I also enjoy
     ```
 
 5. **Test the New Command**:
-   Run MeshBot and test the new command by sending a message with the command `newcommand` to ensure it responds correctly.
+   Run MeshBot and test the new command by sending a message with the command `newcommand` to ensure it responds correctly.
+
+
+### Running a Shell command
+
+Using the above example and enabling the filemon module, you can make a command which calls a bash file to do things on the system.
+
+```python
+def auto_response(message, snr, rssi, hop, pkiStatus, message_from_id, channel_number, deviceID, isDM):
+    #...
+    "switchON": lambda: call_external_script(message)
+```
+This would call the default script located in script/runShell.sh and return its output.

modules/bbstools.py

@@ -167,7 +167,7 @@ def bbs_sync_posts(input, peerNode, RxNode):
     messageID =  0
 
     # check if the bbs link is enabled
-    if bbs_link_whitelist is not None:
+    if bbs_link_whitelist != ['']:
         if str(peerNode) not in bbs_link_whitelist:
             logger.warning(f"System: BBS Link is disabled for node {peerNode}.")
             return "System: BBS Link is disabled for your node."
@@ -185,11 +185,17 @@ def bbs_sync_posts(input, peerNode, RxNode):
             return f"bbsack {messageID}"
     elif "bbsack" in input.lower():
         # increment the messageID
-        ack = int(input.split(" ")[1])
-        messageID = int(ack) + 1
+        if len(input.split(" ")) > 1:
+            try:
+                messageID = int(input.split(" ")[1]) + 1
+            except:
+                return "link error"
+        else:
+            return "link error"
 
     # send message with delay to keep chutil happy
     if messageID < len(bbs_messages):
+        logger.debug(f"System: Sending bbslink message {messageID} to peer " + str(peerNode))
         time.sleep(5 + responseDelay)
         # every 5 messages add extra delay
         if messageID % 5 == 0:

modules/filemon.py

@@ -76,7 +76,7 @@ def call_external_script(message, script="script/runShell.sh"):
                 logger.warning(f"FileMon: Script not found: {script_path}")
                 return "sorry I can't do that"
             
-        output = os.popen(f"bash {script_path} {message}", encoding='utf-8').read()
+        output = os.popen(f"bash {script_path} {message}").read().encode('utf-8').decode('utf-8')
         return output
     except Exception as e:
         logger.warning(f"FileMon: Error calling external script: {e}")

modules/games/videopoker.py

@@ -164,7 +164,7 @@ class PlayerVP:
                 return self.show_hand()    
             except Exception as e:
                 pass
-    
+
         return "ex:1,3,4 deals them new, and keeps 2,5 or (N)o to keep current (H)and"
 
     # Method for scoring hand, calculating winnings, and outputting message
@@ -390,7 +390,7 @@ def playVideoPoker(nodeID, message):
         else:
             if drawCount <= 1:
                 msg = player.redraw(deck, message)
-                if msg.startswith("Send Card"):
+                if msg.startswith("ex:"):
                     # if returned error message, return it
                     return msg
                 drawCount += 1
@@ -403,7 +403,7 @@ def playVideoPoker(nodeID, message):
                 if drawCount == 2:
                     # this is the last draw will carry on to endGame for scoring
                     msg = player.redraw(deck, message) + f"\n"
-                    if msg.startswith("Send Card"):
+                    if msg.startswith("ex:"):
                         # if returned error message, return it
                         return msg
                     # redraw done

modules/locationdata.py

@@ -9,7 +9,7 @@ import bs4 as bs # pip install beautifulsoup4
 import xml.dom.minidom 
 from modules.log import *
 
-trap_list_location = ("whereami", "tide", "wx", "wxc", "wxa", "wxalert", "rlist", "ea", "ealert", "riverflow")
+trap_list_location = ("whereami", "tide", "wx", "wxc", "wxa", "wxalert", "rlist", "ea", "ealert", "riverflow","valert")
 
 def where_am_i(lat=0, lon=0, short=False, zip=False):
     whereIam = ""
@@ -234,6 +234,7 @@ def get_NOAAweather(lat=0, lon=0, unit=0):
     # get weather data from NOAA units for metric unit = 1 is metric
     if use_metric:
         unit = 1
+        logger.debug("Location: new API metric units not implemented yet")
         
     weather_url = "https://forecast.weather.gov/MapClick.php?FcstType=text&lat=" + str(lat) + "&lon=" + str(lon)
     weather_api = "https://api.weather.gov/points/" + str(lat) + "," + str(lon)
@@ -396,6 +397,12 @@ def alertBrodcastNOAA():
     elif currentAlert == NO_ALERTS:
         wxAlertCacheNOAA = ""
         return False
+    if ignoreEASenable:
+        # check if the alert is in the ignoreEAS list
+        for word in ignoreEASwords:
+            if word.lower() in currentAlert[0].lower():
+                logger.debug(f"Location:Ignoring NOAA Alert: {currentAlert[0]} containing {word}")
+                return False
     # broadcast the alerts send to wxBrodcastCh
     elif currentAlert[0] not in wxAlertCacheNOAA:
         # Check if the current alert is not in the weather alert cache
@@ -615,3 +622,53 @@ def get_flood_noaa(lat=0, lon=0, uid=0):
 
     return flood_data
 
+def get_volcano_usgs(lat=0, lon=0):
+    alerts = ''
+    if lat == 0 and lon == 0:
+        lat = latitudeValue
+        lon = longitudeValue
+    # get the latest volcano alert from USGS from CAP feed
+    usgs_volcano_url = "https://volcanoes.usgs.gov/hans-public/api/volcano/getCapElevated"
+    try:
+        volcano_data = requests.get(usgs_volcano_url, timeout=urlTimeoutSeconds)
+        if not volcano_data.ok:
+            logger.warning("System: USGS fetching volcano alerts from USGS")
+            return ERROR_FETCHING_DATA
+    except (requests.exceptions.RequestException):
+        logger.warning("System: USGS fetching volcano alerts from USGS")
+        return ERROR_FETCHING_DATA
+    volcano_json = volcano_data.json()
+    # extract alerts from main feed
+    if volcano_json and isinstance(volcano_json, list):
+        for alert in volcano_json:
+            # check ignore list
+            if ignoreUSGSEnable:
+                for word in ignoreUSGSwords:
+                    if word.lower() in alert['volcano_name_appended'].lower():
+                        logger.debug(f"System: Ignoring USGS Alert: {alert['volcano_name_appended']} containing {word}")
+                        continue
+            # check if the alert lat long is within the range of bot latitudeValue and longitudeValue
+            if (alert['latitude'] >= latitudeValue - 10 and alert['latitude'] <= latitudeValue + 10) and (alert['longitude'] >= longitudeValue - 10 and alert['longitude'] <= longitudeValue + 10):
+                volcano_name = alert['volcano_name_appended']
+                alert_level = alert['alert_level']
+                color_code = alert['color_code']
+                cap_severity = alert['cap_severity']
+                synopsis = alert['synopsis']
+                # format Alert
+                alerts += f"🌋🚨: {volcano_name}, {alert_level} {color_code}, {cap_severity}.\n{synopsis}\n"
+            else:
+                #logger.debug(f"System: USGS volcano alert not in range: {alert['volcano_name_appended']}")
+                continue
+    else:
+        logger.debug("Location:Error fetching volcano data from USGS")
+        return NO_ALERTS
+    if alerts == "":
+        return NO_ALERTS
+    # trim off last newline
+    if alerts[-1] == "\n":
+        alerts = alerts[:-1]
+    # return the alerts
+    alerts = abbreviate_noaa(alerts)
+    return alerts
+
+

modules/settings.py

@@ -252,6 +252,8 @@ try:
     enableGBalerts = config['location'].getboolean('enableGBalerts', False) # default False
     enableDEalerts = config['location'].getboolean('enableDEalerts', False) # default False
     wxAlertsEnabled = config['location'].getboolean('NOAAalertsEnabled', True) # default True
+    ignoreEASenable = config['location'].getboolean('ignoreEASenable', False) # default False
+    ignoreEASwords = config['location'].get('ignoreEASwords', 'test,advisory').split(',') # default test,advisory
     mySAME = config['location'].get('mySAME', '').split(',') # default empty
     myRegionalKeysDE = config['location'].get('myRegionalKeysDE', '110000000000').split(',') # default city Berlin
     forecastDuration = config['location'].getint('NOAAforecastDuration', 4) # NOAA forcast days
@@ -262,6 +264,10 @@ try:
     ignoreFEMAwords = config['location'].get('ignoreFEMAwords', 'test,exercise').split(',') # default test,exercise
     wxAlertBroadcastChannel = config['location'].get('wxAlertBroadcastCh', '2').split(',') # default Channel 2
     emergencyAlertBroadcastCh = config['location'].get('eAlertBroadcastCh', '2').split(',') # default Channel 2
+    volcanoAlertBroadcastEnabled = config['location'].getboolean('volcanoAlertBroadcastEnabled', False) # default False
+    volcanoAlertBroadcastChannel = config['location'].get('volcanoAlertBroadcastCh', '2').split(',') # default Channel 2
+    ignoreUSGSEnable = config['location'].getboolean('ignoreVolcanoEnable', False) # default False
+    ignoreUSGSWords = config['location'].get('ignoreVolcanoWords', 'test,advisory').split(',') # default test,advisory
     
     # bbs
     bbs_enabled = config['bbs'].getboolean('enabled', False)
@@ -305,6 +311,12 @@ try:
 
     # scheduler
     scheduler_enabled = config['scheduler'].getboolean('enabled', False)
+    schedulerInterface = config['scheduler'].getint('interface', 1) # default interface 1
+    schedulerChannel = config['scheduler'].getint('channel', 2) # default channel 2
+    schedulerMessage = config['scheduler'].get('message', 'Scheduled message') # default message
+    schedulerInterval = config['scheduler'].get('interval', '') # default empty
+    schedulerTime = config['scheduler'].get('time', '') # default empty
+    schedulerValue = config['scheduler'].get('value', '') # default empty
 
     # radio monitoring
     radio_detection_enabled = config['radioMon'].getboolean('enabled', False)
@@ -341,6 +353,7 @@ try:
     MESSAGE_CHUNK_SIZE = config['messagingSettings'].getint('MESSAGE_CHUNK_SIZE', 160) # default 160
     wantAck = config['messagingSettings'].getboolean('wantAck', False) # default False
     maxBuffer = config['messagingSettings'].getint('maxBuffer', 220) # default 220
+    enableHopLogs = config['messagingSettings'].getboolean('enableHopLogs', False) # default False
 
 except KeyError as e:
     print(f"System: Error reading config file: {e}")

modules/system.py

@@ -89,14 +89,14 @@ if location_enabled:
         from modules.wx_meteo import * # from the spudgunman/meshing-around repo
     else:
         # NOAA only features
-        help_message = help_message + ", wxa, tide, ealert"
+        help_message = help_message + ", wxa, tide"
 
 # NOAA alerts needs location module
-if wxAlertBroadcastEnabled or emergencyAlertBrodcastEnabled:
+if wxAlertBroadcastEnabled or emergencyAlertBrodcastEnabled or volcanoAlertBroadcastEnabled:
     from modules.locationdata import * # from the spudgunman/meshing-around repo
     # limited subset, this should be done better but eh..
-    trap_list = trap_list + ("wx", "wxc", "wxa", "wxalert", "ea", "ealert")
-    help_message = help_message + ", wxalert, ealert"
+    trap_list = trap_list + ("wx", "wxc", "wxa", "wxalert", "ea", "ealert", "valert")
+    help_message = help_message + ", wxalert, ealert, valert"
         
 # BBS Configuration
 if bbs_enabled:
@@ -384,27 +384,27 @@ def get_node_list(nodeInt=1):
     
     return node_list
 
-def get_node_location(number, nodeInt=1, channel=0):
+def get_node_location(nodeID, nodeInt=1, channel=0):
     interface = globals()[f'interface{nodeInt}']
     # Get the location of a node by its number from nodeDB on device
+    # if no location data, return default location
     latitude = latitudeValue
     longitude = longitudeValue
     position = [latitudeValue,longitudeValue]
-    lastheard = 0
     if interface.nodes:
         for node in interface.nodes.values():
-            if number == node['num']:
-                if 'position' in node:
+            if nodeID == node['num']:
+                if 'position' in node and node['position'] is not {}:
                     try:
                         latitude = node['position']['latitude']
                         longitude = node['position']['longitude']
+                        logger.debug(f"System: location data for {nodeID} is {latitude},{longitude}")
+                        position = [latitude,longitude]
                     except Exception as e:
-                        logger.warning(f"System: Error getting location data for {number}")
-                    logger.debug(f"System: location data for {number} is {latitude},{longitude}")
-                    position = [latitude,longitude]
+                        logger.debug(f"System: No location data for {nodeID} use default location")
                     return position
                 else:
-                    logger.warning(f"System: No location data for {number} using default location")
+                    logger.debug(f"System: No location data for {nodeID} using default location")
                     # request location data
                     # try:
                     #     logger.debug(f"System: Requesting location data for {number}")
@@ -413,7 +413,7 @@ def get_node_location(number, nodeInt=1, channel=0):
                     #     logger.error(f"System: Error requesting location data for {number}. Error: {e}")
                     return position
         else:
-            logger.warning(f"System: No nodes found")
+            logger.warning(f"System: Location for NodeID {nodeID} not found in nodeDb")
             return position
 
 
@@ -723,12 +723,14 @@ def handleMultiPing(nodeID=0, deviceID=1):
                             multiPingList.pop(j)
                             break
 
-
+priorVolcanoAlert = ""
 def handleAlertBroadcast(deviceID=1):
+    global priorVolcanoAlert
     alertUk = NO_ALERTS
     alertDe = NO_ALERTS
     alertFema = NO_ALERTS
     wxAlert = NO_ALERTS
+    volcanoAlert = NO_ALERTS
     alertWx = False
     # only allow API call every 20 minutes
     # the watchdog will call this function 3 times, seeing possible throttling on the API
@@ -785,8 +787,8 @@ def handleAlertBroadcast(deviceID=1):
                 send_message(ukAlert, emergencyAlertBroadcastCh, 0, deviceID)
             return True
         
-    # pause for 10 seconds
-    time.sleep(10)
+    # pause for traffic
+    time.sleep(5)
 
     if wxAlertBroadcastEnabled:
         if wxAlert:
@@ -796,6 +798,22 @@ def handleAlertBroadcast(deviceID=1):
             else:
                 send_message(wxAlert, wxAlertBroadcastChannel, 0, deviceID)
             return True
+    
+    # pause for traffic
+    time.sleep(5)
+
+    if volcanoAlertBroadcastEnabled:
+        volcanoAlert = get_volcano_usgs(latitudeValue, longitudeValue)
+        if volcanoAlert and NO_ALERTS not in volcanoAlert and ERROR_FETCHING_DATA not in volcanoAlert:
+            # check if the alert is different from the last one
+            if volcanoAlert != priorVolcanoAlert:
+                priorVolcanoAlert = volcanoAlert
+                if isinstance(volcanoAlertBroadcastChannel, list):
+                    for channel in volcanoAlertBroadcastChannel:
+                        send_message(volcanoAlert, int(channel), 0, deviceID)
+                else:
+                    send_message(volcanoAlert, volcanoAlertBroadcastChannel, 0, deviceID)
+                return True
 
 def onDisconnect(interface):
     global retry_int1, retry_int2, retry_int3, retry_int4, retry_int5, retry_int6, retry_int7, retry_int8, retry_int9
@@ -961,7 +979,7 @@ def consumeMetadata(packet, rxNode=0):
                 for key in keys:
                     positionMetadata[nodeID][key] = position_data.get(key, 0)
         
-                # Keep the positionMetadata dictionary at 5 records
+                # Keep the positionMetadata dictionary at a maximum size of 20
                 if len(positionMetadata) > 20:
                     # Remove the oldest entry
                     oldest_nodeID = next(iter(positionMetadata))
@@ -1210,7 +1228,7 @@ async def watchdog():
 
                     handleMultiPing(0, i)
 
-                    if wxAlertBroadcastEnabled or emergencyAlertBrodcastEnabled:
+                    if wxAlertBroadcastEnabled or emergencyAlertBrodcastEnabled or volcanoAlertBroadcastEnabled:
                         handleAlertBroadcast(i)
 
                     intData = displayNodeTelemetry(0, i)

modules/web.py

@@ -40,8 +40,8 @@ class QuietHandler(http.server.SimpleHTTPRequestHandler):
 # Change the current working directory to webRoot
 os.chdir(webRoot)
 
-# boot up simple HTTP server
-httpd = http.server.HTTPServer(('127.0.0.1', PORT), QuietHandler)
+# Create the HTTP server instance with the desired IP address
+httpd = http.server.HTTPServer((server_ip, PORT), QuietHandler)
 
 if SSL:
     ctx = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
@@ -51,12 +51,9 @@ if SSL:
         print("SSL certificate file not found. Please generate it using the command provided in the comments.")
         exit(1)
     httpd.socket = ctx.wrap_socket(httpd.socket, server_side=True)
-
-# Create the HTTP server instance with the desired IP address
-httpd = http.server.HTTPServer((server_ip, PORT), QuietHandler)
-
-# Print out the URL using the IP address stored in server_ip
-print(f"Serving reports at http://{server_ip}:{PORT} Press ^C to quit.\n\n")
+    print(f"Serving reports at https://{server_ip}:{PORT} Press ^C to quit.\n\n")
+else:
+    print(f"Serving reports at http://{server_ip}:{PORT} Press ^C to quit.\n\n")
 
 if not webServerLogs:
     print("Server Logs are disabled")