mirror of
https://github.com/langbot-app/LangBot.git
synced 2026-06-02 20:14:36 +00:00
Compare commits
15 Commits
fix/plugin
...
feat/lark_
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
16ec4b4f7c | ||
|
|
87de625dc9 | ||
|
|
767ae34ed3 | ||
|
|
13ed6c8d46 | ||
|
|
2412e080b4 | ||
|
|
442c93193c | ||
|
|
2a87419fb2 | ||
|
|
9855b6d5bc | ||
|
|
403a721b94 | ||
|
|
2ef47ebfb1 | ||
|
|
81e411c558 | ||
|
|
ad64e89a86 | ||
|
|
913b9a24c4 | ||
|
|
ceb38d91b4 | ||
|
|
a0dec39905 |
@@ -23,20 +23,25 @@ xml_template = """
|
|||||||
|
|
||||||
|
|
||||||
class OAClient:
|
class OAClient:
|
||||||
def __init__(self, token: str, EncodingAESKey: str, AppID: str, Appsecret: str, logger: None):
|
def __init__(self, token: str, EncodingAESKey: str, AppID: str, Appsecret: str, logger: None, unified_mode: bool = False):
|
||||||
self.token = token
|
self.token = token
|
||||||
self.aes = EncodingAESKey
|
self.aes = EncodingAESKey
|
||||||
self.appid = AppID
|
self.appid = AppID
|
||||||
self.appsecret = Appsecret
|
self.appsecret = Appsecret
|
||||||
self.base_url = 'https://api.weixin.qq.com'
|
self.base_url = 'https://api.weixin.qq.com'
|
||||||
self.access_token = ''
|
self.access_token = ''
|
||||||
|
self.unified_mode = unified_mode
|
||||||
self.app = Quart(__name__)
|
self.app = Quart(__name__)
|
||||||
self.app.add_url_rule(
|
|
||||||
'/callback/command',
|
# 只有在非统一模式下才注册独立路由
|
||||||
'handle_callback',
|
if not self.unified_mode:
|
||||||
self.handle_callback_request,
|
self.app.add_url_rule(
|
||||||
methods=['GET', 'POST'],
|
'/callback/command',
|
||||||
)
|
'handle_callback',
|
||||||
|
self.handle_callback_request,
|
||||||
|
methods=['GET', 'POST'],
|
||||||
|
)
|
||||||
|
|
||||||
self._message_handlers = {
|
self._message_handlers = {
|
||||||
'example': [],
|
'example': [],
|
||||||
}
|
}
|
||||||
@@ -46,19 +51,39 @@ class OAClient:
|
|||||||
self.logger = logger
|
self.logger = logger
|
||||||
|
|
||||||
async def handle_callback_request(self):
|
async def handle_callback_request(self):
|
||||||
|
"""处理回调请求(独立端口模式,使用全局 request)。"""
|
||||||
|
return await self._handle_callback_internal(request)
|
||||||
|
|
||||||
|
async def handle_unified_webhook(self, req):
|
||||||
|
"""处理回调请求(统一 webhook 模式,显式传递 request)。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
req: Quart Request 对象
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
响应数据
|
||||||
|
"""
|
||||||
|
return await self._handle_callback_internal(req)
|
||||||
|
|
||||||
|
async def _handle_callback_internal(self, req):
|
||||||
|
"""处理回调请求的内部实现,包括 GET 验证和 POST 消息接收。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
req: Quart Request 对象
|
||||||
|
"""
|
||||||
try:
|
try:
|
||||||
# 每隔100毫秒查询是否生成ai回答
|
# 每隔100毫秒查询是否生成ai回答
|
||||||
start_time = time.time()
|
start_time = time.time()
|
||||||
signature = request.args.get('signature', '')
|
signature = req.args.get('signature', '')
|
||||||
timestamp = request.args.get('timestamp', '')
|
timestamp = req.args.get('timestamp', '')
|
||||||
nonce = request.args.get('nonce', '')
|
nonce = req.args.get('nonce', '')
|
||||||
echostr = request.args.get('echostr', '')
|
echostr = req.args.get('echostr', '')
|
||||||
msg_signature = request.args.get('msg_signature', '')
|
msg_signature = req.args.get('msg_signature', '')
|
||||||
if msg_signature is None:
|
if msg_signature is None:
|
||||||
await self.logger.error('msg_signature不在请求体中')
|
await self.logger.error('msg_signature不在请求体中')
|
||||||
raise Exception('msg_signature不在请求体中')
|
raise Exception('msg_signature不在请求体中')
|
||||||
|
|
||||||
if request.method == 'GET':
|
if req.method == 'GET':
|
||||||
# 校验签名
|
# 校验签名
|
||||||
check_str = ''.join(sorted([self.token, timestamp, nonce]))
|
check_str = ''.join(sorted([self.token, timestamp, nonce]))
|
||||||
check_signature = hashlib.sha1(check_str.encode('utf-8')).hexdigest()
|
check_signature = hashlib.sha1(check_str.encode('utf-8')).hexdigest()
|
||||||
@@ -68,8 +93,8 @@ class OAClient:
|
|||||||
else:
|
else:
|
||||||
await self.logger.error('拒绝请求')
|
await self.logger.error('拒绝请求')
|
||||||
raise Exception('拒绝请求')
|
raise Exception('拒绝请求')
|
||||||
elif request.method == 'POST':
|
elif req.method == 'POST':
|
||||||
encryt_msg = await request.data
|
encryt_msg = await req.data
|
||||||
wxcpt = WXBizMsgCrypt(self.token, self.aes, self.appid)
|
wxcpt = WXBizMsgCrypt(self.token, self.aes, self.appid)
|
||||||
ret, xml_msg = wxcpt.DecryptMsg(encryt_msg, msg_signature, timestamp, nonce)
|
ret, xml_msg = wxcpt.DecryptMsg(encryt_msg, msg_signature, timestamp, nonce)
|
||||||
xml_msg = xml_msg.decode('utf-8')
|
xml_msg = xml_msg.decode('utf-8')
|
||||||
@@ -182,6 +207,7 @@ class OAClientForLongerResponse:
|
|||||||
Appsecret: str,
|
Appsecret: str,
|
||||||
LoadingMessage: str,
|
LoadingMessage: str,
|
||||||
logger: None,
|
logger: None,
|
||||||
|
unified_mode: bool = False,
|
||||||
):
|
):
|
||||||
self.token = token
|
self.token = token
|
||||||
self.aes = EncodingAESKey
|
self.aes = EncodingAESKey
|
||||||
@@ -189,13 +215,18 @@ class OAClientForLongerResponse:
|
|||||||
self.appsecret = Appsecret
|
self.appsecret = Appsecret
|
||||||
self.base_url = 'https://api.weixin.qq.com'
|
self.base_url = 'https://api.weixin.qq.com'
|
||||||
self.access_token = ''
|
self.access_token = ''
|
||||||
|
self.unified_mode = unified_mode
|
||||||
self.app = Quart(__name__)
|
self.app = Quart(__name__)
|
||||||
self.app.add_url_rule(
|
|
||||||
'/callback/command',
|
# 只有在非统一模式下才注册独立路由
|
||||||
'handle_callback',
|
if not self.unified_mode:
|
||||||
self.handle_callback_request,
|
self.app.add_url_rule(
|
||||||
methods=['GET', 'POST'],
|
'/callback/command',
|
||||||
)
|
'handle_callback',
|
||||||
|
self.handle_callback_request,
|
||||||
|
methods=['GET', 'POST'],
|
||||||
|
)
|
||||||
|
|
||||||
self._message_handlers = {
|
self._message_handlers = {
|
||||||
'example': [],
|
'example': [],
|
||||||
}
|
}
|
||||||
@@ -206,24 +237,44 @@ class OAClientForLongerResponse:
|
|||||||
self.logger = logger
|
self.logger = logger
|
||||||
|
|
||||||
async def handle_callback_request(self):
|
async def handle_callback_request(self):
|
||||||
|
"""处理回调请求(独立端口模式,使用全局 request)。"""
|
||||||
|
return await self._handle_callback_internal(request)
|
||||||
|
|
||||||
|
async def handle_unified_webhook(self, req):
|
||||||
|
"""处理回调请求(统一 webhook 模式,显式传递 request)。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
req: Quart Request 对象
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
响应数据
|
||||||
|
"""
|
||||||
|
return await self._handle_callback_internal(req)
|
||||||
|
|
||||||
|
async def _handle_callback_internal(self, req):
|
||||||
|
"""处理回调请求的内部实现,包括 GET 验证和 POST 消息接收。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
req: Quart Request 对象
|
||||||
|
"""
|
||||||
try:
|
try:
|
||||||
signature = request.args.get('signature', '')
|
signature = req.args.get('signature', '')
|
||||||
timestamp = request.args.get('timestamp', '')
|
timestamp = req.args.get('timestamp', '')
|
||||||
nonce = request.args.get('nonce', '')
|
nonce = req.args.get('nonce', '')
|
||||||
echostr = request.args.get('echostr', '')
|
echostr = req.args.get('echostr', '')
|
||||||
msg_signature = request.args.get('msg_signature', '')
|
msg_signature = req.args.get('msg_signature', '')
|
||||||
|
|
||||||
if msg_signature is None:
|
if msg_signature is None:
|
||||||
await self.logger.error('msg_signature不在请求体中')
|
await self.logger.error('msg_signature不在请求体中')
|
||||||
raise Exception('msg_signature不在请求体中')
|
raise Exception('msg_signature不在请求体中')
|
||||||
|
|
||||||
if request.method == 'GET':
|
if req.method == 'GET':
|
||||||
check_str = ''.join(sorted([self.token, timestamp, nonce]))
|
check_str = ''.join(sorted([self.token, timestamp, nonce]))
|
||||||
check_signature = hashlib.sha1(check_str.encode('utf-8')).hexdigest()
|
check_signature = hashlib.sha1(check_str.encode('utf-8')).hexdigest()
|
||||||
return echostr if check_signature == signature else '拒绝请求'
|
return echostr if check_signature == signature else '拒绝请求'
|
||||||
|
|
||||||
elif request.method == 'POST':
|
elif req.method == 'POST':
|
||||||
encryt_msg = await request.data
|
encryt_msg = await req.data
|
||||||
wxcpt = WXBizMsgCrypt(self.token, self.aes, self.appid)
|
wxcpt = WXBizMsgCrypt(self.token, self.aes, self.appid)
|
||||||
ret, xml_msg = wxcpt.DecryptMsg(encryt_msg, msg_signature, timestamp, nonce)
|
ret, xml_msg = wxcpt.DecryptMsg(encryt_msg, msg_signature, timestamp, nonce)
|
||||||
xml_msg = xml_msg.decode('utf-8')
|
xml_msg = xml_msg.decode('utf-8')
|
||||||
|
|||||||
@@ -10,38 +10,20 @@ import traceback
|
|||||||
from cryptography.hazmat.primitives.asymmetric import ed25519
|
from cryptography.hazmat.primitives.asymmetric import ed25519
|
||||||
|
|
||||||
|
|
||||||
def handle_validation(body: dict, bot_secret: str):
|
|
||||||
# bot正确的secert是32位的,此处仅为了适配演示demo
|
|
||||||
while len(bot_secret) < 32:
|
|
||||||
bot_secret = bot_secret * 2
|
|
||||||
bot_secret = bot_secret[:32]
|
|
||||||
# 实际使用场景中以上三行内容可清除
|
|
||||||
|
|
||||||
seed_bytes = bot_secret.encode()
|
|
||||||
|
|
||||||
signing_key = ed25519.Ed25519PrivateKey.from_private_bytes(seed_bytes)
|
|
||||||
|
|
||||||
msg = body['d']['event_ts'] + body['d']['plain_token']
|
|
||||||
msg_bytes = msg.encode()
|
|
||||||
|
|
||||||
signature = signing_key.sign(msg_bytes)
|
|
||||||
|
|
||||||
signature_hex = signature.hex()
|
|
||||||
|
|
||||||
response = {'plain_token': body['d']['plain_token'], 'signature': signature_hex}
|
|
||||||
|
|
||||||
return response
|
|
||||||
|
|
||||||
|
|
||||||
class QQOfficialClient:
|
class QQOfficialClient:
|
||||||
def __init__(self, secret: str, token: str, app_id: str, logger: None):
|
def __init__(self, secret: str, token: str, app_id: str, logger: None, unified_mode: bool = False):
|
||||||
|
self.unified_mode = unified_mode
|
||||||
self.app = Quart(__name__)
|
self.app = Quart(__name__)
|
||||||
self.app.add_url_rule(
|
|
||||||
'/callback/command',
|
# 只有在非统一模式下才注册独立路由
|
||||||
'handle_callback',
|
if not self.unified_mode:
|
||||||
self.handle_callback_request,
|
self.app.add_url_rule(
|
||||||
methods=['GET', 'POST'],
|
'/callback/command',
|
||||||
)
|
'handle_callback',
|
||||||
|
self.handle_callback_request,
|
||||||
|
methods=['GET', 'POST'],
|
||||||
|
)
|
||||||
|
|
||||||
self.secret = secret
|
self.secret = secret
|
||||||
self.token = token
|
self.token = token
|
||||||
self.app_id = app_id
|
self.app_id = app_id
|
||||||
@@ -82,18 +64,45 @@ class QQOfficialClient:
|
|||||||
raise Exception(f'获取access_token失败: {e}')
|
raise Exception(f'获取access_token失败: {e}')
|
||||||
|
|
||||||
async def handle_callback_request(self):
|
async def handle_callback_request(self):
|
||||||
"""处理回调请求"""
|
"""处理回调请求(独立端口模式,使用全局 request)"""
|
||||||
|
return await self._handle_callback_internal(request)
|
||||||
|
|
||||||
|
async def handle_unified_webhook(self, req):
|
||||||
|
"""处理回调请求(统一 webhook 模式,显式传递 request)。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
req: Quart Request 对象
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
响应数据
|
||||||
|
"""
|
||||||
|
return await self._handle_callback_internal(req)
|
||||||
|
|
||||||
|
async def _handle_callback_internal(self, req):
|
||||||
|
"""处理回调请求的内部实现。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
req: Quart Request 对象
|
||||||
|
"""
|
||||||
try:
|
try:
|
||||||
# 读取请求数据
|
|
||||||
body = await request.get_data()
|
body = await req.get_data()
|
||||||
|
|
||||||
|
print(f'[QQ Official] Received request, body length: {len(body)}')
|
||||||
|
|
||||||
|
if not body or len(body) == 0:
|
||||||
|
print('[QQ Official] Received empty body, might be health check or GET request')
|
||||||
|
return {'code': 0, 'message': 'ok'}, 200
|
||||||
|
|
||||||
payload = json.loads(body)
|
payload = json.loads(body)
|
||||||
|
|
||||||
# 验证是否为回调验证请求
|
|
||||||
if payload.get('op') == 13:
|
|
||||||
# 生成签名
|
|
||||||
response = handle_validation(payload, self.secret)
|
|
||||||
|
|
||||||
return response
|
if payload.get('op') == 13:
|
||||||
|
validation_data = payload.get('d')
|
||||||
|
if not validation_data:
|
||||||
|
return {'error': "missing 'd' field"}, 400
|
||||||
|
response = await self.verify(validation_data)
|
||||||
|
return response, 200
|
||||||
|
|
||||||
if payload.get('op') == 0:
|
if payload.get('op') == 0:
|
||||||
message_data = await self.get_message(payload)
|
message_data = await self.get_message(payload)
|
||||||
@@ -104,6 +113,7 @@ class QQOfficialClient:
|
|||||||
return {'code': 0, 'message': 'success'}
|
return {'code': 0, 'message': 'success'}
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
print(f'[QQ Official] ERROR: {traceback.format_exc()}')
|
||||||
await self.logger.error(f'Error in handle_callback_request: {traceback.format_exc()}')
|
await self.logger.error(f'Error in handle_callback_request: {traceback.format_exc()}')
|
||||||
return {'error': str(e)}, 400
|
return {'error': str(e)}, 400
|
||||||
|
|
||||||
@@ -261,3 +271,26 @@ class QQOfficialClient:
|
|||||||
if self.access_token_expiry_time is None:
|
if self.access_token_expiry_time is None:
|
||||||
return True
|
return True
|
||||||
return time.time() > self.access_token_expiry_time
|
return time.time() > self.access_token_expiry_time
|
||||||
|
|
||||||
|
async def repeat_seed(self, bot_secret: str, target_size: int = 32) -> bytes:
|
||||||
|
seed = bot_secret
|
||||||
|
while len(seed) < target_size:
|
||||||
|
seed *= 2
|
||||||
|
return seed[:target_size].encode("utf-8")
|
||||||
|
|
||||||
|
async def verify(self, validation_payload: dict):
|
||||||
|
seed = await self.repeat_seed(self.secret)
|
||||||
|
private_key = ed25519.Ed25519PrivateKey.from_private_bytes(seed)
|
||||||
|
|
||||||
|
event_ts = validation_payload.get("event_ts", "")
|
||||||
|
plain_token = validation_payload.get("plain_token", "")
|
||||||
|
msg = event_ts + plain_token
|
||||||
|
|
||||||
|
# sign
|
||||||
|
signature = private_key.sign(msg.encode()).hex()
|
||||||
|
|
||||||
|
response = {
|
||||||
|
"plain_token": plain_token,
|
||||||
|
"signature": signature,
|
||||||
|
}
|
||||||
|
return response
|
||||||
|
|||||||
@@ -8,14 +8,19 @@ import langbot_plugin.api.entities.builtin.platform.events as platform_events
|
|||||||
|
|
||||||
|
|
||||||
class SlackClient:
|
class SlackClient:
|
||||||
def __init__(self, bot_token: str, signing_secret: str, logger: None):
|
def __init__(self, bot_token: str, signing_secret: str, logger: None, unified_mode: bool = False):
|
||||||
self.bot_token = bot_token
|
self.bot_token = bot_token
|
||||||
self.signing_secret = signing_secret
|
self.signing_secret = signing_secret
|
||||||
|
self.unified_mode = unified_mode
|
||||||
self.app = Quart(__name__)
|
self.app = Quart(__name__)
|
||||||
self.client = AsyncWebClient(self.bot_token)
|
self.client = AsyncWebClient(self.bot_token)
|
||||||
self.app.add_url_rule(
|
|
||||||
'/callback/command', 'handle_callback', self.handle_callback_request, methods=['GET', 'POST']
|
# 只有在非统一模式下才注册独立路由
|
||||||
)
|
if not self.unified_mode:
|
||||||
|
self.app.add_url_rule(
|
||||||
|
'/callback/command', 'handle_callback', self.handle_callback_request, methods=['GET', 'POST']
|
||||||
|
)
|
||||||
|
|
||||||
self._message_handlers = {
|
self._message_handlers = {
|
||||||
'example': [],
|
'example': [],
|
||||||
}
|
}
|
||||||
@@ -23,8 +28,28 @@ class SlackClient:
|
|||||||
self.logger = logger
|
self.logger = logger
|
||||||
|
|
||||||
async def handle_callback_request(self):
|
async def handle_callback_request(self):
|
||||||
|
"""处理回调请求(独立端口模式,使用全局 request)"""
|
||||||
|
return await self._handle_callback_internal(request)
|
||||||
|
|
||||||
|
async def handle_unified_webhook(self, req):
|
||||||
|
"""处理回调请求(统一 webhook 模式,显式传递 request)。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
req: Quart Request 对象
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
响应数据
|
||||||
|
"""
|
||||||
|
return await self._handle_callback_internal(req)
|
||||||
|
|
||||||
|
async def _handle_callback_internal(self, req):
|
||||||
|
"""处理回调请求的内部实现。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
req: Quart Request 对象
|
||||||
|
"""
|
||||||
try:
|
try:
|
||||||
body = await request.get_data()
|
body = await req.get_data()
|
||||||
data = json.loads(body)
|
data = json.loads(body)
|
||||||
if 'type' in data:
|
if 'type' in data:
|
||||||
if data['type'] == 'url_verification':
|
if data['type'] == 'url_verification':
|
||||||
|
|||||||
@@ -200,7 +200,7 @@ class StreamSessionManager:
|
|||||||
|
|
||||||
|
|
||||||
class WecomBotClient:
|
class WecomBotClient:
|
||||||
def __init__(self, Token: str, EnCodingAESKey: str, Corpid: str, logger: EventLogger):
|
def __init__(self, Token: str, EnCodingAESKey: str, Corpid: str, logger: EventLogger, unified_mode: bool = False):
|
||||||
"""企业微信智能机器人客户端。
|
"""企业微信智能机器人客户端。
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
@@ -208,6 +208,7 @@ class WecomBotClient:
|
|||||||
EnCodingAESKey: 企业微信消息加解密密钥。
|
EnCodingAESKey: 企业微信消息加解密密钥。
|
||||||
Corpid: 企业 ID。
|
Corpid: 企业 ID。
|
||||||
logger: 日志记录器。
|
logger: 日志记录器。
|
||||||
|
unified_mode: 是否使用统一 webhook 模式(默认 False)。
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
>>> client = WecomBotClient(Token='token', EnCodingAESKey='aeskey', Corpid='corp', logger=logger)
|
>>> client = WecomBotClient(Token='token', EnCodingAESKey='aeskey', Corpid='corp', logger=logger)
|
||||||
@@ -217,10 +218,15 @@ class WecomBotClient:
|
|||||||
self.EnCodingAESKey = EnCodingAESKey
|
self.EnCodingAESKey = EnCodingAESKey
|
||||||
self.Corpid = Corpid
|
self.Corpid = Corpid
|
||||||
self.ReceiveId = ''
|
self.ReceiveId = ''
|
||||||
|
self.unified_mode = unified_mode
|
||||||
self.app = Quart(__name__)
|
self.app = Quart(__name__)
|
||||||
self.app.add_url_rule(
|
|
||||||
'/callback/command', 'handle_callback', self.handle_callback_request, methods=['POST', 'GET']
|
# 只有在非统一模式下才注册独立路由
|
||||||
)
|
if not self.unified_mode:
|
||||||
|
self.app.add_url_rule(
|
||||||
|
'/callback/command', 'handle_callback', self.handle_callback_request, methods=['POST', 'GET']
|
||||||
|
)
|
||||||
|
|
||||||
self._message_handlers = {
|
self._message_handlers = {
|
||||||
'example': [],
|
'example': [],
|
||||||
}
|
}
|
||||||
@@ -359,7 +365,7 @@ class WecomBotClient:
|
|||||||
return await self._encrypt_and_reply(payload, nonce)
|
return await self._encrypt_and_reply(payload, nonce)
|
||||||
|
|
||||||
async def handle_callback_request(self):
|
async def handle_callback_request(self):
|
||||||
"""企业微信回调入口。
|
"""企业微信回调入口(独立端口模式,使用全局 request)。
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
Quart Response: 根据请求类型返回验证、首包或刷新结果。
|
Quart Response: 根据请求类型返回验证、首包或刷新结果。
|
||||||
@@ -367,15 +373,34 @@ class WecomBotClient:
|
|||||||
Example:
|
Example:
|
||||||
作为 Quart 路由处理函数直接注册并使用。
|
作为 Quart 路由处理函数直接注册并使用。
|
||||||
"""
|
"""
|
||||||
|
return await self._handle_callback_internal(request)
|
||||||
|
|
||||||
|
async def handle_unified_webhook(self, req):
|
||||||
|
"""处理回调请求(统一 webhook 模式,显式传递 request)。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
req: Quart Request 对象
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
响应数据
|
||||||
|
"""
|
||||||
|
return await self._handle_callback_internal(req)
|
||||||
|
|
||||||
|
async def _handle_callback_internal(self, req):
|
||||||
|
"""处理回调请求的内部实现,包括 GET 验证和 POST 消息接收。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
req: Quart Request 对象
|
||||||
|
"""
|
||||||
try:
|
try:
|
||||||
self.wxcpt = WXBizMsgCrypt(self.Token, self.EnCodingAESKey, '')
|
self.wxcpt = WXBizMsgCrypt(self.Token, self.EnCodingAESKey, '')
|
||||||
await self.logger.info(f'{request.method} {request.url} {str(request.args)}')
|
await self.logger.info(f'{req.method} {req.url} {str(req.args)}')
|
||||||
|
|
||||||
if request.method == 'GET':
|
if req.method == 'GET':
|
||||||
return await self._handle_get_callback()
|
return await self._handle_get_callback(req)
|
||||||
|
|
||||||
if request.method == 'POST':
|
if req.method == 'POST':
|
||||||
return await self._handle_post_callback()
|
return await self._handle_post_callback(req)
|
||||||
|
|
||||||
return Response('', status=405)
|
return Response('', status=405)
|
||||||
|
|
||||||
@@ -383,13 +408,13 @@ class WecomBotClient:
|
|||||||
await self.logger.error(traceback.format_exc())
|
await self.logger.error(traceback.format_exc())
|
||||||
return Response('Internal Server Error', status=500)
|
return Response('Internal Server Error', status=500)
|
||||||
|
|
||||||
async def _handle_get_callback(self) -> tuple[Response, int] | Response:
|
async def _handle_get_callback(self, req) -> tuple[Response, int] | Response:
|
||||||
"""处理企业微信的 GET 验证请求。"""
|
"""处理企业微信的 GET 验证请求。"""
|
||||||
|
|
||||||
msg_signature = unquote(request.args.get('msg_signature', ''))
|
msg_signature = unquote(req.args.get('msg_signature', ''))
|
||||||
timestamp = unquote(request.args.get('timestamp', ''))
|
timestamp = unquote(req.args.get('timestamp', ''))
|
||||||
nonce = unquote(request.args.get('nonce', ''))
|
nonce = unquote(req.args.get('nonce', ''))
|
||||||
echostr = unquote(request.args.get('echostr', ''))
|
echostr = unquote(req.args.get('echostr', ''))
|
||||||
|
|
||||||
if not all([msg_signature, timestamp, nonce, echostr]):
|
if not all([msg_signature, timestamp, nonce, echostr]):
|
||||||
await self.logger.error('请求参数缺失')
|
await self.logger.error('请求参数缺失')
|
||||||
@@ -402,16 +427,16 @@ class WecomBotClient:
|
|||||||
|
|
||||||
return Response(decrypted_str, mimetype='text/plain')
|
return Response(decrypted_str, mimetype='text/plain')
|
||||||
|
|
||||||
async def _handle_post_callback(self) -> tuple[Response, int] | Response:
|
async def _handle_post_callback(self, req) -> tuple[Response, int] | Response:
|
||||||
"""处理企业微信的 POST 回调请求。"""
|
"""处理企业微信的 POST 回调请求。"""
|
||||||
|
|
||||||
self.stream_sessions.cleanup()
|
self.stream_sessions.cleanup()
|
||||||
|
|
||||||
msg_signature = unquote(request.args.get('msg_signature', ''))
|
msg_signature = unquote(req.args.get('msg_signature', ''))
|
||||||
timestamp = unquote(request.args.get('timestamp', ''))
|
timestamp = unquote(req.args.get('timestamp', ''))
|
||||||
nonce = unquote(request.args.get('nonce', ''))
|
nonce = unquote(req.args.get('nonce', ''))
|
||||||
|
|
||||||
encrypted_json = await request.get_json()
|
encrypted_json = await req.get_json()
|
||||||
encrypted_msg = (encrypted_json or {}).get('encrypt', '')
|
encrypted_msg = (encrypted_json or {}).get('encrypt', '')
|
||||||
if not encrypted_msg:
|
if not encrypted_msg:
|
||||||
await self.logger.error("请求体中缺少 'encrypt' 字段")
|
await self.logger.error("请求体中缺少 'encrypt' 字段")
|
||||||
|
|||||||
@@ -29,12 +29,7 @@ class WecomBotEvent(dict):
|
|||||||
"""
|
"""
|
||||||
用户名称
|
用户名称
|
||||||
"""
|
"""
|
||||||
return (
|
return self.get('username', '') or self.get('from', {}).get('alias', '') or self.get('from', {}).get('name', '') or self.userid
|
||||||
self.get('username', '')
|
|
||||||
or self.get('from', {}).get('alias', '')
|
|
||||||
or self.get('from', {}).get('name', '')
|
|
||||||
or self.userid
|
|
||||||
)
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def chatname(self) -> str:
|
def chatname(self) -> str:
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ class WecomClient:
|
|||||||
EncodingAESKey: str,
|
EncodingAESKey: str,
|
||||||
contacts_secret: str,
|
contacts_secret: str,
|
||||||
logger: None,
|
logger: None,
|
||||||
|
unified_mode: bool = False,
|
||||||
):
|
):
|
||||||
self.corpid = corpid
|
self.corpid = corpid
|
||||||
self.secret = secret
|
self.secret = secret
|
||||||
@@ -31,13 +32,18 @@ class WecomClient:
|
|||||||
self.access_token = ''
|
self.access_token = ''
|
||||||
self.secret_for_contacts = contacts_secret
|
self.secret_for_contacts = contacts_secret
|
||||||
self.logger = logger
|
self.logger = logger
|
||||||
|
self.unified_mode = unified_mode
|
||||||
self.app = Quart(__name__)
|
self.app = Quart(__name__)
|
||||||
self.app.add_url_rule(
|
|
||||||
'/callback/command',
|
# 只有在非统一模式下才注册独立路由
|
||||||
'handle_callback',
|
if not self.unified_mode:
|
||||||
self.handle_callback_request,
|
self.app.add_url_rule(
|
||||||
methods=['GET', 'POST'],
|
'/callback/command',
|
||||||
)
|
'handle_callback',
|
||||||
|
self.handle_callback_request,
|
||||||
|
methods=['GET', 'POST'],
|
||||||
|
)
|
||||||
|
|
||||||
self._message_handlers = {
|
self._message_handlers = {
|
||||||
'example': [],
|
'example': [],
|
||||||
}
|
}
|
||||||
@@ -161,25 +167,43 @@ class WecomClient:
|
|||||||
raise Exception('Failed to send message: ' + str(data))
|
raise Exception('Failed to send message: ' + str(data))
|
||||||
|
|
||||||
async def handle_callback_request(self):
|
async def handle_callback_request(self):
|
||||||
|
"""处理回调请求(独立端口模式,使用全局 request)。"""
|
||||||
|
return await self._handle_callback_internal(request)
|
||||||
|
|
||||||
|
async def handle_unified_webhook(self, req):
|
||||||
|
"""处理回调请求(统一 webhook 模式,显式传递 request)。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
req: Quart Request 对象
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
响应数据
|
||||||
"""
|
"""
|
||||||
处理回调请求,包括 GET 验证和 POST 消息接收。
|
return await self._handle_callback_internal(req)
|
||||||
|
|
||||||
|
async def _handle_callback_internal(self, req):
|
||||||
|
"""
|
||||||
|
处理回调请求的内部实现,包括 GET 验证和 POST 消息接收。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
req: Quart Request 对象
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
msg_signature = request.args.get('msg_signature')
|
msg_signature = req.args.get('msg_signature')
|
||||||
timestamp = request.args.get('timestamp')
|
timestamp = req.args.get('timestamp')
|
||||||
nonce = request.args.get('nonce')
|
nonce = req.args.get('nonce')
|
||||||
|
|
||||||
wxcpt = WXBizMsgCrypt(self.token, self.aes, self.corpid)
|
wxcpt = WXBizMsgCrypt(self.token, self.aes, self.corpid)
|
||||||
if request.method == 'GET':
|
if req.method == 'GET':
|
||||||
echostr = request.args.get('echostr')
|
echostr = req.args.get('echostr')
|
||||||
ret, reply_echo_str = wxcpt.VerifyURL(msg_signature, timestamp, nonce, echostr)
|
ret, reply_echo_str = wxcpt.VerifyURL(msg_signature, timestamp, nonce, echostr)
|
||||||
if ret != 0:
|
if ret != 0:
|
||||||
await self.logger.error('验证失败')
|
await self.logger.error('验证失败')
|
||||||
raise Exception(f'验证失败,错误码: {ret}')
|
raise Exception(f'验证失败,错误码: {ret}')
|
||||||
return reply_echo_str
|
return reply_echo_str
|
||||||
|
|
||||||
elif request.method == 'POST':
|
elif req.method == 'POST':
|
||||||
encrypt_msg = await request.data
|
encrypt_msg = await req.data
|
||||||
ret, xml_msg = wxcpt.DecryptMsg(encrypt_msg, msg_signature, timestamp, nonce)
|
ret, xml_msg = wxcpt.DecryptMsg(encrypt_msg, msg_signature, timestamp, nonce)
|
||||||
if ret != 0:
|
if ret != 0:
|
||||||
await self.logger.error('消息解密失败')
|
await self.logger.error('消息解密失败')
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import aiofiles
|
|||||||
|
|
||||||
|
|
||||||
class WecomCSClient:
|
class WecomCSClient:
|
||||||
def __init__(self, corpid: str, secret: str, token: str, EncodingAESKey: str, logger: None):
|
def __init__(self, corpid: str, secret: str, token: str, EncodingAESKey: str, logger: None, unified_mode: bool = False):
|
||||||
self.corpid = corpid
|
self.corpid = corpid
|
||||||
self.secret = secret
|
self.secret = secret
|
||||||
self.access_token_for_contacts = ''
|
self.access_token_for_contacts = ''
|
||||||
@@ -22,10 +22,15 @@ class WecomCSClient:
|
|||||||
self.base_url = 'https://qyapi.weixin.qq.com/cgi-bin'
|
self.base_url = 'https://qyapi.weixin.qq.com/cgi-bin'
|
||||||
self.access_token = ''
|
self.access_token = ''
|
||||||
self.logger = logger
|
self.logger = logger
|
||||||
|
self.unified_mode = unified_mode
|
||||||
self.app = Quart(__name__)
|
self.app = Quart(__name__)
|
||||||
self.app.add_url_rule(
|
|
||||||
'/callback/command', 'handle_callback', self.handle_callback_request, methods=['GET', 'POST']
|
# 只有在非统一模式下才注册独立路由
|
||||||
)
|
if not self.unified_mode:
|
||||||
|
self.app.add_url_rule(
|
||||||
|
'/callback/command', 'handle_callback', self.handle_callback_request, methods=['GET', 'POST']
|
||||||
|
)
|
||||||
|
|
||||||
self._message_handlers = {
|
self._message_handlers = {
|
||||||
'example': [],
|
'example': [],
|
||||||
}
|
}
|
||||||
@@ -192,27 +197,45 @@ class WecomCSClient:
|
|||||||
return data
|
return data
|
||||||
|
|
||||||
async def handle_callback_request(self):
|
async def handle_callback_request(self):
|
||||||
|
"""处理回调请求(独立端口模式,使用全局 request)。"""
|
||||||
|
return await self._handle_callback_internal(request)
|
||||||
|
|
||||||
|
async def handle_unified_webhook(self, req):
|
||||||
|
"""处理回调请求(统一 webhook 模式,显式传递 request)。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
req: Quart Request 对象
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
响应数据
|
||||||
"""
|
"""
|
||||||
处理回调请求,包括 GET 验证和 POST 消息接收。
|
return await self._handle_callback_internal(req)
|
||||||
|
|
||||||
|
async def _handle_callback_internal(self, req):
|
||||||
|
"""
|
||||||
|
处理回调请求的内部实现,包括 GET 验证和 POST 消息接收。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
req: Quart Request 对象
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
msg_signature = request.args.get('msg_signature')
|
msg_signature = req.args.get('msg_signature')
|
||||||
timestamp = request.args.get('timestamp')
|
timestamp = req.args.get('timestamp')
|
||||||
nonce = request.args.get('nonce')
|
nonce = req.args.get('nonce')
|
||||||
try:
|
try:
|
||||||
wxcpt = WXBizMsgCrypt(self.token, self.aes, self.corpid)
|
wxcpt = WXBizMsgCrypt(self.token, self.aes, self.corpid)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
raise Exception(f'初始化失败,错误码: {e}')
|
raise Exception(f'初始化失败,错误码: {e}')
|
||||||
|
|
||||||
if request.method == 'GET':
|
if req.method == 'GET':
|
||||||
echostr = request.args.get('echostr')
|
echostr = req.args.get('echostr')
|
||||||
ret, reply_echo_str = wxcpt.VerifyURL(msg_signature, timestamp, nonce, echostr)
|
ret, reply_echo_str = wxcpt.VerifyURL(msg_signature, timestamp, nonce, echostr)
|
||||||
if ret != 0:
|
if ret != 0:
|
||||||
raise Exception(f'验证失败,错误码: {ret}')
|
raise Exception(f'验证失败,错误码: {ret}')
|
||||||
return reply_echo_str
|
return reply_echo_str
|
||||||
|
|
||||||
elif request.method == 'POST':
|
elif req.method == 'POST':
|
||||||
encrypt_msg = await request.data
|
encrypt_msg = await req.data
|
||||||
ret, xml_msg = wxcpt.DecryptMsg(encrypt_msg, msg_signature, timestamp, nonce)
|
ret, xml_msg = wxcpt.DecryptMsg(encrypt_msg, msg_signature, timestamp, nonce)
|
||||||
if ret != 0:
|
if ret != 0:
|
||||||
raise Exception(f'消息解密失败,错误码: {ret}')
|
raise Exception(f'消息解密失败,错误码: {ret}')
|
||||||
|
|||||||
@@ -18,7 +18,8 @@ class BotsRouterGroup(group.RouterGroup):
|
|||||||
@self.route('/<bot_uuid>', methods=['GET', 'PUT', 'DELETE'], auth_type=group.AuthType.USER_TOKEN_OR_API_KEY)
|
@self.route('/<bot_uuid>', methods=['GET', 'PUT', 'DELETE'], auth_type=group.AuthType.USER_TOKEN_OR_API_KEY)
|
||||||
async def _(bot_uuid: str) -> str:
|
async def _(bot_uuid: str) -> str:
|
||||||
if quart.request.method == 'GET':
|
if quart.request.method == 'GET':
|
||||||
bot = await self.ap.bot_service.get_bot(bot_uuid)
|
# 返回运行时信息,包括webhook地址等
|
||||||
|
bot = await self.ap.bot_service.get_runtime_bot_info(bot_uuid)
|
||||||
if bot is None:
|
if bot is None:
|
||||||
return self.http_status(404, -1, 'bot not found')
|
return self.http_status(404, -1, 'bot not found')
|
||||||
return self.success(data={'bot': bot})
|
return self.success(data={'bot': bot})
|
||||||
|
|||||||
@@ -1,49 +1,57 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
import quart
|
import quart
|
||||||
|
import traceback
|
||||||
|
|
||||||
from .. import group
|
from .. import group
|
||||||
|
|
||||||
|
|
||||||
@group.group_class('webhooks', '/api/v1/webhooks')
|
@group.group_class('webhooks', '/bots')
|
||||||
class WebhooksRouterGroup(group.RouterGroup):
|
class WebhookRouterGroup(group.RouterGroup):
|
||||||
async def initialize(self) -> None:
|
async def initialize(self) -> None:
|
||||||
@self.route('', methods=['GET', 'POST'])
|
@self.route('/<bot_uuid>', methods=['GET', 'POST'], auth_type=group.AuthType.NONE)
|
||||||
async def _() -> str:
|
async def handle_webhook(bot_uuid: str):
|
||||||
if quart.request.method == 'GET':
|
"""处理 bot webhook 回调(无子路径)"""
|
||||||
webhooks = await self.ap.webhook_service.get_webhooks()
|
return await self._dispatch_webhook(bot_uuid, '')
|
||||||
return self.success(data={'webhooks': webhooks})
|
|
||||||
elif quart.request.method == 'POST':
|
|
||||||
json_data = await quart.request.json
|
|
||||||
name = json_data.get('name', '')
|
|
||||||
url = json_data.get('url', '')
|
|
||||||
description = json_data.get('description', '')
|
|
||||||
enabled = json_data.get('enabled', True)
|
|
||||||
|
|
||||||
if not name:
|
@self.route('/<bot_uuid>/<path:path>', methods=['GET', 'POST'], auth_type=group.AuthType.NONE)
|
||||||
return self.http_status(400, -1, 'Name is required')
|
async def handle_webhook_with_path(bot_uuid: str, path: str):
|
||||||
if not url:
|
"""处理 bot webhook 回调(带子路径)"""
|
||||||
return self.http_status(400, -1, 'URL is required')
|
return await self._dispatch_webhook(bot_uuid, path)
|
||||||
|
|
||||||
webhook = await self.ap.webhook_service.create_webhook(name, url, description, enabled)
|
async def _dispatch_webhook(self, bot_uuid: str, path: str):
|
||||||
return self.success(data={'webhook': webhook})
|
"""分发 webhook 请求到对应的 bot adapter
|
||||||
|
|
||||||
@self.route('/<int:webhook_id>', methods=['GET', 'PUT', 'DELETE'])
|
Args:
|
||||||
async def _(webhook_id: int) -> str:
|
bot_uuid: Bot 的 UUID
|
||||||
if quart.request.method == 'GET':
|
path: 子路径(如果有的话)
|
||||||
webhook = await self.ap.webhook_service.get_webhook(webhook_id)
|
|
||||||
if webhook is None:
|
|
||||||
return self.http_status(404, -1, 'Webhook not found')
|
|
||||||
return self.success(data={'webhook': webhook})
|
|
||||||
|
|
||||||
elif quart.request.method == 'PUT':
|
Returns:
|
||||||
json_data = await quart.request.json
|
适配器返回的响应
|
||||||
name = json_data.get('name')
|
"""
|
||||||
url = json_data.get('url')
|
try:
|
||||||
description = json_data.get('description')
|
|
||||||
enabled = json_data.get('enabled')
|
|
||||||
|
|
||||||
await self.ap.webhook_service.update_webhook(webhook_id, name, url, description, enabled)
|
runtime_bot = await self.ap.platform_mgr.get_bot_by_uuid(bot_uuid)
|
||||||
return self.success()
|
|
||||||
|
|
||||||
elif quart.request.method == 'DELETE':
|
if not runtime_bot:
|
||||||
await self.ap.webhook_service.delete_webhook(webhook_id)
|
return quart.jsonify({'error': 'Bot not found'}), 404
|
||||||
return self.success()
|
|
||||||
|
if not runtime_bot.enable:
|
||||||
|
return quart.jsonify({'error': 'Bot is disabled'}), 403
|
||||||
|
|
||||||
|
|
||||||
|
if not hasattr(runtime_bot.adapter, 'handle_unified_webhook'):
|
||||||
|
return quart.jsonify({'error': 'Adapter does not support unified webhook'}), 501
|
||||||
|
|
||||||
|
|
||||||
|
response = await runtime_bot.adapter.handle_unified_webhook(
|
||||||
|
bot_uuid=bot_uuid,
|
||||||
|
path=path,
|
||||||
|
request=quart.request,
|
||||||
|
)
|
||||||
|
|
||||||
|
return response
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
self.ap.logger.error(f'Webhook dispatch error for bot {bot_uuid}: {traceback.format_exc()}')
|
||||||
|
return quart.jsonify({'error': str(e)}), 500
|
||||||
|
|||||||
@@ -58,6 +58,16 @@ class BotService:
|
|||||||
if runtime_bot is not None:
|
if runtime_bot is not None:
|
||||||
adapter_runtime_values['bot_account_id'] = runtime_bot.adapter.bot_account_id
|
adapter_runtime_values['bot_account_id'] = runtime_bot.adapter.bot_account_id
|
||||||
|
|
||||||
|
# Webhook URL for unified webhook adapters (independent of bot running state)
|
||||||
|
if persistence_bot['adapter'] in ['wecom', 'wecombot', 'officialaccount', 'qqofficial', 'slack', 'wecomcs', 'LINE', "lark"]:
|
||||||
|
webhook_prefix = self.ap.instance_config.data['api'].get('webhook_prefix', 'http://127.0.0.1:5300')
|
||||||
|
webhook_url = f'/bots/{bot_uuid}'
|
||||||
|
adapter_runtime_values['webhook_url'] = webhook_url
|
||||||
|
adapter_runtime_values['webhook_full_url'] = f'{webhook_prefix}{webhook_url}'
|
||||||
|
else:
|
||||||
|
adapter_runtime_values['webhook_url'] = None
|
||||||
|
adapter_runtime_values['webhook_full_url'] = None
|
||||||
|
|
||||||
persistence_bot['adapter_runtime_values'] = adapter_runtime_values
|
persistence_bot['adapter_runtime_values'] = adapter_runtime_values
|
||||||
|
|
||||||
return persistence_bot
|
return persistence_bot
|
||||||
|
|||||||
@@ -247,6 +247,10 @@ class PlatformManager:
|
|||||||
logger,
|
logger,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# 如果 adapter 支持 set_bot_uuid 方法,设置 bot_uuid(用于统一 webhook)
|
||||||
|
if hasattr(adapter_inst, 'set_bot_uuid'):
|
||||||
|
adapter_inst.set_bot_uuid(bot_entity.uuid)
|
||||||
|
|
||||||
runtime_bot = RuntimeBot(ap=self.ap, bot_entity=bot_entity, adapter=adapter_inst, logger=logger)
|
runtime_bot = RuntimeBot(ap=self.ap, bot_entity=bot_entity, adapter=adapter_inst, logger=logger)
|
||||||
|
|
||||||
await runtime_bot.initialize()
|
await runtime_bot.initialize()
|
||||||
|
|||||||
@@ -342,6 +342,8 @@ class LarkAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
|
|
||||||
quart_app: quart.Quart = pydantic.Field(exclude=True)
|
quart_app: quart.Quart = pydantic.Field(exclude=True)
|
||||||
|
|
||||||
|
bot_uuid: str = None
|
||||||
|
|
||||||
card_id_dict: dict[str, str] # 消息id到卡片id的映射,便于创建卡片后的发送消息到指定卡片
|
card_id_dict: dict[str, str] # 消息id到卡片id的映射,便于创建卡片后的发送消息到指定卡片
|
||||||
|
|
||||||
seq: int # 用于在发送卡片消息中识别消息顺序,直接以seq作为标识
|
seq: int # 用于在发送卡片消息中识别消息顺序,直接以seq作为标识
|
||||||
@@ -349,46 +351,6 @@ class LarkAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
def __init__(self, config: dict, logger: abstract_platform_logger.AbstractEventLogger, **kwargs):
|
def __init__(self, config: dict, logger: abstract_platform_logger.AbstractEventLogger, **kwargs):
|
||||||
quart_app = quart.Quart(__name__)
|
quart_app = quart.Quart(__name__)
|
||||||
|
|
||||||
@quart_app.route('/lark/callback', methods=['POST'])
|
|
||||||
async def lark_callback():
|
|
||||||
try:
|
|
||||||
data = await quart.request.json
|
|
||||||
|
|
||||||
if 'encrypt' in data:
|
|
||||||
cipher = AESCipher(config['encrypt-key'])
|
|
||||||
data = cipher.decrypt_string(data['encrypt'])
|
|
||||||
data = json.loads(data)
|
|
||||||
|
|
||||||
type = data.get('type')
|
|
||||||
if type is None:
|
|
||||||
context = EventContext(data)
|
|
||||||
type = context.header.event_type
|
|
||||||
|
|
||||||
if 'url_verification' == type:
|
|
||||||
# todo 验证verification token
|
|
||||||
return {'challenge': data.get('challenge')}
|
|
||||||
context = EventContext(data)
|
|
||||||
type = context.header.event_type
|
|
||||||
p2v1 = P2ImMessageReceiveV1()
|
|
||||||
p2v1.header = context.header
|
|
||||||
event = P2ImMessageReceiveV1Data()
|
|
||||||
event.message = EventMessage(context.event['message'])
|
|
||||||
event.sender = EventSender(context.event['sender'])
|
|
||||||
p2v1.event = event
|
|
||||||
p2v1.schema = context.schema
|
|
||||||
if 'im.message.receive_v1' == type:
|
|
||||||
try:
|
|
||||||
event = await self.event_converter.target2yiri(p2v1, self.api_client)
|
|
||||||
except Exception:
|
|
||||||
await self.logger.error(f'Error in lark callback: {traceback.format_exc()}')
|
|
||||||
|
|
||||||
if event.__class__ in self.listeners:
|
|
||||||
await self.listeners[event.__class__](event, self)
|
|
||||||
|
|
||||||
return {'code': 200, 'message': 'ok'}
|
|
||||||
except Exception:
|
|
||||||
await self.logger.error(f'Error in lark callback: {traceback.format_exc()}')
|
|
||||||
return {'code': 500, 'message': 'error'}
|
|
||||||
|
|
||||||
async def on_message(event: lark_oapi.im.v1.P2ImMessageReceiveV1):
|
async def on_message(event: lark_oapi.im.v1.P2ImMessageReceiveV1):
|
||||||
lb_event = await self.event_converter.target2yiri(event, self.api_client)
|
lb_event = await self.event_converter.target2yiri(event, self.api_client)
|
||||||
@@ -774,8 +736,65 @@ class LarkAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
):
|
):
|
||||||
self.listeners.pop(event_type)
|
self.listeners.pop(event_type)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
def set_bot_uuid(self, bot_uuid: str):
|
||||||
|
"""设置 bot UUID(用于生成 webhook URL)"""
|
||||||
|
self.bot_uuid = bot_uuid
|
||||||
|
|
||||||
|
async def handle_unified_webhook(self, bot_uuid: str, path: str, request):
|
||||||
|
"""处理统一 webhook 请求。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
bot_uuid: Bot 的 UUID
|
||||||
|
path: 子路径(如果有的话)
|
||||||
|
request: Quart Request 对象
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
响应数据
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
data = await quart.request.json
|
||||||
|
|
||||||
|
if 'encrypt' in data:
|
||||||
|
cipher = AESCipher(config['encrypt-key'])
|
||||||
|
data = cipher.decrypt_string(data['encrypt'])
|
||||||
|
data = json.loads(data)
|
||||||
|
|
||||||
|
type = data.get('type')
|
||||||
|
if type is None:
|
||||||
|
context = EventContext(data)
|
||||||
|
type = context.header.event_type
|
||||||
|
|
||||||
|
if 'url_verification' == type:
|
||||||
|
# todo 验证verification token
|
||||||
|
return {'challenge': data.get('challenge')}
|
||||||
|
context = EventContext(data)
|
||||||
|
type = context.header.event_type
|
||||||
|
p2v1 = P2ImMessageReceiveV1()
|
||||||
|
p2v1.header = context.header
|
||||||
|
event = P2ImMessageReceiveV1Data()
|
||||||
|
event.message = EventMessage(context.event['message'])
|
||||||
|
event.sender = EventSender(context.event['sender'])
|
||||||
|
p2v1.event = event
|
||||||
|
p2v1.schema = context.schema
|
||||||
|
if 'im.message.receive_v1' == type:
|
||||||
|
try:
|
||||||
|
event = await self.event_converter.target2yiri(p2v1, self.api_client)
|
||||||
|
except Exception:
|
||||||
|
await self.logger.error(f'Error in lark callback: {traceback.format_exc()}')
|
||||||
|
|
||||||
|
if event.__class__ in self.listeners:
|
||||||
|
await self.listeners[event.__class__](event, self)
|
||||||
|
|
||||||
|
return {'code': 200, 'message': 'ok'}
|
||||||
|
except Exception:
|
||||||
|
await self.logger.error(f'Error in lark callback: {traceback.format_exc()}')
|
||||||
|
return {'code': 500, 'message': 'error'}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
async def run_async(self):
|
async def run_async(self):
|
||||||
port = self.config['port']
|
|
||||||
enable_webhook = self.config['enable-webhook']
|
enable_webhook = self.config['enable-webhook']
|
||||||
|
|
||||||
if not enable_webhook:
|
if not enable_webhook:
|
||||||
@@ -791,16 +810,28 @@ class LarkAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
raise e
|
raise e
|
||||||
else:
|
else:
|
||||||
|
|
||||||
async def shutdown_trigger_placeholder():
|
# 统一 webhook 模式下,不启动独立的 Quart 应用
|
||||||
while True:
|
# 保持运行但不启动独立端口
|
||||||
await asyncio.sleep(1)
|
|
||||||
|
|
||||||
await self.quart_app.run_task(
|
# 打印 webhook 回调地址
|
||||||
host='0.0.0.0',
|
if self.bot_uuid and hasattr(self.logger, 'ap'):
|
||||||
port=port,
|
try:
|
||||||
shutdown_trigger=shutdown_trigger_placeholder,
|
api_port = self.logger.ap.instance_config.data['api']['port']
|
||||||
)
|
webhook_url = f'http://127.0.0.1:{api_port}/bots/{self.bot_uuid}'
|
||||||
|
webhook_url_public = f'http://<Your-Public-IP>:{api_port}/bots/{self.bot_uuid}'
|
||||||
|
|
||||||
|
await self.logger.info('Lark 机器人 Webhook 回调地址:')
|
||||||
|
await self.logger.info(f' 本地地址: {webhook_url}')
|
||||||
|
await self.logger.info(f' 公网地址: {webhook_url_public}')
|
||||||
|
await self.logger.info('请在 Lark 机器人后台配置此回调地址')
|
||||||
|
except Exception as e:
|
||||||
|
await self.logger.warning(f'无法生成 webhook URL: {e}')
|
||||||
|
|
||||||
|
async def keep_alive():
|
||||||
|
while True:
|
||||||
|
await asyncio.sleep(1)
|
||||||
|
|
||||||
|
await keep_alive()
|
||||||
async def kill(self) -> bool:
|
async def kill(self) -> bool:
|
||||||
# 需要断开连接,不然旧的连接会继续运行,导致飞书消息来时会随机选择一个连接
|
# 需要断开连接,不然旧的连接会继续运行,导致飞书消息来时会随机选择一个连接
|
||||||
# 断开时lark.ws.Client的_receive_message_loop会打印error日志: receive message loop exit。然后进行重连,
|
# 断开时lark.ws.Client的_receive_message_loop会打印error日志: receive message loop exit。然后进行重连,
|
||||||
|
|||||||
@@ -11,6 +11,16 @@ metadata:
|
|||||||
icon: lark.svg
|
icon: lark.svg
|
||||||
spec:
|
spec:
|
||||||
config:
|
config:
|
||||||
|
- name: enable-webhook
|
||||||
|
label:
|
||||||
|
en_US: Enable Webhook Mode
|
||||||
|
zh_Hans: 启用Webhook模式
|
||||||
|
description:
|
||||||
|
en_US: If enabled, the bot will use webhook mode to receive messages. Otherwise, it will use WS long connection mode
|
||||||
|
zh_Hans: 如果启用,机器人将使用 Webhook 模式接收消息。否则,将使用 WS 长连接模式
|
||||||
|
type: boolean
|
||||||
|
required: true
|
||||||
|
default: false
|
||||||
- name: app_id
|
- name: app_id
|
||||||
label:
|
label:
|
||||||
en_US: App ID
|
en_US: App ID
|
||||||
@@ -35,26 +45,6 @@ spec:
|
|||||||
type: string
|
type: string
|
||||||
required: true
|
required: true
|
||||||
default: ""
|
default: ""
|
||||||
- name: enable-webhook
|
|
||||||
label:
|
|
||||||
en_US: Enable Webhook Mode
|
|
||||||
zh_Hans: 启用Webhook模式
|
|
||||||
description:
|
|
||||||
en_US: If enabled, the bot will use webhook mode to receive messages. Otherwise, it will use WS long connection mode
|
|
||||||
zh_Hans: 如果启用,机器人将使用 Webhook 模式接收消息。否则,将使用 WS 长连接模式
|
|
||||||
type: boolean
|
|
||||||
required: true
|
|
||||||
default: false
|
|
||||||
- name: port
|
|
||||||
label:
|
|
||||||
en_US: Webhook Port
|
|
||||||
zh_Hans: Webhook端口
|
|
||||||
description:
|
|
||||||
en_US: Only valid when webhook mode is enabled, please fill in the webhook port
|
|
||||||
zh_Hans: 仅在启用 Webhook 模式时有效,请填写 Webhook 端口
|
|
||||||
type: integer
|
|
||||||
required: true
|
|
||||||
default: 2285
|
|
||||||
- name: encrypt-key
|
- name: encrypt-key
|
||||||
label:
|
label:
|
||||||
en_US: Encrypt Key
|
en_US: Encrypt Key
|
||||||
|
|||||||
@@ -122,6 +122,7 @@ class LINEEventConverter(abstract_platform_adapter.AbstractEventConverter):
|
|||||||
class LINEAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
class LINEAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
||||||
bot: MessagingApi
|
bot: MessagingApi
|
||||||
api_client: ApiClient
|
api_client: ApiClient
|
||||||
|
parser: WebhookParser
|
||||||
|
|
||||||
bot_account_id: str # 用于在流水线中识别at是否是本bot,直接以bot_name作为标识
|
bot_account_id: str # 用于在流水线中识别at是否是本bot,直接以bot_name作为标识
|
||||||
message_converter: LINEMessageConverter
|
message_converter: LINEMessageConverter
|
||||||
@@ -133,7 +134,7 @@ class LINEAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
]
|
]
|
||||||
|
|
||||||
config: dict
|
config: dict
|
||||||
quart_app: quart.Quart
|
bot_uuid: str = None
|
||||||
|
|
||||||
card_id_dict: dict[str, str] # 消息id到卡片id的映射,便于创建卡片后的发送消息到指定卡片
|
card_id_dict: dict[str, str] # 消息id到卡片id的映射,便于创建卡片后的发送消息到指定卡片
|
||||||
|
|
||||||
@@ -150,7 +151,6 @@ class LINEAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
super().__init__(
|
super().__init__(
|
||||||
config=config,
|
config=config,
|
||||||
logger=logger,
|
logger=logger,
|
||||||
quart_app=quart.Quart(__name__),
|
|
||||||
listeners={},
|
listeners={},
|
||||||
card_id_dict={},
|
card_id_dict={},
|
||||||
seq=1,
|
seq=1,
|
||||||
@@ -164,29 +164,6 @@ class LINEAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
bot_account_id=bot_account_id,
|
bot_account_id=bot_account_id,
|
||||||
)
|
)
|
||||||
|
|
||||||
@self.quart_app.route('/line/callback', methods=['POST'])
|
|
||||||
async def line_callback():
|
|
||||||
try:
|
|
||||||
signature = quart.request.headers.get('X-Line-Signature')
|
|
||||||
body = await quart.request.get_data(as_text=True)
|
|
||||||
events = parser.parse(body, signature) # 解密解析消息
|
|
||||||
|
|
||||||
try:
|
|
||||||
# print(events)
|
|
||||||
lb_event = await self.event_converter.target2yiri(events[0], self.api_client)
|
|
||||||
if lb_event.__class__ in self.listeners:
|
|
||||||
await self.listeners[lb_event.__class__](lb_event, self)
|
|
||||||
except InvalidSignatureError:
|
|
||||||
self.logger.info(
|
|
||||||
f'Invalid signature. Please check your channel access token/channel secret.{traceback.format_exc()}'
|
|
||||||
)
|
|
||||||
return quart.Response('Invalid signature', status=400)
|
|
||||||
|
|
||||||
return {'code': 200, 'message': 'ok'}
|
|
||||||
except Exception:
|
|
||||||
await self.logger.error(f'Error in LINE callback: {traceback.format_exc()}')
|
|
||||||
return {'code': 500, 'message': 'error'}
|
|
||||||
|
|
||||||
async def send_message(self, target_type: str, target_id: str, message: platform_message.MessageChain):
|
async def send_message(self, target_type: str, target_id: str, message: platform_message.MessageChain):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -235,18 +212,73 @@ class LINEAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
):
|
):
|
||||||
self.listeners.pop(event_type)
|
self.listeners.pop(event_type)
|
||||||
|
|
||||||
async def run_async(self):
|
def set_bot_uuid(self, bot_uuid: str):
|
||||||
port = self.config['port']
|
"""设置 bot UUID(用于生成 webhook URL)"""
|
||||||
|
self.bot_uuid = bot_uuid
|
||||||
|
|
||||||
async def shutdown_trigger_placeholder():
|
async def handle_unified_webhook(self, bot_uuid: str, path: str, request):
|
||||||
|
"""处理统一 webhook 请求。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
bot_uuid: Bot 的 UUID
|
||||||
|
path: 子路径(如果有的话)
|
||||||
|
request: Quart Request 对象
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
响应数据
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
signature = request.headers.get('X-Line-Signature')
|
||||||
|
body = await request.get_data(as_text=True)
|
||||||
|
|
||||||
|
# Check if signature header exists
|
||||||
|
if not signature:
|
||||||
|
await self.logger.warning('Missing X-Line-Signature header')
|
||||||
|
return quart.Response('Missing X-Line-Signature header', status=400)
|
||||||
|
|
||||||
|
try:
|
||||||
|
events = self.parser.parse(body, signature) # 解密解析消息
|
||||||
|
except InvalidSignatureError:
|
||||||
|
await self.logger.info(
|
||||||
|
f'Invalid signature. Please check your channel access token/channel secret.{traceback.format_exc()}'
|
||||||
|
)
|
||||||
|
return quart.Response('Invalid signature', status=400)
|
||||||
|
|
||||||
|
# 处理事件
|
||||||
|
if events and len(events) > 0:
|
||||||
|
lb_event = await self.event_converter.target2yiri(events[0], self.api_client)
|
||||||
|
if lb_event.__class__ in self.listeners:
|
||||||
|
await self.listeners[lb_event.__class__](lb_event, self)
|
||||||
|
|
||||||
|
return {'code': 200, 'message': 'ok'}
|
||||||
|
except Exception:
|
||||||
|
await self.logger.error(f'Error in LINE callback: {traceback.format_exc()}')
|
||||||
|
print(traceback.format_exc())
|
||||||
|
return {'code': 500, 'message': 'error'}
|
||||||
|
|
||||||
|
async def run_async(self):
|
||||||
|
# 统一 webhook 模式下,不启动独立的 Quart 应用
|
||||||
|
# 保持运行但不启动独立端口
|
||||||
|
|
||||||
|
# 打印 webhook 回调地址
|
||||||
|
if self.bot_uuid and hasattr(self.logger, 'ap'):
|
||||||
|
try:
|
||||||
|
api_port = self.logger.ap.instance_config.data['api']['port']
|
||||||
|
webhook_url = f'http://127.0.0.1:{api_port}/bots/{self.bot_uuid}'
|
||||||
|
webhook_url_public = f'http://<Your-Public-IP>:{api_port}/bots/{self.bot_uuid}'
|
||||||
|
|
||||||
|
await self.logger.info('LINE Webhook 回调地址:')
|
||||||
|
await self.logger.info(f' 本地地址: {webhook_url}')
|
||||||
|
await self.logger.info(f' 公网地址: {webhook_url_public}')
|
||||||
|
await self.logger.info('请在 LINE 后台配置此回调地址')
|
||||||
|
except Exception as e:
|
||||||
|
await self.logger.warning(f'无法生成 webhook URL: {e}')
|
||||||
|
|
||||||
|
async def keep_alive():
|
||||||
while True:
|
while True:
|
||||||
await asyncio.sleep(1)
|
await asyncio.sleep(1)
|
||||||
|
|
||||||
await self.quart_app.run_task(
|
await keep_alive()
|
||||||
host='0.0.0.0',
|
|
||||||
port=port,
|
|
||||||
shutdown_trigger=shutdown_trigger_placeholder,
|
|
||||||
)
|
|
||||||
|
|
||||||
async def kill(self) -> bool:
|
async def kill(self) -> bool:
|
||||||
pass
|
pass
|
||||||
|
|||||||
@@ -22,18 +22,6 @@ spec:
|
|||||||
type: string
|
type: string
|
||||||
required: true
|
required: true
|
||||||
default: ""
|
default: ""
|
||||||
- name: port
|
|
||||||
label:
|
|
||||||
en_US: Webhook Port
|
|
||||||
zh_Hans: Webhook端口
|
|
||||||
description:
|
|
||||||
en_US: Only valid when webhook mode is enabled, please fill in the webhook port
|
|
||||||
zh_Hans: 请填写 Webhook 端口
|
|
||||||
ja_JP: Webhookポートを入力してください
|
|
||||||
zh_Hant: 請填寫 Webhook 端口
|
|
||||||
type: integer
|
|
||||||
required: true
|
|
||||||
default: 2287
|
|
||||||
- name: channel_secret
|
- name: channel_secret
|
||||||
label:
|
label:
|
||||||
en_US: Channel secret
|
en_US: Channel secret
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ from langbot.libs.official_account_api.api import OAClientForLongerResponse
|
|||||||
import langbot_plugin.api.entities.builtin.platform.entities as platform_entities
|
import langbot_plugin.api.entities.builtin.platform.entities as platform_entities
|
||||||
import langbot_plugin.api.entities.builtin.platform.message as platform_message
|
import langbot_plugin.api.entities.builtin.platform.message as platform_message
|
||||||
import langbot_plugin.api.entities.builtin.platform.events as platform_events
|
import langbot_plugin.api.entities.builtin.platform.events as platform_events
|
||||||
from langbot.pkg.platform.logger import EventLogger
|
from ..logger import EventLogger
|
||||||
|
|
||||||
|
|
||||||
class OAMessageConverter(abstract_platform_adapter.AbstractMessageConverter):
|
class OAMessageConverter(abstract_platform_adapter.AbstractMessageConverter):
|
||||||
@@ -58,13 +58,16 @@ class OfficialAccountAdapter(abstract_platform_adapter.AbstractMessagePlatformAd
|
|||||||
message_converter: OAMessageConverter = OAMessageConverter()
|
message_converter: OAMessageConverter = OAMessageConverter()
|
||||||
event_converter: OAEventConverter = OAEventConverter()
|
event_converter: OAEventConverter = OAEventConverter()
|
||||||
bot: typing.Union[OAClient, OAClientForLongerResponse] = pydantic.Field(exclude=True)
|
bot: typing.Union[OAClient, OAClientForLongerResponse] = pydantic.Field(exclude=True)
|
||||||
|
bot_uuid: str = None
|
||||||
|
|
||||||
def __init__(self, config: dict, logger: EventLogger):
|
def __init__(self, config: dict, logger: EventLogger):
|
||||||
|
# 校验必填项
|
||||||
required_keys = ['token', 'EncodingAESKey', 'AppSecret', 'AppID', 'Mode']
|
required_keys = ['token', 'EncodingAESKey', 'AppSecret', 'AppID', 'Mode']
|
||||||
missing_keys = [k for k in required_keys if k not in config]
|
missing_keys = [k for k in required_keys if k not in config]
|
||||||
if missing_keys:
|
if missing_keys:
|
||||||
raise Exception(f'OfficialAccount 缺少配置项: {missing_keys}')
|
raise Exception(f'OfficialAccount 缺少配置项: {missing_keys}')
|
||||||
|
|
||||||
|
# 创建运行时 bot 对象,始终使用统一 webhook 模式
|
||||||
if config['Mode'] == 'drop':
|
if config['Mode'] == 'drop':
|
||||||
bot = OAClient(
|
bot = OAClient(
|
||||||
token=config['token'],
|
token=config['token'],
|
||||||
@@ -72,6 +75,7 @@ class OfficialAccountAdapter(abstract_platform_adapter.AbstractMessagePlatformAd
|
|||||||
Appsecret=config['AppSecret'],
|
Appsecret=config['AppSecret'],
|
||||||
AppID=config['AppID'],
|
AppID=config['AppID'],
|
||||||
logger=logger,
|
logger=logger,
|
||||||
|
unified_mode=True,
|
||||||
)
|
)
|
||||||
elif config['Mode'] == 'passive':
|
elif config['Mode'] == 'passive':
|
||||||
bot = OAClientForLongerResponse(
|
bot = OAClientForLongerResponse(
|
||||||
@@ -81,6 +85,7 @@ class OfficialAccountAdapter(abstract_platform_adapter.AbstractMessagePlatformAd
|
|||||||
AppID=config['AppID'],
|
AppID=config['AppID'],
|
||||||
LoadingMessage=config.get('LoadingMessage', ''),
|
LoadingMessage=config.get('LoadingMessage', ''),
|
||||||
logger=logger,
|
logger=logger,
|
||||||
|
unified_mode=True,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
raise KeyError('请设置微信公众号通信模式')
|
raise KeyError('请设置微信公众号通信模式')
|
||||||
@@ -129,16 +134,46 @@ class OfficialAccountAdapter(abstract_platform_adapter.AbstractMessagePlatformAd
|
|||||||
elif event_type == platform_events.GroupMessage:
|
elif event_type == platform_events.GroupMessage:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
def set_bot_uuid(self, bot_uuid: str):
|
||||||
|
"""设置 bot UUID(用于生成 webhook URL)"""
|
||||||
|
self.bot_uuid = bot_uuid
|
||||||
|
|
||||||
|
async def handle_unified_webhook(self, bot_uuid: str, path: str, request):
|
||||||
|
"""处理统一 webhook 请求。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
bot_uuid: Bot 的 UUID
|
||||||
|
path: 子路径(如果有的话)
|
||||||
|
request: Quart Request 对象
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
响应数据
|
||||||
|
"""
|
||||||
|
return await self.bot.handle_unified_webhook(request)
|
||||||
|
|
||||||
async def run_async(self):
|
async def run_async(self):
|
||||||
async def shutdown_trigger_placeholder():
|
# 统一 webhook 模式下,不启动独立的 Quart 应用
|
||||||
|
# 保持运行但不启动独立端口
|
||||||
|
|
||||||
|
# 打印 webhook 回调地址
|
||||||
|
if self.bot_uuid and hasattr(self.logger, 'ap'):
|
||||||
|
try:
|
||||||
|
api_port = self.logger.ap.instance_config.data['api']['port']
|
||||||
|
webhook_url = f'http://127.0.0.1:{api_port}/bots/{self.bot_uuid}'
|
||||||
|
webhook_url_public = f'http://<Your-Public-IP>:{api_port}/bots/{self.bot_uuid}'
|
||||||
|
|
||||||
|
await self.logger.info('微信公众号 Webhook 回调地址:')
|
||||||
|
await self.logger.info(f' 本地地址: {webhook_url}')
|
||||||
|
await self.logger.info(f' 公网地址: {webhook_url_public}')
|
||||||
|
await self.logger.info('请在微信公众号后台配置此回调地址')
|
||||||
|
except Exception as e:
|
||||||
|
await self.logger.warning(f'无法生成 webhook URL: {e}')
|
||||||
|
|
||||||
|
async def keep_alive():
|
||||||
while True:
|
while True:
|
||||||
await asyncio.sleep(1)
|
await asyncio.sleep(1)
|
||||||
|
|
||||||
await self.bot.run_task(
|
await keep_alive()
|
||||||
host=self.config['host'],
|
|
||||||
port=self.config['port'],
|
|
||||||
shutdown_trigger=shutdown_trigger_placeholder,
|
|
||||||
)
|
|
||||||
|
|
||||||
async def kill(self) -> bool:
|
async def kill(self) -> bool:
|
||||||
return False
|
return False
|
||||||
|
|||||||
@@ -53,23 +53,6 @@ spec:
|
|||||||
type: string
|
type: string
|
||||||
required: true
|
required: true
|
||||||
default: "AI正在思考中,请发送任意内容获取回复。"
|
default: "AI正在思考中,请发送任意内容获取回复。"
|
||||||
- name: host
|
|
||||||
label:
|
|
||||||
en_US: Host
|
|
||||||
zh_Hans: 监听主机
|
|
||||||
description:
|
|
||||||
en_US: The host that Official Account listens on for Webhook connections.
|
|
||||||
zh_Hans: 微信公众号监听的主机,除非你知道自己在做什么,否则请写 0.0.0.0
|
|
||||||
type: string
|
|
||||||
required: true
|
|
||||||
default: 0.0.0.0
|
|
||||||
- name: port
|
|
||||||
label:
|
|
||||||
en_US: Port
|
|
||||||
zh_Hans: 监听端口
|
|
||||||
type: integer
|
|
||||||
required: true
|
|
||||||
default: 2287
|
|
||||||
execution:
|
execution:
|
||||||
python:
|
python:
|
||||||
path: ./officialaccount.py
|
path: ./officialaccount.py
|
||||||
|
|||||||
@@ -11,8 +11,8 @@ import langbot_plugin.api.entities.builtin.platform.events as platform_events
|
|||||||
import langbot_plugin.api.entities.builtin.platform.entities as platform_entities
|
import langbot_plugin.api.entities.builtin.platform.entities as platform_entities
|
||||||
from langbot.libs.qq_official_api.api import QQOfficialClient
|
from langbot.libs.qq_official_api.api import QQOfficialClient
|
||||||
from langbot.libs.qq_official_api.qqofficialevent import QQOfficialEvent
|
from langbot.libs.qq_official_api.qqofficialevent import QQOfficialEvent
|
||||||
from langbot.pkg.utils import image
|
from ...utils import image
|
||||||
from langbot.pkg.platform.logger import EventLogger
|
from ..logger import EventLogger
|
||||||
|
|
||||||
|
|
||||||
class QQOfficialMessageConverter(abstract_platform_adapter.AbstractMessageConverter):
|
class QQOfficialMessageConverter(abstract_platform_adapter.AbstractMessageConverter):
|
||||||
@@ -134,11 +134,14 @@ class QQOfficialAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter
|
|||||||
bot: QQOfficialClient
|
bot: QQOfficialClient
|
||||||
config: dict
|
config: dict
|
||||||
bot_account_id: str
|
bot_account_id: str
|
||||||
|
bot_uuid: str = None
|
||||||
message_converter: QQOfficialMessageConverter = QQOfficialMessageConverter()
|
message_converter: QQOfficialMessageConverter = QQOfficialMessageConverter()
|
||||||
event_converter: QQOfficialEventConverter = QQOfficialEventConverter()
|
event_converter: QQOfficialEventConverter = QQOfficialEventConverter()
|
||||||
|
|
||||||
def __init__(self, config: dict, logger: EventLogger):
|
def __init__(self, config: dict, logger: EventLogger):
|
||||||
bot = QQOfficialClient(app_id=config['appid'], secret=config['secret'], token=config['token'], logger=logger)
|
bot = QQOfficialClient(
|
||||||
|
app_id=config['appid'], secret=config['secret'], token=config['token'], logger=logger, unified_mode=True
|
||||||
|
)
|
||||||
|
|
||||||
super().__init__(
|
super().__init__(
|
||||||
config=config,
|
config=config,
|
||||||
@@ -223,16 +226,46 @@ class QQOfficialAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter
|
|||||||
self.bot.on_message('GROUP_AT_MESSAGE_CREATE')(on_message)
|
self.bot.on_message('GROUP_AT_MESSAGE_CREATE')(on_message)
|
||||||
self.bot.on_message('AT_MESSAGE_CREATE')(on_message)
|
self.bot.on_message('AT_MESSAGE_CREATE')(on_message)
|
||||||
|
|
||||||
|
def set_bot_uuid(self, bot_uuid: str):
|
||||||
|
"""设置 bot UUID(用于生成 webhook URL)"""
|
||||||
|
self.bot_uuid = bot_uuid
|
||||||
|
|
||||||
|
async def handle_unified_webhook(self, bot_uuid: str, path: str, request):
|
||||||
|
"""处理统一 webhook 请求。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
bot_uuid: Bot 的 UUID
|
||||||
|
path: 子路径(如果有的话)
|
||||||
|
request: Quart Request 对象
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
响应数据
|
||||||
|
"""
|
||||||
|
return await self.bot.handle_unified_webhook(request)
|
||||||
|
|
||||||
async def run_async(self):
|
async def run_async(self):
|
||||||
async def shutdown_trigger_placeholder():
|
# 统一 webhook 模式下,不启动独立的 Quart 应用
|
||||||
|
# 保持运行但不启动独立端口
|
||||||
|
|
||||||
|
# 打印 webhook 回调地址
|
||||||
|
if self.bot_uuid and hasattr(self.logger, 'ap'):
|
||||||
|
try:
|
||||||
|
api_port = self.logger.ap.instance_config.data['api']['port']
|
||||||
|
webhook_url = f'http://127.0.0.1:{api_port}/bots/{self.bot_uuid}'
|
||||||
|
webhook_url_public = f'http://<Your-Public-IP>:{api_port}/bots/{self.bot_uuid}'
|
||||||
|
|
||||||
|
await self.logger.info('QQ 官方机器人 Webhook 回调地址:')
|
||||||
|
await self.logger.info(f' 本地地址: {webhook_url}')
|
||||||
|
await self.logger.info(f' 公网地址: {webhook_url_public}')
|
||||||
|
await self.logger.info('请在 QQ 官方机器人后台配置此回调地址')
|
||||||
|
except Exception as e:
|
||||||
|
await self.logger.warning(f'无法生成 webhook URL: {e}')
|
||||||
|
|
||||||
|
async def keep_alive():
|
||||||
while True:
|
while True:
|
||||||
await asyncio.sleep(1)
|
await asyncio.sleep(1)
|
||||||
|
|
||||||
await self.bot.run_task(
|
await keep_alive()
|
||||||
host='0.0.0.0',
|
|
||||||
port=self.config['port'],
|
|
||||||
shutdown_trigger=shutdown_trigger_placeholder,
|
|
||||||
)
|
|
||||||
|
|
||||||
async def kill(self) -> bool:
|
async def kill(self) -> bool:
|
||||||
return False
|
return False
|
||||||
|
|||||||
@@ -25,13 +25,6 @@ spec:
|
|||||||
type: string
|
type: string
|
||||||
required: true
|
required: true
|
||||||
default: ""
|
default: ""
|
||||||
- name: port
|
|
||||||
label:
|
|
||||||
en_US: Port
|
|
||||||
zh_Hans: 监听端口
|
|
||||||
type: integer
|
|
||||||
required: true
|
|
||||||
default: 2284
|
|
||||||
- name: token
|
- name: token
|
||||||
label:
|
label:
|
||||||
en_US: Token
|
en_US: Token
|
||||||
|
|||||||
@@ -86,13 +86,12 @@ class SlackEventConverter(abstract_platform_adapter.AbstractEventConverter):
|
|||||||
class SlackAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
class SlackAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
||||||
bot: SlackClient
|
bot: SlackClient
|
||||||
bot_account_id: str
|
bot_account_id: str
|
||||||
|
bot_uuid: str = None
|
||||||
message_converter: SlackMessageConverter = SlackMessageConverter()
|
message_converter: SlackMessageConverter = SlackMessageConverter()
|
||||||
event_converter: SlackEventConverter = SlackEventConverter()
|
event_converter: SlackEventConverter = SlackEventConverter()
|
||||||
config: dict
|
config: dict
|
||||||
|
|
||||||
def __init__(self, config: dict, logger: EventLogger):
|
def __init__(self, config: dict, logger: EventLogger):
|
||||||
self.config = config
|
|
||||||
self.logger = logger
|
|
||||||
required_keys = [
|
required_keys = [
|
||||||
'bot_token',
|
'bot_token',
|
||||||
'signing_secret',
|
'signing_secret',
|
||||||
@@ -101,8 +100,18 @@ class SlackAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
if missing_keys:
|
if missing_keys:
|
||||||
raise command_errors.ParamNotEnoughError('Slack机器人缺少相关配置项,请查看文档或联系管理员')
|
raise command_errors.ParamNotEnoughError('Slack机器人缺少相关配置项,请查看文档或联系管理员')
|
||||||
|
|
||||||
self.bot = SlackClient(
|
bot = SlackClient(
|
||||||
bot_token=self.config['bot_token'], signing_secret=self.config['signing_secret'], logger=self.logger
|
bot_token=config['bot_token'],
|
||||||
|
signing_secret=config['signing_secret'],
|
||||||
|
logger=logger,
|
||||||
|
unified_mode=True
|
||||||
|
)
|
||||||
|
|
||||||
|
super().__init__(
|
||||||
|
config=config,
|
||||||
|
logger=logger,
|
||||||
|
bot=bot,
|
||||||
|
bot_account_id=config['bot_token'],
|
||||||
)
|
)
|
||||||
|
|
||||||
async def reply_message(
|
async def reply_message(
|
||||||
@@ -148,16 +157,45 @@ class SlackAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
elif event_type == platform_events.GroupMessage:
|
elif event_type == platform_events.GroupMessage:
|
||||||
self.bot.on_message('channel')(on_message)
|
self.bot.on_message('channel')(on_message)
|
||||||
|
|
||||||
|
def set_bot_uuid(self, bot_uuid: str):
|
||||||
|
"""设置 bot UUID(用于生成 webhook URL)"""
|
||||||
|
self.bot_uuid = bot_uuid
|
||||||
|
|
||||||
|
async def handle_unified_webhook(self, bot_uuid: str, path: str, request):
|
||||||
|
"""处理统一 webhook 请求。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
bot_uuid: Bot 的 UUID
|
||||||
|
path: 子路径(如果有的话)
|
||||||
|
request: Quart Request 对象
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
响应数据
|
||||||
|
"""
|
||||||
|
return await self.bot.handle_unified_webhook(request)
|
||||||
|
|
||||||
async def run_async(self):
|
async def run_async(self):
|
||||||
async def shutdown_trigger_placeholder():
|
# 统一 webhook 模式下,不启动独立的 Quart 应用
|
||||||
|
# 保持运行但不启动独立端口
|
||||||
|
|
||||||
|
# 打印 webhook 回调地址
|
||||||
|
if self.bot_uuid and hasattr(self.logger, 'ap'):
|
||||||
|
try:
|
||||||
|
api_port = self.logger.ap.instance_config.data['api']['port']
|
||||||
|
webhook_url = f"http://127.0.0.1:{api_port}/bots/{self.bot_uuid}"
|
||||||
|
webhook_url_public = f"http://<Your-Public-IP>:{api_port}/bots/{self.bot_uuid}"
|
||||||
|
|
||||||
|
await self.logger.info(f"Slack 机器人 Webhook 回调地址:")
|
||||||
|
await self.logger.info(f" 本地地址: {webhook_url}")
|
||||||
|
await self.logger.info(f" 公网地址: {webhook_url_public}")
|
||||||
|
await self.logger.info(f"请在 Slack 后台配置此回调地址")
|
||||||
|
except Exception as e:
|
||||||
|
await self.logger.warning(f"无法生成 webhook URL: {e}")
|
||||||
|
|
||||||
|
async def keep_alive():
|
||||||
while True:
|
while True:
|
||||||
await asyncio.sleep(1)
|
await asyncio.sleep(1)
|
||||||
|
await keep_alive()
|
||||||
await self.bot.run_task(
|
|
||||||
host='0.0.0.0',
|
|
||||||
port=self.config['port'],
|
|
||||||
shutdown_trigger=shutdown_trigger_placeholder,
|
|
||||||
)
|
|
||||||
|
|
||||||
async def kill(self) -> bool:
|
async def kill(self) -> bool:
|
||||||
return False
|
return False
|
||||||
|
|||||||
@@ -25,13 +25,6 @@ spec:
|
|||||||
type: string
|
type: string
|
||||||
required: true
|
required: true
|
||||||
default: ""
|
default: ""
|
||||||
- name: port
|
|
||||||
label:
|
|
||||||
en_US: Port
|
|
||||||
zh_Hans: 监听端口
|
|
||||||
type: int
|
|
||||||
required: true
|
|
||||||
default: 2288
|
|
||||||
execution:
|
execution:
|
||||||
python:
|
python:
|
||||||
path: ./slack.py
|
path: ./slack.py
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ import datetime
|
|||||||
from langbot.libs.wecom_api.api import WecomClient
|
from langbot.libs.wecom_api.api import WecomClient
|
||||||
import langbot_plugin.api.definition.abstract.platform.adapter as abstract_platform_adapter
|
import langbot_plugin.api.definition.abstract.platform.adapter as abstract_platform_adapter
|
||||||
from langbot.libs.wecom_api.wecomevent import WecomEvent
|
from langbot.libs.wecom_api.wecomevent import WecomEvent
|
||||||
from langbot.pkg.utils import image
|
from ...utils import image
|
||||||
from langbot.pkg.platform.logger import EventLogger
|
from ..logger import EventLogger
|
||||||
import langbot_plugin.api.entities.builtin.platform.message as platform_message
|
import langbot_plugin.api.entities.builtin.platform.message as platform_message
|
||||||
import langbot_plugin.api.entities.builtin.platform.events as platform_events
|
import langbot_plugin.api.entities.builtin.platform.events as platform_events
|
||||||
import langbot_plugin.api.entities.builtin.platform.entities as platform_entities
|
import langbot_plugin.api.entities.builtin.platform.entities as platform_entities
|
||||||
@@ -131,6 +131,7 @@ class WecomAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
message_converter: WecomMessageConverter = WecomMessageConverter()
|
message_converter: WecomMessageConverter = WecomMessageConverter()
|
||||||
event_converter: WecomEventConverter = WecomEventConverter()
|
event_converter: WecomEventConverter = WecomEventConverter()
|
||||||
config: dict
|
config: dict
|
||||||
|
bot_uuid: str = None
|
||||||
|
|
||||||
def __init__(self, config: dict, logger: EventLogger):
|
def __init__(self, config: dict, logger: EventLogger):
|
||||||
# 校验必填项
|
# 校验必填项
|
||||||
@@ -141,11 +142,12 @@ class WecomAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
'EncodingAESKey',
|
'EncodingAESKey',
|
||||||
'contacts_secret',
|
'contacts_secret',
|
||||||
]
|
]
|
||||||
|
|
||||||
missing_keys = [key for key in required_keys if key not in config]
|
missing_keys = [key for key in required_keys if key not in config]
|
||||||
if missing_keys:
|
if missing_keys:
|
||||||
raise Exception(f'Wecom 缺少配置项: {missing_keys}')
|
raise Exception(f'Wecom 缺少配置项: {missing_keys}')
|
||||||
|
|
||||||
# 创建运行时 bot 对象
|
# 创建运行时 bot 对象,始终使用统一 webhook 模式
|
||||||
bot = WecomClient(
|
bot = WecomClient(
|
||||||
corpid=config['corpid'],
|
corpid=config['corpid'],
|
||||||
secret=config['secret'],
|
secret=config['secret'],
|
||||||
@@ -153,6 +155,7 @@ class WecomAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
EncodingAESKey=config['EncodingAESKey'],
|
EncodingAESKey=config['EncodingAESKey'],
|
||||||
contacts_secret=config['contacts_secret'],
|
contacts_secret=config['contacts_secret'],
|
||||||
logger=logger,
|
logger=logger,
|
||||||
|
unified_mode=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
super().__init__(
|
super().__init__(
|
||||||
@@ -162,6 +165,10 @@ class WecomAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
bot_account_id='',
|
bot_account_id='',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def set_bot_uuid(self, bot_uuid: str):
|
||||||
|
"""设置 bot UUID(用于生成 webhook URL)"""
|
||||||
|
self.bot_uuid = bot_uuid
|
||||||
|
|
||||||
async def reply_message(
|
async def reply_message(
|
||||||
self,
|
self,
|
||||||
message_source: platform_events.MessageEvent,
|
message_source: platform_events.MessageEvent,
|
||||||
@@ -180,9 +187,6 @@ class WecomAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
await self.bot.send_image(fixed_user_id, Wecom_event.agent_id, content['media_id'])
|
await self.bot.send_image(fixed_user_id, Wecom_event.agent_id, content['media_id'])
|
||||||
|
|
||||||
async def send_message(self, target_type: str, target_id: str, message: platform_message.MessageChain):
|
async def send_message(self, target_type: str, target_id: str, message: platform_message.MessageChain):
|
||||||
"""企业微信目前只有发送给个人的方法,
|
|
||||||
构造target_id的方式为前半部分为账户id,后半部分为agent_id,中间使用“|”符号隔开。
|
|
||||||
"""
|
|
||||||
content_list = await WecomMessageConverter.yiri2target(message, self.bot)
|
content_list = await WecomMessageConverter.yiri2target(message, self.bot)
|
||||||
parts = target_id.split('|')
|
parts = target_id.split('|')
|
||||||
user_id = parts[0]
|
user_id = parts[0]
|
||||||
@@ -214,16 +218,38 @@ class WecomAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
elif event_type == platform_events.GroupMessage:
|
elif event_type == platform_events.GroupMessage:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
async def handle_unified_webhook(self, bot_uuid: str, path: str, request):
|
||||||
|
"""处理统一 webhook 请求。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
bot_uuid: Bot 的 UUID
|
||||||
|
path: 子路径(如果有的话)
|
||||||
|
request: Quart Request 对象
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
响应数据
|
||||||
|
"""
|
||||||
|
return await self.bot.handle_unified_webhook(request)
|
||||||
|
|
||||||
async def run_async(self):
|
async def run_async(self):
|
||||||
async def shutdown_trigger_placeholder():
|
if self.bot_uuid and hasattr(self.logger, 'ap'):
|
||||||
|
try:
|
||||||
|
api_port = self.logger.ap.instance_config.data['api']['port']
|
||||||
|
webhook_url = f'http://127.0.0.1:{api_port}/bots/{self.bot_uuid}'
|
||||||
|
webhook_url_public = f'http://<Your-Public-IP>:{api_port}/bots/{self.bot_uuid}'
|
||||||
|
|
||||||
|
await self.logger.info('企业微信 Webhook 回调地址:')
|
||||||
|
await self.logger.info(f' 本地地址: {webhook_url}')
|
||||||
|
await self.logger.info(f' 公网地址: {webhook_url_public}')
|
||||||
|
await self.logger.info('请在企业微信后台配置此回调地址')
|
||||||
|
except Exception as e:
|
||||||
|
await self.logger.warning(f'无法生成 webhook URL: {e}')
|
||||||
|
|
||||||
|
async def keep_alive():
|
||||||
while True:
|
while True:
|
||||||
await asyncio.sleep(1)
|
await asyncio.sleep(1)
|
||||||
|
|
||||||
await self.bot.run_task(
|
await keep_alive()
|
||||||
host=self.config['host'],
|
|
||||||
port=self.config['port'],
|
|
||||||
shutdown_trigger=shutdown_trigger_placeholder,
|
|
||||||
)
|
|
||||||
|
|
||||||
async def kill(self) -> bool:
|
async def kill(self) -> bool:
|
||||||
return False
|
return False
|
||||||
|
|||||||
@@ -11,23 +11,6 @@ metadata:
|
|||||||
icon: wecom.png
|
icon: wecom.png
|
||||||
spec:
|
spec:
|
||||||
config:
|
config:
|
||||||
- name: host
|
|
||||||
label:
|
|
||||||
en_US: Host
|
|
||||||
zh_Hans: 监听主机
|
|
||||||
description:
|
|
||||||
en_US: Webhook host, unless you know what you're doing, please write 0.0.0.0
|
|
||||||
zh_Hans: Webhook 监听主机,除非你知道自己在做什么,否则请写 0.0.0.0
|
|
||||||
type: string
|
|
||||||
required: true
|
|
||||||
default: "0.0.0.0"
|
|
||||||
- name: port
|
|
||||||
label:
|
|
||||||
en_US: Port
|
|
||||||
zh_Hans: 监听端口
|
|
||||||
type: integer
|
|
||||||
required: true
|
|
||||||
default: 2290
|
|
||||||
- name: corpid
|
- name: corpid
|
||||||
label:
|
label:
|
||||||
en_US: Corpid
|
en_US: Corpid
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import langbot_plugin.api.definition.abstract.platform.adapter as abstract_platf
|
|||||||
import langbot_plugin.api.entities.builtin.platform.message as platform_message
|
import langbot_plugin.api.entities.builtin.platform.message as platform_message
|
||||||
import langbot_plugin.api.entities.builtin.platform.events as platform_events
|
import langbot_plugin.api.entities.builtin.platform.events as platform_events
|
||||||
import langbot_plugin.api.entities.builtin.platform.entities as platform_entities
|
import langbot_plugin.api.entities.builtin.platform.entities as platform_entities
|
||||||
from langbot.pkg.platform.logger import EventLogger
|
from ..logger import EventLogger
|
||||||
from langbot.libs.wecom_ai_bot_api.wecombotevent import WecomBotEvent
|
from langbot.libs.wecom_ai_bot_api.wecombotevent import WecomBotEvent
|
||||||
from langbot.libs.wecom_ai_bot_api.api import WecomBotClient
|
from langbot.libs.wecom_ai_bot_api.api import WecomBotClient
|
||||||
|
|
||||||
@@ -88,19 +88,20 @@ class WecomBotAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
message_converter: WecomBotMessageConverter = WecomBotMessageConverter()
|
message_converter: WecomBotMessageConverter = WecomBotMessageConverter()
|
||||||
event_converter: WecomBotEventConverter = WecomBotEventConverter()
|
event_converter: WecomBotEventConverter = WecomBotEventConverter()
|
||||||
config: dict
|
config: dict
|
||||||
|
bot_uuid: str = None
|
||||||
|
|
||||||
def __init__(self, config: dict, logger: EventLogger):
|
def __init__(self, config: dict, logger: EventLogger):
|
||||||
required_keys = ['Token', 'EncodingAESKey', 'Corpid', 'BotId', 'port']
|
required_keys = ['Token', 'EncodingAESKey', 'Corpid', 'BotId']
|
||||||
missing_keys = [key for key in required_keys if key not in config]
|
missing_keys = [key for key in required_keys if key not in config]
|
||||||
if missing_keys:
|
if missing_keys:
|
||||||
raise Exception(f'WecomBot 缺少配置项: {missing_keys}')
|
raise Exception(f'WecomBot 缺少配置项: {missing_keys}')
|
||||||
|
|
||||||
# 创建运行时 bot 对象
|
|
||||||
bot = WecomBotClient(
|
bot = WecomBotClient(
|
||||||
Token=config['Token'],
|
Token=config['Token'],
|
||||||
EnCodingAESKey=config['EncodingAESKey'],
|
EnCodingAESKey=config['EncodingAESKey'],
|
||||||
Corpid=config['Corpid'],
|
Corpid=config['Corpid'],
|
||||||
logger=logger,
|
logger=logger,
|
||||||
|
unified_mode=True,
|
||||||
)
|
)
|
||||||
bot_account_id = config['BotId']
|
bot_account_id = config['BotId']
|
||||||
|
|
||||||
@@ -189,16 +190,46 @@ class WecomBotAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
except Exception:
|
except Exception:
|
||||||
print(traceback.format_exc())
|
print(traceback.format_exc())
|
||||||
|
|
||||||
|
def set_bot_uuid(self, bot_uuid: str):
|
||||||
|
"""设置 bot UUID(用于生成 webhook URL)"""
|
||||||
|
self.bot_uuid = bot_uuid
|
||||||
|
|
||||||
|
async def handle_unified_webhook(self, bot_uuid: str, path: str, request):
|
||||||
|
"""处理统一 webhook 请求。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
bot_uuid: Bot 的 UUID
|
||||||
|
path: 子路径(如果有的话)
|
||||||
|
request: Quart Request 对象
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
响应数据
|
||||||
|
"""
|
||||||
|
return await self.bot.handle_unified_webhook(request)
|
||||||
|
|
||||||
async def run_async(self):
|
async def run_async(self):
|
||||||
async def shutdown_trigger_placeholder():
|
# 统一 webhook 模式下,不启动独立的 Quart 应用
|
||||||
|
# 保持运行但不启动独立端口
|
||||||
|
|
||||||
|
# 打印 webhook 回调地址
|
||||||
|
if self.bot_uuid and hasattr(self.logger, 'ap'):
|
||||||
|
try:
|
||||||
|
api_port = self.logger.ap.instance_config.data['api']['port']
|
||||||
|
webhook_url = f'http://127.0.0.1:{api_port}/bots/{self.bot_uuid}'
|
||||||
|
webhook_url_public = f'http://<Your-Public-IP>:{api_port}/bots/{self.bot_uuid}'
|
||||||
|
|
||||||
|
await self.logger.info('企业微信机器人 Webhook 回调地址:')
|
||||||
|
await self.logger.info(f' 本地地址: {webhook_url}')
|
||||||
|
await self.logger.info(f' 公网地址: {webhook_url_public}')
|
||||||
|
await self.logger.info('请在企业微信后台配置此回调地址')
|
||||||
|
except Exception as e:
|
||||||
|
await self.logger.warning(f'无法生成 webhook URL: {e}')
|
||||||
|
|
||||||
|
async def keep_alive():
|
||||||
while True:
|
while True:
|
||||||
await asyncio.sleep(1)
|
await asyncio.sleep(1)
|
||||||
|
|
||||||
await self.bot.run_task(
|
await keep_alive()
|
||||||
host='0.0.0.0',
|
|
||||||
port=self.config['port'],
|
|
||||||
shutdown_trigger=shutdown_trigger_placeholder,
|
|
||||||
)
|
|
||||||
|
|
||||||
async def kill(self) -> bool:
|
async def kill(self) -> bool:
|
||||||
return False
|
return False
|
||||||
|
|||||||
@@ -11,13 +11,6 @@ metadata:
|
|||||||
icon: wecombot.png
|
icon: wecombot.png
|
||||||
spec:
|
spec:
|
||||||
config:
|
config:
|
||||||
- name: port
|
|
||||||
label:
|
|
||||||
en_US: Port
|
|
||||||
zh_Hans: 监听端口
|
|
||||||
type: integer
|
|
||||||
required: true
|
|
||||||
default: 2291
|
|
||||||
- name: Corpid
|
- name: Corpid
|
||||||
label:
|
label:
|
||||||
en_US: Corpid
|
en_US: Corpid
|
||||||
|
|||||||
@@ -121,6 +121,7 @@ class WecomCSAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
bot: WecomCSClient = pydantic.Field(exclude=True)
|
bot: WecomCSClient = pydantic.Field(exclude=True)
|
||||||
message_converter: WecomMessageConverter = WecomMessageConverter()
|
message_converter: WecomMessageConverter = WecomMessageConverter()
|
||||||
event_converter: WecomEventConverter = WecomEventConverter()
|
event_converter: WecomEventConverter = WecomEventConverter()
|
||||||
|
bot_uuid: str = None
|
||||||
|
|
||||||
def __init__(self, config: dict, logger: abstract_platform_logger.AbstractEventLogger):
|
def __init__(self, config: dict, logger: abstract_platform_logger.AbstractEventLogger):
|
||||||
required_keys = [
|
required_keys = [
|
||||||
@@ -139,6 +140,7 @@ class WecomCSAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
token=config['token'],
|
token=config['token'],
|
||||||
EncodingAESKey=config['EncodingAESKey'],
|
EncodingAESKey=config['EncodingAESKey'],
|
||||||
logger=logger,
|
logger=logger,
|
||||||
|
unified_mode=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
super().__init__(
|
super().__init__(
|
||||||
@@ -170,6 +172,10 @@ class WecomCSAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
async def send_message(self, target_type: str, target_id: str, message: platform_message.MessageChain):
|
async def send_message(self, target_type: str, target_id: str, message: platform_message.MessageChain):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
def set_bot_uuid(self, bot_uuid: str):
|
||||||
|
"""设置 bot UUID(用于生成 webhook URL)"""
|
||||||
|
self.bot_uuid = bot_uuid
|
||||||
|
|
||||||
def register_listener(
|
def register_listener(
|
||||||
self,
|
self,
|
||||||
event_type: typing.Type[platform_events.Event],
|
event_type: typing.Type[platform_events.Event],
|
||||||
@@ -190,16 +196,41 @@ class WecomCSAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
elif event_type == platform_events.GroupMessage:
|
elif event_type == platform_events.GroupMessage:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
async def handle_unified_webhook(self, bot_uuid: str, path: str, request):
|
||||||
|
"""处理统一 webhook 请求。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
bot_uuid: Bot 的 UUID
|
||||||
|
path: 子路径(如果有的话)
|
||||||
|
request: Quart Request 对象
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
响应数据
|
||||||
|
"""
|
||||||
|
return await self.bot.handle_unified_webhook(request)
|
||||||
|
|
||||||
async def run_async(self):
|
async def run_async(self):
|
||||||
async def shutdown_trigger_placeholder():
|
# 统一 webhook 模式下,不启动独立的 Quart 应用
|
||||||
|
# 保持运行但不启动独立端口
|
||||||
|
|
||||||
|
# 打印 webhook 回调地址
|
||||||
|
if self.bot_uuid and hasattr(self.logger, 'ap'):
|
||||||
|
try:
|
||||||
|
api_port = self.logger.ap.instance_config.data['api']['port']
|
||||||
|
webhook_url = f"http://127.0.0.1:{api_port}/bots/{self.bot_uuid}"
|
||||||
|
webhook_url_public = f"http://<Your-Public-IP>:{api_port}/bots/{self.bot_uuid}"
|
||||||
|
|
||||||
|
await self.logger.info(f"企业微信客服 Webhook 回调地址:")
|
||||||
|
await self.logger.info(f" 本地地址: {webhook_url}")
|
||||||
|
await self.logger.info(f" 公网地址: {webhook_url_public}")
|
||||||
|
await self.logger.info(f"请在企业微信后台配置此回调地址")
|
||||||
|
except Exception as e:
|
||||||
|
await self.logger.warning(f"无法生成 webhook URL: {e}")
|
||||||
|
|
||||||
|
async def keep_alive():
|
||||||
while True:
|
while True:
|
||||||
await asyncio.sleep(1)
|
await asyncio.sleep(1)
|
||||||
|
await keep_alive()
|
||||||
await self.bot.run_task(
|
|
||||||
host='0.0.0.0',
|
|
||||||
port=self.config['port'],
|
|
||||||
shutdown_trigger=shutdown_trigger_placeholder,
|
|
||||||
)
|
|
||||||
|
|
||||||
async def kill(self) -> bool:
|
async def kill(self) -> bool:
|
||||||
return False
|
return False
|
||||||
|
|||||||
@@ -11,13 +11,6 @@ metadata:
|
|||||||
icon: wecom.png
|
icon: wecom.png
|
||||||
spec:
|
spec:
|
||||||
config:
|
config:
|
||||||
- name: port
|
|
||||||
label:
|
|
||||||
en_US: Port
|
|
||||||
zh_Hans: 监听端口
|
|
||||||
type: int
|
|
||||||
required: true
|
|
||||||
default: 2289
|
|
||||||
- name: corpid
|
- name: corpid
|
||||||
label:
|
label:
|
||||||
en_US: Corpid
|
en_US: Corpid
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
admins: []
|
admins: []
|
||||||
api:
|
api:
|
||||||
port: 5300
|
port: 5300
|
||||||
|
webhook_prefix: 'http://127.0.0.1:5300'
|
||||||
command:
|
command:
|
||||||
enable: true
|
enable: true
|
||||||
prefix:
|
prefix:
|
||||||
|
|||||||
143
tests/unit_tests/config/test_webhook_display_prefix.py
Normal file
143
tests/unit_tests/config/test_webhook_display_prefix.py
Normal file
@@ -0,0 +1,143 @@
|
|||||||
|
"""
|
||||||
|
Tests for webhook_prefix configuration
|
||||||
|
"""
|
||||||
|
|
||||||
|
import os
|
||||||
|
import pytest
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
|
||||||
|
def _apply_env_overrides_to_config(cfg: dict) -> dict:
|
||||||
|
"""Apply environment variable overrides to data/config.yaml
|
||||||
|
|
||||||
|
Environment variables should be uppercase and use __ (double underscore)
|
||||||
|
to represent nested keys. For example:
|
||||||
|
- CONCURRENCY__PIPELINE overrides concurrency.pipeline
|
||||||
|
- PLUGIN__RUNTIME_WS_URL overrides plugin.runtime_ws_url
|
||||||
|
|
||||||
|
Arrays and dict types are ignored.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
cfg: Configuration dictionary
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Updated configuration dictionary
|
||||||
|
"""
|
||||||
|
|
||||||
|
def convert_value(value: str, original_value: Any) -> Any:
|
||||||
|
"""Convert string value to appropriate type based on original value
|
||||||
|
|
||||||
|
Args:
|
||||||
|
value: String value from environment variable
|
||||||
|
original_value: Original value to infer type from
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Converted value (falls back to string if conversion fails)
|
||||||
|
"""
|
||||||
|
if isinstance(original_value, bool):
|
||||||
|
return value.lower() in ('true', '1', 'yes', 'on')
|
||||||
|
elif isinstance(original_value, int):
|
||||||
|
try:
|
||||||
|
return int(value)
|
||||||
|
except ValueError:
|
||||||
|
# If conversion fails, keep as string (user error, but non-breaking)
|
||||||
|
return value
|
||||||
|
elif isinstance(original_value, float):
|
||||||
|
try:
|
||||||
|
return float(value)
|
||||||
|
except ValueError:
|
||||||
|
# If conversion fails, keep as string (user error, but non-breaking)
|
||||||
|
return value
|
||||||
|
else:
|
||||||
|
return value
|
||||||
|
|
||||||
|
# Process environment variables
|
||||||
|
for env_key, env_value in os.environ.items():
|
||||||
|
# Check if the environment variable is uppercase and contains __
|
||||||
|
if not env_key.isupper():
|
||||||
|
continue
|
||||||
|
if '__' not in env_key:
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Convert environment variable name to config path
|
||||||
|
# e.g., CONCURRENCY__PIPELINE -> ['concurrency', 'pipeline']
|
||||||
|
keys = [key.lower() for key in env_key.split('__')]
|
||||||
|
|
||||||
|
# Navigate to the target value and validate the path
|
||||||
|
current = cfg
|
||||||
|
|
||||||
|
for i, key in enumerate(keys):
|
||||||
|
if not isinstance(current, dict) or key not in current:
|
||||||
|
break
|
||||||
|
|
||||||
|
if i == len(keys) - 1:
|
||||||
|
# At the final key - check if it's a scalar value
|
||||||
|
if isinstance(current[key], (dict, list)):
|
||||||
|
# Skip dict and list types
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
# Valid scalar value - convert and set it
|
||||||
|
converted_value = convert_value(env_value, current[key])
|
||||||
|
current[key] = converted_value
|
||||||
|
else:
|
||||||
|
# Navigate deeper
|
||||||
|
current = current[key]
|
||||||
|
|
||||||
|
return cfg
|
||||||
|
|
||||||
|
|
||||||
|
class TestWebhookDisplayPrefix:
|
||||||
|
"""Test webhook_prefix configuration functionality"""
|
||||||
|
|
||||||
|
def test_default_webhook_prefix(self):
|
||||||
|
"""Test that the default webhook display prefix is correctly set"""
|
||||||
|
cfg = {'api': {'port': 5300, 'webhook_prefix': 'http://127.0.0.1:5300'}}
|
||||||
|
|
||||||
|
# Should have the default value
|
||||||
|
assert cfg['api']['webhook_prefix'] == 'http://127.0.0.1:5300'
|
||||||
|
|
||||||
|
def test_webhook_prefix_env_override(self):
|
||||||
|
"""Test overriding webhook_prefix via environment variable"""
|
||||||
|
cfg = {'api': {'port': 5300, 'webhook_prefix': 'http://127.0.0.1:5300'}}
|
||||||
|
|
||||||
|
# Set environment variable
|
||||||
|
os.environ['API__WEBHOOK_PREFIX'] = 'https://example.com:8080'
|
||||||
|
|
||||||
|
result = _apply_env_overrides_to_config(cfg)
|
||||||
|
|
||||||
|
assert result['api']['webhook_prefix'] == 'https://example.com:8080'
|
||||||
|
|
||||||
|
# Cleanup
|
||||||
|
del os.environ['API__WEBHOOK_PREFIX']
|
||||||
|
|
||||||
|
def test_webhook_prefix_with_custom_domain(self):
|
||||||
|
"""Test webhook_prefix with custom domain"""
|
||||||
|
cfg = {'api': {'port': 5300, 'webhook_prefix': 'http://127.0.0.1:5300'}}
|
||||||
|
|
||||||
|
# Set to a custom domain
|
||||||
|
os.environ['API__WEBHOOK_PREFIX'] = 'https://bot.mycompany.com'
|
||||||
|
|
||||||
|
result = _apply_env_overrides_to_config(cfg)
|
||||||
|
|
||||||
|
assert result['api']['webhook_prefix'] == 'https://bot.mycompany.com'
|
||||||
|
|
||||||
|
# Cleanup
|
||||||
|
del os.environ['API__WEBHOOK_PREFIX']
|
||||||
|
|
||||||
|
def test_webhook_prefix_with_subdirectory(self):
|
||||||
|
"""Test webhook_prefix with subdirectory path"""
|
||||||
|
cfg = {'api': {'port': 5300, 'webhook_prefix': 'http://127.0.0.1:5300'}}
|
||||||
|
|
||||||
|
# Set to a URL with subdirectory
|
||||||
|
os.environ['API__WEBHOOK_PREFIX'] = 'https://example.com/langbot'
|
||||||
|
|
||||||
|
result = _apply_env_overrides_to_config(cfg)
|
||||||
|
|
||||||
|
assert result['api']['webhook_prefix'] == 'https://example.com/langbot'
|
||||||
|
|
||||||
|
# Cleanup
|
||||||
|
del os.environ['API__WEBHOOK_PREFIX']
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
pytest.main([__file__, '-v'])
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useEffect, useState } from 'react';
|
import React, { useEffect, useState } from 'react';
|
||||||
import {
|
import {
|
||||||
IChooseAdapterEntity,
|
IChooseAdapterEntity,
|
||||||
IPipelineEntity,
|
IPipelineEntity,
|
||||||
@@ -112,11 +112,86 @@ export default function BotForm({
|
|||||||
IDynamicFormItemSchema[]
|
IDynamicFormItemSchema[]
|
||||||
>([]);
|
>([]);
|
||||||
const [, setIsLoading] = useState<boolean>(false);
|
const [, setIsLoading] = useState<boolean>(false);
|
||||||
|
const [webhookUrl, setWebhookUrl] = useState<string>('');
|
||||||
|
const webhookInputRef = React.useRef<HTMLInputElement>(null);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setBotFormValues();
|
setBotFormValues();
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
// 复制到剪贴板的辅助函数 - 使用页面上的真实input元素
|
||||||
|
const copyToClipboard = () => {
|
||||||
|
console.log('[Copy] Attempting to copy from input element');
|
||||||
|
|
||||||
|
const inputElement = webhookInputRef.current;
|
||||||
|
if (!inputElement) {
|
||||||
|
console.error('[Copy] Input element not found');
|
||||||
|
toast.error(t('common.copyFailed'));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
// 确保input元素可见且未被禁用
|
||||||
|
inputElement.disabled = false;
|
||||||
|
inputElement.readOnly = false;
|
||||||
|
|
||||||
|
// 聚焦并选中所有文本
|
||||||
|
inputElement.focus();
|
||||||
|
inputElement.select();
|
||||||
|
|
||||||
|
// 尝试使用现代API
|
||||||
|
if (navigator.clipboard && navigator.clipboard.writeText) {
|
||||||
|
console.log(
|
||||||
|
'[Copy] Using Clipboard API with input value:',
|
||||||
|
inputElement.value,
|
||||||
|
);
|
||||||
|
navigator.clipboard
|
||||||
|
.writeText(inputElement.value)
|
||||||
|
.then(() => {
|
||||||
|
console.log('[Copy] Clipboard API success');
|
||||||
|
inputElement.blur(); // 取消选中
|
||||||
|
inputElement.readOnly = true;
|
||||||
|
toast.success(t('bots.webhookUrlCopied'));
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
console.error(
|
||||||
|
'[Copy] Clipboard API failed, trying execCommand:',
|
||||||
|
err,
|
||||||
|
);
|
||||||
|
// 降级到execCommand
|
||||||
|
const successful = document.execCommand('copy');
|
||||||
|
console.log('[Copy] execCommand result:', successful);
|
||||||
|
inputElement.blur();
|
||||||
|
inputElement.readOnly = true;
|
||||||
|
if (successful) {
|
||||||
|
toast.success(t('bots.webhookUrlCopied'));
|
||||||
|
} else {
|
||||||
|
toast.error(t('common.copyFailed'));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
// 直接使用execCommand
|
||||||
|
console.log(
|
||||||
|
'[Copy] Using execCommand with input value:',
|
||||||
|
inputElement.value,
|
||||||
|
);
|
||||||
|
const successful = document.execCommand('copy');
|
||||||
|
console.log('[Copy] execCommand result:', successful);
|
||||||
|
inputElement.blur();
|
||||||
|
inputElement.readOnly = true;
|
||||||
|
if (successful) {
|
||||||
|
toast.success(t('bots.webhookUrlCopied'));
|
||||||
|
} else {
|
||||||
|
toast.error(t('common.copyFailed'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.error('[Copy] Copy failed:', err);
|
||||||
|
inputElement.readOnly = true;
|
||||||
|
toast.error(t('common.copyFailed'));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
function setBotFormValues() {
|
function setBotFormValues() {
|
||||||
initBotFormComponent().then(() => {
|
initBotFormComponent().then(() => {
|
||||||
// 拉取初始化表单信息
|
// 拉取初始化表单信息
|
||||||
@@ -132,12 +207,20 @@ export default function BotForm({
|
|||||||
console.log('form', form.getValues());
|
console.log('form', form.getValues());
|
||||||
handleAdapterSelect(val.adapter);
|
handleAdapterSelect(val.adapter);
|
||||||
// dynamicForm.setFieldsValue(val.adapter_config);
|
// dynamicForm.setFieldsValue(val.adapter_config);
|
||||||
|
|
||||||
|
// 设置 webhook 地址(如果有)
|
||||||
|
if (val.webhook_full_url) {
|
||||||
|
setWebhookUrl(val.webhook_full_url);
|
||||||
|
} else {
|
||||||
|
setWebhookUrl('');
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
toast.error(t('bots.getBotConfigError') + err.message);
|
toast.error(t('bots.getBotConfigError') + err.message);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
form.reset();
|
form.reset();
|
||||||
|
setWebhookUrl('');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -212,7 +295,7 @@ export default function BotForm({
|
|||||||
|
|
||||||
async function getBotConfig(
|
async function getBotConfig(
|
||||||
botId: string,
|
botId: string,
|
||||||
): Promise<z.infer<typeof formSchema>> {
|
): Promise<z.infer<typeof formSchema> & { webhook_full_url?: string }> {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
httpClient
|
httpClient
|
||||||
.getBot(botId)
|
.getBot(botId)
|
||||||
@@ -225,6 +308,10 @@ export default function BotForm({
|
|||||||
adapter_config: bot.adapter_config,
|
adapter_config: bot.adapter_config,
|
||||||
enable: bot.enable ?? true,
|
enable: bot.enable ?? true,
|
||||||
use_pipeline_uuid: bot.use_pipeline_uuid ?? '',
|
use_pipeline_uuid: bot.use_pipeline_uuid ?? '',
|
||||||
|
webhook_full_url: bot.adapter_runtime_values
|
||||||
|
? ((bot.adapter_runtime_values as Record<string, unknown>)
|
||||||
|
.webhook_full_url as string)
|
||||||
|
: undefined,
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
@@ -274,6 +361,20 @@ export default function BotForm({
|
|||||||
console.log('update bot success', res);
|
console.log('update bot success', res);
|
||||||
onFormSubmit(form.getValues());
|
onFormSubmit(form.getValues());
|
||||||
toast.success(t('bots.saveSuccess'));
|
toast.success(t('bots.saveSuccess'));
|
||||||
|
|
||||||
|
// 保存成功后重新拉取机器人配置,更新 webhook 地址(依赖后端 runtime 计算)
|
||||||
|
httpClient
|
||||||
|
.getBot(initBotId)
|
||||||
|
.then((getRes) => {
|
||||||
|
const runtimeValues = getRes.bot.adapter_runtime_values as Record<string, unknown> | undefined;
|
||||||
|
const newWebhookUrl = runtimeValues
|
||||||
|
? ((runtimeValues.webhook_full_url as string) || '')
|
||||||
|
: '';
|
||||||
|
setWebhookUrl(newWebhookUrl);
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
console.warn('refresh webhook url failed', err);
|
||||||
|
});
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
toast.error(t('bots.saveError') + err.message);
|
toast.error(t('bots.saveError') + err.message);
|
||||||
@@ -328,6 +429,18 @@ export default function BotForm({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 计算动态表单渲染列表:启用 Lark 的 Webhook 时隐藏 app_id 与 app_secret
|
||||||
|
const dynamicFormConfigListToRender = (() => {
|
||||||
|
const isLark = form.watch('adapter') === 'lark';
|
||||||
|
const enableWebhook = !!form.watch('adapter_config')?.['enable-webhook'];
|
||||||
|
if (isLark && enableWebhook) {
|
||||||
|
return dynamicFormConfigList.filter(
|
||||||
|
(item) => item.name !== 'app_id' && item.name !== 'app_secret',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return dynamicFormConfigList;
|
||||||
|
})();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<Dialog
|
<Dialog
|
||||||
@@ -368,51 +481,88 @@ export default function BotForm({
|
|||||||
<div className="space-y-4">
|
<div className="space-y-4">
|
||||||
{/* 是否启用 & 绑定流水线 仅在编辑模式 */}
|
{/* 是否启用 & 绑定流水线 仅在编辑模式 */}
|
||||||
{initBotId && (
|
{initBotId && (
|
||||||
<div className="flex items-center gap-6">
|
<>
|
||||||
<FormField
|
<div className="flex items-center gap-6">
|
||||||
control={form.control}
|
<FormField
|
||||||
name="enable"
|
control={form.control}
|
||||||
render={({ field }) => (
|
name="enable"
|
||||||
<FormItem className="flex flex-col justify-start gap-[0.8rem] h-[3.8rem]">
|
render={({ field }) => (
|
||||||
<FormLabel>{t('common.enable')}</FormLabel>
|
<FormItem className="flex flex-col justify-start gap-[0.8rem] h-[3.8rem]">
|
||||||
<FormControl>
|
<FormLabel>{t('common.enable')}</FormLabel>
|
||||||
<Switch
|
<FormControl>
|
||||||
checked={field.value}
|
<Switch
|
||||||
onCheckedChange={field.onChange}
|
checked={field.value}
|
||||||
/>
|
onCheckedChange={field.onChange}
|
||||||
</FormControl>
|
/>
|
||||||
</FormItem>
|
</FormControl>
|
||||||
)}
|
</FormItem>
|
||||||
/>
|
)}
|
||||||
|
/>
|
||||||
|
|
||||||
<FormField
|
<FormField
|
||||||
control={form.control}
|
control={form.control}
|
||||||
name="use_pipeline_uuid"
|
name="use_pipeline_uuid"
|
||||||
render={({ field }) => (
|
render={({ field }) => (
|
||||||
<FormItem className="flex flex-col justify-start gap-[0.8rem] h-[3.8rem]">
|
<FormItem className="flex flex-col justify-start gap-[0.8rem] h-[3.8rem]">
|
||||||
<FormLabel>{t('bots.bindPipeline')}</FormLabel>
|
<FormLabel>{t('bots.bindPipeline')}</FormLabel>
|
||||||
<FormControl>
|
<FormControl>
|
||||||
<Select onValueChange={field.onChange} {...field}>
|
<Select onValueChange={field.onChange} {...field}>
|
||||||
<SelectTrigger className="bg-[#ffffff] dark:bg-[#2a2a2e]">
|
<SelectTrigger className="bg-[#ffffff] dark:bg-[#2a2a2e]">
|
||||||
<SelectValue
|
<SelectValue
|
||||||
placeholder={t('bots.selectPipeline')}
|
placeholder={t('bots.selectPipeline')}
|
||||||
/>
|
/>
|
||||||
</SelectTrigger>
|
</SelectTrigger>
|
||||||
<SelectContent className="fixed z-[1000]">
|
<SelectContent className="fixed z-[1000]">
|
||||||
<SelectGroup>
|
<SelectGroup>
|
||||||
{pipelineNameList.map((item) => (
|
{pipelineNameList.map((item) => (
|
||||||
<SelectItem key={item.value} value={item.value}>
|
<SelectItem
|
||||||
{item.label}
|
key={item.value}
|
||||||
</SelectItem>
|
value={item.value}
|
||||||
))}
|
>
|
||||||
</SelectGroup>
|
{item.label}
|
||||||
</SelectContent>
|
</SelectItem>
|
||||||
</Select>
|
))}
|
||||||
</FormControl>
|
</SelectGroup>
|
||||||
</FormItem>
|
</SelectContent>
|
||||||
)}
|
</Select>
|
||||||
/>
|
</FormControl>
|
||||||
</div>
|
</FormItem>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Webhook 地址显示(统一 Webhook 模式) */}
|
||||||
|
{form.watch('adapter') === 'lark' &&
|
||||||
|
!!form.watch('adapter_config')?.['enable-webhook'] &&
|
||||||
|
webhookUrl && (
|
||||||
|
<FormItem>
|
||||||
|
<FormLabel>{t('bots.webhookUrl')}</FormLabel>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Input
|
||||||
|
ref={webhookInputRef}
|
||||||
|
value={webhookUrl}
|
||||||
|
readOnly
|
||||||
|
className="flex-1 bg-gray-50 dark:bg-gray-900"
|
||||||
|
onClick={(e) => {
|
||||||
|
// 点击输入框时自动全选
|
||||||
|
(e.target as HTMLInputElement).select();
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<Button
|
||||||
|
type="button"
|
||||||
|
variant="outline"
|
||||||
|
size="sm"
|
||||||
|
onClick={copyToClipboard}
|
||||||
|
>
|
||||||
|
{t('common.copy')}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
<p className="text-sm text-gray-500 mt-1">
|
||||||
|
{t('bots.webhookUrlHint')}
|
||||||
|
</p>
|
||||||
|
</FormItem>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<FormField
|
<FormField
|
||||||
@@ -508,16 +658,17 @@ export default function BotForm({
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{showDynamicForm && dynamicFormConfigList.length > 0 && (
|
{showDynamicForm && dynamicFormConfigListToRender.length > 0 && (
|
||||||
<div className="space-y-4">
|
<div className="space-y-4">
|
||||||
<div className="text-lg font-medium">
|
<div className="text-lg font-medium">
|
||||||
{t('bots.adapterConfig')}
|
{t('bots.adapterConfig')}
|
||||||
</div>
|
</div>
|
||||||
<DynamicFormComponent
|
<DynamicFormComponent
|
||||||
itemConfigList={dynamicFormConfigList}
|
itemConfigList={dynamicFormConfigListToRender}
|
||||||
initialValues={form.watch('adapter_config')}
|
initialValues={form.watch('adapter_config')}
|
||||||
onSubmit={(values) => {
|
onSubmit={(values) => {
|
||||||
form.setValue('adapter_config', values);
|
const prev = form.getValues('adapter_config') || {};
|
||||||
|
form.setValue('adapter_config', { ...prev, ...values });
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -142,6 +142,7 @@ export interface Bot {
|
|||||||
use_pipeline_uuid?: string;
|
use_pipeline_uuid?: string;
|
||||||
created_at?: string;
|
created_at?: string;
|
||||||
updated_at?: string;
|
updated_at?: string;
|
||||||
|
adapter_runtime_values?: object;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ApiRespKnowledgeBases {
|
export interface ApiRespKnowledgeBases {
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ const enUS = {
|
|||||||
addRound: 'Add Round',
|
addRound: 'Add Round',
|
||||||
copy: 'Copy',
|
copy: 'Copy',
|
||||||
copySuccess: 'Copy Successfully',
|
copySuccess: 'Copy Successfully',
|
||||||
|
copyFailed: 'Copy Failed',
|
||||||
test: 'Test',
|
test: 'Test',
|
||||||
forgotPassword: 'Forgot Password?',
|
forgotPassword: 'Forgot Password?',
|
||||||
loading: 'Loading...',
|
loading: 'Loading...',
|
||||||
@@ -187,6 +188,10 @@ const enUS = {
|
|||||||
log: 'Log',
|
log: 'Log',
|
||||||
configuration: 'Configuration',
|
configuration: 'Configuration',
|
||||||
logs: 'Logs',
|
logs: 'Logs',
|
||||||
|
webhookUrl: 'Webhook Callback URL',
|
||||||
|
webhookUrlCopied: 'Webhook URL copied',
|
||||||
|
webhookUrlHint:
|
||||||
|
'Click the input to select all, then press Ctrl+C (Mac: Cmd+C) to copy, or click the button',
|
||||||
},
|
},
|
||||||
plugins: {
|
plugins: {
|
||||||
title: 'Extensions',
|
title: 'Extensions',
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ const jaJP = {
|
|||||||
addRound: 'ラウンドを追加',
|
addRound: 'ラウンドを追加',
|
||||||
copy: 'コピー',
|
copy: 'コピー',
|
||||||
copySuccess: 'コピーに成功しました',
|
copySuccess: 'コピーに成功しました',
|
||||||
|
copyFailed: 'コピーに失敗しました',
|
||||||
test: 'テスト',
|
test: 'テスト',
|
||||||
forgotPassword: 'パスワードを忘れた?',
|
forgotPassword: 'パスワードを忘れた?',
|
||||||
loading: '読み込み中...',
|
loading: '読み込み中...',
|
||||||
@@ -189,6 +190,10 @@ const jaJP = {
|
|||||||
log: 'ログ',
|
log: 'ログ',
|
||||||
configuration: '設定',
|
configuration: '設定',
|
||||||
logs: 'ログ',
|
logs: 'ログ',
|
||||||
|
webhookUrl: 'Webhook コールバック URL',
|
||||||
|
webhookUrlCopied: 'Webhook URL をコピーしました',
|
||||||
|
webhookUrlHint:
|
||||||
|
'入力ボックスをクリックして全選択し、Ctrl+C (Mac: Cmd+C) でコピーするか、右側のボタンをクリックしてください',
|
||||||
},
|
},
|
||||||
plugins: {
|
plugins: {
|
||||||
title: '拡張機能',
|
title: '拡張機能',
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ const zhHans = {
|
|||||||
addRound: '添加回合',
|
addRound: '添加回合',
|
||||||
copy: '复制',
|
copy: '复制',
|
||||||
copySuccess: '复制成功',
|
copySuccess: '复制成功',
|
||||||
|
copyFailed: '复制失败',
|
||||||
test: '测试',
|
test: '测试',
|
||||||
forgotPassword: '忘记密码?',
|
forgotPassword: '忘记密码?',
|
||||||
loading: '加载中...',
|
loading: '加载中...',
|
||||||
@@ -182,6 +183,10 @@ const zhHans = {
|
|||||||
log: '日志',
|
log: '日志',
|
||||||
configuration: '配置',
|
configuration: '配置',
|
||||||
logs: '日志',
|
logs: '日志',
|
||||||
|
webhookUrl: 'Webhook 回调地址',
|
||||||
|
webhookUrlCopied: 'Webhook 地址已复制',
|
||||||
|
webhookUrlHint:
|
||||||
|
'点击输入框自动全选,然后按 Ctrl+C (Mac: Cmd+C) 复制,或点击右侧按钮',
|
||||||
},
|
},
|
||||||
plugins: {
|
plugins: {
|
||||||
title: '插件扩展',
|
title: '插件扩展',
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ const zhHant = {
|
|||||||
addRound: '新增回合',
|
addRound: '新增回合',
|
||||||
copy: '複製',
|
copy: '複製',
|
||||||
copySuccess: '複製成功',
|
copySuccess: '複製成功',
|
||||||
|
copyFailed: '複製失敗',
|
||||||
test: '測試',
|
test: '測試',
|
||||||
forgotPassword: '忘記密碼?',
|
forgotPassword: '忘記密碼?',
|
||||||
loading: '載入中...',
|
loading: '載入中...',
|
||||||
@@ -182,6 +183,10 @@ const zhHant = {
|
|||||||
log: '日誌',
|
log: '日誌',
|
||||||
configuration: '設定',
|
configuration: '設定',
|
||||||
logs: '日誌',
|
logs: '日誌',
|
||||||
|
webhookUrl: 'Webhook 回調位址',
|
||||||
|
webhookUrlCopied: 'Webhook 位址已複製',
|
||||||
|
webhookUrlHint:
|
||||||
|
'點擊輸入框自動全選,然後按 Ctrl+C (Mac: Cmd+C) 複製,或點擊右側按鈕',
|
||||||
},
|
},
|
||||||
plugins: {
|
plugins: {
|
||||||
title: '外掛擴展',
|
title: '外掛擴展',
|
||||||
|
|||||||
Reference in New Issue
Block a user