iarv/meshview
1
0
Fork 1
mirror of https://github.com/pablorevilla-meshtastic/meshview.git synced 2026-03-04 23:27:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

changes to README

Browse Source
This commit is contained in:
Pablo Revilla
2025-01-13 12:56:55 -08:00
parent 854f1c5555
commit 4fa4e17f45
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main.py
View File

@@ -28,7 +28,7 @@ if __name__ == '__main__':
parser = argparse.ArgumentParser('meshview')
parser.add_argument('--bind', nargs='*', default=['*'])
parser.add_argument('--acme-challenge')
parser.add_argument('--port', default=80, type=int)
parser.add_argument('--port', default=8080, type=int)
parser.add_argument('--tls-cert')
parser.add_argument('--mqtt-server', default='mqtt.bayme.sh')

16
meshview/store.py
View File

@@ -28,7 +28,8 @@ async def process_envelope(topic, env):
from_node_id=getattr(env.packet, "from"),
to_node_id=env.packet.to,
payload=env.packet.SerializeToString(),
import_time=datetime.datetime.utcnow(),
# 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(packet)
@@ -51,7 +52,8 @@ async def process_envelope(topic, env):
hop_limit=env.packet.hop_limit,
hop_start=env.packet.hop_start,
topic=topic,
import_time=datetime.datetime.utcnow(),
# 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)
@@ -122,7 +124,7 @@ async def process_envelope(topic, env):
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.utcnow(),
import_time=datetime.datetime.now(),
))
await session.commit()
@@ -164,7 +166,7 @@ async def get_packets(node_id=None, portnum=None, since=None, limit=500, before=
if portnum:
q = q.where(Packet.portnum == portnum)
if since:
q = q.where(Packet.import_time > (datetime.datetime.utcnow() - since))
q = q.where(Packet.import_time > (datetime.datetime.utc() - since))
if before:
q = q.where(Packet.import_time < before)
if after:
@@ -187,7 +189,7 @@ async def get_packets_from(node_id=None, portnum=None, since=None, limit=500):
if portnum:
q = q.where(Packet.portnum == portnum)
if since:
q = q.where(Packet.import_time > (datetime.datetime.utcnow() - since))
q = q.where(Packet.import_time > (datetime.datetime.now() - since))
result = await session.execute(q.limit(limit).order_by(Packet.import_time.desc()))
return result.scalars()
@@ -242,7 +244,7 @@ async def get_traceroutes(since):
result = await session.execute(
select(Traceroute)
.join(Packet)
.where(Traceroute.import_time > (datetime.datetime.utcnow() - since))
.where(Traceroute.import_time > (datetime.datetime.utc() - since))
.order_by(Traceroute.import_time)
)
return result.scalars()
@@ -255,7 +257,7 @@ async def get_mqtt_neighbors(since):
.where(
(PacketSeen.hop_limit == PacketSeen.hop_start)
& (PacketSeen.hop_start != 0)
& (PacketSeen.import_time > (datetime.datetime.utcnow() - since))
& (PacketSeen.import_time > (datetime.datetime.now() - since))
)
.options(
lazyload(Packet.from_node),

3
meshview/templates/base.html
View File

@@ -1,7 +1,7 @@
<!doctype html>
<html lang="en">
<head>
<title>MeshView {% if node and node.short_name %}-- {{node.short_name}}{% endif %}</title>
<title>MeshView - Bay Area Mesh - http://bayme.sh {% if node and node.short_name %}-- {{node.short_name}}{% endif %}</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<script src="https://unpkg.com/htmx.org@1.9.11" integrity="sha384-0gxUXCCR8yv9FM2b+U3FDbsKthCI66oH5IA9fHppQq9DDMHuMauqq1ZHBpJxQ0J0" crossorigin="anonymous"></script>
@@ -33,6 +33,7 @@
</style>
</head>
<body hx-indicator="#spinner">
<div style="text-align:center"><strong>Bay Area Mesh - http://bayme.sh</strong></div>
<div style="text-align:center"><a href="/">Search for a node </a>&nbsp;-&nbsp;<a href="/graph/network">See a realtime graph of the network </a>&nbsp;-&nbsp;<a href="/chat">See what people are saying </a>&nbsp;-&nbsp;<a href="/firehose">See <strong>everything</strong> </a> </div><br>
<div id="spinner" class="spinner-border secondary-primary htmx-indicator position-absolute top-50 start-50" role="status">
<span class="visually-hidden">Loading...</span>

9
meshview/web.py
View File

@@ -55,7 +55,7 @@ async def build_neighbors(node_id):
packet = (await store.get_packets_from(node_id, PortNum.NEIGHBORINFO_APP, limit=1)).first()
if not packet:
return []
if packet.import_time < datetime.datetime.utcnow() - datetime.timedelta(days=1):
if packet.import_time < datetime.datetime.now() - datetime.timedelta(days=1):
return []
_, payload = decode_payload.decode(packet)
neighbors = []
@@ -78,6 +78,7 @@ async def build_neighbors(node_id):
del results[node_id]
return list(results.values())
return list(results.values())
def node_id_to_hex(node_id):
@@ -89,7 +90,7 @@ def node_id_to_hex(node_id):
def format_timestamp(timestamp):
if isinstance(timestamp, int):
timestamp = datetime.datetime.fromtimestamp(timestamp, datetime.timezone.utc)
timestamp = datetime.datetime.fromtimestamp(timestamp, datetime.timezone.now)
return timestamp.isoformat(timespec="milliseconds")
@@ -676,7 +677,7 @@ async def graph_power_metrics(request):
@routes.get("/graph/neighbors/{node_id}")
async def graph_neighbors(request):
oldest = datetime.datetime.utcnow() - datetime.timedelta(days=4)
oldest = datetime.datetime.now() - datetime.timedelta(days=4)
data = {}
dates =[]
@@ -724,7 +725,7 @@ async def graph_neighbors(request):
@routes.get("/graph/neighbors2/{node_id}")
async def graph_neighbors2(request):
oldest = datetime.datetime.utcnow() - datetime.timedelta(days=30)
oldest = datetime.datetime.now() - datetime.timedelta(days=30)
data = []
node_ids = set()