CheeseAPI 0.3.3__tar.gz → 0.3.5__tar.gz

{cheeseapi-0.3.3 → cheeseapi-0.3.5}/CheeseAPI/app.py

@@ -33,37 +33,46 @@ class App:
         self.handle: Handle = Handle()
         self.g: Dict[str, Any] = {}
 
-    def run(self, *, managers: Dict[str, multiprocessing.Manager] = {}):
+    def init(self):
         try:
-            self.managers.update(managers)
-            manager = multiprocessing.Manager()
-            self.managers['lock'] = manager.Lock()
-            self.managers['startedWorkerNum'] = manager.Value(int, 0)
-            self.managers['firstRequest'] = manager.Value(bool, False)
-
-            self.handle._server_beforeStartingHandle(self)
-            for server_beforeStartingHandle in self.handle.server_beforeStartingHandles:
-                server_beforeStartingHandle()
-            if signal.receiver('server_beforeStartingHandle'):
-                signal.send('server_beforeStartingHandle')
-
-            sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-            sock.bind((self.server.host, self.server.port))
-            sock.set_inheritable(True)
-
-            multiprocessing.allow_connection_pickling()
-            for i in range(0, self.server.workers - 1):
-                process = multiprocessing.Process(target = run, args = (self, sock), name = f'CheeseAPI_Subprocess<{i}>', daemon = True)
-                process.start()
-
-            run(self, sock, True)
-
-            while self.managers['startedWorkerNum'].value != 0:
-                time.sleep(0.1)
+            self.handle._initHandle(self)
         except Exception as e:
             sys.excepthook(Exception, e, sys.exc_info()[2])
 
+    def run(self, *, managers: Dict[str, multiprocessing.Manager] = {}):
+        if 'startTimer' not in app.g:
+            logger.error('The app has not yet been initiated!')
+        else:
+            try:
+                self.managers.update(managers)
+                manager = multiprocessing.Manager()
+                self.managers['lock'] = manager.Lock()
+                self.managers['startedWorkerNum'] = manager.Value(int, 0)
+                self.managers['firstRequest'] = manager.Value(bool, False)
+
+                self.handle._server_beforeStartingHandle(self)
+                for server_beforeStartingHandle in self.handle.server_beforeStartingHandles:
+                    server_beforeStartingHandle()
+                if signal.receiver('server_beforeStartingHandle'):
+                    signal.send('server_beforeStartingHandle')
+
+                sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+                sock.bind((self.server.host, self.server.port))
+                sock.set_inheritable(True)
+
+                multiprocessing.allow_connection_pickling()
+                for i in range(0, self.server.workers - 1):
+                    process = multiprocessing.Process(target = run, args = (self, sock), name = f'CheeseAPI_Subprocess<{i}>', daemon = True)
+                    process.start()
+
+                run(self, sock, True)
+
+                while self.managers['startedWorkerNum'].value != 0:
+                    time.sleep(0.1)
+            except Exception as e:
+                sys.excepthook(Exception, e, sys.exc_info()[2])
+
         if signal.receiver('server_beforeStoppingHandle'):
             signal.send('server_beforeStoppingHandle')
         for server_beforeStoppingHandle in self.handle.server_beforeStoppingHandles:

{cheeseapi-0.3.3 → cheeseapi-0.3.5}/CheeseAPI/handle.py

@@ -2,7 +2,7 @@ import os, time, http, traceback, asyncio
 from typing import TYPE_CHECKING, List, Callable, Tuple, Dict, Any
 
 import websockets
-from CheeseLog import logger, ProgressBar
+from CheeseLog import logger
 from websockets.legacy.server import HTTPResponse
 
 from CheeseAPI.response import FileResponse, BaseResponse, Response
@@ -15,6 +15,7 @@ if TYPE_CHECKING:
 
 class Handle:
     def __init__(self):
+        self.afterInitHandles: List[Callable] = []
         self.server_beforeStartingHandles: List[Callable] = []
         self.worker_beforeStartingHandles: List[Callable] = []
         self.worker_afterStartingHandles: List[Callable] = []
@@ -68,13 +69,48 @@ class Handle:
     def _exitSignalHandle(self, server):
         server.close()
 
+    def _initHandle(self, app: 'App'):
+        app.g['startTimer'] = time.time()
+
+        moduleNum = len(app.modules)
+        if moduleNum:
+            for i in range(moduleNum):
+                Module(app.modules[i])
+
+        if app.localModules is True:
+            localModule = []
+            for foldername in os.listdir(app.workspace.base):
+                if foldername[0] == '.' or foldername == '__pycache__':
+                    continue
+                folderPath = os.path.join(app.workspace.base, foldername)
+                if os.path.isdir(folderPath):
+                    if (not app.workspace.static or not os.path.exists(os.path.join(app.workspace.base, app.workspace.static)) or not os.path.samefile(folderPath, os.path.join(app.workspace.base, app.workspace.static))) and (not app.workspace.log or not os.path.exists(os.path.join(app.workspace.base, app.workspace.log)) or not os.path.samefile(folderPath, os.path.join(app.workspace.base, app.workspace.log))) and foldername not in app.exclude_localModules:
+                        localModule.append(foldername)
+            app.localModules = localModule
+        else:
+            app.preferred_localModules = []
+        localModuleNum = len(app.localModules)
+        if localModuleNum:
+            for module in app.preferred_localModules:
+                LocalModule(app.workspace.base, module)
+            for module in app.localModules:
+                if module not in app.preferred_localModules:
+                    LocalModule(app.workspace.base, module)
+
+        if signal.receiver('afterInitHandle'):
+            signal.send('afterInitHandle')
+        for afterInitHandle in app.handle.afterInitHandles:
+            afterInitHandle()
+
+    def afterInitHandle(self, func: Callable):
+        self.afterInitHandles.append(func)
+        return func
+
     def server_beforeStartingHandle(self, func: Callable):
         self.server_beforeStartingHandles.append(func)
         return func
 
     def _server_beforeStartingHandle(self, app: 'App'):
-        app.g['startTimer'] = time.time()
-
         logger.starting(f'The master process {os.getpid()} started', f'The master process <blue>{os.getpid()}</blue> started')
 
         logger.starting(f'''Workspace information:
@@ -99,55 +135,13 @@ Port: <blue>{app.server.port}</blue>
 Workers: <blue>{app.server.workers}</blue>''' + (f'''
 Static: <cyan>{app.server.static}</cyan>''' if app.server.static else ''))
 
-        progressBar = ProgressBar(20)
-
-        moduleNum = len(app.modules)
-        if moduleNum:
+        if app.modules:
             logger.starting(f'''Modules:
-''' + ' | '.join(app.modules), f'''Modules:
-''' + ' | '.join(app.modules) + '''
-''')
-            timer = time.time()
-            for i in range(moduleNum):
-                message, styledMessage = progressBar(i * 1.0 / moduleNum)
-                logger.loading(message, styledMessage)
-                Module(app.modules[i])
-            timer = time.time() - timer
-            logger.loaded('The modules are loaded, which takes {:.6f} seconds'.format(timer), 'The modules are loaded, which takes <blue>{:.6f}</blue> seconds'.format(timer), refreshed = True)
+''' + ' | '.join(app.modules))
 
-        if app.localModules is True:
-            localModule = []
-            for foldername in os.listdir(app.workspace.base):
-                if foldername[0] == '.' or foldername == '__pycache__':
-                    continue
-                folderPath = os.path.join(app.workspace.base, foldername)
-                if os.path.isdir(folderPath):
-                    if (not app.workspace.static or not os.path.exists(os.path.join(app.workspace.base, app.workspace.static)) or not os.path.samefile(folderPath, os.path.join(app.workspace.base, app.workspace.static))) and (not app.workspace.log or not os.path.exists(os.path.join(app.workspace.base, app.workspace.log)) or not os.path.samefile(folderPath, os.path.join(app.workspace.base, app.workspace.log))) and foldername not in app.exclude_localModules:
-                        localModule.append(foldername)
-            app.localModules = localModule
-        else:
-            app.preferred_localModules = []
-        localModuleNum = len(app.localModules)
-        if localModuleNum:
+        if app.localModules:
             logger.starting(f'''Local Modules:
-''' + ' | '.join(app.localModules), f'''Local Modules:
-''' + ' | '.join(app.localModules) + '''
-''')
-            timer = time.time()
-            count = 0
-            for module in app.preferred_localModules:
-                message, styledMessage = progressBar(count * 1.0 / localModuleNum)
-                logger.loading(message, styledMessage)
-                LocalModule(app.workspace.base, module)
-                count += 1
-            for module in app.localModules:
-                if module not in app.preferred_localModules:
-                    message, styledMessage = progressBar(count * 1.0 / localModuleNum)
-                    logger.loading(message, styledMessage)
-                    LocalModule(app.workspace.base, module)
-                    count += 1
-            timer = time.time() - timer
-            logger.loaded('The local modules are loaded, which takes {:.6f} seconds'.format(timer), 'The local modules are loaded, which takes <blue>{:.6f}</blue> seconds'.format(timer), refreshed = True)
+''' + ' | '.join(app.localModules))
 
     def worker_beforeStartingHandle(self, func: Callable):
         self.worker_beforeStartingHandles.append(func)
@@ -167,9 +161,6 @@ Static: <cyan>{app.server.static}</cyan>''' if app.server.static else ''))
     def _server_afterStartingHandle(self, app: 'App'):
         logger.starting(f'The server started on http://{app.server.host}:{app.server.port}', f'The server started on <cyan><underline>http://{app.server.host}:{app.server.port}</underline></cyan>')
 
-        timer = time.time() - app.g['startTimer']
-        logger.starting('The server startup takes {:.6f} seconds'.format(timer), 'The server startup takes <blue>{:.6f}</blue> seconds'.format(timer))
-
     def context_beforeFirstRequestHandle(self, func: Callable):
         self.context_beforeFirstRequestHandles.append(func)
         return func

{cheeseapi-0.3.3 → cheeseapi-0.3.5}/CheeseAPI/signal.py

@@ -34,6 +34,7 @@ class Signal(dict):
 
 signal = Signal()
 
+signal.register('afterInitHandle')
 signal.register('server_beforeStartingHandle')
 signal.register('worker_beforeStartingHandle')
 signal.register('worker_afterStartingHandle')

{cheeseapi-0.3.3 → cheeseapi-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CheeseAPI
-Version: 0.3.3
+Version: 0.3.5
 Summary: 一款web协程框架。
 Project-URL: Source, https://github.com/CheeseUnknown/CheeseAPI
 Author-email: Cheese Unknown <cheese@cheese.ren>
@@ -52,6 +52,8 @@ from CheeseAPI import app, Response
 async def test(**kwargs):
     return Response('您好，这里是CheeseAPI！')
 
+app.init() # 初始化app
+
 if __name__ == '__main__':
     app.run() # 默认的启动地址：'0.0.0.0'，默认的启动端口：5214
 ```

{cheeseapi-0.3.3 → cheeseapi-0.3.5}/README.md

@@ -37,6 +37,8 @@ from CheeseAPI import app, Response
 async def test(**kwargs):
     return Response('您好，这里是CheeseAPI！')
 
+app.init() # 初始化app
+
 if __name__ == '__main__':
     app.run() # 默认的启动地址：'0.0.0.0'，默认的启动端口：5214
 ```

{cheeseapi-0.3.3 → cheeseapi-0.3.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "CheeseAPI"
-version = "0.3.3"
+version = "0.3.5"
 description = "一款web协程框架。"
 readme = "README.md"
 authors = [