xinyin025/LangBot
1
0
Fork 0
mirror of https://github.com/langbot-app/LangBot.git synced 2026-06-04 04:54:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(gewechat): remove redundant set_webhook_url and login logic

Browse Source 
Remove the unnecessary set_webhook_url method and its caller in botmgr,
instead inject webhook_prefix via adapter config for self-assembly.
Remove login logic from run_async since login is handled elsewhere.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
fdc310
2026-03-22 06:15:16 +08:00
parent c4d4c90930
commit 60579f7b3a
2 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/langbot/pkg/platform/botmgr.py
View File

@@ -272,12 +272,9 @@ class PlatformManager:
# 如果 adapter 支持 set_bot_uuid 方法，设置 bot_uuid（用于统一 webhook）
if hasattr(adapter_inst, 'set_bot_uuid'):
adapter_inst.set_bot_uuid(bot_entity.uuid)
# 如果 adapter 支持 set_webhook_url 方法，构建并传递完整的 webhook URL
if hasattr(adapter_inst, 'set_webhook_url'):
webhook_prefix = self.ap.instance_config.data['api'].get('webhook_prefix', 'http://127.0.0.1:5300')
webhook_full_url = f'{webhook_prefix}/bots/{bot_entity.uuid}'
adapter_inst.set_webhook_url(webhook_full_url)
adapter_inst.config['_webhook_prefix'] = self.ap.instance_config.data['api'].get(
'webhook_prefix', 'http://127.0.0.1:5300'
)
runtime_bot = RuntimeBot(ap=self.ap, bot_entity=bot_entity, adapter=adapter_inst, logger=logger)

25
src/langbot/pkg/platform/sources/gewechat.py
View File

@@ -3,7 +3,7 @@ import gewechat_client
import typing
import asyncio
import traceback
import time
import re
import copy
import threading
@@ -404,7 +404,6 @@ class GewechatEventConverter(abstract_platform_adapter.AbstractEventConverter):
class GeWeChatAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
bot: gewechat_client.GewechatClient = None
bot_uuid: str = None
webhook_url: str = None
message_converter: GewechatMessageConverter = None
event_converter: GewechatEventConverter = None
@@ -425,9 +424,6 @@ class GeWeChatAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
def set_bot_uuid(self, bot_uuid: str):
self.bot_uuid = bot_uuid
def set_webhook_url(self, webhook_url: str):
self.webhook_url = webhook_url
async def handle_unified_webhook(self, bot_uuid: str, path: str, request):
data = await request.json
await self.logger.debug(f'Gewechat callback event: {data}')
@@ -575,9 +571,8 @@ class GeWeChatAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
pass
def _build_callback_url(self) -> str:
if self.webhook_url:
return self.webhook_url
raise Exception('webhook_url 未设置，请检查 LangBot 的 api.webhook_prefix 配置')
webhook_prefix = self.config.get('_webhook_prefix', 'http://127.0.0.1:5300').rstrip('/')
return f'{webhook_prefix}/bots/{self.bot_uuid}'
async def run_async(self):
if not self.config['token']:
@@ -592,20 +587,10 @@ class GeWeChatAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
self.bot = gewechat_client.GewechatClient(f'{self.config["gewechat_url"]}/v2/api', self.config['token'])
def gewechat_login_process():
app_id, error_msg = self.bot.login(self.config['app_id'])
if error_msg:
raise Exception(f'Gewechat 登录失败: {error_msg}')
self.config['app_id'] = app_id
print(f'Gewechat 登录成功，app_id: {app_id}')
def gewechat_init_process():
profile = self.bot.get_profile(self.config['app_id'])
self.bot_account_id = profile['data']['nickName']
time.sleep(2)
try:
callback_url = self._build_callback_url()
self.bot.set_callback(self.config['token'], callback_url)
@@ -613,7 +598,7 @@ class GeWeChatAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
except Exception as e:
raise Exception(f'设置 Gewechat 回调失败，token失效：{e}')
threading.Thread(target=gewechat_login_process).start()
threading.Thread(target=gewechat_init_process).start()
# 统一 webhook 模式下，不启动独立的 HTTP 服务
# 保持适配器运行