wslink 2.0.4__py3-none-any.whl → 2.1.0__py3-none-any.whl

wslink/backends/aiohttp/__init__.py

@@ -1,8 +1,9 @@
-import asyncio
 import os
 import logging
 import sys
 import uuid
+import json
+from pathlib import Path
 
 from wslink.protocol import WslinkHandler, AbstractWebApp
 
@@ -12,8 +13,13 @@ import aiohttp.web as aiohttp_web
 
 
 # 4MB is the default inside aiohttp
+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: str | None = os.environ.get("WSLINK_HTTP_HEADERS")  # path to json file
+
+if HTTP_HEADERS and Path(HTTP_HEADERS).exists():
+    HTTP_HEADERS: dict = json.loads(Path(HTTP_HEADERS).read_text())
 
 logger = logging.getLogger(__name__)
 
@@ -34,17 +40,13 @@ def _fix_path(path):
     return path
 
 
-# -----------------------------------------------------------------------------
-# Needed for WASM/sharedArrayBuffer
-# => we should find a way to dynamically provided needed header
 # -----------------------------------------------------------------------------
 @aiohttp_web.middleware
-async def shared_array_buffer_headers(request: aiohttp_web.Request, handler):
+async def http_headers(request: aiohttp_web.Request, handler):
     response: aiohttp_web.Response = await handler(request)
-    response.headers.setdefault("Cross-Origin-Opener-Policy", "same-origin")
-    response.headers.setdefault("Cross-Origin-Embedder-Policy", "require-corp")
-    response.headers.setdefault("Access-Control-Allow-Origin", "*")
-    response.headers.setdefault("Cache-Control", "no-store")
+    for k, v in HTTP_HEADERS.items():
+        response.headers.setdefault(k, v)
+
     return response
 
 
@@ -52,7 +54,10 @@ async def shared_array_buffer_headers(request: aiohttp_web.Request, handler):
 class WebAppServer(AbstractWebApp):
     def __init__(self, server_config):
         AbstractWebApp.__init__(self, server_config)
-        self.set_app(aiohttp_web.Application(middlewares=[shared_array_buffer_headers]))
+        if HTTP_HEADERS:
+            self.set_app(aiohttp_web.Application(middlewares=[http_headers]))
+        else:
+            self.set_app(aiohttp_web.Application())
         self._ws_handlers = []
         self._site = None
         self._runner = None
@@ -212,7 +217,7 @@ class AioHttpWsHandler(WslinkHandler):
     async def handleWsRequest(self, request):
         client_id = str(uuid.uuid4()).replace("-", "")
         current_ws = aiohttp_web.WebSocketResponse(
-            max_msg_size=MAX_MSG_SIZE, heartbeat=HEART_BEAT
+            max_msg_size=MSG_OVERHEAD + MAX_MSG_SIZE, heartbeat=HEART_BEAT
         )
         self.connections[client_id] = current_ws
 

wslink/protocol.py

@@ -252,6 +252,7 @@ class WslinkHandler(object):
 
     async def onMessage(self, is_binary, msg, client_id):
         if not is_binary:
+            logger.critical("wslink is not expecting text message:\n> %s", msg.data)
             return
 
         full_message = self.unchunkers[client_id].process_chunk(msg.data)

{wslink-2.0.4.dist-info → wslink-2.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wslink
-Version: 2.0.4
+Version: 2.1.0
 Summary: Python/JavaScript library for communicating over WebSocket
 Home-page: https://github.com/kitware/wslink
 Author: Kitware, Inc.
@@ -65,6 +65,7 @@ Those only apply for the Python server and launcher.
 * WSLINK_LAUNCHER_DELETE - If set to 1 this will enable the DELETE endpoint for killing a running session
 * WSLINK_MAX_MSG_SIZE - Number of bytes for a message size (default: 4194304)
 * WSLINK_HEART_BEAT - Number of seconds between heartbeats (default: 30)
+* WSLINK_HTTP_HEADERS - Path to json file containing HTTP headers to be added
 
 License
 -------

{wslink-2.0.4.dist-info → wslink-2.1.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ wslink/LICENSE,sha256=I44UH7kDVqxDLnnlOWw_hFL2Fz7RjQ_4vPzZv9NYgTU,1483
 wslink/__init__.py,sha256=7Uyn6lk5LhykHbBwQ9pwSmX1YhxDanD9TT6H95DXzhk,2709
 wslink/chunking.py,sha256=1DJlGG6fjknGFrqPOtqUUc5tCrijldP7Kdx56d5e3Wg,7337
 wslink/launcher.py,sha256=8VMs3juObLkyGYQFNLjMoo4qFpKIcxWz0kS-af-DKO4,21170
-wslink/protocol.py,sha256=zdf4QthFHpAgEw3hTUyyaOuN76jzHeOJBpvekPbk7aY,15886
+wslink/protocol.py,sha256=V5kqfHebfyXzmZq0-ua0SjDkOXdQmx1Mu29G3hORgx0,15971
 wslink/publish.py,sha256=9G5TXqyGr-LCo_LwHYhzif6lhG2iXDvEBmEgwR8fh1M,1437
 wslink/relay.py,sha256=E8Lzu2Ay7KbOheN1-ArAZawo8lLqdDgJXOZSBuMknYs,86
 wslink/server.py,sha256=yvhCjpzPOfhbZrpDvW9i4H_uSyuQAe3ZOP-BRBmgHQA,9326
@@ -10,7 +10,7 @@ wslink/ssl_context.py,sha256=hNOJJCdrStws1Qf6vPvY4vTk9Bf8J5d90W3fS0cRv8o,2290
 wslink/uri.py,sha256=woCQ4yChUqTMg9IT6YYDtUYeKmCg7OUCEgeBGA-19DY,384
 wslink/websocket.py,sha256=pBiWqkL8Zn8LuSJ9nv3yA-KjEynbolOQ2gLHtQFJ2Ic,4611
 wslink/backends/__init__.py,sha256=cyJGjm-YyBSyOEX81owyTbJ3YnrA6dB7--B4LnsEtHI,1214
-wslink/backends/aiohttp/__init__.py,sha256=sXCL6kI1Ilv_t2V3o6c8fKDcIJ0A3WaB2mwyPrXSM7E,9232
+wslink/backends/aiohttp/__init__.py,sha256=RlQmJ7PgTUfCkBevpMPKquOfALdljOtGR7mWItdrcGI,9217
 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
@@ -19,7 +19,7 @@ wslink/backends/jupyter/__init__.py,sha256=Qu65gWsd2xCSsxybnDtEDI5vMjHN-F5jgPZOy
 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.4.dist-info/METADATA,sha256=fTgpqrNfE65VXr09MwvMEd_McVQ1FmHWl5YCYK2iPEM,3045
-wslink-2.0.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-wslink-2.0.4.dist-info/top_level.txt,sha256=N0d8eqvhwhfW1p1yPTmvxlbzhjz7ZyhBfysNvaFqpQY,7
-wslink-2.0.4.dist-info/RECORD,,
+wslink-2.1.0.dist-info/METADATA,sha256=af9xY0D0eOaXmF02cMqoIAKfM8sQR7tl96vcoq_Dicw,3123
+wslink-2.1.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+wslink-2.1.0.dist-info/top_level.txt,sha256=N0d8eqvhwhfW1p1yPTmvxlbzhjz7ZyhBfysNvaFqpQY,7
+wslink-2.1.0.dist-info/RECORD,,