wslink 2.0.4__tar.gz → 2.1.0__tar.gz

{wslink-2.0.4 → wslink-2.1.0}/PKG-INFO

@@ -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 → wslink-2.1.0}/README.rst

@@ -37,6 +37,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 → wslink-2.1.0}/setup.cfg

@@ -1,5 +1,5 @@
 [metadata]
-version = 2.0.4
+version = 2.1.0
 
 [egg_info]
 tag_build = 

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

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