fix: Phase 6联调 — 插件管理器端口修正 + 多模型配置系统整合 + 历史消息刷新修复
## 调试日志
### 1. 插件管理器启动失败
- **症状**: DevTools 显示插件管理器一直"已停止"，手动启动正常
- **排查**: 对比 process-manager.js 传入的环境变量 vs plugin-manager config.go 读取的变量
- **根因**: config.js 传入 PLUGIN_MANAGER_PORT=8094，但 config.go 读取 os.Getenv("PORT")，env 名不匹配。且 process.env 中 PORT 泄露时被误读为 9090，与 DevTools 端口冲突
- **修复**: config.js 将 PLUGIN_MANAGER_PORT → PORT，使 env 名与代码一致 (c3055f4)
### 2. 历史消息刷新后消失
- **症状**: 浏览器刷新后聊天历史清空
- **排查**: WebSocket history_response handler 中 if (msg.messages) 对空数组 [] 为 truthy
- **根因**: 后端返回空的 history_response (缓存为空) 时，空数组覆盖了 HTTP 已加载的消息
- **修复**: useWebSocket.ts 改为 if (msg.messages && msg.messages.length > 0)，空数组走 else-if 分支仅打日志，不覆盖已有消息
### 3. Phase 6 多模型配置系统
- Gateway: ModelsConfigStore (JSON文件持久化) + Admin CRUD API (providers/models/routing)
- ai-core: ModelSelector 支持按 purpose 选择 + fallback_chain，无配置时回退 .env
- DevTools: 模型配置管理面板 (Providers/Models/Routing 三Tab)、在线模型查询代理、路由表单 checkbox 多选、关键词搜索过滤
- .gitignore: models.json + platform_configs.json
### 4. 多端客户端追踪
- Hub 新增 knownClients 映射 (clientID → KnownClient)，在线/离线状态追踪
- 客户端备注持久化到 PostgreSQL
- DevTools 客户端管理面板
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -20,12 +20,28 @@ import (
|
||||
"github.com/yourname/cyrene-ai/platform-bridge/internal/bridge"
|
||||
"github.com/yourname/cyrene-ai/platform-bridge/internal/config"
|
||||
"github.com/yourname/cyrene-ai/platform-bridge/internal/handler"
|
||||
"github.com/yourname/cyrene-ai/platform-bridge/internal/logging"
|
||||
"github.com/yourname/cyrene-ai/platform-bridge/internal/permissions"
|
||||
)
|
||||
|
||||
func main() {
|
||||
cfg := config.Load()
|
||||
|
||||
// Config store for platform adapter configs.
|
||||
configStore, err := config.NewStore("platform_configs.json")
|
||||
if err != nil {
|
||||
fmt.Printf("FATAL: config store: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
// Message logger.
|
||||
msgLogger, err := logging.NewLogger("logs")
|
||||
if err != nil {
|
||||
fmt.Printf("FATAL: logger: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
defer msgLogger.Close()
|
||||
|
||||
// Core components.
|
||||
mapper := bridge.NewIdentityMapper()
|
||||
checker := permissions.NewChecker()
|
||||
@@ -34,23 +50,58 @@ func main() {
|
||||
// Seed default identities from environment.
|
||||
seedIdentities(mapper)
|
||||
|
||||
// Register platform adapters.
|
||||
adapters := []bridge.PlatformAdapter{
|
||||
qqadapter.NewAdapter(cfg.QQBotPort),
|
||||
telegramadapter.NewAdapter(cfg.TelegramToken, cfg.TelegramWebhookURL),
|
||||
webhookadapter.NewAdapter("webhook"),
|
||||
wechatstub.NewAdapter(),
|
||||
feishustub.NewAdapter(),
|
||||
discordstub.NewAdapter(),
|
||||
}
|
||||
|
||||
// Register platform adapters based on stored configs or defaults.
|
||||
adapters := createAdapters(cfg, configStore)
|
||||
for _, a := range adapters {
|
||||
router.RegisterAdapter(a)
|
||||
}
|
||||
|
||||
// Set message handler: forward to AI-Core.
|
||||
// Set message handler with logging.
|
||||
router.SetMessageHandler(func(msg *bridge.UnifiedMessage) (*bridge.UnifiedResponse, error) {
|
||||
return forwardToAICore(cfg, msg)
|
||||
// Log incoming.
|
||||
msgLogger.Log(logging.LogEntry{
|
||||
Timestamp: time.Now(),
|
||||
Direction: "incoming",
|
||||
Platform: msg.Platform,
|
||||
ChannelID: msg.ChannelID,
|
||||
SenderID: msg.SenderID,
|
||||
SenderName: msg.SenderName,
|
||||
Content: msg.Content,
|
||||
ContentType: msg.ContentType,
|
||||
MessageID: msg.MessageID,
|
||||
Success: true,
|
||||
})
|
||||
|
||||
response, err := forwardToAICore(cfg, msg)
|
||||
if err != nil {
|
||||
msgLogger.Log(logging.LogEntry{
|
||||
Timestamp: time.Now(),
|
||||
Direction: "outgoing",
|
||||
Platform: msg.Platform,
|
||||
ChannelID: msg.ChannelID,
|
||||
SenderID: msg.SenderID,
|
||||
Success: false,
|
||||
Error: err.Error(),
|
||||
})
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Log outgoing.
|
||||
for _, rm := range response.Messages {
|
||||
msgLogger.Log(logging.LogEntry{
|
||||
Timestamp: time.Now(),
|
||||
Direction: "outgoing",
|
||||
Platform: msg.Platform,
|
||||
ChannelID: msg.ChannelID,
|
||||
SenderID: msg.SenderID,
|
||||
SenderName: "Cyrene",
|
||||
Content: rm.Content,
|
||||
ContentType: "text",
|
||||
Success: true,
|
||||
})
|
||||
}
|
||||
|
||||
return response, nil
|
||||
})
|
||||
|
||||
// Connect all adapters.
|
||||
@@ -68,6 +119,12 @@ func main() {
|
||||
bh := handler.NewBridgeHandler(router)
|
||||
bh.RegisterRoutes(mux)
|
||||
|
||||
// Config and log handlers.
|
||||
ch := handler.NewConfigHandler(configStore, router)
|
||||
ch.RegisterRoutes(mux)
|
||||
lh := handler.NewLogHandler(msgLogger)
|
||||
lh.RegisterRoutes(mux)
|
||||
|
||||
// Start QQ message reader loop.
|
||||
qq, _ := router.GetAdapter("qq")
|
||||
if qqa, ok := qq.(*qqadapter.Adapter); ok {
|
||||
@@ -80,13 +137,12 @@ func main() {
|
||||
fmt.Printf("[qq] route error: %v\n", err)
|
||||
continue
|
||||
}
|
||||
// Send response back through QQ adapter.
|
||||
msgs, err := router.SendResponse(response)
|
||||
if err != nil {
|
||||
fmt.Printf("[qq] send error: %v\n", err)
|
||||
continue
|
||||
}
|
||||
_ = msgs // QQ adapter handles sending via WebSocket
|
||||
_ = msgs
|
||||
}
|
||||
}()
|
||||
}
|
||||
@@ -115,6 +171,76 @@ func main() {
|
||||
fmt.Println("Platform Bridge stopped")
|
||||
}
|
||||
|
||||
// createAdapters builds platform adapters, preferring stored configs over defaults.
|
||||
func createAdapters(cfg *config.Config, store *config.Store) []bridge.PlatformAdapter {
|
||||
allNames := []string{"qq", "telegram", "webhook", "wechat", "feishu", "discord"}
|
||||
var adapters []bridge.PlatformAdapter
|
||||
|
||||
for _, name := range allNames {
|
||||
stored, _ := store.Get(name)
|
||||
if stored != nil && !stored.Enabled {
|
||||
fmt.Printf("Platform %s is disabled in config, skipping\n", name)
|
||||
continue
|
||||
}
|
||||
|
||||
var a bridge.PlatformAdapter
|
||||
fields := mergeFields(cfg, name, stored)
|
||||
|
||||
switch name {
|
||||
case "qq":
|
||||
port := cfg.QQBotPort
|
||||
if p, ok := fields["bot_port"]; ok && p != "" {
|
||||
port = p
|
||||
}
|
||||
a = qqadapter.NewAdapter(port)
|
||||
case "telegram":
|
||||
token := cfg.TelegramToken
|
||||
if t, ok := fields["bot_token"]; ok && t != "" {
|
||||
token = t
|
||||
}
|
||||
webhookURL := cfg.TelegramWebhookURL
|
||||
if w, ok := fields["webhook_url"]; ok && w != "" {
|
||||
webhookURL = w
|
||||
}
|
||||
a = telegramadapter.NewAdapter(token, webhookURL)
|
||||
case "webhook":
|
||||
a = webhookadapter.NewAdapter("webhook")
|
||||
case "wechat":
|
||||
a = wechatstub.NewAdapter()
|
||||
case "feishu":
|
||||
a = feishustub.NewAdapter()
|
||||
case "discord":
|
||||
a = discordstub.NewAdapter()
|
||||
}
|
||||
|
||||
if a != nil {
|
||||
adapters = append(adapters, a)
|
||||
}
|
||||
}
|
||||
return adapters
|
||||
}
|
||||
|
||||
// mergeFields returns fields from stored config, falling back to env defaults.
|
||||
func mergeFields(cfg *config.Config, name string, stored *config.PlatformConfig) map[string]string {
|
||||
fields := make(map[string]string)
|
||||
if stored != nil {
|
||||
for k, v := range stored.Fields {
|
||||
fields[k] = v
|
||||
}
|
||||
}
|
||||
// Apply env var defaults if fields are missing.
|
||||
if fields["bot_token"] == "" && cfg.TelegramToken != "" && name == "telegram" {
|
||||
fields["bot_token"] = cfg.TelegramToken
|
||||
}
|
||||
if fields["webhook_url"] == "" && cfg.TelegramWebhookURL != "" && name == "telegram" {
|
||||
fields["webhook_url"] = cfg.TelegramWebhookURL
|
||||
}
|
||||
if fields["bot_port"] == "" && cfg.QQBotPort != "" && name == "qq" {
|
||||
fields["bot_port"] = cfg.QQBotPort
|
||||
}
|
||||
return fields
|
||||
}
|
||||
|
||||
// forwardToAICore sends a unified message to AI-Core's chat endpoint and returns the response.
|
||||
func forwardToAICore(cfg *config.Config, msg *bridge.UnifiedMessage) (*bridge.UnifiedResponse, error) {
|
||||
reqBody, _ := json.Marshal(map[string]interface{}{
|
||||
@@ -145,13 +271,11 @@ func forwardToAICore(cfg *config.Config, msg *bridge.UnifiedMessage) (*bridge.Un
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
// For simplicity, collect full text from SSE stream.
|
||||
var result struct {
|
||||
Content string `json:"content"`
|
||||
Error string `json:"error"`
|
||||
}
|
||||
if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
|
||||
// Non-JSON response — read as raw text.
|
||||
buf := new(bytes.Buffer)
|
||||
buf.ReadFrom(resp.Body)
|
||||
return &bridge.UnifiedResponse{
|
||||
@@ -181,7 +305,6 @@ func forwardToAICore(cfg *config.Config, msg *bridge.UnifiedMessage) (*bridge.Un
|
||||
|
||||
// seedIdentities loads default identity mappings.
|
||||
func seedIdentities(m *bridge.IdentityMapper) {
|
||||
// Admin on QQ.
|
||||
if qqAdmin := os.Getenv("QQ_ADMIN_UID"); qqAdmin != "" {
|
||||
m.Register(permissions.PlatformIdentity{
|
||||
Platform: "qq",
|
||||
@@ -191,7 +314,6 @@ func seedIdentities(m *bridge.IdentityMapper) {
|
||||
PermissionLevel: "admin",
|
||||
})
|
||||
}
|
||||
// Admin on Telegram.
|
||||
if tgAdmin := os.Getenv("TELEGRAM_ADMIN_UID"); tgAdmin != "" {
|
||||
m.Register(permissions.PlatformIdentity{
|
||||
Platform: "telegram",
|
||||
|
||||
Reference in New Issue
Block a user