CheeseAPI 2.0.8b2__tar.gz → 2.0.8b4__tar.gz

{cheeseapi-2.0.8b2 → cheeseapi-2.0.8b4}/CheeseAPI/route.py

@@ -150,7 +150,7 @@ class AppRoute(Route):
         self._routes: dict[str, dict[HTTP_METHOD_TYPE, RouteDict]] = {}
         self._patterns: list[Pattern] = [
             {
-                'pattern': re.compile(r'-?(0|[1-9]\d*)'),
+                'pattern': re.compile(r'-?(?:0|[1-9]\d*)'),
                 'weight': 5,
                 'type': int,
                 'key': 'int'

{cheeseapi-2.0.8b2 → cheeseapi-2.0.8b4}/CheeseAPI/scheduler.py

@@ -300,7 +300,7 @@ class SchedulerProxy:
 
     def add(self, interval_time: float, fn: Callable | None = None, *, first_run_timer: datetime.datetime | None = None, expected_run_num: int | None = None, key: str | None = None, run_type: Literal['THREAD', 'PROCESS'] = 'THREAD', args: tuple = (), kwargs: dict = {}, auto_remove: bool = False, timeout: float | None = None) -> Callable | Task:
         if fn:
-            if not self._pubsub_ready:
+            if self.app.sync_server_url and not self._pubsub_ready:
                 self._pubsub_ready = True
                 threading.Thread(target = self._start_pubsub, args = (self.app,), daemon = True).start()
                 coro = self._async_start_pubsub(self.app)
@@ -329,7 +329,7 @@ class SchedulerProxy:
 
     async def async_add(self, interval_time: float | None = None, fn: Callable | None = None, *, first_run_timer: datetime.datetime | None = None, expected_run_num: int | None = None, key: str | None = None, args: tuple = (), kwargs: dict = {}, auto_remove: bool = False, timeout: float | None = None) -> Callable | Task:
         if fn is not None:
-            if not self._pubsub_ready:
+            if self.app.sync_server_url and not self._pubsub_ready:
                 self._pubsub_ready = True
                 threading.Thread(target = self._start_pubsub, args = (self.app,), daemon = True).start()
                 coro = self._async_start_pubsub(self.app)

{cheeseapi-2.0.8b2 → cheeseapi-2.0.8b4}/CheeseAPI/websocket.py

@@ -112,11 +112,17 @@ class WebsocketProxy:
     @staticmethod
     def _static_send(path: str, data: bytes | list | str | dict, *, websocket_key_or_keys: str | list[str] | None = None):
         if static.websocket_sync_servers is not None:
-            data = json.dumps({
-                'data': data,
-                'key': websocket_key_or_keys,
-                'event': 'send'
-            }).encode()
+            if isinstance(data, bytes):
+                data = b'\x01' + json.dumps({
+                    'key': websocket_key_or_keys,
+                    'event': 'send'
+                }).encode() + b'\x00' + data
+            else:
+                data = b'\x00' + json.dumps({
+                    'data': data,
+                    'key': websocket_key_or_keys,
+                    'event': 'send'
+                }).encode()
             if static.websocket_data_encode is not None:
                 data = static.websocket_data_encode(data)
             redis.Redis(connection_pool = static.websocket_sync_servers[0]).publish(path, data)
@@ -137,11 +143,18 @@ class WebsocketProxy:
     @staticmethod
     async def async_send(path: str, data: bytes | list | str | dict, *, websocket_key_or_keys: str | list[str] | None = None):
         if static.websocket_sync_servers is not None:
-            data = json.dumps({
-                'data': data,
-                'key': websocket_key_or_keys,
-                'event': 'send'
-            }).encode()
+            if isinstance(data, bytes):
+                header = json.dumps({
+                    'key': websocket_key_or_keys,
+                    'event': 'send'
+                }).encode()
+                data = b'\x01' + header + b'\x00' + data
+            else:
+                data = b'\x00' + json.dumps({
+                    'data': data,
+                    'key': websocket_key_or_keys,
+                    'event': 'send'
+                }).encode()
             if static.websocket_data_encode is not None:
                 data = static.websocket_data_encode(data)
             await redis.asyncio.Redis(connection_pool = static.websocket_sync_servers[1]).publish(path, data)
@@ -157,7 +170,7 @@ class WebsocketProxy:
     @staticmethod
     def _static_close(path: str, code: int = 1000, message: str = '', *, websocket_key_or_keys: str | list[str] | None = None):
         if static.websocket_sync_servers is not None:
-            data = json.dumps({
+            data = b'\x00' + json.dumps({
                 'key': websocket_key_or_keys,
                 'event': 'close'
             }).encode()
@@ -181,7 +194,7 @@ class WebsocketProxy:
     @staticmethod
     async def async_close(path: str, code: int = 1000, message: str = '', *, websocket_key_or_keys: str | list[str] | None = None):
         if static.websocket_sync_servers is not None:
-            data = json.dumps({
+            data = b'\x00' + json.dumps({
                 'key': websocket_key_or_keys,
                 'event': 'close'
             }).encode()
@@ -263,7 +276,14 @@ class WebsocketProxy:
                             message = message['data']
                             if static.websocket_data_decode is not None:
                                 message = static.websocket_data_decode(message)
-                            message = json.loads(message.decode())
+                            msg_type = message[0]
+                            if msg_type == 0:
+                                message = json.loads(message[1:].decode())
+                                _data = message.get('data')
+                            else:
+                                sep = message.index(b'\x00', 1)
+                                _data = message[sep + 1:]
+                                message = json.loads(message[1:sep].decode())
                             if isinstance(message['key'], list):
                                 connectors = [connector for connector in connectors if connector.key in message['key']]
                             elif isinstance(message['key'], str):
@@ -274,7 +294,7 @@ class WebsocketProxy:
                             if connectors:
                                 if message['event'] == 'send':
                                     for connector in connectors:
-                                        asyncio.create_task(connector.send(message['data']))
+                                        asyncio.create_task(connector.send(_data))
                                 elif message['event'] == 'close':
                                     for connector in connectors:
                                         asyncio.create_task(connector.close())

{cheeseapi-2.0.8b2 → cheeseapi-2.0.8b4}/PKG-INFO

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

{cheeseapi-2.0.8b2 → cheeseapi-2.0.8b4}/pyproject.toml

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