mirror of
https://github.com/memohai/Memoh.git
synced 2026-04-25 07:00:48 +09:00
Squashed commit of the following:
commit bcdb026ae43e4f95d0b2c4f9bd440a2df9d6b514 Author: Ran <16112591+chen-ran@users.noreply.github.com> Date: Thu Feb 12 17:10:32 2026 +0800 chore: update DEVELOPMENT.md commit30281742efMerge:ca5c6a15b05f13Author: BBQ <bbq@BBQdeMacBook-Air.local> Date: Thu Feb 12 15:49:17 2026 +0800 merge(github/main): integrate fx dependency injection framework Merge upstream fx refactor and adapt all services to use go.uber.org/fx for dependency injection. Resolve conflicts in main.go, server.go, and service constructors while preserving our domain model changes. - Fix telegram adapter panic on shutdown (double close channel) - Fix feishu adapter processing messages after stop - Increase directory lookup timeout from 2s to 5s commitca5c6a1866Author: BBQ <bbq@BBQdeMacBook-Air.local> Date: Thu Feb 12 15:33:09 2026 +0800 refactor(core): restructure conversation, channel and message domains - Rename chat module to conversation with flow-based architecture - Move channelidentities into channel/identities subpackage - Add channel/route for routing logic - Add message service with event hub - Add MCP providers: container, directory, schedule - Refactor Feishu/Telegram adapters with directory and stream support - Add platform management page and channel badges in web UI - Update database schema for conversations, messages and channel routes - Add @memoh/shared package for cross-package type definitions commit75e2ef0467Merge:d99ba3801cb6c8Author: BBQ <bbq@BBQdeMacBook-Air.local> Date: Thu Feb 12 14:45:49 2026 +0800 merge(github): merge github/main, resolve index.ts URL conflict Keep our defensive absolute-URL check in createAuthFetcher. commitd99ba38b7dMerge:860e20f35ce7d1Author: BBQ <bbq@BBQdeMacBook-Air.local> Date: Thu Feb 12 05:20:18 2026 +0800 merge(github): merge github/main, keep our code and docs/spec commit860e20fe70Author: BBQ <bbq@BBQdeMacBook-Air.local> Date: Wed Feb 11 22:13:27 2026 +0800 docs(docs): add concepts and style guides for VitePress site - Add concepts: identity-and-binding, index (en/zh) - Add style: terminology (en/zh) - Update index and zh/index - Update .vitepress/config.ts commita75fdb8040Author: BBQ <bbq@BBQdeMacBook-Air.local> Date: Wed Feb 11 17:37:16 2026 +0800 refactor(mcp): standardize unified tool gateway on go-sdk Split business executors from federation sources and migrate unified tool/federation transports to the official go-sdk for stricter MCP compliance and safer session lifecycle handling. Add targeted regression tests for accept compatibility, initialization retries, pending cleanup, and include updated swagger artifacts. commit02b33c8e85Author: BBQ <bbq@BBQdeMacBook-Air.local> Date: Wed Feb 11 15:42:21 2026 +0800 refactor(core): finalize user-centric identity and policy cleanup Unify auth and chat identity semantics around user_id, enforce personal-bot owner-only authorization, and remove legacy compatibility branches in integration tests. commit06e8619a37Author: BBQ <bbq@BBQdeMacBook-Air.local> Date: Wed Feb 11 14:47:03 2026 +0800 refactor(core): migrate channel identity and binding across app Align channel identity and bind flow across backend and app-facing layers, including generated swagger artifacts and package lock updates while excluding docs content changes.
This commit is contained in:
Ran
@@ -0,0 +1,286 @@
|
||||
package feishu
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"regexp"
|
||||
"strings"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
lark "github.com/larksuite/oapi-sdk-go/v3"
|
||||
larkim "github.com/larksuite/oapi-sdk-go/v3/service/im/v1"
|
||||
|
||||
"github.com/memohai/memoh/internal/channel"
|
||||
)
|
||||
|
||||
const (
|
||||
feishuStreamThinkingText = "Thinking..."
|
||||
feishuStreamPatchInterval = 700 * time.Millisecond
|
||||
feishuStreamMaxRunes = 8000
|
||||
)
|
||||
|
||||
type feishuOutboundStream struct {
|
||||
adapter *FeishuAdapter
|
||||
cfg channel.ChannelConfig
|
||||
target string
|
||||
reply *channel.ReplyRef
|
||||
client *lark.Client
|
||||
receiveID string
|
||||
receiveType string
|
||||
cardMessageID string
|
||||
textBuffer strings.Builder
|
||||
lastPatchedAt time.Time
|
||||
lastPatched string
|
||||
patchInterval time.Duration
|
||||
closed atomic.Bool
|
||||
}
|
||||
|
||||
func (s *feishuOutboundStream) Push(ctx context.Context, event channel.StreamEvent) error {
|
||||
if s == nil || s.adapter == nil {
|
||||
return fmt.Errorf("feishu stream not configured")
|
||||
}
|
||||
if s.closed.Load() {
|
||||
return fmt.Errorf("feishu stream is closed")
|
||||
}
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return ctx.Err()
|
||||
default:
|
||||
}
|
||||
switch event.Type {
|
||||
case channel.StreamEventStatus:
|
||||
if event.Status == channel.StreamStatusStarted {
|
||||
return s.ensureCard(ctx, feishuStreamThinkingText)
|
||||
}
|
||||
return nil
|
||||
case channel.StreamEventDelta:
|
||||
if event.Delta == "" {
|
||||
return nil
|
||||
}
|
||||
s.textBuffer.WriteString(event.Delta)
|
||||
if err := s.ensureCard(ctx, feishuStreamThinkingText); err != nil {
|
||||
return err
|
||||
}
|
||||
if time.Since(s.lastPatchedAt) < s.patchInterval && !strings.Contains(event.Delta, "\n") {
|
||||
return nil
|
||||
}
|
||||
return s.patchCard(ctx, s.textBuffer.String())
|
||||
case channel.StreamEventFinal:
|
||||
if event.Final == nil || event.Final.Message.IsEmpty() {
|
||||
return nil
|
||||
}
|
||||
msg := event.Final.Message
|
||||
finalText := strings.TrimSpace(msg.PlainText())
|
||||
if finalText == "" {
|
||||
finalText = strings.TrimSpace(s.textBuffer.String())
|
||||
}
|
||||
if finalText != "" {
|
||||
if err := s.ensureCard(ctx, feishuStreamThinkingText); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := s.patchCard(ctx, finalText); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if len(msg.Attachments) > 0 {
|
||||
media := msg
|
||||
media.Format = ""
|
||||
media.Text = ""
|
||||
media.Parts = nil
|
||||
media.Actions = nil
|
||||
media.Reply = nil
|
||||
return s.adapter.Send(ctx, s.cfg, channel.OutboundMessage{
|
||||
Target: s.target,
|
||||
Message: media,
|
||||
})
|
||||
}
|
||||
return nil
|
||||
case channel.StreamEventError:
|
||||
errText := strings.TrimSpace(event.Error)
|
||||
if errText == "" {
|
||||
return nil
|
||||
}
|
||||
if err := s.ensureCard(ctx, feishuStreamThinkingText); err != nil {
|
||||
return err
|
||||
}
|
||||
return s.patchCard(ctx, "Error: "+errText)
|
||||
default:
|
||||
return fmt.Errorf("unsupported stream event type: %s", event.Type)
|
||||
}
|
||||
}
|
||||
|
||||
func (s *feishuOutboundStream) Close(ctx context.Context) error {
|
||||
if s == nil {
|
||||
return nil
|
||||
}
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return ctx.Err()
|
||||
default:
|
||||
}
|
||||
s.closed.Store(true)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *feishuOutboundStream) ensureCard(ctx context.Context, text string) error {
|
||||
if strings.TrimSpace(s.cardMessageID) != "" {
|
||||
return nil
|
||||
}
|
||||
if s.client == nil {
|
||||
return fmt.Errorf("feishu client not configured")
|
||||
}
|
||||
content, err := buildFeishuStreamCardContent(text)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if s.reply != nil && strings.TrimSpace(s.reply.MessageID) != "" {
|
||||
replyReq := larkim.NewReplyMessageReqBuilder().
|
||||
MessageId(strings.TrimSpace(s.reply.MessageID)).
|
||||
Body(larkim.NewReplyMessageReqBodyBuilder().
|
||||
Content(content).
|
||||
MsgType(larkim.MsgTypeInteractive).
|
||||
Uuid(uuid.NewString()).
|
||||
Build()).
|
||||
Build()
|
||||
replyResp, err := s.client.Im.V1.Message.Reply(ctx, replyReq)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if replyResp == nil || !replyResp.Success() {
|
||||
code, msg := 0, ""
|
||||
if replyResp != nil {
|
||||
code, msg = replyResp.Code, replyResp.Msg
|
||||
}
|
||||
return fmt.Errorf("feishu stream reply failed: %s (code: %d)", msg, code)
|
||||
}
|
||||
if replyResp.Data == nil || replyResp.Data.MessageId == nil || strings.TrimSpace(*replyResp.Data.MessageId) == "" {
|
||||
return fmt.Errorf("feishu stream reply failed: empty message id")
|
||||
}
|
||||
s.cardMessageID = strings.TrimSpace(*replyResp.Data.MessageId)
|
||||
s.lastPatched = normalizeFeishuStreamText(text)
|
||||
s.lastPatchedAt = time.Now()
|
||||
return nil
|
||||
}
|
||||
createReq := larkim.NewCreateMessageReqBuilder().
|
||||
ReceiveIdType(s.receiveType).
|
||||
Body(larkim.NewCreateMessageReqBodyBuilder().
|
||||
ReceiveId(s.receiveID).
|
||||
MsgType(larkim.MsgTypeInteractive).
|
||||
Content(content).
|
||||
Uuid(uuid.NewString()).
|
||||
Build()).
|
||||
Build()
|
||||
createResp, err := s.client.Im.V1.Message.Create(ctx, createReq)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if createResp == nil || !createResp.Success() {
|
||||
code, msg := 0, ""
|
||||
if createResp != nil {
|
||||
code, msg = createResp.Code, createResp.Msg
|
||||
}
|
||||
return fmt.Errorf("feishu stream create failed: %s (code: %d)", msg, code)
|
||||
}
|
||||
if createResp.Data == nil || createResp.Data.MessageId == nil || strings.TrimSpace(*createResp.Data.MessageId) == "" {
|
||||
return fmt.Errorf("feishu stream create failed: empty message id")
|
||||
}
|
||||
s.cardMessageID = strings.TrimSpace(*createResp.Data.MessageId)
|
||||
s.lastPatched = normalizeFeishuStreamText(text)
|
||||
s.lastPatchedAt = time.Now()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *feishuOutboundStream) patchCard(ctx context.Context, text string) error {
|
||||
if strings.TrimSpace(s.cardMessageID) == "" {
|
||||
return fmt.Errorf("feishu stream card message not initialized")
|
||||
}
|
||||
contentText := normalizeFeishuStreamText(text)
|
||||
if contentText == s.lastPatched {
|
||||
return nil
|
||||
}
|
||||
content, err := buildFeishuStreamCardContent(contentText)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
patchReq := larkim.NewPatchMessageReqBuilder().
|
||||
MessageId(strings.TrimSpace(s.cardMessageID)).
|
||||
Body(larkim.NewPatchMessageReqBodyBuilder().
|
||||
Content(content).
|
||||
Build()).
|
||||
Build()
|
||||
patchResp, err := s.client.Im.V1.Message.Patch(ctx, patchReq)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if patchResp == nil || !patchResp.Success() {
|
||||
code, msg := 0, ""
|
||||
if patchResp != nil {
|
||||
code, msg = patchResp.Code, patchResp.Msg
|
||||
}
|
||||
return fmt.Errorf("feishu stream patch failed: %s (code: %d)", msg, code)
|
||||
}
|
||||
s.lastPatched = contentText
|
||||
s.lastPatchedAt = time.Now()
|
||||
return nil
|
||||
}
|
||||
|
||||
func buildFeishuStreamCardContent(text string) (string, error) {
|
||||
content := normalizeFeishuStreamText(text)
|
||||
content = processFeishuCardMarkdown(content)
|
||||
card := map[string]any{
|
||||
"config": map[string]any{
|
||||
"wide_screen_mode": true,
|
||||
"enable_forward": true,
|
||||
"update_multi": true,
|
||||
},
|
||||
"elements": []map[string]any{
|
||||
{
|
||||
"tag": "div",
|
||||
"fields": []map[string]any{
|
||||
{
|
||||
"is_short": false,
|
||||
"text": map[string]any{
|
||||
"tag": "lark_md",
|
||||
"content": content,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
data, err := json.Marshal(card)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return string(data), nil
|
||||
}
|
||||
|
||||
var feishuCardHeadingPrefix = regexp.MustCompile(`(?m)^#{1,6}\s+(.+)$`)
|
||||
|
||||
// processFeishuCardMarkdown normalizes markdown for Feishu card lark_md (e.g. ATX headings to bold).
|
||||
func processFeishuCardMarkdown(s string) string {
|
||||
s = strings.ReplaceAll(s, "\\n", "\n")
|
||||
s = feishuCardHeadingPrefix.ReplaceAllStringFunc(s, func(m string) string {
|
||||
parts := feishuCardHeadingPrefix.FindStringSubmatch(m)
|
||||
if len(parts) == 2 {
|
||||
return "**" + parts[1] + "**"
|
||||
}
|
||||
return m
|
||||
})
|
||||
return s
|
||||
}
|
||||
|
||||
func normalizeFeishuStreamText(text string) string {
|
||||
trimmed := strings.TrimSpace(text)
|
||||
if trimmed == "" {
|
||||
return feishuStreamThinkingText
|
||||
}
|
||||
runes := []rune(trimmed)
|
||||
if len(runes) <= feishuStreamMaxRunes {
|
||||
return trimmed
|
||||
}
|
||||
return "...\n" + string(runes[len(runes)-feishuStreamMaxRunes:])
|
||||
}
|
||||
Reference in New Issue
Block a user