wslink 2.3.1__tar.gz → 2.3.3__tar.gz

{wslink-2.3.1 → wslink-2.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wslink
-Version: 2.3.1
+Version: 2.3.3
 Summary: Python/JavaScript library for communicating over WebSocket
 Home-page: https://github.com/kitware/wslink
 Author: Kitware, Inc.

{wslink-2.3.1 → wslink-2.3.3}/setup.cfg

@@ -1,5 +1,5 @@
 [metadata]
-version = 2.3.1
+version = 2.3.3
 
 [egg_info]
 tag_build = 

{wslink-2.3.1 → wslink-2.3.3}/src/wslink/backends/aiohttp/__init__.py

@@ -27,6 +27,19 @@ STATE_KEY = aiohttp_web.AppKey("state", str)
 
 logger = logging.getLogger(__name__)
 
+def reload_settings():
+    global MSG_OVERHEAD, MAX_MSG_SIZE, HEART_BEAT, HTTP_HEADERS
+
+    MSG_OVERHEAD = int(os.environ.get("WSLINK_MSG_OVERHEAD", 4096))
+    MAX_MSG_SIZE = int(os.environ.get("WSLINK_MAX_MSG_SIZE", 4194304))
+    HEART_BEAT = int(os.environ.get("WSLINK_HEART_BEAT", 30))  # 30 seconds
+    HTTP_HEADERS = os.environ.get("WSLINK_HTTP_HEADERS")
+
+    # Allow to skip heart beat
+    if HEART_BEAT < 1:
+        HEART_BEAT = None
+
+
 # -----------------------------------------------------------------------------
 # HTTP helpers
 # -----------------------------------------------------------------------------
@@ -57,6 +70,7 @@ async def http_headers(request: aiohttp_web.Request, handler):
 # -----------------------------------------------------------------------------
 class WebAppServer(AbstractWebApp):
     def __init__(self, server_config):
+        reload_settings()
         AbstractWebApp.__init__(self, server_config)
         if HTTP_HEADERS:
             self.set_app(aiohttp_web.Application(middlewares=[http_headers]))
@@ -167,6 +181,7 @@ class WebAppServer(AbstractWebApp):
 
 class ReverseWebAppServer(AbstractWebApp):
     def __init__(self, server_config):
+        reload_settings()
         super().__init__(server_config)
         self._url = server_config.get("reverse_url")
         self._server_protocol = server_config.get("ws_protocol")

{wslink-2.3.1 → wslink-2.3.3}/src/wslink/emitter.py

@@ -3,34 +3,26 @@ import functools
 
 
 class EventEmitter:
-    def __init__(self):
+    def __init__(self, allowed_events=None):
         self._listeners = {}
 
+        if allowed_events is None:
+            allowed_events = []
+
+        self._allowed_events = set(allowed_events)
+
+        for event in self._allowed_events:
+            setattr(self, event, functools.partial(self.emit, event))
+
     def clear(self):
         self._listeners = {}
 
     def __call__(self, event, *args, **kwargs):
         self.emit(event, *args, **kwargs)
 
-    def __getattr__(self, name):
-        return functools.partial(self.emit, name)
-
-    def exception(self, *args, **kwargs):
-        self.emit("exception", *args, **kwargs)
-
-    def error(self, *args, **kwargs):
-        self.emit("error", *args, **kwargs)
-
-    def critical(self, *args, **kwargs):
-        self.emit("critical", *args, **kwargs)
-
-    def info(self, *args, **kwargs):
-        self.emit("info", *args, **kwargs)
-
-    def debug(self, *args, **kwargs):
-        self.emit("debug", *args, **kwargs)
-
     def emit(self, event, *args, **kwargs):
+        self._validate_event(event)
+
         listeners = self._listeners.get(event)
         if listeners is None:
             return
@@ -47,6 +39,8 @@ class EventEmitter:
                 listener(*args, **kwargs)
 
     def add_event_listener(self, event, listener):
+        self._validate_event(event)
+
         listeners = self._listeners.get(event)
         if listeners is None:
             listeners = set()
@@ -55,6 +49,8 @@ class EventEmitter:
         listeners.add(listener)
 
     def remove_event_listener(self, event, listener):
+        self._validate_event(event)
+
         listeners = self._listeners.get(event)
         if listeners is None:
             return
@@ -66,8 +62,23 @@ class EventEmitter:
         return self.listeners_count(event) > 0
 
     def listeners_count(self, event):
+        self._validate_event(event)
+
         listeners = self._listeners.get(event)
         if listeners is None:
             return 0
 
         return len(listeners)
+
+    @property
+    def allowed_events(self):
+        return self._allowed_events
+
+    def _validate_event(self, event):
+        if len(self.allowed_events) == 0:
+            return
+
+        if event not in self.allowed_events:
+            raise ValueError(
+                f"'{event}' is not a known event of this EventEmitter: {self.allowed_events}"
+            )

{wslink-2.3.1 → wslink-2.3.3}/src/wslink/websocket.py

@@ -126,7 +126,9 @@ class ServerProtocol(object):
 
     def __init__(self):
         self.network_monitor = NetworkMonitor()
-        self.log_emitter = EventEmitter()
+        self.log_emitter = EventEmitter(
+            allowed_events=["exception", "error", "critical", "info", "debug"]
+        )
         self.linkProtocols = []
         self.secret = None
         self.initialize()

{wslink-2.3.1 → wslink-2.3.3}/src/wslink.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wslink
-Version: 2.3.1
+Version: 2.3.3
 Summary: Python/JavaScript library for communicating over WebSocket
 Home-page: https://github.com/kitware/wslink
 Author: Kitware, Inc.