Fixed:

-> !wants
-> !orgs info
-> special cmd's
-> !assist
-> "afk" for players without active account
-> !loot add <item_ref> <count> => nolonger breaks !account
Changes:
-> grouped !tara, !gaunt, .. into !wb
-> Display the most recent news entry on logon (default: enabled)
-> improved grouping of !items
-> Added the option to authentificate WS connections (Datanet module). This is used in special cases, where the Websocket Server requires the clien tto authentificate itself. (Server sends "#auth", client responds with the auth string)
-> Add main name to relaying (priv <-> org) [default: disabled]
-> Added logon/logoff messages back
-> restricted default access to "dangerous" commands to moderator
-> Added optional logging (Private Channel, Org Channel, Tells, ... disabled by default)

Rewrite of the Tower Module.
-> More verbosity, if enabled in config. by default, GAS and Hot timer only.
-> !hot displays currently hot (and in penalty) sites, and these which go hot in < 60 minutes
-> !attacks filterable by PF and Site
-> display current contract QL's grouped by org: !contracts (requires managed cache)

modules/standard/datanet/ws_controller.py

@@ -6,7 +6,7 @@ from core.decorators import instance, timerevent
 from core.event_service import EventService
 from core.logger import Logger
 from core.setting_service import SettingService
-from core.setting_types import TextSettingType
+from core.setting_types import TextSettingType, HiddenSettingType
 from modules.standard.datanet.ws_worker import WebsocketRelayWorker
 
 
@@ -37,10 +37,16 @@ class WebsocketRelayController(BaseModule):
     def pre_start(self):
         self.event_service.register_event_type(self.WS_RELAY)
         self.setting_service.register(self.module_name,
-                                          'relay_address',
-                                          'ws://localhost:25500',
+                                      'relay_address',
+                                      'ws://localhost:25500',
                                       TextSettingType([], allow_empty=True),
-                                          "relay for timers, tower info, ...")
+                                      "relay for timers, tower info, ...")
+
+        self.setting_service.register(self.module_name,
+                                      'datanet_auth',
+                                      '',
+                                      HiddenSettingType([], allow_empty=True),
+                                      "Auth Challenge response")
 
     @timerevent(budatime="1s", description="Relay messages from Data relay to the internal message hub",
                 is_hidden=True)
@@ -48,8 +54,6 @@ class WebsocketRelayController(BaseModule):
         while self.queue:
             obj = self.queue.pop(0)
             self.event_service.fire_event(self.WS_RELAY, obj)
-            if obj.type == "connected":
-                self.send_relay_message('join', f"{self.bot.name}")
 
     @timerevent(budatime="1m", description="Ensure the bot is connected to Data relay", is_hidden=True,
                 run_at_startup=True)
@@ -68,7 +72,8 @@ class WebsocketRelayController(BaseModule):
 
     def connect(self):
         self.disconnect()
-        self.worker = WebsocketRelayWorker(self.queue, self.setting_service.get_value("relay_address"), False)
+        self.worker = WebsocketRelayWorker(self.queue, self.setting_service.get_value("relay_address"),
+                                           self.setting_service.get_value("datanet_auth"))
         self.dthread = threading.Thread(target=self.worker.run, daemon=True)
         self.dthread.start()
 

modules/standard/datanet/ws_worker.py

@@ -1,16 +1,17 @@
 import json
 
-from websocket import create_connection
+from websocket import create_connection, WebSocketConnectionClosedException
 
 from core.dict_object import DictObject
 from core.logger import Logger
 
 
 class WebsocketRelayWorker:
-    def __init__(self, inbound_queue, url, proxy):
+    def __init__(self, inbound_queue, url, auth):
         self.logger = Logger(__name__)
         self.inbound_queue = inbound_queue
         self.url = url
+        self.auth = auth
         self.ws = None
 
     def run(self):
@@ -21,13 +22,19 @@ class WebsocketRelayWorker:
 
             result = self.ws.recv()
             while result:
-                obj = DictObject(json.loads(result))
-                self.inbound_queue.append(obj)
+                if result == "#auth":
+                    self.ws.send(self.auth)
+                else:
+                    obj = DictObject(json.loads(result))
+                    self.inbound_queue.append(obj)
                 result = self.ws.recv()
-
             self.ws.close()
         except ConnectionRefusedError:
             pass
+        except ConnectionResetError:
+            pass
+        except WebSocketConnectionClosedException:
+            pass
 
     def send_message(self, message):
         if self.ws: