后端:
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 个
196 lines
5.4 KiB
Go
196 lines
5.4 KiB
Go
package activescheduler
|
||
|
||
import (
|
||
"context"
|
||
"encoding/json"
|
||
"errors"
|
||
"strings"
|
||
"time"
|
||
|
||
activepb "github.com/LoveLosita/smartflow/backend/services/active_scheduler/rpc/pb"
|
||
contracts "github.com/LoveLosita/smartflow/backend/shared/contracts/activescheduler"
|
||
"github.com/zeromicro/go-zero/zrpc"
|
||
)
|
||
|
||
const (
|
||
defaultEndpoint = "127.0.0.1:9083"
|
||
defaultTimeout = 8 * time.Second
|
||
)
|
||
|
||
type ClientConfig struct {
|
||
Endpoints []string
|
||
Target string
|
||
Timeout time.Duration
|
||
}
|
||
|
||
// Client 是 gateway 侧 active-scheduler zrpc 的最小适配层。
|
||
//
|
||
// 职责边界:
|
||
// 1. 只负责跨进程 gRPC 调用和响应 JSON 透传,不碰 DAO、graph、outbox 或 job scanner;
|
||
// 2. confirm/apply 业务拒绝从 gRPC status 反解成共享 ApplyError,便于 API 层维持既有响应形状;
|
||
// 3. 复杂响应不在 gateway 重新建模,避免主动调度 DTO 复制扩散。
|
||
type Client struct {
|
||
rpc activepb.ActiveSchedulerClient
|
||
}
|
||
|
||
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: activepb.NewActiveSchedulerClient(zclient.Conn())}, nil
|
||
}
|
||
|
||
func (c *Client) DryRun(ctx context.Context, req contracts.ActiveScheduleRequest) (json.RawMessage, error) {
|
||
if err := c.ensureReady(); err != nil {
|
||
return nil, err
|
||
}
|
||
resp, err := c.rpc.DryRun(ctx, requestToPB(req))
|
||
if err != nil {
|
||
return nil, responseFromRPCError(err)
|
||
}
|
||
return jsonFromResponse(resp)
|
||
}
|
||
|
||
func (c *Client) Trigger(ctx context.Context, req contracts.ActiveScheduleRequest) (*contracts.TriggerResponse, error) {
|
||
if err := c.ensureReady(); err != nil {
|
||
return nil, err
|
||
}
|
||
resp, err := c.rpc.Trigger(ctx, requestToPB(req))
|
||
if err != nil {
|
||
return nil, responseFromRPCError(err)
|
||
}
|
||
return triggerFromPB(resp), nil
|
||
}
|
||
|
||
func (c *Client) CreatePreview(ctx context.Context, req contracts.ActiveScheduleRequest) (json.RawMessage, error) {
|
||
if err := c.ensureReady(); err != nil {
|
||
return nil, err
|
||
}
|
||
resp, err := c.rpc.CreatePreview(ctx, requestToPB(req))
|
||
if err != nil {
|
||
return nil, responseFromRPCError(err)
|
||
}
|
||
return jsonFromResponse(resp)
|
||
}
|
||
|
||
func (c *Client) GetPreview(ctx context.Context, req contracts.GetPreviewRequest) (json.RawMessage, error) {
|
||
if err := c.ensureReady(); err != nil {
|
||
return nil, err
|
||
}
|
||
resp, err := c.rpc.GetPreview(ctx, &activepb.GetPreviewRequest{
|
||
UserId: int64(req.UserID),
|
||
PreviewId: req.PreviewID,
|
||
})
|
||
if err != nil {
|
||
return nil, responseFromRPCError(err)
|
||
}
|
||
return jsonFromResponse(resp)
|
||
}
|
||
|
||
func (c *Client) ConfirmPreview(ctx context.Context, req contracts.ConfirmPreviewRequest) (json.RawMessage, error) {
|
||
if err := c.ensureReady(); err != nil {
|
||
return nil, err
|
||
}
|
||
resp, err := c.rpc.ConfirmPreview(ctx, confirmToPB(req))
|
||
if err != nil {
|
||
return nil, responseFromRPCError(err)
|
||
}
|
||
return jsonFromResponse(resp)
|
||
}
|
||
|
||
func (c *Client) ensureReady() error {
|
||
if c == nil || c.rpc == nil {
|
||
return errors.New("active-scheduler zrpc client is not initialized")
|
||
}
|
||
return nil
|
||
}
|
||
|
||
func requestToPB(req contracts.ActiveScheduleRequest) *activepb.ActiveScheduleRequest {
|
||
mockNowUnixNano := int64(0)
|
||
if req.MockNow != nil && !req.MockNow.IsZero() {
|
||
mockNowUnixNano = req.MockNow.UnixNano()
|
||
}
|
||
return &activepb.ActiveScheduleRequest{
|
||
UserId: int64(req.UserID),
|
||
TriggerType: req.TriggerType,
|
||
TargetType: req.TargetType,
|
||
TargetId: int64(req.TargetID),
|
||
FeedbackId: req.FeedbackID,
|
||
IdempotencyKey: req.IdempotencyKey,
|
||
MockNowUnixNano: mockNowUnixNano,
|
||
PayloadJson: []byte(req.Payload),
|
||
}
|
||
}
|
||
|
||
func confirmToPB(req contracts.ConfirmPreviewRequest) *activepb.ConfirmPreviewRequest {
|
||
requestedAtUnixNano := int64(0)
|
||
if !req.RequestedAt.IsZero() {
|
||
requestedAtUnixNano = req.RequestedAt.UnixNano()
|
||
}
|
||
return &activepb.ConfirmPreviewRequest{
|
||
UserId: int64(req.UserID),
|
||
PreviewId: req.PreviewID,
|
||
CandidateId: req.CandidateID,
|
||
Action: req.Action,
|
||
EditedChangesJson: []byte(req.EditedChanges),
|
||
IdempotencyKey: req.IdempotencyKey,
|
||
RequestedAtUnixNano: requestedAtUnixNano,
|
||
TraceId: req.TraceID,
|
||
}
|
||
}
|
||
|
||
func triggerFromPB(resp *activepb.TriggerResponse) *contracts.TriggerResponse {
|
||
if resp == nil {
|
||
return &contracts.TriggerResponse{}
|
||
}
|
||
var previewID *string
|
||
if resp.HasPreviewId {
|
||
value := resp.PreviewId
|
||
previewID = &value
|
||
}
|
||
return &contracts.TriggerResponse{
|
||
TriggerID: resp.TriggerId,
|
||
Status: resp.Status,
|
||
PreviewID: previewID,
|
||
DedupeHit: resp.DedupeHit,
|
||
TraceID: resp.TraceId,
|
||
}
|
||
}
|
||
|
||
func jsonFromResponse(resp *activepb.JSONResponse) (json.RawMessage, error) {
|
||
if resp == nil {
|
||
return nil, errors.New("active-scheduler zrpc service returned empty JSON response")
|
||
}
|
||
if len(resp.DataJson) == 0 {
|
||
return json.RawMessage("null"), nil
|
||
}
|
||
return json.RawMessage(resp.DataJson), 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
|
||
}
|