Revert "Merge branch 'channel-logic-fix'"

This reverts commit 44a0de44c3, reversing
changes made to ea451b0eec.
feature/plugins-parameters
Jeremiah K 2023-04-18 11:45:19 -05:00
rodzic d6092a2454
commit f132cf94ff
1 zmienionych plików z 118 dodań i 29 usunięć

147
main.py
Wyświetl plik

@ -1,35 +1,51 @@
import asyncio
import time
import threading
import json
import sqlite3
import logging
import re
import yaml
import re
import meshtastic.tcp_interface
import meshtastic.serial_interface
from nio import AsyncClient, AsyncClientConfig, MatrixRoom, RoomMessageText
from nio import AsyncClient, AsyncClientConfig, MatrixRoom, RoomMessageText, RoomMessage
from pubsub import pub
from meshtastic import mesh_pb2
from yaml.loader import SafeLoader
bot_start_time = int(time.time() * 1000)
logging.basicConfig()
logger = logging.getLogger(name="meshtastic.matrix.relay")
# Load configuration
# Collect configuration
relay_config = None
with open("config.yaml", "r") as f:
relay_config = yaml.load(f, Loader=SafeLoader)
logger.setLevel(getattr(logging, relay_config["logging"]["level"].upper()))
if relay_config["logging"]["level"] == "debug":
logger.setLevel(logging.DEBUG)
elif relay_config["logging"]["level"] == "info":
logger.setLevel(logging.INFO)
elif relay_config["logging"]["level"] == "warn":
logger.setLevel(logging.WARN)
elif relay_config["logging"]["level"] == "error":
logger.setLevel(logging.ERROR)
# Initialize Meshtastic interface
# Connect to the Meshtastic device
logger.info(f"Starting Meshtastic <==> Matrix Relay...")
# Add a new configuration option to select between serial and network connections
connection_type = relay_config["meshtastic"]["connection_type"]
if connection_type == "serial":
serial_port = relay_config["meshtastic"]["serial_port"]
logger.info(f"Connecting to radio using serial port {serial_port} ...")
meshtastic_interface = meshtastic.serial_interface.SerialInterface(serial_port)
logger.info(f"Connected to radio using serial port {serial_port}.")
else:
target_host = relay_config["meshtastic"]["host"]
logger.info(f"Connecting to radio at {target_host} ...")
meshtastic_interface = meshtastic.tcp_interface.TCPInterface(hostname=target_host)
logger.info(f"Connected to radio at {target_host}.")
matrix_client = None
@ -39,7 +55,43 @@ matrix_access_token = relay_config["matrix"]["access_token"]
bot_user_id = relay_config["matrix"]["bot_user_id"]
matrix_room_id = relay_config["matrix"]["room_id"]
# Send message to the Matrix room
# SQLite configuration
db_file = "meshtastic.sqlite"
db = sqlite3.connect(db_file)
# Initialize the database
db.execute("CREATE TABLE IF NOT EXISTS nodes (id TEXT PRIMARY KEY, longname TEXT)")
db.execute(
"CREATE TABLE IF NOT EXISTS messages (id INTEGER PRIMARY KEY, sender_id TEXT, text TEXT, timestamp INTEGER)"
)
db.commit()
# Function to insert or update a node
def upsert_node(id, longname):
db.execute(
"INSERT OR REPLACE INTO nodes (id, longname) VALUES (?, ?)", (id, longname)
)
db.commit()
# Function to insert a message
def insert_message(sender_id, text, timestamp):
db.execute(
"INSERT INTO messages (sender_id, text, timestamp) VALUES (?, ?, ?)",
(sender_id, text, timestamp),
)
db.commit()
# Function to get the node's longname
def get_node_longname(sender):
cursor = db.cursor()
cursor.execute("SELECT longname FROM nodes WHERE id = ?", (sender,))
row = cursor.fetchone()
return row[0] if row else sender
async def matrix_relay(matrix_client, message):
try:
await asyncio.wait_for(
@ -53,50 +105,86 @@ async def matrix_relay(matrix_client, message):
logger.info(f"Sent inbound radio message to matrix room: {matrix_room_id}")
except asyncio.TimeoutError:
logger.error(f"Timed out while waiting for Matrix response")
logger.error(
f"Timed out while waiting for Matrix response - room {matrix_room_id}: {e}"
)
except Exception as e:
logger.error(f"Error sending radio message to matrix room {matrix_room_id}: {e}")
logger.error(
f"Error sending radio message to matrix room {matrix_room_id}: {e}"
)
# Callback for new messages from Meshtastic
def on_meshtastic_message(packet, loop=None):
global matrix_client
sender = packet["fromId"]
if "text" in packet["decoded"] and packet["decoded"]["text"]:
text = packet["decoded"]["text"]
# timestamp = packet["received"]
logger.info(f"Processing inbound radio message from {sender}")
if logger.level == logging.DEBUG:
logger.debug(f"Processing radio message from {sender}: {text}")
elif logger.level == logging.INFO:
logger.info(f"Processing inbound radio message from {sender}")
formatted_message = f"{sender}: {text}"
# create an event loop
asyncio.run_coroutine_threadsafe(
matrix_relay(matrix_client, formatted_message),
loop=loop,
)
# insert_message(sender, text, timestamp)
# Callback for new messages in Matrix room
async def on_room_message(room: MatrixRoom, event: RoomMessageText) -> None:
if room.room_id == matrix_room_id and event.sender != bot_user_id:
message_timestamp = event.server_timestamp
logger.info(
f"Detected inbound matrix message from {event.sender} in room {room.room_id}"
)
# Only process messages with a timestamp greater than the bot's start time
if message_timestamp > bot_start_time:
if room.room_id == matrix_room_id and event.sender != bot_user_id:
target_node = None
if event.formatted_body:
text = event.formatted_body.strip()
else:
text = event.body.strip()
logger.info(f"Processing matrix message from {event.sender}: {text}")
logger.debug(f"Processing matrix message from {event.sender}: {text}")
display_name_response = await matrix_client.get_displayname(event.sender)
display_name = display_name_response.displayname or event.sender
# Opportunistically detect node in message text !124abcd:
match = re.search(r"(![\da-z]+):", text)
if match:
target_node = match.group(1)
text = f"{display_name}: {text}"
text = text[0:80]
if relay_config["meshtastic"]["broadcast_enabled"]:
logger.info(f"Sending radio message from {display_name} to radio broadcast")
meshtastic_interface.sendText(
text=text, channelIndex=relay_config["meshtastic"]["channel"]
)
else:
logger.debug(f"Broadcast not supported: Message from {display_name} dropped.")
text = re.sub(r"<mx-reply>.*?</mx-reply>", "", text)
text = f"{event.source['sender']}: {text}"
text = text[0:80]
if target_node:
logger.debug(
f"Sending radio message from {event.sender} to {target_node} ..."
)
meshtastic_interface.sendText(
text=text,
channelIndex=relay_config["meshtastic"]["channel"],
destinationId=target_node,
)
logger.info(f"Sent radio message from {event.sender} to {target_node}")
elif relay_config["meshtastic"]["broadcast_enabled"]:
logger.debug(
f"Sending radio message from {event.sender} to radio broadcast ..."
)
meshtastic_interface.sendText(
text=text, channelIndex=relay_config["meshtastic"]["channel"]
)
logger.info(f"Sent radio message from {event.sender} to radio broadcast")
elif not relay_config["meshtastic"]["broadcast_enabled"]:
logger.debug(
f"Broadcast not supported: Message from {event.sender} dropped."
)
async def main():
@ -119,4 +207,5 @@ async def main():
# Start the Matrix client
await matrix_client.sync_forever(timeout=30000)
asyncio.run(main())