CheeseAPI 0.4.2__tar.gz → 0.4.5__tar.gz

{cheeseapi-0.4.2 → cheeseapi-0.4.5}/CheeseAPI/handle.py

@@ -658,7 +658,8 @@ class Handle:
                 })
 
             await protocol.server.message(**{
-                'message': message
+                'message': message,
+                **protocol.kwargs
             })
 
             await self.websocket_afterMessage(protocol, message)

{cheeseapi-0.4.2 → cheeseapi-0.4.5}/CheeseAPI/protocol.py

@@ -29,11 +29,6 @@ class HttpProtocol(asyncio.Protocol):
 
         try:
             self.parser.feed_data(data)
-
-            if self.request.body:
-                self.request._parseBody()
-
-            asyncio.get_event_loop().create_task(app._handle.http(self))
         except httptools.HttpParserUpgrade:
             self.request._upgrade()
 
@@ -49,15 +44,22 @@ class HttpProtocol(asyncio.Protocol):
         self.request.headers['-'.join([t.capitalize() for t in key.decode().split('-')])] = value.decode()
 
     def on_headers_complete(self):
-        self.request.client = self.request.headers.get('X-Real-Ip', None)
-        self.request.origin = self.request.headers.get('Origin', None)
-        self.request.scheme = self.request.headers.get('X-Forwarded-Proto', None)
+        self.request.client = self.request.headers.get('X-Real-Ip', self.transport.get_extra_info('socket').getpeername()[0])
+        self.request.origin = self.request.headers.get('Origin', f'{self.transport.get_extra_info("socket").getsockname()[0]}:{self.transport.get_extra_info("socket").getsockname()[1]}')
+        self.request.scheme = self.request.headers.get('X-Forwarded-Proto', 'https' if self.transport.get_extra_info('sslcontext') else 'http')
+
+        if not self.parser.should_upgrade() and not int(self.request.headers.get('Content-Length', 0)):
+            asyncio.get_event_loop().create_task(app._handle.http(self))
 
     def on_body(self, body: bytes):
         if self.request.body is None:
             self.request.body = b''
         self.request.body += body
 
+        if len(self.request.body) == int(self.request.headers.get('Content-Length', 0)):
+            self.request._parseBody()
+            asyncio.get_event_loop().create_task(app._handle.http(self))
+
     def connection_lost(self, exc: Exception | None):
         self.transport.close()
 

{cheeseapi-0.4.2 → cheeseapi-0.4.5}/PKG-INFO

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

{cheeseapi-0.4.2 → cheeseapi-0.4.5}/pyproject.toml

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