From 03183384c615abbc3c08b027c190a77c1a372f2c Mon Sep 17 00:00:00 2001 From: Pablo Revilla Date: Fri, 21 Feb 2025 11:24:15 -0800 Subject: [PATCH 1/8] Adding screenshots --- config.ini | 2 +- main.py | 4 +++- meshview/mqtt_reader.py | 1 + meshview/templates/net.html | 2 +- meshview/web.py | 38 +------------------------------------ 5 files changed, 7 insertions(+), 40 deletions(-) diff --git a/config.ini b/config.ini index 693429b..9b4e152 100644 --- a/config.ini +++ b/config.ini @@ -6,7 +6,7 @@ acme_challenge = [mqtt] server = mqtt.bayme.sh -topics = ['msh/US/bayarea/#', 'msh/US/CA/mrymesh/#'] +topics = ["msh/US/bayarea/#"] port = 1883 username = meshdev password = large4cats diff --git a/main.py b/main.py index 7accc67..f92a106 100644 --- a/main.py +++ b/main.py @@ -6,6 +6,7 @@ from meshview import database from meshview import store from meshview import web from meshview import http +import json async def load_database_from_mqtt(mqtt_server: str , mqtt_port: int, topic: str, mqtt_user: str | None = None, mqtt_passwd: str | None = None): @@ -23,10 +24,11 @@ async def main(config): mqtt_user: str = config["mqtt"]["username"] if config["mqtt"]["password"] != "": mqtt_passwd: str = config["mqtt"]["password"] + mqtt_topics = json.loads(config["mqtt"]["topics"]) async with asyncio.TaskGroup() as tg: tg.create_task( - load_database_from_mqtt(config["mqtt"]["server"], int(config["mqtt"]["port"]), config["mqtt"]["topics"], mqtt_user, mqtt_passwd) + load_database_from_mqtt(config["mqtt"]["server"], int(config["mqtt"]["port"]), mqtt_topics, mqtt_user, mqtt_passwd) ) tg.create_task( web.run_server( diff --git a/meshview/mqtt_reader.py b/meshview/mqtt_reader.py index 5215f98..c63d3ce 100644 --- a/meshview/mqtt_reader.py +++ b/meshview/mqtt_reader.py @@ -33,6 +33,7 @@ async def get_topic_envelopes(mqtt_server, mqtt_port, topics, mqtt_user, mqtt_pa mqtt_server, port=mqtt_port , username=mqtt_user, password=mqtt_passwd , identifier=identifier, ) as client: for topic in topics: + print(topic) await client.subscribe(topic) async for msg in client.messages: try: diff --git a/meshview/templates/net.html b/meshview/templates/net.html index b16e0db..9d6fcbb 100644 --- a/meshview/templates/net.html +++ b/meshview/templates/net.html @@ -24,7 +24,7 @@
Weekly Mesh check-in. We will keep it open on every Wednesday from 5:00pm for checkins so you do not have to rush.
The message format should be (LONG NAME) - (CITY YOU ARE IN) #BayMeshNet.

-
+
{% for packet in packets %} {% include 'chat_packet.html' %} {% else %} diff --git a/meshview/web.py b/meshview/web.py index 2669546..5265195 100644 --- a/meshview/web.py +++ b/meshview/web.py @@ -1573,7 +1573,7 @@ async def net(request): raise # Let aiohttp handle HTTP exceptions properly except Exception as e: - print("Error processing chat request") + print("Error processing net request") return web.Response( text="An internal server error occurred.", status=500, @@ -1581,42 +1581,6 @@ async def net(request): ) -@routes.get("/net_events") -async def net_events(request): - chat_packet = env.get_template("net_packet.html") - - # Precompile regex for performance (case insensitive) - seq_pattern = re.compile(r"seq \d+$") - - with notify.subscribe(node_id=0xFFFFFFFF) as event: - async with sse_response(request) as resp: - while resp.is_connected(): - try: - await asyncio.wait_for(event.wait(), timeout=10) - except asyncio.TimeoutError: - continue # Timeout occurred, loop again - - if event.is_set(): - # Ensure event.packets is valid before accessing it - packets = [ - p for p in (event.packets or []) - if p.portnum == PortNum.TEXT_MESSAGE_APP - ] - event.clear() - - try: - for packet in packets: - ui_packet = Packet.from_model(packet) - if not seq_pattern.match(ui_packet.payload) and "baymeshnet" in ui_packet.payload.lower(): - await resp.send( - chat_packet.render(packet=ui_packet), - event="net_packet", - ) - except ConnectionResetError: - print("Client disconnected from SSE stream.") - return # Gracefully exit on disconnection - - @routes.get("/map") async def map(request): try: From 1bd41ae82a98eba45ecc937f7fd61cebb5e03aec Mon Sep 17 00:00:00 2001 From: Pablo Revilla Date: Fri, 21 Feb 2025 11:57:01 -0800 Subject: [PATCH 2/8] Adding screenshots --- meshview/templates/map.html | 155 ++++++++++++++++++++++++++++++++++++ 1 file changed, 155 insertions(+) create mode 100644 meshview/templates/map.html diff --git a/meshview/templates/map.html b/meshview/templates/map.html new file mode 100644 index 0000000..2247f5e --- /dev/null +++ b/meshview/templates/map.html @@ -0,0 +1,155 @@ +{% extends "base.html" %} +{% block css %} + + +{% endblock %} + +{% block body %} +
+ +
+ LongFast + MediumSlow + LongFast Routers + MediumSlow Routers +
+ + + + +{% endblock %} +test From 5f97274e80e5e634d209d487ab3a1f8ee46e663c Mon Sep 17 00:00:00 2001 From: Pablo Revilla Date: Wed, 5 Mar 2025 16:11:40 -0800 Subject: [PATCH 3/8] Major changes to the project - Now the database process and the web process are separate. - Added Map - Added new graphing tools --- .idea/.gitignore | 3 - .../inspectionProfiles/profiles_settings.xml | 6 + .idea/meshview-2.iml | 10 + .idea/modules.xml | 8 + config.ini | 7 +- main.py | 16 +- meshview/database.py | 39 +- meshview/models.py | 2 - meshview/mqtt_database.py | 16 + meshview/mqtt_store.py | 165 +++ meshview/store.py | 304 +---- meshview/templates/base.html | 4 +- meshview/templates/chat.html | 8 +- meshview/templates/firehose.html | 87 +- meshview/templates/map.html | 8 +- meshview/templates/node.html | 149 ++- meshview/templates/node2.html | 58 + meshview/templates/nodegraph.html | 190 +++ meshview/templates/packet.html | 3 +- meshview/templates/packet_details.html | 98 +- meshview/templates/traceroute.html | 67 + meshview/web.py | 1126 ++++++----------- requirements.txt | 57 +- startdb.py | 50 + 24 files changed, 1380 insertions(+), 1101 deletions(-) delete mode 100644 .idea/.gitignore create mode 100644 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 .idea/meshview-2.iml create mode 100644 .idea/modules.xml create mode 100644 meshview/mqtt_database.py create mode 100644 meshview/mqtt_store.py create mode 100644 meshview/templates/node2.html create mode 100644 meshview/templates/nodegraph.html create mode 100644 meshview/templates/traceroute.html create mode 100644 startdb.py diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..105ce2d --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/meshview-2.iml b/.idea/meshview-2.iml new file mode 100644 index 0000000..7198901 --- /dev/null +++ b/.idea/meshview-2.iml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..99ffd7e --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/config.ini b/config.ini index 693429b..5f9e91f 100644 --- a/config.ini +++ b/config.ini @@ -6,10 +6,13 @@ acme_challenge = [mqtt] server = mqtt.bayme.sh -topics = ['msh/US/bayarea/#', 'msh/US/CA/mrymesh/#'] +topics = ["msh/US/bayarea/#", "msh/US/CA/mrymesh/#"] port = 1883 username = meshdev password = large4cats [database] -connection_string = sqlite+aiosqlite:///packets.db \ No newline at end of file +connection_string = sqlite+aiosqlite:///packets.db + +[website] +title = San Francisco Bay Area Mesh \ No newline at end of file diff --git a/main.py b/main.py index e256ba4..717c67a 100644 --- a/main.py +++ b/main.py @@ -1,18 +1,16 @@ import asyncio import argparse import configparser -import json from meshview import mqtt_reader from meshview import database -from meshview import store +from meshview import mqtt_store from meshview import web -from meshview import http import json async def load_database_from_mqtt(mqtt_server: str , mqtt_port: int, topic: list, mqtt_user: str | None = None, mqtt_passwd: str | None = None): async for topic, env in mqtt_reader.get_topic_envelopes(mqtt_server, mqtt_port, topic, mqtt_user, mqtt_passwd): - await store.process_envelope(topic, env) + await mqtt_store.process_envelope(topic, env) async def main(config): @@ -28,9 +26,6 @@ async def main(config): mqtt_topics = json.loads(config["mqtt"]["topics"]) async with asyncio.TaskGroup() as tg: - tg.create_task( - load_database_from_mqtt(config["mqtt"]["server"], int(config["mqtt"]["port"]), mqtt_topics, mqtt_user, mqtt_passwd) - ) tg.create_task( web.run_server( config["server"]["bind"], @@ -38,13 +33,6 @@ async def main(config): config["server"].get("tls_cert"), ) ) - if config["server"].get("acme_challenge"): - tg.create_task( - http.run_server( - config["server"]["bind"], config["server"]["acme_challenge"] - ) - ) - def load_config(file_path): """Load configuration from an INI-style text file.""" diff --git a/meshview/database.py b/meshview/database.py index a20e37b..83fc134 100644 --- a/meshview/database.py +++ b/meshview/database.py @@ -1,15 +1,36 @@ from meshview import models -from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker +from sqlalchemy.ext.asyncio import async_sessionmaker +from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession -def init_database(database_connection_string): + + +engine = None +async_session = None + + +def init_database(database_connection_string, read_only=False): global engine, async_session - kwargs = {} - if not database_connection_string.startswith('sqlite'): - kwargs['pool_size'] = 20 - kwargs['max_overflow'] = 50 - print (**kwargs) - engine = create_async_engine(database_connection_string, echo=False, connect_args={"timeout": 15}) - async_session = async_sessionmaker(engine, expire_on_commit=False) + + kwargs = {"echo": False} + + if database_connection_string.startswith("sqlite"): + if read_only: + # Ensure SQLite is opened in read-only mode + database_connection_string += "?mode=ro" + kwargs["connect_args"] = {"uri": True} + else: + kwargs["connect_args"] = {"timeout": 15} + else: + kwargs["pool_size"] = 20 + kwargs["max_overflow"] = 50 + + print("Database connection settings:", kwargs) # Debugging output + + engine = create_async_engine(database_connection_string, **kwargs) + async_session = async_sessionmaker( bind=engine, + class_=AsyncSession, + expire_on_commit=False, +) async def create_tables(): async with engine.begin() as conn: diff --git a/meshview/models.py b/meshview/models.py index 569943c..78efa10 100644 --- a/meshview/models.py +++ b/meshview/models.py @@ -1,5 +1,4 @@ from datetime import datetime - from sqlalchemy.orm import DeclarativeBase, foreign from sqlalchemy.ext.asyncio import AsyncAttrs from sqlalchemy.orm import mapped_column, relationship, Mapped @@ -69,4 +68,3 @@ class Traceroute(Base): done: Mapped[bool] = mapped_column(nullable=True) route: Mapped[bytes] = mapped_column(nullable=True) import_time: Mapped[datetime] = mapped_column(nullable=True) - diff --git a/meshview/mqtt_database.py b/meshview/mqtt_database.py new file mode 100644 index 0000000..a20e37b --- /dev/null +++ b/meshview/mqtt_database.py @@ -0,0 +1,16 @@ +from meshview import models +from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker + +def init_database(database_connection_string): + global engine, async_session + kwargs = {} + if not database_connection_string.startswith('sqlite'): + kwargs['pool_size'] = 20 + kwargs['max_overflow'] = 50 + print (**kwargs) + engine = create_async_engine(database_connection_string, echo=False, connect_args={"timeout": 15}) + async_session = async_sessionmaker(engine, expire_on_commit=False) + +async def create_tables(): + async with engine.begin() as conn: + await conn.run_sync(models.Base.metadata.create_all) diff --git a/meshview/mqtt_store.py b/meshview/mqtt_store.py new file mode 100644 index 0000000..292d996 --- /dev/null +++ b/meshview/mqtt_store.py @@ -0,0 +1,165 @@ +import datetime +from sqlalchemy import select +from sqlalchemy import update +from meshtastic.protobuf.config_pb2 import Config +from meshtastic.protobuf.portnums_pb2 import PortNum +from meshtastic.protobuf.mesh_pb2 import User, HardwareModel +from meshview import mqtt_database +from meshview import decode_payload +from meshview.models import Packet, PacketSeen, Node, Traceroute + + + + +async def process_envelope(topic, env): + + # Checking if the received packet is a MAP_REPORT + # Update the node table with the firmware version + if env.packet.decoded.portnum == PortNum.MAP_REPORT_APP: + # Extract the node ID from the packet (renamed from 'id' to 'node_id' to avoid conflicts with Python's built-in id function) + node_id = getattr(env.packet, "from") + + # Decode the MAP report payload to extract the firmware version + map_report = decode_payload.decode_payload(PortNum.MAP_REPORT_APP, env.packet.decoded.payload) + + # Establish an asynchronous database session + async with mqtt_database.async_session() as session: + # Construct an SQLAlchemy update statement + stmt = ( + update(Node) + .where(Node.node_id == node_id) # Ensure correct column reference + .values(firmware=map_report.firmware_version) # Assign new firmware value + ) + + # Execute the update statement asynchronously + await session.execute(stmt) + + # Commit the changes to the database + await session.commit() + + # This ignores any packet that does not have a ID + if not env.packet.id: + return + + async with mqtt_database.async_session() as session: + result = await session.execute(select(Packet).where(Packet.id == env.packet.id)) + new_packet = False + packet = result.scalar_one_or_none() + if not packet: + new_packet = True + packet = Packet( + id=env.packet.id, + portnum=env.packet.decoded.portnum, + from_node_id=getattr(env.packet, "from"), + to_node_id=env.packet.to, + payload=env.packet.SerializeToString(), + # p.r. Here seems to be where the packet is imported on the Database and import time is set. + import_time=datetime.datetime.now(), + channel=env.channel_id, + ) + session.add(packet) + + result = await session.execute( + select(PacketSeen).where( + PacketSeen.packet_id == env.packet.id, + PacketSeen.node_id == int(env.gateway_id[1:], 16), + PacketSeen.rx_time == env.packet.rx_time, + ) + ) + seen = None + if not result.scalar_one_or_none(): + seen = PacketSeen( + packet_id=env.packet.id, + node_id=int(env.gateway_id[1:], 16), + channel=env.channel_id, + rx_time=env.packet.rx_time, + rx_snr=env.packet.rx_snr, + rx_rssi=env.packet.rx_rssi, + hop_limit=env.packet.hop_limit, + hop_start=env.packet.hop_start, + topic=topic, + # p.r. Here seems to be where the packet is imported on the Database and import time is set. + import_time=datetime.datetime.now(), + ) + session.add(seen) + + + + if env.packet.decoded.portnum == PortNum.NODEINFO_APP: + user = decode_payload.decode_payload( + PortNum.NODEINFO_APP, env.packet.decoded.payload + ) + if user: + result = await session.execute(select(Node).where(Node.id == user.id)) + if user.id and user.id[0] == "!": + try: + node_id = int(user.id[1:], 16) + except ValueError: + node_id = None + pass + else: + node_id = None + + try: + hw_model = HardwareModel.Name(user.hw_model) + except ValueError: + hw_model = "unknown" + try: + role = Config.DeviceConfig.Role.Name(user.role) + except ValueError: + role = "unknown" + + if node := result.scalar_one_or_none(): + node.node_id = node_id + node.long_name = user.long_name + node.short_name = user.short_name + node.hw_model = hw_model + node.role = role + node.last_update =datetime.datetime.now() + + else: + node = Node( + id=user.id, + node_id=node_id, + long_name=user.long_name, + short_name=user.short_name, + hw_model=hw_model, + role=role, + channel=env.channel_id, + # if need to update time of last update it may be here + ) + session.add(node) + + if env.packet.decoded.portnum == PortNum.POSITION_APP: + position = decode_payload.decode_payload( + PortNum.POSITION_APP, env.packet.decoded.payload + ) + if position and position.latitude_i and position.longitude_i: + from_node_id = getattr(env.packet, 'from') + node = (await session.execute(select(Node).where(Node.node_id == from_node_id))).scalar_one_or_none() + if node: + node.last_lat = position.latitude_i + node.last_long = position.longitude_i + session.add(node) + + if env.packet.decoded.portnum == PortNum.TRACEROUTE_APP: + packet_id = None + if env.packet.decoded.want_response: + packet_id = env.packet.id + else: + result = await session.execute(select(Packet).where(Packet.id == env.packet.decoded.request_id)) + if result.scalar_one_or_none(): + packet_id = env.packet.decoded.request_id + if packet_id is not None: + session.add(Traceroute( + packet_id=packet_id, + route=env.packet.decoded.payload, + done=not env.packet.decoded.want_response, + gateway_node_id=int(env.gateway_id[1:], 16), + import_time=datetime.datetime.now(), + )) + + await session.commit() + if new_packet: + await packet.awaitable_attrs.to_node + await packet.awaitable_attrs.from_node diff --git a/meshview/store.py b/meshview/store.py index 3ff6118..87ef868 100644 --- a/meshview/store.py +++ b/meshview/store.py @@ -1,176 +1,8 @@ import datetime - from sqlalchemy import select, func from sqlalchemy.orm import lazyload -from sqlalchemy import update -from meshtastic.protobuf.config_pb2 import Config -from meshtastic.protobuf.portnums_pb2 import PortNum -from meshtastic.protobuf.mesh_pb2 import User, HardwareModel from meshview import database -from meshview import decode_payload from meshview.models import Packet, PacketSeen, Node, Traceroute -from meshview import notify - - - -async def process_envelope(topic, env): - - # Checking if the received packet is a MAP_REPORT - # Update the node table with the firmware version - if env.packet.decoded.portnum == PortNum.MAP_REPORT_APP: - # Extract the node ID from the packet (renamed from 'id' to 'node_id' to avoid conflicts with Python's built-in id function) - node_id = getattr(env.packet, "from") - - # Decode the MAP report payload to extract the firmware version - map_report = decode_payload.decode_payload(PortNum.MAP_REPORT_APP, env.packet.decoded.payload) - - # Establish an asynchronous database session - async with database.async_session() as session: - # Construct an SQLAlchemy update statement - stmt = ( - update(Node) - .where(Node.node_id == node_id) # Ensure correct column reference - .values(firmware=map_report.firmware_version) # Assign new firmware value - ) - - # Execute the update statement asynchronously - await session.execute(stmt) - - # Commit the changes to the database - await session.commit() - - # This ignores any packet that does not have a ID - if not env.packet.id: - return - - async with database.async_session() as session: - result = await session.execute(select(Packet).where(Packet.id == env.packet.id)) - new_packet = False - packet = result.scalar_one_or_none() - if not packet: - new_packet = True - packet = Packet( - id=env.packet.id, - portnum=env.packet.decoded.portnum, - from_node_id=getattr(env.packet, "from"), - to_node_id=env.packet.to, - payload=env.packet.SerializeToString(), - # p.r. Here seems to be where the packet is imported on the Database and import time is set. - import_time=datetime.datetime.now(), - channel=env.channel_id, - ) - session.add(packet) - - result = await session.execute( - select(PacketSeen).where( - PacketSeen.packet_id == env.packet.id, - PacketSeen.node_id == int(env.gateway_id[1:], 16), - PacketSeen.rx_time == env.packet.rx_time, - ) - ) - seen = None - if not result.scalar_one_or_none(): - seen = PacketSeen( - packet_id=env.packet.id, - node_id=int(env.gateway_id[1:], 16), - channel=env.channel_id, - rx_time=env.packet.rx_time, - rx_snr=env.packet.rx_snr, - rx_rssi=env.packet.rx_rssi, - hop_limit=env.packet.hop_limit, - hop_start=env.packet.hop_start, - topic=topic, - # p.r. Here seems to be where the packet is imported on the Database and import time is set. - import_time=datetime.datetime.now(), - ) - session.add(seen) - - - - if env.packet.decoded.portnum == PortNum.NODEINFO_APP: - user = decode_payload.decode_payload( - PortNum.NODEINFO_APP, env.packet.decoded.payload - ) - if user: - result = await session.execute(select(Node).where(Node.id == user.id)) - if user.id and user.id[0] == "!": - try: - node_id = int(user.id[1:], 16) - except ValueError: - node_id = None - pass - else: - node_id = None - - try: - hw_model = HardwareModel.Name(user.hw_model) - except ValueError: - hw_model = "unknown" - try: - role = Config.DeviceConfig.Role.Name(user.role) - except ValueError: - role = "unknown" - - if node := result.scalar_one_or_none(): - node.node_id = node_id - node.long_name = user.long_name - node.short_name = user.short_name - node.hw_model = hw_model - node.role = role - node.last_update =datetime.datetime.now() - - else: - node = Node( - id=user.id, - node_id=node_id, - long_name=user.long_name, - short_name=user.short_name, - hw_model=hw_model, - role=role, - channel=env.channel_id, - # if need to update time of last update it may be here - ) - session.add(node) - - if env.packet.decoded.portnum == PortNum.POSITION_APP: - position = decode_payload.decode_payload( - PortNum.POSITION_APP, env.packet.decoded.payload - ) - if position and position.latitude_i and position.longitude_i: - from_node_id = getattr(env.packet, 'from') - node = (await session.execute(select(Node).where(Node.node_id == from_node_id))).scalar_one_or_none() - if node: - node.last_lat = position.latitude_i - node.last_long = position.longitude_i - session.add(node) - - if env.packet.decoded.portnum == PortNum.TRACEROUTE_APP: - packet_id = None - if env.packet.decoded.want_response: - packet_id = env.packet.id - else: - result = await session.execute(select(Packet).where(Packet.id == env.packet.decoded.request_id)) - if result.scalar_one_or_none(): - packet_id = env.packet.decoded.request_id - if packet_id is not None: - session.add(Traceroute( - packet_id=packet_id, - route=env.packet.decoded.payload, - done=not env.packet.decoded.want_response, - gateway_node_id=int(env.gateway_id[1:], 16), - import_time=datetime.datetime.now(), - )) - - await session.commit() - if new_packet: - await packet.awaitable_attrs.to_node - await packet.awaitable_attrs.from_node - notify.notify_packet(packet.to_node_id, packet) - notify.notify_packet(packet.from_node_id, packet) - notify.notify_packet(None, packet) - if seen: - notify.notify_uplinked(seen.node_id, packet) - async def get_node(node_id): async with database.async_session() as session: @@ -189,7 +21,7 @@ async def get_fuzzy_nodes(query): return result.scalars() -async def get_packets(node_id=None, portnum=None, since=None, limit=500, before=None, after=None): +async def get_packets(node_id=None, portnum=None, since=None, limit=1000, before=None, after=None): async with database.async_session() as session: q = select(Packet) @@ -209,7 +41,8 @@ async def get_packets(node_id=None, portnum=None, since=None, limit=500, before= q = q.limit(limit) result = await session.execute(q.order_by(Packet.import_time.desc())) - return result.scalars() + packets = list(result.scalars()) # Convert to list + return packets # Return the list async def get_packets_from(node_id=None, portnum=None, since=None, limit=500): @@ -300,137 +133,6 @@ async def get_mqtt_neighbors(since): ) return result -# In order to provide separate network graphs for LongFast and MediumSlow, I am duplicating the procedures. -# 3 procedures are needed. These would have to be replicated for any other network that we may need to use graphs. -# -# get_traceroutes_longfast -# get_packets_longfast -# get_mqtt_neighbors_longfast -# -# p.r. -# -# Get Traceroute for LongFast only -async def get_traceroutes_longfast(since): - async with database.async_session() as session: - result = await session.execute( - select(Traceroute) - .join(Packet) - .where( - (Traceroute.import_time > (datetime.datetime.now() - since)) - & (Packet.channel == "LongFast") - ) - .order_by(Traceroute.import_time) - ) - return result.scalars() - -# Get MQTT Neighbors for LongFast only -# p.r. -async def get_mqtt_neighbors_longfast(since): - async with database.async_session() as session: - result = await session.execute(select(PacketSeen, Packet) - .join(Packet) - .where( - (PacketSeen.hop_limit == PacketSeen.hop_start) - & (PacketSeen.hop_start != 0) - & (Packet.channel == "LongFast") - ) - - .options( - lazyload(Packet.from_node), - lazyload(Packet.to_node), - ) - ) - return result - -# Get Packets for LongFast only -# p.r. -async def get_packets_longfast(node_id=None, portnum=None, since=None, limit=500, before=None, after=None): - async with database.async_session() as session: - q = select(Packet) - - # Add condition for channel being "LongFast" - q = q.where(Packet.channel == "LongFast") - - if node_id: - q = q.where( - (Packet.from_node_id == node_id) | (Packet.to_node_id == node_id) - ) - if portnum: - q = q.where(Packet.portnum == portnum) - if since: - q = q.where(Packet.import_time > (datetime.datetime.now() - since)) - if before: - q = q.where(Packet.import_time < before) - if after: - q = q.where(Packet.import_time > after) - if limit is not None: - q = q.limit(limit) - - result = await session.execute(q.order_by(Packet.import_time.desc())) - return result.scalars() - -# Get Traceroute for mediumslow only -# p.r. -async def get_traceroutes_mediumslow(since): - async with database.async_session() as session: - result = await session.execute( - select(Traceroute) - .join(Packet) - .where( - (Traceroute.import_time > (datetime.datetime.now() - since)) - & (Packet.channel == "MediumSlow") - ) - .order_by(Traceroute.import_time) - ) - return result.scalars() - -# Get MQTT Neighbors for mediumslow only -# p.r. -async def get_mqtt_neighbors_mediumslow(since): - async with database.async_session() as session: - result = await session.execute(select(PacketSeen, Packet) - .join(Packet) - .where( - (PacketSeen.hop_limit == PacketSeen.hop_start) - & (PacketSeen.hop_start != 0) - & (Packet.channel == "MediumSlow") - ) - - .options( - lazyload(Packet.from_node), - lazyload(Packet.to_node), - ) - ) - return result - -# Get Packets for MediumSlow only -# p.r. -async def get_packets_mediumslow(node_id=None, portnum=None, since=None, limit=500, before=None, after=None): - async with database.async_session() as session: - q = select(Packet) - - # Add condition for channel being "MediumSlow" - q = q.where(Packet.channel == "MediumSlow") - - if node_id: - q = q.where( - (Packet.from_node_id == node_id) | (Packet.to_node_id == node_id) - ) - if portnum: - q = q.where(Packet.portnum == portnum) - if since: - q = q.where(Packet.import_time > (datetime.datetime.now() - since)) - if before: - q = q.where(Packet.import_time < before) - if after: - q = q.where(Packet.import_time > after) - if limit is not None: - q = q.limit(limit) - - result = await session.execute(q.order_by(Packet.import_time.desc())) - return result.scalars() - - # We count the total amount of packages # This is to be used by /stats in web.py diff --git a/meshview/templates/base.html b/meshview/templates/base.html index c21c916..54a5ac1 100644 --- a/meshview/templates/base.html +++ b/meshview/templates/base.html @@ -10,6 +10,8 @@ + + {% block head %} {% endblock %} @@ -35,7 +37,7 @@
Bay Area Mesh - http://bayme.sh
Quick Links:  Nodes - Conversations - See everything -  - Mesh Graph LF - MS  - Stats +  - Mesh Graph LF - MS  - Stats  - Weekly Net - Map