CheeseAPI 0.3.5__tar.gz → 0.3.6__tar.gz

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

@@ -18,41 +18,43 @@ class App:
 
         self.workspace: Workspace = Workspace()
         self.server: Server = Server()
-        self.httpWorker: HttpWorker = HttpWorker()
-        self.websocketWorker: WebsocketWorker = WebsocketWorker()
         self.routeBus: RouteBus = RouteBus()
         self.route: Route = Route()
         self.cors: Cors = Cors()
-        self.managers: Dict[str, multiprocessing.Manager] = {}
+        self.g: Dict[str, Any] = {}
+        self.managers: Dict[str, Any] = {
+            'lock': multiprocessing.Lock()
+        }
 
         self.modules: List[str] = []
         self.localModules: List[str] | Literal[True] = True
         self.exclude_localModules: List[str] = []
         self.preferred_localModules: List[str] = []
 
-        self.handle: Handle = Handle()
-        self.g: Dict[str, Any] = {}
+        self.httpWorker: HttpWorker = HttpWorker()
+        self.websocketWorker: WebsocketWorker = WebsocketWorker()
+        self._handle: Handle = Handle()
+        self._managers: Dict[str, Any] = {
+            'firstRequest': multiprocessing.Value('b', False),
+            'startedWorkerNum': multiprocessing.Value('i', 0)
+        }
 
     def init(self):
         try:
-            self.handle._initHandle(self)
+            self._handle._initHandle(self)
         except Exception as e:
             sys.excepthook(Exception, e, sys.exc_info()[2])
 
-    def run(self, *, managers: Dict[str, multiprocessing.Manager] = {}):
+    def run(self, *, managers: Dict[str, Any] = {}):
         if 'startTimer' not in app.g:
-            logger.error('The app has not yet been initiated!')
+            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._managers['workspace.logger'] = manager.Value(str, self.workspace.logger)
 
-                self.handle._server_beforeStartingHandle(self)
-                for server_beforeStartingHandle in self.handle.server_beforeStartingHandles:
-                    server_beforeStartingHandle()
+                self._handle._server_beforeStartingHandle(self)
                 if signal.receiver('server_beforeStartingHandle'):
                     signal.send('server_beforeStartingHandle')
 
@@ -63,70 +65,73 @@ class App:
 
                 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 = multiprocessing.Process(target = run, args = (self, sock), name = f'CheeseAPI_subprocess')
                     process.start()
 
                 run(self, sock, True)
 
-                while self.managers['startedWorkerNum'].value != 0:
-                    time.sleep(0.1)
+                while self._managers['startedWorkerNum'].value != 0:
+                    time.sleep(0.01)
             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:
-            server_beforeStoppingHandle()
-        self.handle._server_beforeStoppingHandle(self)
-        logger.destory()
+        self._handle._server_beforeStoppingHandle(self)
+        logger.destroy()
 
 app = App()
 
-async def _run(app: App, sock: socket.socket, master: bool = False):
+async def _run(_app: App, sock: socket.socket, master: bool = False):
     from CheeseAPI.protocol import HttpProtocol
 
-    app.handle._worker_beforeStartingHandle()
-    for worker_beforeStartingHandle in app.handle.worker_beforeStartingHandles:
-        worker_beforeStartingHandle()
+    app.g = _app.g
+    app.managers = _app.managers
+    app._managers = _app._managers
+
+    app.workspace.logger = app._managers['workspace.logger'].value
+
+    app._handle._worker_beforeStartingHandle()
     if signal.receiver('worker_beforeStartingHandle'):
-        signal.send('worker_beforeStartingHandle')
+        await signal.async_send('worker_beforeStartingHandle')
 
-    HttpProtocol.managers = app.managers
+    HttpProtocol.managers = app._managers
 
     loop = asyncio.get_running_loop()
     server = await loop.create_server(HttpProtocol, sock = sock)
-    loop.add_signal_handler(pySignal.SIGINT, app.handle._exitSignalHandle, server)
-    loop.add_signal_handler(pySignal.SIGTERM, app.handle._exitSignalHandle, server)
+    loop.add_signal_handler(pySignal.SIGINT, app._handle._exitSignalHandle, server)
+    loop.add_signal_handler(pySignal.SIGTERM, app._handle._exitSignalHandle, server)
 
-    for worker_afterStartingHandle in app.handle.worker_afterStartingHandles:
-        worker_afterStartingHandle()
     if signal.receiver('worker_afterStartingHandle'):
-        signal.send('worker_afterStartingHandle')
+        await signal.async_send('worker_afterStartingHandle')
 
     with app.managers['lock']:
-        app.managers['startedWorkerNum'].value += 1
-        if app.managers['startedWorkerNum'].value == app.server.workers:
-            app.handle._server_afterStartingHandle(app)
-            for server_afterStartingHandle in app.handle.server_afterStartingHandles:
-                server_afterStartingHandle()
+        app._managers['startedWorkerNum'].value += 1
+        if app._managers['startedWorkerNum'].value == app.server.workers:
+            app._handle._server_afterStartingHandle(app)
             if signal.receiver('server_afterStartingHandle'):
-                signal.send('server_afterStartingHandle')
+                await signal.async_send('server_afterStartingHandle')
 
     while server.is_serving():
-        await asyncio.sleep(0.1)
+        if app._managers['workspace.logger'].value != app.workspace.logger:
+            app.workspace.logger = app._managers['workspace.logger'].value
+
+        await asyncio.sleep(0.01)
 
     if signal.receiver('worker_beforeStoppingHandle'):
-        signal.send('worker_beforeStoppingHandle')
-    for worker_beforeStoppingHandle in app.handle.worker_beforeStoppingHandles:
-        worker_beforeStoppingHandle()
-    app.handle._worker_beforeStoppingHandle(app)
+        await signal.async_send('worker_beforeStoppingHandle')
+    app._handle._worker_beforeStoppingHandle(app)
 
     with app.managers['lock']:
-        app.managers['startedWorkerNum'].value -= 1
+        app._managers['startedWorkerNum'].value -= 1
 
     if not master:
-        logger.destory()
+        logger.destroy()
 
 def run(app, sock, master: bool = False):
+    import setproctitle
+
+    setproctitle.setproctitle('CheeseAPI_masterProcess' if master else 'CheeseAPI_subprocess')
+
     asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
     asyncio.run(_run(app, sock, master))

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

@@ -14,20 +14,6 @@ if TYPE_CHECKING:
     from CheeseAPI.protocol import WebsocketProtocol, Protocol
 
 class Handle:
-    def __init__(self):
-        self.afterInitHandles: List[Callable] = []
-        self.server_beforeStartingHandles: List[Callable] = []
-        self.worker_beforeStartingHandles: List[Callable] = []
-        self.worker_afterStartingHandles: List[Callable] = []
-        self.server_afterStartingHandles: List[Callable] = []
-        self.context_beforeFirstRequestHandles: List[Callable] = []
-        self.http_beforeRequestHandles: List[Callable] = []
-        self.http_afterResponseHandles: List[Callable] = []
-        self.websocket_beforeConnectionHandles: List[Callable] = []
-        self.websocket_afterDisconnectionHandles: List[Callable] = []
-        self.worker_beforeStoppingHandles: List[Callable] = []
-        self.server_beforeStoppingHandles: List[Callable] = []
-
     async def _httpHandle(self, protocol: 'Protocol', app: 'App'):
         try:
             if app.server.static and protocol.request.path.startswith(app.server.static) and protocol.request.method == http.HTTPMethod.GET:
@@ -40,8 +26,6 @@ class Handle:
             try:
                 func, kwargs = app.routeBus._match(protocol.request.path, protocol.request.method)
 
-                for http_beforeRequestHandle in self.http_beforeRequestHandles:
-                    await http_beforeRequestHandle(**{ 'request': protocol.request })
                 if signal.receiver('http_beforeRequestHandle'):
                     await signal.async_send('http_beforeRequestHandle', { 'request': protocol.request })
 
@@ -99,16 +83,6 @@ class Handle:
 
         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'):
         logger.starting(f'The master process {os.getpid()} started', f'The master process <blue>{os.getpid()}</blue> started')
@@ -136,39 +110,19 @@ Workers: <blue>{app.server.workers}</blue>''' + (f'''
 Static: <cyan>{app.server.static}</cyan>''' if app.server.static else ''))
 
         if app.modules:
-            logger.starting(f'''Modules:
+            logger.loaded(f'''Modules:
 ''' + ' | '.join(app.modules))
 
         if app.localModules:
-            logger.starting(f'''Local Modules:
+            logger.loaded(f'''Local Modules:
 ''' + ' | '.join(app.localModules))
 
-    def worker_beforeStartingHandle(self, func: Callable):
-        self.worker_beforeStartingHandles.append(func)
-        return func
-
     def _worker_beforeStartingHandle(self):
         logger.debug(f'The subprocess {os.getpid()} started', f'The subprocess <blue>{os.getpid()}</blue> started')
 
-    def worker_afterStartingHandle(self, func: Callable):
-        self.worker_afterStartingHandles.append(func)
-        return func
-
-    def server_afterStartingHandle(self, func: Callable):
-        self.server_afterStartingHandles.append(func)
-        return func
-
     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>')
 
-    def context_beforeFirstRequestHandle(self, func: Callable):
-        self.context_beforeFirstRequestHandles.append(func)
-        return func
-
-    def http_beforeRequestHandle(self, func: Callable):
-        self.http_beforeRequestHandles.append(func)
-        return func
-
     async def _http_staticHandle(self, protocol: 'Protocol', app: 'App'):
         return FileResponse(app.workspace.static[:-1] + protocol.request.path)
 
@@ -203,11 +157,6 @@ A usable BaseResponse is not returned''')
                     'response': response,
                     'request': protocol.request
                 })
-            for http_afterResponseHandle in self.http_afterResponseHandles:
-                await http_afterResponseHandle(**{
-                    'response': response,
-                    'request': protocol.request
-                })
 
             if app.cors.origin == '*':
                 response.headers['Access-Control-Allow-Origin'] = app.cors.origin
@@ -241,17 +190,13 @@ A usable BaseResponse is not returned''')
             if protocol.deque:
                 _protocol = protocol.deque.popleft()
                 _protocol.transport.resume_reading()
-                protocol.task = asyncio.get_event_loop().create_task(app.handle._httpHandle(_protocol, app))
+                protocol.task = asyncio.get_event_loop().create_task(app._handle._httpHandle(_protocol, app))
                 protocol.task.add_done_callback(app.httpWorker.tasks.discard)
                 app.httpWorker.tasks.add(protocol.task)
 
             return True
         return False
 
-    def http_afterResponseHandle(self, func: Callable):
-        self.http_afterResponseHandles.append(func)
-        return func
-
     async def _websocket_requestHandle(self, protocol: 'WebsocketProtocol', app: 'App') -> Tuple[Callable, Dict[str, Any]] | HTTPResponse:
         try:
             func, kwargs = app.routeBus._match(protocol.request.path, 'WEBSOCKET')
@@ -270,14 +215,12 @@ A usable BaseResponse is not returned''')
     async def _websocket_405Handle(self, protocol: 'WebsocketProtocol', app: 'App') -> Response:
         return Response(status = http.HTTPStatus.METHOD_NOT_ALLOWED)
 
-    async def _websocket_responseHandle(self, protocol: 'WebsocketProtocol', app: 'App', response) -> HTTPResponse:
-        for http_afterResponseHandle in self.http_afterResponseHandles:
-            _response = await http_afterResponseHandle(**{
+    async def _websocket_responseHandle(self, protocol: 'WebsocketProtocol', app: 'App', response: BaseResponse) -> HTTPResponse:
+        if signal.receiver('http_afterResponseHandle'):
+            await signal.async_send('http_afterResponseHandle', {
                 'response': response,
                 'request': protocol.request
             })
-            if isinstance(_response, BaseResponse):
-                response = _response
 
         logger.http(f'The {protocol.request.headers.get("X-Forwarded-For").split(", ")[0]} accessed WEBSOCKET {protocol.request.fullPath} and returned {response.status}', f'The <cyan>{protocol.request.headers.get("X-Forwarded-For").split(", ")[0]}</cyan> accessed <cyan>WEBSOCKET ' + logger.encode(protocol.request.fullPath) + f'</cyan> and returned <blue>{response.status}</blue>')
 
@@ -290,10 +233,6 @@ A usable BaseResponse is not returned''')
         })
         return protocol.func[0].subprotocolHandle(**kwargs)
 
-    def websocket_beforeConnectionHandle(self, func: Callable):
-        self.websocket_beforeConnectionHandles.append(func)
-        return func
-
     async def _websocket_connectionHandle(self, protocol: 'WebsocketProtocol', app: 'App'):
         try:
             logger.websocket(f'The {protocol.request.headers.get("X-Forwarded-For").split(", ")[0]} connected WEBSOCKET {protocol.request.fullPath}', f'The <cyan>{protocol.request.headers.get("X-Forwarded-For").split(", ")[0]}</cyan> connected <cyan>WEBSOCKET {protocol.request.fullPath}</cyan>')
@@ -307,15 +246,13 @@ A usable BaseResponse is not returned''')
 
     async def _websocket_handler(self, protocol: 'WebsocketProtocol', app: 'App'):
         try:
-            for websocket_beforeConnectionHandle in app.handle.websocket_beforeConnectionHandles:
-                await websocket_beforeConnectionHandle(**protocol.func[1])
             if signal.receiver('websocket_beforeConnectionHandle'):
                 await signal.async_send('websocket_beforeConnectionHandle', protocol.func[1])
 
-            await app.handle._websocket_connectionHandle(protocol, app)
+            await app._handle._websocket_connectionHandle(protocol, app)
 
             while not protocol.closed:
-                await app.handle._websocket_messageHandle(protocol, app)
+                await app._handle._websocket_messageHandle(protocol, app)
         except:
             message = logger.encode(traceback.format_exc()[:-1])
             logger.danger(f'''An error occurred while receiving WEBSOCKET {protocol.request.fullPath} message:
@@ -341,10 +278,6 @@ A usable BaseResponse is not returned''')
 {message}''', f'''An error occurred while receiving <cyan>WEBSOCKET {protocol.request.fullPath}</cyan> message:
 {message}''')
 
-    def websocket_afterDisconnectionHandle(self, func: Callable):
-        self.websocket_afterDisconnectionHandles.append(func)
-        return func
-
     def _websocket_disconnectionHandle(self, protocol: 'WebsocketProtocol', app: 'App'):
         if not protocol.func:
             return
@@ -356,25 +289,15 @@ A usable BaseResponse is not returned''')
 
             if signal.receiver('websocket_afterDisconnectionHandle'):
                 signal.send('websocket_afterDisconnectionHandle', protocol.func[1])
-            for websocket_afterDisconnectionHandle in app.handle.websocket_afterDisconnectionHandles:
-                websocket_afterDisconnectionHandle(**protocol.func[1])
         except:
             message = logger.encode(traceback.format_exc()[:-1])
             logger.danger(f'''An error occurred while disconnecting WEBSOCKET {protocol.request.fullPath}:
 {message}''', f'''An error occurred while disconnecting <cyan>WEBSOCKET {protocol.request.fullPath}</cyan>:
 {message}''')
 
-    def worker_beforeStoppingHandle(self, func: Callable):
-        self.worker_beforeStoppingHandles.append(func)
-        return func
-
     def _worker_beforeStoppingHandle(self, app: 'App'):
         logger.debug(f'The {os.getpid()} subprocess stopped', f'The <blue>{os.getpid()}</blue> subprocess stopped')
 
-    def server_beforeStoppingHandle(self, func: Callable):
-        self.server_beforeStoppingHandles.append(func)
-        return func
-
     def _server_beforeStoppingHandle(self, app: 'App'):
         timer = time.time() - app.g['startTimer']
         message = 'The server runs for a total of '

{cheeseapi-0.3.5 → cheeseapi-0.3.6}/CheeseAPI/protocol.py

@@ -48,7 +48,7 @@ class WebsocketProtocol(WebSocketServerProtocol):
         super().connection_made(transport)
 
     async def process_request(self, *args, **kwargs) -> HTTPResponse | None:
-        result = await app.handle._websocket_requestHandle(self, app)
+        result = await app._handle._websocket_requestHandle(self, app)
         if len(result) == 3:
             return result
         self.func = result
@@ -56,13 +56,13 @@ class WebsocketProtocol(WebSocketServerProtocol):
         self.func[0].close = self.close
 
     def process_subprotocol(self, *args, **kwargs) -> str:
-        self.func[1]['subprotocol'] = app.handle._websocket_subprotocolHandle(self, app)
+        self.func[1]['subprotocol'] = app._handle._websocket_subprotocolHandle(self, app)
         if self.func[1]['subprotocol'] not in self.request.headers.get('Sec-Websocket-Protocol', '').split(', '):
             raise InvalidHandshake()
         return self.func[1]['subprotocol']
 
     async def ws_handler(self, *args, **kwargs):
-        await app.handle._websocket_handler(self, app)
+        await app._handle._websocket_handler(self, app)
 
     def connection_lost(self, exc: Exception | None) -> None:
         app.websocketWorker.connections.discard(self)
@@ -70,7 +70,7 @@ class WebsocketProtocol(WebSocketServerProtocol):
         if exc is None:
             self.transport.close()
 
-        app.handle._websocket_disconnectionHandle(self, app)
+        app._handle._websocket_disconnectionHandle(self, app)
 
 class Protocol:
     def __init__(self, parser):
@@ -87,8 +87,6 @@ class HttpProtocol(asyncio.Protocol):
 
     def __init__(self):
         if not HttpProtocol.managers['firstRequest'].value:
-            for context_beforeFirstRequestHandle in app.handle.context_beforeFirstRequestHandles:
-                context_beforeFirstRequestHandle()
             if signal.receiver('context_beforeFirstRequestHandle'):
                 signal.send('context_beforeFirstRequestHandle')
             HttpProtocol.managers['firstRequest'].value = True
@@ -149,7 +147,7 @@ class HttpProtocol(asyncio.Protocol):
             self.protocol.transport.pause_reading()
             self.protocol.deque.append(self.protocol)
         else:
-            self.protocol.task = asyncio.get_event_loop().create_task(app.handle._httpHandle(self.protocol, app))
+            self.protocol.task = asyncio.get_event_loop().create_task(app._handle._httpHandle(self.protocol, app))
             self.protocol.task.add_done_callback(app.httpWorker.tasks.discard)
             app.httpWorker.tasks.add(self.protocol.task)
 

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

@@ -1,4 +1,5 @@
 import blinker
+from ordered_set import OrderedSet
 
 class Signal(dict):
     def register(self, name: str):
@@ -32,6 +33,8 @@ class Signal(dict):
 
         await self[name].send_async(*args, **kwargs)
 
+blinker.Signal.set_class = OrderedSet
+
 signal = Signal()
 
 signal.register('afterInitHandle')

{cheeseapi-0.3.5 → cheeseapi-0.3.6}/CheeseAPI/workspace.py

@@ -16,6 +16,8 @@ class Workspace:
 
     @logger.setter
     def logger(self, value: str | bool):
+        from CheeseAPI import app
+
         if value is True:
             self._logger = datetime.datetime.now().strftime('%Y_%m_%d-%H_%M_%S.log')
         elif value is False:
@@ -24,3 +26,6 @@ class Workspace:
         else:
             self._logger = datetime.datetime.now().strftime(str(value))
         logger.filePath = self.log + self._logger
+
+        if 'workspace.logger' in app._managers and app._managers['workspace.logger'].value != logger.filePath:
+            app._managers['workspace.logger'].value = self.logger

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CheeseAPI
-Version: 0.3.5
+Version: 0.3.6
 Summary: 一款web协程框架。
 Project-URL: Source, https://github.com/CheeseUnknown/CheeseAPI
 Author-email: Cheese Unknown <cheese@cheese.ren>
@@ -8,6 +8,7 @@ License-File: LICENSE
 Requires-Dist: blinker
 Requires-Dist: cheeselog
 Requires-Dist: httptools
+Requires-Dist: ordered-set
 Requires-Dist: uvloop
 Requires-Dist: websockets
 Requires-Dist: xmltodict
@@ -111,31 +112,28 @@ CheeseAPI采用类Django的结构：
 | model.py | 模型类 |
 | api.py | api接口 |
 | service.py | 业务逻辑实现 |
+| handle.py | 初始化逻辑 |
 
 ## **更多...**
 
-### 1. [**生命周期**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/生命周期.md)
+### 1. [**App**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/App.md)
 
-### 2. [**App**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/App.md)
+#### 1.1 [**Workspace**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/App/Workspace.md)
 
-#### 2.1 [**Workspace**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/App/Workspace.md)
+#### 1.2 [**Server**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/App/Server.md)
 
-#### 2.2 [**Server**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/App/Server.md)
+#### 1.3 [**Cors**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/App/Cors.md)
 
-#### 2.3 [**Cors**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/App/Cors.md)
+### 2. [**Route**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Route.md)
 
-#### 2.4 [**Handle**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/App/Handle.md)
+### 3. [**Request**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Request.md)
 
-### 3. [**Route**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Route.md)
+### 4. [**Response**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Response.md)
 
-### 4. [**Request**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Request.md)
+### 5. [**Websocket**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Websocket.md)
 
-### 5. [**Response**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Response.md)
+### 6. [**Module**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Module.md)
 
-### 6. [**Websocket**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Websocket.md)
-
-### 7. [**Module**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Module.md)
+### 7. [**Signal**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Signal.md)
 
 ### 8. [**File**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/File.md)
-
-### 9. [**Signal**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Signal.md)

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

@@ -96,31 +96,28 @@ CheeseAPI采用类Django的结构：
 | model.py | 模型类 |
 | api.py | api接口 |
 | service.py | 业务逻辑实现 |
+| handle.py | 初始化逻辑 |
 
 ## **更多...**
 
-### 1. [**生命周期**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/生命周期.md)
+### 1. [**App**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/App.md)
 
-### 2. [**App**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/App.md)
+#### 1.1 [**Workspace**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/App/Workspace.md)
 
-#### 2.1 [**Workspace**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/App/Workspace.md)
+#### 1.2 [**Server**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/App/Server.md)
 
-#### 2.2 [**Server**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/App/Server.md)
+#### 1.3 [**Cors**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/App/Cors.md)
 
-#### 2.3 [**Cors**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/App/Cors.md)
+### 2. [**Route**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Route.md)
 
-#### 2.4 [**Handle**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/App/Handle.md)
+### 3. [**Request**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Request.md)
 
-### 3. [**Route**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Route.md)
+### 4. [**Response**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Response.md)
 
-### 4. [**Request**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Request.md)
+### 5. [**Websocket**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Websocket.md)
 
-### 5. [**Response**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Response.md)
+### 6. [**Module**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Module.md)
 
-### 6. [**Websocket**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Websocket.md)
-
-### 7. [**Module**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Module.md)
+### 7. [**Signal**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Signal.md)
 
 ### 8. [**File**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/File.md)
-
-### 9. [**Signal**](https://github.com/CheeseUnknown/CheeseAPI/blob/master/documents/Signal.md)

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

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "CheeseAPI"
-version = "0.3.5"
+version = "0.3.6"
 description = "一款web协程框架。"
 readme = "README.md"
 authors = [
@@ -16,7 +16,8 @@ dependencies = [
     "blinker",
     "websockets",
     "uvloop",
-    "httptools"
+    "httptools",
+    "ordered_set"
 ]
 
 [project.urls]