CheeseAPI 0.4.7__tar.gz → 0.4.9__tar.gz

{cheeseapi-0.4.7 → cheeseapi-0.4.9}/CheeseAPI/handle.py

@@ -130,7 +130,7 @@ class Handle:
         self.worker_start(sock, True)
 
         for process in processes:
-            os.kill(process.pid, signal.SIGKILL)
+            process.terminate()
             process.join()
 
         for text in self._app._text.server_stopping():
@@ -142,7 +142,7 @@ class Handle:
 
         logger.destroy()
 
-        os.kill(os.getpid(), signal.SIGKILL)
+        os.killpg(os.getpid(), signal.SIGKILL)
 
     def worker_beforeStarting(self):
         for text in self._app._text.worker_starting():
@@ -275,7 +275,6 @@ class Handle:
                     return
 
                 if e.args[0] == 1:
-                    await self.http_options(protocol)
                     if isinstance(protocol.response, BaseResponse):
                         if self._app.signal.http_options.receivers:
                             await self._app.signal.http_options.send_async(**{
@@ -350,10 +349,31 @@ class Handle:
     async def http_404(self, protocol: 'HttpProtocol'):
         protocol.response = Response(status = http.HTTPStatus.NOT_FOUND)
 
-    async def http_options(self, protocol: 'HttpProtocol'):
+    async def http_405(self, protocol: 'HttpProtocol'):
+        protocol.response = Response(status = http.HTTPStatus.METHOD_NOT_ALLOWED)
+
+    async def http_500(self, protocol: 'HttpProtocol', e: BaseException, recycled: bool = False):
+        protocol.response = Response(status = http.HTTPStatus.INTERNAL_SERVER_ERROR)
+
+        if not recycled:
+            for text in self._app._text.http_500(protocol, e):
+                logger.danger(text[0], text[1])
+
+    async def http_response(self, protocol: 'HttpProtocol', recycled: bool = False):
+        if not isinstance(protocol.response, BaseResponse):
+            await self.noResponse(protocol)
+
+        if not recycled:
+            await self.http_beforeResponse(protocol)
+            if self._app.signal.http_beforeResponse.receivers:
+                await self._app.signal.http_beforeResponse.send_async(**{
+                    'request': protocol.request,
+                    'response': protocol.response,
+                    **protocol.kwargs
+                })
+
         if (
-            protocol.request.method == http.HTTPMethod.OPTIONS
-            and (
+            (
                 protocol.request.origin not in self._app.cors.exclude_origin
                 and
                 (
@@ -380,29 +400,6 @@ class Handle:
             elif self._app.cors.headers:
                 protocol.response.headers['Access-Control-Allow-Headers'] = ', '.join(self._app.cors.headers)
 
-    async def http_405(self, protocol: 'HttpProtocol'):
-        protocol.response = Response(status = http.HTTPStatus.METHOD_NOT_ALLOWED)
-
-    async def http_500(self, protocol: 'HttpProtocol', e: BaseException, recycled: bool = False):
-        protocol.response = Response(status = http.HTTPStatus.INTERNAL_SERVER_ERROR)
-
-        if not recycled:
-            for text in self._app._text.http_500(protocol, e):
-                logger.danger(text[0], text[1])
-
-    async def http_response(self, protocol: 'HttpProtocol', recycled: bool = False):
-        if not isinstance(protocol.response, BaseResponse):
-            await self.noResponse(protocol)
-
-        if not recycled:
-            await self.http_beforeResponse(protocol)
-            if self._app.signal.http_beforeResponse.receivers:
-                await self._app.signal.http_beforeResponse.send_async(**{
-                    'request': protocol.request,
-                    'response': protocol.response,
-                    **protocol.kwargs
-                })
-
         try:
             content, streamed = await protocol.response()
             protocol.transport.write(content)

{cheeseapi-0.4.7 → cheeseapi-0.4.9}/CheeseAPI/workspace.py

@@ -22,7 +22,10 @@ class Workspace:
 
     @base.setter
     def base(self, value: str):
-        sys.path.remove(self._base)
+        try:
+            sys.path.remove(self._base)
+        except:
+            ...
         self._base = value
         sys.path.append(self._base)
 

{cheeseapi-0.4.7 → cheeseapi-0.4.9}/PKG-INFO

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

{cheeseapi-0.4.7 → cheeseapi-0.4.9}/pyproject.toml

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