feat: 重构配置格式

perf: 优化配置处理过程和呈现方式
2024-08-06 04:58:29 -04:00
parent 14dbdb2d83
commit f8aef78d25
19 changed files with 829 additions and 833 deletions
@@ -52,10 +52,11 @@ class Platform():
        return ret[:100] if len(ret) > 100 else ret
    
    def check_nick(self, message_str: str) -> bool:
-        if self.context.nick:
-            for nick in self.context.nick:
-                if nick and message_str.strip().startswith(nick):
-                    return True
+        w = self.context.config_helper.wake_prefix
+        if not w: return False
+        for nick in w:
+            if nick and message_str.strip().startswith(nick):
+                return True
        return False

    async def convert_to_t2i_chain(self, message_result: list) -> list:
@@ -6,6 +6,12 @@ from type.types import Context
 from SparkleLogging.utils.core import LogManager
 from logging import Logger
 from astrbot.message.handler import MessageHandler
+from util.cmd_config import (
+    PlatformConfig, 
+    AiocqhttpPlatformConfig, 
+    NakuruPlatformConfig, 
+    QQOfficialPlatformConfig
+)

 logger: Logger = LogManager.GetLogger(log_name='astrbot')

@@ -13,36 +19,40 @@ logger: Logger = LogManager.GetLogger(log_name='astrbot')
 class PlatformManager():
    def __init__(self, context: Context, message_handler: MessageHandler) -> None:
        self.context = context
-        self.config = context.base_config
        self.msg_handler = message_handler
        
    def load_platforms(self):
        tasks = []
        
-        if 'gocqbot' in self.config and self.config['gocqbot']['enable']:
-            logger.info("启用 QQ(nakuru 适配器)")
-            tasks.append(asyncio.create_task(self.gocq_bot(), name="nakuru-adapter"))
-        
-        if 'aiocqhttp' in self.config and self.config['aiocqhttp']['enable']:
-            logger.info("启用 QQ(aiocqhttp 适配器)")
-            tasks.append(asyncio.create_task(self.aiocq_bot(), name="aiocqhttp-adapter"))
+        platforms = self.context.config_helper.platform
+        logger.info(f"加载 {len(platforms)} 个机器人消息平台...")
+        for platform in platforms:
+            if not platform.enable:
+                continue
+            if platform.name == "qq_official":
+                assert isinstance(platform, QQOfficialPlatformConfig), "qq_official: 无法识别的配置类型。"
+                logger.info(f"加载 QQ官方 机器人消息平台 (appid: {platform.appid})")
+                tasks.append(asyncio.create_task(self.qqofficial_bot(platform), name="qqofficial-adapter"))
+            elif platform.name == "nakuru":
+                assert isinstance(platform, NakuruPlatformConfig), "nakuru: 无法识别的配置类型。"
+                logger.info(f"加载 QQ(nakuru) 机器人消息平台 ({platform.host}, {platform.websocket_port}, {platform.port})")
+                tasks.append(asyncio.create_task(self.nakuru_bot(platform), name="nakuru-adapter"))
+            elif platform.name == "aiocqhttp":
+                assert isinstance(platform, AiocqhttpPlatformConfig), "aiocqhttp: 无法识别的配置类型。"
+                logger.info("加载 QQ(aiocqhttp) 机器人消息平台")
+                tasks.append(asyncio.create_task(self.aiocq_bot(platform), name="aiocqhttp-adapter"))

-        # QQ频道
-        if 'qqbot' in self.config and self.config['qqbot']['enable'] and self.config['qqbot']['appid'] != None:
-            logger.info("启用 QQ(官方 API) 机器人消息平台")
-            tasks.append(asyncio.create_task(self.qqchan_bot(), name="qqofficial-adapter"))
-            
        return tasks

-    async def gocq_bot(self):
+    async def nakuru_bot(self, config: NakuruPlatformConfig):
        '''
        运行 QQ(nakuru 适配器) 
        '''
-        from model.platform.qq_nakuru import QQGOCQ
+        from model.platform.qq_nakuru import QQNakuru
        noticed = False
-        host = self.config.get("gocq_host", "127.0.0.1")
-        port = self.config.get("gocq_websocket_port", 6700)
-        http_port = self.config.get("gocq_http_port", 5700)
+        host = config.host
+        port = config.websocket_port
+        http_port = config.port
        logger.info(
            f"正在检查连接...host: {host}, ws port: {port}, http port: {http_port}")
        while True:
@@ -56,32 +66,32 @@ class PlatformManager():
                logger.info("nakuru 适配器已连接。")
                break
        try:
-            qq_gocq = QQGOCQ(self.context, self.msg_handler)
+            qq_gocq = QQNakuru(self.context, self.msg_handler, config)
            self.context.platforms.append(RegisteredPlatform(
-                platform_name="gocq", platform_instance=qq_gocq, origin="internal"))
+                platform_name="nakuru", platform_instance=qq_gocq, origin="internal"))
            await qq_gocq.run()
        except BaseException as e:
            logger.error("启动 nakuru 适配器时出现错误: " + str(e))

-    def aiocq_bot(self):
+    def aiocq_bot(self, config):
        '''
        运行 QQ(aiocqhttp 适配器)
        '''
        from model.platform.qq_aiocqhttp import AIOCQHTTP
-        qq_aiocqhttp = AIOCQHTTP(self.context, self.msg_handler)
+        qq_aiocqhttp = AIOCQHTTP(self.context, self.msg_handler, config)
        self.context.platforms.append(RegisteredPlatform(
            platform_name="aiocqhttp", platform_instance=qq_aiocqhttp, origin="internal"))
        return qq_aiocqhttp.run_aiocqhttp()

-    def qqchan_bot(self):
+    def qqofficial_bot(self, config):
        '''
        运行 QQ 官方机器人适配器
        '''
        try:
            from model.platform.qq_official import QQOfficial
-            qqchannel_bot = QQOfficial(self.context, self.msg_handler)
+            qqchannel_bot = QQOfficial(self.context, self.msg_handler, config)
            self.context.platforms.append(RegisteredPlatform(
-                platform_name="qqchan", platform_instance=qqchannel_bot, origin="internal"))
+                platform_name="qqofficial", platform_instance=qqchannel_bot, origin="internal"))
            return qqchannel_bot.run()
        except BaseException as e:
            logger.error("启动 QQ官方机器人适配器时出现错误: " + str(e))
@@ -13,18 +13,25 @@ from nakuru.entities.components import *
 from SparkleLogging.utils.core import LogManager
 from logging import Logger
 from astrbot.message.handler import MessageHandler
+from util.cmd_config import PlatformConfig, AiocqhttpPlatformConfig

 logger: Logger = LogManager.GetLogger(log_name='astrbot')

 class AIOCQHTTP(Platform):
-    def __init__(self, context: Context, message_handler: MessageHandler) -> None:
+    def __init__(self, context: Context, 
+                 message_handler: MessageHandler, 
+                 platform_config: PlatformConfig) -> None:
+        assert isinstance(platform_config, AiocqhttpPlatformConfig), "aiocqhttp: 无法识别的配置类型。"
+        
        self.message_handler = message_handler
        self.waiting = {}
        self.context = context
-        self.unique_session = self.context.unique_session
-        self.announcement = self.context.base_config.get("announcement", "欢迎新人！")
-        self.host = self.context.base_config['aiocqhttp']['ws_reverse_host']
-        self.port = self.context.base_config['aiocqhttp']['ws_reverse_port']
+        self.config = platform_config
+        self.unique_session = context.config_helper.platform_settings.unique_session
+        self.announcement = context.config_helper.platform_settings.welcome_message_when_join
+        self.host = platform_config.ws_reverse_host
+        self.port = platform_config.ws_reverse_port
+        self.admins = context.config_helper.admins_id
        
    def convert_message(self, event: Event) -> AstrBotMessage:
        
@@ -123,12 +130,11 @@ class AIOCQHTTP(Platform):
        
        # 解析 role
        sender_id = str(message.sender.user_id)
-        if sender_id == self.context.base_config.get('admin_qq', '') or \
-                sender_id in self.context.base_config.get('other_admins', []):
+        if sender_id in self.admins:
            role = 'admin'
        else:
            role = 'member'
-            
+
        # construct astrbot message event
        ame = AstrMessageEvent.from_astrbot_message(message, self.context, "aiocqhttp", message.session_id, role)
        
@@ -160,7 +166,7 @@ class AIOCQHTTP(Platform):
            res = [Plain(text=res), ]
            
        # if image mode, put all Plain texts into a new picture.
-        if self.context.base_config.get("qq_pic_mode", False) and isinstance(res, list):
+        if self.context.config_helper.t2i and isinstance(res, list):
            rendered_images = await self.convert_to_t2i_chain(res)
            if rendered_images:
                try:
@@ -18,6 +18,7 @@ from type.command import *
 from SparkleLogging.utils.core import LogManager
 from logging import Logger
 from astrbot.message.handler import MessageHandler
+from util.cmd_config import PlatformConfig, NakuruPlatformConfig

 logger: Logger = LogManager.GetLogger(log_name='astrbot')

@@ -28,46 +29,52 @@ class FakeSource:
        self.group_id = group_id


-class QQGOCQ(Platform):
-    def __init__(self, context: Context, message_handler: MessageHandler) -> None:
+class QQNakuru(Platform):
+    def __init__(self, context: Context, 
+                 message_handler: MessageHandler,
+                 platform_config: PlatformConfig) -> None:
+        assert isinstance(platform_config, NakuruPlatformConfig), "gocq: 无法识别的配置类型。"
+        
        self.loop = asyncio.new_event_loop()
        asyncio.set_event_loop(self.loop)
        
        self.message_handler = message_handler
        self.waiting = {}
        self.context = context
-        self.unique_session = self.context.unique_session
-        self.announcement = self.context.base_config.get("announcement", "欢迎新人！")
-
+        self.unique_session = context.config_helper.platform_settings.unique_session
+        self.announcement = context.config_helper.platform_settings.welcome_message_when_join
+        self.config = platform_config
+        self.admins = context.config_helper.admins_id
+        
        self.client = CQHTTP(
-            host=self.context.base_config.get("gocq_host", "127.0.0.1"),
-            port=self.context.base_config.get("gocq_websocket_port", 6700),
-            http_port=self.context.base_config.get("gocq_http_port", 5700),
+            host=self.config.host,
+            port=self.config.websocket_port,
+            http_port=self.config.port
        )
        gocq_app = self.client

        @gocq_app.receiver("GroupMessage")
        async def _(app: CQHTTP, source: GroupMessage):
-            if self.context.base_config.get("gocq_react_group", True):
+            if self.config.enable_group:
                abm = self.convert_message(source)
                await self.handle_msg(abm)

        @gocq_app.receiver("FriendMessage")
        async def _(app: CQHTTP, source: FriendMessage):
-            if self.context.base_config.get("gocq_react_friend", True):
+            if self.config.enable_direct_message:
                abm = self.convert_message(source)
                await self.handle_msg(abm)

        @gocq_app.receiver("GroupMemberIncrease")
        async def _(app: CQHTTP, source: GroupMemberIncrease):
-            if self.context.base_config.get("gocq_react_group_increase", True):
+            if self.config.enable_group_increase:
                await app.sendGroupMessage(source.group_id, [
                    Plain(text=self.announcement)
                ])

        @gocq_app.receiver("GuildMessage")
        async def _(app: CQHTTP, source: GuildMessage):
-            if self.cc.get("gocq_react_guild", True):
+            if self.config.enable_guild:
                abm = self.convert_message(source)
                await self.handle_msg(abm)
                        
@@ -112,8 +119,7 @@ class QQGOCQ(Platform):

        # 解析 role
        sender_id = str(message.raw_message.user_id)
-        if sender_id == self.context.base_config.get('admin_qq', '') or \
-                sender_id in self.context.base_config.get('other_admins', []):
+        if sender_id in self.admins:
            role = 'admin'
        else:
            role = 'member'
@@ -152,7 +158,7 @@ class QQGOCQ(Platform):
            res = [Plain(text=res), ]

        # if image mode, put all Plain texts into a new picture.
-        if self.context.base_config.get("qq_pic_mode", False) and isinstance(res, list):
+        if self.context.config_helper.t2i and isinstance(res, list):
            rendered_images = await self.convert_to_t2i_chain(res)
            if rendered_images:
                try:
@@ -186,7 +192,7 @@ class QQGOCQ(Platform):
                    plain_text_len += len(i.text)
                elif isinstance(i, Image):
                    image_num += 1
-            if plain_text_len > self.context.base_config.get('qq_forward_threshold', 200):
+            if plain_text_len > self.context.config_helper.platform_settings.forward_threshold or image_num > 1:
                # 删除At
                for i in message_chain:
                    if isinstance(i, At):
@@ -19,6 +19,7 @@ from nakuru.entities.components import *
 from SparkleLogging.utils.core import LogManager
 from logging import Logger
 from astrbot.message.handler import MessageHandler
+from util.cmd_config import PlatformConfig, QQOfficialPlatformConfig

 logger: Logger = LogManager.GetLogger(log_name='astrbot')

@@ -52,32 +53,36 @@ class botClient(Client):

 class QQOfficial(Platform):

-    def __init__(self, context: Context, message_handler: MessageHandler, test_mode = False) -> None:
-        super().__init__()
+    def __init__(self, context: Context, 
+                 message_handler: MessageHandler, 
+                 platform_config: PlatformConfig,
+                 test_mode = False) -> None:
+        assert isinstance(platform_config, QQOfficialPlatformConfig), "qq_official: 无法识别的配置类型。"
        self.loop = asyncio.new_event_loop()
        asyncio.set_event_loop(self.loop)
        
        self.message_handler = message_handler
        self.waiting: dict = {}
        self.context = context
+        self.config = platform_config
+        self.admins = context.config_helper.admins_id
        
-        self.appid = context.base_config['qqbot']['appid']
-        self.token = context.base_config['qqbot']['token']
-        self.secret = context.base_config['qqbot_secret']
-        self.unique_session = context.unique_session
-        qq_group = context.base_config['qqofficial_enable_group_message']
-        
+        self.appid = platform_config.appid
+        self.secret = platform_config.secret
+        self.unique_session = context.config_helper.platform_settings.unique_session
+        qq_group = platform_config.enable_group_c2c
+        guild_dm = platform_config.enable_guild_direct_message

        if qq_group:
            self.intents = botpy.Intents(
                public_messages=True,
                public_guild_messages=True,
-                direct_message=context.base_config['direct_message_mode']
+                direct_message=guild_dm
            )
        else:
            self.intents = botpy.Intents(
                public_guild_messages=True,
-                direct_message=context.base_config['direct_message_mode']
+                direct_message=guild_dm
            )
        self.client = botClient(
            intents=self.intents,
@@ -168,24 +173,11 @@ class QQOfficial(Platform):
        return abm

    def run(self):
-        try:
-            return self.client.start(
-                appid=self.appid,
-                secret=self.secret
-            )
-        except BaseException as e:
-            # 早期的 qq-botpy 版本使用 token 登录。
-            logger.error(traceback.format_exc())
-            self.client = botClient(
-                intents=self.intents,
-                bot_log=False
-            )
-            self.client.set_platform(self)
-            return self.client.start(
-                appid=self.appid,
-                token=self.token
-            )
-
+        return self.client.start(
+            appid=self.appid,
+            secret=self.secret
+        )
+            
    async def handle_msg(self, message: AstrBotMessage):
        assert isinstance(message.raw_message, (botpy.message.Message,
                          botpy.message.GroupMessage, botpy.message.DirectMessage, botpy.message.C2CMessage))
@@ -209,8 +201,7 @@ class QQOfficial(Platform):

        # 解析出 role
        sender_id = message.sender.user_id
-        if sender_id == self.context.base_config.get('admin_qqchan', None) or \
-                sender_id in self.context.base_config.get('other_admins', None):
+        if sender_id in self.admins:
            role = 'admin'
        else:
            role = 'member'
@@ -249,7 +240,7 @@ class QQOfficial(Platform):
        msg_ref = None
        rendered_images = []
        
-        if self.context.base_config.get("qq_pic_mode", False) and isinstance(result_message, list):
+        if self.context.config_helper.t2i and isinstance(result_message, list):
            rendered_images = await self.convert_to_t2i_chain(result_message)
        
        if isinstance(result_message, list):