Allererste Fassung von Gruppen- und Dispatcher-Mobil View
This commit is contained in:
1 parent
47240302d0
commit
8e5f91948f
9 files changed
+1383
-20
No files matched your search
+40
-10
@@ -232,9 +232,23 @@ class WebSocketBroker:
|
||||
return bool(group and msg_row['receiver_id'] == group['id'])
|
||||
return False
|
||||
|
||||
# Code 2000: nur Dispatcher und Beobachter.
|
||||
# Code 2000: Dispatcher, Beobachter und Gruppen.
|
||||
if code == 2000:
|
||||
return role in ('Dispatcher', 'Beobachter')
|
||||
if role in ('Dispatcher', 'Beobachter'):
|
||||
return True
|
||||
if role == 'Gruppe':
|
||||
group = db.execute(
|
||||
'SELECT id FROM groups WHERE account_id = ? AND tenant_id = ?',
|
||||
(account_id, tenant_id)
|
||||
).fetchone()
|
||||
payload = self._payload(msg_row)
|
||||
group_id = None
|
||||
if isinstance(payload, dict):
|
||||
group_id = payload.get('group_id')
|
||||
if group_id is None:
|
||||
group_id = msg_row['receiver_id']
|
||||
return bool(group and group_id == group['id'])
|
||||
return False
|
||||
|
||||
return False
|
||||
|
||||
@@ -762,7 +776,11 @@ class WebSocketBroker:
|
||||
|
||||
elif code == 2000:
|
||||
# Eine Gruppe sendet an Dispatcher und Beobachter.
|
||||
# Im Gruppen/Mobil-View sollen nur Nachrichten an alle oder an diese Gruppe ankommen.
|
||||
add_accounts(('Dispatcher', 'Beobachter'))
|
||||
group_id = self._resolve_group_id(tenant_id, message, sender, payload)
|
||||
if group_id:
|
||||
add_group_account(group_id)
|
||||
|
||||
elif code == 2:
|
||||
# Heartbeat-Antworten werden nur an Dispatcher-Views weitergegeben.
|
||||
@@ -788,15 +806,27 @@ class WebSocketBroker:
|
||||
@staticmethod
|
||||
def _payload(message):
|
||||
"""Liefert den JSON-Payload einer Nachricht oder None."""
|
||||
if isinstance(message.msg, dict):
|
||||
return message.msg
|
||||
if not isinstance(message.msg, str):
|
||||
return None
|
||||
try:
|
||||
data = json.loads(message.msg)
|
||||
return data if isinstance(data, dict) else None
|
||||
except (ValueError, TypeError):
|
||||
if isinstance(message, dict):
|
||||
msg = message.get('msg')
|
||||
if isinstance(msg, dict):
|
||||
return msg
|
||||
if isinstance(msg, str):
|
||||
try:
|
||||
data = json.loads(msg)
|
||||
return data if isinstance(data, dict) else None
|
||||
except (ValueError, TypeError):
|
||||
return None
|
||||
return None
|
||||
if hasattr(message, 'msg'):
|
||||
if isinstance(message.msg, dict):
|
||||
return message.msg
|
||||
if isinstance(message.msg, str):
|
||||
try:
|
||||
data = json.loads(message.msg)
|
||||
return data if isinstance(data, dict) else None
|
||||
except (ValueError, TypeError):
|
||||
return None
|
||||
return None
|
||||
|
||||
def _resolve_group_id(self, tenant_id, message, sender, payload):
|
||||
"""Ermittelt die betroffene Gruppen-ID aus Payload, receiver_id oder Absender."""
|
||||
|
||||
Reference in new issue
Block a user