25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。
TypeScript aicliclickhousedatabasedatabase-clientdatabase-managementdockerguimcpmongodbmysqlpostgresqlredisrustsql-serversqlitetaurivue
feat(rocketmq): support proxy grpc sending with optional tls
圆头圆脑ca6d0c22e7cf
diff --git a/agents/README.md b/agents/README.mdindex 84cb3d096f..f2cbd77289 100644--- a/agents/README.md+++ b/agents/README.md@@ -52,11 +52,19 @@ Each agent runs as a standalone process and communicates with DBX via stdin/stdo| etcd2 | etcd 2.0–2.3, 3.0–3.5 with --enable-v2 (v2 API) | etcd v2 HTTP/JSON native Go agent || zookeeper | Apache ZooKeeper | go-zookeeper native agent || rabbitmq | RabbitMQ | amqp091-go native agent |-| rocketmq | Apache RocketMQ | rocketmq-admin-go native agent |+| rocketmq | Apache RocketMQ | rocketmq-admin-go (Remoting) and official Go v5 SDK (Proxy gRPC) native agent || iris | InterSystems IRIS | InterSystems IRIS JDBC || cache | InterSystems Caché | InterSystems Caché JDBC (CacheDB) |+## RocketMQ Connection Modes++The same `rocketmq` Agent supports NameServer/Remoting and the official RocketMQ 5.x Proxy gRPC protocol. Proxy mode requires the handshake feature `rocketmq_proxy_grpc`; configurations without a mode continue to use Remoting.++Proxy messaging uses the official Go v5 SDK's RPC, signing and protocol types with per-connection TLS and dialers. SDK v5.1.4 does not forward the high-level Producer's connection options, so this implementation does not replace global TLS switches or transport constructors. It registers Producer settings through Telemetry before checking Heartbeat, keeps the stream open, and sends ordinary messages with keys, tags and user properties. It does not map consumption to a non-mutating peek. Optional NameServer administration reuses Remoting and reports its own degraded state.++Run `go test ./...` and `go test -race ./...` in the RocketMQ driver directory. The official Proxy integration test is opt-in: prepare a NORMAL topic, set `ROCKETMQ_PROXY_INTEGRATION=1`, `ROCKETMQ_PROXY_ENDPOINT`, `ROCKETMQ_PROXY_TOPIC` and `ROCKETMQ_PROXY_TLS`, then run the test. It publishes a test message. The native Agent does not require Java; Java is only used by the local official-service fixture.+## Multi-JRE SupportMost Java agents target JRE 21. Native agents, such as `cassandra`, `duckdb`, `hive`, `iotdb`, `oracle`, `kingbase`, `tdengine`, `xugu`, `rabbitmq`, `rocketmq`, `zookeeper`, `etcd`, and `etcd2`, do not require a JRE. DBX downloads and manages the JRE 21 installation automatically for Java agents.diff --git a/agents/README.zh-CN.md b/agents/README.zh-CN.mdindex f8c66ff57d..c56f70dbc1 100644--- a/agents/README.zh-CN.md+++ b/agents/README.zh-CN.md@@ -50,11 +50,19 @@ DBX 的 Agent 驱动 —— 通过 JDBC 和原生数据库驱动支持各种数| etcd | etcd | jetcd || zookeeper | Apache ZooKeeper | go-zookeeper 原生 Agent || rabbitmq | RabbitMQ | amqp091-go 原生 agent |-| rocketmq | Apache RocketMQ | rocketmq-admin-go 原生 agent |+| rocketmq | Apache RocketMQ | rocketmq-admin-go(Remoting)及官方 Go v5 SDK(Proxy gRPC)原生 agent || iris | InterSystems IRIS | InterSystems IRIS JDBC || cache | InterSystems Caché | InterSystems Caché JDBC (CacheDB) |+## RocketMQ 接入模式++同一 `rocketmq` Agent 支持原有 NameServer/Remoting 接入与 RocketMQ 5.x 官方 Proxy gRPC 接入。Proxy 模式通过握手能力 `rocketmq_proxy_grpc` 协商;未指定模式的旧配置继续使用 Remoting,无需迁移驱动标识。++Proxy 消息使用官方 Go v5 SDK 的 RPC、签名和协议类型,并为每个连接独立配置 TLS 与拨号器;SDK v5.1.4 高层 Producer 未传递连接选项,因此此处不使用全局 TLS 开关或全局连接构造器替换。消息支持普通发送、Key、Tag 与用户属性,不将 gRPC 消费映射为无副作用预览。可选 NameServer 管理通道复用现有 Remoting 实现,失败时独立标记 degraded。++开发验证可运行 `go test ./...` 与 `go test -race ./...`。官方 Proxy 集成用例默认关闭,需要预先准备普通 Topic,并显式设置 `ROCKETMQ_PROXY_INTEGRATION=1`、`ROCKETMQ_PROXY_ENDPOINT`、`ROCKETMQ_PROXY_TOPIC` 及 `ROCKETMQ_PROXY_TLS`;集成用例会向该 Topic 发送测试消息。原生 Agent 不需要 JRE,Java 仅用于本地官方服务集成 fixture。+## 多 JRE 支持多数 Java agent 以 JRE 21 为目标。原生 agent(如 `cassandra`、`duckdb`、`hive`、`iotdb`、`oracle`、`kingbase`、`tdengine`、`xugu`、`rabbitmq`、`rocketmq` 和 `zookeeper`)不需要 JRE。对 Java agent,DBX 会自动下载并管理 JRE 21 安装。diff --git a/agents/drivers/rocketmq/connection.go b/agents/drivers/rocketmq/connection.goindex b334332507..7f13cf4c10 100644--- a/agents/drivers/rocketmq/connection.go+++ b/agents/drivers/rocketmq/connection.go@@ -22,15 +22,20 @@ type socksProxyConfig struct {}type connectionConfig struct {- NameServers []string- ClusterName string- BrokerAddr string- AccessKey string- SecretKey string- RequestTimeout time.Duration- ConnectTimeout time.Duration- TLSSkipVerify bool- SocksProxy *socksProxyConfig+ NameServers []string+ Mode string+ ProxyEndpoint string+ ProxyDialEndpoint string+ ProxyTLS bool+ ManagementEnabled bool+ ClusterName string+ BrokerAddr string+ AccessKey string+ SecretKey string+ RequestTimeout time.Duration+ ConnectTimeout time.Duration+ TLSSkipVerify bool+ SocksProxy *socksProxyConfig}func parseConnection(params map[string]any) (connectionConfig, error) {@@ -39,18 +44,43 @@ func parseConnection(params map[string]any) (connectionConfig, error) {connection = params}nameServers := splitAddresses(stringValue(connection, "namesrv_addr", "namesrvAddr"))- if len(nameServers) == 0 {+ mode := stringValue(connection, "connection_mode", "connectionMode")+ if mode == "" {+ mode = "remoting"+ }+ if mode != "remoting" && mode != "proxy" {+ return connectionConfig{}, fmt.Errorf("unsupported connection_mode: %s", mode)+ }+ management := mode == "remoting" || boolValue(connection, false, "management_enabled", "managementEnabled")+ if len(nameServers) == 0 && management {return connectionConfig{}, fmt.Errorf("namesrv_addr is required")}config := connectionConfig{- NameServers: nameServers,- ClusterName: stringValue(connection, "cluster_name", "clusterName"),- BrokerAddr: stringValue(connection, "broker_addr", "brokerAddr"),- AccessKey: stringValue(connection, "access_key", "accessKey"),- SecretKey: stringValue(connection, "secret_key", "secretKey"),- RequestTimeout: time.Duration(intValue(connection, int(defaultRequestTimeout/time.Millisecond), "request_timeout_ms")) * time.Millisecond,- ConnectTimeout: time.Duration(intValue(connection, int(defaultConnectTimeout/time.Millisecond), "connect_timeout_ms")) * time.Millisecond,- TLSSkipVerify: boolValue(connection, false, "tls_skip_verify"),+ Mode: mode, ManagementEnabled: management,+ ProxyEndpoint: stringValue(connection, "proxy_endpoint", "proxyEndpoint"),+ ProxyDialEndpoint: stringValue(connection, "proxy_dial_endpoint", "proxyDialEndpoint"),+ ProxyTLS: boolValue(connection, true, "proxy_tls", "proxyTls"),+ NameServers: nameServers,+ ClusterName: stringValue(connection, "cluster_name", "clusterName"),+ BrokerAddr: stringValue(connection, "broker_addr", "brokerAddr"),+ AccessKey: stringValue(connection, "access_key", "accessKey"),+ SecretKey: stringValue(connection, "secret_key", "secretKey"),+ RequestTimeout: time.Duration(intValue(connection, int(defaultRequestTimeout/time.Millisecond), "request_timeout_ms")) * time.Millisecond,+ ConnectTimeout: time.Duration(intValue(connection, int(defaultConnectTimeout/time.Millisecond), "connect_timeout_ms")) * time.Millisecond,+ TLSSkipVerify: boolValue(connection, false, "tls_skip_verify"),+ }+ if mode == "proxy" {+ if err := validateProxyEndpoint(config.ProxyEndpoint); err != nil {+ return connectionConfig{}, fmt.Errorf("proxy_endpoint: %w", err)+ }+ if config.ProxyDialEndpoint != "" {+ if err := validateProxyEndpoint(config.ProxyDialEndpoint); err != nil {+ return connectionConfig{}, fmt.Errorf("proxy_dial_endpoint: %w", err)+ }+ }+ if (config.AccessKey == "") != (config.SecretKey == "") {+ return connectionConfig{}, fmt.Errorf("proxy access_key and secret_key must be provided together")+ }}if config.RequestTimeout <= 0 {config.RequestTimeout = defaultRequestTimeout@@ -78,6 +108,9 @@ func (a *rocketMQAgent) connect(params map[string]any) (any, error) {if err != nil {return nil, err}+ if config.Mode == "proxy" {+ return a.connectProxy(config, false)+ }client, proxies, clusterInfo, err := buildClient(config)if err != nil {return nil, err@@ -92,13 +125,17 @@ func (a *rocketMQAgent) connect(params map[string]any) (any, error) {}a.mu.Lock()- oldClient, oldProxies := a.client, a.proxies+ oldClient, oldProxies, oldMessaging := a.client, a.proxies, a.messaging+ a.messaging = nila.client = clienta.proxies = proxiesa.connection = configa.clusterName = clusterNamea.brokerAddr = brokerAddra.mu.Unlock()+ if oldMessaging != nil {+ oldMessaging.Close()+ }if oldClient != nil {_ = oldClient.Close()}@@ -113,6 +150,9 @@ func (a *rocketMQAgent) testConnection(params map[string]any) (any, error) {if err != nil {return nil, err}+ if config.Mode == "proxy" {+ return a.connectProxy(config, true)+ }a.mu.RLock()if a.client != nil && a.connection.equal(config) {client, proxies := a.client, a.proxies@@ -233,11 +273,16 @@ func clusterTestResult(client *admin.Client, info *admin.ClusterInfo, config conreturn map[string]any{"ok": true, "clusterId": resolveClusterName(info, config.ClusterName),"brokers": brokers, "nodeCount": len(brokers), "controller": controller,- "aclEnabled": aclEnabled,+ "aclEnabled": aclEnabled,+ "capabilities": transportCapabilities(true),+ "channels": map[string]any{"messaging": map[string]any{"status": "ready"}, "management": map[string]any{"status": "ready"}},}}func (config connectionConfig) equal(other connectionConfig) bool {+ if config.Mode != other.Mode || config.ProxyEndpoint != other.ProxyEndpoint || config.ProxyDialEndpoint != other.ProxyDialEndpoint || config.ProxyTLS != other.ProxyTLS || config.ManagementEnabled != other.ManagementEnabled {+ return false+ }if config.ClusterName != other.ClusterName || config.BrokerAddr != other.BrokerAddr ||config.AccessKey != other.AccessKey || config.SecretKey != other.SecretKey ||config.RequestTimeout != other.RequestTimeout || config.ConnectTimeout != other.ConnectTimeout ||diff --git a/agents/drivers/rocketmq/go.mod b/agents/drivers/rocketmq/go.modindex 358661354c..3d70b8ca20 100644--- a/agents/drivers/rocketmq/go.mod+++ b/agents/drivers/rocketmq/go.mod@@ -4,25 +4,53 @@ go 1.25.0require (github.com/amigoer/rocketmq-admin-go v1.1.1+ github.com/apache/rocketmq-client-go/v2 v2.1.2+ github.com/apache/rocketmq-clients/golang/v5 v5.1.4+ go.uber.org/zap v1.27.0golang.org/x/net v0.44.0+ google.golang.org/grpc v1.72.0+ google.golang.org/protobuf v1.36.6)require (- github.com/apache/rocketmq-client-go/v2 v2.1.2 // indirect+ contrib.go.opencensus.io/exporter/ocagent v0.7.0 // indirect+ github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect+ github.com/dchest/siphash v1.2.3 // indirectgithub.com/emirpasic/gods v1.18.1 // indirect+ github.com/gabriel-vasile/mimetype v1.4.9 // indirect+ github.com/go-playground/locales v0.14.1 // indirect+ github.com/go-playground/universal-translator v0.18.1 // indirect+ github.com/go-playground/validator/v10 v10.26.0 // indirect+ github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirectgithub.com/golang/mock v1.6.0 // indirect+ github.com/golang/protobuf v1.5.4 // indirectgithub.com/google/uuid v1.6.0 // indirect+ github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirectgithub.com/json-iterator/go v1.1.12 // indirect+ github.com/klauspost/compress v1.18.0 // indirect+ github.com/leodido/go-urn v1.4.0 // indirectgithub.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirectgithub.com/modern-go/reflect2 v1.0.2 // indirect+ github.com/natefinch/lumberjack v2.0.0+incompatible // indirectgithub.com/patrickmn/go-cache v2.1.0+incompatible // indirect+ github.com/pierrec/lz4 v2.6.1+incompatible // indirectgithub.com/pkg/errors v0.9.1 // indirect+ github.com/rogpeppe/go-internal v1.16.0 // indirectgithub.com/sirupsen/logrus v1.9.4 // indirectgithub.com/tidwall/gjson v1.18.0 // indirectgithub.com/tidwall/match v1.2.0 // indirectgithub.com/tidwall/pretty v1.2.1 // indirect+ github.com/valyala/fastrand v1.1.0 // indirect+ go.opencensus.io v0.24.0 // indirectgo.uber.org/atomic v1.11.0 // indirect+ go.uber.org/multierr v1.11.0 // indirect+ golang.org/x/crypto v0.42.0 // indirect+ golang.org/x/sync v0.17.0 // indirectgolang.org/x/sys v0.42.0 // indirect+ golang.org/x/text v0.29.0 // indirect+ google.golang.org/api v0.230.0 // indirect+ google.golang.org/genproto/googleapis/api v0.0.0-20250422160041-2d3770c4ea7f // indirect+ google.golang.org/genproto/googleapis/rpc v0.0.0-20250422160041-2d3770c4ea7f // indirectgopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirectstathat.com/c/consistent v1.0.0 // indirect)diff --git a/agents/drivers/rocketmq/go.sum b/agents/drivers/rocketmq/go.sumindex 3e53cfa55c..b2f8a6e27f 100644--- a/agents/drivers/rocketmq/go.sum+++ b/agents/drivers/rocketmq/go.sum@@ -1,61 +1,178 @@+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=+cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=+cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=+cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=+cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=+cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=+cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=+cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=+cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=+cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=+cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=+cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=+contrib.go.opencensus.io/exporter/ocagent v0.7.0 h1:BEfdCTXfMV30tLZD8c9n64V/tIZX5+9sXiuFLnrr1k8=+contrib.go.opencensus.io/exporter/ocagent v0.7.0/go.mod h1:IshRmMJBhDfFj5Y67nVhMYTTIze91RUeT73ipWKs/GY=+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=+github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=github.com/amigoer/rocketmq-admin-go v1.1.1 h1:DhV7c1lukiB5Qy115/b4a7yE3XXLMRYJ/Jz77miLZoc=github.com/amigoer/rocketmq-admin-go v1.1.1/go.mod h1:I/N1RG6IvNEP2APjKh66Tg7YbZyW9aetiEEl8ziuYPs=+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=github.com/apache/rocketmq-client-go/v2 v2.1.2 h1:yt73olKe5N6894Dbm+ojRf/JPiP0cxfDNNffKwhpJVg=github.com/apache/rocketmq-client-go/v2 v2.1.2/go.mod h1:6I6vgxHR3hzrvn+6n/4mrhS+UTulzK/X9LB2Vk1U5gE=+github.com/apache/rocketmq-clients/golang/v5 v5.1.4 h1:fGUbM4wpf3G/4UKxpQq7zg1h8eQdCpwcgxvChFJnr+I=+github.com/apache/rocketmq-clients/golang/v5 v5.1.4/go.mod h1:qg/POLGOcuU33gPbi2yA6Ak4kTPydBBamrQU+bl0WMU=+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=+github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g=+github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw=github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=+github.com/dchest/siphash v1.2.3 h1:QXwFc8cFOR2dSa/gE6o/HokBMWtLUaNDVd+22aKHeEA=+github.com/dchest/siphash v1.2.3/go.mod h1:0NvQU092bT0ipiFN++/rXm69QG9tVxLAlQHIXMPAkHc=github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=+github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY=+github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok=+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=+github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=+github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=+github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=+github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=+github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=+github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=+github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=+github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=+github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc/iMaVtFbr3Sw2k=+github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=+github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=+github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=+github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=+github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=+github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=+github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=+github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw=+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo=+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI=+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=+github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=+github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=+github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=+github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=+github.com/natefinch/lumberjack v2.0.0+incompatible h1:4QJd3OLAMgj7ph+yZTuX13Ld4UpgHp07nNdFX7mqFfM=+github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod h1:Wi9p2TTF5DG5oU+6YfsmYQpsTIOm0B1VNzQg9Mw6nPk=github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=@@ -69,11 +186,20 @@ github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlgithub.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=+github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM=+github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=+github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=+github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=+github.com/rogpeppe/go-internal v1.16.0 h1:O9DK+vNMDVGLr2BeZqmpLeMjiMNkuXfcqntWbZV6S5g=+github.com/rogpeppe/go-internal v1.16.0/go.mod h1:DrUVZyrJU+txYW5/1kwtXQSMFio52ZOxX7yM1VHvnxs=github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g=@@ -83,9 +209,15 @@ github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKgithub.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=github.com/tidwall/gjson v1.13.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=@@ -97,41 +229,145 @@ github.com/tidwall/match v1.2.0/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTgithub.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=+github.com/valyala/fastrand v1.1.0 h1:f+5HkLW4rsgzdNoleUOB69hyT9IlD2ZQh9GyDMfb5G8=+github.com/valyala/fastrand v1.1.0/go.mod h1:HWqCzkrkg6QXT8V2EXWvXCoow7vLwOFN002oeRzjapQ=+github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=+go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=+go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=+go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=+go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=+go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=+go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=+go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=+go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M=+go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE=+go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=+go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=+go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=+go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=+go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs=+go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=+go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=+go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=+golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=+golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=+golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=+golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=+golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=+golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=+golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=+golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=+golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=+golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=+golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=+golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=+golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=+golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=+golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=+golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=+golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=+golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=@@ -143,41 +379,151 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBcgolang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=+golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=+golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=+golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=+golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=+golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=+golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=+golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=+golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=+golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=+golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=+golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=+golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=+golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=+golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=+google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=+google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=+google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=+google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=+google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=+google.golang.org/api v0.25.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=+google.golang.org/api v0.230.0 h1:2u1hni3E+UXAXrONrrkfWpi/V6cyKVAbfGVeGtC3OxM=+google.golang.org/api v0.230.0/go.mod h1:aqvtoMk7YkiXx+6U12arQFExiRV9D/ekvMCwCd/TksQ=+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=+google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=+google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=+google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=+google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=+google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=+google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=+google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=+google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=+google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=+google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=+google.golang.org/genproto/googleapis/api v0.0.0-20250422160041-2d3770c4ea7f h1:tjZsroqekhC63+WMqzmWyW5Twj/ZfR5HAlpd5YQ1Vs0=+google.golang.org/genproto/googleapis/api v0.0.0-20250422160041-2d3770c4ea7f/go.mod h1:Cd8IzgPo5Akum2c9R6FsXNaZbH3Jpa2gpHlW89FqlyQ=+google.golang.org/genproto/googleapis/rpc v0.0.0-20250422160041-2d3770c4ea7f h1:N/PrbTw4kdkqNRzVfWPrBekzLuarFREcbFOiOLkXon4=+google.golang.org/genproto/googleapis/rpc v0.0.0-20250422160041-2d3770c4ea7f/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=+google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=+google.golang.org/grpc v1.72.0 h1:S7UkcVa60b5AAQTaO6ZKamFp1zMZSU0fGDK2WZLbBnM=+google.golang.org/grpc v1.72.0/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=+google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=+honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=stathat.com/c/consistent v1.0.0 h1:ezyc51EGcRPJUxfHGSgJjWzJdj3NiMU9pNfLNGiXV0c=stathat.com/c/consistent v1.0.0/go.mod h1:QkzMWzcbB+yQBL2AttO6sgsQS/JSTapcDISJalmCDS0=diff --git a/agents/drivers/rocketmq/main.go b/agents/drivers/rocketmq/main.goindex 316303fb69..6ca9f59aa1 100644--- a/agents/drivers/rocketmq/main.go+++ b/agents/drivers/rocketmq/main.go@@ -5,6 +5,8 @@ import ("encoding/json""fmt""os"++ rmq "github.com/apache/rocketmq-clients/golang/v5")const maxRPCMessageBytes = 32 * 1024 * 1024@@ -29,6 +31,9 @@ type rpcResponse struct {}func main() {+ // stdout carries JSON-RPC exclusively, regardless of the parent environment.+ _ = os.Setenv(rmq.ENABLE_CONSOLE_APPENDER, "false")+ rmq.ResetLogger()agent := newRocketMQAgent()defer agent.close()diff --git a/agents/drivers/rocketmq/main_test.go b/agents/drivers/rocketmq/main_test.goindex 543d69be2e..d432ddd13b 100644--- a/agents/drivers/rocketmq/main_test.go+++ b/agents/drivers/rocketmq/main_test.go@@ -4,6 +4,7 @@ import ("bufio""bytes""context"+ "crypto/x509""encoding/json""fmt""os"@@ -91,6 +92,19 @@ func TestRocketMQAgentHelperProcess(t *testing.T) {if os.Getenv(rocketMQHelperProcessEnv) != "1" {return}+ if rootFile := os.Getenv("DBX_ROCKETMQ_TEST_ROOTS"); rootFile != "" {+ // macOS uses its platform verifier and ignores SSL_CERT_FILE. This is+ // isolated to a test child and never changes the user's keychain.+ pem, err := os.ReadFile(rootFile)+ if err != nil {+ t.Fatal(err)+ }+ roots := x509.NewCertPool()+ if !roots.AppendCertsFromPEM(pem) {+ t.Fatal("invalid test roots")+ }+ x509.SetFallbackRoots(roots)+ }main()os.Exit(0)}diff --git a/agents/drivers/rocketmq/messages.go b/agents/drivers/rocketmq/messages.goindex c3854365d5..a011e5798a 100644--- a/agents/drivers/rocketmq/messages.go+++ b/agents/drivers/rocketmq/messages.go@@ -329,6 +329,18 @@ func (a *rocketMQAgent) queryMessageTrace(params map[string]any) (any, error) {}func (a *rocketMQAgent) sendMessage(params map[string]any) (any, error) {+ a.mu.RLock()+ messaging, mode := a.messaging, a.connection.Mode+ a.mu.RUnlock()+ if mode == "proxy" {+ if messaging == nil {+ return nil, fmt.Errorf("RocketMQ agent is not connected")+ }+ return messaging.Send(params)+ }+ if _, _, err := a.requireClient(); err != nil {+ return nil, err+ }topic, err := requireString(params, "topic")if err != nil {return nil, errdiff --git a/agents/drivers/rocketmq/proxy.go b/agents/drivers/rocketmq/proxy.gonew file mode 100644index 0000000000..a4620dbe35--- /dev/null+++ b/agents/drivers/rocketmq/proxy.go@@ -0,0 +1,518 @@+package main++import (+ "context"+ "crypto/tls"+ "encoding/base64"+ "fmt"+ "net"+ "os"+ "strconv"+ "strings"+ "sync"+ "time"+ "unicode/utf8"++ admin "github.com/amigoer/rocketmq-admin-go"+ rmq "github.com/apache/rocketmq-clients/golang/v5"+ "github.com/apache/rocketmq-clients/golang/v5/credentials"+ v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"+ "go.uber.org/zap"+ "golang.org/x/net/proxy"+ "google.golang.org/grpc"+ grpccredentials "google.golang.org/grpc/credentials"+ "google.golang.org/grpc/credentials/insecure"+ "google.golang.org/protobuf/types/known/durationpb"+ "google.golang.org/protobuf/types/known/timestamppb"+)++// The SDK Producer does not forward its client connection options in v5.1.4.+// Use its authenticated RPC/protocol APIs with strictly per-connection options.+// No SDK global transport constructors or TLS switches are changed.+type proxyMessagingClient struct {+ rpc rmq.RpcClient+ signer rmq.Client+ config connectionConfig+ ctx context.Context+ cancel context.CancelFunc+ closeOnce sync.Once+ telemetry v2.MessagingService_TelemetryClient+}++func validateProxyEndpoint(endpoint string) error {+ if strings.ContainsAny(endpoint, "/;,@?# \t\r\n") {+ return fmt.Errorf("expected a single host:port")+ }+ host, port, err := net.SplitHostPort(endpoint)+ if err != nil || host == "" {+ return fmt.Errorf("expected a single host:port")+ }+ n, err := strconv.Atoi(port)+ if err != nil || n <= 0 || n > 65535 {+ return fmt.Errorf("invalid port")+ }+ return nil+}++func newProxyMessagingClient(setupCtx context.Context, config connectionConfig) (*proxyMessagingClient, error) {+ cfg := &rmq.Config{Endpoint: config.ProxyEndpoint}+ if config.AccessKey != "" {+ cfg.Credentials = &credentials.SessionCredentials{AccessKey: config.AccessKey, AccessSecret: config.SecretKey}+ }+ signer, err := rmq.NewClient(cfg)+ if err != nil {+ return nil, err+ }+ ctx, cancel := context.WithCancel(context.Background())+ p := &proxyMessagingClient{signer: signer, config: config, ctx: ctx, cancel: cancel}+ host, _, _ := net.SplitHostPort(config.ProxyEndpoint)+ transport := grpccredentials.TransportCredentials(insecure.NewCredentials())+ if config.ProxyTLS {+ transport = grpccredentials.NewTLS(&tls.Config{MinVersion: tls.VersionTLS12, ServerName: host})+ }+ direct := &net.Dialer{Timeout: config.ConnectTimeout}+ var dialer proxy.ContextDialer = direct+ if socks := config.SocksProxy; socks != nil {+ var auth *proxy.Auth+ if socks.Username != "" || socks.Password != "" {+ auth = &proxy.Auth{User: socks.Username, Password: socks.Password}+ }+ d, e := proxy.SOCKS5("tcp", net.JoinHostPort(socks.Host, strconv.Itoa(socks.Port)), auth, direct)+ if e != nil {+ cancel()+ return nil, e+ }+ var ok bool+ dialer, ok = d.(proxy.ContextDialer)+ if !ok {+ cancel()+ return nil, fmt.Errorf("SOCKS dialer does not support cancellation")+ }+ }+ dial := func(callCtx context.Context, _ string) (net.Conn, error) {+ target := config.ProxyEndpoint+ if config.ProxyDialEndpoint != "" {+ target = config.ProxyDialEndpoint+ }+ return dialer.DialContext(callCtx, "tcp", target)+ }+ dialTimeout := config.ConnectTimeout+ if deadline, ok := setupCtx.Deadline(); ok {+ dialTimeout = time.Until(deadline)+ }+ if dialTimeout <= 0 {+ cancel()+ return nil, context.DeadlineExceeded+ }+ p.rpc, err = rmq.NewRpcClient(config.ProxyEndpoint, rmq.WithRpcClientConnOption(+ rmq.WithContext(ctx), rmq.WithDialTimeout(dialTimeout), rmq.WithZapLogger(zap.NewNop()),+ rmq.WithDialOptions(grpc.WithTransportCredentials(transport), grpc.WithContextDialer(dial), grpc.WithDisableRetry()),+ ))+ if err != nil {+ cancel()+ return nil, fmt.Errorf("connect RocketMQ Proxy: %w", err)+ }+ if err = p.register(setupCtx); err != nil {+ p.Close()+ return nil, err+ }+ if err = p.heartbeat(setupCtx); err != nil {+ p.Close()+ return nil, err+ }+ go p.keepAlive()+ return p, nil+}++func (p *proxyMessagingClient) Close() {+ if p != nil {+ p.closeOnce.Do(func() {+ p.cancel()+ if p.rpc != nil {+ _ = p.rpc.GracefulStop()+ }+ })+ }+}+func proxyStatus(operation string, status *v2.Status) error {+ if status == nil {+ return fmt.Errorf("RocketMQ Proxy %s: missing status", operation)+ }+ if status.Code != v2.Code_OK {+ return fmt.Errorf("RocketMQ Proxy %s: %s (%s)", operation, status.Code, status.Message)+ }+ return nil+}+func (p *proxyMessagingClient) register(setupCtx context.Context) error {+ stream, err := p.rpc.Telemetry(p.signer.Sign(p.ctx))+ if err != nil {+ return fmt.Errorf("RocketMQ Proxy telemetry: %w", err)+ }+ p.telemetry = stream+ kind := v2.ClientType_PRODUCER+ host, _ := os.Hostname()+ command := &v2.TelemetryCommand{Command: &v2.TelemetryCommand_Settings{Settings: &v2.Settings{+ ClientType: &kind, AccessPoint: proxyProtoEndpoints(p.config.ProxyEndpoint), RequestTimeout: durationpb.New(p.config.RequestTimeout),+ BackoffPolicy: &v2.RetryPolicy{MaxAttempts: 1}, PubSub: &v2.Settings_Publishing{Publishing: &v2.Publishing{}},+ UserAgent: &v2.UA{Language: v2.Language_GOLANG, Version: "5.1.4", Platform: "DBX", Hostname: host},+ }}}+ ready := make(chan error, 1)+ go func() {+ if err := stream.Send(command); err != nil {+ ready <- err+ p.Close()+ return+ }+ first := true+ for {+ response, err := stream.Recv()+ if err != nil {+ if first {+ ready <- err+ }+ p.Close()+ return+ }+ if response.GetStatus() != nil {+ if err = proxyStatus("telemetry", response.GetStatus()); err != nil {+ if first {+ ready <- err+ }+ p.Close()+ return+ }+ }+ if first && response.GetSettings() != nil {+ ready <- nil+ first = false+ }+ }+ }()+ select {+ case err := <-ready:+ if err != nil {+ return fmt.Errorf("RocketMQ Proxy settings: %w", err)+ }+ return nil+ case <-setupCtx.Done():+ return fmt.Errorf("RocketMQ Proxy settings: %w", setupCtx.Err())+ }+}++func (p *proxyMessagingClient) keepAlive() {+ ticker := time.NewTicker(10 * time.Second)+ defer ticker.Stop()+ for {+ select {+ case <-p.ctx.Done():+ return+ case <-ticker.C:+ ctx, cancel := context.WithTimeout(p.ctx, p.config.RequestTimeout)+ err := p.heartbeat(ctx)+ cancel()+ if err != nil {+ p.Close()+ return+ }+ }+ }+}++func (p *proxyMessagingClient) heartbeat(ctx context.Context) error {+ response, err := p.rpc.HeartBeat(p.signer.Sign(ctx), &v2.HeartbeatRequest{ClientType: v2.ClientType_PRODUCER})+ if err != nil {+ return fmt.Errorf("RocketMQ Proxy heartbeat: %w", err)+ }+ return proxyStatus("heartbeat", response.GetStatus())+}++func (p *proxyMessagingClient) Send(params map[string]any) (any, error) {+ message, err := ordinaryProxyMessage(params)+ if err != nil {+ return nil, err+ }+ ctx, cancel := context.WithTimeout(p.ctx, p.config.RequestTimeout)+ defer cancel()+ // Keep messaging on the configured Proxy gRPC endpoint, including dial+ // overrides. Proxy resolves physical broker endpoints itself.+ route, err := p.rpc.QueryRoute(p.signer.Sign(ctx), &v2.QueryRouteRequest{Topic: message.Topic, Endpoints: proxyProtoEndpoints(p.config.ProxyEndpoint)})+ if err != nil {+ return nil, fmt.Errorf("RocketMQ Proxy route: %w", err)+ }+ if err = proxyStatus("route", route.GetStatus()); err != nil {+ return nil, err+ }+ var selected *v2.MessageQueue+ for _, queue := range route.GetMessageQueues() {+ if queue == nil || queue.GetId() < 0 || queue.GetTopic().GetName() != message.Topic.Name {+ continue+ }+ if queue.Permission != v2.Permission_WRITE && queue.Permission != v2.Permission_READ_WRITE {+ continue+ }+ normal := false+ for _, kind := range queue.AcceptMessageTypes {+ if kind == v2.MessageType_NORMAL {+ normal = true+ }+ }+ if normal {+ selected = queue+ break+ }+ }+ if selected == nil {+ return nil, fmt.Errorf("unsupported: no writable NORMAL message queue for topic %s", message.Topic.Name)+ }+ // Ordinary Proxy sends select their physical queue server-side. Route data+ // establishes eligibility only; the send receipt does not expose queue ID.+ // One attempt only: retrying an ambiguous send can duplicate application data.+ response, err := p.rpc.SendMessage(p.signer.Sign(ctx), &v2.SendMessageRequest{Messages: []*v2.Message{message}})+ if err != nil {+ return nil, fmt.Errorf("RocketMQ Proxy send (delivery outcome may be unknown): %w", err)+ }+ if err = proxyStatus("send", response.GetStatus()); err != nil {+ return nil, err+ }+ entries := response.GetEntries()+ if len(entries) != 1 {+ return nil, fmt.Errorf("RocketMQ Proxy send: expected one result entry, got %d", len(entries))+ }+ for _, entry := range entries {+ if err = proxyStatus("send entry", entry.GetStatus()); err != nil {+ return nil, err+ }+ if entry.GetMessageId() == "" {+ return nil, fmt.Errorf("RocketMQ Proxy send: missing message ID")+ }+ }+ return map[string]any{"ok": true, "topic": message.Topic.Name, "partition": nil, "offset": entries[0].Offset, "timestamp": time.Now().UnixMilli(), "messageId": entries[0].MessageId}, nil+}++func proxyProtoEndpoints(endpoint string) *v2.Endpoints {+ host, port, _ := net.SplitHostPort(endpoint)+ n, _ := strconv.Atoi(port)+ scheme := v2.AddressScheme_DOMAIN_NAME+ if ip := net.ParseIP(host); ip != nil {+ scheme = v2.AddressScheme_IPv4+ if ip.To4() == nil {+ scheme = v2.AddressScheme_IPv6+ }+ }+ return &v2.Endpoints{Scheme: scheme, Addresses: []*v2.Address{{Host: host, Port: int32(n)}}}+}++// Reject special semantics rather than silently dropping requested guarantees.+func ordinaryProxyMessage(params map[string]any) (*v2.Message, error) {+ for _, key := range []string{"partition", "delay", "delayLevel", "delayTimeLevel", "delay_level", "deliveryTimestamp", "delivery_timestamp", "messageGroup", "message_group", "fifo", "transaction", "transactional", "transactionId", "transaction_id", "priority", "liteTopic", "lite_topic", "retry", "reconsumeTimes", "reconsume_times", "maxReconsumeTimes", "max_reconsume_times"} {+ if value, ok := params[key]; ok && value != nil {+ return nil, fmt.Errorf("unsupported: Proxy ordinary messages do not support %s", key)+ }+ }+ if typ := stringValue(params, "messageType", "message_type"); typ != "" && strings.ToUpper(typ) != "NORMAL" {+ return nil, fmt.Errorf("unsupported Proxy message type: %s", typ)+ }+ text := func(key string) (string, error) {+ value, ok := params[key]+ if !ok || value == nil {+ return "", nil+ }+ s, ok := value.(string)+ if !ok || !utf8.ValidString(s) {+ return "", fmt.Errorf("%s must be a UTF-8 string", key)+ }+ return s, nil+ }+ topic, err := text("topic")+ if err != nil {+ return nil, err+ }+ if strings.TrimSpace(topic) == "" || topic != strings.TrimSpace(topic) || strings.ContainsAny(topic, "\x00\r\n") {+ return nil, fmt.Errorf("valid topic is required")+ }+ if strings.HasPrefix(topic, "%RETRY%") || strings.HasPrefix(topic, "%DLQ%") {+ return nil, fmt.Errorf("unsupported: retry and dead-letter topics cannot receive ordinary Proxy messages")+ }+ encoded, err := text("payloadBase64")+ if err != nil {+ return nil, err+ }+ var body []byte+ if _, has := params["payloadBase64"]; has {+ body, err = base64.StdEncoding.DecodeString(encoded)+ if err != nil {+ return nil, fmt.Errorf("invalid payloadBase64: %w", err)+ }+ } else {+ key := "payload"+ if _, ok := params[key]; !ok {+ key = "payloadText"+ }+ value, e := text(key)+ if e != nil {+ return nil, e+ }+ body = []byte(value)+ }+ if len(body) > 4*1024*1024 {+ return nil, fmt.Errorf("Proxy message body exceeds 4 MiB")+ }+ key, err := text("key")+ if err != nil {+ return nil, err+ }+ tag, err := text("tag")+ if err != nil {+ return nil, err+ }+ properties := map[string]string{}+ for _, field := range []string{"headers", "properties", "customProps"} {+ raw, exists := params[field]+ if !exists || raw == nil {+ continue+ }+ headers, ok := raw.(map[string]any)+ if !ok {+ return nil, fmt.Errorf("%s must be an object of strings", field)+ }+ for name, value := range headers {+ val, ok := value.(string)+ if !ok || !utf8.ValidString(val) || !utf8.ValidString(name) || name == "" || strings.ContainsAny(name+val, "\x00\x01\x02") {+ return nil, fmt.Errorf("invalid Proxy user property %q: string key/value required", name)+ }+ switch name {+ case "KEYS":+ if key == "" {+ key = val+ }+ continue+ case "TAGS":+ if tag == "" {+ tag = val+ }+ continue+ }+ upper := strings.ToUpper(name)+ if isReservedMessageProperty(upper) || strings.HasPrefix(upper, "__") || strings.HasPrefix(upper, "PROPERTY_") || strings.Contains(upper, "TIMER_") || upper == "DELAY" || upper == "SHARDING_KEY" || upper == "TRAN_MSG" {+ return nil, fmt.Errorf("unsupported: reserved Proxy message property %s", name)+ }+ properties[name] = val+ }+ }+ if strings.ContainsAny(key+tag, "\x00\x01\x02\r\n") {+ return nil, fmt.Errorf("invalid Key or Tag")+ }+ host, _ := os.Hostname()+ if host == "" {+ host = "localhost"+ }+ msg := &v2.Message{Topic: &v2.Resource{Name: topic}, Body: body, UserProperties: properties, SystemProperties: &v2.SystemProperties{MessageId: rmq.GetMessageIdCodecInstance().NextMessageId().String(), BornTimestamp: timestamppb.Now(), BornHost: host, BodyEncoding: v2.Encoding_IDENTITY, MessageType: v2.MessageType_NORMAL}}+ if key != "" {+ msg.SystemProperties.Keys = []string{key}+ }+ if tag != "" {+ msg.SystemProperties.Tag = &tag+ }+ return msg, nil+}++func transportCapabilities(management bool) map[string]any {+ caps := map[string]any{"supportsSendMessage": true}+ for _, key := range []string{"supportsListTopics", "supportsCreateTopic", "supportsDeleteTopic", "supportsTopicStats", "supportsBrokerAdmin", "supportsProducerListing", "supportsSubscriptions", "supportsResetCursor", "supportsSkipMessages", "supportsClearBacklog", "supportsPeekMessages", "supportsPermissions", "supportsMessageQuery", "supportsDlq", "supportsMessageTrace"} {+ caps[key] = management+ }+ return caps+}++func (a *rocketMQAgent) connectProxy(config connectionConfig, testOnly bool) (any, error) {+ if testOnly {+ a.mu.RLock()+ if a.messaging != nil && a.connection.equal(config) {+ testOnly = false+ }+ a.mu.RUnlock()+ }+ setupCtx, setupCancel := context.WithTimeout(context.Background(), config.ConnectTimeout)+ defer setupCancel()+ messaging, err := newProxyMessagingClient(setupCtx, config)+ if err != nil {+ return nil, err+ }+ var client *admin.Client+ var proxies *proxyManager+ var info *admin.ClusterInfo+ management := map[string]any{"status": "disabled"}+ clusterName, brokerAddr := "", ""+ if config.ManagementEnabled {+ managementConfig := config+ budget := minDuration(config.ConnectTimeout/3, 3*time.Second)+ if deadline, ok := setupCtx.Deadline(); ok && time.Until(deadline) < budget {+ budget = time.Until(deadline)+ }+ if budget <= 0 {+ err = context.DeadlineExceeded+ } else {+ managementConfig.ConnectTimeout = budget+ managementConfig.RequestTimeout = minDuration(config.RequestTimeout, budget)+ client, proxies, info, err = buildClient(managementConfig)+ }+ if err == nil {+ brokerAddr, err = resolveBrokerAddr(info, config, proxies)+ }+ if err != nil {+ if client != nil {+ _ = client.Close()+ client = nil+ }+ if proxies != nil {+ proxies.Close()+ proxies = nil+ }+ management = map[string]any{"status": "degraded", "error": "RocketMQ Remoting management connection failed"}+ } else {+ management = map[string]any{"status": "ready"}+ clusterName = resolveClusterName(info, config.ClusterName)+ }+ }+ if err := messaging.ctx.Err(); err != nil {+ messaging.Close()+ if client != nil {+ _ = client.Close()+ }+ if proxies != nil {+ proxies.Close()+ }+ return nil, fmt.Errorf("RocketMQ Proxy messaging session ended during connection setup: %w", err)+ }+ result := map[string]any{"ok": true, "clusterId": clusterName, "nodeCount": 0, "brokers": []any{}, "aclEnabled": config.AccessKey != "", "capabilities": transportCapabilities(client != nil), "channels": map[string]any{"messaging": map[string]any{"status": "ready"}, "management": management}}+ if client != nil {+ result["brokers"] = brokerNodes(info, proxies)+ result["nodeCount"] = len(brokerNodes(info, proxies))+ }+ if testOnly {+ messaging.Close()+ if client != nil {+ _ = client.Close()+ }+ if proxies != nil {+ proxies.Close()+ }+ return result, nil+ }+ a.mu.Lock()+ oldClient, oldProxies, oldMessaging := a.client, a.proxies, a.messaging+ a.client, a.proxies, a.messaging = client, proxies, messaging+ a.connection = config+ a.clusterName, a.brokerAddr = clusterName, brokerAddr+ a.mu.Unlock()+ if oldMessaging != nil {+ oldMessaging.Close()+ }+ if oldClient != nil {+ _ = oldClient.Close()+ }+ if oldProxies != nil {+ oldProxies.Close()+ }+ return result, nil+}diff --git a/agents/drivers/rocketmq/proxy_config_test.go b/agents/drivers/rocketmq/proxy_config_test.gonew file mode 100644index 0000000000..4ebcc1f5b9--- /dev/null+++ b/agents/drivers/rocketmq/proxy_config_test.go@@ -0,0 +1,39 @@+package main++import (+ "encoding/json"+ "strings"+ "testing"+)++func TestProxyConnectionDoesNotRequireNameServer(t *testing.T) {+ if _, err := parseConnection(map[string]any{"connection_mode": "proxy", "proxy_endpoint": "proxy.example.com:8081"}); err != nil {+ t.Fatalf("proxy-only connection must not require namesrv_addr: %v", err)+ }+}++func TestProxyConnectionValidation(t *testing.T) {+ tests := []map[string]any{+ {"connection_mode": "invalid", "namesrv_addr": "localhost:9876"},+ {"connection_mode": "proxy"},+ {"connection_mode": "proxy", "proxy_endpoint": "https://proxy:8081"},+ {"connection_mode": "proxy", "proxy_endpoint": "proxy:8081", "management_enabled": true},+ {"connection_mode": "proxy", "proxy_endpoint": "proxy:8081", "access_key": "only-ak"},+ }+ for _, params := range tests {+ if _, err := parseConnection(params); err == nil {+ t.Errorf("expected invalid config to fail: %v", params)+ }+ }+}++func TestHandshakeAdvertisesProxyTransport(t *testing.T) {+ result, err := newRocketMQAgent().dispatch("handshake", json.RawMessage(`{}`))+ if err != nil {+ t.Fatal(err)+ }+ data, _ := json.Marshal(result)+ if !strings.Contains(string(data), `"rocketmq_proxy_grpc"`) {+ t.Fatalf("handshake missing proxy capability: %s", data)+ }+}diff --git a/agents/drivers/rocketmq/proxy_grpc_test.go b/agents/drivers/rocketmq/proxy_grpc_test.gonew file mode 100644index 0000000000..2da0d2706a--- /dev/null+++ b/agents/drivers/rocketmq/proxy_grpc_test.go@@ -0,0 +1,341 @@+package main++import (+ "bytes"+ "context"+ "crypto/hmac"+ "crypto/sha1"+ "encoding/hex"+ "encoding/json"+ "fmt"+ "net"+ "strconv"+ "strings"+ "sync"+ "testing"+ "time"++ v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"+ "google.golang.org/grpc"+ "google.golang.org/grpc/metadata"+ "google.golang.org/grpc/stats"+)++type proxyTestService struct {+ v2.UnimplementedMessagingServiceServer+ mu sync.Mutex+ t *testing.T+ address string+ heartbeatCode v2.Code+ routeCode v2.Code+ sendCode v2.Code+ entryCode v2.Code+ permission v2.Permission+ messageType v2.MessageType+ emptyEntries bool+ heartbeats int+ sends int+ received *v2.Message+ registered map[string]bool+ failTelemetry chan bool+ connectionEnded chan struct{}+ heartbeatSeen chan struct{}+}++func (s *proxyTestService) TagRPC(ctx context.Context, _ *stats.RPCTagInfo) context.Context {+ return ctx+}+func (s *proxyTestService) HandleRPC(context.Context, stats.RPCStats) {}+func (s *proxyTestService) TagConn(ctx context.Context, _ *stats.ConnTagInfo) context.Context {+ return ctx+}+func (s *proxyTestService) HandleConn(_ context.Context, event stats.ConnStats) {+ if _, ok := event.(*stats.ConnEnd); ok && s.connectionEnded != nil {+ select {+ case s.connectionEnded <- struct{}{}:+ default:+ }+ }+}++func (s *proxyTestService) Telemetry(stream v2.MessagingService_TelemetryServer) error {+ s.checkAuth(stream.Context())+ md, _ := metadata.FromIncomingContext(stream.Context())+ ids := md.Get("x-mq-client-id")+ if len(ids) != 1 {+ return fmt.Errorf("missing client ID")+ }+ request, err := stream.Recv()+ if err != nil {+ return err+ }+ settings := request.GetSettings()+ if settings == nil || settings.GetClientType() != v2.ClientType_PRODUCER || settings.GetPublishing() == nil {+ return fmt.Errorf("producer settings required")+ }+ s.mu.Lock()+ if s.registered == nil {+ s.registered = map[string]bool{}+ }+ s.registered[ids[0]] = true+ s.mu.Unlock()+ defer func() { s.mu.Lock(); delete(s.registered, ids[0]); s.mu.Unlock() }()+ if err = stream.Send(&v2.TelemetryCommand{Status: &v2.Status{Code: v2.Code_OK}, Command: &v2.TelemetryCommand_Settings{Settings: settings}}); err != nil {+ return err+ }+ if s.failTelemetry != nil {+ select {+ case business := <-s.failTelemetry:+ if business {+ return stream.Send(&v2.TelemetryCommand{Status: &v2.Status{Code: v2.Code_FORBIDDEN}})+ }+ return fmt.Errorf("injected telemetry failure")+ case <-stream.Context().Done():+ return stream.Context().Err()+ }+ }+ for {+ if _, err = stream.Recv(); err != nil {+ return err+ }+ }+}++func (s *proxyTestService) checkAuth(ctx context.Context) {+ s.t.Helper()+ md, _ := metadata.FromIncomingContext(ctx)+ date := md.Get("x-mq-date-time")+ if len(date) != 1 {+ s.t.Error("missing RPC timestamp")+ return+ }+ h := hmac.New(sha1.New, []byte("secret"))+ _, _ = h.Write([]byte(date[0]))+ want := fmt.Sprintf("MQv2-HMAC-SHA1 Credential=access//Rocketmq, SignedHeaders=x-mq-date-time, Signature=%s", hex.EncodeToString(h.Sum(nil)))+ if got := md.Get("authorization"); len(got) != 1 || got[0] != want {+ s.t.Errorf("invalid authorization: %v want %s", got, want)+ }+ if len(md.Get("x-mq-client-id")) != 1 {+ s.t.Error("missing client ID")+ }+}+func (s *proxyTestService) Heartbeat(ctx context.Context, _ *v2.HeartbeatRequest) (*v2.HeartbeatResponse, error) {+ s.checkAuth(ctx)+ s.mu.Lock()+ defer s.mu.Unlock()+ s.heartbeats+++ if s.heartbeatSeen != nil {+ select {+ case s.heartbeatSeen <- struct{}{}:+ default:+ }+ }+ md, _ := metadata.FromIncomingContext(ctx)+ ids := md.Get("x-mq-client-id")+ if len(ids) != 1 || !s.registered[ids[0]] {+ return &v2.HeartbeatResponse{Status: &v2.Status{Code: v2.Code_UNRECOGNIZED_CLIENT_TYPE}}, nil+ }+ return &v2.HeartbeatResponse{Status: &v2.Status{Code: s.heartbeatCode}}, nil+}+func (s *proxyTestService) QueryRoute(ctx context.Context, r *v2.QueryRouteRequest) (*v2.QueryRouteResponse, error) {+ s.checkAuth(ctx)+ host, port, _ := net.SplitHostPort(s.address)+ p, _ := strconv.Atoi(port)+ s.mu.Lock()+ defer s.mu.Unlock()+ return &v2.QueryRouteResponse{Status: &v2.Status{Code: s.routeCode}, MessageQueues: []*v2.MessageQueue{{Topic: r.Topic, Id: 3, Permission: s.permission, AcceptMessageTypes: []v2.MessageType{s.messageType}, Broker: &v2.Broker{Name: "broker-a", Endpoints: &v2.Endpoints{Scheme: v2.AddressScheme_IPv4, Addresses: []*v2.Address{{Host: host, Port: int32(p)}}}}}}}, nil+}+func (s *proxyTestService) SendMessage(ctx context.Context, r *v2.SendMessageRequest) (*v2.SendMessageResponse, error) {+ s.checkAuth(ctx)+ s.mu.Lock()+ defer s.mu.Unlock()+ s.sends+++ if len(r.Messages) != 1 {+ s.t.Errorf("messages=%d", len(r.Messages))+ } else {+ s.received = r.Messages[0]+ }+ response := &v2.SendMessageResponse{Status: &v2.Status{Code: s.sendCode}}+ if !s.emptyEntries {+ response.Entries = []*v2.SendResultEntry{{Status: &v2.Status{Code: s.entryCode}, MessageId: r.Messages[0].GetSystemProperties().GetMessageId(), Offset: 42}}+ }+ return response, nil+}+func startProxyTestService(t *testing.T) (*proxyTestService, map[string]any) {+ t.Helper()+ listener, err := net.Listen("tcp", "127.0.0.1:0")+ if err != nil {+ t.Fatal(err)+ }+ s := &proxyTestService{t: t, address: listener.Addr().String(), heartbeatCode: v2.Code_OK, routeCode: v2.Code_OK, sendCode: v2.Code_OK, entryCode: v2.Code_OK, permission: v2.Permission_READ_WRITE, messageType: v2.MessageType_NORMAL}+ s.failTelemetry = make(chan bool, 1)+ s.connectionEnded = make(chan struct{}, 16)+ s.heartbeatSeen = make(chan struct{}, 16)+ server := grpc.NewServer(grpc.StatsHandler(s))+ v2.RegisterMessagingServiceServer(server, s)+ go func() { _ = server.Serve(listener) }()+ t.Cleanup(server.Stop)+ return s, map[string]any{"connection_mode": "proxy", "proxy_endpoint": s.address, "proxy_tls": false, "access_key": "access", "secret_key": "secret", "connect_timeout_ms": float64(500), "request_timeout_ms": float64(500)}+}+func dispatchProxyTest(t *testing.T, a *rocketMQAgent, method string, params map[string]any) (any, error) {+ t.Helper()+ raw, err := json.Marshal(params)+ if err != nil {+ t.Fatal(err)+ }+ return a.dispatch(method, raw)+}++func TestProxyConnectSendAndLifecycle(t *testing.T) {+ s, config := startProxyTestService(t)+ a := newRocketMQAgent()+ t.Cleanup(a.close)+ result, err := dispatchProxyTest(t, a, "connect", config)+ if err != nil {+ t.Fatal(err)+ }+ encoded, _ := json.Marshal(result)+ if !strings.Contains(string(encoded), `"management":{"status":"disabled"}`) || !strings.Contains(string(encoded), `"messaging":{"status":"ready"}`) {+ t.Fatalf("invalid channels %s", encoded)+ }+ payload := []byte{0, 1, 255, ' '}+ result, err = dispatchProxyTest(t, a, "mq_send_message", map[string]any{"topic": "orders", "payloadBase64": "AAH/IA==", "key": "order-1", "tag": "created", "headers": map[string]any{"custom": "value"}})+ if err != nil {+ t.Fatal(err)+ }+ row := result.(map[string]any)+ if row["ok"] != true || row["offset"] != int64(42) || row["partition"] != nil {+ t.Fatalf("send result %v", row)+ }+ s.mu.Lock()+ msg := s.received+ count := s.sends+ s.mu.Unlock()+ if count != 1 || !bytes.Equal(msg.GetBody(), payload) || msg.GetSystemProperties().GetQueueId() != 0 || msg.GetSystemProperties().GetTag() != "created" || len(msg.GetSystemProperties().GetKeys()) != 1 || msg.GetUserProperties()["custom"] != "value" {+ t.Fatalf("incorrect message %v count=%d", msg, count)+ }+ if msg.GetSystemProperties().GetMessageId() == "" || msg.GetSystemProperties().GetMessageType() != v2.MessageType_NORMAL {+ t.Fatalf("missing normal system properties %v", msg)+ }+ for _, method := range []string{"mq_list_topics", "mq_peek_messages", "mq_view_message", "mq_describe_cluster", "mq_create_acls"} {+ if _, err = dispatchProxyTest(t, a, method, map[string]any{"topic": "orders", "msgId": "x"}); err == nil || !strings.Contains(strings.ToLower(err.Error()), "unsupported") {+ t.Errorf("%s should return unsupported, got %v", method, err)+ }+ }+ a.close()+ a.close()+ if _, err = dispatchProxyTest(t, a, "mq_send_message", map[string]any{"topic": "orders", "payload": "x"}); err == nil {+ t.Fatal("send after disconnect succeeded")+ }+}++func TestProxyRejectsUnsupportedSendBeforeRPC(t *testing.T) {+ s, config := startProxyTestService(t)+ a := newRocketMQAgent()+ t.Cleanup(a.close)+ if _, err := dispatchProxyTest(t, a, "connect", config); err != nil {+ t.Fatal(err)+ }+ invalid := []map[string]any{{"partition": 0}, {"delayLevel": 1}, {"messageGroup": "a"}, {"transaction": true}, {"headers": map[string]any{"DELAY": "1"}}, {"headers": map[string]any{"KEYS": 123}}, {"key": 42}, {"payloadBase64": "%%%"}, {"headers": map[string]any{"x": map[string]any{}}}}+ for _, extra := range invalid {+ params := map[string]any{"topic": "orders", "payload": "text"}+ for k, v := range extra {+ params[k] = v+ }+ if _, err := dispatchProxyTest(t, a, "mq_send_message", params); err == nil {+ t.Errorf("invalid message accepted: %v", extra)+ }+ }+ s.mu.Lock()+ defer s.mu.Unlock()+ if s.sends != 0 {+ t.Fatalf("invalid requests reached SendMessage: %d", s.sends)+ }+}++func TestProxyProtocolFailuresDoNotSilentlySucceed(t *testing.T) {+ for _, failure := range []string{"heartbeat", "route", "permission", "type", "send", "entry", "emptyEntries"} {+ t.Run(failure, func(t *testing.T) {+ s, config := startProxyTestService(t)+ a := newRocketMQAgent()+ t.Cleanup(a.close)+ if failure == "heartbeat" {+ s.heartbeatCode = v2.Code_FORBIDDEN+ }+ _, err := dispatchProxyTest(t, a, "connect", config)+ if failure == "heartbeat" {+ if err == nil {+ t.Fatal("heartbeat business error ignored")+ }+ return+ }+ if err != nil {+ t.Fatal(err)+ }+ s.mu.Lock()+ switch failure {+ case "route":+ s.routeCode = v2.Code_FORBIDDEN+ case "permission":+ s.permission = v2.Permission_READ+ case "type":+ s.messageType = v2.MessageType_FIFO+ case "send":+ s.sendCode = v2.Code_FORBIDDEN+ case "entry":+ s.entryCode = v2.Code_FORBIDDEN+ case "emptyEntries":+ s.emptyEntries = true+ }+ s.mu.Unlock()+ if _, err = dispatchProxyTest(t, a, "mq_send_message", map[string]any{"topic": "orders", "payload": "x"}); err == nil {+ t.Fatalf("%s failure ignored", failure)+ }+ s.mu.Lock()+ defer s.mu.Unlock()+ if s.sends > 1 {+ t.Fatalf("send retried implicitly: %d", s.sends)+ }+ })+ }+}++func TestProxyManagementFailureIsDegradedAndTestDoesNotReplaceSession(t *testing.T) {+ _, config := startProxyTestService(t)+ a := newRocketMQAgent()+ t.Cleanup(a.close)+ if _, err := dispatchProxyTest(t, a, "connect", config); err != nil {+ t.Fatal(err)+ }+ config["management_enabled"] = true+ config["namesrv_addr"] = "127.0.0.1:1"+ config["connect_timeout_ms"] = float64(30)+ config["request_timeout_ms"] = float64(30)+ result, err := dispatchProxyTest(t, a, "test_connection", config)+ if err != nil {+ t.Fatal(err)+ }+ encoded, _ := json.Marshal(result)+ if !strings.Contains(string(encoded), `"status":"degraded"`) {+ t.Fatalf("not degraded: %s", encoded)+ }+ if _, err := dispatchProxyTest(t, a, "mq_send_message", map[string]any{"topic": "orders", "payload": "x"}); err != nil {+ t.Fatalf("test_connection damaged active session: %v", err)+ }+}++func TestProxyConnectTimeoutIsBounded(t *testing.T) {+ listener, err := net.Listen("tcp", "127.0.0.1:0")+ if err != nil {+ t.Fatal(err)+ }+ defer listener.Close()+ // A listening TCP peer which never performs HTTP/2 must not hang the driver.+ a := newRocketMQAgent()+ defer a.close()+ start := time.Now()+ _, err = dispatchProxyTest(t, a, "connect", map[string]any{"connection_mode": "proxy", "proxy_endpoint": listener.Addr().String(), "proxy_tls": false, "connect_timeout_ms": float64(40)})+ if err == nil || time.Since(start) > time.Second {+ t.Fatalf("connect was not bounded: %v %v", err, time.Since(start))+ }+}diff --git a/agents/drivers/rocketmq/proxy_integration_test.go b/agents/drivers/rocketmq/proxy_integration_test.gonew file mode 100644index 0000000000..f872a65497--- /dev/null+++ b/agents/drivers/rocketmq/proxy_integration_test.go@@ -0,0 +1,42 @@+package main++import (+ "os"+ "testing"+ "time"+)++// This test intentionally starts no mock server: it proves that the official+// Proxy accepts Settings registration, authenticated Heartbeat and ordinary sends.+// Provision a NORMAL topic first; this test publishes one message to that topic.+func TestRocketMQProxyIntegration(t *testing.T) {+ if os.Getenv("ROCKETMQ_PROXY_INTEGRATION") != "1" {+ t.Skip("set ROCKETMQ_PROXY_INTEGRATION=1 with an official Proxy and pre-created NORMAL topic")+ }+ endpoint := os.Getenv("ROCKETMQ_PROXY_ENDPOINT")+ if endpoint == "" {+ t.Fatal("ROCKETMQ_PROXY_ENDPOINT is required")+ }+ topic := os.Getenv("ROCKETMQ_PROXY_TOPIC")+ if topic == "" {+ t.Fatal("ROCKETMQ_PROXY_TOPIC is required")+ }+ config := map[string]any{"connection_mode": "proxy", "proxy_endpoint": endpoint, "proxy_tls": os.Getenv("ROCKETMQ_PROXY_TLS") != "false", "access_key": os.Getenv("ROCKETMQ_PROXY_ACCESS_KEY"), "secret_key": os.Getenv("ROCKETMQ_PROXY_SECRET_KEY"), "connect_timeout_ms": float64(5000), "request_timeout_ms": float64(10000)}+ if dial := os.Getenv("ROCKETMQ_PROXY_DIAL_ENDPOINT"); dial != "" {+ config["proxy_dial_endpoint"] = dial+ }+ a := newRocketMQAgent()+ defer a.close()+ if _, err := dispatchProxyTest(t, a, "connect", config); err != nil {+ t.Fatal(err)+ }+ result, err := dispatchProxyTest(t, a, "mq_send_message", map[string]any{"topic": topic, "payload": "DBX official Proxy interoperability " + time.Now().UTC().Format(time.RFC3339Nano), "key": "DBX_PROXY_INTEROP", "tag": "DBX", "headers": map[string]any{"dbxProbe": "ordinary"}})+ if err != nil {+ t.Fatalf("official Proxy ordinary send after Telemetry registration: %v", err)+ }+ row := result.(map[string]any)+ if row["ok"] != true || row["messageId"] == "" {+ t.Fatalf("invalid send receipt: %#v", row)+ }+ t.Logf("official Proxy accepted ordinary send after Telemetry registration: messageId=%v partition=%v offset=%v", row["messageId"], row["partition"], row["offset"])+}diff --git a/agents/drivers/rocketmq/proxy_lifecycle_test.go b/agents/drivers/rocketmq/proxy_lifecycle_test.gonew file mode 100644index 0000000000..4de0898156--- /dev/null+++ b/agents/drivers/rocketmq/proxy_lifecycle_test.go@@ -0,0 +1,83 @@+package main++import (+ v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"+ "testing"+ "time"+)++func TestProxyPeriodicHeartbeatFailureClosesRPCTransport(t *testing.T) {+ service, config := startProxyTestService(t)+ a := newRocketMQAgent()+ defer a.close()+ if _, err := dispatchProxyTest(t, a, "connect", config); err != nil {+ t.Fatal(err)+ }+ service.mu.Lock()+ service.heartbeatCode = v2.Code_FORBIDDEN+ service.mu.Unlock()+ select {+ case <-service.connectionEnded:+ case <-time.After(12 * time.Second):+ t.Fatal("periodic heartbeat failure leaked the RPC connection")+ }+}++func TestProxyTelemetryFailureClosesRPCTransport(t *testing.T) {+ for _, business := range []bool{false, true} {+ t.Run(map[bool]string{false: "receive", true: "status"}[business], func(t *testing.T) {+ service, config := startProxyTestService(t)+ a := newRocketMQAgent()+ defer a.close()+ if _, err := dispatchProxyTest(t, a, "connect", config); err != nil {+ t.Fatal(err)+ }+ service.failTelemetry <- business+ select {+ case <-service.connectionEnded:+ case <-time.After(time.Second):+ t.Fatal("terminal Telemetry error did not close underlying RPC transport")+ }+ })+ }+}++func TestProxyDoesNotInstallSessionLostDuringManagement(t *testing.T) {+ _, oldConfig := startProxyTestService(t)+ a := newRocketMQAgent()+ defer a.close()+ if _, err := dispatchProxyTest(t, a, "connect", oldConfig); err != nil {+ t.Fatal(err)+ }+ a.mu.RLock()+ old := a.messaging+ a.mu.RUnlock()+ service, config := startProxyTestService(t)+ address, _ := startProxyManagementFixture(t)+ config["management_enabled"] = true+ config["namesrv_addr"] = address+ config["connect_timeout_ms"] = float64(600)+ config["request_timeout_ms"] = float64(600)+ result := make(chan error, 1)+ go func() { _, err := dispatchProxyTest(t, a, "connect", config); result <- err }()+ select {+ case <-service.heartbeatSeen:+ case <-time.After(time.Second):+ t.Fatal("new session never reached heartbeat")+ }+ service.failTelemetry <- false+ if err := <-result; err == nil {+ t.Fatal("dead messaging session reported ready after management setup")+ }+ a.mu.RLock()+ current := a.messaging+ a.mu.RUnlock()+ if current != old || old.ctx.Err() != nil {+ t.Fatal("failed replacement destroyed the prior working session")+ }+ select {+ case <-service.connectionEnded:+ case <-time.After(time.Second):+ t.Fatal("failed replacement leaked RPC connection")+ }+}diff --git a/agents/drivers/rocketmq/proxy_management_test.go b/agents/drivers/rocketmq/proxy_management_test.gonew file mode 100644index 0000000000..2946821e10--- /dev/null+++ b/agents/drivers/rocketmq/proxy_management_test.go@@ -0,0 +1,141 @@+package main++import (+ "encoding/binary"+ "encoding/json"+ "io"+ "net"+ "strings"+ "sync"+ "sync/atomic"+ "testing"+ "time"++ "github.com/amigoer/rocketmq-admin-go/protocol/remoting"+)++func startProxyManagementFixture(t *testing.T) (string, *atomic.Bool) {+ t.Helper()+ listener, err := net.Listen("tcp", "127.0.0.1:0")+ if err != nil {+ t.Fatal(err)+ }+ var ready atomic.Bool+ var connections sync.Map+ done := make(chan struct{})+ t.Cleanup(func() {+ close(done)+ _ = listener.Close()+ connections.Range(func(k, v any) bool { _ = k.(net.Conn).Close(); return true })+ })+ go func() {+ for {+ conn, err := listener.Accept()+ if err != nil {+ return+ }+ connections.Store(conn, true)+ go func() {+ defer conn.Close()+ defer connections.Delete(conn)+ for {+ size := make([]byte, 4)+ if _, err := io.ReadFull(conn, size); err != nil {+ return+ }+ n := binary.BigEndian.Uint32(size)+ if n > 1024*1024 {+ return+ }+ data := make([]byte, n)+ if _, err := io.ReadFull(conn, data); err != nil {+ return+ }+ request, err := remoting.Decode(data)+ if err != nil {+ return+ }+ if !ready.Load() {+ select {+ case <-done:+ return+ case <-time.After(2 * time.Second):+ return+ }+ }+ body, _ := json.Marshal(map[string]any{"clusterAddrTable": map[string]any{"DefaultCluster": []string{"broker-a"}}, "brokerAddrTable": map[string]any{"broker-a": map[string]any{"cluster": "DefaultCluster", "brokerName": "broker-a", "brokerAddrs": map[string]string{"0": listener.Addr().String()}}}})+ response := &remoting.RemotingCommand{Code: 0, Opaque: request.Opaque, Flag: 1, Body: body}+ encoded, err := response.Encode()+ if err != nil {+ return+ }+ if _, err = conn.Write(encoded); err != nil {+ return+ }+ }+ }()+ }+ }()+ return listener.Addr().String(), &ready+}++func TestProxyManagementBudgetDoesNotConsumeMessagingConnectBudget(t *testing.T) {+ _, config := startProxyTestService(t)+ address, _ := startProxyManagementFixture(t)+ config["management_enabled"] = true+ config["namesrv_addr"] = address+ config["connect_timeout_ms"] = float64(450)+ config["request_timeout_ms"] = float64(450)+ a := newRocketMQAgent()+ defer a.close()+ start := time.Now()+ result, err := dispatchProxyTest(t, a, "connect", config)+ if err != nil {+ t.Fatal(err)+ }+ if elapsed := time.Since(start); elapsed > 320*time.Millisecond {+ t.Fatalf("optional management exhausted messaging connect budget: %v", elapsed)+ }+ data, _ := json.Marshal(result)+ if !strings.Contains(string(data), `"status":"degraded"`) {+ t.Fatalf("expected degraded management: %s", data)+ }+}++func TestProxyTestConnectionRestoresSameActiveManagementChannel(t *testing.T) {+ _, config := startProxyTestService(t)+ address, ready := startProxyManagementFixture(t)+ config["management_enabled"] = true+ config["namesrv_addr"] = address+ config["connect_timeout_ms"] = float64(300)+ config["request_timeout_ms"] = float64(300)+ a := newRocketMQAgent()+ defer a.close()+ if _, err := dispatchProxyTest(t, a, "connect", config); err != nil {+ t.Fatal(err)+ }+ a.mu.RLock()+ old := a.messaging+ a.mu.RUnlock()+ ready.Store(true)+ result, err := dispatchProxyTest(t, a, "test_connection", config)+ if err != nil {+ t.Fatal(err)+ }+ data, _ := json.Marshal(result)+ if !strings.Contains(string(data), `"management":{"status":"ready"}`) {+ t.Fatalf("expected management recovery: %s", data)+ }+ a.mu.RLock()+ client, current := a.client, a.messaging+ a.mu.RUnlock()+ if client == nil {+ t.Fatal("test reports management ready but active management client is nil")+ }+ if current == old || old.ctx.Err() == nil {+ t.Fatal("old messaging connection was not replaced and closed")+ }+ if _, err := dispatchProxyTest(t, a, "mq_describe_cluster", map[string]any{}); err != nil {+ t.Fatalf("recovered management is unusable: %v", err)+ }+}diff --git a/agents/drivers/rocketmq/proxy_process_test.go b/agents/drivers/rocketmq/proxy_process_test.gonew file mode 100644index 0000000000..e9777b301f--- /dev/null+++ b/agents/drivers/rocketmq/proxy_process_test.go@@ -0,0 +1,113 @@+package main++import (+ "bufio"+ "context"+ "crypto/ecdsa"+ "crypto/elliptic"+ "crypto/rand"+ "crypto/tls"+ "crypto/x509"+ "crypto/x509/pkix"+ "encoding/json"+ "encoding/pem"+ v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"+ "google.golang.org/grpc"+ grpccredentials "google.golang.org/grpc/credentials"+ "math/big"+ "net"+ "os"+ "os/exec"+ "path/filepath"+ "testing"+ "time"+)++func TestProxyTrustedTLSWithDialOverride(t *testing.T) {+ key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)+ if err != nil {+ t.Fatal(err)+ }+ certificate := &x509.Certificate{SerialNumber: big.NewInt(1), Subject: pkix.Name{CommonName: "proxy.example.invalid"}, DNSNames: []string{"proxy.example.invalid"}, NotBefore: time.Now().Add(-time.Hour), NotAfter: time.Now().Add(time.Hour), KeyUsage: x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign, ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth}, IsCA: true, BasicConstraintsValid: true}+ der, err := x509.CreateCertificate(rand.Reader, certificate, certificate, &key.PublicKey, key)+ if err != nil {+ t.Fatal(err)+ }+ keyDER, err := x509.MarshalECPrivateKey(key)+ if err != nil {+ t.Fatal(err)+ }+ certPEM := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: der})+ pair, err := tls.X509KeyPair(certPEM, pem.EncodeToMemory(&pem.Block{Type: "EC PRIVATE KEY", Bytes: keyDER}))+ if err != nil {+ t.Fatal(err)+ }+ rootFile := filepath.Join(t.TempDir(), "trusted-proxy.pem")+ if err = os.WriteFile(rootFile, certPEM, 0600); err != nil {+ t.Fatal(err)+ }+ listener, err := net.Listen("tcp", "127.0.0.1:0")+ if err != nil {+ t.Fatal(err)+ }+ service := &proxyTestService{t: t, address: listener.Addr().String(), heartbeatCode: v2.Code_OK, routeCode: v2.Code_OK, sendCode: v2.Code_OK, entryCode: v2.Code_OK, permission: v2.Permission_READ_WRITE, messageType: v2.MessageType_NORMAL}+ server := grpc.NewServer(grpc.Creds(grpccredentials.NewTLS(&tls.Config{Certificates: []tls.Certificate{pair}, MinVersion: tls.VersionTLS12})))+ v2.RegisterMessagingServiceServer(server, service)+ go func() { _ = server.Serve(listener) }()+ defer server.Stop()+ runProxyProcessTest(t, map[string]any{"connection_mode": "proxy", "proxy_endpoint": "proxy.example.invalid:8081", "proxy_dial_endpoint": listener.Addr().String(), "proxy_tls": true, "access_key": "access", "secret_key": "secret", "connect_timeout_ms": float64(2000)}, []string{"DBX_ROCKETMQ_TEST_ROOTS=" + rootFile, "GODEBUG=x509usefallbackroots=1"})+}++func TestProxyProcessKeepsSDKLogsOffStdout(t *testing.T) {+ _, config := startProxyTestService(t)+ runProxyProcessTest(t, config, nil)+}++func runProxyProcessTest(t *testing.T, config map[string]any, environment []string) {+ t.Helper()+ ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)+ defer cancel()+ command := exec.CommandContext(ctx, os.Args[0], "-test.run=^TestRocketMQAgentHelperProcess$")+ command.Env = append(os.Environ(), rocketMQHelperProcessEnv+"=1", "mq.consoleAppender.enabled=true")+ command.Env = append(command.Env, environment...)+ stdin, err := command.StdinPipe()+ if err != nil {+ t.Fatal(err)+ }+ stdout, err := command.StdoutPipe()+ if err != nil {+ t.Fatal(err)+ }+ var stderr synchronizedBuffer+ command.Stderr = &stderr+ if err := command.Start(); err != nil {+ t.Fatal(err)+ }+ defer func() {+ _ = stdin.Close()+ if command.Process != nil {+ _ = command.Process.Kill()+ }+ }()+ scanner := bufio.NewScanner(stdout)+ if !scanner.Scan() || scanner.Text() != `{"ready":true}` {+ t.Fatalf("unexpected ready %q %s", scanner.Text(), stderr.String())+ }+ for index, request := range []struct {+ method string+ params map[string]any+ }{{"connect", config}, {"mq_send_message", map[string]any{"topic": "orders", "payload": "hello"}}, {"shutdown", map[string]any{}}} {+ raw, err := json.Marshal(map[string]any{"jsonrpc": "2.0", "id": index + 1, "method": request.method, "params": request.params})+ if err != nil {+ t.Fatal(err)+ }+ writeRPCRequest(t, stdin, string(raw))+ response := readRPCResponse(t, scanner, stderr.String())+ if response.Error != nil {+ t.Fatalf("%s: %s", request.method, response.Error.Message)+ }+ }+ if err := command.Wait(); err != nil {+ t.Fatalf("agent failed: %v %s", err, stderr.String())+ }+}diff --git a/agents/drivers/rocketmq/proxy_transport_test.go b/agents/drivers/rocketmq/proxy_transport_test.gonew file mode 100644index 0000000000..8b4a6e2e44--- /dev/null+++ b/agents/drivers/rocketmq/proxy_transport_test.go@@ -0,0 +1,207 @@+package main++import (+ "crypto/ecdsa"+ "crypto/elliptic"+ "crypto/rand"+ "crypto/tls"+ "crypto/x509"+ "crypto/x509/pkix"+ "encoding/pem"+ "io"+ "math/big"+ "net"+ "strconv"+ "strings"+ "testing"+ "time"++ v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"+ "google.golang.org/grpc"+ grpccredentials "google.golang.org/grpc/credentials"+)++func TestProxyDialOverridePreservesLogicalEndpoint(t *testing.T) {+ _, config := startProxyTestService(t)+ config["proxy_dial_endpoint"] = config["proxy_endpoint"]+ config["proxy_endpoint"] = "proxy.example.invalid:8081"+ a := newRocketMQAgent()+ defer a.close()+ if _, err := dispatchProxyTest(t, a, "connect", config); err != nil {+ t.Fatal(err)+ }+ if _, err := dispatchProxyTest(t, a, "mq_send_message", map[string]any{"topic": "orders", "payload": "x"}); err != nil {+ t.Fatal(err)+ }+}++func TestProxyTLSRejectsUntrustedCertificateAndPreservesAuthority(t *testing.T) {+ key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)+ if err != nil {+ t.Fatal(err)+ }+ cert := &x509.Certificate{SerialNumber: big.NewInt(1), Subject: pkix.Name{CommonName: "proxy.example.invalid"}, DNSNames: []string{"proxy.example.invalid"}, NotBefore: time.Now().Add(-time.Hour), NotAfter: time.Now().Add(time.Hour), KeyUsage: x509.KeyUsageDigitalSignature, ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth}}+ der, err := x509.CreateCertificate(rand.Reader, cert, cert, &key.PublicKey, key)+ if err != nil {+ t.Fatal(err)+ }+ keyDER, err := x509.MarshalECPrivateKey(key)+ if err != nil {+ t.Fatal(err)+ }+ pair, err := tls.X509KeyPair(pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: der}), pem.EncodeToMemory(&pem.Block{Type: "EC PRIVATE KEY", Bytes: keyDER}))+ if err != nil {+ t.Fatal(err)+ }+ sni := make(chan string, 16)+ tlsConfig := &tls.Config{Certificates: []tls.Certificate{pair}, MinVersion: tls.VersionTLS12, GetConfigForClient: func(hello *tls.ClientHelloInfo) (*tls.Config, error) {+ select {+ case sni <- hello.ServerName:+ default:+ }+ return nil, nil+ }}+ listener, err := net.Listen("tcp", "127.0.0.1:0")+ if err != nil {+ t.Fatal(err)+ }+ server := grpc.NewServer(grpc.Creds(grpccredentials.NewTLS(tlsConfig)))+ v2.RegisterMessagingServiceServer(server, &proxyTestService{t: t})+ go func() { _ = server.Serve(listener) }()+ defer server.Stop()+ a := newRocketMQAgent()+ defer a.close()+ _, err = dispatchProxyTest(t, a, "connect", map[string]any{"connection_mode": "proxy", "proxy_endpoint": "proxy.example.invalid:8081", "proxy_dial_endpoint": listener.Addr().String(), "proxy_tls": true, "tls_skip_verify": true, "connect_timeout_ms": float64(150)})+ if err == nil {+ t.Fatal("untrusted self-signed TLS certificate accepted")+ }+ select {+ case name := <-sni:+ if name != "proxy.example.invalid" {+ t.Fatalf("SNI=%q, logical authority lost", name)+ }+ default:+ t.Fatal("TLS server did not receive handshake")+ }+}++func TestProxySOCKSDialerCarriesGRPCAndOriginalTarget(t *testing.T) {+ _, config := startProxyTestService(t)+ remote := config["proxy_endpoint"].(string)+ listener, err := net.Listen("tcp", "127.0.0.1:0")+ if err != nil {+ t.Fatal(err)+ }+ defer listener.Close()+ target := make(chan string, 4)+ go func() {+ for {+ conn, err := listener.Accept()+ if err != nil {+ return+ }+ go func() {+ defer conn.Close()+ _ = conn.SetDeadline(time.Now().Add(3 * time.Second))+ greeting := make([]byte, 2)+ if _, err := io.ReadFull(conn, greeting); err != nil {+ return+ }+ methods := make([]byte, int(greeting[1]))+ if _, err := io.ReadFull(conn, methods); err != nil {+ return+ }+ if _, err := conn.Write([]byte{5, 0}); err != nil {+ return+ }+ header := make([]byte, 4)+ if _, err := io.ReadFull(conn, header); err != nil {+ return+ }+ var host string+ switch header[3] {+ case 1:+ b := make([]byte, 4)+ if _, err := io.ReadFull(conn, b); err != nil {+ return+ }+ host = net.IP(b).String()+ case 3:+ b := make([]byte, 1)+ if _, err := io.ReadFull(conn, b); err != nil {+ return+ }+ name := make([]byte, int(b[0]))+ if _, err := io.ReadFull(conn, name); err != nil {+ return+ }+ host = string(name)+ default:+ return+ }+ port := make([]byte, 2)+ if _, err := io.ReadFull(conn, port); err != nil {+ return+ }+ target <- net.JoinHostPort(host, strconv.Itoa(int(port[0])<<8|int(port[1])))+ upstream, err := net.DialTimeout("tcp", remote, time.Second)+ if err != nil {+ return+ }+ defer upstream.Close()+ if _, err := conn.Write([]byte{5, 0, 0, 1, 127, 0, 0, 1, 0, 0}); err != nil {+ return+ }+ done := make(chan struct{})+ go func() { _, _ = io.Copy(upstream, conn); close(done) }()+ _, _ = io.Copy(conn, upstream)+ _ = conn.Close()+ <-done+ }()+ }+ }()+ host, port, _ := net.SplitHostPort(listener.Addr().String())+ p, _ := strconv.Atoi(port)+ config["proxy_endpoint"] = "proxy.example.invalid:8081"+ config["socks_proxy"] = map[string]any{"host": host, "port": float64(p)}+ a := newRocketMQAgent()+ defer a.close()+ if _, err := dispatchProxyTest(t, a, "connect", config); err != nil {+ t.Fatal(err)+ }+ select {+ case got := <-target:+ if got != "proxy.example.invalid:8081" {+ t.Fatalf("SOCKS target %s", got)+ }+ default:+ t.Fatal("SOCKS was bypassed")+ }+}++func TestProxyPreservesTextPayloadWhitespace(t *testing.T) {+ s, config := startProxyTestService(t)+ a := newRocketMQAgent()+ defer a.close()+ if _, err := dispatchProxyTest(t, a, "connect", config); err != nil {+ t.Fatal(err)+ }+ if _, err := dispatchProxyTest(t, a, "mq_send_message", map[string]any{"topic": "orders", "payload": " \nbody\t "}); err != nil {+ t.Fatal(err)+ }+ s.mu.Lock()+ defer s.mu.Unlock()+ if string(s.received.GetBody()) != " \nbody\t " {+ t.Fatalf("payload whitespace corrupted: %q", s.received.GetBody())+ }+}++func TestProxyClosedManagementMethodsNeverPanic(t *testing.T) {+ a := newRocketMQAgent()+ for _, method := range []string{"mq_peek_messages", "mq_view_message", "mq_query_message_by_key", "mq_query_message_by_topic", "mq_get_topic_stats", "mq_delete_topic", "mq_get_consumer_lag", "mq_describe_consumer_group"} {+ _, err := dispatchProxyTest(t, a, method, map[string]any{"topic": "orders", "name": "orders", "msgId": "x", "groupId": "g", "key": "k"})+ if err == nil || !strings.Contains(err.Error(), "not connected") {+ t.Errorf("%s: %v", method, err)+ }+ }+}diff --git a/agents/drivers/rocketmq/scripts/run-proxy-fixture.sh b/agents/drivers/rocketmq/scripts/run-proxy-fixture.shnew file mode 100644index 0000000000..0132128209--- /dev/null+++ b/agents/drivers/rocketmq/scripts/run-proxy-fixture.sh@@ -0,0 +1,138 @@+#!/usr/bin/env bash+set -euo pipefail+# Run in a managed background job. EXIT/INT/TERM stop only this invocation's children.+module_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)+repo_root=$(cd "$module_dir/../../.." && pwd)+fixture="$repo_root/tmp/rocketmq-proxy-fixture"+java_home="${JAVA_HOME:-}"+maven="${MAVEN:-mvn}"+mode="${1:-run}"+if [[ -z "$java_home" && -x /usr/libexec/java_home ]]; then+ java_home=$(/usr/libexec/java_home -v '17+' 2>/dev/null || true)+fi+if [[ -n "$java_home" ]]; then+ java_bin="$java_home/bin/java"+else+ java_bin=$(command -v java || true)+fi+if [[ -z "$java_bin" || ! -x "$java_bin" ]]; then+ echo "Java 17+ is required; set JAVA_HOME or put java on PATH." >&2+ exit 1+fi+java_version=$("$java_bin" -version 2>&1)+java_major=$(printf '%s\n' "$java_version" | sed -nE 's/.*version "([0-9]+).*/\1/p' | head -1)+if [[ ! "$java_major" =~ ^[0-9]+$ ]] || (( java_major < 17 )); then+ echo "Java 17+ is required; detected: $java_version" >&2+ exit 1+fi+mkdir -p "$fixture/conf" "$fixture/lib" "$fixture/store" "$fixture/logs"+if ! mkdir "$fixture/run.lock" 2>/dev/null; then+ echo "Fixture lock exists: $fixture/run.lock; inspect recorded PIDs before removing a stale lock." >&2+ exit 1+fi+children=()+cleanup() {+ trap - EXIT INT TERM+ for pid in "${children[@]}"; do+ if kill -0 "$pid" 2>/dev/null; then kill "$pid" 2>/dev/null || true; fi+ done+ for pid in "${children[@]}"; do wait "$pid" 2>/dev/null || true; done+ # Exact fixed fixture path; preserve configs, data and logs for diagnosis.+ rmdir "$fixture/run.lock"+}+trap cleanup EXIT+trap 'exit 130' INT+trap 'exit 143' TERM+for port in 19876 20909 20911 20912 18080 18081; do+ if lsof -nP -iTCP:"$port" -sTCP:LISTEN >/dev/null 2>&1; then+ echo "Refusing to start: TCP $port is already occupied; no existing process was stopped." >&2+ exit 1+ fi+done+cat >"$fixture/pom.xml" <<'XML'+<project xmlns="http://maven.apache.org/POM/4.0.0"><modelVersion>4.0.0</modelVersion><groupId>com.dbx.test</groupId><artifactId>rocketmq-proxy-fixture</artifactId><version>1.0</version><dependencies><dependency><groupId>org.apache.rocketmq</groupId><artifactId>rocketmq-namesrv</artifactId><version>5.3.2</version></dependency><dependency><groupId>org.apache.rocketmq</groupId><artifactId>rocketmq-broker</artifactId><version>5.3.2</version></dependency><dependency><groupId>org.apache.rocketmq</groupId><artifactId>rocketmq-proxy</artifactId><version>5.3.2</version></dependency></dependencies></project>+XML+if [[ "$mode" != "run-cached" ]]; then+ JAVA_HOME="$java_home" "$maven" -B -f "$fixture/pom.xml" dependency:copy-dependencies -DoutputDirectory="$fixture/lib"+fi+for component in namesrv broker proxy; do+cat >"$fixture/conf/logback_${component}.xml" <<'XML'+<configuration><appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"><encoder><pattern>%date %-5level %logger - %msg%n</pattern></encoder></appender><root level="INFO"><appender-ref ref="STDOUT"/></root></configuration>+XML+done+cat >"$fixture/namesrv.conf" <<'CONF'+listenPort=19876+CONF+cat >"$fixture/broker.conf" <<CONF+brokerClusterName=DefaultCluster+brokerName=dbx-proxy-fixture+brokerId=0+brokerIP1=127.0.0.1+namesrvAddr=127.0.0.1:19876+listenPort=20911+haListenPort=20912+autoCreateTopicEnable=true+autoCreateSubscriptionGroup=true+brokerRole=ASYNC_MASTER+flushDiskType=ASYNC_FLUSH+storePathRootDir=$fixture/store+storePathCommitLog=$fixture/store/commitlog+mappedFileSizeCommitLog=16777216+diskMaxUsedSpaceRatio=95+CONF+cat >"$fixture/proxy.json" <<'JSON'+{"rocketMQClusterName":"DefaultCluster","namesrvAddr":"127.0.0.1:19876","proxyMode":"CLUSTER","grpcServerPort":18081,"remotingListenPort":18080,"localServeAddr":"127.0.0.1","remotingAccessAddr":"127.0.0.1"}+JSON+jvm=(-Xms128m -Xmx256m --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED -Drocketmq.home.dir="$fixture" -Duser.home="$fixture" -cp "$fixture/lib/*")+printf 'supervisor=%s\n' "$$" >"$fixture/pids.env"+"$java_bin" "${jvm[@]}" org.apache.rocketmq.namesrv.NamesrvStartup -c "$fixture/namesrv.conf" >"$fixture/namesrv.stdout.log" 2>&1 &+children+=("$!")+printf 'namesrv=%s\n' "$!" >>"$fixture/pids.env"+"$java_bin" "${jvm[@]}" org.apache.rocketmq.broker.BrokerStartup -c "$fixture/broker.conf" >"$fixture/broker.stdout.log" 2>&1 &+children+=("$!")+printf 'broker=%s\n' "$!" >>"$fixture/pids.env"+# Proxy startup creates cluster system topics and requires a registered broker.+registered=false+for attempt in {1..120}; do+ for pid in "${children[@]}"; do+ if ! kill -0 "$pid" 2>/dev/null; then echo "Fixture child $pid exited before registration" >&2; exit 1; fi+ done+ if "$java_bin" "${jvm[@]}" org.apache.rocketmq.tools.command.MQAdminStartup clusterList -n 127.0.0.1:19876 >"$fixture/cluster.stdout.log" 2>&1 && grep -q 'dbx-proxy-fixture' "$fixture/cluster.stdout.log"; then+ registered=true+ break+ fi+ sleep 1+done+if [[ "$registered" != true ]]; then echo "Broker registration timeout; inspect cluster.stdout.log" >&2; exit 1; fi+"$java_bin" "${jvm[@]}" org.apache.rocketmq.proxy.ProxyStartup -pc "$fixture/proxy.json" >"$fixture/proxy.stdout.log" 2>&1 &+children+=("$!")+printf 'proxy=%s\n' "$!" >>"$fixture/pids.env"+for attempt in {1..120}; do+ for pid in "${children[@]}"; do+ if ! kill -0 "$pid" 2>/dev/null; then+ echo "Fixture process $pid exited; inspect $fixture/*.stdout.log" >&2+ exit 1+ fi+ done+ ready=true+ for port in 19876 20911 18080 18081; do+ if ! lsof -nP -iTCP:"$port" -sTCP:LISTEN >/dev/null 2>&1; then ready=false; fi+ done+ if [[ "$ready" == true ]]; then+ printf 'READY namesrv=127.0.0.1:19876 broker=127.0.0.1:20911 proxy_grpc=127.0.0.1:18081 proxy_remoting=127.0.0.1:18080 supervisor=%s\n' "$$"+ printf 'Cleanup: kill -TERM %s (or cancel managed background job); trap stops recorded children.\n' "$$"+ break+ fi+ if [[ "$attempt" == 120 ]]; then echo "Fixture readiness timeout" >&2; exit 1; fi+ sleep 1+done+# These admin calls are fixture setup, not part of the proxy-only client test.+"$java_bin" "${jvm[@]}" org.apache.rocketmq.tools.command.MQAdminStartup updateTopic -n 127.0.0.1:19876 -b 127.0.0.1:20911 -t DBX_PROXY_TEST -a +message.type=NORMAL >"$fixture/topic.stdout.log" 2>&1+printf 'TOPIC_READY DBX_PROXY_TEST\n'+# Poll only our children so any service failure tears down the fixture.+while true; do+ for pid in "${children[@]}"; do+ if ! kill -0 "$pid" 2>/dev/null; then echo "Fixture child $pid exited" >&2; exit 1; fi+ done+ sleep 2+donediff --git a/agents/drivers/rocketmq/server.go b/agents/drivers/rocketmq/server.goindex 3b5520ba27..1c6e79e3b6 100644--- a/agents/drivers/rocketmq/server.go+++ b/agents/drivers/rocketmq/server.go@@ -17,12 +17,13 @@ const (var capabilities = []string{"mq_connect", "mq_test_connection", "mq_topics", "mq_consumer_groups",- "mq_messages", "mq_acl", "mq_config", "mq_monitoring",+ "mq_messages", "mq_acl", "mq_config", "mq_monitoring", "rocketmq_proxy_grpc",}type rocketMQAgent struct {mu sync.RWMutexclient *admin.Client+ messaging *proxyMessagingClientconnection connectionConfigproxies *proxyManagerclusterName string@@ -39,6 +40,11 @@ func (a *rocketMQAgent) dispatch(method string, raw json.RawMessage) (any, errorif err != nil {return nil, err}+ if strings.HasPrefix(method, "mq_") && method != "mq_send_message" {+ if _, _, err := a.requireClient(); err != nil {+ return nil, err+ }+ }switch method {case "handshake":return map[string]any{@@ -120,6 +126,9 @@ func (a *rocketMQAgent) requireClient() (*admin.Client, connectionConfig, error)a.mu.RLock()defer a.mu.RUnlock()if a.client == nil {+ if a.messaging != nil {+ return nil, a.connection, errors.New("unsupported: RocketMQ management channel is unavailable")+ }return nil, connectionConfig{}, errors.New("RocketMQ agent is not connected")}return a.client, a.connection, nil@@ -134,6 +143,10 @@ func (a *rocketMQAgent) close() {if a.proxies != nil {a.proxies.Close()}+ if a.messaging != nil {+ a.messaging.Close()+ a.messaging = nil+ }a.client = nila.proxies = nila.connection = connectionConfig{}diff --git a/apps/desktop/src/components/connection/ConnectionDialog.vue b/apps/desktop/src/components/connection/ConnectionDialog.vueindex 88dfba94be..d4ce1934ec 100644--- a/apps/desktop/src/components/connection/ConnectionDialog.vue+++ b/apps/desktop/src/components/connection/ConnectionDialog.vue@@ -125,7 +125,7 @@ import { postgresLegacyTlsEnabled, postgresTlsModeForForm, setPostgresLegacyTlsEimport { buildMqKafkaConnectionExtra, mqKafkaConnectionTarget, resolveMqKafkaConnectionSource, type MqKafkaConnectionSource } from "@/lib/connection/mqKafkaConnection";import { assertCompleteDatabaseCategories, databaseSelectionForCategory } from "@/lib/connection/databaseCategoryOptions";import { loadConnectionPickerView, saveConnectionPickerView, type DbPickerView } from "@/lib/connection/connectionPickerViewPreference";-import { normalizeRocketmqNamesrvAddr } from "@/lib/connection/rocketmqNamesrv";+import { buildRocketMqConfig, hydrateRocketMqConfig, isRocketMqConfigValid, rocketMqConnectionTarget } from "@/lib/connection/rocketmqConfig";import { normalizeRabbitmqAddresses, parseRabbitmqAddress } from "@/lib/connection/rabbitmqAddresses";import { pluginFieldIsRequired, pluginFieldIsVisible } from "@/lib/plugins/pluginFieldConditions";import { detectMqUiAuthKind, isMqAuthKindAllowedForSystem, type MqUiAuthKind } from "@/lib/connection/mqAuth";@@ -937,6 +937,18 @@ const mqSystemKind = ref<MqSystemKind>("pulsar");const mqKafkaConnectionSource = ref<MqKafkaConnectionSource>("bootstrap");const mqRocketmqNamesrvAddr = ref("127.0.0.1:9876");const mqRocketmqClusterName = ref("");+const mqRocketmqConnectionMode = ref<"remoting" | "proxy">("remoting");+const mqRocketmqProxyEndpoint = ref("");+const mqRocketmqProxyTls = ref(true);+const mqRocketmqManagementEnabled = ref(false);+const rocketMqFormFields = () => ({+ connectionMode: mqRocketmqConnectionMode.value,+ proxyEndpoint: mqRocketmqProxyEndpoint.value,+ proxyTls: mqRocketmqProxyTls.value,+ managementEnabled: mqRocketmqManagementEnabled.value,+ namesrvAddr: mqRocketmqNamesrvAddr.value,+ clusterName: mqRocketmqClusterName.value,+});const mqRabbitmqAddresses = ref("127.0.0.1:5672");const mqRabbitmqVirtualHost = ref("/");const mqKafkaBootstrapServers = ref("127.0.0.1:9092");@@ -1304,8 +1316,13 @@ function resetMqFields(config?: Partial<MqAdminConfig>) {mqKafkaConnectionSource.value = resolveMqKafkaConnectionSource(extra);mqKafkaBootstrapServers.value = mqExtraString(extra, "bootstrapServers") || "127.0.0.1:9092";mqKafkaZooKeeperServers.value = mqExtraString(extra, "zookeeperServers");- mqRocketmqNamesrvAddr.value = mqExtraString(extra, "namesrvAddr") || mqExtraString(extra, "namesrv_addr") || "127.0.0.1:9876";- mqRocketmqClusterName.value = mqExtraString(extra, "clusterName") || mqExtraString(extra, "cluster_name");+ const rocketmq = hydrateRocketMqConfig(config);+ mqRocketmqNamesrvAddr.value = rocketmq.namesrvAddr;+ mqRocketmqClusterName.value = rocketmq.clusterName;+ mqRocketmqConnectionMode.value = rocketmq.connectionMode;+ mqRocketmqProxyEndpoint.value = rocketmq.proxyEndpoint;+ mqRocketmqProxyTls.value = rocketmq.proxyTls;+ mqRocketmqManagementEnabled.value = rocketmq.managementEnabled;mqRabbitmqAddresses.value = mqExtraString(extra, "addresses") || "127.0.0.1:5672";mqRabbitmqVirtualHost.value = mqExtraString(extra, "virtualHost") || "/";mqKafkaSecurityProtocol.value = mqExtraString(extra, "securityProtocol") || MQ_KAFKA_SECURITY_PROTOCOL_AUTO;@@ -2094,20 +2111,7 @@ function buildMqAdminConfig(): MqAdminConfig {}if (systemKind === "rocketmq") {- const namesrvAddr = normalizeRocketmqNamesrvAddr(mqRocketmqNamesrvAddr.value);- const extra: Record<string, unknown> = { namesrvAddr };- if (mqRocketmqClusterName.value.trim()) extra.clusterName = mqRocketmqClusterName.value.trim();- if (mqAuthKind.value === "basic") {- extra.accessKey = mqBasicUsername.value.trim();- extra.secretKey = mqBasicPassword.value;- }- return {- systemKind: "rocketmq",- adminUrl: "",- auth: buildMqAuth(),- tlsSkipVerify: mqTlsSkipVerify.value || undefined,- extra,- };+ return buildRocketMqConfig(rocketMqFormFields(), buildMqAuth(), mqTlsSkipVerify.value);}if (systemKind === "rabbitmq") {@@ -2629,20 +2633,6 @@ async function testConnectionWithTimeout(config: ConnectionConfig, runId: number}}-function applyMqRocketmqNamesrv(config: LegacyConnectionConfig, namesrvAddr: string) {- const first = normalizeRocketmqNamesrvAddr(namesrvAddr).split(";")[0];- if (!first) throw new Error(t("connection.rocketmqNamesrvAddrRequired"));- let parsed: URL;- try {- parsed = new URL(`rocketmq://${first}`);- } catch {- throw new Error(t("connection.rocketmqNamesrvAddrInvalid"));- }- config.host = parsed.hostname;- config.port = Number(parsed.port) || 9876;- config.ssl = false;-}-function applyMqAdminUrl(config: LegacyConnectionConfig, adminUrl: string) {let parsed: URL;try {@@ -4397,7 +4387,7 @@ const hasRequiredConnectionTarget = computed(() => {}if (form.value.db_type === "mq") {if (mqSystemKind.value === "kafka") return mqKafkaConnectionSource.value === "zookeeper" ? !!mqKafkaZooKeeperServers.value.trim() : !!mqKafkaBootstrapServers.value.trim();- if (mqSystemKind.value === "rocketmq") return !!mqRocketmqNamesrvAddr.value.trim();+ if (mqSystemKind.value === "rocketmq") return isRocketMqConfigValid(rocketMqFormFields());if (mqSystemKind.value === "rabbitmq") return !!mqRabbitmqAddresses.value.trim();return !!mqAdminUrl.value.trim();}@@ -4994,8 +4984,7 @@ function connectionConfigForSubmit(id: string, generatedName = "", validatePlugiconst extra = mqExtraRecord(mqConfig);applyMqKafkaConnectionTarget(config, extra);} else if (mqConfig.systemKind === "rocketmq") {- const extra = mqExtraRecord(mqConfig);- applyMqRocketmqNamesrv(config, mqExtraString(extra, "namesrvAddr") || mqExtraString(extra, "namesrv_addr"));+ Object.assign(config, rocketMqConnectionTarget(mqConfig));} else if (mqConfig.systemKind === "rabbitmq") {const extra = mqExtraRecord(mqConfig);applyMqRabbitmqAddresses(config, mqExtraString(extra, "addresses"));@@ -7802,10 +7791,35 @@ function openExternalUrl(url: string) {</template><template v-else-if="mqSystemKind === 'rocketmq'"><div class="grid grid-cols-4 items-center gap-4">+ <Label :class="connectionLabelClass">{{ t("connection.rocketmqConnectionMode") }}</Label>+ <Select v-model="mqRocketmqConnectionMode">+ <SelectTrigger class="col-span-3"><SelectValue /></SelectTrigger>+ <SelectContent>+ <SelectItem value="remoting">Remoting</SelectItem>+ <SelectItem value="proxy">Proxy (gRPC)</SelectItem>+ </SelectContent>+ </Select>+ </div>+ <template v-if="mqRocketmqConnectionMode === 'proxy'">+ <div class="grid grid-cols-4 items-center gap-4">+ <Label :class="connectionLabelClass">{{ t("connection.rocketmqProxyEndpoint") }}</Label>+ <Input v-model="mqRocketmqProxyEndpoint" class="col-span-3" placeholder="proxy.example.com:8081" />+ </div>+ <div class="grid grid-cols-4 items-center gap-4">+ <Label :class="connectionLabelClass">{{ t("connection.rocketmqProxyTls") }}</Label>+ <input v-model="mqRocketmqProxyTls" type="checkbox" />+ </div>+ <div class="grid grid-cols-4 items-center gap-4">+ <Label :class="connectionLabelClass">{{ t("connection.rocketmqManagementEnabled") }}</Label>+ <input v-model="mqRocketmqManagementEnabled" type="checkbox" />+ </div>+ <p class="text-xs text-muted-foreground">{{ t("connection.rocketmqProxyHint") }}</p>+ </template>+ <div v-if="mqRocketmqConnectionMode === 'remoting' || mqRocketmqManagementEnabled" class="grid grid-cols-4 items-center gap-4"><Label :class="connectionLabelClass">{{ t("connection.rocketmqNamesrvAddr") }}</Label><Input v-model="mqRocketmqNamesrvAddr" class="col-span-3" :placeholder="t('connection.rocketmqNamesrvAddrPlaceholder')" /></div>- <div class="grid grid-cols-4 items-center gap-4">+ <div v-if="mqRocketmqConnectionMode === 'remoting' || mqRocketmqManagementEnabled" class="grid grid-cols-4 items-center gap-4"><Label :class="connectionLabelClass">{{ t("connection.rocketmqClusterName") }}</Label><Input v-model="mqRocketmqClusterName" class="col-span-3" :placeholder="t('connection.rocketmqClusterNamePlaceholder')" /></div>diff --git a/apps/desktop/src/components/mq/MqAdminConsole.vue b/apps/desktop/src/components/mq/MqAdminConsole.vueindex 912e2f8f2a..f712364964 100644--- a/apps/desktop/src/components/mq/MqAdminConsole.vue+++ b/apps/desktop/src/components/mq/MqAdminConsole.vue@@ -1,11 +1,13 @@<script setup lang="ts">import { formatError } from "@/lib/backend/errorUtils";-import { ref, computed, onMounted, watch } from "vue";+import { ref, computed, onMounted, onUnmounted, watch } from "vue";import { useI18n } from "vue-i18n";import type { MqAdminConfig, MqClusterInfo, MqSystemKind, NamespaceRef, TopicInfo } from "@/types/mq";import { mqCreateNamespace, mqListNamespaces, mqTestConnection } from "@/lib/backend/api";import { useConnectionStore } from "@/stores/connectionStore";import { useMqMutationGuard } from "@/composables/useMqMutationGuard";+import { resolveRocketMqChannels } from "@/lib/mq/rocketmqChannels";+import { hydrateRocketMqConfig } from "@/lib/connection/rocketmqConfig";import { mqClusterOptionsFromExtra } from "@/lib/mq/mqTenantForm";import {defaultMqCapabilitiesForSystemKind,@@ -72,6 +74,9 @@ const { confirmMqWrite } = useMqMutationGuard(() => props.connectionId);const isProductionConnection = computed(() => !!connectionStore.getConfig(props.connectionId)?.is_production);const configuredSystemKind = computed(() => resolveMqSystemKindFromConnection(connectionStore.getConfig(props.connectionId)));const FLAT_MQ_CONTEXT = "_flat_mq";+const connectionFingerprint = computed(() => JSON.stringify([props.connectionId, connectionStore.getConfig(props.connectionId), connectionStore.metadataGenerationFor?.(props.connectionId)]));+let handshakeGeneration = 0;+let mounted = false;function normalizeFlatMqTenant(tenant: string | undefined, systemKind: MqSystemKind | undefined): string | undefined {// RabbitMQ has no tenant concept: the console pins a synthetic tenant and@@ -163,7 +168,22 @@ const effectiveNamespace = computed(() => {const breadcrumbTenant = computed(() => (isFlatMqCluster.value ? undefined : selectedTenant.value));const breadcrumbNamespace = computed(() => (isFlatMqCluster.value && !isRabbitMqCluster.value ? undefined : selectedNamespace.value));const breadcrumbNamespaceLabel = computed(() => (isAllVhostsNamespace(breadcrumbNamespace.value) ? t("mqAdmin.allNamespaces") : breadcrumbNamespace.value));-const effectiveCapabilities = computed(() => capabilities.value ?? defaultMqCapabilitiesForSystemKind(configuredSystemKind.value));+const isRocketMqProxy = computed(() => isRocketMqCluster.value && hydrateRocketMqConfig(connectionStore.getConfig(props.connectionId)?.external_config as Partial<MqAdminConfig>).connectionMode === "proxy");+const effectiveCapabilities = computed(() => {+ const defaults = defaultMqCapabilitiesForSystemKind(configuredSystemKind.value, connectionStore.getConfig(props.connectionId));+ const resolved = { ...defaults, ...capabilities.value };+ if (isRocketMqProxy.value && !hydrateRocketMqConfig(connectionStore.getConfig(props.connectionId)?.external_config as Partial<MqAdminConfig>).managementEnabled) {+ return { ...defaults, supportsSendMessage: capabilities.value?.supportsSendMessage ?? defaults.supportsSendMessage };+ }+ // The Proxy transport supports ordinary sending; administration does not imply receive/query support.+ if (isRocketMqProxy.value) {+ resolved.supportsPeekMessages = false;+ resolved.supportsMessageQuery = false;+ resolved.supportsMessageTrace = false;+ resolved.supportsPartitionedTopics = false;+ }+ return resolved;+});const canManageTenants = computed(() => effectiveCapabilities.value.supportsTenants);const canManageNamespaces = computed(() => effectiveCapabilities.value.supportsNamespaces);const canManagePartitionedTopics = computed(() => effectiveCapabilities.value.supportsPartitionedTopics);@@ -190,6 +210,7 @@ const canManageClientConnections = computed(() => effectiveCapabilities.value.suconst canMessageQuery = computed(() => effectiveCapabilities.value.supportsMessageQuery ?? false);const canMessageTrace = computed(() => effectiveCapabilities.value.supportsMessageTrace ?? false);const canUseRawApi = computed(() => effectiveCapabilities.value.supportsRawAdminApi);+const rocketMqChannels = computed(() => (isRocketMqCluster.value ? resolveRocketMqChannels(clusterInfo.value?.extra) : []));const clusterOptions = computed(() => mqClusterOptionsFromExtra(clusterInfo.value?.extra));const availableTabs = computed<MqTab[]>(() =>resolveAvailableMqTabs({@@ -225,20 +246,38 @@ function tabLabelKey(tab: MqTab): string {}// Methods-async function loadClusterInfo() {+async function loadClusterInfo(generation: number, fingerprint: string) {+ const current = () => mounted && generation === handshakeGeneration && fingerprint === connectionFingerprint.value;+ if (!current()) return;loading.value = true;error.value = undefined;try {- clusterInfo.value = await mqTestConnection(props.connectionId);- capabilities.value = clusterInfo.value.capabilities;+ const result = await mqTestConnection(props.connectionId);+ if (!current()) return;+ clusterInfo.value = result;+ capabilities.value = result.capabilities;reconcileActiveTab();} catch (e: unknown) {- error.value = formatError(e);+ if (current()) error.value = formatError(e);} finally {- loading.value = false;+ if (current()) loading.value = false;}}+async function refreshConnectionCapabilities(generation: number) {+ // Coalesce synchronous config edits before reconnecting or starting a handshake.+ await Promise.resolve();+ if (!mounted || generation !== handshakeGeneration) return;+ const fingerprint = connectionFingerprint.value;+ try {+ await connectionStore.ensureConnected(props.connectionId, { skipIfClosedByUser: true });+ } catch (e) {+ if (generation !== handshakeGeneration) return;+ console.warn("[DBX] ensureConnected failed for", props.connectionId, e);+ }+ await loadClusterInfo(generation, fingerprint);+}+async function loadRabbitMqVhosts() {try {const namespaces = await mqListNamespaces(props.connectionId, RABBITMQ_MQ_TENANT);@@ -376,7 +415,7 @@ function goToNamespaceLevel() {function goToTopicLevel() {selectedSubscriptionName.value = undefined;- activeTab.value = "topics";+ setActiveTab("topics");}function setActiveTab(tab: MqTab) {@@ -385,7 +424,7 @@ function setActiveTab(tab: MqTab) {}function firstAvailableTab(): MqTab {- return availableTabs.value[0] ?? "topics";+ return availableTabs.value[0] ?? (isRocketMqProxy.value ? "messages" : "topics");}function reconcileActiveTab() {@@ -394,7 +433,7 @@ function reconcileActiveTab() {}}-watch(availableTabs, reconcileActiveTab);+watch(availableTabs, reconcileActiveTab, { immediate: true });watch(isRabbitMqCluster,(isRabbitMq) => {@@ -421,14 +460,31 @@ watch(},);+// A same-id edit or reconnect must never reuse capabilities from the previous transport.+watch(+ connectionFingerprint,+ () => {+ const generation = ++handshakeGeneration;+ capabilities.value = undefined;+ clusterInfo.value = undefined;+ loading.value = false;+ error.value = undefined;+ selectedTopic.value = undefined;+ selectedSubscriptionName.value = undefined;+ reconcileActiveTab();+ if (mounted) void refreshConnectionCapabilities(generation);+ },+ { flush: "sync" },+);+// Lifecycle-onMounted(async () => {- try {- await connectionStore.ensureConnected(props.connectionId, { skipIfClosedByUser: true });- } catch (e) {- console.warn("[DBX] ensureConnected failed for", props.connectionId, e);- }- loadClusterInfo();+onMounted(() => {+ mounted = true;+ void refreshConnectionCapabilities(++handshakeGeneration);+});+onUnmounted(() => {+ mounted = false;+ handshakeGeneration++;});</script>@@ -449,6 +505,9 @@ onMounted(async () => {<button v-if="selectedTopic" class="breadcrumb-button" @click="goToTopicLevel" :title="t('mqAdmin.viewTopic')">{{ selectedTopic.shortName }}</button></div><div class="toolbar-status">+ <span v-for="channel in rocketMqChannels" :key="channel.channel" :class="{ 'toolbar-error': channel.status === 'degraded' }" :title="channel.error">+ {{ t(`connection.rocketmqChannel${channel.channel === "messaging" ? "Messaging" : "Management"}`) }}: {{ t(`connection.rocketmqChannel${channel.status}`) }}+ </span><span v-if="isProductionConnection" class="prod-badge">PROD</span><span v-if="readOnly" class="readonly-badge">{{ t("mqAdmin.readOnly") }}</span><span v-if="error" class="toolbar-error">{{ error }}</span>@@ -478,6 +537,7 @@ onMounted(async () => {<!-- Main Content Area --><div class="mq-content">+ <div v-if="isRocketMqProxy && !availableTabs.length" class="panel-placeholder">{{ t("connection.rocketmqProxyUnavailable") }}</div><TenantsPanel v-if="activeTab === 'tenants'" :connection-id="connectionId" :supports-tenants="canManageTenants" :read-only="readOnly" :cluster-options="clusterOptions" @tenant-selected="handleTenantSelected" /><NamespacesPanelv-else-if="activeTab === 'namespaces'"@@ -499,6 +559,11 @@ onMounted(async () => {:is-flat-mq-cluster="isFlatMqCluster":mq-system-kind="mqSystemKind":supports-exchanges="canManageExchanges"+ :supports-create-topic="effectiveCapabilities.supportsCreateTopic"+ :supports-delete-topic="effectiveCapabilities.supportsDeleteTopic"+ :supports-topic-stats="effectiveCapabilities.supportsTopicStats"+ :supports-broker-admin="effectiveCapabilities.supportsBrokerAdmin"+ :supports-message-query="canMessageQuery"@topic-selected="handleTopicSelected"@navigate-tab="handleNavigateTab"/>@@ -547,6 +612,16 @@ onMounted(async () => {:mq-system-kind="mqSystemKind"@topic-selected="handleProducerTopicSelected"/>+ <SendMessagePanel+ v-else-if="activeTab === 'messages' && isRocketMqProxy && canSendMessage"+ :connection-id="connectionId"+ :tenant="effectiveTenant"+ :namespace="effectiveNamespace"+ :read-only="readOnly"+ :mq-system-kind="mqSystemKind"+ :supports-list-topics="false"+ :supports-peek-messages="false"+ /><RocketMqMessagesPanelv-else-if="activeTab === 'messages' && isRocketMqCluster && (canMessageQuery || canSendMessage)":connection-id="connectionId"diff --git a/apps/desktop/src/components/mq/SendMessagePanel.vue b/apps/desktop/src/components/mq/SendMessagePanel.vueindex ae9351845b..d19795408e 100644--- a/apps/desktop/src/components/mq/SendMessagePanel.vue+++ b/apps/desktop/src/components/mq/SendMessagePanel.vue@@ -18,12 +18,13 @@ interface Props {mqSystemKind?: MqSystemKind;isFlatMqCluster?: boolean;supportsPeekMessages?: boolean;+ supportsListTopics?: boolean;fixedTopic?: boolean;/** Hide outer toolbar when embedded in a dialog. */embedded?: boolean;}-const props = defineProps<Props>();+const props = withDefaults(defineProps<Props>(), { supportsListTopics: undefined });const { t } = useI18n();const { confirmMqWrite } = useMqMutationGuard(() => props.connectionId);@@ -94,6 +95,7 @@ async function guardWritable() {}async function loadTopics() {+ if (props.supportsListTopics === false) return;if (props.fixedTopic) {availableTopics.value = props.topic ? [props.topic] : [];topicName.value = props.topic?.shortName ?? "";@@ -259,12 +261,13 @@ watch(<div v-if="error" class="panel-error">{{ error }}</div><div v-if="success" class="panel-success"><span class="success-icon">✓</span>- <span>{{ t("mqMessages.sendSuccess", { partition: success.partition, offset: success.offset }) }}</span>+ <span>{{ isRocketMqCluster ? t("mqMessages.sendSuccessRocketmq") : t("mqMessages.sendSuccess", { partition: success.partition ?? "-", offset: success.partition == null ? "-" : success.offset }) }}</span></div><div class="form-group"><label>{{ t("mqMessages.targetTopic") }} <span class="required">*</span></label><input v-if="fixedTopic" :value="topicName" type="text" class="topic-input" disabled />+ <input v-else-if="supportsListTopics === false" v-model="topicName" type="text" class="topic-input" :disabled="readOnly" :placeholder="t('mqMessages.topicSearchPlaceholder')" /><RocketMqTopicSelect v-else-if="isRocketMqCluster" ref="rocketMqTopicSelectRef" v-model="topicName" :connection-id="connectionId" :tenant="tenant" :namespace="namespace" grouping="business" :show-type-filter="false" :disabled="readOnly" @loaded="handleRocketMqTopicsLoaded" /><template v-else><div class="topic-select-row">diff --git a/apps/desktop/src/components/mq/TopicsPanel.vue b/apps/desktop/src/components/mq/TopicsPanel.vueindex d04cfe2950..e26fe93136 100644--- a/apps/desktop/src/components/mq/TopicsPanel.vue+++ b/apps/desktop/src/components/mq/TopicsPanel.vue@@ -38,9 +38,20 @@ interface Props {isFlatMqCluster?: boolean;mqSystemKind?: MqSystemKind;supportsExchanges?: boolean;-}--const props = defineProps<Props>();+ supportsCreateTopic?: boolean;+ supportsDeleteTopic?: boolean;+ supportsTopicStats?: boolean;+ supportsBrokerAdmin?: boolean;+ supportsMessageQuery?: boolean;+}++const props = withDefaults(defineProps<Props>(), {+ supportsCreateTopic: undefined,+ supportsDeleteTopic: undefined,+ supportsTopicStats: undefined,+ supportsBrokerAdmin: undefined,+ supportsMessageQuery: undefined,+});const emit = defineEmits<{topicSelected: [topic: TopicInfo];navigateTab: [payload: { tab: MqTab; topic?: TopicInfo; subscription?: string; preferDlqTopic?: boolean }];@@ -311,7 +322,7 @@ function changeRabbitMqPageSize(pageSize: number) {}async function loadClusterInfo() {- if (!isRocketMqCluster.value) return;+ if (!isRocketMqCluster.value || props.supportsBrokerAdmin === false) return;try {clusterInfo.value = await mqGetClusterInfo(props.connectionId);} catch (e: unknown) {@@ -320,6 +331,7 @@ async function loadClusterInfo() {}function openCreateDialog() {+ if (props.supportsCreateTopic === false) return;if (props.readOnly) {error.value = t("mqTopics.readOnly");return;@@ -341,6 +353,8 @@ function openCreateDialog() {}function openRocketMqDialog(kind: RocketMqTopicDialogKind, topic: TopicInfo) {+ if (kind === "status" && props.supportsTopicStats === false) return;+ if (kind === "route" && props.supportsBrokerAdmin === false) return;rocketMqDialogTopic.value = topic;activeRocketMqDialog.value = kind;}@@ -384,6 +398,7 @@ function navigateToMessages(topic: TopicInfo) {}function navigateToMessageQuery(topic: TopicInfo, preferDlqTopic = false) {+ if (props.supportsMessageQuery === false) return;emit("navigateTab", {tab: "messages",topic,@@ -411,6 +426,7 @@ function openPartitionsDialog(topic: TopicInfo) {}async function handleCreate() {+ if (props.supportsCreateTopic === false) return;if (!(await guardWritable(t("mqTopics.create")))) return;if (!formData.value.topicName.trim() || !props.tenant || !props.namespace) {dialogError.value = t("mqTopics.topicNameRequired");@@ -445,6 +461,7 @@ async function handleCreate() {}function handleDelete(topic: TopicInfo) {+ if (props.supportsDeleteTopic === false) return;if (props.readOnly) {error.value = t("mqTopics.readOnly");return;@@ -454,6 +471,7 @@ function handleDelete(topic: TopicInfo) {}async function confirmDelete() {+ if (props.supportsDeleteTopic === false) return;if (!(await guardWritable(t("mqTopics.delete")))) return;const topic = deleteTarget.value;if (!topic || !props.tenant || !props.namespace) return;@@ -605,7 +623,7 @@ onBeforeUnmount(() => {<button @click="loadTopics" :disabled="loading || !tenant || !namespace" class="btn-secondary">{{ loading ? t("mqTopics.refreshing") : t("mqTopics.refresh") }}</button>- <button @click="openCreateDialog" :disabled="loading || readOnly || !tenant || !namespace || showNamespaceColumn" :title="showNamespaceColumn ? t('mqAdmin.selectNamespaceToCreate') : undefined" class="btn-primary">+ {{ t("mqTopics.createTopic") }}</button>+ <button @click="openCreateDialog" :disabled="loading || readOnly || supportsCreateTopic === false || !tenant || !namespace || showNamespaceColumn" :title="showNamespaceColumn ? t('mqAdmin.selectNamespaceToCreate') : undefined" class="btn-primary">+ {{ t("mqTopics.createTopic") }}</button></div></div>@@ -687,18 +705,18 @@ onBeforeUnmount(() => {</div><div class="topics-col actions" @click.stop><template v-if="isRocketMqCluster">- <button type="button" class="btn-sm" @click="openRocketMqDialog('status', row.topic)">{{ t("mqTopics.actionStatus") }}</button>- <button type="button" class="btn-sm" @click="openRocketMqDialog('route', row.topic)">{{ t("mqTopics.actionRoute") }}</button>+ <button type="button" class="btn-sm" :disabled="supportsTopicStats === false" @click="openRocketMqDialog('status', row.topic)">{{ t("mqTopics.actionStatus") }}</button>+ <button type="button" class="btn-sm" :disabled="supportsBrokerAdmin === false" @click="openRocketMqDialog('route', row.topic)">{{ t("mqTopics.actionRoute") }}</button><button type="button" class="btn-sm" @click="openRocketMqDialog('consumers', row.topic)">{{ t("mqTopics.actionConsumers") }}</button>- <button v-if="isDlqTopic(row.topic)" type="button" class="btn-sm" @click="navigateToMessageQuery(row.topic, true)">{{ t("mqRocketmq.viewDlqMessages") }}</button>+ <button v-if="isDlqTopic(row.topic)" type="button" class="btn-sm" :disabled="supportsMessageQuery === false" @click="navigateToMessageQuery(row.topic, true)">{{ t("mqRocketmq.viewDlqMessages") }}</button><template v-else>- <button type="button" class="btn-sm" @click="navigateToMessageQuery(row.topic)">{{ t("mqRocketmq.actionMessageQuery") }}</button>+ <button type="button" class="btn-sm" :disabled="supportsMessageQuery === false" @click="navigateToMessageQuery(row.topic)">{{ t("mqRocketmq.actionMessageQuery") }}</button><button type="button" class="btn-sm" :disabled="readOnly" @click="navigateToMessages(row.topic)">{{ t("mqRocketmq.actionSendMessage") }}</button></template><button type="button" class="btn-sm" @click="openRocketMqDialog('config', row.topic)">{{ t("mqTopics.actionConfig") }}</button><button type="button" class="btn-sm" :disabled="readOnly || isTopicProtected(row.topic)" @click="openRocketMqDialog('reset', row.topic)">{{ t("mqTopics.actionReset") }}</button><button type="button" class="btn-sm" :disabled="readOnly || isTopicProtected(row.topic)" @click="openRocketMqDialog('skip', row.topic)">{{ t("mqTopics.actionSkip") }}</button>- <button type="button" class="btn-sm btn-danger" :disabled="readOnly || isTopicProtected(row.topic)" @click="handleDelete(row.topic)">{{ t("mqTopics.delete") }}</button>+ <button type="button" class="btn-sm btn-danger" :disabled="readOnly || supportsDeleteTopic === false || isTopicProtected(row.topic)" @click="handleDelete(row.topic)">{{ t("mqTopics.delete") }}</button></template><template v-else><button v-if="row.topic.partitioned && supportsPartitionedTopics !== false && !isTopicProtected(row.topic)" type="button" @click="openPartitionsDialog(row.topic)" :disabled="readOnly || !row.topic.partitions" class="btn-sm">@@ -707,7 +725,7 @@ onBeforeUnmount(() => {<buttontype="button"@click="handleDelete(row.topic)"- :disabled="readOnly || isTopicProtected(row.topic) || (showNamespaceColumn && !row.topic.namespace)"+ :disabled="readOnly || supportsDeleteTopic === false || isTopicProtected(row.topic) || (showNamespaceColumn && !row.topic.namespace)":title="showNamespaceColumn && !row.topic.namespace ? t('mqAdmin.selectNamespaceToWrite') : undefined"class="btn-sm btn-danger">@@ -808,7 +826,7 @@ onBeforeUnmount(() => {</div><div class="dialog-footer"><button @click="showCreateDialog = false" class="btn-secondary">{{ t("mqTopics.cancel") }}</button>- <button @click="handleCreate" :disabled="loading || readOnly" class="btn-primary">{{ t("mqTopics.create") }}</button>+ <button @click="handleCreate" :disabled="loading || readOnly || supportsCreateTopic === false" class="btn-primary">{{ t("mqTopics.create") }}</button></div></div></div>diff --git a/apps/desktop/src/components/mq/__tests__/MqSendResponse.spec.ts b/apps/desktop/src/components/mq/__tests__/MqSendResponse.spec.tsnew file mode 100644index 0000000000..1105f96d49--- /dev/null+++ b/apps/desktop/src/components/mq/__tests__/MqSendResponse.spec.ts@@ -0,0 +1,52 @@+// @vitest-environment happy-dom+import { afterEach, describe, expect, it, vi } from "vitest";+import { createApp, nextTick, type App } from "vue";+const backend = vi.hoisted(() => ({ mqListTopics: vi.fn().mockResolvedValue([]), mqSendMessage: vi.fn() }));+vi.mock("@/lib/backend/api", () => backend);+vi.mock("vue-i18n", () => ({ useI18n: () => ({ t: (key: string, values?: Record<string, unknown>) => `${key}${values ? JSON.stringify(values) : ""}` }) }));+vi.mock("@/composables/useMqMutationGuard", () => ({ useMqMutationGuard: () => ({ confirmMqWrite: async () => true }) }));+vi.mock("@/components/mq/MessageBrowser.vue", () => ({ default: { render: () => null } }));+import SendMessagePanel from "../SendMessagePanel.vue";+import RocketMqMessageDetailDialog from "../shared/RocketMqMessageDetailDialog.vue";+import type { SendMessageResponse } from "@/types/mq";+let app: App;+let root: HTMLDivElement;+const flush = async () => {+ await Promise.resolve();+ await Promise.resolve();+ await nextTick();+};+afterEach(() => {+ app?.unmount();+ root?.remove();+ vi.clearAllMocks();+});++describe("MQ send response queue identity", () => {+ it.each([undefined, null, 0, 3])("preserves known Kafka partitions and renders unknown %s without fabricated offsets", async (partition) => {+ backend.mqSendMessage.mockResolvedValue({ topic: "events", partition, offset: 42 });+ root = document.createElement("div");+ document.body.append(root);+ app = createApp(SendMessagePanel, { connectionId: "kafka", tenant: "flat", namespace: "flat", mqSystemKind: "kafka", fixedTopic: true, supportsPeekMessages: false, topic: { name: "events", shortName: "events", persistent: true, partitioned: false } });+ app.mount(root);+ await flush();+ const payload = root.querySelector<HTMLTextAreaElement>("textarea")!;+ payload.value = "body";+ payload.dispatchEvent(new Event("input", { bubbles: true }));+ await flush();+ [...root.querySelectorAll<HTMLButtonElement>("button")].find((button) => button.textContent?.trim() === "mqMessages.sendMessage")!.click();+ await flush();+ await flush();+ const message = root.querySelector(".panel-success")?.textContent;+ expect(message).toContain(JSON.stringify({ partition: partition ?? "-", offset: partition == null ? "-" : 42 }));+ });+ it.each([undefined, null])("does not promise queue or offset on RocketMQ detail resend with partition %s", (partition) => {+ const response: SendMessageResponse = { topic: "events", partition, offset: 42 };+ root = document.createElement("div");+ document.body.append(root);+ app = createApp(RocketMqMessageDetailDialog, { message: { topic: "events", payload: "body" }, resendSuccess: response });+ app.mount(root);+ expect(root.querySelector(".panel-success")?.textContent?.trim()).toBe("mqMessages.sendSuccessRocketmq");+ expect(root.querySelector(".panel-success")?.textContent).not.toContain("42");+ });+});diff --git a/apps/desktop/src/components/mq/__tests__/RocketMqProxyConsole.spec.ts b/apps/desktop/src/components/mq/__tests__/RocketMqProxyConsole.spec.tsnew file mode 100644index 0000000000..096c98ad39--- /dev/null+++ b/apps/desktop/src/components/mq/__tests__/RocketMqProxyConsole.spec.ts@@ -0,0 +1,214 @@+// @vitest-environment happy-dom+import { afterEach, describe, expect, it, vi } from "vitest";+import { createApp, nextTick, reactive, type App } from "vue";+const state = vi.hoisted(() => ({ config: { db_type: "mq", driver_profile: "rocketmq", external_config: { systemKind: "rocketmq", extra: { connectionMode: "proxy" } } }, revision: { value: 0 }, test: vi.fn(), topics: vi.fn(), admin: vi.fn() }));+vi.mock("vue-i18n", () => ({ useI18n: () => ({ t: (key: string) => key }) }));+vi.mock("@/stores/connectionStore", () => ({ useConnectionStore: () => ({ getConfig: () => state.config, metadataGenerationFor: () => state.revision.value, ensureConnected: async () => undefined }) }));+vi.mock("@/lib/tabs/tabUiState", () => ({ useTabUiState: () => ({ initialState: { activeTab: "broker", selectedTopic: { name: "OldTopic", shortName: "OldTopic", partitioned: false, persistent: true } }, track: () => undefined }) }));+vi.mock("@/composables/useMqMutationGuard", () => ({ useMqMutationGuard: () => ({ confirmMqWrite: async () => true }) }));+vi.mock("@/lib/backend/api", () => ({ mqTestConnection: state.test, mqListTopics: state.topics, mqSendMessage: vi.fn(), mqCreateNamespace: vi.fn(), mqListNamespaces: vi.fn() }));+vi.mock("@/components/mq/TopicsPanel.vue", () => ({+ default: {+ setup: () => {+ state.admin("topics");+ return () => null;+ },+ },+}));+vi.mock("@/components/mq/BrokerPanel.vue", () => ({+ default: {+ setup: () => {+ state.admin("broker");+ return () => null;+ },+ },+}));+vi.mock("@/components/mq/SubscriptionsPanel.vue", () => ({+ default: {+ setup: () => {+ state.admin("subscriptions");+ return () => null;+ },+ },+}));+vi.mock("@/components/mq/ProducerConsumerPanel.vue", () => ({+ default: {+ setup: () => {+ state.admin("producers");+ return () => null;+ },+ },+}));+vi.mock("@/components/mq/RocketMqMessagesPanel.vue", () => ({+ default: {+ setup: () => {+ state.admin("query");+ return () => null;+ },+ },+}));+vi.mock("@/components/mq/MessageQueryPanel.vue", () => ({+ default: {+ setup: () => {+ state.admin("query");+ return () => null;+ },+ },+}));+vi.mock("@/components/mq/MessageBrowser.vue", () => ({ default: { render: () => null } }));+import MqAdminConsole from "../MqAdminConsole.vue";+import { defaultMqCapabilitiesForSystemKind } from "@/lib/mq/mqConsoleDefaults";+let app: App;+let root: HTMLDivElement;+const flush = async () => {+ await Promise.resolve();+ await Promise.resolve();+ await nextTick();+ await Promise.resolve();+ await nextTick();+};+afterEach(() => {+ app?.unmount();+ root?.remove();+ vi.clearAllMocks();+ delete (state.config.external_config.extra as Record<string, unknown>).managementEnabled;+ state.config.external_config.extra.connectionMode = "proxy";+});++describe("RocketMQ proxy console negotiation", () => {+ it("renegotiates reactive same-id mode and endpoint changes without accepting stale responses", async () => {+ state.config = reactive(state.config);+ state.revision = reactive(state.revision);+ const extra = state.config.external_config.extra as Record<string, unknown>;+ extra.connectionMode = "remoting";+ const legacy = { systemKind: "rocketmq", capabilities: defaultMqCapabilitiesForSystemKind("rocketmq"), extra: { channels: { messaging: { status: "ready" }, management: { status: "ready" } } } };+ state.test.mockResolvedValueOnce(legacy);+ root = document.createElement("div");+ document.body.append(root);+ app = createApp(MqAdminConsole, { connectionId: "proxy" });+ app.mount(root);+ await flush();+ expect(root.textContent).toContain("mqAdmin.tabCluster");+ let resolveOld!: (value: unknown) => void;+ state.test.mockImplementationOnce(+ () =>+ new Promise((resolve) => {+ resolveOld = resolve;+ }),+ );+ Object.assign(extra, { connectionMode: "proxy", managementEnabled: true, proxyEndpoint: "first:8081" });+ await flush();+ expect([...root.querySelectorAll(".mq-tabs-list button")].map((el) => el.textContent?.trim())).toEqual(["mqAdmin.tabMessages"]);+ expect(root.textContent).not.toContain("connection.rocketmqChannelManagement");+ expect(state.test).toHaveBeenCalledTimes(2);+ const conservative = defaultMqCapabilitiesForSystemKind("rocketmq", state.config as never);+ state.test.mockResolvedValueOnce({ systemKind: "rocketmq", capabilities: conservative, extra: { channels: { messaging: { status: "ready" }, management: { status: "degraded", error: "offline" } } } });+ extra.proxyEndpoint = "second:8081";+ await flush();+ await flush();+ expect(state.test).toHaveBeenCalledTimes(3);+ expect(root.querySelector('[title="offline"]')).not.toBeNull();+ resolveOld(legacy);+ await flush();+ expect(root.querySelector('[title="offline"]')).not.toBeNull();+ expect(root.textContent).not.toContain("mqAdmin.tabCluster");+ state.test.mockResolvedValueOnce({ ...legacy, capabilities: { ...conservative, supportsListTopics: true, supportsBrokerAdmin: true } });+ extra.proxyEndpoint = "recovered:8081";+ await flush();+ await flush();+ expect(state.test).toHaveBeenCalledTimes(4);+ expect(root.querySelector('[title="offline"]')).toBeNull();+ expect(root.textContent).toContain("mqAdmin.tabTopics");+ expect(root.textContent).toContain("connection.rocketmqChannelManagement: connection.rocketmqChannelready");+ state.test.mockReturnValueOnce(new Promise(() => undefined));+ state.revision.value++;+ await flush();+ expect(state.test).toHaveBeenCalledTimes(5);+ expect(root.textContent).not.toContain("connection.rocketmqChannelManagement");+ expect([...root.querySelectorAll(".mq-tabs-list button")].map((el) => el.textContent?.trim())).toEqual(["mqAdmin.tabMessages"]);+ extra.connectionMode = "proxy";+ });+ it("reconciles a restored Broker tab before mounting and never fetches administration before capabilities", async () => {+ state.test.mockReturnValue(new Promise(() => undefined));+ root = document.createElement("div");+ document.body.append(root);+ app = createApp(MqAdminConsole, { connectionId: "proxy" });+ app.mount(root);+ await flush();+ expect([...root.querySelectorAll(".mq-tabs-list button")].map((el) => el.textContent?.trim())).toEqual(["mqAdmin.tabMessages"]);+ expect(root.querySelector(".send-message-panel input.topic-input")).not.toBeNull();+ root.querySelector<HTMLButtonElement>(".breadcrumb-button")!.click();+ await flush();+ expect(root.querySelector(".send-message-panel input.topic-input")).not.toBeNull();+ expect(state.admin).not.toHaveBeenCalled();+ expect(state.topics).not.toHaveBeenCalled();+ });+ it("keeps proxy-only administration disabled even when stale legacy capabilities arrive", async () => {+ state.test.mockResolvedValue({ systemKind: "rocketmq", capabilities: defaultMqCapabilitiesForSystemKind("rocketmq") });+ root = document.createElement("div");+ document.body.append(root);+ app = createApp(MqAdminConsole, { connectionId: "proxy" });+ app.mount(root);+ await flush();+ expect([...root.querySelectorAll(".mq-tabs-list button")].map((el) => el.textContent?.trim())).toEqual(["mqAdmin.tabMessages"]);+ expect(state.admin).not.toHaveBeenCalled();+ expect(state.topics).not.toHaveBeenCalled();+ });+ it("never falls back to topic administration when sending is unavailable", async () => {+ state.test.mockResolvedValue({ systemKind: "rocketmq", capabilities: { ...defaultMqCapabilitiesForSystemKind("rocketmq", state.config as never), supportsSendMessage: false } });+ root = document.createElement("div");+ document.body.append(root);+ app = createApp(MqAdminConsole, { connectionId: "proxy" });+ app.mount(root);+ await flush();+ expect(state.admin).not.toHaveBeenCalled();+ expect(state.topics).not.toHaveBeenCalled();+ expect(root.querySelector(".send-message-panel")).toBeNull();+ });+ it("sends an unlisted manual topic with ready administration and list capability", async () => {+ const extra = state.config.external_config.extra as Record<string, unknown>;+ extra.managementEnabled = true;+ const send = (await import("@/lib/backend/api")).mqSendMessage;+ vi.mocked(send).mockResolvedValue({ topic: "UnlistedTopic", partition: 0, offset: 0 });+ state.topics.mockResolvedValue([{ name: "ListedTopic", shortName: "ListedTopic", persistent: true, partitioned: false }]);+ state.test.mockResolvedValue({ systemKind: "rocketmq", capabilities: { ...defaultMqCapabilitiesForSystemKind("rocketmq"), supportsListTopics: true }, extra: { channels: { messaging: { status: "ready" }, management: { status: "ready" } } } });+ root = document.createElement("div");+ document.body.append(root);+ app = createApp(MqAdminConsole, { connectionId: "proxy" });+ app.mount(root);+ await flush();+ const tabs = [...root.querySelectorAll<HTMLButtonElement>(".mq-tabs-list button")];+ expect(tabs.some((button) => button.textContent?.trim() === "mqAdmin.tabTopics")).toBe(true);+ tabs.find((button) => button.textContent?.trim() === "mqAdmin.tabMessages")!.click();+ await flush();+ const topic = root.querySelector<HTMLInputElement>(".send-message-panel input")!;+ topic.value = "UnlistedTopic";+ topic.dispatchEvent(new Event("input", { bubbles: true }));+ await flush();+ const payload = root.querySelector<HTMLTextAreaElement>(".send-message-panel textarea")!;+ payload.value = "ordinary payload";+ payload.dispatchEvent(new Event("input", { bubbles: true }));+ await flush();+ [...root.querySelectorAll<HTMLButtonElement>(".send-message-panel button")].find((button) => button.textContent?.trim() === "mqMessages.sendMessage")!.click();+ await flush();+ await flush();+ expect(send).toHaveBeenCalledWith("proxy", expect.objectContaining({ topic: "UnlistedTopic", payloadText: "ordinary payload" }));+ expect(state.topics).not.toHaveBeenCalled();+ });+ it("keeps sending available and displays degraded management separately", async () => {+ state.test.mockResolvedValue({ systemKind: "rocketmq", capabilities: defaultMqCapabilitiesForSystemKind("rocketmq", state.config as never), extra: { channels: { messaging: { status: "ready" }, management: { status: "degraded", error: "No route to NameServer" } } } });+ root = document.createElement("div");+ document.body.append(root);+ app = createApp(MqAdminConsole, { connectionId: "proxy" });+ app.mount(root);+ await flush();+ expect(root.textContent).toContain("connection.rocketmqChannelMessaging: connection.rocketmqChannelready");+ expect(root.querySelector('[title="No route to NameServer"]')?.textContent).toContain("connection.rocketmqChanneldegraded");+ expect(root.querySelector(".send-message-panel input.topic-input")).not.toBeNull();+ root.querySelector<HTMLButtonElement>(".breadcrumb-button")!.click();+ await flush();+ expect(root.querySelector(".send-message-panel input.topic-input")).not.toBeNull();+ expect(state.admin).not.toHaveBeenCalled();+ expect(state.topics).not.toHaveBeenCalled();+ });+});diff --git a/apps/desktop/src/components/mq/__tests__/RocketMqProxySend.spec.ts b/apps/desktop/src/components/mq/__tests__/RocketMqProxySend.spec.tsnew file mode 100644index 0000000000..5c4966c117--- /dev/null+++ b/apps/desktop/src/components/mq/__tests__/RocketMqProxySend.spec.ts@@ -0,0 +1,56 @@+// @vitest-environment happy-dom+import { afterEach, describe, expect, it, vi } from "vitest";+import { createApp, nextTick, type App } from "vue";+const backend = vi.hoisted(() => ({ mqListTopics: vi.fn().mockResolvedValue([]), mqSendMessage: vi.fn().mockResolvedValue({ messageId: "sent" }) }));+vi.mock("@/lib/backend/api", () => backend);+vi.mock("vue-i18n", () => ({ useI18n: () => ({ t: (key: string) => key }) }));+vi.mock("@/composables/useMqMutationGuard", () => ({ useMqMutationGuard: () => ({ confirmMqWrite: async () => true }) }));+vi.mock("@/components/mq/MessageBrowser.vue", () => ({ default: { render: () => null } }));+import SendMessagePanel from "../SendMessagePanel.vue";+let app: App;+let root: HTMLDivElement;+afterEach(() => {+ app?.unmount();+ root?.remove();+ vi.clearAllMocks();+});+const flush = async () => {+ await Promise.resolve();+ await Promise.resolve();+ await nextTick();+};++describe("RocketMQ proxy ordinary sending", () => {+ it("accepts a manual topic without requesting management data and sends ordinary key/tag/properties", async () => {+ root = document.createElement("div");+ document.body.append(root);+ app = createApp(SendMessagePanel, { connectionId: "proxy", tenant: "_flat_mq", namespace: "_flat_mq", mqSystemKind: "rocketmq", supportsListTopics: false, supportsPeekMessages: false });+ app.mount(root);+ await flush();+ expect(backend.mqListTopics).not.toHaveBeenCalled();+ const topic = root.querySelector<HTMLInputElement>("input.topic-input")!;+ expect(topic).not.toBeNull();+ const set = async (el: HTMLInputElement | HTMLTextAreaElement, value: string) => {+ el.value = value;+ el.dispatchEvent(new Event("input", { bubbles: true }));+ await nextTick();+ };+ await set(topic, "ManualTopic");+ const inputs = root.querySelectorAll<HTMLInputElement>(".form-group input");+ await set(inputs[1], "key-1");+ await set(inputs[2], "tag-1");+ await set(root.querySelector<HTMLTextAreaElement>("textarea")!, "hello");+ root.querySelector<HTMLButtonElement>(".collapse-toggle")!.click();+ await nextTick();+ const textareas = root.querySelectorAll<HTMLTextAreaElement>("textarea");+ await set(textareas[1], "trace: value");+ const send = Array.from(root.querySelectorAll<HTMLButtonElement>("button")).find((el) => el.textContent?.includes("mqMessages.sendMessage"))!;+ send.click();+ await flush();+ await flush();+ expect(backend.mqSendMessage).toHaveBeenCalledWith("proxy", expect.objectContaining({ topic: "ManualTopic", key: "key-1", headers: { TAGS: "tag-1", trace: "value" }, payloadText: "hello" }));+ expect(backend.mqSendMessage.mock.calls[0][1]).not.toHaveProperty("partition");+ expect(backend.mqListTopics).not.toHaveBeenCalled();+ expect(root.textContent).toContain("mqMessages.sendSuccessRocketmq");+ });+});diff --git a/apps/desktop/src/components/mq/__tests__/TopicsPanel.spec.ts b/apps/desktop/src/components/mq/__tests__/TopicsPanel.spec.tsindex 67510224b5..f06c8f0e73 100644--- a/apps/desktop/src/components/mq/__tests__/TopicsPanel.spec.ts+++ b/apps/desktop/src/components/mq/__tests__/TopicsPanel.spec.ts@@ -169,6 +169,21 @@ afterEach(() => {vi.useRealTimers();});+describe("TopicsPanel optional management capabilities", () => {+ it("disables create/delete and avoids Broker discovery when unsupported", async () => {+ backend.mqListTopics.mockResolvedValue([{ name: "TopicA", shortName: "TopicA", persistent: true, partitioned: false, messageType: "NORMAL" }]);+ root = document.createElement("div");+ document.body.append(root);+ app = createApp(TopicsPanel, { connectionId: "proxy", tenant: "_flat_mq", namespace: "_flat_mq", mqSystemKind: "rocketmq", supportsCreateTopic: false, supportsDeleteTopic: false, supportsTopicStats: false, supportsBrokerAdmin: false });+ app.mount(root);+ await flushUi();+ expect(backend.mqGetClusterInfo).not.toHaveBeenCalled();+ const buttons = [...root.querySelectorAll<HTMLButtonElement>("button")];+ expect(buttons.find((button) => button.textContent?.includes("mqTopics.createTopic"))?.disabled).toBe(true);+ expect(buttons.find((button) => button.textContent?.trim() === "mqTopics.delete")?.disabled).toBe(true);+ });+});+describe("TopicsPanel RabbitMQ queue messages", () => {it("shows ready message counts and toggles descending and ascending sorting", async () => {const panel = await mountRabbitMqPanel();diff --git a/apps/desktop/src/components/mq/shared/RocketMqMessageDetailDialog.vue b/apps/desktop/src/components/mq/shared/RocketMqMessageDetailDialog.vueindex 99a5cb1388..78600f57cb 100644--- a/apps/desktop/src/components/mq/shared/RocketMqMessageDetailDialog.vue+++ b/apps/desktop/src/components/mq/shared/RocketMqMessageDetailDialog.vue@@ -50,7 +50,7 @@ const { t } = useI18n();<template v-else><div v-if="detailError" class="panel-error">{{ detailError }}</div><div v-if="resendSuccess" class="panel-success">- {{ t("mqMessages.sendSuccess", { partition: resendSuccess.partition, offset: resendSuccess.offset }) }}+ {{ t("mqMessages.sendSuccessRocketmq") }}</div><div v-if="resendError" class="panel-error">{{ resendError }}</div>diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.tsindex dce526d084..b9e04bdf51 100644--- a/apps/desktop/src/i18n/locales/en.ts+++ b/apps/desktop/src/i18n/locales/en.ts@@ -1555,6 +1555,17 @@ export default {kafkaKerberosKrb5ConfPlaceholder: "Optional path on DBX Agent machine, e.g. /etc/krb5.conf",kafkaKerberosPathHint: "The keytab and krb5.conf paths are read by DBX Agent and must exist on the machine running DBX Agent; files are not uploaded from this browser.",kafkaKerberosAuthHint: "Uses GSSAPI + keytab login. If the server requires encrypted transport, set Security to SASL_SSL; otherwise Auto or SASL_PLAINTEXT can be used.",+ rocketmqConnectionMode: "Connection mode",+ rocketmqProxyEndpoint: "Proxy endpoint",+ rocketmqProxyTls: "Proxy TLS",+ rocketmqManagementEnabled: "Enable Remoting management",+ rocketmqProxyUnavailable: "This connection does not support Proxy message sending. Check the agent version and messaging channel status.",+ rocketmqProxyHint: "Proxy sends ordinary messages only. Enter a Topic manually. Optional management requires a reachable NameServer and Brokers; management failure does not disable sending.",+ rocketmqChannelMessaging: "Messaging",+ rocketmqChannelManagement: "Management",+ rocketmqChannelready: "Ready",+ rocketmqChanneldisabled: "Disabled",+ rocketmqChanneldegraded: "Degraded",rocketmqNamesrvAddr: "NameServer Address",rocketmqNamesrvAddrPlaceholder: "127.0.0.1:9876",rocketmqNamesrvAddrRequired: "RocketMQ NameServer address is required",@@ -10915,6 +10926,7 @@ export default {readOnlyCannotSend: "This connection is read-only and cannot send messages",selectTargetTopic: "Select a target topic",messageContentRequired: "Message content is required",+ sendSuccessRocketmq: "Message sent",sendSuccess: "Message sent — partition: {partition}, offset: {offset}",targetTopic: "Target topic",topicLoading: "Loading...",diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.tsindex b79f3f0fdd..2fd258ad54 100644--- a/apps/desktop/src/i18n/locales/es.ts+++ b/apps/desktop/src/i18n/locales/es.ts@@ -1719,6 +1719,17 @@ export default withEnglishFallback({elasticsearchIndexGroupingPattern: "Index grouping regex",elasticsearchIndexGroupingPatternPlaceholder: "off by default; enter a regex to enable",elasticsearchIndexGroupingPatternHint: "Off by default (naming schemes vary). Enter a regular expression to enable: matched rolling or time-series indices are aggregated into one queryable wildcard pattern, hiding per-day detail.",+ rocketmqConnectionMode: "Modo de conexión",+ rocketmqProxyEndpoint: "Dirección del Proxy",+ rocketmqProxyTls: "TLS del Proxy",+ rocketmqManagementEnabled: "Habilitar administración Remoting",+ rocketmqProxyUnavailable: "Esta conexión no admite el envío de mensajes mediante Proxy. Comprueba la versión del agente y el estado del canal de mensajería.",+ rocketmqProxyHint: "Proxy solo envía mensajes normales. Introduce un Topic manualmente. La administración opcional requiere acceso al NameServer y a los Brokers; un fallo de administración no desactiva el envío.",+ rocketmqChannelMessaging: "Mensajería",+ rocketmqChannelManagement: "Administración",+ rocketmqChannelready: "Disponible",+ rocketmqChanneldisabled: "Deshabilitado",+ rocketmqChanneldegraded: "Degradado",rocketmqNamesrvAddr: "Dirección de NameServer",rocketmqNamesrvAddrPlaceholder: "127.0.0.1:9876",rocketmqNamesrvAddrRequired: "La dirección de NameServer de RocketMQ no puede estar vacía",@@ -10397,6 +10408,7 @@ export default withEnglishFallback({selectTargetTopic: "Seleccione un tema de destino",messageContentRequired: "El contenido del mensaje es obligatorio",sendSuccess: "Mensaje enviado — partición: {partition}, offset: {offset}",+ sendSuccessRocketmq: "Mensaje enviado",targetTopic: "Tema de destino",topicLoading: "Cargando...",topicSearchPlaceholder: "Escriba o busque temas...",diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.tsindex faca3f37f8..1bf3ce7a70 100644--- a/apps/desktop/src/i18n/locales/it.ts+++ b/apps/desktop/src/i18n/locales/it.ts@@ -1631,6 +1631,17 @@ export default withEnglishFallback({elasticsearchIndexGroupingPattern: "Index grouping regex",elasticsearchIndexGroupingPatternPlaceholder: "off by default; enter a regex to enable",elasticsearchIndexGroupingPatternHint: "Off by default (naming schemes vary). Enter a regular expression to enable: matched rolling or time-series indices are aggregated into one queryable wildcard pattern, hiding per-day detail.",+ rocketmqConnectionMode: "Modalità di connessione",+ rocketmqProxyEndpoint: "Endpoint Proxy",+ rocketmqProxyTls: "TLS del Proxy",+ rocketmqManagementEnabled: "Abilita gestione Remoting",+ rocketmqProxyUnavailable: "Questa connessione non supporta l’invio di messaggi tramite Proxy. Controlla la versione dell’agente e lo stato del canale di messaggistica.",+ rocketmqProxyHint: "Il Proxy invia solo messaggi ordinari. Inserisci un Topic manualmente. La gestione opzionale richiede NameServer e Broker raggiungibili; un errore di gestione non disabilita l’invio.",+ rocketmqChannelMessaging: "Messaggistica",+ rocketmqChannelManagement: "Gestione",+ rocketmqChannelready: "Pronto",+ rocketmqChanneldisabled: "Disabilitato",+ rocketmqChanneldegraded: "Degradato",rocketmqNamesrvAddr: "Indirizzo NameServer",rocketmqNamesrvAddrPlaceholder: "127.0.0.1:9876",rocketmqNamesrvAddrRequired: "L'indirizzo NameServer di RocketMQ non può essere vuoto",@@ -10144,6 +10155,7 @@ export default withEnglishFallback({selectTargetTopic: "Seleziona un topic di destinazione",messageContentRequired: "Il contenuto del messaggio è obbligatorio",sendSuccess: "Messaggio inviato — partizione: {partition}, offset: {offset}",+ sendSuccessRocketmq: "Messaggio inviato",targetTopic: "Topic di destinazione",topicLoading: "Caricamento in corso...",topicSearchPlaceholder: "Digita o cerca topic...",diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.tsindex 17ca9cc4f3..d09e416193 100644--- a/apps/desktop/src/i18n/locales/ja.ts+++ b/apps/desktop/src/i18n/locales/ja.ts@@ -1631,6 +1631,17 @@ export default withEnglishFallback({elasticsearchIndexGroupingPattern: "Index grouping regex",elasticsearchIndexGroupingPatternPlaceholder: "off by default; enter a regex to enable",elasticsearchIndexGroupingPatternHint: "Off by default (naming schemes vary). Enter a regular expression to enable: matched rolling or time-series indices are aggregated into one queryable wildcard pattern, hiding per-day detail.",+ rocketmqConnectionMode: "接続モード",+ rocketmqProxyEndpoint: "Proxy エンドポイント",+ rocketmqProxyTls: "Proxy TLS",+ rocketmqManagementEnabled: "Remoting 管理を有効にする",+ rocketmqProxyUnavailable: "この接続は Proxy によるメッセージ送信に対応していません。エージェントのバージョンとメッセージチャネルの状態を確認してください。",+ rocketmqProxyHint: "Proxy は通常メッセージの送信のみ対応しています。Topic を手動で入力してください。任意の管理機能には到達可能な NameServer と Broker が必要です。管理機能に障害が発生しても送信は継続できます。",+ rocketmqChannelMessaging: "メッセージ",+ rocketmqChannelManagement: "管理",+ rocketmqChannelready: "準備完了",+ rocketmqChanneldisabled: "無効",+ rocketmqChanneldegraded: "機能低下",rocketmqNamesrvAddr: "NameServer アドレス",rocketmqNamesrvAddrPlaceholder: "127.0.0.1:9876",rocketmqNamesrvAddrRequired: "RocketMQ NameServer アドレスは空にできません",@@ -10181,6 +10192,7 @@ export default withEnglishFallback({selectTargetTopic: "送信先トピックを選択してください",messageContentRequired: "メッセージ内容は必須です",sendSuccess: "メッセージを送信しました — パーティション: {partition}, offset: {offset}",+ sendSuccessRocketmq: "メッセージを送信しました",targetTopic: "送信先トピック",topicLoading: "読み込み中...",topicSearchPlaceholder: "トピックを入力または検索...",diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.tsindex 76f70e3b33..77cb9ec52d 100644--- a/apps/desktop/src/i18n/locales/ko.ts+++ b/apps/desktop/src/i18n/locales/ko.ts@@ -1336,6 +1336,17 @@ export default withEnglishFallback({kafkaKerberosKrb5ConfPlaceholder: "DBX Agent 머신의 선택 경로, 예: /etc/krb5.conf",kafkaKerberosPathHint: "keytab과 krb5.conf 경로는 DBX Agent가 읽으며 DBX Agent를 실행하는 머신에 존재해야 합니다. 이 브라우저에서 파일이 업로드되지 않습니다.",kafkaKerberosAuthHint: "GSSAPI + keytab 로그인을 사용합니다. 서버가 암호화 전송을 요구하면 보안을 SASL_SSL로 설정하고, 그렇지 않으면 자동 또는 SASL_PLAINTEXT를 사용할 수 있습니다.",+ rocketmqConnectionMode: "연결 모드",+ rocketmqProxyEndpoint: "Proxy 엔드포인트",+ rocketmqProxyTls: "Proxy TLS",+ rocketmqManagementEnabled: "Remoting 관리 활성화",+ rocketmqProxyUnavailable: "이 연결은 Proxy 메시지 전송을 지원하지 않습니다. 에이전트 버전과 메시징 채널 상태를 확인하세요.",+ rocketmqProxyHint: "Proxy는 일반 메시지 전송만 지원합니다. Topic을 직접 입력하세요. 선택적 관리 기능에는 연결 가능한 NameServer와 Broker가 필요하며, 관리 기능에 장애가 발생해도 전송은 계속 사용할 수 있습니다.",+ rocketmqChannelMessaging: "메시징",+ rocketmqChannelManagement: "관리",+ rocketmqChannelready: "준비됨",+ rocketmqChanneldisabled: "비활성화됨",+ rocketmqChanneldegraded: "기능 저하",rocketmqNamesrvAddr: "NameServer 주소",rocketmqNamesrvAddrPlaceholder: "127.0.0.1:9876",rocketmqNamesrvAddrRequired: "RocketMQ NameServer 주소는 필수입니다",@@ -9608,6 +9619,7 @@ export default withEnglishFallback({selectTargetTopic: "대상 토픽을 선택하세요",messageContentRequired: "메시지 내용은 필수입니다",sendSuccess: "메시지 전송됨 — 파티션: {partition}, 오프셋: {offset}",+ sendSuccessRocketmq: "메시지 전송됨",targetTopic: "대상 토픽",topicLoading: "불러오는 중...",topicSearchPlaceholder: "토픽 선택",diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.tsindex a282579259..f3add95e0a 100644--- a/apps/desktop/src/i18n/locales/pt-BR.ts+++ b/apps/desktop/src/i18n/locales/pt-BR.ts@@ -1632,6 +1632,17 @@ export default withEnglishFallback({elasticsearchIndexGroupingPattern: "Index grouping regex",elasticsearchIndexGroupingPatternPlaceholder: "off by default; enter a regex to enable",elasticsearchIndexGroupingPatternHint: "Off by default (naming schemes vary). Enter a regular expression to enable: matched rolling or time-series indices are aggregated into one queryable wildcard pattern, hiding per-day detail.",+ rocketmqConnectionMode: "Modo de conexão",+ rocketmqProxyEndpoint: "Endpoint do Proxy",+ rocketmqProxyTls: "TLS do Proxy",+ rocketmqManagementEnabled: "Ativar gerenciamento Remoting",+ rocketmqProxyUnavailable: "Esta conexão não oferece suporte ao envio de mensagens via Proxy. Verifique a versão do agente e o estado do canal de mensagens.",+ rocketmqProxyHint: "O Proxy envia apenas mensagens comuns. Insira um Topic manualmente. O gerenciamento opcional requer NameServer e Brokers acessíveis; uma falha no gerenciamento não desativa o envio.",+ rocketmqChannelMessaging: "Mensagens",+ rocketmqChannelManagement: "Gerenciamento",+ rocketmqChannelready: "Pronto",+ rocketmqChanneldisabled: "Desativado",+ rocketmqChanneldegraded: "Degradado",rocketmqNamesrvAddr: "Endereço do NameServer",rocketmqNamesrvAddrPlaceholder: "127.0.0.1:9876",rocketmqNamesrvAddrRequired: "O endereço do NameServer do RocketMQ não pode estar vazio",@@ -10140,6 +10151,7 @@ export default withEnglishFallback({selectTargetTopic: "Selecione um tópico de destino",messageContentRequired: "O conteúdo da mensagem é obrigatório",sendSuccess: "Mensagem enviada — partição: {partition}, offset: {offset}",+ sendSuccessRocketmq: "Mensagem enviada",targetTopic: "Tópico de destino",topicLoading: "Carregando...",topicSearchPlaceholder: "Digite ou pesquise tópicos...",diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.tsindex 0898f95d14..f46756d421 100644--- a/apps/desktop/src/i18n/locales/ru.ts+++ b/apps/desktop/src/i18n/locales/ru.ts@@ -1320,6 +1320,17 @@ export default withEnglishFallback({kafkaKerberosKrb5ConfPlaceholder: "Необязательный путь на машине DBX Agent, например /etc/krb5.conf",kafkaKerberosPathHint: "Пути keytab и krb5.conf читаются DBX Agent и должны существовать на машине, где запущен DBX Agent; файлы не загружаются из этого браузера.",kafkaKerberosAuthHint: "Использует вход GSSAPI + keytab. Если сервер требует зашифрованный транспорт, задайте для Security значение SASL_SSL; иначе можно использовать Auto или SASL_PLAINTEXT.",+ rocketmqConnectionMode: "Режим подключения",+ rocketmqProxyEndpoint: "Адрес Proxy",+ rocketmqProxyTls: "TLS для Proxy",+ rocketmqManagementEnabled: "Включить управление Remoting",+ rocketmqProxyUnavailable: "Это подключение не поддерживает отправку сообщений через Proxy. Проверьте версию агента и состояние канала сообщений.",+ rocketmqProxyHint: "Proxy поддерживает только отправку обычных сообщений. Введите Topic вручную. Для дополнительного управления необходимы доступные NameServer и Broker; сбой управления не отключает отправку.",+ rocketmqChannelMessaging: "Сообщения",+ rocketmqChannelManagement: "Управление",+ rocketmqChannelready: "Готов",+ rocketmqChanneldisabled: "Отключён",+ rocketmqChanneldegraded: "Ограниченная работоспособность",rocketmqNamesrvAddr: "Адрес NameServer",rocketmqNamesrvAddrPlaceholder: "127.0.0.1:9876",rocketmqNamesrvAddrRequired: "Требуется адрес NameServer RocketMQ",@@ -11109,6 +11120,7 @@ export default withEnglishFallback({selectTargetTopic: "Выберите целевую тему",messageContentRequired: "Укажите содержимое сообщения",sendSuccess: "Сообщение отправлено — раздел: {partition}, смещение: {offset}",+ sendSuccessRocketmq: "Сообщение отправлено",targetTopic: "Целевая тема",topicLoading: "Загрузка...",topicSearchPlaceholder: "Выберите тему",diff --git a/apps/desktop/src/i18n/locales/th.ts b/apps/desktop/src/i18n/locales/th.tsindex a45de22cb9..57c8555c02 100644--- a/apps/desktop/src/i18n/locales/th.ts+++ b/apps/desktop/src/i18n/locales/th.ts@@ -1520,6 +1520,17 @@ export default withEnglishFallback({kafkaKerberosKrb5ConfPlaceholder: "Path ที่เป็นตัวเลือกบนเครื่อง DBX Agent เช่น /etc/krb5.conf",kafkaKerberosPathHint: "DBX Agent อ่าน Path ของ Keytab และ krb5.conf และไฟล์ต้องมีอยู่บนเครื่องที่เรียกใช้ DBX Agent ไฟล์จะไม่ถูกอัปโหลดจาก Browser นี้",kafkaKerberosAuthHint: "ใช้การเข้าสู่ระบบ GSSAPI + Keytab หาก Server ต้องใช้ Transport ที่เข้ารหัส ให้ตั้ง Security เป็น SASL_SSL มิฉะนั้นใช้ Auto หรือ SASL_PLAINTEXT ได้",+ rocketmqConnectionMode: "โหมดการเชื่อมต่อ",+ rocketmqProxyEndpoint: "ปลายทาง Proxy",+ rocketmqProxyTls: "TLS ของ Proxy",+ rocketmqManagementEnabled: "เปิดใช้งานการจัดการผ่าน Remoting",+ rocketmqProxyUnavailable: "การเชื่อมต่อนี้ไม่รองรับการส่งข้อความผ่าน Proxy โปรดตรวจสอบเวอร์ชันเอเจนต์และสถานะช่องทางข้อความ",+ rocketmqProxyHint: "Proxy รองรับเฉพาะการส่งข้อความทั่วไป โปรดป้อน Topic ด้วยตนเอง การจัดการเสริมต้องเชื่อมต่อกับ NameServer และ Broker ได้ หากการจัดการล้มเหลวจะยังคงส่งข้อความได้",+ rocketmqChannelMessaging: "ข้อความ",+ rocketmqChannelManagement: "การจัดการ",+ rocketmqChannelready: "พร้อมใช้งาน",+ rocketmqChanneldisabled: "ปิดใช้งาน",+ rocketmqChanneldegraded: "ทำงานได้บางส่วน",rocketmqNamesrvAddr: "ที่อยู่ NameServer",rocketmqNamesrvAddrPlaceholder: "127.0.0.1:9876",rocketmqNamesrvAddrRequired: "ต้องระบุที่อยู่ RocketMQ NameServer",@@ -11540,6 +11551,7 @@ export default withEnglishFallback({selectTargetTopic: "เลือก Topic เป้าหมาย",messageContentRequired: "ต้องระบุเนื้อหาข้อความ",sendSuccess: "ส่งข้อความแล้ว — พาร์ติชัน: {partition}, Offset: {offset}",+ sendSuccessRocketmq: "ส่งข้อความแล้ว",targetTopic: "Topic เป้าหมาย",topicLoading: "กำลังโหลด...",topicSearchPlaceholder: "เลือก Topic",diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.tsindex 5c8f4000ac..4fd6178c5f 100644--- a/apps/desktop/src/i18n/locales/zh-CN.ts+++ b/apps/desktop/src/i18n/locales/zh-CN.ts@@ -1490,6 +1490,17 @@ export default withEnglishFallback({kafkaKerberosKrb5ConfPlaceholder: "可选,DBX Agent 所在机器路径,例如 /etc/krb5.conf",kafkaKerberosPathHint: "keytab 和 krb5.conf 路径由 DBX Agent 读取,必须存在于运行 DBX Agent 的机器上;不会从当前浏览器上传文件。",kafkaKerberosAuthHint: "使用 GSSAPI + keytab 登录。若服务端要求加密传输,请将 Security 设为 SASL_SSL;否则可使用 Auto 或 SASL_PLAINTEXT。",+ rocketmqConnectionMode: "连接模式",+ rocketmqProxyEndpoint: "Proxy 地址",+ rocketmqProxyTls: "Proxy TLS",+ rocketmqManagementEnabled: "启用 Remoting 管理",+ rocketmqProxyUnavailable: "当前连接不支持 Proxy 消息发送,请检查 Agent 版本及消息通道状态。",+ rocketmqProxyHint: "Proxy 仅发送普通消息,可手动输入 Topic。可选管理功能需要可访问的 NameServer 和 Broker;管理通道异常不影响发送。",+ rocketmqChannelMessaging: "消息通道",+ rocketmqChannelManagement: "管理通道",+ rocketmqChannelready: "就绪",+ rocketmqChanneldisabled: "未启用",+ rocketmqChanneldegraded: "已降级",rocketmqNamesrvAddr: "NameServer 地址",rocketmqNamesrvAddrPlaceholder: "127.0.0.1:9876",rocketmqNamesrvAddrRequired: "RocketMQ NameServer 地址不能为空",@@ -10892,6 +10903,7 @@ export default withEnglishFallback({readOnlyCannotSend: "当前连接为只读模式,不能发送消息",selectTargetTopic: "请选择目标主题",messageContentRequired: "消息内容不能为空",+ sendSuccessRocketmq: "消息发送成功",sendSuccess: "消息发送成功 — 分区: {partition},偏移: {offset}",targetTopic: "目标主题",topicLoading: "加载中...",diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.tsindex 63c9a989b2..9b9df3dcaa 100644--- a/apps/desktop/src/i18n/locales/zh-TW.ts+++ b/apps/desktop/src/i18n/locales/zh-TW.ts@@ -1641,6 +1641,17 @@ export default withEnglishFallback({elasticsearchIndexGroupingPattern: "索引聚合正則",elasticsearchIndexGroupingPatternPlaceholder: "預設關閉,填正則表達式開啟",elasticsearchIndexGroupingPatternHint: "預設關閉(命名格式因環境而異)。填入正則表達式即可開啟:將比對到的滾動或時間序列索引聚合成一個可查詢的通配 pattern,隱藏每日明細。",+ rocketmqConnectionMode: "連線模式",+ rocketmqProxyEndpoint: "Proxy 位址",+ rocketmqProxyTls: "Proxy TLS",+ rocketmqManagementEnabled: "啟用 Remoting 管理",+ rocketmqProxyUnavailable: "目前連線不支援 Proxy 訊息傳送,請檢查 Agent 版本與訊息通道狀態。",+ rocketmqProxyHint: "Proxy 僅傳送普通訊息,可手動輸入 Topic。選用管理功能需要可存取的 NameServer 和 Broker;管理通道異常不影響傳送。",+ rocketmqChannelMessaging: "訊息通道",+ rocketmqChannelManagement: "管理通道",+ rocketmqChannelready: "就緒",+ rocketmqChanneldisabled: "未啟用",+ rocketmqChanneldegraded: "已降級",rocketmqNamesrvAddr: "NameServer 地址",rocketmqNamesrvAddrPlaceholder: "127.0.0.1:9876",rocketmqNamesrvAddrRequired: "RocketMQ NameServer 地址不能為空",@@ -10152,6 +10163,7 @@ export default withEnglishFallback({readOnlyCannotSend: "目前連線為唯讀模式,無法傳送訊息",selectTargetTopic: "請選取目標主題",messageContentRequired: "訊息內容不能為空",+ sendSuccessRocketmq: "訊息傳送成功",sendSuccess: "訊息傳送成功 — 分區: {partition},偏移: {offset}",targetTopic: "目標主題",topicLoading: "載入中...",diff --git a/apps/desktop/src/lib/connection/__tests__/rocketmqConfig.spec.ts b/apps/desktop/src/lib/connection/__tests__/rocketmqConfig.spec.tsnew file mode 100644index 0000000000..f741b49a84--- /dev/null+++ b/apps/desktop/src/lib/connection/__tests__/rocketmqConfig.spec.ts@@ -0,0 +1,26 @@+import { describe, expect, it } from "vitest";+import { hydrateRocketMqConfig, buildRocketMqConfig, rocketMqConnectionTarget } from "../rocketmqConfig";++describe("RocketMQ connection configuration", () => {+ it("hydrates legacy aliases as remoting and keeps Basic credentials", () => {+ expect(hydrateRocketMqConfig({ extra: { namesrv_addr: "host:9876", cluster_name: "old" }, auth: { kind: "basic", username: "ak", password: "sk" } })).toMatchObject({ connectionMode: "remoting", namesrvAddr: "host:9876", clusterName: "old", proxyTls: true, managementEnabled: false });+ });+ it("builds proxy-only without a NameServer or extra credential copies", () => {+ const config = buildRocketMqConfig({ connectionMode: "proxy", proxyEndpoint: " proxy:8081 ", proxyTls: true, managementEnabled: false, namesrvAddr: "", clusterName: "" }, { kind: "basic", username: "ak", password: "sk" });+ expect(config).toMatchObject({ systemKind: "rocketmq", auth: { kind: "basic", username: "ak", password: "sk" }, extra: { connectionMode: "proxy", proxyEndpoint: "proxy:8081", proxyTls: true, managementEnabled: false } });+ expect(config.extra).not.toHaveProperty("secretKey");+ expect(config.extra).not.toHaveProperty("accessKey");+ expect(rocketMqConnectionTarget(config)).toEqual({ host: "proxy", port: 8081, ssl: true });+ });+ it("requires a NameServer for remoting and optional administration", () => {+ for (const connectionMode of ["remoting", "proxy"] as const) {+ expect(() => buildRocketMqConfig({ connectionMode, proxyEndpoint: "proxy:8081", proxyTls: true, managementEnabled: true, namesrvAddr: "", clusterName: "" })).toThrow(/NameServer/);+ }+ });+ it.each(["", "http://proxy:8081", "proxy", "proxy:0", "proxy:99999", "proxy:8081/path", "user:password@proxy:8081", "proxy:8081,other:8081"])("rejects invalid proxy endpoint %s", (proxyEndpoint) => {+ expect(() => buildRocketMqConfig({ connectionMode: "proxy", proxyEndpoint, proxyTls: true, managementEnabled: false, namesrvAddr: "", clusterName: "" })).toThrow(/Proxy/);+ });+ it("preserves explicit plaintext and enabled management on hydration", () => {+ expect(hydrateRocketMqConfig({ extra: { connectionMode: "proxy", proxyTls: false, managementEnabled: true, namesrvAddr: "n:9876", proxyEndpoint: "[::1]:8081" } })).toMatchObject({ proxyTls: false, managementEnabled: true });+ });+});diff --git a/apps/desktop/src/lib/connection/rocketmqConfig.ts b/apps/desktop/src/lib/connection/rocketmqConfig.tsnew file mode 100644index 0000000000..24d99bc450--- /dev/null+++ b/apps/desktop/src/lib/connection/rocketmqConfig.ts@@ -0,0 +1,70 @@+import type { MqAdminConfig, MqAuth } from "@/types/mq";+import { normalizeRocketmqNamesrvAddr } from "./rocketmqNamesrv";++export interface RocketMqFields {+ connectionMode: "remoting" | "proxy";+ proxyEndpoint: string;+ proxyTls: boolean;+ managementEnabled: boolean;+ namesrvAddr: string;+ clusterName: string;+}++export function hydrateRocketMqConfig(config?: Partial<MqAdminConfig>): RocketMqFields {+ const extra = config?.extra && typeof config.extra === "object" ? (config.extra as Record<string, unknown>) : {};+ const text = (key: string) => (typeof extra[key] === "string" ? (extra[key] as string) : "");+ return {+ connectionMode: extra.connectionMode === "proxy" ? "proxy" : "remoting",+ proxyEndpoint: text("proxyEndpoint"),+ proxyTls: extra.proxyTls !== false,+ managementEnabled: extra.managementEnabled === true,+ namesrvAddr: text("namesrvAddr") || text("namesrv_addr"),+ clusterName: text("clusterName") || text("cluster_name"),+ };+}++function proxyTarget(value: string) {+ const endpoint = value.trim();+ if (!/^(?:\[[^\]]+\]|[^\s:/,;@?#]+):\d+$/.test(endpoint)) throw new Error("RocketMQ Proxy endpoint must be host:port");+ let parsed: URL;+ try {+ parsed = new URL(`rocketmq://${endpoint}`);+ } catch {+ throw new Error("RocketMQ Proxy endpoint is invalid");+ }+ const port = Number(parsed.port);+ if (!parsed.hostname || port < 1 || port > 65535) throw new Error("RocketMQ Proxy endpoint is invalid");+ return { endpoint, host: parsed.hostname, port };+}++export function buildRocketMqConfig(fields: RocketMqFields, auth: MqAuth = { kind: "none" }, tlsSkipVerify?: boolean): MqAdminConfig {+ const extra: Record<string, unknown> = { connectionMode: fields.connectionMode };+ if (fields.connectionMode === "remoting" || fields.managementEnabled) extra.namesrvAddr = normalizeRocketmqNamesrvAddr(fields.namesrvAddr);+ if (fields.clusterName.trim()) extra.clusterName = fields.clusterName.trim();+ if (fields.connectionMode === "proxy") {+ extra.proxyEndpoint = proxyTarget(fields.proxyEndpoint).endpoint;+ extra.proxyTls = fields.proxyTls;+ extra.managementEnabled = fields.managementEnabled;+ }+ return { systemKind: "rocketmq", adminUrl: "", auth, tlsSkipVerify: tlsSkipVerify || undefined, extra };+}++export function rocketMqConnectionTarget(config: Partial<MqAdminConfig>) {+ const fields = hydrateRocketMqConfig(config);+ if (fields.connectionMode === "proxy") {+ const { host, port } = proxyTarget(fields.proxyEndpoint);+ return { host, port, ssl: fields.proxyTls };+ }+ const first = normalizeRocketmqNamesrvAddr(fields.namesrvAddr).split(";")[0];+ const parsed = new URL(`rocketmq://${first}`);+ return { host: parsed.hostname, port: Number(parsed.port) || 9876, ssl: false };+}++export function isRocketMqConfigValid(fields: RocketMqFields): boolean {+ try {+ buildRocketMqConfig(fields);+ return true;+ } catch {+ return false;+ }+}diff --git a/apps/desktop/src/lib/mq/__tests__/rocketmqChannels.spec.ts b/apps/desktop/src/lib/mq/__tests__/rocketmqChannels.spec.tsnew file mode 100644index 0000000000..72095620f5--- /dev/null+++ b/apps/desktop/src/lib/mq/__tests__/rocketmqChannels.spec.ts@@ -0,0 +1,15 @@+import { describe, expect, it } from "vitest";+import { resolveRocketMqChannels } from "../rocketmqChannels";++describe("RocketMQ channel states", () => {+ it("exposes optional management degradation independently of ready messaging", () => {+ expect(resolveRocketMqChannels({ channels: { messaging: { status: "ready" }, management: { status: "degraded", error: "NameServer unavailable" } } })).toEqual([+ { channel: "messaging", status: "ready", error: undefined },+ { channel: "management", status: "degraded", error: "NameServer unavailable" },+ ]);+ });+ it("does not infer channel health for legacy or malformed data", () => {+ expect(resolveRocketMqChannels(undefined)).toEqual([]);+ expect(resolveRocketMqChannels({ channels: { management: { status: "unexpected" } } })).toEqual([]);+ });+});diff --git a/apps/desktop/src/lib/mq/__tests__/rocketmqProxy.spec.ts b/apps/desktop/src/lib/mq/__tests__/rocketmqProxy.spec.tsnew file mode 100644index 0000000000..438c35cc05--- /dev/null+++ b/apps/desktop/src/lib/mq/__tests__/rocketmqProxy.spec.ts@@ -0,0 +1,19 @@+import { describe, expect, it } from "vitest";+import { defaultMqCapabilitiesForSystemKind, resolveAvailableMqTabs } from "../mqConsoleDefaults";++describe("RocketMQ explicit administration capabilities", () => {+ it("keeps the legacy administration tabs when optional flags are absent", () => {+ expect(resolveAvailableMqTabs({ systemKind: "rocketmq", capabilities: defaultMqCapabilitiesForSystemKind("rocketmq") })).toContain("broker");+ });+ it("uses conservative capabilities for a configured proxy before negotiation", () => {+ const config = { db_type: "mq", driver_profile: "rocketmq", external_config: { systemKind: "rocketmq", extra: { connectionMode: "proxy" } } } as import("@/types/database").ConnectionConfig;+ const capabilities = defaultMqCapabilitiesForSystemKind("rocketmq", config);+ expect(resolveAvailableMqTabs({ systemKind: "rocketmq", capabilities })).toEqual(["messages"]);+ expect(capabilities.supportsPeekMessages).toBe(false);+ expect(capabilities.supportsMessageQuery).toBe(false);+ });+ it("exposes only sending when administration is unavailable", () => {+ const capabilities = { ...defaultMqCapabilitiesForSystemKind("rocketmq"), supportsListTopics: false, supportsBrokerAdmin: false, supportsProducerListing: false, supportsSubscriptions: false, supportsMessageQuery: false, supportsMessageTrace: false, supportsPermissions: false };+ expect(resolveAvailableMqTabs({ systemKind: "rocketmq", capabilities })).toEqual(["messages"]);+ });+});diff --git a/apps/desktop/src/lib/mq/mqConsoleDefaults.ts b/apps/desktop/src/lib/mq/mqConsoleDefaults.tsindex 19820f326d..56aecacdb0 100644--- a/apps/desktop/src/lib/mq/mqConsoleDefaults.ts+++ b/apps/desktop/src/lib/mq/mqConsoleDefaults.ts@@ -67,7 +67,7 @@ export function isFlatMqSystemKind(kind: MqSystemKind | undefined): boolean {return kind === "kafka" || kind === "rocketmq" || kind === "rabbitmq";}-export function defaultMqCapabilitiesForSystemKind(kind: MqSystemKind | undefined): MqCapabilities {+export function defaultMqCapabilitiesForSystemKind(kind: MqSystemKind | undefined, config?: ConnectionConfig): MqCapabilities {if (kind === "kafka") {return {...FLAT_MQ_BASE_CAPABILITIES,@@ -76,6 +76,27 @@ export function defaultMqCapabilitiesForSystemKind(kind: MqSystemKind | undefine};}if (kind === "rocketmq") {+ const extra = (config?.external_config as Partial<MqAdminConfig> | undefined)?.extra as Record<string, unknown> | undefined;+ if (extra?.connectionMode === "proxy") {+ return {+ ...FLAT_MQ_BASE_CAPABILITIES,+ supportsPartitionedTopics: false,+ supportsSubscriptions: false,+ supportsResetCursor: false,+ supportsClearBacklog: false,+ supportsPeekMessages: false,+ supportsPermissions: false,+ supportsListTopics: false,+ supportsCreateTopic: false,+ supportsDeleteTopic: false,+ supportsTopicStats: false,+ supportsBrokerAdmin: false,+ supportsProducerListing: false,+ supportsMessageQuery: false,+ supportsMessageTrace: false,+ supportsDlq: false,+ };+ }return {...FLAT_MQ_BASE_CAPABILITIES,supportsMessageQuery: true,@@ -163,7 +184,11 @@ export type MqTab = "tenants" | "namespaces" | "topics" | "subscriptions" | "conexport function resolveAvailableMqTabs(options: { systemKind?: MqSystemKind; capabilities: MqCapabilities }): MqTab[] {const { systemKind, capabilities } = options;if (systemKind === "rocketmq") {- const tabs: MqTab[] = ["broker", "topics", "subscriptions", "producers"];+ const tabs: MqTab[] = [];+ if (capabilities.supportsBrokerAdmin !== false) tabs.push("broker");+ if (capabilities.supportsListTopics !== false) tabs.push("topics");+ if (capabilities.supportsSubscriptions) tabs.push("subscriptions");+ if (capabilities.supportsProducerListing !== false) tabs.push("producers");if (capabilities.supportsMessageQuery || capabilities.supportsSendMessage) tabs.push("messages");if (capabilities.supportsMessageTrace) tabs.push("trace");if (capabilities.supportsPermissions) tabs.push("permissions");diff --git a/apps/desktop/src/lib/mq/rocketmqChannels.ts b/apps/desktop/src/lib/mq/rocketmqChannels.tsnew file mode 100644index 0000000000..201e949153--- /dev/null+++ b/apps/desktop/src/lib/mq/rocketmqChannels.ts@@ -0,0 +1,18 @@+export interface RocketMqChannelState {+ channel: "messaging" | "management";+ status: "ready" | "disabled" | "degraded";+ error?: string;+}+export function resolveRocketMqChannels(extra: unknown): RocketMqChannelState[] {+ if (!extra || typeof extra !== "object" || !("channels" in extra)) return [];+ const channels = extra.channels;+ if (!channels || typeof channels !== "object") return [];+ return (["messaging", "management"] as const).flatMap((channel) => {+ const state = (channels as Record<string, unknown>)[channel];+ if (!state || typeof state !== "object" || !("status" in state)) return [];+ const status = state.status;+ if (status !== "ready" && status !== "disabled" && status !== "degraded") return [];+ const error = "error" in state && typeof state.error === "string" ? state.error : undefined;+ return [{ channel, status, error }];+ });+}diff --git a/apps/desktop/src/types/mq.ts b/apps/desktop/src/types/mq.tsindex fd37a9bfd4..c5c49bffb8 100644--- a/apps/desktop/src/types/mq.ts+++ b/apps/desktop/src/types/mq.ts@@ -3,6 +3,12 @@export type MqSystemKind = "pulsar" | "kafka" | "rocketmq" | "rabbitmq";export interface MqCapabilities {+ supportsListTopics?: boolean;+ supportsCreateTopic?: boolean;+ supportsDeleteTopic?: boolean;+ supportsTopicStats?: boolean;+ supportsBrokerAdmin?: boolean;+ supportsProducerListing?: boolean;supportsTenants: boolean;supportsNamespaces: boolean;supportsPartitionedTopics: boolean;@@ -583,7 +589,8 @@ export interface SendMessageRequest {export interface SendMessageResponse {topic: string;- partition: number;+ /** Absent when the transport does not report the actual physical queue. */+ partition?: number | null;offset: number;timestamp?: string;}diff --git a/crates/dbx-core/src/admin/mq/adapters/kafka.rs b/crates/dbx-core/src/admin/mq/adapters/kafka.rsindex 21ec6682dd..c09ed0bc00 100644--- a/crates/dbx-core/src/admin/mq/adapters/kafka.rs+++ b/crates/dbx-core/src/admin/mq/adapters/kafka.rs@@ -24,6 +24,12 @@ use crate::mq::types::*;/// Kafka capabilities - no tenants/namespaces, supports topics, consumer groups,/// ACLs, retention, and message production.const KAFKA_CAPABILITIES: MqCapabilities = MqCapabilities {+ supports_list_topics: true,+ supports_create_topic: true,+ supports_delete_topic: true,+ supports_topic_stats: true,+ supports_broker_admin: true,+ supports_producer_listing: true,supports_tenants: false,supports_namespaces: false,supports_partitioned_topics: true,@@ -586,7 +592,7 @@ impl MessageQueueAdmin for KafkaAdmin {Ok(SendMessageResponse {topic: result.get("topic").and_then(|v| v.as_str()).unwrap_or(&req.topic).to_string(),- partition: result.get("partition").and_then(|v| v.as_i64()).unwrap_or(0) as i32,+ partition: Some(result.get("partition").and_then(|v| v.as_i64()).unwrap_or(0) as i32),offset: result.get("offset").and_then(|v| v.as_i64()).unwrap_or(0),timestamp: result.get("timestamp").and_then(|v| v.as_i64()).map(|v| v.to_string()),})diff --git a/crates/dbx-core/src/admin/mq/adapters/pulsar_version.rs b/crates/dbx-core/src/admin/mq/adapters/pulsar_version.rsindex f15d9426dd..cc8fd481e0 100644--- a/crates/dbx-core/src/admin/mq/adapters/pulsar_version.rs+++ b/crates/dbx-core/src/admin/mq/adapters/pulsar_version.rs@@ -121,6 +121,12 @@ impl PulsarApiProfile {pub fn capabilities(&self) -> MqCapabilities {match self.version {PulsarVersion::V3_1 => MqCapabilities {+ supports_list_topics: true,+ supports_create_topic: true,+ supports_delete_topic: true,+ supports_topic_stats: true,+ supports_broker_admin: true,+ supports_producer_listing: true,supports_tenants: true,supports_namespaces: true,supports_partitioned_topics: true,diff --git a/crates/dbx-core/src/admin/mq/adapters/rabbitmq.rs b/crates/dbx-core/src/admin/mq/adapters/rabbitmq.rsindex fc5e159a66..edb5650d82 100644--- a/crates/dbx-core/src/admin/mq/adapters/rabbitmq.rs+++ b/crates/dbx-core/src/admin/mq/adapters/rabbitmq.rs@@ -25,6 +25,12 @@ use crate::mq::types::*;/// production are supported through the agent; exchanges and bindings are/// managed through the agent.const RABBITMQ_CAPABILITIES: MqCapabilities = MqCapabilities {+ supports_list_topics: true,+ supports_create_topic: true,+ supports_delete_topic: true,+ supports_topic_stats: true,+ supports_broker_admin: true,+ supports_producer_listing: true,supports_tenants: false,supports_namespaces: true,supports_partitioned_topics: false,@@ -721,7 +727,7 @@ impl MessageQueueAdmin for RabbitMqAdmin {Ok(SendMessageResponse {topic: result.get("topic").and_then(|v| v.as_str()).unwrap_or(&req.topic).to_string(),- partition: 0,+ partition: Some(0),offset: result.get("offset").and_then(|v| v.as_i64()).unwrap_or(0),timestamp: result.get("timestamp").and_then(|v| v.as_i64()).map(|v| v.to_string()),})diff --git a/crates/dbx-core/src/admin/mq/adapters/rocketmq.rs b/crates/dbx-core/src/admin/mq/adapters/rocketmq.rsindex d5cabd8018..f26f071416 100644--- a/crates/dbx-core/src/admin/mq/adapters/rocketmq.rs+++ b/crates/dbx-core/src/admin/mq/adapters/rocketmq.rs@@ -10,7 +10,7 @@use std::collections::{HashMap, HashSet};use std::future::Future;use std::net::ToSocketAddrs;-use std::sync::Arc;+use std::sync::{Arc, RwLock};use std::time::Duration;use async_trait::async_trait;@@ -28,6 +28,12 @@ use crate::mq::types::*;/// RocketMQ capabilities - no tenants/namespaces; supports topics, consumer groups,/// ACLs, and message production.const ROCKETMQ_CAPABILITIES: MqCapabilities = MqCapabilities {+ supports_list_topics: true,+ supports_create_topic: true,+ supports_delete_topic: true,+ supports_topic_stats: true,+ supports_broker_admin: true,+ supports_producer_listing: true,supports_tenants: false,supports_namespaces: false,supports_partitioned_topics: true,@@ -72,6 +78,139 @@ const CONSUMER_GROUP_LIST_PAGE_SIZE: i32 = 500;pub struct RocketMqAdmin {client: Arc<Mutex<AgentDriverClient>>,config: MqAdminConfig,+ capabilities: RwLock<MqCapabilities>,+}++fn connection_mode(cfg: &MqAdminConfig) -> &str {+ extra_str(&cfg.extra, "connectionMode").unwrap_or("remoting")+}++fn management_enabled(cfg: &MqAdminConfig) -> bool {+ cfg.extra.get("managementEnabled").and_then(|value| value.as_bool()).unwrap_or(false)+}++fn validate_connection_config(cfg: &MqAdminConfig) -> Result<(), String> {+ match connection_mode(cfg) {+ "remoting" if namesrv_addr(cfg).trim().is_empty() => {+ Err("RocketMQ namesrvAddr is required for remoting".into())+ }+ "remoting" => Ok(()),+ "proxy" => {+ let endpoint = extra_str(&cfg.extra, "proxyEndpoint").ok_or("RocketMQ proxyEndpoint is required")?;+ let (host, port) =+ parse_namesrv_target(endpoint).map_err(|_| "RocketMQ proxyEndpoint must be host:port")?;+ if port == 0+ || host.contains('/')+ || host.contains('@')+ || host.contains('?')+ || host.contains('#')+ || host.chars().any(char::is_whitespace)+ || endpoint.contains(';')+ {+ return Err("RocketMQ proxyEndpoint must be host:port".into());+ }+ // Optional management failure is handled independently by the agent.+ Ok(())+ }+ mode => Err(format!("Unsupported RocketMQ connectionMode '{mode}'")),+ }+}++fn validate_handshake(cfg: &MqAdminConfig, handshake: &serde_json::Value) -> Result<(), String> {+ if connection_mode(cfg) == "proxy"+ && !handshake+ .get("capabilities")+ .and_then(|value| value.as_array())+ .is_some_and(|caps| caps.iter().any(|value| value.as_str() == Some("rocketmq_proxy_grpc")))+ {+ return Err("RocketMQ Proxy requires rocketmq_proxy_grpc; upgrade the RocketMQ agent and retry".into());+ }+ Ok(())+}++fn messaging_only_capabilities(send: bool) -> MqCapabilities {+ MqCapabilities {+ supports_list_topics: false,+ supports_create_topic: false,+ supports_delete_topic: false,+ supports_topic_stats: false,+ supports_broker_admin: false,+ supports_producer_listing: false,+ supports_send_message: send,+ ..MqCapabilities::default()+ }+}++fn cluster_info_for_config(cfg: &MqAdminConfig, result: &serde_json::Value) -> Result<MqClusterInfo, String> {+ let mut info = cluster_info_from_agent_result(result);+ let is_proxy = connection_mode(cfg) == "proxy";+ let management_status = result.pointer("/channels/management/status").and_then(|value| value.as_str());+ let management_ready = management_enabled(cfg) && management_status == Some("ready");+ if is_proxy && !management_ready {+ info.capabilities = messaging_only_capabilities(true);+ }+ if let Some(reported) = result.get("capabilities") {+ let reported = reported.as_object().ok_or("RocketMQ agent capabilities must be an object")?;+ let mut merged = serde_json::to_value(info.capabilities).map_err(|error| error.to_string())?;+ for (key, value) in reported {+ merged[key] = value.clone();+ }+ info.capabilities =+ serde_json::from_value(merged).map_err(|error| format!("Invalid RocketMQ agent capabilities: {error}"))?;+ }+ if is_proxy && !management_ready {+ info.capabilities = messaging_only_capabilities(info.capabilities.supports_send_message);+ }+ if let Some(channels) = result.get("channels") {+ info.extra["channels"] = channels.clone();+ } else if is_proxy {+ info.extra["channels"] = serde_json::json!({+ "messaging": { "status": "ready" },+ "management": { "status": if management_enabled(cfg) { "degraded" } else { "disabled" } }+ });+ }+ Ok(info)+}++fn ensure_operation_supported(+ cfg: &MqAdminConfig,+ caps: MqCapabilities,+ method: &str,+ params: &serde_json::Value,+) -> Result<(), String> {+ if method == "test_connection" {+ return Ok(());+ }+ let supported = match method {+ "mq_send_message" => {+ if connection_mode(cfg) == "proxy" && params.get("partition").is_some_and(|value| !value.is_null()) {+ return Err("RocketMQ Proxy does not support selecting a partition".into());+ }+ caps.supports_send_message+ }+ "mq_list_topics" => caps.supports_list_topics,+ "mq_create_topic" => caps.supports_create_topic,+ "mq_delete_topic" => caps.supports_delete_topic,+ "mq_get_topic_stats" => caps.supports_topic_stats,+ "mq_list_producers" => caps.supports_producer_listing,+ "mq_peek_messages" => caps.supports_peek_messages,+ "mq_view_message" | "mq_query_message_by_key" | "mq_query_message_by_topic" => caps.supports_message_query,+ "mq_query_message_trace" => caps.supports_message_trace,+ "mq_list_consumer_groups"+ | "mq_describe_consumer_group"+ | "mq_get_subscription_group_config"+ | "mq_alter_subscription_group_config"+ | "mq_delete_consumer_group"+ | "mq_get_consumer_lag" => caps.supports_subscriptions,+ "mq_reset_consumer_group_offsets" => caps.supports_reset_cursor,+ "mq_list_acls" | "mq_create_acls" | "mq_delete_acls" => caps.supports_permissions,+ _ => caps.supports_broker_admin,+ };+ if supported {+ Ok(())+ } else {+ Err(format!("RocketMQ operation '{method}' is unsupported by the active channels"))+ }}fn cluster_info_from_agent_result(result: &serde_json::Value) -> MqClusterInfo {@@ -102,24 +241,27 @@ fn cluster_info_from_agent_result(result: &serde_json::Value) -> MqClusterInfo {impl RocketMqAdmin {/// Spawn the RocketMQ native agent, perform handshake, and connect.///- /// Callers must probe NameServer reachability before invoking this so the- /// connect-timeout wall covers only process spawn + handshake + connect.+ /// Callers probe the configured messaging endpoint before invoking this so+ /// the connect-timeout wall covers only process spawn + handshake + connect.pub async fn new(cfg: MqAdminConfig, launch: AgentLaunchSpec) -> Result<Self, String> {+ validate_connection_config(&cfg)?;let mut client = AgentDriverClient::spawn(launch).await?;// Handshake / connect use Advanced connect timeout; ops RPC keep query timeout.- let _: serde_json::Value =+ let handshake: serde_json::Value =client.call_with_timeout("handshake", serde_json::json!({}), Some(cfg.connect_timeout())).await?;+ validate_handshake(&cfg, &handshake)?;// Build the connection params from MqAdminConfiglet conn_params = build_connection_params(&cfg);let connect_params = serde_json::json!({ "connection": conn_params });- let _: serde_json::Value =- client.call_with_timeout("connect", connect_params, Some(cfg.connect_timeout())).await?;+ let result: serde_json::Value =+ client.call_with_timeout("connect", connect_params, Some(cfg.adapter_connect_timeout())).await?;+ let capabilities = cluster_info_for_config(&cfg, &result)?.capabilities;log::info!("RocketMQ admin connected via agent (namesrv: {})", namesrv_addr(&cfg));- Ok(Self { client: Arc::new(Mutex::new(client)), config: cfg })+ Ok(Self { client: Arc::new(Mutex::new(client)), config: cfg, capabilities: RwLock::new(capabilities) })}/// Send a JSON-RPC call to the RocketMQ agent and deserialize the result.@@ -128,6 +270,7 @@ impl RocketMqAdmin {method: &str,params: serde_json::Value,) -> Result<T, String> {+ ensure_operation_supported(&self.config, self.capabilities(), method, ¶ms)?;let mut client = self.client.lock().await;client.call_with_timeout(method, params, self.config.rpc_timeout()).await}@@ -156,7 +299,7 @@ impl RocketMqAdmin {#[async_trait]impl MessageQueueAdmin for RocketMqAdmin {fn capabilities(&self) -> MqCapabilities {- ROCKETMQ_CAPABILITIES+ *self.capabilities.read().unwrap_or_else(|poisoned| poisoned.into_inner())}fn system_kind(&self) -> MqSystemKind {@@ -169,10 +312,20 @@ impl MessageQueueAdmin for RocketMqAdmin {async fn test_connection(&self) -> Result<MqClusterInfo, String> {let conn_params = build_connection_params(&self.config);- let result: serde_json::Value =- self.call("test_connection", serde_json::json!({ "connection": conn_params })).await?;+ let result: serde_json::Value = {+ let mut client = self.client.lock().await;+ client+ .call_with_timeout(+ "test_connection",+ serde_json::json!({ "connection": conn_params }),+ Some(self.config.adapter_connect_timeout()),+ )+ .await?+ };- Ok(cluster_info_from_agent_result(&result))+ let info = cluster_info_for_config(&self.config, &result)?;+ *self.capabilities.write().unwrap_or_else(|poisoned| poisoned.into_inner()) = info.capabilities;+ Ok(info)}// ---- Tenants (not supported by RocketMQ) ----@@ -728,7 +881,7 @@ impl MessageQueueAdmin for RocketMqAdmin {Ok(SendMessageResponse {topic: result.get("topic").and_then(|v| v.as_str()).unwrap_or(&req.topic).to_string(),- partition: result.get("partition").and_then(|v| v.as_i64()).unwrap_or(0) as i32,+ partition: result.get("partition").and_then(|v| v.as_i64()).map(|value| value as i32),offset: result.get("offset").and_then(|v| v.as_i64()).unwrap_or(0),timestamp: result.get("timestamp").and_then(|v| v.as_i64()).map(|v| v.to_string()),})@@ -870,22 +1023,20 @@ fn rocketmq_topic_admin_params(topic: &TopicRef, partitions: Option<u32>) -> ser/// Build the connection params JSON from MqAdminConfig for the native agent.fn build_connection_params(cfg: &MqAdminConfig) -> serde_json::Value {let extra = &cfg.extra;- let access_key = extra_str(extra, "accessKey")- .or_else(|| extra_str(extra, "access_key"))- .or(match &cfg.auth {- MqAuth::Basic { username, .. } => Some(username.as_str()),- _ => None,- })- .unwrap_or("");- let secret_key = extra_str(extra, "secretKey")- .or_else(|| extra_str(extra, "secret_key"))- .or(match &cfg.auth {- MqAuth::Basic { password, .. } => Some(password.as_str()),- _ => None,- })- .unwrap_or("");+ let (access_key, secret_key) = match &cfg.auth {+ MqAuth::Basic { username, password } => (username.as_str(), password.as_str()),+ _ => ("", ""),+ };serde_json::json!({+ "connection_mode": connection_mode(cfg),+ "proxy_endpoint": extra_str(extra, "proxyEndpoint").unwrap_or(""),+ "proxy_tls": extra.get("proxyTls").and_then(|v| v.as_bool()).unwrap_or(true),+ "management_enabled": management_enabled(cfg),+ "proxy_dial_endpoint": cfg.connect_override.as_ref().map(|endpoint| {+ if endpoint.host.contains(':') { format!("[{}]:{}", endpoint.host, endpoint.port) }+ else { format!("{}:{}", endpoint.host, endpoint.port) }+ }),"namesrv_addr": namesrv_addr(cfg),"cluster_name": extra_str(extra, "clusterName").or_else(|| extra_str(extra, "cluster_name"))@@ -1014,14 +1165,37 @@ fn rocketmq_subscription_from_group(group: &serde_json::Value) -> SubscriptionIn}}-/// Fail fast on unreachable NameServer before paying for JVM agent startup.-/// Called outside the connect-timeout wall so the probe does not steal JVM budget.-pub(crate) async fn probe_namesrv_before_connect(cfg: &MqAdminConfig, budget: Duration) -> Result<(), String> {- if let Some(proxy) = &cfg.socks_proxy {- probe_namesrv_via_socks5(&namesrv_addr(cfg), proxy, budget).await+/// Fail fast on an unreachable messaging endpoint before starting the agent.+/// Optional management is deliberately left to the agent and may degrade independently.+pub(crate) async fn probe_before_connect(cfg: &MqAdminConfig, budget: Duration) -> Result<(), String> {+ validate_connection_config(cfg)?;+ let is_proxy = connection_mode(cfg) == "proxy";+ let target = if is_proxy {+ cfg.connect_override+ .as_ref()+ .map(|endpoint| {+ if endpoint.host.contains(':') {+ format!("[{}]:{}", endpoint.host, endpoint.port)+ } else {+ format!("{}:{}", endpoint.host, endpoint.port)+ }+ })+ .unwrap_or_else(|| extra_str(&cfg.extra, "proxyEndpoint").unwrap_or("").to_string())} else {- probe_namesrv_tcp(&namesrv_addr(cfg), budget).await- }+ namesrv_addr(cfg)+ };+ let result = if let Some(proxy) = &cfg.socks_proxy {+ probe_namesrv_via_socks5(&target, proxy, budget).await+ } else {+ probe_namesrv_tcp(&target, budget).await+ };+ result.map_err(|error| {+ if is_proxy {+ error.replace("NameServer", "Proxy").replace("namesrv_addr", "proxyEndpoint")+ } else {+ error+ }+ })}async fn probe_namesrv_via_socks5(@@ -1230,6 +1404,233 @@ mod tests {}}+ #[tokio::test]+ async fn rocketmq_proxy_official_agent_integration() {+ if std::env::var("ROCKETMQ_PROXY_INTEGRATION").as_deref() != Ok("1") {+ return;+ }+ let program = std::env::var("DBX_ROCKETMQ_AGENT_PATH").expect("DBX_ROCKETMQ_AGENT_PATH is required");+ let endpoint = std::env::var("ROCKETMQ_PROXY_ENDPOINT").unwrap_or_else(|_| "127.0.0.1:18081".into());+ let topic = std::env::var("ROCKETMQ_PROXY_TOPIC").unwrap_or_else(|_| "DBX_PROXY_TEST".into());+ for management in [false, true] {+ let listener = TcpListener::bind(("127.0.0.1", 0)).await.unwrap();+ let management_endpoint = listener.local_addr().unwrap().to_string();+ let blackhole = tokio::spawn(async move {+ let mut streams = Vec::new();+ while let Ok((stream, _)) = listener.accept().await {+ streams.push(stream);+ }+ });+ let mut cfg = rocketmq_config(+ serde_json::json!({+ "connectionMode": "proxy", "proxyEndpoint": endpoint, "proxyTls": false,+ "managementEnabled": management,+ "namesrvAddr": if management { management_endpoint.as_str() } else { "" }+ }),+ MqAuth::None,+ );+ cfg.connect_timeout_secs = 10;+ cfg.query_timeout_secs = 1;+ let budget = cfg.adapter_connect_timeout();+ let admin = timeout(budget, RocketMqAdmin::new(cfg, AgentLaunchSpec::new(&program)))+ .await+ .expect("Rust outer connection deadline exceeded")+ .expect("Proxy connect");+ let info = admin.test_connection().await.expect("Proxy test_connection");+ assert!(info.capabilities.supports_send_message);+ assert!(!info.capabilities.supports_list_topics);+ assert_eq!(+ serde_json::to_value(admin.capabilities()).unwrap(),+ serde_json::to_value(info.capabilities).unwrap()+ );+ assert_eq!(info.extra["channels"]["messaging"]["status"], "ready");+ assert_eq!(+ info.extra["channels"]["management"]["status"],+ if management { "degraded" } else { "disabled" }+ );+ let request: SendMessageRequest = serde_json::from_value(serde_json::json!({+ "topic": topic, "payloadBase64": "UnVzdCBQcm94eSBpbnRlZ3JhdGlvbg=="+ }))+ .unwrap();+ let result = admin.send_message(request).await.expect("Proxy ordinary send");+ assert_eq!(result.topic, topic);+ assert!(+ serde_json::to_value(result).unwrap().get("partition").is_none(),+ "Proxy must not invent its selected queue"+ );+ blackhole.abort();+ }+ }++ #[test]+ fn proxy_connection_contract_defaults_and_logical_endpoint() {+ let legacy = rocketmq_config(serde_json::json!({}), MqAuth::None);+ let params = build_connection_params(&legacy);+ assert_eq!(params["connection_mode"], "remoting");+ assert_eq!(params["proxy_tls"], true);+ assert_eq!(params["management_enabled"], false);+ let mut proxy = rocketmq_config(+ serde_json::json!({+ "connectionMode": "proxy", "proxyEndpoint": "proxy.internal:8081"+ }),+ MqAuth::None,+ );+ proxy.connect_override = Some(crate::mq::config::MqConnectOverride { host: "127.0.0.1".into(), port: 32100 });+ let params = build_connection_params(&proxy);+ assert_eq!(params["proxy_endpoint"], "proxy.internal:8081");+ assert_eq!(params["proxy_dial_endpoint"], "127.0.0.1:32100");+ }++ #[test]+ fn proxy_requires_agent_handshake_capability() {+ let proxy = rocketmq_config(serde_json::json!({ "connectionMode": "proxy" }), MqAuth::None);+ assert!(validate_handshake(&proxy, &serde_json::json!({})).unwrap_err().contains("upgrade"));+ assert!(validate_handshake(&proxy, &serde_json::json!({ "capabilities": ["rocketmq_proxy_grpc"] })).is_ok());+ let legacy = rocketmq_config(serde_json::json!({}), MqAuth::None);+ assert!(validate_handshake(&legacy, &serde_json::json!({})).is_ok());+ }++ #[test]+ fn proxy_channels_disable_management_and_preserve_send() {+ let cfg = rocketmq_config(serde_json::json!({ "connectionMode": "proxy" }), MqAuth::None);+ let info = cluster_info_for_config(+ &cfg,+ &serde_json::json!({+ "channels": { "messaging": { "status": "ready" }, "management": { "status": "disabled" } },+ "capabilities": { "supportsSendMessage": true, "supportsListTopics": false }+ }),+ )+ .unwrap();+ assert!(info.capabilities.supports_send_message);+ assert!(!info.capabilities.supports_list_topics);+ assert!(!info.capabilities.supports_peek_messages);+ assert!(!info.capabilities.supports_subscriptions);+ assert_eq!(info.extra["channels"]["management"]["status"], "disabled");+ assert!(ensure_operation_supported(&cfg, info.capabilities, "mq_list_topics", &serde_json::json!({})).is_err());+ assert!(ensure_operation_supported(&cfg, info.capabilities, "mq_send_message", &serde_json::json!({})).is_ok());+ assert!(ensure_operation_supported(+ &cfg,+ info.capabilities,+ "mq_send_message",+ &serde_json::json!({ "partition": 0 })+ )+ .is_err());+ }++ #[test]+ fn proxy_degraded_management_never_restores_admin_from_reported_flags() {+ let cfg = rocketmq_config(+ serde_json::json!({+ "connectionMode": "proxy", "managementEnabled": true+ }),+ MqAuth::None,+ );+ let result = serde_json::json!({+ "channels": { "messaging": { "status": "ready" }, "management": { "status": "degraded", "error": "unreachable" } },+ "capabilities": { "supportsSendMessage": true, "supportsListTopics": true, "supportsPeekMessages": true }+ });+ let info = cluster_info_for_config(&cfg, &result).unwrap();+ assert!(info.capabilities.supports_send_message);+ assert!(!info.capabilities.supports_list_topics);+ assert!(!info.capabilities.supports_broker_admin);+ assert_eq!(info.extra["channels"], result["channels"]);+ for method in [+ "mq_peek_messages",+ "mq_query_message_by_key",+ "mq_query_message_trace",+ "mq_list_consumer_groups",+ "mq_describe_cluster",+ "mq_list_producers",+ "mq_delete_topic",+ ] {+ assert!(+ ensure_operation_supported(&cfg, info.capabilities, method, &serde_json::json!({})).is_err(),+ "{method}"+ );+ }+ }++ #[test]+ fn proxy_ready_management_uses_actual_agent_capabilities() {+ let cfg = rocketmq_config(+ serde_json::json!({+ "connectionMode": "proxy", "managementEnabled": true+ }),+ MqAuth::None,+ );+ let info = cluster_info_for_config(&cfg, &serde_json::json!({+ "channels": { "management": { "status": "ready" } },+ "capabilities": { "supportsListTopics": true, "supportsMessageQuery": false, "supportsProducerListing": false }+ })).unwrap();+ assert!(info.capabilities.supports_list_topics);+ assert!(!info.capabilities.supports_message_query);+ assert!(!info.capabilities.supports_producer_listing);+ }++ #[test]+ fn proxy_validation_accepts_no_nameserver_and_rejects_invalid_modes_or_endpoints() {+ let cfg = rocketmq_config(+ serde_json::json!({ "connectionMode": "proxy", "proxyEndpoint": "proxy.internal:8081" }),+ MqAuth::None,+ );+ assert!(validate_connection_config(&cfg).is_ok());+ for extra in [+ serde_json::json!({ "connectionMode": "grpc" }),+ serde_json::json!({ "connectionMode": "proxy" }),+ serde_json::json!({ "connectionMode": "proxy", "proxyEndpoint": "https://proxy:8081" }),+ serde_json::json!({ "connectionMode": "proxy", "proxyEndpoint": "proxy:0" }),+ ] {+ assert!(validate_connection_config(&rocketmq_config(extra, MqAuth::None)).is_err());+ }+ }++ #[test]+ fn legacy_capability_fields_default_true_when_missing() {+ let mut value = serde_json::to_value(ROCKETMQ_CAPABILITIES).unwrap();+ for key in [+ "supportsListTopics",+ "supportsCreateTopic",+ "supportsDeleteTopic",+ "supportsTopicStats",+ "supportsBrokerAdmin",+ "supportsProducerListing",+ ] {+ value.as_object_mut().unwrap().remove(key);+ }+ let caps: MqCapabilities = serde_json::from_value(value).unwrap();+ assert!(caps.supports_list_topics && caps.supports_create_topic && caps.supports_delete_topic);+ assert!(caps.supports_topic_stats && caps.supports_broker_admin && caps.supports_producer_listing);+ }++ #[tokio::test]+ async fn proxy_probe_dials_proxy_without_nameserver() {+ let listener = TcpListener::bind(("127.0.0.1", 0)).await.unwrap();+ let cfg = rocketmq_config(+ serde_json::json!({+ "connectionMode": "proxy", "proxyEndpoint": listener.local_addr().unwrap().to_string()+ }),+ MqAuth::None,+ );+ probe_before_connect(&cfg, Duration::from_secs(1)).await.unwrap();+ }++ #[tokio::test]+ async fn proxy_probe_uses_dial_override_without_rewriting_tls_endpoint() {+ let listener = TcpListener::bind(("127.0.0.1", 0)).await.unwrap();+ let cfg = rocketmq_config(+ serde_json::json!({+ "connectionMode": "proxy", "proxyEndpoint": "unresolvable.invalid:8081", "proxyTls": true,+ "namesrvAddr": "unresolvable.invalid:9876", "managementEnabled": true+ }),+ MqAuth::None,+ )+ .with_connect_override("127.0.0.1", listener.local_addr().unwrap().port());+ probe_before_connect(&cfg, Duration::from_secs(1)).await.unwrap();+ let params = build_connection_params(&cfg);+ assert_eq!(params["proxy_endpoint"], "unresolvable.invalid:8081");+ assert_eq!(params["proxy_tls"], true);+ }+#[tokio::test]async fn probe_namesrv_rejects_empty_address_list() {let err = probe_namesrv_tcp(" ; ; ", Duration::from_millis(200)).await.expect_err("empty");@@ -1265,7 +1666,7 @@ mod tests {password: String::new(),});- probe_namesrv_before_connect(&cfg, Duration::from_secs(2)).await.unwrap();+ probe_before_connect(&cfg, Duration::from_secs(2)).await.unwrap();assert_eq!(target_rx.await.unwrap(), ("172.19.191.166".to_string(), 9876));proxy_task.await.unwrap();@@ -1294,6 +1695,20 @@ mod tests {);}+ #[test]+ fn connection_params_respect_explicit_auth_including_none_and_empty_basic() {+ for (auth, expected_ak, expected_sk) in [+ (MqAuth::None, "", ""),+ (MqAuth::Basic { username: String::new(), password: String::new() }, "", ""),+ (MqAuth::Basic { username: "auth-ak".into(), password: "auth-sk".into() }, "auth-ak", "auth-sk"),+ ] {+ let cfg = rocketmq_config(serde_json::json!({ "accessKey": "stale-ak", "secretKey": "stale-sk" }), auth);+ let params = build_connection_params(&cfg);+ assert_eq!(params["access_key"], expected_ak);+ assert_eq!(params["secret_key"], expected_sk);+ }+ }+#[test]fn connection_params_follow_advanced_timeouts() {let mut cfg = rocketmq_config(serde_json::json!({ "namesrvAddr": "127.0.0.1:9876" }), MqAuth::None);diff --git a/crates/dbx-core/src/admin/mq/config.rs b/crates/dbx-core/src/admin/mq/config.rsindex e2e10cb5b4..f422b9761e 100644--- a/crates/dbx-core/src/admin/mq/config.rs+++ b/crates/dbx-core/src/admin/mq/config.rs@@ -87,7 +87,9 @@ pub struct MqAdminConfig {impl MqAdminConfig {/// Decode the MQ admin config from a connection's `external_config` slot.pub fn from_connection(cfg: &ConnectionConfig) -> Result<Self, String> {- let raw = cfg+ let mut normalized = cfg.clone();+ crate::connection::connection_secrets::normalize_rocketmq_credentials(&mut normalized);+ let raw = normalized.external_config.as_ref().ok_or("This connection has no message queue admin configuration (external_config is empty)")?;@@ -131,6 +133,19 @@ impl MqAdminConfig {Duration::from_secs(self.connect_timeout_secs.max(1))}+ /// Rust process/RPC wall around the agent's independently bounded network setup.+ /// Proxy keeps a fixed allowance for spawn, handshake and JSON-RPC overhead.+ pub fn adapter_connect_timeout(&self) -> Duration {+ let overhead = if self.system_kind == MqSystemKind::RocketMq+ && self.extra.get("connectionMode").and_then(serde_json::Value::as_str) == Some("proxy")+ {+ 5+ } else {+ 0+ };+ self.connect_timeout().saturating_add(Duration::from_secs(overhead))+ }+/// Milliseconds for agent `connect_timeout_ms` (Advanced connect timeout).pub fn connect_timeout_ms(&self) -> u64 {self.connect_timeout_secs.saturating_mul(1000).max(1_000)@@ -317,6 +332,24 @@ mod tests {assert_eq!(mqc.request_timeout_ms(), 30_000);}+ #[test]+ fn proxy_adapter_timeout_allows_bounded_process_overhead() {+ for (kind, extra, expected) in [+ ("rocketmq", serde_json::json!({ "connectionMode": "proxy" }), 10),+ ("rocketmq", serde_json::json!({ "connectionMode": "remoting" }), 5),+ ("rocketmq", serde_json::json!({}), 5),+ ("kafka", serde_json::json!({ "connectionMode": "proxy" }), 5),+ ] {+ let cfg = connection_with_external(serde_json::json!({+ "systemKind": kind, "adminUrl": "", "extra": extra+ }));+ let mqc = MqAdminConfig::from_connection(&cfg).unwrap();+ assert_eq!(mqc.adapter_connect_timeout(), Duration::from_secs(expected));+ assert_eq!(mqc.connect_timeout(), Duration::from_secs(5));+ assert_eq!(mqc.connect_timeout_ms(), 5_000);+ }+ }+#[test]fn copies_advanced_timeouts_from_connection_config() {let mut cfg = connection_with_external(serde_json::json!({diff --git a/crates/dbx-core/src/admin/mq/mod.rs b/crates/dbx-core/src/admin/mq/mod.rsindex e7217541ef..3f86d2da9e 100644--- a/crates/dbx-core/src/admin/mq/mod.rs+++ b/crates/dbx-core/src/admin/mq/mod.rs@@ -164,13 +164,12 @@ async fn build_adapter_with_connect_timeout(mqc: MqAdminConfig,agent_launch: Option<AgentLaunchSpec>,) -> Result<Arc<dyn MessageQueueAdmin>, String> {- let budget = mqc.connect_timeout();- // RocketMQ: TCP-probe NameServer outside the connect wall so cold JVM spawn- // retains the full connect_timeout (probe used to steal up to half of it).+ let budget = mqc.adapter_connect_timeout();+ // Probe the messaging target outside the agent connect wall: NameServer in+ // remoting mode, Proxy in gRPC mode. Optional management cannot block messaging.if mqc.system_kind == MqSystemKindInternal::RocketMq {- // Probe runs outside the connect wall; scale with Advanced connect_timeout (no hard 5s cap).- let probe_budget = (budget / 2).max(std::time::Duration::from_millis(500));- crate::mq::adapters::rocketmq::probe_namesrv_before_connect(&mqc, probe_budget).await?;+ let probe_budget = (mqc.connect_timeout() / 2).max(std::time::Duration::from_millis(500));+ crate::mq::adapters::rocketmq::probe_before_connect(&mqc, probe_budget).await?;}match tokio::time::timeout(budget, build_adapter(mqc, agent_launch)).await {Ok(result) => result,@@ -225,3 +224,32 @@ async fn build_adapter(}}}++#[cfg(test)]+mod proxy_config_tests {+ use super::*;++ #[test]+ fn rocketmq_transport_changes_invalidate_adapter_fingerprint() {+ let base: MqAdminConfig = serde_json::from_value(serde_json::json!({+ "systemKind": "rocketmq", "adminUrl": "",+ "extra": { "namesrvAddr": "ns.internal:9876" }+ }))+ .unwrap();+ let original = adapter_fingerprint(&base, None);+ for (key, value) in [+ ("connectionMode", serde_json::json!("proxy")),+ ("proxyEndpoint", serde_json::json!("proxy.internal:8081")),+ ("proxyTls", serde_json::json!(false)),+ ("managementEnabled", serde_json::json!(true)),+ ] {+ let mut changed = base.clone();+ changed.extra[key] = value;+ assert_ne!(adapter_fingerprint(&changed, None), original, "{key}");+ }+ let changed = base.clone().with_connect_override("127.0.0.1", 32000);+ assert_ne!(adapter_fingerprint(&changed, None), original);+ let changed = base.with_socks_proxy("127.0.0.1", 1080, "", "");+ assert_ne!(adapter_fingerprint(&changed, None), original);+ }+}diff --git a/crates/dbx-core/src/admin/mq/types.rs b/crates/dbx-core/src/admin/mq/types.rsindex 6d928b9c2b..a2c43d2246 100644--- a/crates/dbx-core/src/admin/mq/types.rs+++ b/crates/dbx-core/src/admin/mq/types.rs@@ -32,9 +32,22 @@ impl MqSystemKind {/// Capability flags. The frontend reads these to show/hide functionality, and/// the adapter computes them from the detected server version so unsupported/// features are hidden rather than failing at call time.-#[derive(Debug, Clone, Copy, Default, Serialize, Deserialize)]+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]#[serde(rename_all = "camelCase")]pub struct MqCapabilities {+ #[serde(default = "capability_default_true")]+ pub supports_list_topics: bool,+ #[serde(default = "capability_default_true")]+ pub supports_create_topic: bool,+ #[serde(default = "capability_default_true")]+ pub supports_delete_topic: bool,+ #[serde(default = "capability_default_true")]+ pub supports_topic_stats: bool,+ #[serde(default = "capability_default_true")]+ pub supports_broker_admin: bool,+ #[serde(default = "capability_default_true")]+ pub supports_producer_listing: bool,+pub supports_tenants: bool,pub supports_namespaces: bool,pub supports_partitioned_topics: bool,@@ -81,6 +94,49 @@ pub struct MqCapabilities {pub supports_cluster_monitoring: bool,}+fn capability_default_true() -> bool {+ true+}++impl Default for MqCapabilities {+ fn default() -> Self {+ Self {+ supports_list_topics: true,+ supports_create_topic: true,+ supports_delete_topic: true,+ supports_topic_stats: true,+ supports_broker_admin: true,+ supports_producer_listing: true,+ supports_tenants: false,+ supports_namespaces: false,+ supports_partitioned_topics: false,+ supports_subscriptions: false,+ supports_create_subscription: false,+ supports_reset_cursor: false,+ supports_skip_messages: false,+ supports_clear_backlog: false,+ supports_peek_messages: false,+ supports_expire_messages: false,+ supports_rate_limits: false,+ supports_backlog_quota: false,+ supports_retention: false,+ supports_permissions: false,+ supports_geo_replication: false,+ supports_token_management: false,+ supports_raw_admin_api: false,+ supports_send_message: false,+ supports_message_query: false,+ supports_dlq: false,+ supports_message_trace: false,+ supports_exchanges: false,+ supports_client_connections: false,+ supports_user_permissions: false,+ supports_policies: false,+ supports_cluster_monitoring: false,+ }+ }+}+/// Result of a connectivity test, including the detected server version and how/// it was determined (probe vs. fallback) so the UI can warn appropriately.#[derive(Debug, Clone, Serialize, Deserialize)]@@ -1231,8 +1287,9 @@ pub struct SendMessageRequest {pub struct SendMessageResponse {/// Topic the message was written to.pub topic: String,- /// Partition the message was written to.- pub partition: i32,+ /// Partition the message was written to, when the transport reports it.+ #[serde(default, skip_serializing_if = "Option::is_none")]+ pub partition: Option<i32>,/// Offset of the produced message.pub offset: i64,/// Broker-assigned timestamp, if available.@@ -1244,6 +1301,23 @@ pub struct SendMessageResponse {mod tests {use super::ResetPosition;+ #[test]+ fn send_result_partition_can_be_unknown_or_known() {+ for partition in [None, Some(serde_json::Value::Null)] {+ let mut value = serde_json::json!({ "topic": "events", "offset": 0 });+ if let Some(partition) = partition {+ value["partition"] = partition;+ }+ let result: super::SendMessageResponse = serde_json::from_value(value).unwrap();+ assert!(serde_json::to_value(result).unwrap().get("partition").is_none());+ }+ let result: super::SendMessageResponse = serde_json::from_value(serde_json::json!({+ "topic": "events", "offset": 17, "partition": 2+ }))+ .unwrap();+ assert_eq!(serde_json::to_value(result).unwrap()["partition"], 2);+ }+#[test]fn reset_position_deserializes_camel_case_variant_fields() {let pos: ResetPosition = serde_json::from_str(r#"{"kind":"timestamp","timestampMs":1710000000000}"#)diff --git a/crates/dbx-core/src/connection/connection_secrets.rs b/crates/dbx-core/src/connection/connection_secrets.rsindex cb893ee81b..36f21b8900 100644--- a/crates/dbx-core/src/connection/connection_secrets.rs+++ b/crates/dbx-core/src/connection/connection_secrets.rs@@ -112,11 +112,64 @@ impl ConnectionSecretStore for FileSecretStore {}}+/// Match only explicitly identified RocketMQ connections. An explicit system+/// kind takes precedence over a stale driver profile.+pub fn is_rocketmq_connection(config: &ConnectionConfig) -> bool {+ if config.db_type != DatabaseType::MessageQueue {+ return false;+ }+ let kind = config+ .external_config+ .as_ref()+ .and_then(|external| external.get("systemKind"))+ .and_then(serde_json::Value::as_str);+ kind.or(config.driver_profile.as_deref()).is_some_and(|kind| kind.eq_ignore_ascii_case("rocketmq"))+}++/// Move legacy RocketMQ ACL copies into Basic auth only when auth is absent.+/// Explicit auth (including `none` and empty fields) is authoritative. Returns+/// whether metadata changed, so loaders can rewrite the sanitized legacy row.+pub fn normalize_rocketmq_credentials(config: &mut ConnectionConfig) -> bool {+ if !is_rocketmq_connection(config) {+ return false;+ }+ let Some(external) = config.external_config.as_mut().and_then(serde_json::Value::as_object_mut) else {+ return false;+ };+ let Some(extra) = external.get_mut("extra").and_then(serde_json::Value::as_object_mut) else {+ return false;+ };+ let access = extra.remove("accessKey");+ let access_alias = extra.remove("access_key");+ let secret = extra.remove("secretKey");+ let secret_alias = extra.remove("secret_key");+ let changed = access.is_some() || access_alias.is_some() || secret.is_some() || secret_alias.is_some();+ if changed && !external.contains_key("auth") {+ let string_value = |primary: Option<serde_json::Value>, alias: Option<serde_json::Value>| {+ [primary, alias]+ .into_iter()+ .flatten()+ .filter_map(|value| value.as_str().filter(|value| !value.trim().is_empty()).map(str::to_owned))+ .next()+ .unwrap_or_default()+ };+ external.insert("auth".into(), serde_json::json!({+ "kind": "basic", "username": string_value(access, access_alias), "password": string_value(secret, secret_alias)+ }));+ }+ changed+}+pub fn save_connections_to_file(path: &Path,configs: &[ConnectionConfig],store: &dyn ConnectionSecretStore,) -> Result<(), String> {+ let mut normalized = configs.to_vec();+ for config in &mut normalized {+ normalize_rocketmq_credentials(config);+ }+ let configs = normalized.as_slice();delete_removed_connection_secrets(path, configs, store)?;for config in configs {persist_secret(store, &config.id, MAIN_PASSWORD_KEY, &config.password)?;@@ -159,6 +212,7 @@ pub fn load_connections_from_file(let mut configs = read_connections(path)?;let mut needs_rewrite = false;for config in &mut configs {+ needs_rewrite |= normalize_rocketmq_credentials(config);if config.password.is_empty() {if let Some(secret) = store.get_secret(&config.id, MAIN_PASSWORD_KEY)? {config.password = secret;@@ -439,6 +493,9 @@ fn delete_secret_prefix(}fn persist_mq_auth_secrets(store: &dyn ConnectionSecretStore, config: &ConnectionConfig) -> Result<(), String> {+ if is_rocketmq_connection(config) && !config.save_password {+ return delete_secret_prefix(store, &config.id, MQ_AUTH_SECRET_PREFIX);+ }if config.db_type != DatabaseType::MessageQueue {delete_secret_prefix(store, &config.id, MQ_AUTH_SECRET_PREFIX)?;return Ok(());@@ -501,6 +558,14 @@ fn hydrate_mq_auth_secrets(config: &mut ConnectionConfig,needs_rewrite: &mut bool,) -> Result<(), String> {+ if is_rocketmq_connection(config) && !config.save_password {+ *needs_rewrite |= mq_auth_object(config.external_config.as_ref())+ .and_then(|auth| auth.get("password"))+ .and_then(serde_json::Value::as_str)+ .is_some_and(|password| !password.is_empty());+ scrub_mq_auth_secrets(config);+ return delete_secret_prefix(store, &config.id, MQ_AUTH_SECRET_PREFIX);+ }if config.db_type != DatabaseType::MessageQueue {return Ok(());}@@ -920,6 +985,7 @@ fn sanitize_connections(configs: &[ConnectionConfig]) -> Vec<ConnectionConfig> {.iter().cloned().map(|mut config| {+ normalize_rocketmq_credentials(&mut config);config.password.clear();for layer in &mut config.transport_layers {match layer {@@ -1141,6 +1207,93 @@ mod tests {serde_json::from_str(&json).unwrap()}+ #[test]+ fn rocketmq_legacy_credentials_migrate_on_file_load_and_save() {+ for (access, secret) in [("accessKey", "secretKey"), ("access_key", "secret_key")] {+ let path = temp_connections_file(access);+ let store = MemorySecretStore::default();+ let mut config = connection("rocket", "", "");+ config.db_type = DatabaseType::MessageQueue;+ config.external_config = Some(serde_json::json!({+ "systemKind": "rocketmq", "extra": {(access): "legacy-ak", (secret): "legacy-sk", "namesrvAddr": "localhost:9876"}+ }));+ std::fs::write(&path, serde_json::to_string(&vec![config]).unwrap()).unwrap();+ let loaded = load_connections_from_file(&path, &store).unwrap();+ let external = loaded[0].external_config.as_ref().unwrap();+ assert_eq!(+ external["auth"],+ serde_json::json!({"kind":"basic", "username":"legacy-ak", "password":"legacy-sk"})+ );+ assert_eq!(external["extra"], serde_json::json!({"namesrvAddr":"localhost:9876"}));+ assert_eq!(store.get_existing("rocket", MQ_AUTH_PASSWORD_KEY).as_deref(), Some("legacy-sk"));+ assert!(!std::fs::read_to_string(&path).unwrap().contains("legacy-sk"));+ save_connections_to_file(&path, &loaded, &store).unwrap();+ assert_eq!(load_connections_from_file(&path, &store).unwrap(), loaded);+ }+ }++ #[test]+ fn rocketmq_legacy_blank_primary_keys_fall_back_to_nonblank_aliases() {+ let mut config = connection("rocket-aliases", "", "");+ config.db_type = DatabaseType::MessageQueue;+ config.external_config = Some(serde_json::json!({+ "systemKind": "rocketmq",+ "extra": {"accessKey": "", "access_key": " ak ", "secretKey": " \t", "secret_key": " sk "}+ }));+ assert!(super::normalize_rocketmq_credentials(&mut config));+ let external = config.external_config.as_ref().unwrap();+ assert_eq!(external["auth"], serde_json::json!({"kind":"basic", "username":" ak ", "password":" sk "}));+ assert_eq!(external["extra"], serde_json::json!({}));+ }++ #[test]+ fn rocketmq_normalization_respects_explicit_auth_and_other_systems() {+ for auth in [+ serde_json::json!({"kind":"none"}),+ serde_json::json!({"kind":"basic", "username":"explicit", "password":""}),+ ] {+ let mut config = connection("rocket", "", "");+ config.db_type = DatabaseType::MessageQueue;+ config.driver_profile = Some("rocketmq".into());+ config.external_config = Some(+ serde_json::json!({"auth":auth, "extra":{"accessKey":"old", "secretKey":"old", "access_key":"old", "secret_key":"old"}}),+ );+ assert!(super::normalize_rocketmq_credentials(&mut config));+ assert_eq!(config.external_config.as_ref().unwrap()["auth"], auth);+ assert_eq!(config.external_config.as_ref().unwrap()["extra"], serde_json::json!({}));+ assert!(!super::normalize_rocketmq_credentials(&mut config));+ }+ for kind in ["pulsar", "kafka", "rabbitmq"] {+ let mut config = connection("other", "", "");+ config.db_type = DatabaseType::MessageQueue;+ config.external_config = Some(serde_json::json!({"systemKind":kind, "extra":{"secretKey":"keep"}}));+ config.driver_profile = Some("rocketmq".into());+ let original = config.clone();+ assert!(!super::normalize_rocketmq_credentials(&mut config));+ assert_eq!(config, original);+ }+ let mut config = connection("database", "", "");+ config.external_config = Some(serde_json::json!({"systemKind":"rocketmq", "extra":{"secretKey":"keep"}}));+ assert!(!super::normalize_rocketmq_credentials(&mut config));+ }++ #[test]+ fn rocketmq_file_save_without_password_drops_existing_secret() {+ let path = temp_connections_file("rocket-no-save");+ let store = MemorySecretStore::default();+ store.set_existing("rocket", MQ_AUTH_PASSWORD_KEY, "old");+ let mut config = connection("rocket", "", "");+ config.db_type = DatabaseType::MessageQueue;+ config.save_password = false;+ config.external_config =+ Some(serde_json::json!({"systemKind":"rocketmq", "extra":{"accessKey":"ak", "secretKey":"temporary"}}));+ save_connections_to_file(&path, &[config], &store).unwrap();+ assert_eq!(store.get_existing("rocket", MQ_AUTH_PASSWORD_KEY), None);+ let loaded = load_connections_from_file(&path, &store).unwrap();+ assert_eq!(loaded[0].external_config.as_ref().unwrap()["auth"]["password"], "");+ assert!(!std::fs::read_to_string(path).unwrap().contains("temporary"));+ }+#[test]fn save_connections_moves_passwords_to_secret_store_and_redacts_file() {let path = temp_connections_file("save-redacts");diff --git a/crates/dbx-core/src/connection/mod.rs b/crates/dbx-core/src/connection/mod.rsindex f9ede7ee3c..e675138bdb 100644--- a/crates/dbx-core/src/connection/mod.rs+++ b/crates/dbx-core/src/connection/mod.rs@@ -4109,7 +4109,15 @@ impl AppState {connection_id: &str,config: &ConnectionConfig,) -> Result<crate::mq::config::MqAdminConfig, String> {- let mqc = crate::mq::config::MqAdminConfig::from_connection(config)?;+ let mut normalized = config.clone();+ connection_secrets::normalize_rocketmq_credentials(&mut normalized);+ let mut mqc = crate::mq::config::MqAdminConfig::from_connection(&normalized)?;+ if !config.save_password && mqc.system_kind == crate::mq::types::MqSystemKind::RocketMq {+ let owner = crate::session_credentials::current_credential_owner().unwrap_or_default();+ if let crate::mq::auth::MqAuth::Basic { password, .. } = &mut mqc.auth {+ *password = self.session_credentials.get(&owner, connection_id).unwrap_or_default();+ }+ }if !config.has_effective_transport_layers() {return Ok(mqc);}@@ -6772,19 +6780,29 @@ fn session_scoped_pool_key_for(session_scoped_pool_key(base_pool_key, client_session_id)}+fn normalize_rocketmq_runtime_credentials(config: &mut ConnectionConfig) {+ connection_secrets::normalize_rocketmq_credentials(config);+ if !config.save_password && connection_secrets::is_rocketmq_connection(config) {+ if let Some(auth) = config.external_config.as_mut().and_then(|external| external.get_mut("auth")) {+ if auth.get("kind").and_then(serde_json::Value::as_str) == Some("basic") {+ auth["password"] = serde_json::json!("");+ }+ }+ }+}+/// 两个运行态连接配置是否视为同一连接(用于决定是否销毁连接池)。///-/// 始终忽略只影响前端导航的表加载策略。仅当双方都是 `save_password=false` 时才忽略-/// `password` 字段的差异:这类连接在 connect 时运行态配置可能携带会话密码,持久化-/// 同步后为空,这种空值差异不应触发池重建。若任一方 `save_password=true`,密码是-/// 真实的连接参数,任何密码变更(包括用户保存了新密码)都必须销毁旧池,否则旧池会-/// 继续用旧密码认证。+/// 忽略展示配置与 no-save 连接的临时密码,包括 RocketMQ auth.password。+/// 账号、端点和持久化密码的变化仍会使已有连接失效。pub fn connection_configs_pool_equivalent(a: &ConnectionConfig, b: &ConnectionConfig) -> bool {if a == b {return true;}let mut a = a.clone();let mut b = b.clone();+ normalize_rocketmq_runtime_credentials(&mut a);+ normalize_rocketmq_runtime_credentials(&mut b);// Sidebar paging is a presentation preference and cannot change an// established database session.a.sidebar_auto_load_all_tables = false;@@ -6809,6 +6827,7 @@ pub fn connection_configs_pool_equivalent(a: &ConnectionConfig, b: &ConnectionCo/// belongs to.pub fn connection_configs_session_credentials_compatible(a: &ConnectionConfig, b: &ConnectionConfig) -> bool {fn normalize(mut config: ConnectionConfig) -> ConnectionConfig {+ normalize_rocketmq_runtime_credentials(&mut config);config.name.clear();config.note.clear();config.driver_label = None;@@ -7640,6 +7659,39 @@ mod tests {assert!(!connection_configs_session_credentials_compatible(&initial, &updated));}+ #[cfg(feature = "mq-admin")]+ #[tokio::test]+ async fn rocketmq_runtime_auth_uses_only_active_owner_password() {+ let dir = tempfile::tempdir().unwrap();+ let storage = crate::persistence::test_storage::open(&dir.path().join("storage.db")).await.unwrap();+ let state = AppState::new_with_plugin_dir(storage, dir.path().join("plugins"));+ let mut config = mysql_config(None);+ config.db_type = DatabaseType::MessageQueue;+ config.save_password = false;+ config.external_config = Some(serde_json::json!({+ "systemKind": "rocketmq", "adminUrl": "",+ "auth": { "kind": "basic", "username": "ak", "password": "" },+ "extra": { "connectionMode": "proxy", "proxyEndpoint": "proxy.internal:8081" }+ }));+ state.session_credentials.set("owner-a", &config.id, "sk-a");+ for (owner, expected) in [("owner-a", "sk-a"), ("owner-b", "")] {+ crate::session_credentials::with_credential_owner(Some(owner.into()), async {+ let mqc = state.mq_admin_config_for_connection(&config.id, &config).await.unwrap();+ match mqc.auth {+ crate::mq::auth::MqAuth::Basic { password, .. } => assert_eq!(password, expected),+ _ => panic!("expected Basic auth"),+ }+ })+ .await;+ }+ let mut scrubbed = config.clone();+ config.external_config.as_mut().unwrap()["auth"]["password"] = serde_json::json!("transient");+ assert!(connection_configs_session_credentials_compatible(&config, &scrubbed));+ assert!(connection_configs_pool_equivalent(&config, &scrubbed));+ scrubbed.external_config.as_mut().unwrap()["auth"]["username"] = serde_json::json!("other-ak");+ assert!(!connection_configs_session_credentials_compatible(&config, &scrubbed));+ }+#[tokio::test]async fn apply_session_credential_injects_saved_password_only_for_no_save_connections() {let dir = std::env::temp_dir().join(format!("dbx-core-session-cred-{}", std::process::id()));diff --git a/crates/dbx-core/src/persistence/cloud_sync.rs b/crates/dbx-core/src/persistence/cloud_sync.rsindex 5bcb4c1cca..d069ca1613 100644--- a/crates/dbx-core/src/persistence/cloud_sync.rs+++ b/crates/dbx-core/src/persistence/cloud_sync.rs@@ -16,10 +16,10 @@ mod webdav_snapshot;use crate::ai::AiConfigItem;use crate::connection_secrets::{- plugin_connection_secret_key, CASSANDRA_KEYSTORE_PASSWORD_KEY, CASSANDRA_TRUSTSTORE_PASSWORD_KEY,- MQTT_AUTH_PASSWORD_KEY, MQ_AUTH_API_KEY_VALUE_KEY, MQ_AUTH_CLIENT_SECRET_KEY, MQ_AUTH_PASSWORD_KEY,- MQ_AUTH_TOKEN_KEY, MQ_TOKEN_SIGNING_KEY, NACOS_AUTH_PASSWORD_KEY, NACOS_RNACOS_CONSOLE_PASSWORD_KEY,- PLUGIN_CONNECTION_SECRET_PREFIX,+ is_rocketmq_connection, normalize_rocketmq_credentials, plugin_connection_secret_key,+ CASSANDRA_KEYSTORE_PASSWORD_KEY, CASSANDRA_TRUSTSTORE_PASSWORD_KEY, MQTT_AUTH_PASSWORD_KEY,+ MQ_AUTH_API_KEY_VALUE_KEY, MQ_AUTH_CLIENT_SECRET_KEY, MQ_AUTH_PASSWORD_KEY, MQ_AUTH_TOKEN_KEY,+ MQ_TOKEN_SIGNING_KEY, NACOS_AUTH_PASSWORD_KEY, NACOS_RNACOS_CONSOLE_PASSWORD_KEY, PLUGIN_CONNECTION_SECRET_PREFIX,};use crate::models::connection::{ConnectionConfig, DatabaseType, TransportLayerConfig};use crate::saved_sql::SavedSqlLibrary;@@ -1416,12 +1416,27 @@ pub async fn apply_sync_snapshot_with_selection(.connection_secrets.iter().filter(|secret| {- !(matches!(- secret.key.as_str(),- "password" | NACOS_AUTH_PASSWORD_KEY | NACOS_RNACOS_CONSOLE_PASSWORD_KEY- ) && connections- .iter()- .any(|config| config.id == secret.connection_id && !config.save_password))+ let forbidden_rocketmq_auth =+ secret.key.starts_with(crate::connection_secrets::MQ_AUTH_SECRET_PREFIX)+ && connections.iter().any(|config| {+ config.id == secret.connection_id+ && is_rocketmq_connection(config)+ && (!config.save_password+ || config+ .external_config+ .as_ref()+ .and_then(|external| external.get("auth"))+ .and_then(|auth| auth.get("kind"))+ .and_then(serde_json::Value::as_str)+ == Some("none"))+ });+ !forbidden_rocketmq_auth+ && !(matches!(+ secret.key.as_str(),+ "password" | NACOS_AUTH_PASSWORD_KEY | NACOS_RNACOS_CONSOLE_PASSWORD_KEY+ ) && connections+ .iter()+ .any(|config| config.id == secret.connection_id && !config.save_password))}).map(|secret| SyncImportSecret {connection_id: secret.connection_id.clone(),@@ -2435,6 +2450,7 @@ fn valid_mqtt_filter(topic: &str) -> bool {}fn scrub_connection_secrets(config: &mut ConnectionConfig) {+ normalize_rocketmq_credentials(config);config.password.clear();for layer in &mut config.transport_layers {match layer {@@ -2532,6 +2548,10 @@ fn collect_connection_secrets(config: &ConnectionConfig,include_plugin_secrets: bool,) -> Result<(), String> {+ // Legacy snapshots may arrive without passing through local storage.+ let mut normalized = config.clone();+ normalize_rocketmq_credentials(&mut normalized);+ let config = &normalized;// A transient password must not become durable through a sync snapshot.if config.save_password {push_secret(secrets, &config.id, "password", &config.password);@@ -2561,7 +2581,9 @@ fn collect_connection_secrets(if let Some(connection_string) = &config.connection_string {push_secret(secrets, &config.id, "connection_string", connection_string);}- push_mq_external_config_secrets(secrets, config);+ if !is_rocketmq_connection(config) || config.save_password {+ push_mq_external_config_secrets(secrets, config);+ }push_mqtt_external_config_secret(secrets, config);push_cassandra_tls_secrets(secrets, config);if config.save_password {@@ -4015,6 +4037,64 @@ mod tests {assert!(!request.to_ascii_lowercase().contains("user-agent:"));}+ #[test]+ fn rocketmq_legacy_sync_secrets_use_auth_and_never_leak_extra_copies() {+ let mut config = postgres_connection("rocket", "");+ config.db_type = DatabaseType::MessageQueue;+ config.external_config =+ Some(serde_json::json!({"systemKind":"rocketmq", "extra":{"accessKey":"ak", "secretKey":"legacy-sk"}}));+ let mut secrets = Vec::new();+ super::collect_connection_secrets(&mut secrets, &config, false).unwrap();+ assert!(secrets.iter().any(|secret| secret.key == super::MQ_AUTH_PASSWORD_KEY && secret.secret == "legacy-sk"));+ let mut public = config.clone();+ scrub_connection_secrets(&mut public);+ assert_eq!(public.external_config.as_ref().unwrap()["auth"]["username"], "ak");+ assert_eq!(public.external_config.as_ref().unwrap()["auth"]["password"], "");+ assert!(!serde_json::to_string(&public).unwrap().contains("secretKey"));+ config.save_password = false;+ let mut secrets = Vec::new();+ super::collect_connection_secrets(&mut secrets, &config, false).unwrap();+ assert!(secrets.is_empty());+ }++ #[tokio::test]+ async fn rocketmq_legacy_snapshot_restore_obeys_secret_consent_and_save_preference() {+ for (label, restore_secrets, save_password, auth_none) in [+ ("restore", true, true, false),+ ("metadata", false, true, false),+ ("transient", true, false, false),+ ("none", true, true, true),+ ] {+ let path = temp_db_path(&format!("rocketmq-sync-{label}"));+ let storage = crate::persistence::test_storage::open(&path).await.unwrap();+ let mut snapshot = build_sync_snapshot(&storage, "test", None, None).await.unwrap();+ let mut config = postgres_connection("rocket", "");+ config.db_type = DatabaseType::MessageQueue;+ config.save_password = save_password;+ config.external_config =+ Some(serde_json::json!({"systemKind":"rocketmq", "extra":{"accessKey":"ak", "secretKey":"legacy-sk"}}));+ if auth_none {+ config.external_config.as_mut().unwrap()["auth"] = serde_json::json!({"kind":"none"});+ }+ snapshot.connections = vec![config];+ apply_sync_snapshot(+ &storage,+ &snapshot,+ ApplySnapshotOptions { secrets_passphrase: None, restore_secrets },+ )+ .await+ .unwrap();+ let expected = if restore_secrets && save_password && !auth_none { Some("legacy-sk") } else { None };+ assert_eq!(+ storage.get_secret("rocket", super::MQ_AUTH_PASSWORD_KEY).await.unwrap().as_deref(),+ expected,+ "{label}"+ );+ let loaded = storage.load_connections().await.unwrap();+ assert_eq!(loaded[0].external_config.as_ref().unwrap()["extra"], serde_json::json!({}));+ }+ }+#[test]fn scrubs_connection_secret_fields() {let mut config = ConnectionConfig {diff --git a/crates/dbx-core/src/persistence/storage.rs b/crates/dbx-core/src/persistence/storage.rsindex 4c19599d79..5f83afbc01 100644--- a/crates/dbx-core/src/persistence/storage.rs+++ b/crates/dbx-core/src/persistence/storage.rs@@ -24,9 +24,10 @@ use crate::ai::{AiRunStatus,};use crate::connection_secrets::{- plugin_connection_secret_key, CASSANDRA_KEYSTORE_PASSWORD_KEY, CASSANDRA_TLS_SECRET_PREFIX,- CASSANDRA_TRUSTSTORE_PASSWORD_KEY, MQTT_AUTH_PASSWORD_KEY, MQTT_AUTH_SECRET_PREFIX, MQ_AUTH_API_KEY_VALUE_KEY,- MQ_AUTH_CLIENT_SECRET_KEY, MQ_AUTH_PASSWORD_KEY, MQ_AUTH_SECRET_PREFIX, MQ_AUTH_TOKEN_KEY, MQ_TOKEN_SIGNING_KEY,+ is_rocketmq_connection, normalize_rocketmq_credentials, plugin_connection_secret_key,+ CASSANDRA_KEYSTORE_PASSWORD_KEY, CASSANDRA_TLS_SECRET_PREFIX, CASSANDRA_TRUSTSTORE_PASSWORD_KEY,+ MQTT_AUTH_PASSWORD_KEY, MQTT_AUTH_SECRET_PREFIX, MQ_AUTH_API_KEY_VALUE_KEY, MQ_AUTH_CLIENT_SECRET_KEY,+ MQ_AUTH_PASSWORD_KEY, MQ_AUTH_SECRET_PREFIX, MQ_AUTH_TOKEN_KEY, MQ_TOKEN_SIGNING_KEY,MQ_TOKEN_SIGNING_SECRET_PREFIX, NACOS_AUTH_PASSWORD_KEY, NACOS_AUTH_SECRET_PREFIX,NACOS_RNACOS_CONSOLE_PASSWORD_KEY, PLUGIN_CONNECTION_SECRET_PREFIX, SALESFORCE_AUTH_CLIENT_SECRET_KEY,SALESFORCE_AUTH_PASSWORD_KEY, SALESFORCE_AUTH_REFRESH_TOKEN_KEY, SALESFORCE_AUTH_SECRET_PREFIX,@@ -2761,6 +2762,9 @@ fn connection_secret_in_tx_exists(}fn connection_config_has_inline_secrets(config: &ConnectionConfig) -> bool {+ let mut normalized = config.clone();+ normalize_rocketmq_credentials(&mut normalized);+ let config = &normalized;if !config.password.is_empty()|| config.url_params.as_deref().is_some_and(|value| !value.is_empty())|| config.init_script.as_deref().is_some_and(|value| !value.is_empty())@@ -6575,6 +6579,7 @@ fn ensure_mcp_connection_change_allowed_in_tx(/// Connection metadata with every field managed by the secret store removed.pub fn sanitized_connection_config(config: &ConnectionConfig) -> ConnectionConfig {let mut sanitized = config.clone().canonicalized();+ normalize_rocketmq_credentials(&mut sanitized);sanitized.password = String::new();sanitized.url_params = None;scrub_transport_layer_secrets(&mut sanitized);@@ -6596,7 +6601,8 @@ fn persist_connection_in_tx(codec: &SecretCodec,config: &ConnectionConfig,) -> Result<(), String> {- let config = config.clone().canonicalized();+ let mut config = config.clone().canonicalized();+ normalize_rocketmq_credentials(&mut config);let config_id = config.id.clone();let sanitized = sanitized_connection_config(&config);let json = serde_json::to_string(&sanitized).map_err(|e| e.to_string())?;@@ -6970,20 +6976,13 @@ impl Storage {persist_secret_in_tx(&tx, &codec, &config.id, "password", "")?;delete_secret_prefix_in_tx(&tx, &config.id, NACOS_AUTH_SECRET_PREFIX)?;}- let mut sanitized = config;- sanitized.password = String::new();- sanitized.url_params = None;- scrub_transport_layer_secrets(&mut sanitized);- sanitized.redis_sentinel_password = String::new();- sanitized.connection_string = None;- sanitized.init_script = None;- scrub_mq_auth_secrets(&mut sanitized);- scrub_mqtt_auth_secrets(&mut sanitized);- scrub_mq_token_signing_secret(&mut sanitized);- scrub_nacos_auth_secrets(&mut sanitized);- scrub_cassandra_tls_secrets(&mut sanitized);- scrub_salesforce_auth_secrets(&mut sanitized);- sanitized.connection_secrets.clear();+ if is_rocketmq_connection(&config)+ && (!config.save_password+ || mq_auth_object(config.external_config.as_ref()).and_then(mq_auth_kind) == Some("none"))+ {+ delete_secret_prefix_in_tx(&tx, &config.id, MQ_AUTH_SECRET_PREFIX)?;+ }+ let sanitized = sanitized_connection_config(&config);let json = serde_json::to_string(&sanitized).map_err(|e| e.to_string())?;tx.execute("INSERT INTO connections (id, config_json) VALUES (?1, ?2)", params![config_id, json])@@ -7581,6 +7580,7 @@ impl Storage {if !stored_plugin_secrets.is_empty() {config.connection_secrets = stored_plugin_secrets;}+ let needs_rocketmq_rewrite = normalize_rocketmq_credentials(&mut config);let needs_mq_auth_rewrite = self.hydrate_mq_auth_secrets(&id, &mut config).await?;let needs_mqtt_auth_rewrite = self.hydrate_mqtt_auth_secret(&id, &mut config).await?;let needs_mq_token_signing_rewrite = self.hydrate_mq_token_signing_secret(&id, &mut config).await?;@@ -7601,7 +7601,8 @@ impl Storage {needs_plugin_secret_rewrite = true;}}- let needs_external_secret_rewrite = needs_mq_auth_rewrite+ let needs_external_secret_rewrite = needs_rocketmq_rewrite+ || needs_mq_auth_rewrite|| needs_mqtt_auth_rewrite|| needs_mq_token_signing_rewrite|| needs_nacos_auth_rewrite@@ -7636,6 +7637,24 @@ impl Storage {connection_id: &str,config: &mut ConnectionConfig,) -> Result<bool, String> {+ if is_rocketmq_connection(config) && !config.save_password {+ let had_inline = mq_auth_object(config.external_config.as_ref())+ .and_then(|auth| auth.get("password"))+ .and_then(serde_json::Value::as_str)+ .is_some_and(|password| !password.is_empty());+ scrub_mq_auth_secrets(config);+ let connection_id = connection_id.to_string();+ self.with_conn(move |conn| {+ conn.execute(+ "DELETE FROM connection_secrets WHERE connection_id = ?1 AND key LIKE ?2",+ params![connection_id, format!("{MQ_AUTH_SECRET_PREFIX}%")],+ )+ .map(|_| ())+ .map_err(|error| error.to_string())+ })+ .await?;+ return Ok(had_inline);+ }if config.db_type != DatabaseType::MessageQueue {return Ok(false);}@@ -9112,6 +9131,12 @@ fn apply_sync_connections_in_tx(};for config in configs {let config = config.canonicalized();+ if is_rocketmq_connection(&config)+ && (!config.save_password+ || mq_auth_object(config.external_config.as_ref()).and_then(mq_auth_kind) == Some("none"))+ {+ delete_secret_prefix_in_tx(tx, &config.id, MQ_AUTH_SECRET_PREFIX)?;+ }if !config.save_password && !merge_existing {persist_secret_in_tx(tx, codec, &config.id, "password", "")?;delete_secret_prefix_in_tx(tx, &config.id, NACOS_AUTH_SECRET_PREFIX)?;@@ -9511,6 +9536,9 @@ fn persist_mq_auth_secrets_in_tx(codec: &SecretCodec,config: &ConnectionConfig,) -> Result<(), String> {+ if is_rocketmq_connection(config) && !config.save_password {+ return delete_secret_prefix_in_tx(tx, &config.id, MQ_AUTH_SECRET_PREFIX);+ }if config.db_type != DatabaseType::MessageQueue {delete_secret_prefix_in_tx(tx, &config.id, MQ_AUTH_SECRET_PREFIX)?;return Ok(());@@ -12488,6 +12516,70 @@ mod tests {let _ = std::fs::remove_file(path);}+ #[tokio::test]+ async fn rocketmq_sqlite_load_migrates_legacy_and_rewrites_metadata() {+ let path = temp_db_path("rocketmq-legacy-load");+ let storage = crate::persistence::test_storage::open(&path).await.unwrap();+ let mut config = mq_connection("rocket", "");+ config.external_config =+ Some(serde_json::json!({"systemKind":"rocketmq", "extra":{"access_key":"ak", "secret_key":"legacy-sk"}}));+ let json = serde_json::to_string(&config).unwrap();+ storage+ .with_conn(move |conn| {+ conn.execute("INSERT INTO connections (id, config_json) VALUES ('rocket', ?1)", [json])+ .map(|_| ())+ .map_err(|error| error.to_string())+ })+ .await+ .unwrap();+ let loaded = storage.load_connections().await.unwrap();+ assert_eq!(+ loaded[0].external_config.as_ref().unwrap()["auth"],+ serde_json::json!({"kind":"basic", "username":"ak", "password":"legacy-sk"})+ );+ assert_eq!(+ storage.get_secret("rocket", super::MQ_AUTH_PASSWORD_KEY).await.unwrap().as_deref(),+ Some("legacy-sk")+ );+ let raw = raw_connection_json(&storage, "rocket").await;+ assert!(!raw.contains("legacy-sk"));+ assert!(!raw.contains("secret_key"));+ assert_eq!(storage.load_connections().await.unwrap(), loaded);+ }++ #[tokio::test]+ async fn rocketmq_sqlite_save_normalizes_and_drops_transient_secrets() {+ let path = temp_db_path("rocketmq-save");+ let storage = crate::persistence::test_storage::open(&path).await.unwrap();+ let mut config = mq_connection("rocket", "");+ config.external_config =+ Some(serde_json::json!({"systemKind":"rocketmq", "extra":{"accessKey":"ak", "secretKey":"sk"}}));+ storage.save_connections(std::slice::from_ref(&config)).await.unwrap();+ assert_eq!(storage.get_secret("rocket", super::MQ_AUTH_PASSWORD_KEY).await.unwrap().as_deref(), Some("sk"));+ let raw = raw_connection_json(&storage, "rocket").await;+ assert!(!raw.contains("secretKey"));+ config.save_password = false;+ storage.save_connections(&[config]).await.unwrap();+ assert!(storage.get_secret("rocket", super::MQ_AUTH_PASSWORD_KEY).await.unwrap().is_none());+ let loaded = storage.load_connections().await.unwrap();+ assert_eq!(loaded[0].external_config.as_ref().unwrap()["auth"]["password"], "");+ }++ #[tokio::test]+ async fn rocketmq_sqlite_explicit_none_discards_legacy_copies() {+ let path = temp_db_path("rocketmq-none");+ let storage = crate::persistence::test_storage::open(&path).await.unwrap();+ let mut config = mq_connection("rocket", "");+ config.external_config =+ Some(serde_json::json!({"systemKind":"rocketmq", "auth":{"kind":"none"}, "extra":{"secretKey":"old"}}));+ storage.set_secret("rocket", super::MQ_AUTH_PASSWORD_KEY, "stale").await.unwrap();+ storage.save_connections(&[config]).await.unwrap();+ assert!(storage.get_secret("rocket", super::MQ_AUTH_PASSWORD_KEY).await.unwrap().is_none());+ let loaded = storage.load_connections().await.unwrap();+ assert_eq!(loaded[0].external_config.as_ref().unwrap()["auth"], serde_json::json!({"kind":"none"}));+ assert!(!raw_connection_json(&storage, "rocket").await.contains("secretKey"));+ }+#[tokio::test]async fn save_connections_moves_mq_auth_token_to_secret_table_and_restores_it() {let path = temp_db_path("mq-token-secrets");diff --git a/crates/dbx-mcp/src/server.rs b/crates/dbx-mcp/src/server.rsindex 91dcfa01b7..b687b5d37c 100644--- a/crates/dbx-mcp/src/server.rs+++ b/crates/dbx-mcp/src/server.rs@@ -5093,7 +5093,7 @@ fn format_send_message_result("Message sent to {}.\ntopic: {}\npartition: {}\noffset: {}",system_kind.as_str(),result.topic,- result.partition,+ result.partition.map(|value| value.to_string()).unwrap_or_else(|| "unknown".into()),result.offset);if let Some(timestamp) = result.timestamp.as_deref() {@@ -6773,12 +6773,24 @@ mod tests {assert_eq!(request.headers.get("trace").map(String::as_str), Some("abc"));}+ #[cfg(feature = "mq-admin")]+ #[test]+ fn format_proxy_send_result_marks_unreported_partition_unknown() {+ let result: dbx_core::mq::SendMessageResponse = serde_json::from_value(serde_json::json!({+ "topic": "orders", "offset": 0+ }))+ .unwrap();+ let output = format_send_message_result(&dbx_core::mq::MqSystemKind::RocketMq, &result);+ assert!(output.contains("partition: unknown"));+ assert!(!output.contains("partition: 0"));+ }+#[cfg(feature = "mq-admin")]#[test]fn format_send_message_result_is_concise_and_includes_delivery_metadata() {let result = dbx_core::mq::SendMessageResponse {topic: "orders".to_string(),- partition: 2,+ partition: Some(2),offset: 41,timestamp: Some("1700000000000".to_string()),};diff --git a/crates/dbx-web/src/routes/connection.rs b/crates/dbx-web/src/routes/connection.rsindex 3573af1770..f068458ed8 100644--- a/crates/dbx-web/src/routes/connection.rs+++ b/crates/dbx-web/src/routes/connection.rs@@ -46,9 +46,23 @@ struct SessionCredentialWrites {}fn prepare_runtime_config(mut config: ConnectionConfig) -> (ConnectionConfig, NoSaveRuntimeSecrets) {+ dbx_core::connection::connection_secrets::normalize_rocketmq_credentials(&mut config);if config.save_password {return (config, NoSaveRuntimeSecrets::default());}+ if dbx_core::connection::connection_secrets::is_rocketmq_connection(&config) {+ let primary = config+ .external_config+ .as_mut()+ .and_then(|external| external.get_mut("auth"))+ .filter(|auth| auth.get("kind").and_then(serde_json::Value::as_str) == Some("basic"))+ .and_then(|auth| auth.as_object_mut())+ .and_then(|auth| auth.insert("password".into(), serde_json::json!("")))+ .and_then(|value| value.as_str().map(str::to_owned))+ .filter(|value| !value.is_empty());+ config.password.clear();+ return (config, NoSaveRuntimeSecrets { primary, console: None });+ }if config.db_type == DatabaseType::Nacos {let passwords = take_transient_passwords(&mut config);return (config, NoSaveRuntimeSecrets { primary: passwords.primary, console: passwords.console });@@ -286,14 +300,50 @@ async fn sync_mongo_legacy_driver_fallback(state: &WebState, config: &Connectionapply_mongo_legacy_driver_profile(state, config).await}+async fn with_temporary_connection_config<T, F, Fut>(+ app: &Arc<AppState>,+ config: ConnectionConfig,+ test: F,+) -> Result<T, String>+where+ F: FnOnce(String, ConnectionConfig) -> Fut,+ Fut: std::future::Future<Output = Result<T, String>>,+{+ let temp_id = format!("{TEST_PROBE_ID_PREFIX}{}", uuid::Uuid::new_v4());+ // Only RocketMQ needs auth.password moved into the owner-scoped probe store.+ // Other connectors (notably plugin password binding) consume the draft directly.+ let (mut config, secrets) = if dbx_core::connection::connection_secrets::is_rocketmq_connection(&config) {+ prepare_runtime_config(config)+ } else {+ (config, NoSaveRuntimeSecrets::default())+ };+ config.id = temp_id.clone();+ let owner = dbx_core::session_credentials::current_credential_owner().unwrap_or_default();+ record_session_credentials(app, &owner, &temp_id, &secrets, false);+ app.configs.write().await.insert(temp_id.clone(), config.clone());+ let result = test(temp_id.clone(), config).await;+ app.configs.write().await.remove(&temp_id);+ app.session_credentials.clear_connection(&temp_id);+ result+}+async fn run_temporary_connection_test(app: &Arc<AppState>,config: ConnectionConfig,include_database_info: bool,) -> Result<ConnectionTestResult, String> {- let temp_id = format!("{TEST_PROBE_ID_PREFIX}{}", uuid::Uuid::new_v4());- app.configs.write().await.insert(temp_id.clone(), config.clone());+ with_temporary_connection_config(app, config, |temp_id, config| {+ run_prepared_temporary_connection_test(app, temp_id, config, include_database_info)+ })+ .await+}+async fn run_prepared_temporary_connection_test(+ app: &Arc<AppState>,+ temp_id: String,+ config: ConnectionConfig,+ include_database_info: bool,+) -> Result<ConnectionTestResult, String> {if config.db_type == DatabaseType::Plugin {let result = async {let endpoint = app.plugin_connection_endpoint(&temp_id, &config).await?;@@ -301,7 +351,6 @@ async fn run_temporary_connection_test(}.await;app.reset_connection_transport_for_config(&temp_id, &config).await;- app.configs.write().await.remove(&temp_id);return result;}@@ -380,7 +429,6 @@ async fn run_temporary_connection_test(#[cfg(feature = "mq-admin")]app.mq_registry.drop_connection(&temp_id).await;app.reset_connection_transport_for_config(&temp_id, &config).await;- app.configs.write().await.remove(&temp_id);result}@@ -1060,6 +1108,22 @@ mod tests {use tokio::io::{AsyncReadExt, AsyncWriteExt};use tokio::net::TcpListener;+ #[test]+ fn rocketmq_no_save_runtime_moves_sk_to_session_capture() {+ let mut config = sqlite_config("rocketmq", "");+ config.db_type = DatabaseType::MessageQueue;+ config.save_password = false;+ config.external_config = Some(serde_json::json!({+ "systemKind": "rocketmq", "adminUrl": "",+ "auth": { "kind": "basic", "username": "ak", "password": "sk" },+ "extra": { "secretKey": "stale" }+ }));+ let (runtime, secrets) = super::prepare_runtime_config(config);+ assert_eq!(secrets.primary.as_deref(), Some("sk"));+ assert_eq!(runtime.external_config.as_ref().unwrap()["auth"]["password"], "");+ assert!(runtime.external_config.as_ref().unwrap()["extra"].get("secretKey").is_none());+ }+fn sqlite_config(id: &str, path: &str) -> ConnectionConfig {ConnectionConfig {oracle_oci_nls_lang: None,@@ -1276,6 +1340,69 @@ mod tests {(state, dir)}+ #[tokio::test]+ async fn temporary_plugin_probe_preserves_no_save_password_for_password_binding() {+ let (state, _dir) = test_web_state().await;+ let mut config = plugin_config("plugin-probe-password");+ config.save_password = false;+ config.password = "plugin-password".into();+ super::with_temporary_connection_config(&state.app, config, |_id, runtime| async move {+ // plugin_host.test_connection receives this config directly and binds+ // ConnectionConfig.password into the provider's declared password field.+ assert_eq!(runtime.password, "plugin-password");+ Ok(())+ })+ .await+ .unwrap();+ }++ #[cfg(feature = "mq-admin")]+ #[tokio::test]+ async fn temporary_rocketmq_test_scopes_credentials_to_probe_and_cleans_success_and_failure() {+ let (state, _dir) = test_web_state().await;+ for fail in [false, true] {+ let mut config = sqlite_config("saved-rocketmq", "");+ config.db_type = DatabaseType::MessageQueue;+ config.save_password = false;+ config.external_config = Some(serde_json::json!({+ "systemKind": "rocketmq", "adminUrl": "",+ "auth": { "kind": "basic", "username": "ak", "password": "probe-sk" },+ "extra": { "connectionMode": "proxy", "proxyEndpoint": "proxy:8081" }+ }));+ state.app.session_credentials.set("owner-a", "saved-rocketmq", "saved-sk");+ let probe_id = Arc::new(std::sync::Mutex::new(String::new()));+ let captured = probe_id.clone();+ let app = &state.app;+ let result = dbx_core::session_credentials::with_credential_owner(+ Some("owner-a".into()),+ super::with_temporary_connection_config(app, config, |id, runtime| async move {+ *captured.lock().unwrap() = id.clone();+ assert_ne!(id, "saved-rocketmq");+ assert_eq!(runtime.id, id);+ assert_eq!(runtime.external_config.as_ref().unwrap()["auth"]["password"], "");+ assert_eq!(app.session_credentials.get("owner-a", &id).as_deref(), Some("probe-sk"));+ assert!(!app.session_credentials.has("owner-b", &id));+ let mqc = app.mq_admin_config_for_connection(&id, &runtime).await.unwrap();+ match mqc.auth {+ dbx_core::mq::auth::MqAuth::Basic { password, .. } => assert_eq!(password, "probe-sk"),+ _ => panic!("expected Basic auth"),+ }+ if fail {+ Err("probe failed".to_string())+ } else {+ Ok(())+ }+ }),+ )+ .await;+ assert_eq!(result.is_err(), fail);+ let id = probe_id.lock().unwrap().clone();+ assert!(!state.app.session_credentials.has("owner-a", &id));+ assert!(!state.app.configs.read().await.contains_key(&id));+ assert_eq!(state.app.session_credentials.get("owner-a", "saved-rocketmq").as_deref(), Some("saved-sk"));+ }+ }+#[tokio::test]async fn connection_test_info_preserves_legacy_string_and_cleans_up_temporary_state() {let (state, dir) = test_web_state().await;diff --git a/docs/mq-quick-start.md b/docs/mq-quick-start.mdindex adf77f48af..9bce0a5df5 100644--- a/docs/mq-quick-start.md+++ b/docs/mq-quick-start.md@@ -149,6 +149,39 @@}```+## RocketMQ 5.x Proxy 接入++在 RocketMQ 连接中选择接入模式:++- **NameServer / Remoting**:保留原有行为,连接 NameServer 并访问 Broker。旧连接未指定模式时继续使用此模式。+- **Proxy / gRPC**:填写官方 RocketMQ 5.x Proxy 的 gRPC `host:port`,例如 `proxy.example.com:8081`。这不是 NameServer 端口,也不是 SOCKS5 代理地址。++Proxy 默认启用 TLS 并验证服务端证书及主机名。连接本地明文 Proxy 时应明确关闭 TLS。SSH/SOCKS 网络转发应配置在连接的传输设置中,逻辑 Proxy 地址仍用于 TLS 主机名校验。++AK/SK 使用连接认证中的 Basic 用户名/密码字段;不需要认证时选择无认证。凭据遵循连接的“保存密码”设置,不应在 `extra` 中重复填写 `secretKey`。++配置示例(示例不包含真实凭据):++```json+{+ "systemKind": "rocketmq",+ "adminUrl": "",+ "auth": { "kind": "none" },+ "extra": {+ "connectionMode": "proxy",+ "proxyEndpoint": "proxy.example.com:8081",+ "proxyTls": true,+ "managementEnabled": false+ }+}+```++仅配置 Proxy 时,控制台允许手动输入已存在的 Topic,发送普通消息及 Key、Tag、用户属性。普通消息由 Proxy 选择实际队列,回执不提供可确认的队列 ID,因此 DBX 不展示猜测的分区或分区内 Offset。连接测试检查消息通道,不发送或消费消息;测试成功不代表拥有每个 Topic 的发送权限。全局 Topic 列表、Broker、消费组、ACL、消息查询、Trace、按 Offset 预览不作为纯 Proxy 的功能提供。首期也不提供事务、定时、FIFO 消息或指定分区发送。++需要管理集群时,可开启可选管理通道,再填写 NameServer 地址和集群名。消息仍通过 Proxy 发送,管理操作复用 Remoting;因此客户端还需要访问 NameServer 和 Broker。控制台分别展示消息与管理通道状态,管理通道失败时保留可用的消息发送功能。++Proxy 模式需要支持 `rocketmq_proxy_grpc` 的 RocketMQ Agent。遇到升级提示时,在驱动管理中更新 RocketMQ 驱动;旧 Agent 仍可用于原有 Remoting 连接。+## 使用示例### 租户管理diff --git a/src-tauri/src/commands/connection.rs b/src-tauri/src/commands/connection.rsindex 6c828d7deb..65efbc79c0 100644--- a/src-tauri/src/commands/connection.rs+++ b/src-tauri/src/commands/connection.rs@@ -231,9 +231,113 @@ mod tests {use dbx_core::models::connection::{AttachedDatabaseConfig, ConnectionConfig, DatabaseType, ProxyTunnelConfig, ProxyType, TransportLayerConfig,};+ use std::sync::Arc;use std::time::Duration;use tauri::Manager;+ fn rocketmq_config(password: &str) -> ConnectionConfig {+ let mut config = mongodb_config();+ config.id = "rocketmq-desktop".into();+ config.db_type = DatabaseType::MessageQueue;+ config.driver_profile = None;+ config.driver_label = None;+ config.connection_string = None;+ config.url_params = None;+ config.password.clear();+ config.save_password = false;+ config.external_config = Some(serde_json::json!({+ "systemKind": "rocketmq", "adminUrl": "",+ "auth": { "kind": "basic", "username": "ak", "password": password },+ "extra": { "connectionMode": "proxy", "proxyEndpoint": "proxy.invalid:8081", "secretKey": "stale" }+ }));+ config+ }++ #[tokio::test]+ async fn rocketmq_save_captures_no_save_auth_before_storage_and_rehydrates_desktop_owner() {+ let dir = tempfile::tempdir().unwrap();+ let storage = dbx_core::persistence::test_storage::open(&dir.path().join("storage.db")).await.unwrap();+ let state = AppState::new_with_plugin_dir(storage, dir.path().join("plugins"));+ let config = rocketmq_config("session-sk");+ save_connection_configs(&state, std::slice::from_ref(&config), Vec::new()).await.unwrap();+ let saved = state.storage.load_connections().await.unwrap();+ assert_eq!(state.session_credentials.get("", &config.id).as_deref(), Some("session-sk"));+ let external = saved[0].external_config.as_ref().unwrap();+ assert_eq!(external["auth"]["password"], "");+ assert!(external["extra"].get("secretKey").is_none());+ assert_eq!(state.configs.read().await[&config.id].external_config.as_ref().unwrap()["auth"]["password"], "");+ #[cfg(feature = "mq-admin")]+ {+ let runtime = state.mq_admin_config_for_connection(&config.id, &saved[0]).await.unwrap();+ assert!(+ matches!(runtime.auth, dbx_core::mq::auth::MqAuth::Basic { password, .. } if password == "session-sk")+ );+ }+ save_connection_configs(&state, &saved, Vec::new()).await.unwrap();+ assert_eq!(state.session_credentials.get("", &config.id).as_deref(), Some("session-sk"));+ let mut updated = saved[0].clone();+ updated.external_config.as_mut().unwrap()["auth"]["username"] = serde_json::json!("other-ak");+ save_connection_configs(&state, &[updated.clone()], Vec::new()).await.unwrap();+ assert!(!state.session_credentials.has("", &config.id));+ // Capture must survive identity-change invalidation during runtime sync.+ updated.external_config.as_mut().unwrap()["auth"]["username"] = serde_json::json!("new-ak");+ updated.external_config.as_mut().unwrap()["auth"]["password"] = serde_json::json!("new-sk");+ save_connection_configs(&state, &[updated], Vec::new()).await.unwrap();+ assert_eq!(state.session_credentials.get("", &config.id).as_deref(), Some("new-sk"));+ let state = Arc::new(state);+ let app = tauri::test::mock_builder()+ .manage(state.clone())+ .build(tauri::test::mock_context(tauri::test::noop_assets()))+ .unwrap();+ super::disconnect_db(app.state::<Arc<AppState>>(), config.id.clone(), None).await.unwrap();+ assert!(super::session_credential_status(app.state::<Arc<AppState>>(), config.id.clone()).await.unwrap());+ super::forget_session_credential(app.state::<Arc<AppState>>(), config.id.clone()).await.unwrap();+ assert!(!state.session_credentials.has("", &config.id));+ }++ #[tokio::test]+ async fn rocketmq_save_normalizes_legacy_auth_and_failed_save_keeps_existing_session() {+ let dir = tempfile::tempdir().unwrap();+ let storage = dbx_core::persistence::test_storage::open(&dir.path().join("storage.db")).await.unwrap();+ let state = AppState::new_with_plugin_dir(storage, dir.path().join("plugins"));+ let mut config = rocketmq_config("");+ let external = config.external_config.as_mut().unwrap();+ external.as_object_mut().unwrap().remove("auth");+ external["extra"]["access_key"] = serde_json::json!("legacy-ak");+ external["extra"]["secret_key"] = serde_json::json!("legacy-sk");+ external["extra"].as_object_mut().unwrap().remove("secretKey");+ save_connection_configs(&state, &[config.clone()], Vec::new()).await.unwrap();+ assert_eq!(state.session_credentials.get("", &config.id).as_deref(), Some("legacy-sk"));+ let saved = state.storage.load_connections().await.unwrap();+ assert_eq!(saved[0].external_config.as_ref().unwrap()["auth"]["username"], "legacy-ak");+ let mut invalid = sqlite_config(std::path::Path::new(":memory:"), "");+ invalid.attached_databases.push(AttachedDatabaseConfig { name: "invalid".into(), path: "invalid.db".into() });+ assert!(save_connection_configs(&state, &[rocketmq_config("replacement"), invalid], Vec::new()).await.is_err());+ assert_eq!(state.session_credentials.get("", &config.id).as_deref(), Some("legacy-sk"));+ }++ #[tokio::test]+ async fn rocketmq_failed_connect_rolls_back_only_new_session_credentials() {+ let dir = tempfile::tempdir().unwrap();+ let storage = dbx_core::persistence::test_storage::open(&dir.path().join("storage.db")).await.unwrap();+ let state = Arc::new(AppState::new_with_plugin_dir(storage, dir.path().join("plugins")));+ let app = tauri::test::mock_builder()+ .manage(state.clone())+ .build(tauri::test::mock_context(tauri::test::noop_assets()))+ .unwrap();+ let mut config = rocketmq_config("bad-sk");+ config.external_config.as_mut().unwrap()["extra"]["connectionMode"] = serde_json::json!("invalid");+ assert!(connect_db(app.state::<Arc<AppState>>(), config.clone(), None).await.is_err());+ assert!(!state.session_credentials.has("", &config.id));+ state.session_credentials.set("", &config.id, "existing-sk");+ config.external_config.as_mut().unwrap()["auth"]["password"] = serde_json::json!("");+ assert!(connect_db(app.state::<Arc<AppState>>(), config.clone(), None).await.is_err());+ assert_eq!(state.session_credentials.get("", &config.id).as_deref(), Some("existing-sk"));+ assert!(test_connection_with_info_inner(&state, config.clone()).await.is_err());+ assert_eq!(state.session_credentials.get("", &config.id).as_deref(), Some("existing-sk"));+ assert_eq!(state.configs.read().await.len(), 0);+ }+fn mongodb_config() -> ConnectionConfig {ConnectionConfig {oracle_oci_nls_lang: None,@@ -1064,15 +1168,24 @@ async fn save_connection_configs()?;}}+ // Capture before storage strips no-save auth. Commit to the session only after+ // persistence and config synchronization succeed (which may clear stale identities).+ let prepared: Vec<_> = configs.iter().cloned().map(prepare_rocketmq_runtime_config).collect();+ let configs: Vec<_> = prepared.iter().map(|(config, _)| config.clone()).collect();if !removed_ids.is_empty() {state.storage.delete_connections(&removed_ids).await?;}- state.storage.save_connections(configs).await?;+ state.storage.save_connections(&configs).await?;// Saving upserts, so the request only covers this window's connections. Sync// against the whole persisted list to keep connections saved by another// window/process alive in the runtime cache as well.let persisted = state.storage.load_connections().await?;let sync = sync_connection_configs(state, &persisted).await;+ for (config, password) in &prepared {+ if let Some(password) = password {+ state.session_credentials.set("", &config.id, password);+ }+ }remove_connection_pools_for_connection_ids(state, &sync.connection_pool_ids_to_drop).await;drop_nacos_adapters_for_connection_ids(state, &sync.nacos_adapter_ids_to_drop).await;drop_mq_adapters_for_connection_ids(state, &sync.mq_adapter_ids_to_drop).await;@@ -1317,6 +1430,31 @@ pub async fn test_ssh_tunnel(state: State<'_, Arc<AppState>>, config: Connectionasync fn test_connection_with_info_inner(state: &Arc<AppState>,config: ConnectionConfig,+) -> Result<ConnectionTestResult, String> {+ let (mut config, password) = prepare_rocketmq_runtime_config(config);+ if !dbx_core::connection::connection_secrets::is_rocketmq_connection(&config) {+ return test_connection_with_info_impl(state, config).await;+ }+ // Test Connection must never replace credentials or transports of a live connection.+ let password =+ password.or_else(|| (!config.save_password).then(|| state.session_credentials.get("", &config.id)).flatten());+ config.id = format!("{}{}", dbx_core::runtime_config::TEST_PROBE_ID_PREFIX, uuid::Uuid::new_v4());+ let transport_id = format!("{}:test", config.id);+ let credential_id = if config.has_effective_transport_layers() { &transport_id } else { &config.id };+ let token = password.as_deref().and_then(|password| state.session_credentials.set("", credential_id, password));+ let result = test_connection_with_info_impl(state, config.clone()).await;+ if let Some(token) = token {+ state.session_credentials.remove_if_current(&token);+ }+ // The implementation has early error returns during adapter construction.+ state.reset_connection_transport_for_config(&transport_id, &config).await;+ state.reset_connection_transport_for_config(&config.id, &config).await;+ result+}++async fn test_connection_with_info_impl(+ state: &Arc<AppState>,+ config: ConnectionConfig,) -> Result<ConnectionTestResult, String> {let config = if config.uses_mongodb_oidc() { config.canonicalized() } else { config };let tunnel_id = format!("{}:test", config.id);@@ -1883,9 +2021,37 @@ async fn test_connection_with_info_inner(result.map(|message| ConnectionTestResult::success(message).with_database_info(database_info))}-/// 连接成功且 `save_password=false` 时,把本次输入的密码记入内存会话凭据仓库,-/// 供本次运行内 AI / 元数据 / 池重建复用(进程退出即丢,绝不落盘)。+/// Normalize legacy RocketMQ ACL copies and capture no-save SK before either+/// persistence or runtime caching. Only canonical auth owns the credential.+fn prepare_rocketmq_runtime_config(mut config: ConnectionConfig) -> (ConnectionConfig, Option<String>) {+ use dbx_core::connection::connection_secrets::{is_rocketmq_connection, normalize_rocketmq_credentials};+ normalize_rocketmq_credentials(&mut config);+ if config.save_password || !is_rocketmq_connection(&config) {+ return (config, None);+ }+ let password = config+ .external_config+ .as_mut()+ .and_then(|external| external.get_mut("auth"))+ .filter(|auth| auth.get("kind").and_then(serde_json::Value::as_str) == Some("basic"))+ .and_then(serde_json::Value::as_object_mut)+ .and_then(|auth| auth.insert("password".into(), serde_json::json!("")))+ .and_then(|password| password.as_str().map(str::to_owned))+ .filter(|password| !password.is_empty());+ config.password.clear();+ (config, password)+}++/// Other desktop drivers retain their existing success-only capture timing.+/// RocketMQ is captured before core adapter creation, which reads only the session.fn record_session_credential(state: &AppState, config: &ConnectionConfig, connection_id: &str) {+ if dbx_core::connection::connection_secrets::is_rocketmq_connection(config) {+ let (_, password) = prepare_rocketmq_runtime_config(config.clone());+ if let Some(password) = password {+ state.session_credentials.set("", connection_id, &password);+ }+ return;+ }if !config.save_password && !config.password.is_empty() {let _ = state.session_credentials.set("", connection_id, &config.password);}@@ -1896,6 +2062,24 @@ pub async fn connect_db(state: State<'_, Arc<AppState>>,config: ConnectionConfig,client_attempt: Option<u64>,+) -> Result<String, String> {+ let (config, password) = prepare_rocketmq_runtime_config(config);+ let app = state.inner().clone();+ let token = password.as_deref().and_then(|password| app.session_credentials.set("", &config.id, password));+ let result = connect_db_inner(state, config, client_attempt).await;+ if result.is_err() {+ if let Some(token) = token {+ // A stale failed attempt must not remove a newer attempt's credential.+ app.session_credentials.remove_if_current(&token);+ }+ }+ result+}++async fn connect_db_inner(+ state: State<'_, Arc<AppState>>,+ config: ConnectionConfig,+ client_attempt: Option<u64>,) -> Result<String, String> {let config = config.canonicalized();if config.db_type == DatabaseType::Sqlite && !db::sqlite_worker::sqlite_remote_worker_requested(&config) {@@ -2378,7 +2562,7 @@ pub async fn connection_final_proxy_port(let db_config = metadata_connection_config(&runtime_config);// This pre-connect path caches the configuration for tunnel resolution. Keep// no-save passwords out of that shared runtime cache just like connect_db.- let mut stored_config = runtime_config.clone();+ let (mut stored_config, _) = prepare_rocketmq_runtime_config(runtime_config.clone());if !stored_config.save_password {stored_config.password.clear();}