wslink 2.3.0__tar.gz → 2.3.2__tar.gz

{wslink-2.3.0 → wslink-2.3.2}/PKG-INFO

@@ -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 → wslink-2.3.2}/setup.cfg

@@ -1,5 +1,5 @@
 [metadata]
-version = 2.3.0
+version = 2.3.2
 
 [egg_info]
 tag_build = 

{wslink-2.3.0 → wslink-2.3.2}/src/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-2.3.0 → wslink-2.3.2}/src/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 → wslink-2.3.2}/src/wslink.egg-info/PKG-INFO

@@ -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.