wslink 2.3.0__py3-none-any.whl → 2.3.2__py3-none-any.whl

wslink/emitter.py

@@ -1,26 +1,28 @@
-from typing import TypeVar, Generic, LiteralString
-
 import asyncio
 import functools
 
 
-T = TypeVar("T", bound=LiteralString)
+class EventEmitter:
+    def __init__(self, allowed_events=None):
+        self._listeners = {}
 
+        if allowed_events is None:
+            allowed_events = []
 
-class EventEmitter(Generic[T]):
-    def __init__(self):
-        self._listeners = {}
+        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: T, *args, **kwargs):
+    def __call__(self, event, *args, **kwargs):
         self.emit(event, *args, **kwargs)
 
-    def __getattr__(self, name: T):
-        return functools.partial(self.emit, name)
+    def emit(self, event, *args, **kwargs):
+        self._validate_event(event)
 
-    def emit(self, event: T, *args, **kwargs):
         listeners = self._listeners.get(event)
         if listeners is None:
             return
@@ -36,7 +38,9 @@ class EventEmitter(Generic[T]):
             else:
                 listener(*args, **kwargs)
 
-    def add_event_listener(self, event: T, listener):
+    def add_event_listener(self, event, listener):
+        self._validate_event(event)
+
         listeners = self._listeners.get(event)
         if listeners is None:
             listeners = set()
@@ -44,7 +48,9 @@ class EventEmitter(Generic[T]):
 
         listeners.add(listener)
 
-    def remove_event_listener(self, event: T, listener):
+    def remove_event_listener(self, event, listener):
+        self._validate_event(event)
+
         listeners = self._listeners.get(event)
         if listeners is None:
             return
@@ -52,12 +58,27 @@ class EventEmitter(Generic[T]):
         if listener in listeners:
             listeners.remove(listener)
 
-    def has(self, event: T):
+    def has(self, event):
         return self.listeners_count(event) > 0
 
-    def listeners_count(self, event: T):
+    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

@@ -6,8 +6,6 @@ ServerProtocol to hook all the needed LinkProtocols together.
 
 import logging
 import asyncio
-from typing import Literal
-from dataclasses import dataclass
 
 from wslink import register as exportRpc
 from wslink import schedule_callback
@@ -120,9 +118,6 @@ class NetworkMonitor:
             await self.event.wait()
 
 
-LogEmitterEvents = Literal["exception", "error", "critical", "info", "debug"]
-
-
 class ServerProtocol(object):
     """
     Defines the core server protocol for wslink. Gathers a list of LinkProtocol
@@ -131,7 +126,9 @@ class ServerProtocol(object):
 
     def __init__(self):
         self.network_monitor = NetworkMonitor()
-        self.log_emitter = EventEmitter[LogEmitterEvents]()
+        self.log_emitter = EventEmitter(
+            allowed_events=["exception", "error", "critical", "info", "debug"]
+        )
         self.linkProtocols = []
         self.secret = None
         self.initialize()

{wslink-2.3.0.dist-info → wslink-2.3.2.dist-info}/METADATA

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

{wslink-2.3.0.dist-info → wslink-2.3.2.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=4nm5fOwfvSb5tHq5cZtUsF8YNpuphl05QZQzNHljfRU,1669
+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,7 +9,7 @@ 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=T47xgY6fgQQqDqcxmZpamIEvhQtvw_TWGeF2Es1dIpI,6350
+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/launcher.py,sha256=gHNMvtgNHEwBN_QBRDSCrTp2B4K1PsfV81rKaHi7Cxo,8897
@@ -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.0.dist-info/METADATA,sha256=hisMCyrZAwxLjXz24KZ74-VaFyHvusXzfpnzU0U5wJM,3120
-wslink-2.3.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-wslink-2.3.0.dist-info/top_level.txt,sha256=N0d8eqvhwhfW1p1yPTmvxlbzhjz7ZyhBfysNvaFqpQY,7
-wslink-2.3.0.dist-info/RECORD,,
+wslink-2.3.2.dist-info/METADATA,sha256=XfA7lfjUyU-5hJJjQKquzZOjyTLQZDOjOjDeELLnxk0,3120
+wslink-2.3.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+wslink-2.3.2.dist-info/top_level.txt,sha256=N0d8eqvhwhfW1p1yPTmvxlbzhjz7ZyhBfysNvaFqpQY,7
+wslink-2.3.2.dist-info/RECORD,,