0.0.11

Author: RF-Tar-Railt

README.md

@@ -13,7 +13,9 @@
 
 Edoves 是 `Arclet Project` 基于同项目下的 `Cesloi`的 **第二代** 框架实现, 
 
-**该框架目前处于快速迭代状态, API 可能会发生 _剧烈_ 变化, 可能还不适合进行生产性的开发与运维**
+**该框架目前处于快速迭代状态, API 可能会发生 _剧烈_ 变化, 建议根据changelog选择合适的版本**
+
+### [文档](https://arcletproject.github.io/docs/edoves/tutorial)
 
 ## 安装
 ```
@@ -30,7 +32,9 @@ pip install --upgrade arclet-edoves
     - [x] `Component`: IO的主要属性, 负责实际的数据管理与事件响应
     - [x] `Medium`: 传输事件信息的载体
     - [x] `Protocol`: 调度`Medium`与`IO`
-    - [x] `Scene`: 对IO统一的生命周期管理
+    - [x] `Scene`: 对IO统一的生命周期管理, 间接支持多账号
++ 杂项
+    - [x] `NetworkClient`: 对网络端的抽象处理
 
 + 实现支持
     - [x] `Edoves for mirai-api-http` : 对 [ `mirai-api-http` ](https://github.com/project-mirai/mirai-api-http) 的支持.
@@ -41,22 +45,21 @@ pip install --upgrade arclet-edoves
 
 main.py:
 ```python
-from arclet.edoves.builtin.mah.actions import Reply
+from arclet.edoves.builtin.mah.actions import reply
 from arclet.edoves.builtin.mah.module import MessageModule
 from arclet.edoves.builtin.medium import Message
-from arclet.edoves.builtin.event.message import AllMessage
+from arclet.edoves.builtin.event.message import MessageReceived
 from arclet.edoves.builtin.client import AioHttpClient
 from arclet.edoves.main import Edoves
 
 
 async def test_message_reaction(message: Message):
     if message.content.startswith("Hello World"):
-        await Reply(message).execute()
+        await reply(message)
         await message.set("I received 'Hello World'!").send()
 
 
 app = Edoves(
-    debug=False,
     profile={
         "verify_token": "INITKEYWylsVdbr",
         "port": "9080",
@@ -65,23 +68,8 @@ app = Edoves(
     }
 )
 message_module = app.scene.activate_module(MessageModule)
-message_module.add_handler(AllMessage, test_message_reaction)
+message_module.add_handler(MessageReceived, test_message_reaction)
 app.run()
-```
-edoves/builtin/mah/module.py:
-```python
-from arclet.edoves.main.module import BaseModule, ModuleMetaComponent
-from arclet.edoves.builtin.mah import VERIFY_CODE
-
-
-class MessageModuleData(ModuleMetaComponent):
-    identifier = VERIFY_CODE
-
-
-class MessageModule(BaseModule):
-    prefab_metadata = MessageModuleData
-
-
 ```
 
 ## 相关项目

arclet/edoves/builtin/actions.py

@@ -6,18 +6,29 @@
 
 class MessageAction(ExecutiveAction):
     data: Message
-    action: str
 
     def __init__(self, action: str, message: Message):
-        super().__init__(message)
-        self.action = action
+        super().__init__(message, action)
 
     async def execute(self):
         return await self.target.action(self.action)(
             self.data
         )
 
 
+class MessageRevoke(MessageAction):
+    message_id: int
+
+    def __init__(self, message: Message, target: int = None):
+        self.message_id = target
+        super().__init__("revoke", message)
+
+    async def execute(self):
+        return await self.target.action(self.action)(
+            self.data, target=self.message_id
+        )
+
+
 class MessageSend(MessageAction):
 
     def __init__(self, message: Optional[Message] = None):

arclet/edoves/builtin/behavior.py

@@ -9,14 +9,47 @@ class MessageBehavior(BaseMonoBehavior):
     def activate(self):
         self.protocol = self.io.metadata.protocol.scene.network_protocol
 
+    async def revoke(self, medium: Message, target: int = None):
+        self.protocol.set_medium(
+            {
+                "target": target if target else medium.content.find("Source").id
+            }
+        )
+        await self.protocol.medium_transport("message_revoke")
+
+    async def nudge(self, target: str, **rest):
+        self.protocol.set_medium(
+            {
+                "target": target,
+                "rest": rest
+            }
+        )
+        await self.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(
+                {
+                    "target": medium.purveyor.metadata.identifier,
+                    "rest": rest
+                }
+            )
+            await self.protocol.medium_transport("nudge_send")
+
         self.protocol.set_medium(
             {
                 "target": medium.purveyor.metadata.identifier,
                 "reply": reply,
-                "nudge": nudge,
                 "content": medium.content.replace_type("Text", "Plain").to_sendable(),
                 "rest": rest
             }
         )
-        resp_data = await self.protocol.medium_transport("send_message")
+        resp_data = await self.protocol.medium_transport("message_send")
+        return resp_data.get('messageId')
+
+
+class MonoMetaBehavior(BaseMonoBehavior):
+    protocol: NetworkProtocol
+
+    def activate(self):
+        self.protocol = self.io.metadata.protocol.scene.network_protocol

arclet/edoves/builtin/chatlog.py

@@ -3,7 +3,7 @@
 from ..main.module import BaseModule, ModuleMetaComponent
 from ..main.typings import TMProtocol
 from ..utilles.security import EDOVES_DEFAULT
-from .event.message import AllMessage
+from .event.message import MessageReceived
 
 
 def log_message(module: BaseModule, message: Message, purveyor: Monomer):
@@ -46,4 +46,4 @@ class ChatLogModule(BaseModule):
 
     def __init__(self, protocol: TMProtocol):
         super().__init__(protocol)
-        self.add_handler(AllMessage, log_message)
+        self.add_handler(MessageReceived, log_message)

arclet/edoves/builtin/commander.py

@@ -2,7 +2,7 @@
 from arclet.letoderea.handler import await_exec_target
 from typing import Callable, Dict, Type
 
-from .event.message import AllMessage
+from .event.message import MessageReceived
 from .medium import Message
 from ..main.module import BaseModule, ModuleMetaComponent, Component
 from ..main.typings import TMProtocol
@@ -68,7 +68,7 @@ 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(AllMessage)
+        @self.behavior.add_handler(MessageReceived)
         async def command_handler(message: Message, module: Commander):
             for cmd, psr in self.command_parsers.parsers.items():
                 result = psr.alconna.analyse_message(message.content)

arclet/edoves/builtin/event/__init__.py

@@ -1,2 +1,4 @@
-from .message import AllMessage
+from .message import MessageReceived, MessageRevoke
 from .network import DockerOperate
+from .lifecycle import StartRunning, StopRunning
+

arclet/edoves/builtin/event/lifecycle.py

@@ -0,0 +1,18 @@
+from ...main.event import EdovesBasicEvent
+from ...main.context import ctx_edoves
+
+
+class LifeCycle(EdovesBasicEvent):
+
+    def get_params(self):
+        return self.param_export(
+            edoves=ctx_edoves.get(),
+        )
+
+
+class StartRunning(LifeCycle):
+    pass
+
+
+class StopRunning(LifeCycle):
+    pass

arclet/edoves/builtin/event/message.py

@@ -1,6 +1,10 @@
-from ...main.event import BasicEvent
+from ...main.event import EdovesBasicEvent
 from ..medium import Message
 
 
-class AllMessage(BasicEvent):
+class MessageReceived(EdovesBasicEvent):
+    medium: Message
+
+
+class MessageRevoke(EdovesBasicEvent):
     medium: Message

arclet/edoves/builtin/event/network.py

@@ -1,6 +1,6 @@
-from ...main.event import BasicEvent
+from ...main.event import EdovesBasicEvent
 from ..medium import JsonMedium
 
 
-class DockerOperate(BasicEvent):
+class DockerOperate(EdovesBasicEvent):
     medium: JsonMedium

arclet/edoves/builtin/event/notice.py

@@ -0,0 +1,24 @@
+from ...main.event import EdovesBasicEvent
+from ..medium import Notice
+
+
+class NoticeSelf(EdovesBasicEvent):
+    medium: Notice
+
+
+class MonomerStatusChanged(EdovesBasicEvent):
+    action: str
+    medium: Notice
+
+
+class MonomerMetadataChanged(EdovesBasicEvent):
+    action: str
+    medium: Notice
+
+
+class RelationCreate(EdovesBasicEvent):
+    medium: Notice
+
+
+class RelationDestroy(EdovesBasicEvent):
+    medium: Notice