CheeseAPI 1.2.1__tar.gz → 1.2.3__tar.gz

{cheeseapi-1.2.1 → cheeseapi-1.2.3}/CheeseAPI/app.py

@@ -1,4 +1,4 @@
-import multiprocessing, os
+import multiprocessing, os, setproctitle, sys
 from typing import Dict, Any, List
 
 from CheeseAPI.text import Text
@@ -276,4 +276,7 @@ class App:
 
         return self._preferred_localModules
 
+if ' '.join(sys.argv) in setproctitle.getproctitle():
+    setproctitle.setproctitle('CheeseAPI')
+
 app: App = App()

{cheeseapi-1.2.1 → cheeseapi-1.2.3}/CheeseAPI/handle.py

@@ -1,4 +1,4 @@
-import time, os, inspect, socket, multiprocessing, signal, http, ipaddress, datetime
+import time, os, inspect, socket, multiprocessing, signal, http, ipaddress, datetime, traceback
 from typing import TYPE_CHECKING, Dict, Tuple, List
 
 import asyncio, uvloop, setproctitle, websockets
@@ -109,68 +109,78 @@ class Handle:
                 logger.loaded(text[0], text[1], refreshed = True)
 
     def server_start(self):
-        self._app._handle.server_beforeStarting()
-        if self._app.signal.server_beforeStarting.receivers:
-            self._app.signal.server_beforeStarting.send()
-
         try:
-            ipaddress.IPv4Address(self._app.server.host)
-            sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        except ipaddress.AddressValueError:
-            sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
-        sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        sock.bind((self._app.server.host, self._app.server.port))
-        sock.listen(self._app.server.backlog)
-        sock.set_inheritable(True)
-
-        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)
-            process.start()
-            processes.append(process)
-
-        self.worker_start(sock, True)
-
-        for process in processes:
-            process.terminate()
-            process.join()
-
-        for text in self._app._text.server_stopping():
-            logger.ending(text[0], text[1])
+            self._app._handle.server_beforeStarting()
+            if self._app.signal.server_beforeStarting.receivers:
+                self._app.signal.server_beforeStarting.send()
 
-        self.server_afterStopping()
-        if self._app.signal.server_afterStopping.receivers:
-            self._app.signal.server_afterStopping.send()
-
-        logger.destroy()
-
-        os.killpg(os.getpid(), signal.SIGKILL)
+            try:
+                ipaddress.IPv4Address(self._app.server.host)
+                sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            except ipaddress.AddressValueError:
+                sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+            sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+            sock.bind((self._app.server.host, self._app.server.port))
+            sock.listen(self._app.server.backlog)
+            sock.set_inheritable(True)
+
+            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)
+                process.start()
+                processes.append(process)
+
+            self.worker_start(sock, True)
+
+            for process in processes:
+                process.terminate()
+                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()
+        except KeyboardInterrupt:
+            ...
+        except:
+            logger.error(f'''
+{logger.encode(traceback.format_exc()[:-1])}''')
+        finally:
+            logger.destroy()
+            os.killpg(os.getpid(), signal.SIGKILL)
 
     def worker_beforeStarting(self):
         for text in self._app._text.worker_starting():
             logger.debug(text[0], text[1])
 
     def worker_start(self, sock, master: bool = False):
-        if not master:
-            setproctitle.setproctitle(self._app._text.workerProcess_title)
+        try:
+            if not master:
+                setproctitle.setproctitle(self._app._text.workerProcess_title)
 
-        self.worker_beforeStarting()
-        if self._app.signal.worker_beforeStarting.receivers:
-            self._app.signal.worker_beforeStarting.send()
+            self.worker_beforeStarting()
+            if self._app.signal.worker_beforeStarting.receivers:
+                self._app.signal.worker_beforeStarting.send()
 
-        asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
-        asyncio.run(self.worker_run(sock, master))
+            asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
+            asyncio.run(self.worker_run(sock, master))
 
-        with self._app._managers_['lock']:
-            self._app._managers_['server.workers'].value -= 1
+            with self._app._managers_['lock']:
+                self._app._managers_['server.workers'].value -= 1
 
-            for text in self._app._text.worker_stopping():
-                logger.debug(text[0], text[1])
+                for text in self._app._text.worker_stopping():
+                    logger.debug(text[0], text[1])
 
-            self.worker_afterStopping()
-            if self._app.signal.worker_afterStopping.receivers:
-                self._app.signal.worker_afterStopping.send()
+                self.worker_afterStopping()
+                if self._app.signal.worker_afterStopping.receivers:
+                    self._app.signal.worker_afterStopping.send()
+        except:
+            logger.error(f'''The process {os.getpid()} stopped
+{logger.encode(traceback.format_exc()[:-1])}''', f'''The process <blue>{os.getpid()}</blue> stopped
+{logger.encode(traceback.format_exc()[:-1])}''')
 
     async def worker_run(self, sock, master: bool):
         from CheeseAPI.app import app
@@ -344,7 +354,7 @@ class Handle:
                 })
 
             await self.http_response(protocol)
-        except BaseException as e:
+        except Exception as e:
             try:
                 await self.http_500(protocol, e)
                 if self._app.signal.http_500.receivers:
@@ -355,13 +365,13 @@ class Handle:
                         **protocol.kwargs
                     })
                 await self.http_response(protocol)
-            except BaseException as e:
+            except Exception as e:
                 await self.http_500(protocol, e, True)
                 await self.http_response(protocol, True)
 
     async def http_static(self, protocol: 'HttpProtocol'):
         if self._app.server.static and self._app.workspace.static and protocol.request.path.startswith(self._app.server.static) and protocol.request.method == http.HTTPMethod.GET:
-            for key in [ '', '.html', '/index.html' ]:
+            for key in [ '', '.html', 'index.html', '/index.html' ]:
                 try:
                     protocol.response = FileResponse(os.path.join(self._app.workspace.static, protocol.request.path[1:] + key))
 
@@ -470,7 +480,7 @@ class Handle:
             try:
                 Server, kwargs = self._app.routeBus._match(protocol.request.path, 'WEBSOCKET')
                 protocol.kwargs.update(kwargs)
-            except KeyError as e:
+            except Route_404_Exception as e:
                 await self.websocket_afterRequest(protocol)
                 if self._app.signal.websocket_afterRequest.receivers:
                     await self._app.signal.websocket_afterRequest.async_send(**{
@@ -478,27 +488,30 @@ class Handle:
                         **protocol.kwargs
                     })
 
-                if e.args[0] == 0:
-                    await self.websocket_404(protocol)
-                    if self._app.signal.websocket_404.receivers:
-                        await self._app.signal.websocket_404.async_send(**{
-                            'request': protocol.request,
-                            'response': protocol.response,
-                            **protocol.kwargs
-                        })
-                    return await self.websocket_response(protocol)
-
-                elif e.args[0] == 1:
-                    await self.websocket_405(protocol)
-                    if self._app.signal.websocket_405.receivers:
-                        await self._app.signal.websocket_405.async_send(**{
-                            'request': protocol.request,
-                            'response': protocol.response,
-                            **protocol.kwargs
-                        })
-                    return await self.websocket_response(protocol)
+                await self.websocket_404(protocol)
+                if self._app.signal.websocket_404.receivers:
+                    await self._app.signal.websocket_404.async_send(**{
+                        'request': protocol.request,
+                        'response': protocol.response,
+                        **protocol.kwargs
+                    })
+                return await self.websocket_response(protocol)
+            except Route_405_Exception as e:
+                await self.websocket_afterRequest(protocol)
+                if self._app.signal.websocket_afterRequest.receivers:
+                    await self._app.signal.websocket_afterRequest.async_send(**{
+                        'request': protocol.request,
+                        **protocol.kwargs
+                    })
 
-                raise e
+                await self.websocket_405(protocol)
+                if self._app.signal.websocket_405.receivers:
+                    await self._app.signal.websocket_405.async_send(**{
+                        'request': protocol.request,
+                        'response': protocol.response,
+                        **protocol.kwargs
+                    })
+                return await self.websocket_response(protocol)
 
             protocol.server = Server()
 

{cheeseapi-1.2.1 → cheeseapi-1.2.3}/CheeseAPI/text.py

@@ -14,12 +14,9 @@ class Text:
         self.progressBar: ProgressBar = ProgressBar()
 
         self.response_server: str = 'CheeseAPI'
-        self._process_title: str = 'CheeseAPI'
-        self.workerProcess_title: str = 'CheeseAPI:Process'
+        self.workerProcess_title: str = f'{setproctitle.getproctitle()}:Process'
         self.logger: str = '%Y_%m_%d.log'
 
-        setproctitle.setproctitle(self._process_title)
-
     def server_information(self) -> List[Tuple[str, str]]:
         return [
             (f'The master process {os.getpid()} started', f'The master process <blue>{os.getpid()}</blue> started'),
@@ -167,13 +164,3 @@ Static: <cyan>{self._app.server.static}</cyan>''' if self._app.workspace.static
 
     def validator_enumMessage(self, scope: str, key: str, enum: List[Any]) -> str:
         return f'The {scope}.{key} cannot be a value other than {enum}'
-
-    @property
-    def process_title(self) -> str:
-        return self._process_title
-
-    @process_title.setter
-    def process_title(self, value: str):
-        self._process_title = value
-
-        setproctitle.setproctitle(self._process_title)

{cheeseapi-1.2.1 → cheeseapi-1.2.3}/CheeseAPI/validator.py

@@ -123,7 +123,10 @@ class Validator:
         if validatedForm[f'{self.scope}.{self.key}'] is None:
             if self.required:
                 raise ValidateError(self.response or Response(app._text.validator_requiredMessage(self.scope, self.key), 400))
-            validatedForm[f'{self.scope}.{self.key}'] = self.default
+            if callable(self.default):
+                validatedForm[f'{self.scope}.{self.key}'] = self.default()
+            else:
+                validatedForm[f'{self.scope}.{self.key}'] = self.default
 
         if validatedForm[f'{self.scope}.{self.key}'] is not None:
             if self.type is not None:

{cheeseapi-1.2.1 → cheeseapi-1.2.3}/PKG-INFO

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

{cheeseapi-1.2.1 → cheeseapi-1.2.3}/pyproject.toml

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