 wangjia
|
8ed1cfcc75
|
merge: gRPC server + hub + 跨实例 pub/sub [tsk_mF5RWPEwngai]
Resolve merge conflict between maestro/tsk__58l3wTLvaSn (gRPC nodes feature)
and main (admin backend + JWT config + OpenAPI routes):
- server/cmd/server/main.go: keep admin backend (startAdminIfConfigured) AND
add gRPC agent server (startGRPC) — both coexist as independent optional
listeners governed by their respective env vars
- server/internal/config/config.go: keep JWT fields (JWTPrivateKeyPath /
JWTKeyID / JWTPublicKeys) AND add gRPC fields (GRPCAddr / CAKeyPath /
CACertPath / GRPCCertPath / GRPCKeyPath)
- server/internal/nodes/: add all new files from tsk__58l3wTLvaSn
(hub.go, hub_test.go, load.go, handler_grpc.go, grpc_test.go,
service.go, store.go) — 18 tests, all passing
Test: go test ./internal/nodes/... → PASS (18/18)
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
|
2026-06-13 20:10:01 +08:00 |
|