diff --git a/main.py b/main.py
index df76987..8784bd9 100644
--- a/main.py
+++ b/main.py
@@ -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')
diff --git a/meshview/store.py b/meshview/store.py
index 9f84739..32e7ee3 100644
--- a/meshview/store.py
+++ b/meshview/store.py
@@ -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),
diff --git a/meshview/templates/base.html b/meshview/templates/base.html
index 7ea1f31..6c06026 100644
--- a/meshview/templates/base.html
+++ b/meshview/templates/base.html
@@ -1,7 +1,7 @@
- MeshView {% if node and node.short_name %}-- {{node.short_name}}{% endif %}
+ MeshView - Bay Area Mesh - http://bayme.sh {% if node and node.short_name %}-- {{node.short_name}}{% endif %}
@@ -33,6 +33,7 @@
+ Bay Area Mesh - http://bayme.sh
Loading...
diff --git a/meshview/web.py b/meshview/web.py
index 6d20e6e..8050600 100644
--- a/meshview/web.py
+++ b/meshview/web.py
@@ -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()