wslink 1.11.0__py3-none-any.whl → 1.11.2__py3-none-any.whl

wslink/backends/aiohttp/__init__.py

@@ -35,10 +35,10 @@ def _fix_path(path):
 # -----------------------------------------------------------------------------
 
 
-class WebAppServer(AbstractWebApp, aiohttp_web.Application):
+class WebAppServer(AbstractWebApp):
     def __init__(self, server_config):
         AbstractWebApp.__init__(self, server_config)
-        aiohttp_web.Application.__init__(self)
+        self.set_app(aiohttp_web.Application())
         self._ws_handlers = []
         self._site = None
         self._runner = None
@@ -52,7 +52,7 @@ class WebAppServer(AbstractWebApp, aiohttp_web.Application):
                     aiohttp_web.get(_fix_path(route), protocol_handler.handleWsRequest)
                 )
 
-            self.add_routes(routes)
+            self.app.add_routes(routes)
 
         if "static" in server_config:
             static_routes = server_config["static"]
@@ -68,10 +68,10 @@ class WebAppServer(AbstractWebApp, aiohttp_web.Application):
                 )
 
             # Resolve / => index.html
-            self.router.add_route("GET", "/", _root_handler)
-            self.add_routes(routes)
+            self.app.router.add_route("GET", "/", _root_handler)
+            self.app.add_routes(routes)
 
-        self["state"] = {}
+        self.app["state"] = {}
 
     # -------------------------------------------------------------------------
     # Server status
@@ -94,7 +94,9 @@ class WebAppServer(AbstractWebApp, aiohttp_web.Application):
     # -------------------------------------------------------------------------
 
     async def start(self, port_callback=None):
-        self._runner = aiohttp_web.AppRunner(self, handle_signals=self.handle_signals)
+        self._runner = aiohttp_web.AppRunner(
+            self.app, handle_signals=self.handle_signals
+        )
 
         logging.info("awaiting runner setup")
         await self._runner.setup()

wslink/backends/generic/core.py

@@ -1,12 +1,5 @@
 import asyncio
-import copy
-import os
-import inspect
-import json
 import logging
-import re
-import sys
-import traceback
 import uuid
 from pathlib import Path
 import shutil
@@ -14,7 +7,7 @@ import shutil
 from wslink.protocol import WslinkHandler, AbstractWebApp
 
 
-class Client:
+class WsConnection:
     def __init__(self):
         self._id = str(uuid.uuid4()).replace("-", "")
         self._ws = None
@@ -58,15 +51,15 @@ class Client:
         await self._on_message_fn(True, value)
 
 
-class FakeWs(WslinkHandler):
+class WsEndpoint(WslinkHandler):
     def __init__(self, protocol=None, web_app=None):
         super().__init__(protocol, web_app)
 
     def connect(self):
-        client = Client()
-        self.connections[client.client_id] = client
-        client.on_connect(self)
-        return client
+        conn = WsConnection()
+        self.connections[conn.client_id] = conn
+        conn.on_connect(self)
+        return conn
 
     def disconnect(self, client_or_id):
         client_or_id = (
@@ -84,7 +77,7 @@ class GenericServer(AbstractWebApp):
 
         if "ws" in server_config:
             for route, server_protocol in server_config["ws"].items():
-                protocol_handler = FakeWs(server_protocol, self)
+                protocol_handler = WsEndpoint(server_protocol, self)
                 self._websockets[route] = protocol_handler
 
     def write_static_content(self, dest_directory):

wslink/protocol.py

@@ -7,7 +7,7 @@ import re
 import traceback
 
 from wslink import schedule_coroutine
-from wslink import publish as pub
+from wslink.publish import PublishManager
 
 
 class AbstractWebApp:
@@ -16,6 +16,7 @@ class AbstractWebApp:
         self._config = server_config
         self._shutdown_task = None
         self._completion = asyncio.get_event_loop().create_future()
+        self._app = None
 
     # -------------------------------------------------------------------------
     # Config helper
@@ -58,11 +59,22 @@ class AbstractWebApp:
         self._last_active_client_id = value
 
     # -------------------------------------------------------------------------
-    # Legacy / deprecated
+    # Implementation server class
     # -------------------------------------------------------------------------
 
-    def set_app(self, *args):
-        print("DEPRECATED: set_app()")
+    def set_app(self, app):
+        self._app = app
+
+    def get_app(self):
+        return self._app
+
+    @property
+    def app(self):
+        return self._app
+
+    # -------------------------------------------------------------------------
+    # Legacy / deprecated
+    # -------------------------------------------------------------------------
 
     def get_config(self):
         print("DEPRECATED: get_config() use property instead")
@@ -71,14 +83,6 @@ class AbstractWebApp:
     def set_config(self, config):
         print("DEPRECATED: set_config() use constructor instead")
 
-    def get_app(self):
-        print("DEPRECATED: get_app()")
-        return self
-
-    @property
-    def app(self):
-        print("DEPRECATED: .app.")
-
     def get_last_active_client_id(self):
         print(
             "DEPRECATED: get_last_active_client_id() should be replaced by last_active_client_id"
@@ -132,6 +136,7 @@ class WslinkHandler(object):
         self.connections = {}
         self.authentified_client_ids = set()
         self.attachment_atomic = asyncio.Lock()
+        self.pub_manager = PublishManager()
 
         # Build the rpc method dictionary, assuming we were given a serverprotocol
         if self.getServerProtocol():
@@ -161,7 +166,7 @@ class WslinkHandler(object):
 
     @property
     def publishManager(self):
-        return pub.publishManager
+        return self.pub_manager
 
     @property
     def reverse_connection_client_id(self):

{wslink-1.11.0.dist-info → wslink-1.11.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wslink
-Version: 1.11.0
+Version: 1.11.2
 Summary: Python/JavaScript library for communicating over WebSocket
 Home-page: https://github.com/kitware/wslink
 Author: Kitware, Inc.
@@ -21,7 +21,7 @@ Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: aiohttp (<4)
+Requires-Dist: aiohttp <4
 Provides-Extra: ssl
 Requires-Dist: cryptography ; extra == 'ssl'
 

{wslink-1.11.0.dist-info → wslink-1.11.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 wslink/LICENSE,sha256=I44UH7kDVqxDLnnlOWw_hFL2Fz7RjQ_4vPzZv9NYgTU,1483
 wslink/__init__.py,sha256=AbEm-sUSoGL-uLpnbK1rSSjHSvyW-bMsGHWie7FgMHw,2708
 wslink/launcher.py,sha256=4l_z3l2xkRSiH8hWbZzjtsIbBeujl-P8bTA0TBtJEEg,21137
-wslink/protocol.py,sha256=Hr1KbLNc8rGEQzqQb9wvJbjFBmRzQj7rR9Bm_bPEONI,17753
+wslink/protocol.py,sha256=acKNj_J4AdFKpIUz-6eA9MLcjucy_xGhs2WLHvu_Gc4,17962
 wslink/publish.py,sha256=rSPG-GSVv4HawLXnKm9yceLadHx92EPR9XnGeSuOGlc,2573
 wslink/relay.py,sha256=E8Lzu2Ay7KbOheN1-ArAZawo8lLqdDgJXOZSBuMknYs,86
 wslink/server.py,sha256=FKSJAKHDyfkNVM45-M-y1Zn8hh2TTYto1hTCIJx1pp8,9440
@@ -9,14 +9,14 @@ wslink/ssl_context.py,sha256=hNOJJCdrStws1Qf6vPvY4vTk9Bf8J5d90W3fS0cRv8o,2290
 wslink/uri.py,sha256=woCQ4yChUqTMg9IT6YYDtUYeKmCg7OUCEgeBGA-19DY,384
 wslink/websocket.py,sha256=REYYyKB4WweMuDruvPBA0oPOfhddPF9G5WIGiK367KA,4574
 wslink/backends/__init__.py,sha256=P29TsplrxWTWoA53gXO1Ik1YKNHnMxYDA98yJPn8km4,971
-wslink/backends/aiohttp/__init__.py,sha256=qJW2u9G_EBJ_G9CtPPL72Hw7o9t_YbYBTRyoOVz7Hjg,8415
+wslink/backends/aiohttp/__init__.py,sha256=FUPMwi0Z1nuVVIJhY_sI0ZzRY5ne30tmUILi7JQTgP4,8433
 wslink/backends/aiohttp/launcher.py,sha256=Itblr2-lX_ZpAInvLlGkl1_XrNYjIn3w469BDZ5XyyQ,8737
 wslink/backends/aiohttp/relay.py,sha256=Nn1ELqGU1kwvst4DNwNqYWU4nYd08K3STAMQIhcangY,13338
 wslink/backends/generic/__init__.py,sha256=Qu65gWsd2xCSsxybnDtEDI5vMjHN-F5jgPZOyNIxnGs,112
-wslink/backends/generic/core.py,sha256=L2ySdVo89j2aZwzJA-ejKhy6ji4eP_4VGbiVol2eeXY,4080
+wslink/backends/generic/core.py,sha256=2BJrdCEyMe3OmT_h-wLeyw7QzpVTnm4O8zSkJmnDKyM,4003
 wslink/backends/tornado/__init__.py,sha256=Qu65gWsd2xCSsxybnDtEDI5vMjHN-F5jgPZOyNIxnGs,112
 wslink/backends/tornado/core.py,sha256=tPMkkhWuO_ovkisVim0zcegwZKEAG4IRUdd_O_0a_R0,2157
-wslink-1.11.0.dist-info/METADATA,sha256=v0iPYgLsxJlc2iKYT-bXGgIgaUryaAxL-viUYxlqWWA,3018
-wslink-1.11.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-wslink-1.11.0.dist-info/top_level.txt,sha256=N0d8eqvhwhfW1p1yPTmvxlbzhjz7ZyhBfysNvaFqpQY,7
-wslink-1.11.0.dist-info/RECORD,,
+wslink-1.11.2.dist-info/METADATA,sha256=mHgRzEOs6-Tm_OUe6mZM-u14GR-ErWIR_anG5XJOLKs,3016
+wslink-1.11.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+wslink-1.11.2.dist-info/top_level.txt,sha256=N0d8eqvhwhfW1p1yPTmvxlbzhjz7ZyhBfysNvaFqpQY,7
+wslink-1.11.2.dist-info/RECORD,,

{wslink-1.11.0.dist-info → wslink-1.11.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
+Generator: bdist_wheel (0.41.2)
 Root-Is-Purelib: true
 Tag: py3-none-any