wslink 2.0.0__py3-none-any.whl → 2.0.2__py3-none-any.whl

wslink/backends/generic/core.py

@@ -24,8 +24,8 @@ class WsConnection:
     async def send(self, is_binary, msg):
         await self._ws.onMessage(is_binary, msg, self.client_id)
 
-    def close(self):
-        self._ws.disconnect(self)
+    async def close(self):
+        await self.on_close(self._ws)
 
     # -------------------------------------------------------------------------
     # Method used by FakeWS
@@ -35,13 +35,17 @@ class WsConnection:
     def client_id(self):
         return self._id
 
-    def on_connect(self, ws):
+    async def on_connect(self, ws):
         self.closed = False
         self._ws = ws
+        await self._ws.onConnect(
+            {"type": "generic", "connection": self}, self.client_id
+        )
 
-    def on_close(self, ws):
+    async def on_close(self, ws):
         self.closed = True
         if self._ws == ws:
+            ws.disconnect(self.client_id)
             self._ws = None
 
     async def send_str(self, value):
@@ -55,19 +59,19 @@ class WsEndpoint(WslinkHandler):
     def __init__(self, protocol=None, web_app=None):
         super().__init__(protocol, web_app)
 
-    def connect(self):
+    async def connect(self):
         conn = WsConnection()
         self.connections[conn.client_id] = conn
-        conn.on_connect(self)
+        await conn.on_connect(self)
         return conn
 
-    def disconnect(self, client_or_id):
+    async def disconnect(self, client_or_id):
         client_or_id = (
             client_or_id if isinstance(client_or_id, str) else client_or_id.client_id
         )
         if client_or_id in self.connections:
             client = self.connections.pop(client_or_id)
-            client.on_close(self)
+            await client.onClose(client_or_id)
 
 
 class GenericServer(AbstractWebApp):

wslink/backends/jupyter/core.py

@@ -114,7 +114,7 @@ class JupyterGenericServer(GenericServer):
         connection = self._connections.get(client_id, None)
 
         if connection is None:
-            connection = self._endpoint.connect()
+            connection = await self._endpoint.connect()
             connection.on_message(partial(self.on_msg_from_server, client_id))
             self._connections[client_id] = connection
 

wslink/chunking.py

@@ -2,6 +2,7 @@ import sys
 import secrets
 import msgpack
 from typing import Dict, Tuple, Union
+
 if sys.version_info >= (3, 8):
     from typing import TypedDict  # pylint: disable=no-name-in-module
 else:
@@ -18,16 +19,20 @@ MESSAGE_SIZE_LENGTH = UINT32_LENGTH
 HEADER_LENGTH = ID_LENGTH + MESSAGE_OFFSET_LENGTH + MESSAGE_SIZE_LENGTH
 
 
-def _encode_header(id: bytes, offset: int, size: int) -> bytes:
+def _encode_header(id: int, offset: int, size: int) -> bytes:
     return (
-        id
+        id.to_bytes(ID_LENGTH, "little", signed=False)
         + offset.to_bytes(MESSAGE_OFFSET_LENGTH, "little", signed=False)
         + size.to_bytes(MESSAGE_SIZE_LENGTH, "little", signed=False)
     )
 
 
-def _decode_header(header: bytes) -> Tuple[bytes, int, int]:
-    id = header[ID_LOCATION:ID_LENGTH]
+def _decode_header(header: bytes) -> Tuple[int, int, int]:
+    id = int.from_bytes(
+        header[ID_LOCATION:ID_LENGTH],
+        "little",
+        signed=False,
+    )
     offset = int.from_bytes(
         header[
             MESSAGE_OFFSET_LOCATION : MESSAGE_OFFSET_LOCATION + MESSAGE_OFFSET_LENGTH
@@ -51,7 +56,7 @@ def generate_chunks(message: bytes, max_size: int):
     else:
         max_content_size = max(max_size - HEADER_LENGTH, 1)
 
-    id = secrets.token_bytes(ID_LENGTH)
+    id = int.from_bytes(secrets.token_bytes(ID_LENGTH), "little", signed=False)
 
     offset = 0
 

wslink/server.py

@@ -18,13 +18,13 @@ ws_server = None
 
 # =============================================================================
 # Setup default arguments to be parsed
-#   -s, --nosignalhandlers
-#   -d, --debug
-#   -i, --host     localhost
+#   --nosignalhandlers
+#   --debug
+#   --host     localhost
 #   -p, --port     8080
-#   -t, --timeout  300 (seconds)
-#   -c, --content  '/www'  (No content means WebSocket only)
-#   -a, --authKey  vtkweb-secret
+#   --timeout  300 (seconds)
+#   --content  '/www'  (No content means WebSocket only)
+#   --authKey  vtkweb-secret
 # =============================================================================
 
 
@@ -35,16 +35,14 @@ def add_arguments(parser):
     """
 
     parser.add_argument(
-        "-d", "--debug", help="log debugging messages to stdout", action="store_true"
+        "--debug", help="log debugging messages to stdout", action="store_true"
     )
     parser.add_argument(
-        "-s",
         "--nosignalhandlers",
         help="Prevent installation of signal handlers so server can be started inside a thread.",
         action="store_true",
     )
     parser.add_argument(
-        "-i",
         "--host",
         type=str,
         default="localhost",
@@ -58,26 +56,22 @@ def add_arguments(parser):
         help="port number for the web-server to listen on (default: 8080)",
     )
     parser.add_argument(
-        "-t",
         "--timeout",
         type=int,
         default=300,
         help="timeout for reaping process on idle in seconds (default: 300s, 0 to disable)",
     )
     parser.add_argument(
-        "-c",
         "--content",
         default="",
         help="root for web-pages to serve (default: none)",
     )
     parser.add_argument(
-        "-a",
         "--authKey",
         default="wslink-secret",
         help="Authentication key for clients to connect to the WebSocket.",
     )
     parser.add_argument(
-        "-ws",
         "--ws-endpoint",
         type=str,
         default="ws",

{wslink-2.0.0.dist-info → wslink-2.0.2.dist-info}/METADATA

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

{wslink-2.0.0.dist-info → wslink-2.0.2.dist-info}/RECORD

@@ -1,11 +1,11 @@
 wslink/LICENSE,sha256=I44UH7kDVqxDLnnlOWw_hFL2Fz7RjQ_4vPzZv9NYgTU,1483
 wslink/__init__.py,sha256=AbEm-sUSoGL-uLpnbK1rSSjHSvyW-bMsGHWie7FgMHw,2708
-wslink/chunking.py,sha256=BZZ0YAlh6PNI8rQe80NfdxU8pAvn_Klxew47AkvUJow,7130
+wslink/chunking.py,sha256=YKrl-gwM38It8d6BSuJwRw_5LQgw4OwJslV5ejFyVbU,7282
 wslink/launcher.py,sha256=8VMs3juObLkyGYQFNLjMoo4qFpKIcxWz0kS-af-DKO4,21170
 wslink/protocol.py,sha256=zdf4QthFHpAgEw3hTUyyaOuN76jzHeOJBpvekPbk7aY,15886
 wslink/publish.py,sha256=9G5TXqyGr-LCo_LwHYhzif6lhG2iXDvEBmEgwR8fh1M,1437
 wslink/relay.py,sha256=E8Lzu2Ay7KbOheN1-ArAZawo8lLqdDgJXOZSBuMknYs,86
-wslink/server.py,sha256=FKSJAKHDyfkNVM45-M-y1Zn8hh2TTYto1hTCIJx1pp8,9440
+wslink/server.py,sha256=kS0v17uidq6auF4k2kD4L_FHU6i-OdxvG2tH1KeJOpk,9325
 wslink/ssl_context.py,sha256=hNOJJCdrStws1Qf6vPvY4vTk9Bf8J5d90W3fS0cRv8o,2290
 wslink/uri.py,sha256=woCQ4yChUqTMg9IT6YYDtUYeKmCg7OUCEgeBGA-19DY,384
 wslink/websocket.py,sha256=pBiWqkL8Zn8LuSJ9nv3yA-KjEynbolOQ2gLHtQFJ2Ic,4611
@@ -14,12 +14,12 @@ wslink/backends/aiohttp/__init__.py,sha256=u2UxSnaMJPoiba1CL1fOeM8bTggyOw6znQ2iG
 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
-wslink/backends/generic/core.py,sha256=Gwo7nksgph96i7J77nYm4hB5NwysybQ23rRs86f0d6U,4149
+wslink/backends/generic/core.py,sha256=7Tx02wzoIWsx9sTLrKB0gaZcTk2JT_OBYz_ZOOljfAU,4356
 wslink/backends/jupyter/__init__.py,sha256=Qu65gWsd2xCSsxybnDtEDI5vMjHN-F5jgPZOyNIxnGs,112
-wslink/backends/jupyter/core.py,sha256=H73IEEHyom3TsbhkyI5O88bFBbUIDzHVuvqbIF6PAIM,3858
+wslink/backends/jupyter/core.py,sha256=PCQN-uZPFROnRv8B5dNwnwHV67o4Bpme3_Z6V-zbOUA,3864
 wslink/backends/tornado/__init__.py,sha256=Qu65gWsd2xCSsxybnDtEDI5vMjHN-F5jgPZOyNIxnGs,112
 wslink/backends/tornado/core.py,sha256=tPMkkhWuO_ovkisVim0zcegwZKEAG4IRUdd_O_0a_R0,2157
-wslink-2.0.0.dist-info/METADATA,sha256=XWnXD2kxZEtIuOy4Y-_8HZ8anq9hYFL7axDQhv96GoE,3045
-wslink-2.0.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-wslink-2.0.0.dist-info/top_level.txt,sha256=N0d8eqvhwhfW1p1yPTmvxlbzhjz7ZyhBfysNvaFqpQY,7
-wslink-2.0.0.dist-info/RECORD,,
+wslink-2.0.2.dist-info/METADATA,sha256=q1smyqsGU9ClvWSuOti28QpgT3X044vybCtNTRsdMs4,3045
+wslink-2.0.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+wslink-2.0.2.dist-info/top_level.txt,sha256=N0d8eqvhwhfW1p1yPTmvxlbzhjz7ZyhBfysNvaFqpQY,7
+wslink-2.0.2.dist-info/RECORD,,