CheeseAPI 0.4.1__tar.gz → 0.4.3__tar.gz

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

@@ -1,5 +1,5 @@
 import time, os, inspect, socket, multiprocessing, signal, http, ipaddress
-from typing import TYPE_CHECKING, Dict, Tuple
+from typing import TYPE_CHECKING, Dict, Tuple, List
 
 import asyncio, uvloop, setproctitle, websockets
 from CheeseLog import logger
@@ -120,7 +120,7 @@ class Handle:
         sock.listen(self._app.server.backlog)
         sock.set_inheritable(True)
 
-        processes = []
+        processes: List[multiprocessing.Process] = []
         multiprocessing.allow_connection_pickling()
         for i in range(self._app.server.workers - 1):
             process = multiprocessing.Process(target = self.worker_start, args = (sock,), name = self._app._text.workerProcess_title)
@@ -130,8 +130,21 @@ class Handle:
         self.worker_start(sock, True)
 
         for process in processes:
+            os.kill(process.pid, signal.SIGKILL)
             process.join()
 
+        for text in self._app._text.server_stopping():
+            logger.ending(text[0], text[1])
+
+        self.server_afterStopping()
+        if self._app.signal.server_afterStopping.receivers:
+            self._app.signal.server_afterStopping.send()
+
+        while logger._queue.full():
+            time.sleep(self._app.server.intervalTime)
+
+        os.kill(os.getpid(), signal.SIGKILL)
+
     def worker_beforeStarting(self):
         for text in self._app._text.worker_starting():
             logger.debug(text[0], text[1])
@@ -157,14 +170,6 @@ class Handle:
             if self._app.signal.worker_afterStopping.receivers:
                 self._app.signal.worker_afterStopping.send()
 
-            if self._app._managers['server.workers'].value == 0:
-                for text in self._app._text.server_stopping():
-                    logger.ending(text[0], text[1])
-
-                self.server_afterStopping()
-                if self._app.signal.server_afterStopping.receivers:
-                    self._app.signal.server_afterStopping.send()
-
     async def worker_run(self, sock, master: bool):
         from CheeseAPI.app import app
         from CheeseAPI.protocol import HttpProtocol

{cheeseapi-0.4.1 → cheeseapi-0.4.3}/CheeseAPI/protocol.py

@@ -49,9 +49,9 @@ 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')
 
     def on_body(self, body: bytes):
         if self.request.body is None:

{cheeseapi-0.4.1 → cheeseapi-0.4.3}/CheeseAPI/text.py

@@ -61,10 +61,19 @@ Static: <cyan>{self._app.server.static}</cyan>''' if self._app.workspace.static
         return f'Local Modules: {message} {module}', f'Local Modules: {styledMessage} {module}'
 
     def loadedLocalModules(self) -> List[Tuple[str, str]]:
+        foldernames = self._app.localModules.copy()
+        for foldername in self._app.preferred_localModules:
+            if foldername in foldernames:
+                foldernames.remove(foldername)
+                foldernames.insert(0, foldername)
+        for foldername in self._app.exclude_localModules:
+            if foldername in foldernames:
+                foldernames.remove(foldername)
+
         return [
             (f'''Local Modules:
-''' + ' | '.join(self._app.localModules), f'''Local Modules:
-''' + ' | '.join(self._app.localModules))
+''' + ' | '.join(foldernames), f'''Local Modules:
+''' + ' | '.join(foldernames))
         ]
 
     def worker_starting(self) -> List[Tuple[str, str]]:
@@ -138,8 +147,7 @@ Static: <cyan>{self._app.server.static}</cyan>''' if self._app.workspace.static
         styledMessage += '<blue>{:.6f}</blue> seconds'.format(timer % 60)
 
         return [
-            (message, styledMessage),
-            (f'The master process {os.getpid()} stopped', f'The master process <blue>{os.getpid()}</blue> stopped')
+            (message, styledMessage)
         ]
 
     @property

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

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

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

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