重构:把剩余 12 个顶层包全部迁到 internal/

继续之前的重构:把根目录残留的非数据/资源类子目录(agents、agenttool、ai、
autoreply、completion、conversation、llm、message、mqtpp、stream、
toolmanager、toolrouter)一并搬到 internal/ 下,并把全工程引用它们的
import 路径从 "meshtastic_mqtt_server/<x>" 重写为
"meshtastic_mqtt_server/internal/<x>"。

变更
- git mv 12 个顶层目录进 internal/,无函数体改动。
- 全工程 sed 把 import path 加上 internal/ 前缀,包括 main.go、
  internal/bot/bot_service.go、internal/store/bot_store.go 中对 mqtpp
  的引用,以及 ai 子系统内部 agents/agenttool/autoreply/conversation/
  llm/toolmanager/toolrouter 之间的相互引用。

验证
- go build ./... 通过;go test ./... 全部包通过。
- AI 自动回复链路(main → ai.NewService → autoreply.Service → botSender)
  保持不变,仅 import 路径调整。
- 根目录最终只剩 main.go / main_test.go / internal/ 加 go.mod / go.sum
  与数据资源目录(dist、doc、firmware、py、win、meshmap_frontend)。

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
2026-06-18 18:43:42 +08:00
co-authored by Claude
parent 02b445884d
commit d57dff58f3
25 changed files with 36 additions and 36 deletions
+39
View File
@@ -0,0 +1,39 @@
package autoreply
import (
"context"
"fmt"
)
// BotServiceAdapter adapts the bot service to the BotSender interface
type BotServiceAdapter struct {
sendDirectTextFn func(ctx context.Context, botID uint64, toNodeNum int64, text string) error
sendChannelTextFn func(ctx context.Context, botID uint64, channelID string, text string) error
}
// NewBotServiceAdapter creates a new bot service adapter
func NewBotServiceAdapter(
sendDirectTextFn func(ctx context.Context, botID uint64, toNodeNum int64, text string) error,
sendChannelTextFn func(ctx context.Context, botID uint64, channelID string, text string) error,
) *BotServiceAdapter {
return &BotServiceAdapter{
sendDirectTextFn: sendDirectTextFn,
sendChannelTextFn: sendChannelTextFn,
}
}
// SendDirectText sends a direct/private message to a specific node
func (a *BotServiceAdapter) SendDirectText(ctx context.Context, botID uint64, toNodeNum int64, text string) error {
if a.sendDirectTextFn == nil {
return fmt.Errorf("send direct text function is nil")
}
return a.sendDirectTextFn(ctx, botID, toNodeNum, text)
}
// SendChannelText sends a channel message to a specific channel
func (a *BotServiceAdapter) SendChannelText(ctx context.Context, botID uint64, channelID string, text string) error {
if a.sendChannelTextFn == nil {
return fmt.Errorf("send channel text function is nil")
}
return a.sendChannelTextFn(ctx, botID, channelID, text)
}
+111
View File
@@ -0,0 +1,111 @@
package autoreply
import (
"fmt"
"time"
"gorm.io/gorm"
)
const (
statusPending = "pending"
statusProcessing = "processing"
statusProcessed = "processed"
statusFailed = "error"
)
// DBMessageQueue implements MessageQueue using GORM
type DBMessageQueue struct {
db *gorm.DB
}
// NewDBMessageQueue creates a new database-backed message queue
func NewDBMessageQueue(db *gorm.DB) *DBMessageQueue {
return &DBMessageQueue{db: db}
}
// llmMessageQueueRecord is the database record for LLM messages
type llmMessageQueueRecord struct {
ID uint64 `gorm:"column:id;primaryKey;autoIncrement"`
BotID uint64 `gorm:"column:bot_id;not null;index"`
BotNodeID string `gorm:"column:bot_node_id;not null"`
BotNodeNum int64 `gorm:"column:bot_node_num;not null"`
FromNodeID string `gorm:"column:from_node_id;not null"`
FromNodeNum int64 `gorm:"column:from_node_num;not null"`
LongName *string `gorm:"column:long_name"`
ShortName *string `gorm:"column:short_name"`
Text string `gorm:"column:text;type:text;not null"`
PacketID int64 `gorm:"column:packet_id;not null"`
ChannelID *string `gorm:"column:channel_id"`
Topic string `gorm:"column:topic;not null"`
MessageType string `gorm:"column:message_type;not null;default:'direct'"` // "channel" 或 "direct"
Status string `gorm:"column:status;not null;index"`
Error string `gorm:"column:error;type:text"`
Reply string `gorm:"column:reply;type:text"`
ReceivedAt time.Time `gorm:"column:received_at;not null"`
ProcessedAt *time.Time `gorm:"column:processed_at;index"`
CreatedAt time.Time `gorm:"column:created_at;autoCreateTime;index"`
}
func (llmMessageQueueRecord) TableName() string {
return "llm_message_queue"
}
// GetPendingMessages returns pending messages from the queue
func (q *DBMessageQueue) GetPendingMessages(botID uint64, limit int) ([]QueuedMessage, error) {
var records []llmMessageQueueRecord
query := q.db.Where("status = ?", statusPending).Order("created_at ASC")
if botID > 0 {
query = query.Where("bot_id = ?", botID)
}
if limit > 0 {
query = query.Limit(limit)
}
if err := query.Find(&records).Error; err != nil {
return nil, fmt.Errorf("failed to query pending messages: %w", err)
}
messages := make([]QueuedMessage, 0, len(records))
for _, r := range records {
messages = append(messages, QueuedMessage{
ID: r.ID,
BotID: r.BotID,
BotNodeID: r.BotNodeID,
BotNodeNum: r.BotNodeNum,
FromNodeID: r.FromNodeID,
FromNodeNum: r.FromNodeNum,
LongName: r.LongName,
ShortName: r.ShortName,
Text: r.Text,
PacketID: r.PacketID,
ChannelID: r.ChannelID,
Topic: r.Topic,
MessageType: r.MessageType,
ReceivedAt: r.ReceivedAt,
})
}
return messages, nil
}
// MarkAsProcessing marks a message as being processed
func (q *DBMessageQueue) MarkAsProcessing(id uint64) error {
return q.db.Model(&llmMessageQueueRecord{}).Where("id = ?", id).Update("status", statusProcessing).Error
}
// MarkAsProcessed marks a message as successfully processed
func (q *DBMessageQueue) MarkAsProcessed(id uint64, reply string) error {
now := time.Now()
return q.db.Model(&llmMessageQueueRecord{}).Where("id = ?", id).Updates(map[string]any{
"status": statusProcessed,
"reply": reply,
"processed_at": &now,
}).Error
}
// MarkAsFailed marks a message as failed
func (q *DBMessageQueue) MarkAsFailed(id uint64, error string) error {
return q.db.Model(&llmMessageQueueRecord{}).Where("id = ?", id).Updates(map[string]any{
"status": statusFailed,
"error": error,
}).Error
}
+480
View File
@@ -0,0 +1,480 @@
package autoreply
import (
"context"
"fmt"
"strings"
"sync"
"time"
"unicode/utf8"
"meshtastic_mqtt_server/internal/completion"
"meshtastic_mqtt_server/internal/conversation"
"meshtastic_mqtt_server/internal/llm"
"meshtastic_mqtt_server/internal/message"
"meshtastic_mqtt_server/internal/toolmanager"
"meshtastic_mqtt_server/internal/toolrouter"
"github.com/volcengine/volcengine-go-sdk/service/arkruntime/model"
)
const (
// MaxReplyLength is the maximum length for Meshtastic messages
MaxReplyLength = 200
// PollInterval is how often to check the queue for new messages
PollInterval = 5 * time.Second
// MaxProcessingTime is the maximum time to spend processing a single message
MaxProcessingTime = 120 * time.Second
)
// MessageQueue is the interface for accessing the LLM message queue
type MessageQueue interface {
// GetPendingMessages returns pending messages for a bot
GetPendingMessages(botID uint64, limit int) ([]QueuedMessage, error)
// MarkAsProcessing marks a message as being processed
MarkAsProcessing(id uint64) error
// MarkAsProcessed marks a message as successfully processed
MarkAsProcessed(id uint64, reply string) error
// MarkAsFailed marks a message as failed
MarkAsFailed(id uint64, error string) error
}
// QueuedMessage represents a message in the LLM queue
type QueuedMessage struct {
ID uint64
BotID uint64
BotNodeID string
BotNodeNum int64
FromNodeID string
FromNodeNum int64
LongName *string
ShortName *string
Text string
PacketID int64
ChannelID *string
Topic string
MessageType string // "channel" 或 "direct"
ReceivedAt time.Time
}
// BotSender is the interface for sending bot messages
type BotSender interface {
// SendDirectText 发送私聊消息给指定节点
SendDirectText(ctx context.Context, botID uint64, toNodeNum int64, text string) error
// SendChannelText 发送频道消息到指定频道
SendChannelText(ctx context.Context, botID uint64, channelID string, text string) error
}
// ToolConfigStore is the interface for getting tool configuration
type ToolConfigStore interface {
GetLLMPrimaryConfigSystemPrompt() (string, error)
GetLLMPrimaryConfigEnableTool() (bool, error)
}
// Service manages automatic AI replies for bots
type Service struct {
llmState *llm.State
toolRouter *toolrouter.State
toolMgr *toolmanager.Manager
convStore *conversation.Store
msgQueue MessageQueue
botSender BotSender
toolConfigStore ToolConfigStore
running bool
mu sync.Mutex
cancel context.CancelFunc
wg sync.WaitGroup
}
// NewService creates a new auto-reply service
func NewService(
llmState *llm.State,
toolRouter *toolrouter.State,
toolMgr *toolmanager.Manager,
convStore *conversation.Store,
msgQueue MessageQueue,
botSender BotSender,
toolConfigStore ToolConfigStore,
) *Service {
return &Service{
llmState: llmState,
toolRouter: toolRouter,
toolMgr: toolMgr,
convStore: convStore,
msgQueue: msgQueue,
botSender: botSender,
toolConfigStore: toolConfigStore,
}
}
// Start starts the auto-reply service
func (s *Service) Start(ctx context.Context) error {
s.mu.Lock()
defer s.mu.Unlock()
if s.running {
return fmt.Errorf("auto-reply service is already running")
}
ctx, cancel := context.WithCancel(ctx)
s.cancel = cancel
s.running = true
s.wg.Add(1)
go s.run(ctx)
return nil
}
// Stop stops the auto-reply service
func (s *Service) Stop() {
s.mu.Lock()
defer s.mu.Unlock()
if !s.running {
return
}
if s.cancel != nil {
s.cancel()
}
s.wg.Wait()
s.running = false
}
// run is the main processing loop
func (s *Service) run(ctx context.Context) {
defer s.wg.Done()
ticker := time.NewTicker(PollInterval)
defer ticker.Stop()
for {
select {
case <-ctx.Done():
return
case <-ticker.C:
s.processQueue(ctx)
}
}
}
// processQueue processes pending messages in the queue
func (s *Service) processQueue(ctx context.Context) {
// Get all bots (we'd typically get this from bot store, but for now
// we'll rely on the queue to provide messages per bot)
// For now, process up to 10 messages at a time
messages, err := s.msgQueue.GetPendingMessages(0, 10)
if err != nil {
return
}
for _, msg := range messages {
select {
case <-ctx.Done():
return
default:
s.processMessage(ctx, msg)
}
}
}
// printJSON outputs a structured log message (imported from main package pattern)
func printJSON(v any) {
fmt.Printf("%+v\n", v)
}
// processMessage processes a single queued message
func (s *Service) processMessage(ctx context.Context, msg QueuedMessage) {
// Mark message as processing
if err := s.msgQueue.MarkAsProcessing(msg.ID); err != nil {
printJSON(map[string]any{
"event": "llm_process_failed",
"msg_id": msg.ID,
"step": "mark_as_processing",
"error": err.Error(),
})
return
}
printJSON(map[string]any{
"event": "llm_process_start",
"msg_id": msg.ID,
"bot_id": msg.BotID,
"from_node_id": msg.FromNodeID,
"text": msg.Text,
})
// Create processing context with timeout
procCtx, cancel := context.WithTimeout(ctx, MaxProcessingTime)
defer cancel()
// Get or create conversation for this bot
conv, err := s.convStore.GetOrCreateForBot(msg.BotID, msg.BotNodeID, msg.FromNodeID)
if err != nil {
errMsg := fmt.Sprintf("failed to get conversation: %v", err)
printJSON(map[string]any{"event": "llm_process_failed", "msg_id": msg.ID, "step": "get_conversation", "error": errMsg})
_ = s.msgQueue.MarkAsFailed(msg.ID, errMsg)
return
}
// Add the user message to the conversation
userMsg := message.ChatMessage{
Role: "user",
Content: s.formatUserMessage(msg),
}
if err := s.convStore.AddMessage(conv.ID, userMsg); err != nil {
errMsg := fmt.Sprintf("failed to add message: %v", err)
printJSON(map[string]any{"event": "llm_process_failed", "msg_id": msg.ID, "step": "add_message", "error": errMsg})
_ = s.msgQueue.MarkAsFailed(msg.ID, errMsg)
return
}
// Get the LLM profile
profile := s.llmState.ActiveProfile()
if profile == nil {
errMsg := "no active LLM profile - check if LLM providers are configured"
printJSON(map[string]any{"event": "llm_process_failed", "msg_id": msg.ID, "step": "get_profile", "error": errMsg})
_ = s.msgQueue.MarkAsFailed(msg.ID, errMsg)
return
}
printJSON(map[string]any{
"event": "llm_process_profile",
"msg_id": msg.ID,
"model": profile.Config.Model,
"base_url": profile.Config.BaseURL,
})
// Reload conversation to get updated messages
conv, err = s.convStore.Get(conv.ID)
if err != nil {
errMsg := fmt.Sprintf("failed to reload conversation: %v", err)
printJSON(map[string]any{"event": "llm_process_failed", "msg_id": msg.ID, "step": "reload_conversation", "error": errMsg})
_ = s.msgQueue.MarkAsFailed(msg.ID, errMsg)
return
}
// Get system prompt and tool enable flag from primary config
var systemPrompt string
enableTool := false
if s.toolConfigStore != nil {
systemPrompt, err = s.toolConfigStore.GetLLMPrimaryConfigSystemPrompt()
if err != nil {
printJSON(map[string]any{"event": "llm_system_prompt_warning", "msg_id": msg.ID, "error": err.Error()})
}
enableTool, err = s.toolConfigStore.GetLLMPrimaryConfigEnableTool()
if err != nil {
printJSON(map[string]any{"event": "llm_enable_tool_warning", "msg_id": msg.ID, "error": err.Error()})
}
}
// Print tool manager status for debugging
toolCount := 0
if s.toolMgr != nil {
tools := s.toolMgr.Tools()
toolCount = len(tools)
toolNames := make([]string, 0, toolCount)
for _, t := range tools {
toolNames = append(toolNames, t.Name())
}
printJSON(map[string]any{
"event": "llm_tool_manager_status",
"msg_id": msg.ID,
"tool_count": toolCount,
"tool_names": toolNames,
"enable_tool": enableTool,
})
}
// Run the tool loop to get augmented messages - pass system prompt to tool router
// Tool loop will handle system prompt and tool calling
var augmentedMessages []*model.ChatCompletionMessage
if enableTool && toolCount > 0 {
augmentedMessages, err = toolrouter.RunAgentToolLoop(procCtx, s.toolRouter, profile, systemPrompt, conv.Messages, s.toolMgr, nil)
if err != nil {
printJSON(map[string]any{"event": "llm_tool_loop_warning", "msg_id": msg.ID, "error": err.Error()})
// Continue with original messages if tool loop fails
}
}
printJSON(map[string]any{"event": "llm_process_completion_start", "msg_id": msg.ID, "has_system_prompt": systemPrompt != "", "augmented_messages": len(augmentedMessages)})
// Use augmented messages from tool loop (already includes system prompt and tool results)
// If augmented messages is empty or nil, fallback to original messages with system prompt
var reply string
if len(augmentedMessages) > 0 {
// Use augmented messages from tool loop (already converted to model.ChatCompletionMessage)
reply, err = completion.CompleteTextWithArkMessages(procCtx, profile, augmentedMessages, 512)
} else {
// Fallback to simple completion
reply, err = completion.CompleteText(procCtx, profile, systemPrompt, conv.Messages, 512)
}
if err != nil {
errMsg := fmt.Sprintf("LLM completion failed: %v", err)
printJSON(map[string]any{"event": "llm_process_failed", "msg_id": msg.ID, "step": "llm_completion", "error": errMsg})
_ = s.msgQueue.MarkAsFailed(msg.ID, errMsg)
return
}
printJSON(map[string]any{
"event": "llm_process_completion_success",
"msg_id": msg.ID,
"reply_len": len(reply),
})
// Clean and validate reply text
reply = cleanReplyText(reply)
printJSON(map[string]any{
"event": "llm_process_text_cleaned",
"msg_id": msg.ID,
"cleaned_len": len(reply),
})
// Truncate reply for Meshtastic (UTF-8 safe truncation)
if len([]byte(reply)) > MaxReplyLength {
reply = truncateUTF8(reply, MaxReplyLength-3) + "..."
printJSON(map[string]any{
"event": "llm_process_text_truncated",
"msg_id": msg.ID,
"truncated_len": len(reply),
})
}
// Final UTF-8 validation before sending
if !utf8.ValidString(reply) {
printJSON(map[string]any{
"event": "llm_process_utf8_warning",
"msg_id": msg.ID,
"message": "final text still invalid, using fallback",
})
reply = "抱歉,我暂时无法回复。请稍后再试。"
}
printJSON(map[string]any{
"event": "llm_process_final_check",
"msg_id": msg.ID,
"valid_utf8": utf8.ValidString(reply),
"final_len": len(reply),
})
// Add assistant reply to conversation
assistantMsg := message.ChatMessage{
Role: "assistant",
Content: reply,
}
if err := s.convStore.AddMessage(conv.ID, assistantMsg); err != nil {
// Non-fatal, continue
}
// Send the reply via the bot - 根据消息类型决定发送方式
// 频道消息:回复到原频道;私聊消息:回复给发送节点
var sendErr error
if msg.MessageType == "channel" && msg.ChannelID != nil && *msg.ChannelID != "" {
// 频道消息 - 回复到原频道
printJSON(map[string]any{"event": "llm_process_send_start", "msg_id": msg.ID, "channel_id": *msg.ChannelID, "message_type": "channel"})
sendErr = s.botSender.SendChannelText(procCtx, msg.BotID, *msg.ChannelID, reply)
} else {
// 私聊消息 - 回复给发送节点
printJSON(map[string]any{"event": "llm_process_send_start", "msg_id": msg.ID, "to_node_num": msg.FromNodeNum, "message_type": "direct"})
sendErr = s.botSender.SendDirectText(procCtx, msg.BotID, msg.FromNodeNum, reply)
}
if sendErr != nil {
errMsg := fmt.Sprintf("failed to send reply: %v", sendErr)
printJSON(map[string]any{"event": "llm_process_failed", "msg_id": msg.ID, "step": "send_reply", "error": errMsg})
_ = s.msgQueue.MarkAsFailed(msg.ID, errMsg)
return
}
// Mark message as processed
_ = s.msgQueue.MarkAsProcessed(msg.ID, reply)
printJSON(map[string]any{
"event": "llm_process_success",
"msg_id": msg.ID,
"reply": reply,
})
}
// formatUserMessage formats the incoming message for the LLM
func (s *Service) formatUserMessage(msg QueuedMessage) string {
var sb strings.Builder
if msg.LongName != nil && *msg.LongName != "" {
sb.WriteString(fmt.Sprintf("[来自 %s (%s)] ", *msg.LongName, msg.FromNodeID))
} else if msg.ShortName != nil && *msg.ShortName != "" {
sb.WriteString(fmt.Sprintf("[来自 %s (%s)] ", *msg.ShortName, msg.FromNodeID))
} else {
sb.WriteString(fmt.Sprintf("[来自 %s] ", msg.FromNodeID))
}
sb.WriteString(msg.Text)
return sb.String()
}
// cleanReplyText cleans LLM reply text to ensure it's valid for Meshtastic
func cleanReplyText(text string) string {
// Force convert to valid UTF-8 using rune-by-rune processing
v := make([]rune, 0, len(text))
for i, r := range text {
if r == utf8.RuneError {
_, size := utf8.DecodeRuneInString(text[i:])
if size == 1 {
continue // Skip invalid runes
}
}
// Skip all problematic characters
if r < 32 && r != '\n' && r != '\r' && r != '\t' {
continue
}
if r == 65533 || r == 0xfffd { // Unicode replacement character
continue
}
v = append(v, r)
}
text = string(v)
// Additional cleanup - use only explicitly allowed ASCII printable + CJK
var sb strings.Builder
for _, r := range text {
switch {
case r == '\n':
sb.WriteRune(' ') // Replace newlines with space for Meshtastic
case r == '\r' || r == '\t':
continue
case r >= 32 && r <= 126: // Printable ASCII
sb.WriteRune(r)
case r >= 0x4E00 && r <= 0x9FFF: // CJK Unified Ideographs
sb.WriteRune(r)
case r >= 0x3400 && r <= 0x4DBF: // CJK Extension A
sb.WriteRune(r)
case r >= 0x20000 && r <= 0x2A6DF: // CJK Extension B
sb.WriteRune(r)
case r >= 0xFF01 && r <= 0xFF5E: // Fullwidth ASCII variants
sb.WriteRune(r)
case r == 0x3002 || r == 0xFF1F || r == 0xFF01 || r == 0xFF0C || r == 0xFF1A: // Fullwidth punctuation
sb.WriteRune(r)
default:
continue // Skip all other characters
}
}
result := strings.TrimSpace(sb.String())
if result == "" {
result = "抱歉,我无法回复此消息。"
}
return result
}
// truncateUTF8 safely truncates a UTF-8 string to max bytes without breaking in the middle of a rune
func truncateUTF8(s string, maxBytes int) string {
if len([]byte(s)) <= maxBytes {
return s
}
bytes := []byte(s)
for i := maxBytes; i > 0; i-- {
if utf8.RuneStart(bytes[i]) {
return string(bytes[:i])
}
}
return ""
}