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(rabbitmq): support AMQP message properties on send and browse
lcq928b32d435b1e01
diff --git a/agents/drivers/rabbitmq/message_properties.go b/agents/drivers/rabbitmq/message_properties.gonew file mode 100644index 0000000000..eb81f70192--- /dev/null+++ b/agents/drivers/rabbitmq/message_properties.go@@ -0,0 +1,96 @@+package main++import (+ "fmt"+ "math"+ "strconv"+ "time"++ amqp "github.com/rabbitmq/amqp091-go"+)++func applyMessageProperties(publishing *amqp.Publishing, params jsonObject) error {+ if params["properties"] == nil {+ return nil+ }+ properties := objectOrNil(params, "properties")+ if properties == nil {+ return fmt.Errorf("properties must be an object of strings")+ }+ for key, raw := range properties {+ value, ok := raw.(string)+ if !ok {+ return fmt.Errorf("properties.%s must be a string", key)+ }+ if len(value) > 255 {+ return fmt.Errorf("properties.%s must not exceed 255 bytes", key)+ }+ switch key {+ case "content_type":+ publishing.ContentType = value+ case "content_encoding":+ publishing.ContentEncoding = value+ case "correlation_id":+ publishing.CorrelationId = value+ case "reply_to":+ publishing.ReplyTo = value+ case "message_id":+ publishing.MessageId = value+ case "type":+ publishing.Type = value+ case "user_id":+ publishing.UserId = value+ case "app_id":+ publishing.AppId = value+ case "delivery_mode", "priority", "expiration", "timestamp":+ number, err := strconv.ParseUint(value, 10, 63)+ if err != nil {+ return fmt.Errorf("properties.%s must be a non-negative integer", key)+ }+ switch key {+ case "delivery_mode":+ if number != 1 && number != 2 {+ return fmt.Errorf("properties.delivery_mode must be 1 or 2")+ }+ publishing.DeliveryMode = uint8(number)+ case "priority":+ if number > 255 {+ return fmt.Errorf("properties.priority must be between 0 and 255")+ }+ publishing.Priority = uint8(number)+ case "expiration":+ publishing.Expiration = strconv.FormatUint(number, 10)+ case "timestamp":+ // Peek metadata uses milliseconds, so reject seconds that would overflow it.+ if number > math.MaxInt64/1000 {+ return fmt.Errorf("properties.timestamp exceeds the supported Unix timestamp range")+ }+ publishing.Timestamp = time.Unix(int64(number), 0)+ }+ default:+ return fmt.Errorf("unsupported AMQP property: %s", key)+ }+ }+ return nil+}++func deliveryProperties(delivery amqp.Delivery) map[string]string {+ properties := map[string]string{"priority": strconv.Itoa(int(delivery.Priority))}+ for key, value := range map[string]string{+ "content_type": delivery.ContentType, "content_encoding": delivery.ContentEncoding,+ "correlation_id": delivery.CorrelationId, "reply_to": delivery.ReplyTo,+ "expiration": delivery.Expiration, "message_id": delivery.MessageId,+ "type": delivery.Type, "user_id": delivery.UserId, "app_id": delivery.AppId,+ } {+ if value != "" {+ properties[key] = value+ }+ }+ if delivery.DeliveryMode != 0 {+ properties["delivery_mode"] = strconv.Itoa(int(delivery.DeliveryMode))+ }+ if !delivery.Timestamp.IsZero() {+ properties["timestamp"] = strconv.FormatInt(delivery.Timestamp.Unix(), 10)+ }+ return properties+}diff --git a/agents/drivers/rabbitmq/message_properties_integration_test.go b/agents/drivers/rabbitmq/message_properties_integration_test.gonew file mode 100644index 0000000000..d6bec5ecb0--- /dev/null+++ b/agents/drivers/rabbitmq/message_properties_integration_test.go@@ -0,0 +1,119 @@+package main++import (+ "encoding/base64"+ "fmt"+ "os"+ "reflect"+ "testing"+ "time"++ amqp "github.com/rabbitmq/amqp091-go"+)++func TestRabbitMQMessagePropertiesIntegration(t *testing.T) {+ if os.Getenv("RABBITMQ_INTEGRATION") != "1" {+ t.Skip("set RABBITMQ_INTEGRATION=1 to run against a real RabbitMQ broker")+ }+ username := envOrDefault("RABBITMQ_USERNAME", "dbx")+ config := jsonObject{+ "addresses": envOrDefault("RABBITMQ_HOST", "127.0.0.1"),+ "port": envIntOrDefault(t, "RABBITMQ_PORT", 5672),+ "username": username, "password": envOrDefault("RABBITMQ_PASSWORD", "dbx-password"),+ }+ service := newServer()+ if _, err := service.connect(config); err != nil {+ t.Fatal(err)+ }+ defer service.closeClients()+ queue := fmt.Sprintf("dbx-properties-%d", time.Now().UnixNano())+ if _, err := service.createTopic(jsonObject{"topic": queue, "durable": true}); err != nil {+ t.Fatal(err)+ }+ defer service.deleteTopic(jsonObject{"topic": queue})+ reader, err := openConnection(config)+ if err != nil {+ t.Fatal(err)+ }+ defer reader.Close()+ channel, err := reader.Channel()+ if err != nil {+ t.Fatal(err)+ }+ defer channel.Close()+ get := func(autoAck bool) amqp.Delivery {+ deadline := time.Now().Add(5 * time.Second)+ for {+ delivery, ok, err := channel.Get(queue, autoAck)+ if err != nil {+ t.Fatal(err)+ }+ if ok {+ return delivery+ }+ if time.Now().After(deadline) {+ t.Fatal("published message did not arrive")+ }+ time.Sleep(10 * time.Millisecond)+ }+ }+ properties := jsonObject{+ "content_type": "application/json", "content_encoding": "utf-8", "delivery_mode": "2", "priority": "5",+ "correlation_id": "correlation", "reply_to": "reply", "expiration": "60000", "message_id": "message",+ "timestamp": "1735689600", "type": "order.created", "user_id": username, "app_id": "integration",+ }+ payload := `{"orderId":13512}`+ params := jsonObject{+ "topic": queue, "payloadBase64": base64.StdEncoding.EncodeToString([]byte(payload)),+ "headers": jsonObject{"content_type": "custom-header"}, "properties": properties,+ }+ if _, err := service.sendMessage(params); err != nil {+ t.Fatal(err)+ }+ delivery := get(false)+ want := make(map[string]string, len(properties))+ for key, value := range properties {+ want[key] = value.(string)+ }+ if string(delivery.Body) != payload || delivery.Headers["content_type"] != "custom-header" || !reflect.DeepEqual(deliveryProperties(delivery), want) {+ t.Fatalf("broker did not receive body, custom headers and standard properties separately: %#v", delivery)+ }+ if err := delivery.Nack(false, true); err != nil {+ t.Fatal(err)+ }+ deadline := time.Now().Add(5 * time.Second)+ for {+ result, err := service.peekMessages(jsonObject{"topic": queue, "count": 1})+ if err != nil {+ t.Fatal(err)+ }+ messages := result.(jsonObject)["messages"].([]jsonObject)+ if len(messages) == 1 {+ if !reflect.DeepEqual(messages[0]["properties"], want) {+ t.Fatalf("peek did not return properties: %#v", messages[0])+ }+ break+ }+ if time.Now().After(deadline) {+ t.Fatal("requeued message was not visible to peek")+ }+ time.Sleep(10 * time.Millisecond)+ }+ get(true)+ params["properties"] = jsonObject{"priority": "0", "timestamp": "0"}+ if _, err := service.sendMessage(params); err != nil {+ t.Fatal(err)+ }+ zero := deliveryProperties(get(true))+ if zero["priority"] != "0" || zero["timestamp"] != "0" {+ t.Fatalf("zero values did not roundtrip: %#v", zero)+ }+ params["properties"] = jsonObject{"expiration": "50"}+ if _, err := service.sendMessage(params); err != nil {+ t.Fatal(err)+ }+ time.Sleep(250 * time.Millisecond)+ if _, ok, err := channel.Get(queue, true); err != nil || ok {+ t.Fatalf("50ms message TTL was not applied: exists=%v, error=%v", ok, err)+ }+}diff --git a/agents/drivers/rabbitmq/message_properties_test.go b/agents/drivers/rabbitmq/message_properties_test.gonew file mode 100644index 0000000000..ec28109440--- /dev/null+++ b/agents/drivers/rabbitmq/message_properties_test.go@@ -0,0 +1,113 @@+package main++import (+ "reflect"+ "strings"+ "testing"+ "time"++ amqp "github.com/rabbitmq/amqp091-go"+)++func TestApplyMessageProperties(t *testing.T) {+ properties := mustObject(t, `{"properties": {+ "content_type":"application/json", "content_encoding":"utf-8", "delivery_mode":"2", "priority":"255",+ "correlation_id":"correlation", "reply_to":"reply", "expiration":"60000", "message_id":"message",+ "timestamp":"1735689600", "type":"order.created", "user_id":"user", "app_id":"app"+ }}`)+ publishing := amqp.Publishing{Body: []byte("payload"), Headers: amqp.Table{"content_type": "custom-header"}}+ if err := applyMessageProperties(&publishing, properties); err != nil {+ t.Fatal(err)+ }+ want := amqp.Publishing{+ Body: []byte("payload"), Headers: amqp.Table{"content_type": "custom-header"},+ ContentType: "application/json", ContentEncoding: "utf-8", DeliveryMode: 2, Priority: 255,+ CorrelationId: "correlation", ReplyTo: "reply", Expiration: "60000", MessageId: "message",+ Timestamp: time.Unix(1735689600, 0), Type: "order.created", UserId: "user", AppId: "app",+ }+ if !reflect.DeepEqual(publishing, want) {+ t.Fatalf("got %#v, want %#v", publishing, want)+ }+}++func TestApplyMessagePropertiesDefaultsAndZero(t *testing.T) {+ for _, source := range []string{`{}`, `{"properties":null}`, `{"properties":{}}`} {+ publishing := amqp.Publishing{Body: []byte("payload")}+ if err := applyMessageProperties(&publishing, mustObject(t, source)); err != nil {+ t.Fatal(err)+ }+ if !reflect.DeepEqual(publishing, amqp.Publishing{Body: []byte("payload")}) {+ t.Fatalf("legacy defaults changed: %#v", publishing)+ }+ }+ publishing := amqp.Publishing{}+ if err := applyMessageProperties(&publishing, mustObject(t,+ `{"properties":{"delivery_mode":"1","priority":"0","expiration":"0","timestamp":"0"}}`)); err != nil {+ t.Fatal(err)+ }+ if publishing.DeliveryMode != 1 || publishing.Priority != 0 || publishing.Expiration != "0" || !publishing.Timestamp.Equal(time.Unix(0, 0)) {+ t.Fatalf("explicit zero values were lost: %#v", publishing)+ }+ preview := deliveryProperties(amqp.Delivery{Timestamp: publishing.Timestamp})+ if preview["priority"] != "0" || preview["timestamp"] != "0" {+ t.Fatalf("zero properties were lost from preview: %#v", preview)+ }+ if got := deliveryProperties(amqp.Delivery{}); !reflect.DeepEqual(got, map[string]string{"priority": "0"}) {+ t.Fatalf("unexpected absent properties: %#v", got)+ }+}++func TestApplyMessagePropertiesValidation(t *testing.T) {+ for _, test := range []struct {+ name, source, errorField string+ }{+ {"invalid object", `{"properties":[]}`, "properties"},+ {"non-string", `{"properties":{"priority":2}}`, "priority"},+ {"unsupported", `{"properties":{"contentType":"application/json"}}`, "contentType"},+ {"delivery zero", `{"properties":{"delivery_mode":"0"}}`, "delivery_mode"},+ {"delivery three", `{"properties":{"delivery_mode":"3"}}`, "delivery_mode"},+ {"priority overflow", `{"properties":{"priority":"256"}}`, "priority"},+ {"priority negative", `{"properties":{"priority":"-1"}}`, "priority"},+ {"priority decimal", `{"properties":{"priority":"1.5"}}`, "priority"},+ {"expiration empty", `{"properties":{"expiration":""}}`, "expiration"},+ {"expiration negative", `{"properties":{"expiration":"-1"}}`, "expiration"},+ {"expiration overflow", `{"properties":{"expiration":"9223372036854775808"}}`, "expiration"},+ {"timestamp negative", `{"properties":{"timestamp":"-1"}}`, "timestamp"},+ {"timestamp decimal", `{"properties":{"timestamp":"1.5"}}`, "timestamp"},+ {"timestamp milliseconds overflow", `{"properties":{"timestamp":"9223372036854776"}}`, "timestamp"},+ {"timestamp seconds overflow", `{"properties":{"timestamp":"9223372036854775808"}}`, "timestamp"},+ } {+ t.Run(test.name, func(t *testing.T) {+ err := applyMessageProperties(&amqp.Publishing{}, mustObject(t, test.source))+ if err == nil || !strings.Contains(err.Error(), test.errorField) {+ t.Fatalf("got %v, want an error for %s", err, test.errorField)+ }+ })+ }+ if err := applyMessageProperties(&amqp.Publishing{}, jsonObject{"properties": jsonObject{"content_type": strings.Repeat("界", 86)}}); err == nil || !strings.Contains(err.Error(), "content_type") {+ t.Fatalf("expected shortstr byte limit error, got %v", err)+ }+}++func TestPeekedMessageIncludesBasicProperties(t *testing.T) {+ message := peekedMessageFromDelivery("queue", 0, amqp.Delivery{+ Body: []byte(`{"orderId":13512}`), Headers: amqp.Table{"content_type": "custom-header"},+ ContentType: "application/json", ContentEncoding: "utf-8", DeliveryMode: 2, Priority: 5,+ CorrelationId: "correlation", ReplyTo: "reply", Expiration: "60000", MessageId: "message",+ Timestamp: time.Unix(1735689600, 0), Type: "order.created", UserId: "user", AppId: "app",+ })+ want := map[string]string{+ "content_type": "application/json", "content_encoding": "utf-8", "delivery_mode": "2", "priority": "5",+ "correlation_id": "correlation", "reply_to": "reply", "expiration": "60000", "message_id": "message",+ "timestamp": "1735689600", "type": "order.created", "user_id": "user", "app_id": "app",+ }+ if !reflect.DeepEqual(message["properties"], want) {+ t.Fatalf("got properties %#v, want %#v", message["properties"], want)+ }+ if message["headers"].(map[string]string)["content_type"] != "custom-header" {+ t.Fatalf("custom headers were changed: %#v", message["headers"])+ }+ if message["messageId"] != "message" || message["timestamp"] != int64(1735689600000) {+ t.Fatalf("existing message metadata was changed: %#v", message)+ }+}diff --git a/agents/drivers/rabbitmq/operations.go b/agents/drivers/rabbitmq/operations.goindex 54d6b35d91..ffdca30bc3 100644--- a/agents/drivers/rabbitmq/operations.go+++ b/agents/drivers/rabbitmq/operations.go@@ -1267,6 +1267,7 @@ func peekedMessageFromDelivery(queue string, index int64, delivery amqp.Delivery"deliveryTag": delivery.DeliveryTag,"timestamp": int64(0),"headers": stringHeaders(delivery.Headers),+ "properties": deliveryProperties(delivery),"payloadBase64": base64.StdEncoding.EncodeToString(delivery.Body),}if delivery.MessageId != "" {@@ -1322,6 +1323,9 @@ func (s *server) sendMessage(params jsonObject) (any, error) {}}}+ if err := applyMessageProperties(&publishing, params); err != nil {+ return nil, err+ }if err := channel.PublishWithContext(context.Background(), exchange, routingKey, false, false, publishing); err != nil {return nil, err}diff --git a/apps/desktop/src/components/mq/MessageBrowser.vue b/apps/desktop/src/components/mq/MessageBrowser.vueindex 736662aa99..876664d56f 100644--- a/apps/desktop/src/components/mq/MessageBrowser.vue+++ b/apps/desktop/src/components/mq/MessageBrowser.vue@@ -156,6 +156,10 @@ async function copyMessageHeaders(message: PeekedMessage) {await copyMessageText(JSON.stringify(message.headers, null, 2));}+async function copyMessageProperties(message: PeekedMessage) {+ await copyMessageText(JSON.stringify(message.properties, null, 2));+}+async function copyMessageText(text: string) {try {await copyToClipboard(text);@@ -323,6 +327,18 @@ watch(kafkaStartPosition, () => {<span v-for="(value, key) in message.headers" :key="key">{{ key }}: {{ value }}</span></div></div>+ <div v-if="mqSystemKind === 'rabbitmq' && Object.keys(message.properties || {}).length" class="message-headers" data-testid="message-properties">+ <div class="message-headers-heading">+ <span>{{ t("mqMessages.messageProperties") }}</span>+ <Button type="button" variant="outline" size="sm" class="message-copy-action h-7 gap-1.5 px-2 text-xs" :aria-label="`${t('grid.copy')} ${t('mqMessages.messageProperties')}`" data-testid="copy-message-properties" @click="copyMessageProperties(message)">+ <Copy :size="14" aria-hidden="true" />+ {{ t("grid.copy") }}+ </Button>+ </div>+ <div class="message-headers-values">+ <span v-for="(value, key) in message.properties" :key="key">{{ key }}: {{ value }}</span>+ </div>+ </div></article></div></section>diff --git a/apps/desktop/src/components/mq/SendMessagePanel.vue b/apps/desktop/src/components/mq/SendMessagePanel.vueindex d19795408e..ae36feb4ad 100644--- a/apps/desktop/src/components/mq/SendMessagePanel.vue+++ b/apps/desktop/src/components/mq/SendMessagePanel.vue@@ -35,6 +35,9 @@ const exchangeName = ref("");const routingKey = ref("");const messageValue = ref("");const headersText = ref("");+const rabbitMqProperties = ref<Record<string, string>>({});+const rabbitMqPropertyNames = ["content_type", "content_encoding", "delivery_mode", "priority", "correlation_id", "reply_to", "expiration", "message_id", "timestamp", "type", "user_id", "app_id"];+const numericRabbitMqProperties = new Set(["priority", "expiration", "timestamp"]);const loading = ref(false);const error = ref<string>();const success = ref<SendMessageResponse>();@@ -42,6 +45,14 @@ const availableTopics = ref<TopicInfo[]>([]);const topicsLoading = ref(false);const rocketMqTopicSelectRef = ref<InstanceType<typeof RocketMqTopicSelect>>();const headersExpanded = ref(false);+const propertiesExpanded = ref(false);+const populatedRabbitMqProperties = computed(() =>+ Object.fromEntries(+ Object.entries(rabbitMqProperties.value)+ .map(([key, value]) => [key, value.trim()])+ .filter(([, value]) => value !== ""),+ ),+);let successTimer: ReturnType<typeof setTimeout> | undefined;@@ -185,6 +196,9 @@ async function sendMessage() {// namespace).const exchange = exchangeName.value.trim();if (isRabbitMqCluster.value) {+ if (Object.keys(populatedRabbitMqProperties.value).length) {+ req.properties = populatedRabbitMqProperties.value;+ }if (exchange) {req.exchange = exchange;req.routingKey = routingKey.value.trim() || undefined;@@ -220,6 +234,7 @@ function clearForm() {routingKey.value = "";messageValue.value = "";headersText.value = "";+ rabbitMqProperties.value = {};error.value = undefined;success.value = undefined;}@@ -329,6 +344,52 @@ watch(</div></div>+ <div v-if="isRabbitMqCluster" class="form-group">+ <button type="button" class="collapse-toggle" :aria-expanded="propertiesExpanded" @click="propertiesExpanded = !propertiesExpanded">+ <span class="collapse-arrow" :class="{ expanded: propertiesExpanded }">▶</span>+ <span>{{ t("mqMessages.messageProperties") }}</span>+ <span v-if="Object.keys(populatedRabbitMqProperties).length && !propertiesExpanded" class="collapse-badge">·</span>+ </button>+ <div v-if="propertiesExpanded" class="collapse-body properties-grid">+ <div v-for="property in rabbitMqPropertyNames" :key="property" class="form-group">+ <div class="label-row">+ <label :for="`${connectionId}-property-${property}`">+ {{ property }}+ <span v-if="property === 'expiration'">({{ t("mqMessages.milliseconds") }})</span>+ <span v-if="property === 'timestamp'">({{ t("mqMessages.unixSeconds") }})</span>+ </label>+ <button v-if="property === 'content_type'" type="button" class="btn-sm" :disabled="readOnly" @click="rabbitMqProperties.content_type = 'application/json'">application/json</button>+ </div>+ <select+ v-if="property === 'delivery_mode'"+ :id="`${connectionId}-property-${property}`"+ :value="rabbitMqProperties[property] ?? ''"+ :data-rabbitmq-property="property"+ :disabled="readOnly"+ class="property-select"+ @change="rabbitMqProperties[property] = ($event.target as HTMLSelectElement).value"+ >+ <option value="">{{ t("mqMessages.optional") }}</option>+ <option value="1">1 — {{ t("mqMessages.nonPersistent") }}</option>+ <option value="2">2 — {{ t("mqMessages.persistent") }}</option>+ </select>+ <input+ v-else+ :id="`${connectionId}-property-${property}`"+ :value="rabbitMqProperties[property] ?? ''"+ :data-rabbitmq-property="property"+ :type="numericRabbitMqProperties.has(property) ? 'number' : 'text'"+ :min="numericRabbitMqProperties.has(property) ? 0 : undefined"+ :max="property === 'priority' ? 255 : undefined"+ :step="numericRabbitMqProperties.has(property) ? 1 : undefined"+ :disabled="readOnly"+ :placeholder="t('mqMessages.optional')"+ @input="rabbitMqProperties[property] = ($event.target as HTMLInputElement).value"+ />+ </div>+ </div>+ </div>+<!-- 发送按钮 --><div class="form-actions"><button @click="sendMessage" :disabled="loading || readOnly || !topicName || !messageValue" class="btn-primary">@@ -440,6 +501,25 @@ watch(gap: 6px;}+.properties-grid {+ display: grid;+ grid-template-columns: repeat(auto-fit, minmax(min(240px, 100%), 1fr));+ gap: 12px;+}++.properties-grid input {+ min-width: 0;+}++.property-select {+ padding: 7px 10px;+ border: 1px solid var(--color-border);+ border-radius: var(--dbx-radius-fixed-6);+ background: var(--color-background);+ color: var(--color-text);+ font-size: 13px;+}+.label-row {display: flex;justify-content: space-between;diff --git a/apps/desktop/src/components/mq/__tests__/MessageBrowser.spec.ts b/apps/desktop/src/components/mq/__tests__/MessageBrowser.spec.tsindex 597abf3212..0a83d18e3c 100644--- a/apps/desktop/src/components/mq/__tests__/MessageBrowser.spec.ts+++ b/apps/desktop/src/components/mq/__tests__/MessageBrowser.spec.ts@@ -151,6 +151,48 @@ afterEach(() => {});describe("MessageBrowser", () => {+ it("shows and copies RabbitMQ standard properties separately from headers", async () => {+ const properties = { content_type: "application/json", delivery_mode: "2", priority: "0", expiration: "60000", correlation_id: "rpc-13512" };+ backend.mqPeekMessages.mockResolvedValueOnce([+ {+ position: 1,+ messageId: "13512",+ payloadBase64: "e30=",+ payloadText: "{}",+ properties,+ headers: { "x-trace": "trace-13512" },+ },+ ]);+ const browser = await mountBrowser("rabbitmq");+ await loadMessages(browser);++ const section = browser.querySelector('[data-testid="message-properties"]');+ expect(section?.textContent).toContain("content_type: application/json");+ expect(section?.textContent).toContain("priority: 0");+ expect(section?.textContent).not.toContain("x-trace");+ const copyButton = browser.querySelector<HTMLButtonElement>('[data-testid="copy-message-properties"]');+ if (!copyButton) throw new Error("Properties copy button not found");+ copyButton.click();+ await flushUi();+ expect(clipboard.copyToClipboard).toHaveBeenCalledWith(JSON.stringify(properties, null, 2));+ expect(copyButton.getAttribute("aria-label")).toBe("grid.copy mqMessages.messageProperties");+ });++ it("does not show a RabbitMQ properties section for Kafka metadata", async () => {+ const browser = await mountBrowser("kafka");+ await loadMessages(browser);+ expect(browser.textContent).toContain("mqMessages.metaPartition");+ expect(browser.querySelector('[data-testid="message-properties"]')).toBeNull();+ });++ it("hides the RabbitMQ properties section when a message has no properties", async () => {+ backend.mqPeekMessages.mockResolvedValueOnce([{ position: 1, payloadBase64: "e30=", payloadText: "{}", properties: {}, headers: {} }]);+ const browser = await mountBrowser("rabbitmq");+ await loadMessages(browser);+ expect(browser.querySelector(".message-row")).not.toBeNull();+ expect(browser.querySelector('[data-testid="message-properties"]')).toBeNull();+ });+it("copies a message's displayed payload", async () => {const browser = await mountBrowser();diff --git a/apps/desktop/src/components/mq/__tests__/SendMessagePanel.spec.ts b/apps/desktop/src/components/mq/__tests__/SendMessagePanel.spec.tsindex 9081e208a8..908f1d6abf 100644--- a/apps/desktop/src/components/mq/__tests__/SendMessagePanel.spec.ts+++ b/apps/desktop/src/components/mq/__tests__/SendMessagePanel.spec.ts@@ -135,6 +135,76 @@ afterEach(() => {});describe("SendMessagePanel post-send browsing", () => {+ it("sends RabbitMQ standard properties separately from headers and preserves zero values", async () => {+ const panel = await mountPanel("rabbitmq");+ buttonByText(panel, "mqMessages.messageProperties").click();+ buttonByText(panel, "mqMessages.messageHeaders").click();+ await flushUi();+ buttonByText(panel, "application/json").click();+ const values = {+ content_encoding: "utf-8",+ priority: "0",+ expiration: "0",+ timestamp: "0",+ correlation_id: "rpc-13512",+ reply_to: "reply",+ message_id: "message-13512",+ type: "order.created",+ user_id: "guest",+ app_id: "dbx",+ };+ for (const [name, value] of Object.entries(values)) {+ const input = panel.querySelector<HTMLInputElement>(`[data-rabbitmq-property="${name}"]`);+ if (!input) throw new Error(`RabbitMQ property not found: ${name}`);+ await setInputValue(input, value);+ }+ const deliveryMode = panel.querySelector<HTMLSelectElement>('[data-rabbitmq-property="delivery_mode"]');+ if (!deliveryMode) throw new Error("Delivery mode not found");+ deliveryMode.value = "2";+ deliveryMode.dispatchEvent(new Event("change", { bubbles: true }));+ const headers = panel.querySelector<HTMLTextAreaElement>(".headers-textarea");+ if (!headers) throw new Error("Headers input not found");+ await setInputValue(headers, "content_type: custom-header\nx-trace: trace-13512");+ await sendMessage(panel, '{"orderId":13512}');++ expect(backend.mqSendMessage).toHaveBeenCalledWith(+ "mq-1",+ expect.objectContaining({+ properties: { content_type: "application/json", delivery_mode: "2", ...values },+ headers: { content_type: "custom-header", "x-trace": "trace-13512" },+ }),+ );+ expect(panel.querySelector<HTMLInputElement>('[data-rabbitmq-property="priority"]')?.getAttribute("max")).toBe("255");+ });++ it("omits empty RabbitMQ properties and clears them with the form", async () => {+ const panel = await mountPanel("rabbitmq");+ await sendMessage(panel, "without properties");+ expect(backend.mqSendMessage.mock.calls[0]?.[1]).not.toHaveProperty("properties");++ buttonByText(panel, "mqMessages.messageProperties").click();+ await flushUi();+ buttonByText(panel, "application/json").click();+ const correlation = panel.querySelector<HTMLInputElement>('[data-rabbitmq-property="correlation_id"]');+ if (!correlation) throw new Error("Correlation input not found");+ await setInputValue(correlation, " ");+ await sendMessage(panel, "JSON properties");+ expect(backend.mqSendMessage.mock.calls[1]?.[1].properties).toEqual({ content_type: "application/json" });++ buttonByText(panel, "mqMessages.clear").click();+ await flushUi();+ expect(panel.querySelector<HTMLInputElement>('[data-rabbitmq-property="content_type"]')?.value).toBe("");+ expect(correlation.value).toBe("");+ });++ it("does not offer or send RabbitMQ properties for Kafka", async () => {+ const panel = await mountPanel("kafka");+ expect(panel.textContent).not.toContain("mqMessages.messageProperties");+ expect(panel.querySelector("[data-rabbitmq-property]")).toBeNull();+ await sendMessage(panel, "Kafka payload");+ expect(backend.mqSendMessage.mock.calls[0]?.[1]).not.toHaveProperty("properties");+ });+for (const system of ["kafka", "rabbitmq"] as const) {it(`keeps ${system} results unchanged after sending`, async () => {const panel = await mountPanel(system);diff --git a/apps/desktop/src/i18n/locales/az.ts b/apps/desktop/src/i18n/locales/az.tsindex 2b46b4ca7c..62b659bb3a 100644--- a/apps/desktop/src/i18n/locales/az.ts+++ b/apps/desktop/src/i18n/locales/az.ts@@ -9679,6 +9679,11 @@ export default withEnglishFallback({messageContent: "Mesaj məzmunu",formatJson: "JSON-u formatla",messageHeaders: "Başlıqlar",+ messageProperties: "Mesaj xassələri (Properties)",+ milliseconds: "millisaniyə",+ unixSeconds: "Unix saniyələri",+ nonPersistent: "Daimi olmayan",+ persistent: "Daimi",headersPlaceholder: "açar: dəyər (hər sətirdə bir ədəd)",sending: "Göndərilir...",sendMessage: "Mesaj göndər",diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.tsindex 0e8be22807..56c4562e4e 100644--- a/apps/desktop/src/i18n/locales/en.ts+++ b/apps/desktop/src/i18n/locales/en.ts@@ -12222,6 +12222,11 @@ export default {messageContent: "Message content",formatJson: "Format JSON",messageHeaders: "Headers",+ messageProperties: "Properties",+ milliseconds: "milliseconds",+ unixSeconds: "Unix seconds",+ nonPersistent: "Non-persistent",+ persistent: "Persistent",headersPlaceholder: "key: value (one per line)",sending: "Sending...",sendMessage: "Send message",diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.tsindex e3a2ab12e1..003d6936bb 100644--- a/apps/desktop/src/i18n/locales/es.ts+++ b/apps/desktop/src/i18n/locales/es.ts@@ -11406,6 +11406,11 @@ export default withEnglishFallback({messageContent: "Contenido del mensaje",formatJson: "Formatear JSON",messageHeaders: "Encabezados",+ messageProperties: "Propiedades",+ milliseconds: "milisegundos",+ unixSeconds: "segundos Unix",+ nonPersistent: "No persistente",+ persistent: "Persistente",headersPlaceholder: "clave: valor (una por línea)",sending: "Enviando...",sendMessage: "Enviar mensaje",diff --git a/apps/desktop/src/i18n/locales/id.ts b/apps/desktop/src/i18n/locales/id.tsindex 8e4d8b3aaf..a952923347 100644--- a/apps/desktop/src/i18n/locales/id.ts+++ b/apps/desktop/src/i18n/locales/id.ts@@ -10520,6 +10520,11 @@ export default withEnglishFallback({messageContent: "Isi pesan",formatJson: "Format JSON",messageHeaders: "Header",+ messageProperties: "Properti pesan (Properties)",+ milliseconds: "milidetik",+ unixSeconds: "detik Unix",+ nonPersistent: "Non-persistent",+ persistent: "Persistent",headersPlaceholder: "kunci: nilai (satu per baris)",sending: "Mengirim...",sendMessage: "Kirim pesan",diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.tsindex 8f76aad22f..665ba8050f 100644--- a/apps/desktop/src/i18n/locales/it.ts+++ b/apps/desktop/src/i18n/locales/it.ts@@ -11153,6 +11153,11 @@ export default withEnglishFallback({messageContent: "Contenuto del messaggio",formatJson: "Formatta JSON",messageHeaders: "Intestazioni",+ messageProperties: "Proprietà",+ milliseconds: "millisecondi",+ unixSeconds: "secondi Unix",+ nonPersistent: "Non persistente",+ persistent: "Persistente",headersPlaceholder: "chiave: valore (una per riga)",sending: "Invio in corso...",sendMessage: "Invia messaggio",diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.tsindex f6cce68a65..c9e1aa1b98 100644--- a/apps/desktop/src/i18n/locales/ja.ts+++ b/apps/desktop/src/i18n/locales/ja.ts@@ -11181,6 +11181,11 @@ export default withEnglishFallback({messageContent: "メッセージ内容",formatJson: "JSON を整形",messageHeaders: "ヘッダー",+ messageProperties: "プロパティ",+ milliseconds: "ミリ秒",+ unixSeconds: "Unix 秒",+ nonPersistent: "非永続",+ persistent: "永続",headersPlaceholder: "key: value (1行1件)",sending: "送信中...",sendMessage: "メッセージを送信",diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.tsindex 50c0f4407c..09b3258206 100644--- a/apps/desktop/src/i18n/locales/ko.ts+++ b/apps/desktop/src/i18n/locales/ko.ts@@ -10866,6 +10866,11 @@ export default withEnglishFallback({messageContent: "메시지 내용",formatJson: "JSON 서식",messageHeaders: "헤더",+ messageProperties: "속성",+ milliseconds: "밀리초",+ unixSeconds: "Unix 초",+ nonPersistent: "비지속적",+ persistent: "지속적",headersPlaceholder: "key: value (한 줄에 하나)",sending: "보내는 중...",sendMessage: "메시지 보내기",diff --git a/apps/desktop/src/i18n/locales/pl.ts b/apps/desktop/src/i18n/locales/pl.tsindex 7ab1f6028e..c64a41c389 100644--- a/apps/desktop/src/i18n/locales/pl.ts+++ b/apps/desktop/src/i18n/locales/pl.ts@@ -10539,6 +10539,11 @@ export default withEnglishFallback({messageContent: "Treść wiadomości",formatJson: "Formatuj JSON",messageHeaders: "Nagłówki",+ messageProperties: "Właściwości wiadomości (Properties)",+ milliseconds: "milisekundy",+ unixSeconds: "sekundy Unix",+ nonPersistent: "Nietrwały",+ persistent: "Trwały",headersPlaceholder: "klucz: wartość (jeden na linię)",sending: "Wysyłanie…",sendMessage: "Wyślij wiadomość",diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.tsindex d7e1f9f65e..99e907f05c 100644--- a/apps/desktop/src/i18n/locales/pt-BR.ts+++ b/apps/desktop/src/i18n/locales/pt-BR.ts@@ -11149,6 +11149,11 @@ export default withEnglishFallback({messageContent: "Conteúdo da mensagem",formatJson: "Formatar JSON",messageHeaders: "Cabeçalhos",+ messageProperties: "Propriedades",+ milliseconds: "milissegundos",+ unixSeconds: "segundos Unix",+ nonPersistent: "Não persistente",+ persistent: "Persistente",headersPlaceholder: "chave: valor (um por linha)",sending: "Enviando...",sendMessage: "Enviar mensagem",diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.tsindex 469a2e26ea..5589f5db3b 100644--- a/apps/desktop/src/i18n/locales/ru.ts+++ b/apps/desktop/src/i18n/locales/ru.ts@@ -12370,6 +12370,11 @@ export default withEnglishFallback({messageContent: "Содержимое сообщения",formatJson: "Форматировать JSON",messageHeaders: "Заголовки",+ messageProperties: "Свойства",+ milliseconds: "миллисекунды",+ unixSeconds: "секунды Unix",+ nonPersistent: "Непостоянный",+ persistent: "Постоянный",headersPlaceholder: "ключ: значение (по одному в строке)",sending: "Отправка...",sendMessage: "Отправить сообщение",diff --git a/apps/desktop/src/i18n/locales/th.ts b/apps/desktop/src/i18n/locales/th.tsindex 4506ad517c..aecb19b691 100644--- a/apps/desktop/src/i18n/locales/th.ts+++ b/apps/desktop/src/i18n/locales/th.ts@@ -12733,6 +12733,11 @@ export default withEnglishFallback({messageContent: "เนื้อหาข้อความ",formatJson: "จัดรูปแบบ JSON",messageHeaders: "Headers",+ messageProperties: "คุณสมบัติ",+ milliseconds: "มิลลิวินาที",+ unixSeconds: "วินาที Unix",+ nonPersistent: "ไม่ถาวร",+ persistent: "ถาวร",headersPlaceholder: "key: value (หนึ่งรายการต่อบรรทัด)",sending: "กำลังส่ง...",sendMessage: "ส่งข้อความ",diff --git a/apps/desktop/src/i18n/locales/tr.ts b/apps/desktop/src/i18n/locales/tr.tsindex 0d241b2585..412669a842 100644--- a/apps/desktop/src/i18n/locales/tr.ts+++ b/apps/desktop/src/i18n/locales/tr.ts@@ -9573,6 +9573,11 @@ export default withEnglishFallback({messageContent: "Mesaj içeriği",formatJson: "JSON'u Biçimlendir",messageHeaders: "Başlıklar",+ messageProperties: "Mesaj özellikleri (Properties)",+ milliseconds: "milisaniye",+ unixSeconds: "Unix saniyesi",+ nonPersistent: "Kalıcı değil",+ persistent: "Kalıcı",headersPlaceholder: "anahtar: değer (her satıra bir tane)",sending: "Gönderiliyor...",sendMessage: "Mesaj gönder",diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.tsindex 70df2ad40a..9bffeebf7f 100644--- a/apps/desktop/src/i18n/locales/zh-CN.ts+++ b/apps/desktop/src/i18n/locales/zh-CN.ts@@ -12185,6 +12185,11 @@ export default withEnglishFallback({messageContent: "消息内容",formatJson: "格式化 JSON",messageHeaders: "消息头 (Headers)",+ messageProperties: "消息属性 (Properties)",+ milliseconds: "毫秒",+ unixSeconds: "Unix 秒",+ nonPersistent: "非持久化",+ persistent: "持久化",headersPlaceholder: "key: value(每行一个)",sending: "发送中...",sendMessage: "发送消息",diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.tsindex e93e0e5dbf..7e5d57b6f3 100644--- a/apps/desktop/src/i18n/locales/zh-TW.ts+++ b/apps/desktop/src/i18n/locales/zh-TW.ts@@ -11129,6 +11129,11 @@ export default withEnglishFallback({messageContent: "訊息內容",formatJson: "格式化 JSON",messageHeaders: "訊息標頭 (Headers)",+ messageProperties: "訊息屬性 (Properties)",+ milliseconds: "毫秒",+ unixSeconds: "Unix 秒",+ nonPersistent: "非持久化",+ persistent: "持久化",headersPlaceholder: "key: value(每行一個)",sending: "傳送中...",sendMessage: "傳送訊息",diff --git a/apps/desktop/src/types/mq.ts b/apps/desktop/src/types/mq.tsindex 510b7f8328..88e81b2903 100644--- a/apps/desktop/src/types/mq.ts+++ b/apps/desktop/src/types/mq.ts@@ -581,6 +581,8 @@ export interface SendMessageRequest {payloadText?: string;headers: Record<string, string>;partition?: number;+ /** RabbitMQ: AMQP BasicProperties, separate from custom headers. */+ properties?: Record<string, string>;/** RabbitMQ: target exchange; empty means the default exchange. */exchange?: string;/** RabbitMQ: routing key used when publishing to an exchange. */diff --git a/crates/dbx-core/src/admin/mq/adapters/rabbitmq.rs b/crates/dbx-core/src/admin/mq/adapters/rabbitmq.rsindex 7e96eb88d0..14fd2c5cbb 100644--- a/crates/dbx-core/src/admin/mq/adapters/rabbitmq.rs+++ b/crates/dbx-core/src/admin/mq/adapters/rabbitmq.rs@@ -713,6 +713,9 @@ impl MessageQueueAdmin for RabbitMqAdmin {"payloadBase64": req.payload_base64,"headers": req.headers,});+ if let Some(properties) = req.properties {+ params["properties"] = serde_json::json!(properties);+ }if let Some(exchange) = req.exchange.as_deref().filter(|e| !e.is_empty()) {params["exchange"] = serde_json::json!(exchange);}@@ -1508,6 +1511,52 @@ mod tests {use crate::mq::auth::MqAuth;use crate::mq::types::MqSystemKind;+ #[tokio::test]+ async fn send_message_forwards_properties_without_changing_headers_or_legacy_requests() {+ let directory = tempfile::tempdir().expect("create fake RabbitMQ agent directory");+ let script = directory.path().join("agent.py");+ let calls = directory.path().join("calls.jsonl");+ std::fs::write(+ &script,+ r#"import json+import sys++print(json.dumps({"ready": True}), flush=True)+for line in sys.stdin:+ request = json.loads(line)+ if request["method"] == "mq_send_message":+ with open(sys.argv[1], "a") as calls:+ calls.write(json.dumps(request["params"]) + "\n")+ print(json.dumps({"jsonrpc": "2.0", "id": request["id"], "result": {"ok": True}}), flush=True)+"#,+ )+ .expect("write fake RabbitMQ agent");+ let python = if cfg!(windows) { "python" } else { "python3" };+ let launch = AgentLaunchSpec::new(python)+ .with_args([script.to_string_lossy().to_string(), calls.to_string_lossy().to_string()]);+ let config = rabbitmq_config(serde_json::json!({ "addresses": "broker:5672" }), MqAuth::None, false);+ let admin = RabbitMqAdmin::new(config, launch).await.expect("connect fake RabbitMQ agent");+ let properties = serde_json::json!({ "content_type": "application/json", "priority": "0" });+ for expected in [None, Some(properties)] {+ let mut value = serde_json::json!({+ "topic": "orders", "payloadBase64": "e30=",+ "headers": { "content_type": "custom-header" },+ "exchange": "events", "routingKey": "orders.created", "namespace": "orders-vhost"+ });+ if let Some(properties) = expected.as_ref() {+ value["properties"] = properties.clone();+ }+ admin.send_message(serde_json::from_value(value).unwrap()).await.expect("send message");+ let calls = std::fs::read_to_string(&calls).expect("read agent calls");+ let actual: serde_json::Value = serde_json::from_str(calls.lines().last().unwrap()).unwrap();+ assert_eq!(actual.get("properties"), expected.as_ref());+ assert_eq!(actual["headers"], serde_json::json!({ "content_type": "custom-header" }));+ assert_eq!(actual["exchange"], "events");+ assert_eq!(actual["routingKey"], "orders.created");+ assert_eq!(actual["virtual_host"], "orders-vhost");+ }+ }+fn rabbitmq_config(extra: serde_json::Value, auth: MqAuth, tls_skip_verify: bool) -> MqAdminConfig {MqAdminConfig {system_kind: MqSystemKind::RabbitMq,diff --git a/crates/dbx-core/src/admin/mq/service.rs b/crates/dbx-core/src/admin/mq/service.rsindex 82d77c767c..13bf86f8a2 100644--- a/crates/dbx-core/src/admin/mq/service.rs+++ b/crates/dbx-core/src/admin/mq/service.rs@@ -1036,6 +1036,7 @@ mod tests {payload_base64: "eA==".into(),payload_text: Some("x".into()),headers: Default::default(),+ properties: None,partition: None,exchange: None,routing_key: None,diff --git a/crates/dbx-core/src/admin/mq/types.rs b/crates/dbx-core/src/admin/mq/types.rsindex c941872a6d..2893801455 100644--- a/crates/dbx-core/src/admin/mq/types.rs+++ b/crates/dbx-core/src/admin/mq/types.rs@@ -1273,6 +1273,10 @@ pub struct SendMessageRequest {/// Optional message headers.#[serde(default)]pub headers: HashMap<String, String>,+ /// RabbitMQ: standard AMQP BasicProperties, separate from custom headers.+ /// Keys use AMQP snake_case names; values remain strings on the wire.+ #[serde(default, skip_serializing_if = "Option::is_none")]+ pub properties: Option<HashMap<String, String>>,/// Optional target partition (Kafka). When `None`, the key-based partitioner/// is used.#[serde(default, skip_serializing_if = "Option::is_none")]@@ -1383,6 +1387,27 @@ mod tests {assert!(req.exchange.is_none());assert!(req.routing_key.is_none());assert!(req.namespace.is_none());+ assert!(serde_json::to_value(req).unwrap().get("properties").is_none());+ }++ #[test]+ fn send_message_request_round_trips_rabbitmq_properties_separately_from_headers() {+ let value = serde_json::json!({+ "topic": "dbx-queue",+ "payloadBase64": "aGVsbG8=",+ "headers": { "content_type": "custom-header" },+ "properties": {+ "content_type": "application/json",+ "delivery_mode": "2",+ "priority": "0",+ "expiration": "0",+ "timestamp": "1735689600"+ }+ });+ let req: super::SendMessageRequest = serde_json::from_value(value.clone()).expect("send request");+ let round_trip = serde_json::to_value(req).expect("serialize send request");+ assert_eq!(round_trip.get("properties"), value.get("properties"));+ assert_eq!(round_trip.get("headers"), value.get("headers"));}#[test]diff --git a/crates/dbx-mcp/src/server.rs b/crates/dbx-mcp/src/server.rsindex b7184a2d3e..c8844086b8 100644--- a/crates/dbx-mcp/src/server.rs+++ b/crates/dbx-mcp/src/server.rs@@ -315,6 +315,10 @@ pub struct SendMessageRequest {#[schemars(description = "Optional message headers")]pub headers: std::collections::HashMap<String, String>,#[serde(default)]+ #[schemars(description = "RabbitMQ AMQP properties using snake_case names and string values")]+ #[schemars(extend("type" = "object"))]+ pub properties: Option<std::collections::HashMap<String, String>>,+ #[serde(default)]#[schemars(description = "Optional target partition")]#[schemars(extend("type" = "integer"))]pub partition: Option<i32>,@@ -2687,6 +2691,7 @@ impl DbxMcpServer {payload_base64: request.payload_base64,payload_text: request.payload_text,headers: request.headers,+ properties: request.properties,partition: request.partition,exchange: request.exchange,routing_key: request.routing_key,@@ -6967,8 +6972,10 @@ mod tests {("dbx_get_schema_context", &["database", "schema", "max_tables"]),];#[cfg(feature = "mq-admin")]- checks- .push(("dbx_send_message", &["key", "payload_text", "partition", "exchange", "routing_key", "namespace"]));+ checks.push((+ "dbx_send_message",+ &["key", "payload_text", "properties", "partition", "exchange", "routing_key", "namespace"],+ ));#[cfg(feature = "mq-admin")]checks.push(("dbx_peek_messages", &["count", "partition", "offset"]));@@ -7033,7 +7040,7 @@ mod tests {#[test]fn send_message_request_preserves_binary_payload_and_optional_fields() {let request: SendMessageRequest = serde_json::from_str(- r#"{"connection_name":"events","topic":"orders","payload_base64":"AP8=","key":"order-1","partition":2,"headers":{"trace":"abc"}}"#,+ r#"{"connection_name":"events","topic":"orders","payload_base64":"AP8=","key":"order-1","partition":2,"headers":{"trace":"abc"},"properties":{"content_type":"application/json","priority":"0"}}"#,).expect("send message request");@@ -7043,6 +7050,9 @@ mod tests {assert_eq!(request.key.as_deref(), Some("order-1"));assert_eq!(request.partition, Some(2));assert_eq!(request.headers.get("trace").map(String::as_str), Some("abc"));+ let properties = request.properties.expect("RabbitMQ properties");+ assert_eq!(properties.get("content_type").map(String::as_str), Some("application/json"));+ assert_eq!(properties.get("priority").map(String::as_str), Some("0"));}#[cfg(feature = "mq-admin")]