2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

live mesh log

Browse source
This commit is contained in:
Laura Klünder 2023-10-05 01:36:24 +02:00
parent 18c33a823e
commit 304d35c057
7 changed files with 143 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/c3nav/control/templates/control/fragment_mesh_websocket.html Normal file
View file

@ -0,0 +1,66 @@
{% if node_names %}
{{ node_names|json_script:"node-names" }}
{% endif %}
<script type="text/javascript">
{% if node_names %}
const node_names = JSON.parse(document.getElementById('node-names').textContent);
{% endif %}
function connect() {
console.log('reconnecting websocket...');
var ws = new WebSocket((window.location.protocol=="https:"?"wss:":"ws:")+window.location.host+"/mesh/ui/ws", []);
ws.onopen = (event) => {
console.log('websocket connected.');
ws.send(JSON.stringify({"subscribe": "log"}));
};
ws.onclose = (event) => {
window.setTimeout(connect, 500);
}
ws.onmessage = (event) => {
var data = JSON.parse(event.data);
switch(data.type) {
case 'mesh.log_entry':
var line = document.createElement("tr"), cell, link_tag;
cell = document.createElement("td");
cell.innerText = data.timestamp;
line.appendChild(cell);
cell = document.createElement("td");
cell.innerText = data.channel;
if (data.uplink) {
cell.append(document.createElement("br"));
link_tag = document.createElement("a")
link_tag.href = "/control/mesh/" + data.uplink;
link_tag.innerText = data.uplink;
if (node_names[data.uplink]) {
link_tag.innerText += " ("+node_names[data.uplink]+")";
}
cell.append(link_tag)
}
line.appendChild(cell);
cell = document.createElement("td");
link_tag = document.createElement("a")
link_tag.href = "/control/mesh/" + data.node;
link_tag.innerText = data.node;
if (node_names[data.node]) {
link_tag.innerText += " ("+node_names[data.node]+")";
}
cell.append(link_tag);
line.appendChild(cell);
cell = document.createElement("td");
cell.innerText = data.text;
line.appendChild(cell);
document.querySelector("tbody").prepend(line);
break;
}
console.log(data);
}
}
connect();
</script>

19
src/c3nav/control/templates/control/mesh_logs.html Normal file
View file

@ -0,0 +1,19 @@
{% extends 'control/base.html' %}
{% load i18n %}
{% block heading %}{% trans 'Mesh logs' %}{% endblock %}
{% block subcontent %}
<table style="font-size: 85%;">
<thead>
<tr>
<th>{% trans 'Time' %}</th>
<th>{% trans 'Uplink' %}</th>
<th>{% trans 'Node' %}</th>
<th>{% trans 'Message' %}</th>
</tr>
</thead>
<tbody id="mesh-logs"></tbody>
</table>
{% include "control/fragment_mesh_websocket.html" %}
{% endblock %}

1
src/c3nav/control/templates/control/mesh_nodes.html
View file

@ -41,4 +41,5 @@
</tr>
{% endfor %}
</table>
{% include "control/fragment_mesh_websocket.html" %}
{% endblock %}

3
src/c3nav/control/urls.py
View file

@ -1,7 +1,7 @@
from django.urls import path
from c3nav.control.views.mesh import MeshNodeListView, MeshMessageListView, MeshNodeDetailView, MeshMessageSendView, \
MeshNodeEditView
MeshNodeEditView, MeshLogView
from c3nav.control.views.mapupdates import map_updates
from c3nav.control.views.announcements import announcement_list, announcement_detail
from c3nav.control.views.access import grant_access, grant_access_qr
@ -17,6 +17,7 @@ urlpatterns = [
path('announcements/<int:annoucement>/', announcement_detail, name='control.announcements.detail'),
path('mapupdates/', map_updates, name='control.map_updates'),
path('mesh/', MeshNodeListView.as_view(), name='control.mesh_nodes'),
path('mesh/logs/', MeshLogView.as_view(), name='control.mesh_log'),
path('mesh/messages/', MeshMessageListView.as_view(), name='control.mesh_messages'),
path('mesh/<str:pk>/', MeshNodeDetailView.as_view(), name='control.mesh_node.detail'),
path('mesh/<str:pk>/edit/', MeshNodeEditView.as_view(), name='control.mesh_node.edit'),

13
src/c3nav/control/views/mesh.py
View file

@ -4,7 +4,7 @@ from django.db.models import Max
from django.http import Http404
from django.urls import reverse
from django.utils.translation import gettext_lazy as _
from django.views.generic import ListView, DetailView, FormView, UpdateView
from django.views.generic import ListView, DetailView, FormView, UpdateView, TemplateView
from c3nav.control.forms import MeshMessageFilterForm
from c3nav.control.views.base import ControlPanelMixin
@ -116,3 +116,14 @@ class MeshMessageSendView(ControlPanelMixin, FormView):
form.send()
messages.success(self.request, _('Message sent successfully'))
return super().form_valid(form)
class MeshLogView(ControlPanelMixin, TemplateView):
template_name = "control/mesh_logs.html"
def get_context_data(self, **kwargs):
return {
**super().get_context_data(),
"node_names": {
node.address: node.name for node in MeshNode.objects.all()
}
}

49
src/c3nav/mesh/consumers.py
View file

@ -1,7 +1,7 @@
import traceback
from asgiref.sync import async_to_sync
from channels.generic.websocket import WebsocketConsumer
from channels.generic.websocket import WebsocketConsumer, JsonWebsocketConsumer
from django.utils import timezone
from c3nav.mesh.utils import get_mesh_comm_group
@ -13,14 +13,14 @@ from c3nav.mesh.models import MeshNode, NodeMessage
# noinspection PyAttributeOutsideInit
class MeshConsumer(WebsocketConsumer):
def connect(self):
print('connected!')
# todo: auth
self.uplink_node = None
self.log_text(None, "new mesh websocket connection")
self.dst_nodes = set()
self.accept()
def disconnect(self, close_code):
print('disconnected!')
self.log_text(self.uplink_node, "mesh websocket disconnected")
if self.uplink_node is not None:
# leave broadcast group
async_to_sync(self.channel_layer.group_add)(get_mesh_comm_group(BROADCAST_ADDRESS), self.channel_name)
@ -29,7 +29,8 @@ class MeshConsumer(WebsocketConsumer):
self.remove_dst_nodes(self.dst_nodes)
def send_msg(self, msg):
print('Sending message:', msg)
print("sending", msg)
self.log_text(msg.dst, "sending %s" % msg)
self.send(bytes_data=msg.encode())
def receive(self, text_data=None, bytes_data=None):
@ -92,19 +93,20 @@ class MeshConsumer(WebsocketConsumer):
def mesh_uplink_consumer(self, data):
# message handler: if we are not the given uplink, leave this group
if data["name"] != self.channel_name:
print('shutting down since we have been replaced')
self.log_text(self.uplink_node, "shutting down, uplink now served by new consumer")
self.close()
def mesh_dst_node_uplink(self, data):
# message handler: if we are not the given uplink, leave this group
if data["uplink"] != self.uplink_node.address:
print('leaving node group...')
self.log_text(data["address"], "node now served by new consumer")
self.remove_dst_nodes((data["address"], ))
def mesh_send(self, data):
self.send_msg(MeshMessage.fromjson(data["msg"]))
def log_received_message(self, src_node: MeshNode, msg: messages.MeshMessage):
self.log_text(msg.src, "received %s" % msg)
NodeMessage.objects.create(
uplink_node=self.uplink_node,
src_node=src_node,
@ -112,10 +114,22 @@ class MeshConsumer(WebsocketConsumer):
data=msg.tojson()
)
def log_text(self, address, text):
address = getattr(address, 'address', address)
async_to_sync(self.channel_layer.group_send)("mesh_log", {
"type": "mesh.log_entry",
"timestamp": timezone.now().strftime("%d.%m.%y %H:%M:%S.%f"),
"channel": self.channel_name,
"uplink": self.uplink_node.address if self.uplink_node else None,
"node": address,
"text": text,
})
def add_dst_nodes(self, nodes=None, addresses=None):
nodes = list(nodes) if nodes else []
addresses = set(addresses) if addresses else set()
node_addresses = set(node.address for node in nodes)
missing_addresses = addresses - set(node.address for node in nodes)
if missing_addresses:
@ -123,9 +137,13 @@ class MeshConsumer(WebsocketConsumer):
[MeshNode(address=address) for address in missing_addresses],
ignore_conflicts=True
)
addresses |= node_addresses
addresses |= missing_addresses
for address in addresses:
self.log_text(address, "destination added")
# create group name for this address
group = get_mesh_comm_group(address)
@ -157,6 +175,8 @@ class MeshConsumer(WebsocketConsumer):
def remove_dst_nodes(self, addresses):
for address in tuple(addresses):
self.log_text(address, "destination removed")
# create group name for this address
group = get_mesh_comm_group(address)
@ -171,5 +191,18 @@ class MeshConsumer(WebsocketConsumer):
uplink_id=None,
)
def remove_route(self, route_address):
MeshNode.objects.filter(route_id=route_address).update(route_id=None)
class MeshUIConsumer(JsonWebsocketConsumer):
def connect(self):
# todo: auth
self.accept()
def receive_json(self, content, **kwargs):
if content.get("subscribe", None) == "log":
async_to_sync(self.channel_layer.group_add)("mesh_log", self.channel_name)
def mesh_log_entry(self, data):
self.send_json(data)
def disconnect(self, code):
async_to_sync(self.channel_layer.group_discard)("mesh_log", self.channel_name)

3
src/c3nav/mesh/urls.py
View file

@ -1,7 +1,8 @@
from django.urls import path
from c3nav.mesh.consumers import MeshConsumer
from c3nav.mesh.consumers import MeshConsumer, MeshUIConsumer
websocket_urlpatterns = [
path('ws', MeshConsumer.as_asgi()),
path('ui/ws', MeshUIConsumer.as_asgi()),
]