后端:
1.阶段 6 CP4/CP5 目录收口与共享边界纯化
- 将 backend 根目录收口为 services、client、gateway、cmd、shared 五个一级目录
- 收拢 bootstrap、inits、infra/kafka、infra/outbox、conv、respond、pkg、middleware,移除根目录旧实现与空目录
- 将 utils 下沉到 services/userauth/internal/auth,将 logic 下沉到 services/schedule/core/planning
- 将迁移期 runtime 桥接实现统一收拢到 services/runtime/{conv,dao,eventsvc,model},删除 shared/legacy 与未再被 import 的旧 service 实现
- 将 gateway/shared/respond 收口为 HTTP/Gin 错误写回适配,shared/respond 仅保留共享错误语义与状态映射
- 将 HTTP IdempotencyMiddleware 与 RateLimitMiddleware 收口到 gateway/middleware
- 将 GormCachePlugin 下沉到 shared/infra/gormcache,将共享 RateLimiter 下沉到 shared/infra/ratelimit,将 agent token budget 下沉到 services/agent/shared
- 删除 InitEino 兼容壳,收缩 cmd/internal/coreinit 仅保留旧组合壳残留域初始化语义
- 更新微服务迁移计划与桌面 checklist,补齐 CP4/CP5 当前切流点、目录终态与验证结果
- 完成 go test ./...、git diff --check 与最终真实 smoke;health、register/login、task/create+get、schedule/today、task-class/list、memory/items、agent chat/meta/timeline/context-stats 全部 200,SSE 合并结果为 CP5_OK 且 [DONE] 只有 1 个
182 lines
4.9 KiB
Go
182 lines
4.9 KiB
Go
package notification
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"strings"
|
|
"time"
|
|
|
|
notificationpb "github.com/LoveLosita/smartflow/backend/services/notification/rpc/pb"
|
|
contracts "github.com/LoveLosita/smartflow/backend/shared/contracts/notification"
|
|
"github.com/zeromicro/go-zero/zrpc"
|
|
)
|
|
|
|
const (
|
|
defaultEndpoint = "127.0.0.1:9082"
|
|
defaultTimeout = 6 * time.Second
|
|
)
|
|
|
|
type ClientConfig struct {
|
|
Endpoints []string
|
|
Target string
|
|
Timeout time.Duration
|
|
}
|
|
|
|
// Client 是 gateway 侧 notification zrpc 的最小适配层。
|
|
//
|
|
// 职责边界:
|
|
// 1. 只负责跨进程 gRPC 调用和响应转译,不碰 DB / provider / outbox 细节;
|
|
// 2. 服务端业务错误先通过 gRPC status 传输,再在这里反解回 respond.Response 风格;
|
|
// 3. 上层调用方仍然可以保持 `res, err :=` 的统一用法。
|
|
type Client struct {
|
|
rpc notificationpb.NotificationClient
|
|
}
|
|
|
|
func NewClient(cfg ClientConfig) (*Client, error) {
|
|
timeout := cfg.Timeout
|
|
if timeout <= 0 {
|
|
timeout = defaultTimeout
|
|
}
|
|
endpoints := normalizeEndpoints(cfg.Endpoints)
|
|
target := strings.TrimSpace(cfg.Target)
|
|
if len(endpoints) == 0 && target == "" {
|
|
endpoints = []string{defaultEndpoint}
|
|
}
|
|
|
|
zclient, err := zrpc.NewClient(zrpc.RpcClientConf{
|
|
Endpoints: endpoints,
|
|
Target: target,
|
|
NonBlock: true,
|
|
Timeout: int64(timeout / time.Millisecond),
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &Client{rpc: notificationpb.NewNotificationClient(zclient.Conn())}, nil
|
|
}
|
|
|
|
func (c *Client) GetFeishuWebhook(ctx context.Context, req contracts.GetFeishuWebhookRequest) (*contracts.ChannelResponse, error) {
|
|
if err := c.ensureReady(); err != nil {
|
|
return nil, err
|
|
}
|
|
resp, err := c.rpc.GetFeishuWebhook(ctx, ¬ificationpb.GetFeishuWebhookRequest{
|
|
UserId: int64(req.UserID),
|
|
})
|
|
if err != nil {
|
|
return nil, responseFromRPCError(err)
|
|
}
|
|
return channelFromResponse(resp)
|
|
}
|
|
|
|
func (c *Client) SaveFeishuWebhook(ctx context.Context, req contracts.SaveFeishuWebhookRequest) (*contracts.ChannelResponse, error) {
|
|
if err := c.ensureReady(); err != nil {
|
|
return nil, err
|
|
}
|
|
resp, err := c.rpc.SaveFeishuWebhook(ctx, ¬ificationpb.SaveFeishuWebhookRequest{
|
|
UserId: int64(req.UserID),
|
|
Enabled: req.Enabled,
|
|
WebhookUrl: req.WebhookURL,
|
|
AuthType: req.AuthType,
|
|
BearerToken: req.BearerToken,
|
|
})
|
|
if err != nil {
|
|
return nil, responseFromRPCError(err)
|
|
}
|
|
return channelFromResponse(resp)
|
|
}
|
|
|
|
func (c *Client) DeleteFeishuWebhook(ctx context.Context, req contracts.DeleteFeishuWebhookRequest) error {
|
|
if err := c.ensureReady(); err != nil {
|
|
return err
|
|
}
|
|
resp, err := c.rpc.DeleteFeishuWebhook(ctx, ¬ificationpb.DeleteFeishuWebhookRequest{
|
|
UserId: int64(req.UserID),
|
|
})
|
|
if err != nil {
|
|
return responseFromRPCError(err)
|
|
}
|
|
if resp == nil {
|
|
return errors.New("notification zrpc service returned empty delete response")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (c *Client) TestFeishuWebhook(ctx context.Context, req contracts.TestFeishuWebhookRequest) (*contracts.TestResult, error) {
|
|
if err := c.ensureReady(); err != nil {
|
|
return nil, err
|
|
}
|
|
resp, err := c.rpc.TestFeishuWebhook(ctx, ¬ificationpb.TestFeishuWebhookRequest{
|
|
UserId: int64(req.UserID),
|
|
})
|
|
if err != nil {
|
|
return nil, responseFromRPCError(err)
|
|
}
|
|
return testResultFromResponse(resp)
|
|
}
|
|
|
|
func (c *Client) ensureReady() error {
|
|
if c == nil || c.rpc == nil {
|
|
return errors.New("notification zrpc client is not initialized")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func channelFromResponse(resp *notificationpb.ChannelResponse) (*contracts.ChannelResponse, error) {
|
|
if resp == nil {
|
|
return nil, errors.New("notification zrpc service returned empty channel response")
|
|
}
|
|
var lastTestAt *time.Time
|
|
if value := timeFromUnixNano(resp.LastTestAtUnixNano); !value.IsZero() {
|
|
lastTestAt = &value
|
|
}
|
|
return &contracts.ChannelResponse{
|
|
Channel: resp.Channel,
|
|
Enabled: resp.Enabled,
|
|
Configured: resp.Configured,
|
|
WebhookURLMask: resp.WebhookUrlMask,
|
|
AuthType: resp.AuthType,
|
|
HasBearerToken: resp.HasBearerToken,
|
|
LastTestStatus: resp.LastTestStatus,
|
|
LastTestError: resp.LastTestError,
|
|
LastTestAt: lastTestAt,
|
|
}, nil
|
|
}
|
|
|
|
func testResultFromResponse(resp *notificationpb.TestResult) (*contracts.TestResult, error) {
|
|
if resp == nil {
|
|
return nil, errors.New("notification zrpc service returned empty test response")
|
|
}
|
|
channel, err := channelFromResponse(resp.Channel)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &contracts.TestResult{
|
|
Channel: *channel,
|
|
Status: resp.Status,
|
|
Outcome: resp.Outcome,
|
|
Message: resp.Message,
|
|
TraceID: resp.TraceId,
|
|
SentAt: timeFromUnixNano(resp.SentAtUnixNano),
|
|
Skipped: resp.Skipped,
|
|
Provider: resp.Provider,
|
|
}, nil
|
|
}
|
|
|
|
func normalizeEndpoints(values []string) []string {
|
|
endpoints := make([]string, 0, len(values))
|
|
for _, value := range values {
|
|
trimmed := strings.TrimSpace(value)
|
|
if trimmed != "" {
|
|
endpoints = append(endpoints, trimmed)
|
|
}
|
|
}
|
|
return endpoints
|
|
}
|
|
|
|
func timeFromUnixNano(value int64) time.Time {
|
|
if value <= 0 {
|
|
return time.Time{}
|
|
}
|
|
return time.Unix(0, value)
|
|
}
|