CheeseAPI 0.4.3__tar.gz → 0.4.6__tar.gz

{cheeseapi-0.4.3 → cheeseapi-0.4.6}/CheeseAPI/handle.py

@@ -140,8 +140,7 @@ class Handle:
         if self._app.signal.server_afterStopping.receivers:
             self._app.signal.server_afterStopping.send()
 
-        while logger._queue.full():
-            time.sleep(self._app.server.intervalTime)
+        logger.destroy()
 
         os.kill(os.getpid(), signal.SIGKILL)
 
@@ -658,7 +657,8 @@ class Handle:
                 })
 
             await protocol.server.message(**{
-                'message': message
+                'message': message,
+                **protocol.kwargs
             })
 
             await self.websocket_afterMessage(protocol, message)

{cheeseapi-0.4.3 → cheeseapi-0.4.6}/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()
 
@@ -53,11 +48,18 @@ class HttpProtocol(asyncio.Protocol):
         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.3 → cheeseapi-0.4.6}/CheeseAPI/text.py

@@ -16,7 +16,7 @@ class Text:
         self.response_server: str = 'CheeseAPI'
         self._process_title: str = 'CheeseAPI'
         self.workerProcess_title: str = 'CheeseAPI:Process'
-        self.logger: str = '%Y_%m_%d-%H_%M_%S.log'
+        self.logger: str = '%Y_%m_%d.log'
 
         setproctitle.setproctitle(self._process_title)
 

{cheeseapi-0.4.3 → cheeseapi-0.4.6}/CheeseAPI/workspace.py

@@ -1,4 +1,4 @@
-import os, datetime, sys
+import os, sys
 
 from typing import TYPE_CHECKING
 
@@ -46,11 +46,11 @@ class Workspace:
     @logger.setter
     def logger(self, value: str | bool):
         if value is True:
-            self._logger = datetime.datetime.now().strftime(self._app._text.logger)
+            self._logger = self._app._text.logger
         elif value is False:
             self._logger = ''
         else:
-            self._logger = datetime.datetime.now().strftime(value)
+            self._logger = value
 
         if self.log and self.logger:
             logger.filePath = os.path.join(self.log, self.logger)

{cheeseapi-0.4.3 → cheeseapi-0.4.6}/PKG-INFO

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

{cheeseapi-0.4.3 → cheeseapi-0.4.6}/pyproject.toml

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