Skip to content

armgit / dbx

Public Imported from GitHub
0

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。

feat(mqtt): copy payload or topic and delete messages locally

_Mr丶s ゛😁®28973c88039f
diff --git a/apps/desktop/src/components/mqtt/MqttAdminConsole.vue b/apps/desktop/src/components/mqtt/MqttAdminConsole.vue
index e0d489636f..755e80e563 100644
--- a/apps/desktop/src/components/mqtt/MqttAdminConsole.vue
+++ b/apps/desktop/src/components/mqtt/MqttAdminConsole.vue
@@ -1,15 +1,17 @@
<script setup lang="ts">
import { ref, computed, onMounted, onUnmounted, watch, nextTick } from "vue";
import { useI18n } from "vue-i18n";
-import { mqttGetBrokerInfo, mqttListTopics, mqttListSavedTopicConfigs, mqttGetMessages, mqttSubscribe, mqttUnsubscribe, mqttSaveTopicConfig, mqttDeleteTopicConfig, mqttClearMessages } from "@/lib/backend/api";
+import { mqttGetBrokerInfo, mqttListTopics, mqttListSavedTopicConfigs, mqttGetMessages, mqttSubscribe, mqttUnsubscribe, mqttSaveTopicConfig, mqttDeleteTopicConfig, mqttClearMessages, mqttDeleteMessage } from "@/lib/backend/api";
import type { MqttBrokerInfo, MqttSavedTopic, MqttTopicNode, MqttMessage, MqttMessageDirection, MqttQoS } from "@/types/mqtt";
import { Button } from "@/components/ui/button";
import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
+import CustomContextMenu, { type ContextMenuItem } from "@/components/ui/CustomContextMenu.vue";
import TopicTreeNode from "./TopicTreeNode.vue";
import MqttPublishPanel from "./MqttPublishDialog.vue";
import { decodePayload, PAYLOAD_ENCODINGS, PAYLOAD_ENCODING_LABELS, type PayloadEncoding } from "@/lib/mqtt/mqttPayloadCodec";
import { safeLocalStorageGet, safeLocalStorageSet } from "@/lib/backend/safeStorage";
-import { ChevronDown, ChevronUp, Pause, Play } from "@lucide/vue";
+import { ChevronDown, ChevronUp, Copy, Pause, Play, Trash2 } from "@lucide/vue";
+import { copyToClipboard } from "@/lib/common/clipboard";
import { useTabUiState } from "@/lib/tabs/tabUiState";
interface Props {
@@ -55,6 +57,7 @@ const loading = ref(true);
const error = ref<string | null>(null);
const pollingTimer = ref<ReturnType<typeof setInterval> | null>(null);
const messageListRef = ref<HTMLElement | null>(null);
+const contextMenuMessage = ref<MqttMessagePreview | null>(null);
const messagesPaused = ref(restoredUiState.messagesPaused ?? false);
const displayEncoding = ref<PayloadEncoding>(restoredUiState.displayEncoding ?? "plaintext");
const topicSearch = ref(restoredUiState.topicSearch ?? "");
@@ -382,6 +385,42 @@ async function handleClearMessages() {
}
}
+async function copyMessageValue(value: string) {
+ try {
+ await copyToClipboard(value);
+ } catch (e) {
+ error.value = t("grid.copyFailed", { message: e instanceof Error ? e.message : String(e) });
+ }
+}
+
+async function deleteMessage(msg: MqttMessagePreview) {
+ try {
+ await mqttDeleteMessage(props.connectionId, msg);
+ const index = messagePreviews.value.findIndex((candidate) => candidate.previewKey === msg.previewKey);
+ if (index !== -1) messages.value.splice(index, 1);
+ const nextCollapsedMessageKeys = new Set(collapsedMessageKeys.value);
+ nextCollapsedMessageKeys.delete(msg.previewKey);
+ collapsedMessageKeys.value = nextCollapsedMessageKeys;
+ } catch (e) {
+ error.value = String(e);
+ }
+}
+
+function messageContextMenuItems(): ContextMenuItem[] {
+ const msg = contextMenuMessage.value;
+ if (!msg) return [];
+ return [
+ { label: t("connection.mqttCopyPayload"), icon: Copy, action: () => void copyMessageValue(formatMessagePayload(msg)) },
+ { label: t("connection.mqttCopyTopic"), icon: Copy, action: () => void copyMessageValue(msg.topic) },
+ { label: t("connection.mqttDeleteMessage"), icon: Trash2, variant: "destructive", action: () => void deleteMessage(msg) },
+ ];
+}
+
+function openMessageContextMenu(event: MouseEvent, msg: MqttMessagePreview, openMenu: (event: MouseEvent) => void) {
+ contextMenuMessage.value = msg;
+ openMenu(event);
+}
+
function startPolling() {
stopPolling();
pollingTimer.value = setInterval(async () => {
@@ -579,50 +618,53 @@ onUnmounted(stopPolling);
</Button>
</div>
</div>
- <div ref="messageListRef" data-testid="mqtt-message-list" class="flex min-h-0 flex-1 flex-col gap-4 overflow-auto p-3">
- <div v-if="messages.length === 0" class="p-4 text-center text-xs text-muted-foreground">{{ t("connection.mqttNoMessages") }}</div>
- <div v-else-if="filteredMessages.length === 0" data-testid="mqtt-no-matching-messages" class="p-4 text-center text-xs text-muted-foreground">{{ t("connection.mqttNoMatchingMessages") }}</div>
- <div
- v-for="msg in filteredMessages"
- :key="msg.previewKey"
- data-testid="mqtt-message"
- class="w-full cursor-pointer border px-3 py-2 text-xs"
- :class="
- msg.direction === 'sent'
- ? 'ml-auto max-w-[85%] rounded-l-md border-r-2 border-emerald-400 bg-emerald-50/70 hover:bg-emerald-100/70 dark:border-emerald-500 dark:bg-emerald-950/30 dark:hover:bg-emerald-950/50'
- : 'mr-auto max-w-[85%] rounded-r-md border-l-2 border-blue-400 bg-blue-50/70 hover:bg-blue-100/70 dark:border-blue-500 dark:bg-blue-950/30 dark:hover:bg-blue-950/50'
- "
- @click="handleMessageClick(msg.topic)"
- >
- <div class="mb-0.5 flex items-center gap-2">
- <span v-if="msg.direction === 'sent'" class="shrink-0 text-[10px] font-bold text-emerald-600 dark:text-emerald-400">{{ t("connection.mqttSent") }}</span>
- <span v-else class="shrink-0 text-[10px] font-bold text-blue-600 dark:text-blue-400">{{ t("connection.mqttReceived") }}</span>
- <span class="truncate font-mono font-medium text-blue-700 dark:text-blue-300">{{ msg.topic }}</span>
- <span class="shrink-0 text-muted-foreground">QoS{{ msg.qos }}</span>
- <span v-if="msg.retain" class="shrink-0 text-[10px] font-medium text-amber-600 dark:text-amber-400">{{ t("connection.mqttRetained") }}</span>
- <Button
- type="button"
- size="xs"
- variant="ghost"
- data-testid="mqtt-message-payload-toggle"
- class="ml-auto h-5 gap-0.5 px-1.5 text-[10px] font-normal"
- :title="isMessagePayloadCollapsed(msg.previewKey) ? t('connection.mqttExpandPayload') : t('connection.mqttCollapsePayload')"
- :aria-expanded="!isMessagePayloadCollapsed(msg.previewKey)"
- :aria-controls="msg.payloadElementId"
- @click.stop="toggleMessagePayload(msg.previewKey)"
- >
- <ChevronDown v-if="isMessagePayloadCollapsed(msg.previewKey)" class="h-3 w-3" />
- <ChevronUp v-else class="h-3 w-3" />
- <span>{{ isMessagePayloadCollapsed(msg.previewKey) ? t("connection.mqttExpandPayload") : t("connection.mqttCollapsePayload") }}</span>
- <span class="sr-only">: {{ msg.topic }}</span>
- </Button>
- </div>
- <div :id="msg.payloadElementId" data-testid="mqtt-message-payload" class="break-all whitespace-pre-wrap font-mono text-muted-foreground" :hidden="isMessagePayloadCollapsed(msg.previewKey)">
- <template v-if="!isMessagePayloadCollapsed(msg.previewKey)">{{ formatMessagePayload(msg) }}</template>
+ <CustomContextMenu :items="messageContextMenuItems" v-slot="{ onContextMenu }">
+ <div ref="messageListRef" data-testid="mqtt-message-list" class="flex min-h-0 flex-1 flex-col gap-4 overflow-auto p-3">
+ <div v-if="messages.length === 0" class="p-4 text-center text-xs text-muted-foreground">{{ t("connection.mqttNoMessages") }}</div>
+ <div v-else-if="filteredMessages.length === 0" data-testid="mqtt-no-matching-messages" class="p-4 text-center text-xs text-muted-foreground">{{ t("connection.mqttNoMatchingMessages") }}</div>
+ <div
+ v-for="msg in filteredMessages"
+ :key="msg.previewKey"
+ data-testid="mqtt-message"
+ class="w-full cursor-pointer border px-3 py-2 text-xs"
+ :class="
+ msg.direction === 'sent'
+ ? 'ml-auto max-w-[85%] rounded-l-md border-r-2 border-emerald-400 bg-emerald-50/70 hover:bg-emerald-100/70 dark:border-emerald-500 dark:bg-emerald-950/30 dark:hover:bg-emerald-950/50'
+ : 'mr-auto max-w-[85%] rounded-r-md border-l-2 border-blue-400 bg-blue-50/70 hover:bg-blue-100/70 dark:border-blue-500 dark:bg-blue-950/30 dark:hover:bg-blue-950/50'
+ "
+ @click="handleMessageClick(msg.topic)"
+ @contextmenu="openMessageContextMenu($event, msg, onContextMenu)"
+ >
+ <div class="mb-0.5 flex items-center gap-2">
+ <span v-if="msg.direction === 'sent'" class="shrink-0 text-[10px] font-bold text-emerald-600 dark:text-emerald-400">{{ t("connection.mqttSent") }}</span>
+ <span v-else class="shrink-0 text-[10px] font-bold text-blue-600 dark:text-blue-400">{{ t("connection.mqttReceived") }}</span>
+ <span class="truncate font-mono font-medium text-blue-700 dark:text-blue-300">{{ msg.topic }}</span>
+ <span class="shrink-0 text-muted-foreground">QoS{{ msg.qos }}</span>
+ <span v-if="msg.retain" class="shrink-0 text-[10px] font-medium text-amber-600 dark:text-amber-400">{{ t("connection.mqttRetained") }}</span>
+ <Button
+ type="button"
+ size="xs"
+ variant="ghost"
+ data-testid="mqtt-message-payload-toggle"
+ class="ml-auto h-5 gap-0.5 px-1.5 text-[10px] font-normal"
+ :title="isMessagePayloadCollapsed(msg.previewKey) ? t('connection.mqttExpandPayload') : t('connection.mqttCollapsePayload')"
+ :aria-expanded="!isMessagePayloadCollapsed(msg.previewKey)"
+ :aria-controls="msg.payloadElementId"
+ @click.stop="toggleMessagePayload(msg.previewKey)"
+ >
+ <ChevronDown v-if="isMessagePayloadCollapsed(msg.previewKey)" class="h-3 w-3" />
+ <ChevronUp v-else class="h-3 w-3" />
+ <span>{{ isMessagePayloadCollapsed(msg.previewKey) ? t("connection.mqttExpandPayload") : t("connection.mqttCollapsePayload") }}</span>
+ <span class="sr-only">: {{ msg.topic }}</span>
+ </Button>
+ </div>
+ <div :id="msg.payloadElementId" data-testid="mqtt-message-payload" class="break-all whitespace-pre-wrap font-mono text-muted-foreground" :hidden="isMessagePayloadCollapsed(msg.previewKey)">
+ <template v-if="!isMessagePayloadCollapsed(msg.previewKey)">{{ formatMessagePayload(msg) }}</template>
+ </div>
+ <time class="mt-1 block text-[10px] tabular-nums text-muted-foreground/70">{{ formatMessageTimestamp(msg.receivedAtMs) }}</time>
</div>
- <time class="mt-1 block text-[10px] tabular-nums text-muted-foreground/70">{{ formatMessageTimestamp(msg.receivedAtMs) }}</time>
</div>
- </div>
+ </CustomContextMenu>
</div>
<MqttPublishPanel v-if="connected" v-show="!publishPanelCollapsed" :connection-id="connectionId" :initial-topic="selectedTopic" @published="handleMessagePublished" />
</div>
diff --git a/apps/desktop/src/i18n/locales/az.ts b/apps/desktop/src/i18n/locales/az.ts
index 006306cc7a..70f8aa2eaf 100644
--- a/apps/desktop/src/i18n/locales/az.ts
+++ b/apps/desktop/src/i18n/locales/az.ts
@@ -1008,6 +1008,9 @@ export default withEnglishFallback({
mqttDisconnected: "Əlaqə kəsilib",
mqttRefresh: "Yenilə",
mqttClearMessages: "Mesajları təmizlə",
+ mqttCopyPayload: "Payload-i kopyala",
+ mqttCopyTopic: "Topic-i kopyala",
+ mqttDeleteMessage: "Yerli mesajı sil",
mqttCollapsePayload: "Mesaj məzmununu yığ",
mqttExpandPayload: "Mesaj məzmununu genişləndir",
mqttPauseMessages: "Fasilə ver",
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index 3aad18ec26..839cc5bba0 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -1371,6 +1371,9 @@ export default {
mqttDisconnected: "Disconnected",
mqttRefresh: "Refresh",
mqttClearMessages: "Clear messages",
+ mqttCopyPayload: "Copy Payload",
+ mqttCopyTopic: "Copy Topic",
+ mqttDeleteMessage: "Delete local message",
mqttCollapsePayload: "Collapse payload",
mqttExpandPayload: "Expand payload",
mqttPauseMessages: "Pause",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index 90d280137d..db5914207b 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -1659,6 +1659,9 @@ export default withEnglishFallback({
mqttDisconnected: "Desconectado",
mqttRefresh: "Actualizar",
mqttClearMessages: "Borrar mensajes",
+ mqttCopyPayload: "Copiar Payload",
+ mqttCopyTopic: "Copiar Topic",
+ mqttDeleteMessage: "Eliminar mensaje local",
mqttCollapsePayload: "Contraer Payload",
mqttExpandPayload: "Expandir Payload",
mqttPauseMessages: "Pausar",
diff --git a/apps/desktop/src/i18n/locales/id.ts b/apps/desktop/src/i18n/locales/id.ts
index 91b0c90549..4123b4d84a 100644
--- a/apps/desktop/src/i18n/locales/id.ts
+++ b/apps/desktop/src/i18n/locales/id.ts
@@ -1262,6 +1262,9 @@ export default withEnglishFallback({
mqttDisconnected: "Terputus",
mqttRefresh: "Segarkan",
mqttClearMessages: "Bersihkan pesan",
+ mqttCopyPayload: "Salin Payload",
+ mqttCopyTopic: "Salin Topic",
+ mqttDeleteMessage: "Hapus pesan lokal",
mqttCollapsePayload: "Ciutkan payload",
mqttExpandPayload: "Perluas payload",
mqttPauseMessages: "Jeda",
diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts
index 0030a36a85..012b6fc0e4 100644
--- a/apps/desktop/src/i18n/locales/it.ts
+++ b/apps/desktop/src/i18n/locales/it.ts
@@ -1568,6 +1568,9 @@ export default withEnglishFallback({
mqttDisconnected: "Disconnesso",
mqttRefresh: "Aggiorna",
mqttClearMessages: "Cancella messaggi",
+ mqttCopyPayload: "Copia Payload",
+ mqttCopyTopic: "Copia Topic",
+ mqttDeleteMessage: "Elimina messaggio locale",
mqttCollapsePayload: "Comprimi Payload",
mqttExpandPayload: "Espandi Payload",
mqttPauseMessages: "Pausa",
diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts
index b88c07826a..2f9cae833d 100644
--- a/apps/desktop/src/i18n/locales/ja.ts
+++ b/apps/desktop/src/i18n/locales/ja.ts
@@ -1568,6 +1568,9 @@ export default withEnglishFallback({
mqttDisconnected: "切断済み",
mqttRefresh: "更新",
mqttClearMessages: "メッセージを消去",
+ mqttCopyPayload: "Payload をコピー",
+ mqttCopyTopic: "Topic をコピー",
+ mqttDeleteMessage: "ローカルメッセージを削除",
mqttCollapsePayload: "ペイロードを折りたたむ",
mqttExpandPayload: "ペイロードを展開",
mqttPauseMessages: "一時停止",
diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts
index 22ad62a7f6..1572384a22 100644
--- a/apps/desktop/src/i18n/locales/ko.ts
+++ b/apps/desktop/src/i18n/locales/ko.ts
@@ -1569,6 +1569,9 @@ export default withEnglishFallback({
mqttNoMatchingMessages: "현재 Payload 필터 조건과 일치하는 로드된 메시지가 없습니다.",
mqttCollapsePayload: "Payload 접기",
mqttExpandPayload: "Payload 펼치기",
+ mqttCopyPayload: "Payload 복사",
+ mqttCopyTopic: "Topic 복사",
+ mqttDeleteMessage: "로컬 메시지 삭제",
databaseCategoryPlugins: "플러그인",
pluginProviderUnavailable: "이 플러그인 연결 제공자를 사용할 수 없습니다. 플러그인을 다시 설치하거나 활성화한 후 다시 시도하세요.",
pluginRequiredField: "{field}을(를) 입력하세요.",
diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts
index 040d6346bc..aff7c0ce56 100644
--- a/apps/desktop/src/i18n/locales/pt-BR.ts
+++ b/apps/desktop/src/i18n/locales/pt-BR.ts
@@ -1569,6 +1569,9 @@ export default withEnglishFallback({
mqttDisconnected: "Desconectado",
mqttRefresh: "Atualizar",
mqttClearMessages: "Limpar mensagens",
+ mqttCopyPayload: "Copiar Payload",
+ mqttCopyTopic: "Copiar Topic",
+ mqttDeleteMessage: "Excluir mensagem local",
mqttCollapsePayload: "Recolher Payload",
mqttExpandPayload: "Expandir Payload",
mqttPauseMessages: "Pausar",
diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.ts
index af4d5365ca..a3269d89e9 100644
--- a/apps/desktop/src/i18n/locales/ru.ts
+++ b/apps/desktop/src/i18n/locales/ru.ts
@@ -1281,6 +1281,9 @@ export default withEnglishFallback({
mqttDisconnected: "Отключено",
mqttRefresh: "Обновить",
mqttClearMessages: "Очистить сообщения",
+ mqttCopyPayload: "Скопировать Payload",
+ mqttCopyTopic: "Скопировать Topic",
+ mqttDeleteMessage: "Удалить локальное сообщение",
mqttCollapsePayload: "Свернуть полезную нагрузку",
mqttExpandPayload: "Развернуть полезную нагрузку",
mqttPauseMessages: "Пауза",
diff --git a/apps/desktop/src/i18n/locales/tr.ts b/apps/desktop/src/i18n/locales/tr.ts
index a23d28b1c9..7ed8766e73 100644
--- a/apps/desktop/src/i18n/locales/tr.ts
+++ b/apps/desktop/src/i18n/locales/tr.ts
@@ -1008,6 +1008,9 @@ export default withEnglishFallback({
mqttDisconnected: "Bağlantı kesildi",
mqttRefresh: "Yenile",
mqttClearMessages: "Mesajları temizle",
+ mqttCopyPayload: "Payload'i kopyala",
+ mqttCopyTopic: "Topic'i kopyala",
+ mqttDeleteMessage: "Yerel mesajı sil",
mqttCollapsePayload: "Yükü daralt",
mqttExpandPayload: "Yükü genişlet",
mqttPauseMessages: "Duraklat",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index 332777fdd9..10282f3963 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -1307,6 +1307,9 @@ export default withEnglishFallback({
mqttDisconnected: "已断开",
mqttRefresh: "刷新",
mqttClearMessages: "清空消息",
+ mqttCopyPayload: "复制 Payload",
+ mqttCopyTopic: "复制 Topic",
+ mqttDeleteMessage: "删除本地消息",
mqttCollapsePayload: "收起消息内容",
mqttExpandPayload: "展开消息内容",
mqttPauseMessages: "暂停",
diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts
index 348f75adc7..1e34d18758 100644
--- a/apps/desktop/src/i18n/locales/zh-TW.ts
+++ b/apps/desktop/src/i18n/locales/zh-TW.ts
@@ -1582,6 +1582,9 @@ export default withEnglishFallback({
mqttDisconnected: "已斷線",
mqttRefresh: "重新整理",
mqttClearMessages: "清除訊息",
+ mqttCopyPayload: "複製 Payload",
+ mqttCopyTopic: "複製 Topic",
+ mqttDeleteMessage: "刪除本機訊息",
mqttCollapsePayload: "收合訊息內容",
mqttExpandPayload: "展開訊息內容",
mqttPauseMessages: "暫停",
diff --git a/apps/desktop/src/lib/backend/api.ts b/apps/desktop/src/lib/backend/api.ts
index 72290ccf19..6cca02f285 100644
--- a/apps/desktop/src/lib/backend/api.ts
+++ b/apps/desktop/src/lib/backend/api.ts
@@ -1199,3 +1199,4 @@ export const mqttListSavedTopicConfigs = forward("mqttListSavedTopicConfigs");
export const mqttGetTopicTree = forward("mqttGetTopicTree");
export const mqttGetMessages = forward("mqttGetMessages");
export const mqttClearMessages = forward("mqttClearMessages");
+export const mqttDeleteMessage = forward("mqttDeleteMessage");
diff --git a/apps/desktop/src/lib/backend/mqtt-http.ts b/apps/desktop/src/lib/backend/mqtt-http.ts
index deff8068fb..1e5953e044 100644
--- a/apps/desktop/src/lib/backend/mqtt-http.ts
+++ b/apps/desktop/src/lib/backend/mqtt-http.ts
@@ -1,6 +1,8 @@
// MQTT HTTP backend stubs (MQTT is not yet supported in web/Docker mode).
// Throw descriptive errors so the user knows this isn't available.
+import type { MqttMessage } from "@/types/mqtt";
+
function mqttWebNotAvailable(name: string): never {
throw new Error(`MQTT ${name}: MQTT 功能暂不支持 Web/Docker 模式。请使用桌面版。`);
}
@@ -48,3 +50,7 @@ export async function mqttGetMessages(_connectionId: string, _topicFilter?: stri
export async function mqttClearMessages(_connectionId: string) {
mqttWebNotAvailable("mqttClearMessages");
}
+
+export async function mqttDeleteMessage(_connectionId: string, _message: MqttMessage) {
+ mqttWebNotAvailable("mqttDeleteMessage");
+}
diff --git a/apps/desktop/src/lib/backend/mqtt-tauri.ts b/apps/desktop/src/lib/backend/mqtt-tauri.ts
index 0d1c0a66ee..00b236c864 100644
--- a/apps/desktop/src/lib/backend/mqtt-tauri.ts
+++ b/apps/desktop/src/lib/backend/mqtt-tauri.ts
@@ -1,4 +1,5 @@
import { invoke } from "@tauri-apps/api/core";
+import type { MqttMessage } from "@/types/mqtt";
export async function mqttGetBrokerInfo(connectionId: string) {
return invoke("mqtt_get_broker_info", { connectionId });
@@ -43,3 +44,7 @@ export async function mqttGetMessages(connectionId: string, topicFilter?: string
export async function mqttClearMessages(connectionId: string) {
return invoke("mqtt_clear_messages", { connectionId });
}
+
+export async function mqttDeleteMessage(connectionId: string, message: MqttMessage) {
+ return invoke("mqtt_delete_message", { connectionId, message });
+}
diff --git a/crates/dbx-core/src/admin/mqtt/client.rs b/crates/dbx-core/src/admin/mqtt/client.rs
index eb054bb374..66b5362a35 100644
--- a/crates/dbx-core/src/admin/mqtt/client.rs
+++ b/crates/dbx-core/src/admin/mqtt/client.rs
@@ -1135,6 +1135,14 @@ impl MqttClient {
filtered
}
+ /// Remove one matching message from the live console buffer.
+ pub async fn delete_message(&self, message: &MqttMessage) {
+ let mut buffer = self.message_buffer.write().await;
+ if let Some(index) = buffer.iter().position(|candidate| mqtt_messages_match(candidate, message)) {
+ buffer.remove(index);
+ }
+ }
+
pub async fn lock_message_history(&self) -> tokio::sync::MutexGuard<'_, ()> {
self.message_history_operation.lock().await
}
@@ -1214,6 +1222,16 @@ impl MqttClient {
}
}
+fn mqtt_messages_match(left: &MqttMessage, right: &MqttMessage) -> bool {
+ left.topic == right.topic
+ && left.payload_base64 == right.payload_base64
+ && left.payload_text == right.payload_text
+ && left.qos == right.qos
+ && left.retain == right.retain
+ && left.received_at_ms == right.received_at_ms
+ && left.direction == right.direction
+}
+
impl Drop for MqttClient {
fn drop(&mut self) {
self.shutdown_notify.notify_one();
diff --git a/crates/dbx-core/src/admin/mqtt/service.rs b/crates/dbx-core/src/admin/mqtt/service.rs
index f8750b93bd..a1ac1818df 100644
--- a/crates/dbx-core/src/admin/mqtt/service.rs
+++ b/crates/dbx-core/src/admin/mqtt/service.rs
@@ -69,3 +69,8 @@ pub async fn clear_messages(client: &Arc<MqttClient>) -> Result<(), String> {
client.clear_messages().await;
Ok(())
}
+
+/// Remove one message from the live MQTT console buffer.
+pub async fn delete_message(client: &Arc<MqttClient>, message: &MqttMessage) {
+ client.delete_message(message).await;
+}
diff --git a/crates/dbx-core/src/persistence/storage.rs b/crates/dbx-core/src/persistence/storage.rs
index 4f9e3db4cf..e3b422ead7 100644
--- a/crates/dbx-core/src/persistence/storage.rs
+++ b/crates/dbx-core/src/persistence/storage.rs
@@ -7351,6 +7351,47 @@ impl Storage {
self.delete_state(&key).await
}
+ /// Remove one exact message from a connection's persisted MQTT history.
+ #[cfg(feature = "mq-admin")]
+ pub async fn delete_mqtt_message_history_entry(
+ &self,
+ connection_id: &str,
+ message: &MqttMessage,
+ ) -> Result<(), String> {
+ let key = format!("{MQTT_MESSAGE_HISTORY_STATE_KEY_PREFIX}{connection_id}");
+ let message_identity = mqtt_history_message_identity(message);
+ self.with_conn(move |conn| {
+ let tx =
+ conn.transaction_with_behavior(TransactionBehavior::Immediate).map_err(|error| error.to_string())?;
+ let current: Option<Vec<u8>> = tx
+ .query_row("SELECT value FROM state_store WHERE key = ?1", [&key], |row| row.get(0))
+ .optional()
+ .map_err(|error| error.to_string())?;
+ let Some(bytes) = current else {
+ tx.commit().map_err(|error| error.to_string())?;
+ return Ok(());
+ };
+ let mut messages: Vec<MqttMessage> = serde_json::from_slice(&bytes).map_err(|error| error.to_string())?;
+ if let Some(index) =
+ messages.iter().position(|candidate| mqtt_history_message_identity(candidate) == message_identity)
+ {
+ messages.remove(index);
+ if messages.is_empty() {
+ tx.execute("DELETE FROM state_store WHERE key = ?1", [&key]).map_err(|error| error.to_string())?;
+ } else {
+ let value = serde_json::to_vec(&messages).map_err(|error| error.to_string())?;
+ tx.execute(
+ "UPDATE state_store SET value = ?1, version = version + 1 WHERE key = ?2",
+ params![value, key],
+ )
+ .map_err(|error| error.to_string())?;
+ }
+ }
+ tx.commit().map_err(|error| error.to_string())
+ })
+ .await
+ }
+
/// Update only the persisted driver identity for an existing connection.
/// This is used after runtime driver fallback and deliberately leaves all
/// other connection metadata and separately stored secrets untouched.
diff --git a/src-tauri/src/commands/mqtt_cmd.rs b/src-tauri/src/commands/mqtt_cmd.rs
index b3100b1a66..d4e87d1b0a 100644
--- a/src-tauri/src/commands/mqtt_cmd.rs
+++ b/src-tauri/src/commands/mqtt_cmd.rs
@@ -267,6 +267,20 @@ pub async fn mqtt_clear_messages(state: State<'_, Arc<AppState>>, connection_id:
mqtt_clear_messages_inner(&state, connection_id).await
}
+/// Delete one message from the local MQTT console history and live buffer.
+#[tauri::command]
+pub async fn mqtt_delete_message(
+ state: State<'_, Arc<AppState>>,
+ connection_id: String,
+ message: MqttMessage,
+) -> Result<(), String> {
+ let client = get_mqtt_client(&state, &connection_id).await?;
+ let _history_guard = client.lock_message_history().await;
+ state.storage.delete_mqtt_message_history_entry(&connection_id, &message).await?;
+ service::delete_message(&client, &message).await;
+ Ok(())
+}
+
async fn mqtt_clear_messages_inner(state: &AppState, connection_id: String) -> Result<(), String> {
mqtt_clear_messages_inner_with_hook(state, connection_id, || async {}).await
}
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index c06183bd50..341b58ed3e 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -2731,6 +2731,8 @@ pub fn run() {
commands::mqtt_cmd::mqtt_get_messages,
#[cfg(feature = "mq-admin")]
commands::mqtt_cmd::mqtt_clear_messages,
+ #[cfg(feature = "mq-admin")]
+ commands::mqtt_cmd::mqtt_delete_message,
commands::history::save_history,
commands::history::load_history,
commands::history::search_history,