0.0.12

Signed-off-by: RF-Tar-Railt <3165388245@qq.com>

Author: RF-Tar-Railt

README.md

@@ -35,6 +35,7 @@ pip install --upgrade arclet-edoves
     - [x] `Scene`: 对IO统一的生命周期管理, 间接支持多账号
 + 杂项
     - [x] `NetworkClient`: 对网络端的抽象处理
+    - [x] `Filter`: 对事件内容的限制操作
 
 + 实现支持
     - [x] `Edoves for mirai-api-http` : 对 [ `mirai-api-http` ](https://github.com/project-mirai/mirai-api-http) 的支持.

arclet/edoves/__init__.py

@@ -2,3 +2,6 @@
 if not TYPE_CHECKING:
     import arclet.edoves.builtin.event.network
     import arclet.edoves.builtin.event.message
+    import arclet.edoves.builtin.event.notice
+
+edoves_version = (0, 0, 12)

arclet/edoves/builtin/behavior.py

@@ -1,55 +1,59 @@
 from ..main.monomer import BaseMonoBehavior
-from ..main.protocol import NetworkProtocol
+from ..main.protocol import NetworkProtocol, MonomerProtocol
 from .medium import Message
 
 
 class MessageBehavior(BaseMonoBehavior):
-    protocol: NetworkProtocol
+    n_protocol: NetworkProtocol
+    m_protocol: MonomerProtocol
 
     def activate(self):
-        self.protocol = self.io.metadata.protocol.scene.network_protocol
+        self.n_protocol = self.io.metadata.protocol.scene.network_protocol
+        self.m_protocol = self.io.metadata.protocol
 
     async def revoke(self, medium: Message, target: int = None):
-        self.protocol.set_medium(
+        await self.m_protocol.set_medium(
             {
                 "target": target if target else medium.content.find("Source").id
             }
         )
-        await self.protocol.medium_transport("message_revoke")
+        await self.n_protocol.medium_transport("message_revoke")
 
     async def nudge(self, target: str, **rest):
-        self.protocol.set_medium(
+        await self.m_protocol.set_medium(
             {
                 "target": target,
                 "rest": rest
             }
         )
-        await self.protocol.medium_transport("nudge_send")
+        await self.n_protocol.medium_transport("nudge_send")
 
     async def send_with(self, medium: Message, reply: bool = False, nudge: bool = False, **rest):
         if nudge:
-            self.protocol.set_medium(
+            await self.m_protocol.set_medium(
                 {
                     "target": medium.purveyor.metadata.identifier,
                     "rest": rest
                 }
             )
-            await self.protocol.medium_transport("nudge_send")
+            await self.n_protocol.medium_transport("nudge_send")
 
-        self.protocol.set_medium(
+        await self.m_protocol.set_medium(
             {
                 "target": medium.purveyor.metadata.identifier,
                 "reply": reply,
                 "content": medium.content.replace_type("Text", "Plain").to_sendable(),
                 "rest": rest
             }
         )
-        resp_data = await self.protocol.medium_transport("message_send")
+        resp_data = await self.n_protocol.medium_transport("message_send")
         return resp_data.get('messageId')
 
 
 class MonoMetaBehavior(BaseMonoBehavior):
-    protocol: NetworkProtocol
+    n_protocol: NetworkProtocol
+    m_protocol: MonomerProtocol
 
     def activate(self):
-        self.protocol = self.io.metadata.protocol.scene.network_protocol
+        self.n_protocol = self.io.metadata.protocol.scene.network_protocol
+        self.m_protocol = self.io.metadata.protocol

arclet/edoves/builtin/chatlog.py

@@ -12,8 +12,8 @@ def log_message(module: BaseModule, message: Message, purveyor: Monomer):
         edoves.logger.log(
             module.metadata.log_level,
             module.metadata.group_message_log_format.format(
-                group_name=list(purveyor.parents.values())[0].metadata.name,
-                group_id=list(purveyor.parents.values())[0].metadata.identifier,
+                group_name=purveyor.current_group.metadata.name,
+                group_id=purveyor.current_group.metadata.identifier,
                 member_id=purveyor.metadata.identifier,
                 member_name=purveyor.metadata.name,
                 bot_id=edoves.self.metadata.identifier,
@@ -36,7 +36,7 @@ class ChatLogData(ModuleMetaComponent):
     identifier: str = EDOVES_DEFAULT
     log_level: str = "INFO"
     group_message_log_format: str = (
-        "{bot_id}: [{group_name}({group_id})] {member_name}({member_id}) -> {message_string}" )
+        "{bot_id}: [{group_name}({group_id})] {member_name}({member_id}) -> {message_string}")
     friend_message_log_format: str = "{bot_id}: [{friend_name}({friend_id})] -> {message_string}"
     other_client_message_log_format: str = "{bot_id}: [{platform_name}({platform_id})] -> {message_string}"
 

arclet/edoves/builtin/client.py

@@ -1,10 +1,80 @@
 from contextlib import asynccontextmanager
-from typing import Union, Dict, Any
-
-from aiohttp import ClientSession, ClientWebSocketResponse
+from typing import Union, Dict, Any, Optional
+import json
+from aiohttp import ClientSession, ClientWebSocketResponse, ClientResponse, WSMessage
 from yarl import URL
 
-from ..main.network import NetworkClient, HTTP_METHODS, NetworkResponse
+from ..main.network import NetworkClient, HTTP_METHODS, NetworkResponse, NetworkConnection
+
+
+class AiohttpResponse(NetworkResponse):
+    response: ClientResponse
+
+    def __init__(self, response: ClientResponse):
+        self.response = response
+
+    @property
+    def url(self) -> URL:
+        return self.response.url
+
+    @property
+    def status(self) -> int:
+        return self.response.status
+
+    def raise_for_status(self):
+        self.response.raise_for_status()
+
+    async def read_json(self) -> dict:
+        return await self.response.json()
+
+    async def read(self) -> bytes:
+        return await self.response.read()
+
+    async def cookies(self) -> Dict[str, str]:
+        return {k: str(v) for k, v in self.response.cookies.items()}
+
+    async def headers(self) -> Dict[str, str]:
+        return {k: str(v) for k, v in self.response.headers.items()}
+
+    async def close(self):
+        self.response.close()
+
+
+class AiohttpWSConnection(NetworkConnection):
+
+    async def accept(self) -> None:
+        pass
+
+    def status(self) -> int:
+        pass
+
+    def raise_for_code(self):
+        pass
+
+    response: ClientWebSocketResponse
+
+    def __init__(self, response: ClientWebSocketResponse):
+        self.response = response
+
+    async def send(self, data: Union[bytes, str, dict]) -> None:
+        if isinstance(data, str):
+            return await self.response.send_str(data)
+        if isinstance(data, bytes):
+            return await self.response.send_bytes(data)
+        if isinstance(data, dict):
+            return await self.response.send_str(json.dumps(data))
+
+    async def receive(self, timeout: Optional[float] = None) -> WSMessage:
+        return await self.response.receive(timeout)
+
+    async def ping(self) -> None:
+        return await self.response.ping()
+
+    async def pong(self) -> None:
+        return await self.response.pong()
+
+    async def close(self, code: int = 1000, message: bytes = b'') -> None:
+        await self.response.close(code=code, message=message)
 
 
 class AioHttpClient(NetworkClient):
@@ -26,7 +96,7 @@ async def ensure_network(
             **kwargs: Any
     ):
         resp: ClientWebSocketResponse = await self.session.ws_connect(url, timeout=timeout, **kwargs).__aenter__()
-        yield NetworkResponse(get_connection=lambda: resp)
+        yield AiohttpWSConnection(resp)
 
     @asynccontextmanager
     async def request(
@@ -40,10 +110,8 @@ async def request(
         async with self.session.request(
                 method, url, **{"headers": headers, "data": data, **kwargs}
         ) as resp:
-            async def _read():
-                return await resp.read()
 
-            yield NetworkResponse(get_content=_read)
+            yield AiohttpResponse(resp)
 
     @asynccontextmanager
     async def get(
@@ -55,15 +123,7 @@ async def get(
         async with self.session.get(
                 url, **{"headers": headers, **kwargs}
         ) as resp:
-            resp.raise_for_status()
-
-            async def _read():
-                return await resp.read()
-
-            async def _json():
-                return await resp.json()
-
-            yield NetworkResponse(get_content=_read, get_json=_json)
+            yield AiohttpResponse(resp)
 
     @asynccontextmanager
     async def post(
@@ -75,15 +135,7 @@ async def post(
         async with self.session.post(
                 url, **{"headers": headers, "data": data, **kwargs}
         ) as resp:
-            resp.raise_for_status()
-
-            async def _read():
-                return await resp.read()
-
-            async def _json():
-                return await resp.json()
-
-            yield NetworkResponse(get_content=_read, get_json=_json)
+            yield AiohttpResponse(resp)
 
     @asynccontextmanager
     async def put(

arclet/edoves/builtin/commander.py

@@ -68,8 +68,8 @@ def __init__(self, protocol: TMProtocol):
             for k, v in self.local_storage[self.__class__].items():
                 self.get_component(CommandParsers).parsers.setdefault(k, v)
 
-        @self.behavior.add_handler(MessageReceived)
-        async def command_handler(message: Message, module: Commander):
+        @self.behavior.add_handlers(MessageReceived)
+        async def command_message_handler(message: Message, module: Commander):
             for cmd, psr in self.command_parsers.parsers.items():
                 result = psr.alconna.analyse_message(message.content)
                 if result.matched:

arclet/edoves/builtin/event/network.py

@@ -4,3 +4,7 @@
 
 class DockerOperate(EdovesBasicEvent):
     medium: JsonMedium
+
+
+class DockerStart(EdovesBasicEvent):
+    medium: JsonMedium

arclet/edoves/builtin/event/notice.py

@@ -2,23 +2,18 @@
 from ..medium import Notice
 
 
-class NoticeSelf(EdovesBasicEvent):
+class NoticeMe(EdovesBasicEvent):
     medium: Notice
 
 
-class MonomerStatusChanged(EdovesBasicEvent):
+class MonomerMetadataUpdate(EdovesBasicEvent):
     action: str
     medium: Notice
 
 
-class MonomerMetadataChanged(EdovesBasicEvent):
-    action: str
-    medium: Notice
-
-
-class RelationCreate(EdovesBasicEvent):
+class RelationshipSolution(EdovesBasicEvent):
     medium: Notice
 
 
-class RelationDestroy(EdovesBasicEvent):
+class RelationshipDissolution(EdovesBasicEvent):
     medium: Notice

arclet/edoves/builtin/filter.py

@@ -0,0 +1,33 @@
+from typing import List, Any
+
+from ..utilles.event_filter import EventFilter, EdovesBasicEvent
+
+
+class MonomerTagLimit(EventFilter):
+    tags: List[str]
+
+    def __init__(self, *monomer_tag: str):
+        self.tags = list(monomer_tag)
+
+    def judge(self, event: EdovesBasicEvent) -> bool:
+        if len(self.tags) > 1:
+            return event.medium.purveyor.compare(*self.tags)
+        return event.medium.purveyor.prime_tag == self.tags[0]
+
+
+class MonomerMetaLimit(EventFilter):
+    path: List[str]
+
+    def __init__(self, meta_name: str, value: Any):
+        self.path = meta_name.split('.')
+        if len(self.path) == 1:
+            self.path.insert(0, '')
+        self.value = value
+
+    def judge(self, event: EdovesBasicEvent) -> bool:
+        if self.path[0] == '':
+            return event.medium.purveyor.__getattribute__(self.path[1]) == self.value
+        if self.path[0] == 'metadata':
+            return event.medium.purveyor.metadata.__getitem__(self.path[1]) == self.value
+        if self.path[0] == 'behavior':
+            return event.medium.purveyor.behavior.__getitem__(self.path[1]) == self.value

arclet/edoves/builtin/mah/__init__.py

@@ -11,3 +11,4 @@
 class MAHConfig(TemplateConfig):
     protocol: Type[MAHProtocol] = MAHProtocol
     server_docker: Type[MAHServerDocker] = MAHServerDocker
+    modules_path = "./modules/mah"