wslink 2.3.1__py3-none-any.whl → 2.3.3__py3-none-any.whl

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/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/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.dist-info → wslink-2.3.3.dist-info}/METADATA

@@ -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.dist-info → wslink-2.3.3.dist-info}/RECORD

@@ -1,7 +1,7 @@
 wslink/LICENSE,sha256=I44UH7kDVqxDLnnlOWw_hFL2Fz7RjQ_4vPzZv9NYgTU,1483
 wslink/__init__.py,sha256=qdLGVhzpEXBoraTnLr5S-8bX9oK8pZCQWe8rZRlwAco,2946
 wslink/chunking.py,sha256=1DJlGG6fjknGFrqPOtqUUc5tCrijldP7Kdx56d5e3Wg,7337
-wslink/emitter.py,sha256=vgpA9pmqMLLPm7UDVLfbDY2mgvm21pngsRmBhYT0GcU,1971
+wslink/emitter.py,sha256=eniDanfasJeEa5rDC92nmgaAVWKjjmgZaqbCZwlwQIw,2228
 wslink/launcher.py,sha256=8VMs3juObLkyGYQFNLjMoo4qFpKIcxWz0kS-af-DKO4,21170
 wslink/protocol.py,sha256=IUvdYzXaaKP4qllJps6uQ8zvbipbH6MVwU6o6f60Kuc,17265
 wslink/publish.py,sha256=Xyv9piZT4HxO5l_SA7zeReH8t6tisVHUgU57Hjzgkcg,1595
@@ -9,9 +9,9 @@ wslink/relay.py,sha256=E8Lzu2Ay7KbOheN1-ArAZawo8lLqdDgJXOZSBuMknYs,86
 wslink/server.py,sha256=yvhCjpzPOfhbZrpDvW9i4H_uSyuQAe3ZOP-BRBmgHQA,9326
 wslink/ssl_context.py,sha256=hNOJJCdrStws1Qf6vPvY4vTk9Bf8J5d90W3fS0cRv8o,2290
 wslink/uri.py,sha256=woCQ4yChUqTMg9IT6YYDtUYeKmCg7OUCEgeBGA-19DY,384
-wslink/websocket.py,sha256=wuwqJwgAWmbvtj-FvRezhzXqdUqdoq7nDpWLmetxNTs,6191
+wslink/websocket.py,sha256=mQCcKHM4xAjlMj3gHeuIDgk9TM9cfNniOb5y_hMMQVg,6279
 wslink/backends/__init__.py,sha256=cyJGjm-YyBSyOEX81owyTbJ3YnrA6dB7--B4LnsEtHI,1214
-wslink/backends/aiohttp/__init__.py,sha256=SSK5a_lxuEZGyW_mMMipgvAhJQQLhxAImR3jRokFchM,9301
+wslink/backends/aiohttp/__init__.py,sha256=aD0STOiYI4_WyTPnhKN2XDywN5o5kcfK3VD5ZBf-1Kc,9796
 wslink/backends/aiohttp/launcher.py,sha256=gHNMvtgNHEwBN_QBRDSCrTp2B4K1PsfV81rKaHi7Cxo,8897
 wslink/backends/aiohttp/relay.py,sha256=oZAzIQTpsQaObWXaa-_VtoTOUQALC_QLDd9UvWspYaU,13311
 wslink/backends/generic/__init__.py,sha256=Qu65gWsd2xCSsxybnDtEDI5vMjHN-F5jgPZOyNIxnGs,112
@@ -20,7 +20,7 @@ wslink/backends/jupyter/__init__.py,sha256=Qu65gWsd2xCSsxybnDtEDI5vMjHN-F5jgPZOy
 wslink/backends/jupyter/core.py,sha256=F8R3uH4m6RHCrHHRiA5UAgDOLdyGbpuCSAgCZxANREk,2794
 wslink/backends/tornado/__init__.py,sha256=Qu65gWsd2xCSsxybnDtEDI5vMjHN-F5jgPZOyNIxnGs,112
 wslink/backends/tornado/core.py,sha256=tPMkkhWuO_ovkisVim0zcegwZKEAG4IRUdd_O_0a_R0,2157
-wslink-2.3.1.dist-info/METADATA,sha256=vwfCnfjB7VrNadykxK9VYtNT2p4hiPQ_r13R5oMyMOE,3120
-wslink-2.3.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-wslink-2.3.1.dist-info/top_level.txt,sha256=N0d8eqvhwhfW1p1yPTmvxlbzhjz7ZyhBfysNvaFqpQY,7
-wslink-2.3.1.dist-info/RECORD,,
+wslink-2.3.3.dist-info/METADATA,sha256=ftoh428vQm8_w8T90qSnIv0dnWpxjQ82qAcffEnhH5Y,3120
+wslink-2.3.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+wslink-2.3.3.dist-info/top_level.txt,sha256=N0d8eqvhwhfW1p1yPTmvxlbzhjz7ZyhBfysNvaFqpQY,7
+wslink-2.3.3.dist-info/RECORD,,