mirror of
https://github.com/memohai/Memoh.git
synced 2026-04-27 07:16:19 +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:
@@ -14,7 +14,7 @@ var (
|
||||
logKey = ctxKey{}
|
||||
)
|
||||
|
||||
// Init 初始化全局日志
|
||||
// Init initializes the global logger with the given level and format (e.g. "debug", "json").
|
||||
func Init(level, format string) {
|
||||
var handler slog.Handler
|
||||
opts := &slog.HandlerOptions{
|
||||
@@ -31,7 +31,7 @@ func Init(level, format string) {
|
||||
slog.SetDefault(L)
|
||||
}
|
||||
|
||||
// FromContext 从 context 中获取 logger,如果不存在则返回全局 logger
|
||||
// FromContext returns the logger from ctx, or the global logger if not set.
|
||||
func FromContext(ctx context.Context) *slog.Logger {
|
||||
if l, ok := ctx.Value(logKey).(*slog.Logger); ok {
|
||||
return l
|
||||
@@ -39,7 +39,7 @@ func FromContext(ctx context.Context) *slog.Logger {
|
||||
return L
|
||||
}
|
||||
|
||||
// WithContext 将 logger 注入 context
|
||||
// WithContext stores the logger in ctx and returns the new context.
|
||||
func WithContext(ctx context.Context, l *slog.Logger) context.Context {
|
||||
return context.WithValue(ctx, logKey, l)
|
||||
}
|
||||
@@ -59,7 +59,7 @@ func parseLevel(level string) slog.Level {
|
||||
}
|
||||
}
|
||||
|
||||
// 快捷方法,支持强类型 slog.Attr 或松散的 key-value 对
|
||||
// Debug, Info, Warn, Error log with the global logger (slog.Attr or key-value pairs).
|
||||
func Debug(msg string, args ...any) { L.Debug(msg, args...) }
|
||||
func Info(msg string, args ...any) { L.Info(msg, args...) }
|
||||
func Warn(msg string, args ...any) { L.Warn(msg, args...) }
|
||||
|
||||
@@ -7,29 +7,25 @@ import (
|
||||
)
|
||||
|
||||
func TestInitAndLogging(t *testing.T) {
|
||||
// 测试 JSON 格式
|
||||
Init("debug", "json")
|
||||
|
||||
|
||||
if L.Enabled(context.Background(), slog.LevelDebug) != true {
|
||||
t.Error("expected debug level to be enabled")
|
||||
}
|
||||
|
||||
// 验证是否能正常输出(不崩溃)
|
||||
Info("test info message", "key", "value")
|
||||
}
|
||||
|
||||
func TestContextLogger(t *testing.T) {
|
||||
Init("info", "text")
|
||||
|
||||
// 创建一个带特定属性的 logger
|
||||
|
||||
expectedKey := "request_id"
|
||||
expectedValue := "12345"
|
||||
customLogger := L.With(expectedKey, expectedValue)
|
||||
|
||||
|
||||
ctx := WithContext(context.Background(), customLogger)
|
||||
extracted := FromContext(ctx)
|
||||
|
||||
// 这里简单验证提取出来的是否是同一个(或者功能一致)
|
||||
|
||||
if extracted == nil {
|
||||
t.Fatal("extracted logger should not be nil")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user