Skip to content

feat(m1): 实现领域核与基础设施适配器(domain 与 infra/{pg,redis,kafka,httpclient} 及真容器测试) - #9

Merged
awu123-create merged 1 commit into
mainfrom
feat/issue-5-m1-domain-infra
Nov 22, 2026
Merged

awu123-create merged 1 commit into
mainfrom
feat/issue-5-m1-domain-infra

Conversation

@awu123-create

Copy link
Copy Markdown
Owner

Summary

Part of #3
Closes #5
Blocked by #4(base 分支暂指向 feat/issue-4-m1-foundation,待 #8 合入 main 后变基切回 main)

交付 Milestone 1 领域核与四个基础设施适配器,并接入真容器适配器测试:

internal/
├── domain/                     # Endpoint / Task / DeliveryAttempt / errors / Payload Signature / Parse* + 黑盒单测 (domain_test)
└── infra/
    ├── pg/                     # GORM + pgx 仓储(非导出 PO、Parse* 枚举校验、显式传入 now、SKIP LOCKED、LISTEN/NOTIFY)+ 真 PG 临时库 store_test.go
    ├── redis/                  # Execution Lock(SetNX + Lua 验主续期/释放)+ 真 Redis DB 15 execution_lock_test.go
    ├── kafka/                  # 幂等生产者、连续 Offset 水位提交与分区撤销 + reader_test.go + 真 Broker stream_test.go
    └── httpclient/             # 原始字节直发、禁 3xx 重定向、响应截断、2xx 读体保护(无 M2 parseRetryAfter)+ 黑盒 sender_test.go

Evidence

  • Before: 切片 1(9df46b3)仅提供容器编排、Goose 迁移与基础 config/logger/metrics 包,尚无领域状态机与 PG/Redis/Kafka/HTTP 适配器。
  • After:
    • make fmt && make lint:0 issues.
    • make test(-short 快速单测):7 个包全绿
    • make test-integration(真实 PG / Kafka / Redis 容器):
      ok  github.com/awu123-create/ferry/internal/config           1.076s
      ok  github.com/awu123-create/ferry/internal/domain           1.078s
      ok  github.com/awu123-create/ferry/internal/infra/httpclient 1.243s
      ok  github.com/awu123-create/ferry/internal/infra/kafka      1.624s
      ok  github.com/awu123-create/ferry/internal/infra/pg         1.701s
      ok  github.com/awu123-create/ferry/internal/infra/redis      1.348s
      ok  github.com/awu123-create/ferry/internal/logger           1.080s
      
    • make build 与 pre-commit run --all-files:全部通过

Merge Danger

Door: Two-way

纯新增 internal/domain 与 internal/infra/* 业务及适配器代码,无数据库迁移变更,可通过 git revert 低成本回退。

Blast Radius: Isolated

  • 依赖关系由 .golangci.yml depguard 锁定:domain 零外部框架依赖,四个 infra/* 适配器互不依赖且不反向依赖上层。
  • 真实中间件测试在 -short 下跳过,在非 -short 下采用 Fail-Closed 策略(连不上服务直接失败)。

…容器测试)

改动内容:
- 领域核(internal/domain):新增 Endpoint / Task 聚合、DeliveryAttempt、错误 sentinel、边界常量、Idempotency Key 与 Header 一致性比对、RFC 7230 Header 校验、RFC 7493 jsontext.Value 载荷校验、Payload Signature 签验、状态机与 ParseTaskStatus / ParseAttemptErrorKind,配黑盒单测(package domain_test);移除 M1 未调用的 DeliveryResult.RetryAfter 字段。
- PostgreSQL 适配器(internal/infra/pg):实现私有 PO(统一走 domain.Parse* 校验枚举)、Endpoint CRUD 与 updated_at 乐观锁、幂等创建 Task 与同事务 Outbox、复合乐观锁 CAS 结算、抢锁取消、FOR UPDATE SKIP LOCKED Outbox 抢占派发(显式接收调用方 now)与 LISTEN/NOTIFY 专用连接,配隔离临时库真 PG 测试 store_test.go。
- Redis / Kafka / HTTP 适配器:实现 Redis Execution Lock(SetNX + Lua 验主续期/释锁)及 DB 15 真服务测试;实现 Kafka 幂等生产者、私有 offsetCoord 连续水位消费与真 Broker 恢复测试;实现出站 HTTP Sender(原始字节直发、禁 3xx 重定向、有界响应片段截断、2xx 读体保护;移除 M1 未调用的 parseRetryAfter)及黑盒单测(package httpclient_test)。
- 依赖整理:go.mod / go.sum 同步本切片实际依赖。

影响范围:
- 关联 #3、关闭 #5(依赖 #4);仅新增 internal/domain 与 internal/infra/{pg,redis,kafka,httpclient},不改动控制面、调度与入口包。

验证方式:
- make fmt && make lint:0 issues
- make test(go test -race -short ./...):全部单测通过
- make up 后 make test-integration(go test -race -count=1 ./...):7 个测试包(含真实 PG/Kafka/Redis 测试)全部通过
- make build && pre-commit run --all-files:全部通过

回滚方法:
- 执行 git revert <commit-hash> 即可完整回退本切片。
@awu123-create
awu123-create force-pushed the feat/issue-5-m1-domain-infra branch from 77ff4b5 to 8c7817e Compare November 22, 2026 08:19
@awu123-create
awu123-create merged commit 2038946 into main Nov 22, 2026
2 checks passed
@awu123-create
awu123-create deleted the feat/issue-5-m1-domain-infra branch November 22, 2026 08:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

feat(m1): 实现领域核与基础设施适配器(domain 与 infra/{pg,redis,kafka,httpclient} 及真容器测试)

1 participant