feat: 添加 Satori 协议适配器支持 (#2633)
* Create satori_adapter.py * Add files via upload * Update default.py * Update manager.py * Update platform_adapter_type.py * Update PlatformPage.vue * Add files via upload * Update default.py * Update manager.py * Update platform_adapter_type.py * Update PlatformPage.vue * Add files via upload * Update default.py * chore: format code * feat: 修复 Image, Audio 的解析，修复 message_str 的解析 * perf: 增强鲁棒性 * feat: 添加 Satori 配置项描述，移除适配器默认配置 --------- Co-authored-by: Soulter <905617992@qq.com>
This commit is contained in:
shangxue
GitHub
@@ -246,8 +246,49 @@ CONFIG_METADATA_2 = {
|
||||
"slack_webhook_port": 6197,
|
||||
"slack_webhook_path": "/astrbot-slack-webhook/callback",
|
||||
},
|
||||
"Satori": {
|
||||
"id": "satori",
|
||||
"type": "satori",
|
||||
"enable": False,
|
||||
"satori_api_base_url": "http://localhost:5140/satori/v1",
|
||||
"satori_endpoint": "ws://127.0.0.1:5140/satori/v1/events",
|
||||
"satori_token": "",
|
||||
"satori_auto_reconnect": True,
|
||||
"satori_heartbeat_interval": 10,
|
||||
"satori_reconnect_delay": 5,
|
||||
},
|
||||
},
|
||||
"items": {
|
||||
"satori_api_base_url": {
|
||||
"description": "Satori API Base URL",
|
||||
"type": "string",
|
||||
"hint": "The base URL for the Satori API.",
|
||||
},
|
||||
"satori_endpoint": {
|
||||
"description": "Satori WebSocket Endpoint",
|
||||
"type": "string",
|
||||
"hint": "The WebSocket endpoint for Satori events.",
|
||||
},
|
||||
"satori_token": {
|
||||
"description": "Satori Token",
|
||||
"type": "string",
|
||||
"hint": "The token used for authenticating with the Satori API.",
|
||||
},
|
||||
"satori_auto_reconnect": {
|
||||
"description": "Enable Auto Reconnect",
|
||||
"type": "bool",
|
||||
"hint": "Whether to automatically reconnect the WebSocket on disconnection.",
|
||||
},
|
||||
"satori_heartbeat_interval": {
|
||||
"description": "Satori Heartbeat Interval",
|
||||
"type": "int",
|
||||
"hint": "The interval (in seconds) for sending heartbeat messages.",
|
||||
},
|
||||
"satori_reconnect_delay": {
|
||||
"description": "Satori Reconnect Delay",
|
||||
"type": "int",
|
||||
"hint": "The delay (in seconds) before attempting to reconnect.",
|
||||
},
|
||||
"slack_connection_mode": {
|
||||
"description": "Slack Connection Mode",
|
||||
"type": "string",
|
||||
|
||||
@@ -165,6 +165,10 @@ class Record(BaseMessageComponent):
|
||||
return Record(file=url, **_)
|
||||
raise Exception("not a valid url")
|
||||
|
||||
@staticmethod
|
||||
def fromBase64(bs64_data: str, **_):
|
||||
return Record(file=f"base64://{bs64_data}", **_)
|
||||
|
||||
async def convert_to_file_path(self) -> str:
|
||||
"""将这个语音统一转换为本地文件路径。这个方法避免了手动判断语音数据类型，直接返回语音数据的本地路径（如果是网络 URL, 则会自动进行下载）。
|
||||
|
||||
|
||||
@@ -85,6 +85,8 @@ class PlatformManager:
|
||||
)
|
||||
case "slack":
|
||||
from .sources.slack.slack_adapter import SlackAdapter # noqa: F401
|
||||
case "satori":
|
||||
from .sources.satori.satori_adapter import SatoriPlatformAdapter # noqa: F401
|
||||
except (ImportError, ModuleNotFoundError) as e:
|
||||
logger.error(
|
||||
f"加载平台适配器 {platform_config['type']} 失败，原因：{e}。请检查依赖库是否安装。提示：可以在 管理面板->控制台->安装Pip库 中安装依赖库。"
|
||||
|
||||
@@ -0,0 +1,482 @@
|
||||
import asyncio
|
||||
import json
|
||||
import time
|
||||
import websockets
|
||||
from websockets.asyncio.client import connect
|
||||
from typing import Optional
|
||||
from aiohttp import ClientSession, ClientTimeout
|
||||
from websockets.asyncio.client import ClientConnection
|
||||
from astrbot.api import logger
|
||||
from astrbot.api.event import MessageChain
|
||||
from astrbot.api.platform import (
|
||||
AstrBotMessage,
|
||||
MessageMember,
|
||||
MessageType,
|
||||
Platform,
|
||||
PlatformMetadata,
|
||||
register_platform_adapter,
|
||||
)
|
||||
from astrbot.core.platform.astr_message_event import MessageSession
|
||||
from astrbot.api.message_components import Plain, Image, At, File, Record
|
||||
from xml.etree import ElementTree as ET
|
||||
|
||||
|
||||
@register_platform_adapter(
|
||||
"satori",
|
||||
"Satori 协议适配器",
|
||||
)
|
||||
class SatoriPlatformAdapter(Platform):
|
||||
def __init__(
|
||||
self, platform_config: dict, platform_settings: dict, event_queue: asyncio.Queue
|
||||
) -> None:
|
||||
super().__init__(event_queue)
|
||||
self.config = platform_config
|
||||
self.settings = platform_settings
|
||||
|
||||
self.api_base_url = self.config.get(
|
||||
"satori_api_base_url", "http://localhost:5140/satori/v1"
|
||||
)
|
||||
self.token = self.config.get("satori_token", "")
|
||||
self.endpoint = self.config.get(
|
||||
"satori_endpoint", "ws://127.0.0.1:5140/satori/v1/events"
|
||||
)
|
||||
self.auto_reconnect = self.config.get("satori_auto_reconnect", True)
|
||||
self.heartbeat_interval = self.config.get("satori_heartbeat_interval", 10)
|
||||
self.reconnect_delay = self.config.get("satori_reconnect_delay", 5)
|
||||
|
||||
self.ws: Optional[ClientConnection] = None
|
||||
self.session: Optional[ClientSession] = None
|
||||
self.sequence = 0
|
||||
self.logins = []
|
||||
self.running = False
|
||||
self.heartbeat_task: Optional[asyncio.Task] = None
|
||||
self.ready_received = False
|
||||
|
||||
async def send_by_session(
|
||||
self, session: MessageSession, message_chain: MessageChain
|
||||
):
|
||||
from .satori_event import SatoriPlatformEvent
|
||||
|
||||
await SatoriPlatformEvent.send_with_adapter(
|
||||
self, message_chain, session.session_id
|
||||
)
|
||||
await super().send_by_session(session, message_chain)
|
||||
|
||||
def meta(self) -> PlatformMetadata:
|
||||
return PlatformMetadata(name="satori", description="Satori 通用协议适配器")
|
||||
|
||||
def _is_websocket_closed(self, ws) -> bool:
|
||||
"""检查WebSocket连接是否已关闭"""
|
||||
if not ws:
|
||||
return True
|
||||
try:
|
||||
if hasattr(ws, "closed"):
|
||||
return ws.closed
|
||||
elif hasattr(ws, "close_code"):
|
||||
return ws.close_code is not None
|
||||
else:
|
||||
return False
|
||||
except AttributeError:
|
||||
return False
|
||||
|
||||
async def run(self):
|
||||
self.running = True
|
||||
self.session = ClientSession(timeout=ClientTimeout(total=30))
|
||||
|
||||
retry_count = 0
|
||||
max_retries = 10
|
||||
|
||||
while self.running:
|
||||
try:
|
||||
await self.connect_websocket()
|
||||
retry_count = 0
|
||||
except websockets.exceptions.ConnectionClosed as e:
|
||||
logger.warning(f"Satori WebSocket 连接关闭: {e}")
|
||||
retry_count += 1
|
||||
except Exception as e:
|
||||
logger.error(f"Satori WebSocket 连接失败: {e}")
|
||||
retry_count += 1
|
||||
|
||||
if not self.running:
|
||||
break
|
||||
|
||||
if retry_count >= max_retries:
|
||||
logger.error(f"达到最大重试次数 ({max_retries})，停止重试")
|
||||
break
|
||||
|
||||
if not self.auto_reconnect:
|
||||
break
|
||||
|
||||
delay = min(self.reconnect_delay * (2 ** (retry_count - 1)), 60)
|
||||
await asyncio.sleep(delay)
|
||||
|
||||
if self.session:
|
||||
await self.session.close()
|
||||
|
||||
async def connect_websocket(self):
|
||||
logger.info(f"Satori 适配器正在连接到 WebSocket: {self.endpoint}")
|
||||
logger.info(f"Satori 适配器 HTTP API 地址: {self.api_base_url}")
|
||||
|
||||
if not self.endpoint.startswith(("ws://", "wss://")):
|
||||
logger.error(f"无效的WebSocket URL: {self.endpoint}")
|
||||
raise ValueError(f"WebSocket URL必须以ws://或wss://开头: {self.endpoint}")
|
||||
|
||||
try:
|
||||
websocket = await connect(self.endpoint, additional_headers={})
|
||||
self.ws = websocket
|
||||
|
||||
await asyncio.sleep(0.1)
|
||||
|
||||
await self.send_identify()
|
||||
|
||||
self.heartbeat_task = asyncio.create_task(self.heartbeat_loop())
|
||||
|
||||
async for message in websocket:
|
||||
try:
|
||||
await self.handle_message(message) # type: ignore
|
||||
except Exception as e:
|
||||
logger.error(f"Satori 处理消息异常: {e}")
|
||||
|
||||
except websockets.exceptions.ConnectionClosed as e:
|
||||
logger.warning(f"Satori WebSocket 连接关闭: {e}")
|
||||
raise
|
||||
except Exception as e:
|
||||
logger.error(f"Satori WebSocket 连接异常: {e}")
|
||||
raise
|
||||
finally:
|
||||
if self.heartbeat_task:
|
||||
self.heartbeat_task.cancel()
|
||||
try:
|
||||
await self.heartbeat_task
|
||||
except asyncio.CancelledError:
|
||||
pass
|
||||
if self.ws:
|
||||
try:
|
||||
await self.ws.close()
|
||||
except Exception as e:
|
||||
logger.error(f"Satori WebSocket 关闭异常: {e}")
|
||||
|
||||
async def send_identify(self):
|
||||
if not self.ws:
|
||||
raise Exception("WebSocket连接未建立")
|
||||
|
||||
if self._is_websocket_closed(self.ws):
|
||||
raise Exception("WebSocket连接已关闭")
|
||||
|
||||
identify_payload = {
|
||||
"op": 3, # IDENTIFY
|
||||
"body": {
|
||||
"token": str(self.token) if self.token else "", # 字符串
|
||||
},
|
||||
}
|
||||
|
||||
# 只有在有序列号时才添加sn字段
|
||||
if self.sequence > 0:
|
||||
identify_payload["body"]["sn"] = self.sequence
|
||||
|
||||
try:
|
||||
message_str = json.dumps(identify_payload, ensure_ascii=False)
|
||||
await self.ws.send(message_str)
|
||||
except websockets.exceptions.ConnectionClosed as e:
|
||||
logger.error(f"发送 IDENTIFY 信令时连接关闭: {e}")
|
||||
raise
|
||||
except Exception as e:
|
||||
logger.error(f"发送 IDENTIFY 信令失败: {e}")
|
||||
raise
|
||||
|
||||
async def heartbeat_loop(self):
|
||||
try:
|
||||
while self.running and self.ws:
|
||||
await asyncio.sleep(self.heartbeat_interval)
|
||||
|
||||
if self.ws and not self._is_websocket_closed(self.ws):
|
||||
try:
|
||||
ping_payload = {
|
||||
"op": 1, # PING
|
||||
"body": {},
|
||||
}
|
||||
await self.ws.send(json.dumps(ping_payload, ensure_ascii=False))
|
||||
except websockets.exceptions.ConnectionClosed as e:
|
||||
logger.error(f"Satori WebSocket 连接关闭: {e}")
|
||||
break
|
||||
except Exception as e:
|
||||
logger.error(f"Satori WebSocket 发送心跳失败: {e}")
|
||||
break
|
||||
else:
|
||||
break
|
||||
except asyncio.CancelledError:
|
||||
pass
|
||||
except Exception as e:
|
||||
logger.error(f"心跳任务异常: {e}")
|
||||
|
||||
async def handle_message(self, message: str):
|
||||
try:
|
||||
data = json.loads(message)
|
||||
op = data.get("op")
|
||||
body = data.get("body", {})
|
||||
|
||||
if op == 4: # READY
|
||||
self.logins = body.get("logins", [])
|
||||
self.ready_received = True
|
||||
|
||||
# 输出连接成功的bot信息
|
||||
if self.logins:
|
||||
for i, login in enumerate(self.logins):
|
||||
platform = login.get("platform", "")
|
||||
user = login.get("user", {})
|
||||
user_id = user.get("id", "")
|
||||
user_name = user.get("name", "")
|
||||
logger.info(
|
||||
f"Satori 连接成功 - Bot {i + 1}: platform={platform}, user_id={user_id}, user_name={user_name}"
|
||||
)
|
||||
|
||||
if "sn" in body:
|
||||
self.sequence = body["sn"]
|
||||
|
||||
elif op == 2: # PONG
|
||||
pass
|
||||
|
||||
elif op == 0: # EVENT
|
||||
await self.handle_event(body)
|
||||
if "sn" in body:
|
||||
self.sequence = body["sn"]
|
||||
|
||||
elif op == 5: # META
|
||||
if "sn" in body:
|
||||
self.sequence = body["sn"]
|
||||
|
||||
except json.JSONDecodeError as e:
|
||||
logger.error(f"解析 WebSocket 消息失败: {e}, 消息内容: {message}")
|
||||
except Exception as e:
|
||||
logger.error(f"处理 WebSocket 消息异常: {e}")
|
||||
|
||||
async def handle_event(self, event_data: dict):
|
||||
try:
|
||||
event_type = event_data.get("type")
|
||||
sn = event_data.get("sn")
|
||||
if sn:
|
||||
self.sequence = sn
|
||||
|
||||
if event_type == "message-created":
|
||||
message = event_data.get("message", {})
|
||||
user = event_data.get("user", {})
|
||||
channel = event_data.get("channel", {})
|
||||
guild = event_data.get("guild")
|
||||
login = event_data.get("login", {})
|
||||
timestamp = event_data.get("timestamp")
|
||||
|
||||
if user.get("id") == login.get("user", {}).get("id"):
|
||||
return
|
||||
|
||||
abm = await self.convert_satori_message(
|
||||
message, user, channel, guild, login, timestamp
|
||||
)
|
||||
if abm:
|
||||
await self.handle_msg(abm)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"处理事件失败: {e}")
|
||||
|
||||
async def convert_satori_message(
|
||||
self,
|
||||
message: dict,
|
||||
user: dict,
|
||||
channel: dict,
|
||||
guild: Optional[dict],
|
||||
login: dict,
|
||||
timestamp: Optional[int] = None,
|
||||
) -> Optional[AstrBotMessage]:
|
||||
try:
|
||||
abm = AstrBotMessage()
|
||||
abm.message_id = message.get("id", "")
|
||||
abm.raw_message = {
|
||||
"message": message,
|
||||
"user": user,
|
||||
"channel": channel,
|
||||
"guild": guild,
|
||||
"login": login,
|
||||
}
|
||||
|
||||
if guild and guild.get("id"):
|
||||
abm.type = MessageType.GROUP_MESSAGE
|
||||
abm.group_id = guild.get("id", "")
|
||||
abm.session_id = channel.get("id", "")
|
||||
else:
|
||||
abm.type = MessageType.FRIEND_MESSAGE
|
||||
abm.session_id = channel.get("id", "")
|
||||
|
||||
abm.sender = MessageMember(
|
||||
user_id=user.get("id", ""),
|
||||
nickname=user.get("nick", user.get("name", "")),
|
||||
)
|
||||
|
||||
abm.self_id = login.get("user", {}).get("id", "")
|
||||
|
||||
content = message.get("content", "")
|
||||
abm.message = await self.parse_satori_elements(content)
|
||||
|
||||
# parse message_str
|
||||
abm.message_str = ""
|
||||
for comp in abm.message:
|
||||
if isinstance(comp, Plain):
|
||||
abm.message_str += comp.text
|
||||
|
||||
# 优先使用Satori事件中的时间戳
|
||||
if timestamp is not None:
|
||||
abm.timestamp = timestamp
|
||||
else:
|
||||
abm.timestamp = int(time.time())
|
||||
|
||||
return abm
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"转换 Satori 消息失败: {e}")
|
||||
return None
|
||||
|
||||
async def parse_satori_elements(self, content: str) -> list:
|
||||
"""解析 Satori 消息元素"""
|
||||
elements = []
|
||||
|
||||
if not content:
|
||||
return elements
|
||||
|
||||
try:
|
||||
wrapped_content = f"<root>{content}</root>"
|
||||
root = ET.fromstring(wrapped_content)
|
||||
await self._parse_xml_node(root, elements)
|
||||
except ET.ParseError as e:
|
||||
raise ValueError(f"解析 Satori 元素时发生解析错误: {e}")
|
||||
except Exception as e:
|
||||
raise e
|
||||
|
||||
# 如果没有解析到任何元素，将整个内容当作纯文本
|
||||
if not elements and content.strip():
|
||||
elements.append(Plain(text=content))
|
||||
|
||||
return elements
|
||||
|
||||
async def _parse_xml_node(self, node: ET.Element, elements: list) -> None:
|
||||
"""递归解析 XML 节点"""
|
||||
if node.text and node.text.strip():
|
||||
elements.append(Plain(text=node.text))
|
||||
|
||||
for child in node:
|
||||
tag_name = child.tag.lower()
|
||||
attrs = child.attrib
|
||||
|
||||
if tag_name == "at":
|
||||
user_id = attrs.get("id") or attrs.get("name", "")
|
||||
elements.append(At(qq=user_id, name=user_id))
|
||||
|
||||
elif tag_name in ("img", "image"):
|
||||
src = attrs.get("src", "")
|
||||
if not src:
|
||||
continue
|
||||
if src.startswith("data:image/"):
|
||||
src = src.split(",")[1]
|
||||
elements.append(Image.fromBase64(src))
|
||||
elif src.startswith("http"):
|
||||
elements.append(Image.fromURL(src))
|
||||
else:
|
||||
logger.error(f"未知的图片 src 格式: {str(src)[:16]}")
|
||||
|
||||
elif tag_name == "file":
|
||||
src = attrs.get("src", "")
|
||||
name = attrs.get("name", "文件")
|
||||
if src:
|
||||
elements.append(File(file=src, name=name))
|
||||
|
||||
elif tag_name in ("audio", "record"):
|
||||
src = attrs.get("src", "")
|
||||
if not src:
|
||||
continue
|
||||
if src.startswith("data:audio/"):
|
||||
src = src.split(",")[1]
|
||||
elements.append(Record.fromBase64(src))
|
||||
elif src.startswith("http"):
|
||||
elements.append(Record.fromURL(src))
|
||||
else:
|
||||
logger.error(f"未知的音频 src 格式: {str(src)[:16]}")
|
||||
|
||||
else:
|
||||
# 未知标签，递归处理其内容
|
||||
if child.text and child.text.strip():
|
||||
elements.append(Plain(text=child.text))
|
||||
await self._parse_xml_node(child, elements)
|
||||
|
||||
# 处理标签后的文本
|
||||
if child.tail and child.tail.strip():
|
||||
elements.append(Plain(text=child.tail))
|
||||
|
||||
async def handle_msg(self, message: AstrBotMessage):
|
||||
from .satori_event import SatoriPlatformEvent
|
||||
|
||||
message_event = SatoriPlatformEvent(
|
||||
message_str=message.message_str,
|
||||
message_obj=message,
|
||||
platform_meta=self.meta(),
|
||||
session_id=message.session_id,
|
||||
adapter=self,
|
||||
)
|
||||
self.commit_event(message_event)
|
||||
|
||||
async def send_http_request(
|
||||
self,
|
||||
method: str,
|
||||
path: str,
|
||||
data: dict | None = None,
|
||||
platform: str | None = None,
|
||||
user_id: str | None = None,
|
||||
) -> dict:
|
||||
if not self.session:
|
||||
raise Exception("HTTP session 未初始化")
|
||||
|
||||
headers = {
|
||||
"Content-Type": "application/json",
|
||||
}
|
||||
|
||||
if self.token:
|
||||
headers["Authorization"] = f"Bearer {self.token}"
|
||||
|
||||
if platform and user_id:
|
||||
headers["satori-platform"] = platform
|
||||
headers["satori-user-id"] = user_id
|
||||
elif self.logins:
|
||||
current_login = self.logins[0]
|
||||
headers["satori-platform"] = current_login.get("platform", "")
|
||||
user = current_login.get("user", {})
|
||||
headers["satori-user-id"] = user.get("id", "") if user else ""
|
||||
|
||||
if not path.startswith("/"):
|
||||
path = "/" + path
|
||||
|
||||
# 使用新的API地址配置
|
||||
url = f"{self.api_base_url.rstrip('/')}{path}"
|
||||
|
||||
try:
|
||||
async with self.session.request(
|
||||
method, url, json=data, headers=headers
|
||||
) as response:
|
||||
if response.status == 200:
|
||||
result = await response.json()
|
||||
return result
|
||||
else:
|
||||
return {}
|
||||
except Exception as e:
|
||||
logger.error(f"Satori HTTP 请求异常: {e}")
|
||||
return {}
|
||||
|
||||
async def terminate(self):
|
||||
self.running = False
|
||||
|
||||
if self.heartbeat_task:
|
||||
self.heartbeat_task.cancel()
|
||||
|
||||
if self.ws:
|
||||
try:
|
||||
await self.ws.close()
|
||||
except Exception as e:
|
||||
logger.error(f"Satori WebSocket 关闭异常: {e}")
|
||||
|
||||
if self.session:
|
||||
await self.session.close()
|
||||
@@ -0,0 +1,221 @@
|
||||
from typing import TYPE_CHECKING
|
||||
from astrbot.api import logger
|
||||
from astrbot.api.event import AstrMessageEvent, MessageChain
|
||||
from astrbot.api.platform import AstrBotMessage, PlatformMetadata
|
||||
from astrbot.api.message_components import Plain, Image, At, File, Record
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from .satori_adapter import SatoriPlatformAdapter
|
||||
|
||||
|
||||
class SatoriPlatformEvent(AstrMessageEvent):
|
||||
def __init__(
|
||||
self,
|
||||
message_str: str,
|
||||
message_obj: AstrBotMessage,
|
||||
platform_meta: PlatformMetadata,
|
||||
session_id: str,
|
||||
adapter: "SatoriPlatformAdapter",
|
||||
):
|
||||
super().__init__(message_str, message_obj, platform_meta, session_id)
|
||||
self.adapter = adapter
|
||||
self.platform = None
|
||||
self.user_id = None
|
||||
if (
|
||||
hasattr(message_obj, "raw_message")
|
||||
and message_obj.raw_message
|
||||
and isinstance(message_obj.raw_message, dict)
|
||||
):
|
||||
login = message_obj.raw_message.get("login", {})
|
||||
self.platform = login.get("platform")
|
||||
user = login.get("user", {})
|
||||
self.user_id = user.get("id") if user else None
|
||||
|
||||
@classmethod
|
||||
async def send_with_adapter(
|
||||
cls, adapter: "SatoriPlatformAdapter", message: MessageChain, session_id: str
|
||||
):
|
||||
try:
|
||||
content_parts = []
|
||||
|
||||
for component in message.chain:
|
||||
if isinstance(component, Plain):
|
||||
text = (
|
||||
component.text.replace("&", "&")
|
||||
.replace("<", "<")
|
||||
.replace(">", ">")
|
||||
)
|
||||
content_parts.append(text)
|
||||
|
||||
elif isinstance(component, At):
|
||||
if component.qq:
|
||||
content_parts.append(f'<at id="{component.qq}"/>')
|
||||
elif component.name:
|
||||
content_parts.append(f'<at name="{component.name}"/>')
|
||||
|
||||
elif isinstance(component, Image):
|
||||
try:
|
||||
image_base64 = await component.convert_to_base64()
|
||||
if image_base64:
|
||||
content_parts.append(
|
||||
f'<img src="data:image/jpeg;base64,{image_base64}"/>'
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(f"图片转换为base64失败: {e}")
|
||||
|
||||
elif isinstance(component, File):
|
||||
content_parts.append(
|
||||
f'<file src="{component.file}" name="{component.name or "文件"}"/>'
|
||||
)
|
||||
|
||||
elif isinstance(component, Record):
|
||||
try:
|
||||
record_base64 = await component.convert_to_base64()
|
||||
if record_base64:
|
||||
content_parts.append(
|
||||
f'<audio src="data:audio/wav;base64,{record_base64}"/>'
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(f"语音转换为base64失败: {e}")
|
||||
|
||||
content = "".join(content_parts)
|
||||
channel_id = session_id
|
||||
data = {"channel_id": channel_id, "content": content}
|
||||
|
||||
platform = None
|
||||
user_id = None
|
||||
|
||||
if hasattr(adapter, "logins") and adapter.logins:
|
||||
current_login = adapter.logins[0]
|
||||
platform = current_login.get("platform", "")
|
||||
user = current_login.get("user", {})
|
||||
user_id = user.get("id", "") if user else ""
|
||||
|
||||
result = await adapter.send_http_request(
|
||||
"POST", "/message.create", data, platform, user_id
|
||||
)
|
||||
if result:
|
||||
return result
|
||||
else:
|
||||
return None
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Satori 消息发送异常: {e}")
|
||||
return None
|
||||
|
||||
async def send(self, message: MessageChain):
|
||||
platform = getattr(self, "platform", None)
|
||||
user_id = getattr(self, "user_id", None)
|
||||
|
||||
if not platform or not user_id:
|
||||
if hasattr(self.adapter, "logins") and self.adapter.logins:
|
||||
current_login = self.adapter.logins[0]
|
||||
platform = current_login.get("platform", "")
|
||||
user = current_login.get("user", {})
|
||||
user_id = user.get("id", "") if user else ""
|
||||
|
||||
try:
|
||||
content_parts = []
|
||||
|
||||
for component in message.chain:
|
||||
if isinstance(component, Plain):
|
||||
text = (
|
||||
component.text.replace("&", "&")
|
||||
.replace("<", "<")
|
||||
.replace(">", ">")
|
||||
)
|
||||
content_parts.append(text)
|
||||
|
||||
elif isinstance(component, At):
|
||||
if component.qq:
|
||||
content_parts.append(f'<at id="{component.qq}"/>')
|
||||
elif component.name:
|
||||
content_parts.append(f'<at name="{component.name}"/>')
|
||||
|
||||
elif isinstance(component, Image):
|
||||
try:
|
||||
image_base64 = await component.convert_to_base64()
|
||||
if image_base64:
|
||||
content_parts.append(
|
||||
f'<img src="data:image/jpeg;base64,{image_base64}"/>'
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(f"图片转换为base64失败: {e}")
|
||||
|
||||
elif isinstance(component, File):
|
||||
content_parts.append(
|
||||
f'<file src="{component.file}" name="{component.name or "文件"}"/>'
|
||||
)
|
||||
|
||||
elif isinstance(component, Record):
|
||||
try:
|
||||
record_base64 = await component.convert_to_base64()
|
||||
if record_base64:
|
||||
content_parts.append(
|
||||
f'<audio src="data:audio/wav;base64,{record_base64}"/>'
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(f"语音转换为base64失败: {e}")
|
||||
|
||||
content = "".join(content_parts)
|
||||
channel_id = self.session_id
|
||||
data = {"channel_id": channel_id, "content": content}
|
||||
|
||||
result = await self.adapter.send_http_request(
|
||||
"POST", "/message.create", data, platform, user_id
|
||||
)
|
||||
if not result:
|
||||
logger.error("Satori 消息发送失败")
|
||||
except Exception as e:
|
||||
logger.error(f"Satori 消息发送异常: {e}")
|
||||
|
||||
await super().send(message)
|
||||
|
||||
async def send_streaming(self, generator, use_fallback: bool = False):
|
||||
try:
|
||||
content_parts = []
|
||||
|
||||
async for chain in generator:
|
||||
if isinstance(chain, MessageChain):
|
||||
if chain.type == "break":
|
||||
if content_parts:
|
||||
content = "".join(content_parts)
|
||||
temp_chain = MessageChain([Plain(text=content)])
|
||||
await self.send(temp_chain)
|
||||
content_parts = []
|
||||
continue
|
||||
|
||||
for component in chain.chain:
|
||||
if isinstance(component, Plain):
|
||||
content_parts.append(component.text)
|
||||
elif isinstance(component, Image):
|
||||
if content_parts:
|
||||
content = "".join(content_parts)
|
||||
temp_chain = MessageChain([Plain(text=content)])
|
||||
await self.send(temp_chain)
|
||||
content_parts = []
|
||||
try:
|
||||
image_base64 = await component.convert_to_base64()
|
||||
if image_base64:
|
||||
img_chain = MessageChain(
|
||||
[
|
||||
Plain(
|
||||
text=f'<img src="data:image/jpeg;base64,{image_base64}"/>'
|
||||
)
|
||||
]
|
||||
)
|
||||
await self.send(img_chain)
|
||||
except Exception as e:
|
||||
logger.error(f"图片转换为base64失败: {e}")
|
||||
else:
|
||||
content_parts.append(str(component))
|
||||
|
||||
if content_parts:
|
||||
content = "".join(content_parts)
|
||||
temp_chain = MessageChain([Plain(text=content)])
|
||||
await self.send(temp_chain)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Satori 流式消息发送异常: {e}")
|
||||
|
||||
return await super().send_streaming(generator, use_fallback)
|
||||
@@ -18,6 +18,7 @@ class PlatformAdapterType(enum.Flag):
|
||||
KOOK = enum.auto()
|
||||
VOCECHAT = enum.auto()
|
||||
WEIXIN_OFFICIAL_ACCOUNT = enum.auto()
|
||||
SATORI = enum.auto()
|
||||
ALL = (
|
||||
AIOCQHTTP
|
||||
| QQOFFICIAL
|
||||
@@ -31,6 +32,7 @@ class PlatformAdapterType(enum.Flag):
|
||||
| KOOK
|
||||
| VOCECHAT
|
||||
| WEIXIN_OFFICIAL_ACCOUNT
|
||||
| SATORI
|
||||
)
|
||||
|
||||
|
||||
@@ -47,6 +49,7 @@ ADAPTER_NAME_2_TYPE = {
|
||||
"wechatpadpro": PlatformAdapterType.WECHATPADPRO,
|
||||
"vocechat": PlatformAdapterType.VOCECHAT,
|
||||
"weixin_official_account": PlatformAdapterType.WEIXIN_OFFICIAL_ACCOUNT,
|
||||
"satori": PlatformAdapterType.SATORI,
|
||||
}
|
||||
|
||||
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 21 KiB |
@@ -279,6 +279,8 @@ export default {
|
||||
return new URL('@/assets/images/platform_logos/kook.png', import.meta.url).href
|
||||
} else if (name === 'vocechat') {
|
||||
return new URL('@/assets/images/platform_logos/vocechat.png', import.meta.url).href
|
||||
} else if (name === 'satori' || name === 'Satori') {
|
||||
return new URL('@/assets/images/platform_logos/satori.png', import.meta.url).href
|
||||
}
|
||||
},
|
||||
|
||||
@@ -297,6 +299,7 @@ export default {
|
||||
"slack": "https://astrbot.app/deploy/platform/slack.html",
|
||||
"kook": "https://astrbot.app/deploy/platform/kook.html",
|
||||
"vocechat": "https://astrbot.app/deploy/platform/vocechat.html",
|
||||
// "satori": "https://astrbot.app/deploy/platform/satori.html", // TODO
|
||||
}
|
||||
return tutorial_map[platform_type] || "https://docs.astrbot.app";
|
||||
},
|
||||
@@ -532,4 +535,4 @@ export default {
|
||||
font-weight: bold;
|
||||
opacity: 0.3;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user