CheeseAPI 2.0.8b5__tar.gz → 2.0.8b7__tar.gz

{cheeseapi-2.0.8b5 → cheeseapi-2.0.8b7}/CheeseAPI/request.py

@@ -267,7 +267,7 @@ class RequestProxy:
                 name = None
                 filename = None
                 for line in headers.decode().strip().split('\r\n'):
-                    if line.startswith('content-disposition:'):
+                    if line.startswith('Content-Disposition:'):
                         name_match = re.search(r'name="([^"]*)"', line)
                         if name_match:
                             name = name_match.group(1)

{cheeseapi-2.0.8b5 → cheeseapi-2.0.8b7}/CheeseAPI/websocket.py

@@ -1,4 +1,4 @@
-import base64, hashlib, asyncio, ssl, struct, json
+import base64, hashlib, asyncio, ssl, struct, json, inspect
 from functools import partial
 from typing import TYPE_CHECKING, AsyncIterable, Self
 
@@ -48,8 +48,8 @@ class Websocket:
         self._request: 'Request' = request
 
         self._proxy: 'WebsocketProxy' = request._proxy.app.WebsocketProxy_Class(request._proxy.app, self)
-        self._key: str = self.request.headers.get('sec-websocket-key')
-        subprotocols = self.request.headers.get('sec-websocket-protocol')
+        self._key: str = self.request.headers.get('sec-websocket-key') or self.request.headers.get('Sec-WebSocket-Key')
+        subprotocols = self.request.headers.get('sec-websocket-protocol') or self.request.headers.get('Sec-WebSocket-Protocol')
         self._subprotocols: list[str] | None = subprotocols.strip().split(',') if subprotocols else None
         self._subprotocol: str | None = None
         self.response: Response | None = None
@@ -109,6 +109,8 @@ class Websocket:
     close = DualMethod(_static_close, _instance_close)
 
 class WebsocketProxy:
+    _sync_tasks: dict[str, asyncio.Task] = {}
+
     @staticmethod
     def _static_send(path: str, data: bytes | list | str | dict, *, websocket_key_or_keys: str | list[str] | None = None):
         if static.websocket_sync_servers is not None:
@@ -223,19 +225,21 @@ class WebsocketProxy:
             await self.message()
             await self.disconnect()
         except Exception as e:
-            await self.app.printer.websocket_error(e, self.websocket)
+            result = self.app.printer.websocket_error(e, self.websocket)
+            if inspect.isawaitable(result):
+                await result
 
     async def get_response(self) -> Response:
         headers = {
-            'upgrade': 'websocket',
-            'connection': 'upgrade',
-            'sec-websocket-accept': base64.b64encode(hashlib.sha1(f'{self.websocket.key}258EAFA5-E914-47DA-95CA-C5AB0DC85B11'.encode('utf-8')).digest()).decode('utf-8')
+            'Upgrade': 'websocket',
+            'Connection': 'Upgrade',
+            'Sec-WebSocket-Accept': base64.b64encode(hashlib.sha1(f'{self.websocket.key}258EAFA5-E914-47DA-95CA-C5AB0DC85B11'.encode('utf-8')).digest()).decode('utf-8')
         }
         if self.websocket.subprotocols:
             subprotocol = await self.websocket.on_subprotocol(self.websocket.subprotocols)
             if subprotocol:
                 self.websocket._subprotocol = subprotocol
-                headers['sec-websocket-protocol'] = subprotocol
+                headers['Sec-WebSocket-Protocol'] = subprotocol
         response = self.app.ResponseProxy_Class(self.app, Response(status = 101, headers = headers)).response
         response._proxy.websocket = self.websocket
         return response
@@ -244,7 +248,7 @@ class WebsocketProxy:
         Websocket.connectors.setdefault(self.websocket.request.path, []).append(self.websocket)
         if self.app.sync_server_url and self.websocket.request.path not in static.websocket_sync_server:
             static.websocket_sync_server[self.websocket.request.path] = redis.asyncio.Redis.from_url(self.app.sync_server_url, socket_timeout = self.app.sync_server_timeout, socket_connect_timeout = self.app.sync_server_timeout)
-            asyncio.create_task(self.sync_server_running())
+            WebsocketProxy._sync_tasks[self.websocket.request.path] = asyncio.create_task(self.sync_server_running())
 
         loop = asyncio.get_running_loop()
         self.reader = asyncio.StreamReader()
@@ -259,10 +263,18 @@ class WebsocketProxy:
         await self.websocket.on_connect()
 
     async def sync_server_running(self):
+        pubsub = None
         try:
             if self.app.sync_server_url.startswith('redis'):
                 while True:
                     try:
+                        if pubsub is not None:
+                            try:
+                                await pubsub.aclose()
+                            except Exception:
+                                pass
+                            pubsub = None
+
                         pubsub = redis.asyncio.from_url(self.app.sync_server_url, socket_timeout = None, socket_connect_timeout = None).pubsub()
                         await pubsub.subscribe(self.websocket.request.path)
                         async for message in pubsub.listen():
@@ -302,6 +314,13 @@ class WebsocketProxy:
                         await asyncio.sleep(self.app.sync_server_timeout)
         except (KeyboardInterrupt, SystemExit, asyncio.CancelledError):
             ...
+        finally:
+            WebsocketProxy._sync_tasks.pop(self.websocket.request.path, None)
+            if pubsub is not None:
+                try:
+                    await pubsub.aclose()
+                except Exception:
+                    pass
 
     async def message(self):
         while True:

{cheeseapi-2.0.8b5 → cheeseapi-2.0.8b7}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: CheeseAPI
-Version: 2.0.8b5
+Version: 2.0.8b7
 Summary: 一款web协程框架
 Project-URL: Source, https://github.com/CheeseUnknown/CheeseAPI
 Author-email: Cheese Unknown <cheese@cheese.ren>

{cheeseapi-2.0.8b5 → cheeseapi-2.0.8b7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "CheeseAPI"
-version = "2.0.8-beta.5"
+version = "2.0.8-beta.7"
 description = "一款web协程框架"
 readme = "README.md"
 license-files = { paths = [ "LICENSE" ] }