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。

fix(rabbitmq): add bounded paging for queue and exchange management lists

t8y2725b1ee25283
diff --git a/agents/drivers/rabbitmq/management.go b/agents/drivers/rabbitmq/management.go
index 16eda1d389..69df16798c 100644
--- a/agents/drivers/rabbitmq/management.go
+++ b/agents/drivers/rabbitmq/management.go
@@ -11,6 +11,9 @@ import (
"io"
"net"
"net/http"
+ "net/url"
+ "regexp"
+ "sort"
"strconv"
"strings"
"time"
@@ -21,10 +24,28 @@ const (
defaultManagementTLSPort = 15671
defaultAMQPTLSPort = 5671
managementPageSize = 100
+ managementMaxPageSize = 500
managementConnectTimeout = 10 * time.Second
managementRequestTimeout = 20 * time.Second
)
+type managementPageRequest struct {
+ Page int
+ PageSize int
+ Search string
+ UseRegex bool
+ Sort string
+ SortReverse bool
+}
+
+type managementPageResult struct {
+ Items []any
+ Page int
+ PageSize int
+ TotalCount int
+ HasMore bool
+}
+
type managementStatusError struct {
status int
method string
@@ -172,6 +193,204 @@ func managementGetAll(connection jsonObject, path string) ([]any, error) {
}
}
+// managementGetPage requests exactly one RabbitMQ management API page. Queue
+// and exchange endpoints in RabbitMQ 3.8.x return a pagination envelope when
+// page/page_size are present. The plain-array fallback keeps the agent usable
+// with endpoints or older brokers that ignore those parameters, while still
+// presenting the same explicit page contract to callers.
+func managementGetPage(connection jsonObject, path string, request managementPageRequest) (managementPageResult, error) {
+ if err := validateManagementPageRequest(request); err != nil {
+ return managementPageResult{}, err
+ }
+ query := url.Values{}
+ query.Set("page", strconv.Itoa(request.Page))
+ query.Set("page_size", strconv.Itoa(request.PageSize))
+ if request.Search != "" {
+ query.Set("name", request.Search)
+ query.Set("use_regex", strconv.FormatBool(request.UseRegex))
+ }
+ if request.Sort != "" {
+ query.Set("sort", request.Sort)
+ }
+ if request.SortReverse {
+ query.Set("sort_reverse", "true")
+ }
+
+ response, err := managementGet(connection, appendManagementQuery(path, query))
+ if err != nil {
+ return managementPageResult{}, err
+ }
+ switch typed := response.(type) {
+ case []any:
+ return paginateManagementArray(typed, request)
+ case map[string]any:
+ object := jsonObject(typed)
+ items, exists := typed["items"]
+ if !exists {
+ return managementPageResult{}, fmt.Errorf("Unexpected management API response for list endpoint %s", path)
+ }
+ array, ok := items.([]any)
+ if !ok {
+ return managementPageResult{}, fmt.Errorf("Unexpected management API items for list endpoint %s", path)
+ }
+ page := intOrDefault(object, "page", request.Page)
+ pageSize := intOrDefault(object, "page_size", request.PageSize)
+ totalCount := integerOrNull(object, "filtered_count")
+ if totalCount == nil {
+ totalCount = integerOrNull(object, "total_count")
+ }
+ if totalCount == nil {
+ inferred := (page-1)*pageSize + len(array)
+ totalCount = &inferred
+ }
+ pageCount := integerOrNull(object, "page_count")
+ hasMore := pageCount != nil && page < *pageCount
+ if pageCount == nil {
+ hasMore = page*pageSize < *totalCount
+ }
+ return managementPageResult{
+ Items: array,
+ Page: page,
+ PageSize: pageSize,
+ TotalCount: *totalCount,
+ HasMore: hasMore,
+ }, nil
+ default:
+ return managementPageResult{}, fmt.Errorf("Unexpected management API response for list endpoint %s", path)
+ }
+}
+
+func managementPageRequestFromParams(params jsonObject, allowedSorts ...string) (*managementPageRequest, error) {
+ page := integerOrNull(params, "page")
+ pageSize := integerOrNull(params, "page_size")
+ if page == nil && pageSize == nil {
+ return nil, nil
+ }
+ if page == nil || pageSize == nil {
+ return nil, errors.New("page and page_size must be provided together")
+ }
+ sortName := stringOrDefault(params, "sort", "name")
+ allowed := false
+ for _, candidate := range allowedSorts {
+ if sortName == candidate {
+ allowed = true
+ break
+ }
+ }
+ if !allowed {
+ return nil, fmt.Errorf("Unsupported list sort %q", sortName)
+ }
+ request := managementPageRequest{
+ Page: *page,
+ PageSize: *pageSize,
+ Search: strings.TrimSpace(stringOrEmpty(params, "search")),
+ Sort: sortName,
+ SortReverse: boolOrDefault(params, "sort_reverse", false),
+ }
+ if err := validateManagementPageRequest(request); err != nil {
+ return nil, err
+ }
+ return &request, nil
+}
+
+func validateManagementPageRequest(request managementPageRequest) error {
+ if request.Page < 1 {
+ return errors.New("page must be at least 1")
+ }
+ if request.PageSize < 1 || request.PageSize > managementMaxPageSize {
+ return fmt.Errorf("page_size must be between 1 and %d", managementMaxPageSize)
+ }
+ maxInt := int(^uint(0) >> 1)
+ if request.Page-1 > maxInt/request.PageSize {
+ return errors.New("page is too large")
+ }
+ return nil
+}
+
+func appendManagementQuery(path string, values url.Values) string {
+ separator := "?"
+ if strings.Contains(path, "?") {
+ separator = "&"
+ }
+ return path + separator + values.Encode()
+}
+
+func paginateManagementArray(items []any, request managementPageRequest) (managementPageResult, error) {
+ filtered := make([]any, 0, len(items))
+ var expression *regexp.Regexp
+ if request.Search != "" && request.UseRegex {
+ compiled, err := regexp.Compile("(?i)" + request.Search)
+ if err != nil {
+ return managementPageResult{}, fmt.Errorf("Invalid management list search: %w", err)
+ }
+ expression = compiled
+ }
+ search := strings.ToLower(request.Search)
+ for _, item := range items {
+ if request.Search != "" {
+ object, ok := item.(map[string]any)
+ if !ok {
+ continue
+ }
+ name := stringOrEmpty(jsonObject(object), "name")
+ if expression != nil {
+ if !expression.MatchString(name) {
+ continue
+ }
+ } else if !strings.Contains(strings.ToLower(name), search) {
+ continue
+ }
+ }
+ filtered = append(filtered, item)
+ }
+ sort.SliceStable(filtered, func(left, right int) bool {
+ leftObject, _ := filtered[left].(map[string]any)
+ rightObject, _ := filtered[right].(map[string]any)
+ leftJSON := jsonObject(leftObject)
+ rightJSON := jsonObject(rightObject)
+ comparison := 0
+ if request.Sort == "messages_ready" {
+ leftCount := longOrDefault(leftJSON, "messages_ready", 0)
+ rightCount := longOrDefault(rightJSON, "messages_ready", 0)
+ if leftCount < rightCount {
+ comparison = -1
+ } else if leftCount > rightCount {
+ comparison = 1
+ }
+ }
+ if comparison == 0 {
+ comparison = strings.Compare(stringOrEmpty(leftJSON, "name"), stringOrEmpty(rightJSON, "name"))
+ }
+ if request.SortReverse {
+ comparison = -comparison
+ }
+ return comparison < 0
+ })
+
+ totalCount := len(filtered)
+ start := (request.Page - 1) * request.PageSize
+ if start >= totalCount {
+ return managementPageResult{
+ Items: []any{},
+ Page: request.Page,
+ PageSize: request.PageSize,
+ TotalCount: totalCount,
+ HasMore: false,
+ }, nil
+ }
+ end := start + request.PageSize
+ if end > totalCount {
+ end = totalCount
+ }
+ return managementPageResult{
+ Items: filtered[start:end],
+ Page: request.Page,
+ PageSize: request.PageSize,
+ TotalCount: totalCount,
+ HasMore: end < totalCount,
+ }, nil
+}
+
func managementBaseURLs(connection jsonObject) ([]string, error) {
if explicit := stringOrNull(connection, "management_url"); explicit != nil && strings.TrimSpace(*explicit) != "" {
return []string{normalizeManagementURL(*explicit)}, nil
diff --git a/agents/drivers/rabbitmq/management_test.go b/agents/drivers/rabbitmq/management_test.go
index c412bc1462..67c007a1f4 100644
--- a/agents/drivers/rabbitmq/management_test.go
+++ b/agents/drivers/rabbitmq/management_test.go
@@ -135,6 +135,134 @@ func TestManagementGetAllPlainArray(t *testing.T) {
}
}
+func TestManagementGetPageRequestsOnlyOneRabbitMqPage(t *testing.T) {
+ requestCount := 0
+ server := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
+ requestCount++
+ query := request.URL.Query()
+ if query.Get("page") != "2" || query.Get("page_size") != "100" {
+ t.Fatalf("unexpected pagination query %q", request.URL.RawQuery)
+ }
+ if query.Get("name") != "orders & paid" || query.Get("use_regex") != "false" {
+ t.Fatalf("unexpected search query %q", request.URL.RawQuery)
+ }
+ if query.Get("sort") != "messages_ready" || query.Get("sort_reverse") != "true" {
+ t.Fatalf("unexpected sort query %q", request.URL.RawQuery)
+ }
+ writer.Header().Set("Content-Type", "application/json")
+ _, _ = io.WriteString(writer, `{"items":[{"name":"orders.paid"}],"page":2,"page_size":100,"page_count":3,"total_count":10000,"filtered_count":250}`)
+ }))
+ defer server.Close()
+
+ page, err := managementGetPage(jsonObject{"management_url": server.URL}, "/api/queues?columns=name", managementPageRequest{
+ Page: 2, PageSize: 100, Search: "orders & paid", Sort: "messages_ready", SortReverse: true,
+ })
+ if err != nil {
+ t.Fatal(err)
+ }
+ if requestCount != 1 {
+ t.Fatalf("expected one management request, got %d", requestCount)
+ }
+ if len(page.Items) != 1 || page.Page != 2 || page.PageSize != 100 || page.TotalCount != 250 || !page.HasMore {
+ t.Fatalf("unexpected page %#v", page)
+ }
+}
+
+func TestManagementGetPageFallsBackForPlainArrayResponses(t *testing.T) {
+ server := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
+ writer.Header().Set("Content-Type", "application/json")
+ _, _ = io.WriteString(writer, `[{"name":"alpha","messages_ready":1},{"name":"beta","messages_ready":9},{"name":"gamma","messages_ready":4}]`)
+ }))
+ defer server.Close()
+
+ page, err := managementGetPage(jsonObject{"management_url": server.URL}, "/api/queues", managementPageRequest{
+ Page: 1, PageSize: 2, Search: "a", Sort: "messages_ready", SortReverse: true,
+ })
+ if err != nil {
+ t.Fatal(err)
+ }
+ if page.TotalCount != 3 || !page.HasMore || len(page.Items) != 2 {
+ t.Fatalf("unexpected page %#v", page)
+ }
+ first, _ := page.Items[0].(map[string]any)
+ second, _ := page.Items[1].(map[string]any)
+ if stringOrEmpty(jsonObject(first), "name") != "beta" || stringOrEmpty(jsonObject(second), "name") != "gamma" {
+ t.Fatalf("unexpected sorted items %#v", page.Items)
+ }
+}
+
+func TestManagementPageRequestValidation(t *testing.T) {
+ for _, params := range []jsonObject{
+ {"page": 0, "page_size": 100, "sort": "name"},
+ {"page": 1, "page_size": managementMaxPageSize + 1, "sort": "name"},
+ {"page": 1},
+ {"page": 1, "page_size": 100, "sort": "unsupported"},
+ } {
+ if _, err := managementPageRequestFromParams(params, "name"); err == nil {
+ t.Fatalf("expected invalid page request %#v to fail", params)
+ }
+ }
+ if page, err := managementPageRequestFromParams(jsonObject{}, "name"); err != nil || page != nil {
+ t.Fatalf("legacy unpaged request changed: %#v, %v", page, err)
+ }
+}
+
+func TestListTopicsPagePreservesAllVhostIdentityWithoutDrainingPages(t *testing.T) {
+ requestCount := 0
+ server := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
+ requestCount++
+ if request.URL.Path != "/api/queues" {
+ t.Fatalf("unexpected all-vhosts path %q", request.URL.Path)
+ }
+ writer.Header().Set("Content-Type", "application/json")
+ _, _ = io.WriteString(writer, `{"items":[{"name":"orders","vhost":"staging","durable":true}],"page":1,"page_size":100,"page_count":100,"total_count":10000,"filtered_count":10000}`)
+ }))
+ defer server.Close()
+ service := newServer()
+ service.cachedConnection = jsonObject{"management_url": server.URL}
+
+ listed, err := service.listTopics(jsonObject{
+ "all_vhosts": true, "page": 1, "page_size": 100, "sort": "name",
+ })
+ if err != nil {
+ t.Fatal(err)
+ }
+ result := listed.(jsonObject)
+ topics := result["topics"].([]jsonObject)
+ if requestCount != 1 || len(topics) != 1 || stringOrEmpty(topics[0], "vhost") != "staging" {
+ t.Fatalf("unexpected paged topics %#v after %d requests", result, requestCount)
+ }
+ if intOrDefault(result, "totalCount", 0) != 10000 || !boolOrDefault(result, "hasMore", false) {
+ t.Fatalf("unexpected page metadata %#v", result)
+ }
+}
+
+func TestListExchangesPageSearchIncludesDisplayedDefaultExchange(t *testing.T) {
+ server := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
+ query := request.URL.Query()
+ if query.Get("use_regex") != "true" || !strings.Contains(query.Get("name"), "^$") {
+ t.Fatalf("default exchange search was not translated to a regex: %q", request.URL.RawQuery)
+ }
+ writer.Header().Set("Content-Type", "application/json")
+ _, _ = io.WriteString(writer, `{"items":[{"name":"","type":"direct","durable":true}],"page":1,"page_size":100,"page_count":1,"total_count":8,"filtered_count":1}`)
+ }))
+ defer server.Close()
+ service := newServer()
+ service.cachedConnection = jsonObject{"management_url": server.URL}
+
+ listed, err := service.listExchanges(jsonObject{
+ "virtual_host": "/", "page": 1, "page_size": 100, "search": "default", "sort": "name",
+ })
+ if err != nil {
+ t.Fatal(err)
+ }
+ result := listed.(jsonObject)
+ exchanges := result["exchanges"].([]jsonObject)
+ if len(exchanges) != 1 || stringOrEmpty(exchanges[0], "name") != "" || intOrDefault(result, "totalCount", 0) != 1 {
+ t.Fatalf("unexpected exchange page %#v", result)
+ }
+}
+
func TestManagementRequestFailsOverConnectionErrors(t *testing.T) {
listener, err := net.Listen("tcp", "127.0.0.2:0")
if err != nil {
diff --git a/agents/drivers/rabbitmq/operations.go b/agents/drivers/rabbitmq/operations.go
index fdcdf75482..87205d5cd5 100644
--- a/agents/drivers/rabbitmq/operations.go
+++ b/agents/drivers/rabbitmq/operations.go
@@ -8,6 +8,7 @@ import (
"fmt"
"net/http"
"os"
+ "regexp"
"sort"
"strings"
"unicode/utf8"
@@ -30,7 +31,22 @@ func (s *server) listTopics(params jsonObject) (any, error) {
return nil, err
}
allVhosts := allVhostsRequested(params)
- queues, err := managementGetAll(connection, managementListPath(params, connection, "queues"))
+ pageRequest, err := managementPageRequestFromParams(params, "name", "messages_ready")
+ if err != nil {
+ return nil, err
+ }
+ var queues []any
+ var pageResult *managementPageResult
+ if pageRequest == nil {
+ queues, err = managementGetAll(connection, managementListPath(params, connection, "queues"))
+ } else {
+ page, pageErr := managementGetPage(connection, managementListPath(params, connection, "queues"), *pageRequest)
+ if pageErr != nil {
+ return nil, pageErr
+ }
+ queues = page.Items
+ pageResult = &page
+ }
if err != nil {
return nil, err
}
@@ -46,10 +62,12 @@ func (s *server) listTopics(params jsonObject) (any, error) {
}
topics = append(topics, info)
}
- sort.SliceStable(topics, func(left, right int) bool {
- return stringOrEmpty(topics[left], "name") < stringOrEmpty(topics[right], "name")
- })
- return jsonObject{"topics": topics}, nil
+ if pageRequest == nil {
+ sort.SliceStable(topics, func(left, right int) bool {
+ return stringOrEmpty(topics[left], "name") < stringOrEmpty(topics[right], "name")
+ })
+ }
+ return managementListResult("topics", topics, pageResult), nil
}
func topicInfoFromJSON(queue jsonObject) jsonObject {
@@ -382,7 +400,29 @@ func (s *server) listExchanges(params jsonObject) (any, error) {
return nil, err
}
allVhosts := allVhostsRequested(params)
- exchanges, err := managementGetAll(connection, managementListPath(params, connection, "exchanges"))
+ pageRequest, err := managementPageRequestFromParams(params, "name")
+ if err != nil {
+ return nil, err
+ }
+ if pageRequest != nil && pageRequest.Search != "" && strings.Contains(strings.ToLower("(AMQP default)"), strings.ToLower(pageRequest.Search)) {
+ // The UI displays the empty-name default exchange as "(AMQP default)".
+ // Include it in the broker-side name search whenever that display label
+ // matches, while retaining ordinary substring matches.
+ pageRequest.Search = "(" + regexp.QuoteMeta(pageRequest.Search) + "|^$)"
+ pageRequest.UseRegex = true
+ }
+ var exchanges []any
+ var pageResult *managementPageResult
+ if pageRequest == nil {
+ exchanges, err = managementGetAll(connection, managementListPath(params, connection, "exchanges"))
+ } else {
+ page, pageErr := managementGetPage(connection, managementListPath(params, connection, "exchanges"), *pageRequest)
+ if pageErr != nil {
+ return nil, pageErr
+ }
+ exchanges = page.Items
+ pageResult = &page
+ }
if err != nil {
return nil, err
}
@@ -398,10 +438,24 @@ func (s *server) listExchanges(params jsonObject) (any, error) {
}
result = append(result, info)
}
- sort.SliceStable(result, func(left, right int) bool {
- return stringOrEmpty(result[left], "name") < stringOrEmpty(result[right], "name")
- })
- return jsonObject{"exchanges": result}, nil
+ if pageRequest == nil {
+ sort.SliceStable(result, func(left, right int) bool {
+ return stringOrEmpty(result[left], "name") < stringOrEmpty(result[right], "name")
+ })
+ }
+ return managementListResult("exchanges", result, pageResult), nil
+}
+
+func managementListResult(key string, items []jsonObject, page *managementPageResult) jsonObject {
+ result := jsonObject{key: items}
+ if page == nil {
+ return result
+ }
+ result["page"] = page.Page
+ result["pageSize"] = page.PageSize
+ result["totalCount"] = page.TotalCount
+ result["hasMore"] = page.HasMore
+ return result
}
func exchangeInfoFromJSON(exchange jsonObject) jsonObject {
diff --git a/apps/desktop/src/components/mq/ExchangesPanel.vue b/apps/desktop/src/components/mq/ExchangesPanel.vue
index 9706a7a056..f539d0451a 100644
--- a/apps/desktop/src/components/mq/ExchangesPanel.vue
+++ b/apps/desktop/src/components/mq/ExchangesPanel.vue
@@ -1,13 +1,17 @@
<script setup lang="ts">
-import { computed, ref, watch } from "vue";
+import { computed, onBeforeUnmount, ref, watch } from "vue";
import { useI18n } from "vue-i18n";
-import type { MqBindingInfo, MqExchangeInfo, MqExchangeType, NamespaceRef, TopicInfo } from "@/types/mq";
-import { mqBind, mqCreateExchange, mqDeleteExchange, mqListBindings, mqListExchanges, mqListTopics, mqUnbind } from "@/lib/backend/api";
+import type { MqBindingInfo, MqExchangeInfo, MqExchangeType, MqListPageRequest, NamespaceRef, TopicInfo } from "@/types/mq";
+import { mqBind, mqCreateExchange, mqDeleteExchange, mqListBindings, mqListExchangesPage, mqListTopicsPage, mqUnbind } from "@/lib/backend/api";
import { formatError } from "@/lib/backend/errorUtils";
import { isBuiltinRabbitMqExchange, rabbitMqExchangeDisplayName, RABBITMQ_EXCHANGE_TYPES } from "@/lib/mq/rabbitmqExchanges";
import { isAllVhostsNamespace, resolveMqRowNamespace } from "@/lib/mq/mqConsoleDefaults";
import { useMqMutationGuard } from "@/composables/useMqMutationGuard";
import DangerConfirmDialog from "@/components/editor/DangerConfirmDialog.vue";
+import MqListPagination from "./shared/MqListPagination.vue";
+
+const RABBITMQ_DEFAULT_PAGE_SIZE = 100;
+const RABBITMQ_SEARCH_DEBOUNCE_MS = 250;
interface Props {
connectionId: string;
@@ -25,6 +29,12 @@ const loading = ref(false);
const error = ref<string>();
const exchangeSearch = ref("");
const selectedExchange = ref<MqExchangeInfo>();
+const exchangePage = ref(1);
+const exchangePageSize = ref(RABBITMQ_DEFAULT_PAGE_SIZE);
+const exchangeTotalCount = ref(0);
+const exchangeHasMore = ref(false);
+let exchangeLoadSequence = 0;
+let exchangeSearchTimer: ReturnType<typeof setTimeout> | undefined;
const bindings = ref<MqBindingInfo[]>([]);
const bindingsLoading = ref(false);
@@ -58,6 +68,9 @@ const unbindTarget = ref<MqBindingInfo>();
const unbinding = ref(false);
const availableQueues = ref<TopicInfo[]>([]);
+const availableQueueTotal = ref(0);
+let queueLoadSequence = 0;
+let queueSearchTimer: ReturnType<typeof setTimeout> | undefined;
const filteredExchanges = computed(() => {
const query = exchangeSearch.value.trim().toLowerCase();
@@ -92,24 +105,60 @@ async function guardWritable(operation: string): Promise<boolean> {
async function loadExchanges() {
const ns = nsRef();
if (!ns) {
+ exchangeLoadSequence += 1;
exchanges.value = [];
+ exchangeTotalCount.value = 0;
+ exchangeHasMore.value = false;
return;
}
+ const loadSequence = ++exchangeLoadSequence;
loading.value = true;
error.value = undefined;
try {
- exchanges.value = await mqListExchanges(props.connectionId, ns);
+ const pagination: MqListPageRequest = {
+ page: exchangePage.value,
+ pageSize: exchangePageSize.value,
+ search: exchangeSearch.value.trim() || undefined,
+ sort: "name",
+ sortDescending: false,
+ };
+ const result = await mqListExchangesPage(props.connectionId, ns, pagination);
+ if (loadSequence !== exchangeLoadSequence) return;
+ const lastPage = Math.max(1, Math.ceil(result.totalCount / result.pageSize));
+ if (result.page > lastPage) {
+ exchangePage.value = lastPage;
+ void loadExchanges();
+ return;
+ }
+ exchanges.value = result.items;
+ exchangePage.value = result.page;
+ exchangePageSize.value = result.pageSize;
+ exchangeTotalCount.value = result.totalCount;
+ exchangeHasMore.value = result.hasMore;
if (selectedExchange.value && !exchanges.value.some((exchange) => exchange.name === selectedExchange.value?.name && exchange.namespace === selectedExchange.value?.namespace)) {
selectedExchange.value = undefined;
bindings.value = [];
}
} catch (e: unknown) {
+ if (loadSequence !== exchangeLoadSequence) return;
error.value = formatError(e);
} finally {
- loading.value = false;
+ if (loadSequence === exchangeLoadSequence) loading.value = false;
}
}
+function changeExchangePage(page: number) {
+ if (page < 1 || page === exchangePage.value) return;
+ exchangePage.value = page;
+ void loadExchanges();
+}
+
+function changeExchangePageSize(pageSize: number) {
+ exchangePageSize.value = pageSize;
+ exchangePage.value = 1;
+ void loadExchanges();
+}
+
async function loadBindings(exchange: MqExchangeInfo) {
const ns = nsRefFor(exchange);
if (!ns) return;
@@ -124,12 +173,28 @@ async function loadBindings(exchange: MqExchangeInfo) {
}
}
-async function loadQueues() {
+async function loadQueues(search = "") {
const ns = nsRefFor(selectedExchange.value);
if (!ns) return;
+ const loadSequence = ++queueLoadSequence;
try {
- availableQueues.value = await mqListTopics(props.connectionId, ns, { includeNonPersistent: false });
+ const result = await mqListTopicsPage(
+ props.connectionId,
+ ns,
+ { includeNonPersistent: false },
+ {
+ page: 1,
+ pageSize: RABBITMQ_DEFAULT_PAGE_SIZE,
+ search: search.trim() || undefined,
+ sort: "name",
+ sortDescending: false,
+ },
+ );
+ if (loadSequence !== queueLoadSequence) return;
+ availableQueues.value = result.items;
+ availableQueueTotal.value = result.totalCount;
} catch (e: unknown) {
+ if (loadSequence !== queueLoadSequence) return;
console.warn("[DBX] Failed to load queues for binding dialog:", e);
}
}
@@ -224,7 +289,6 @@ function openBindDialog() {
if (!selectedExchange.value) return;
dialogError.value = undefined;
bindForm.value = { destinationType: "queue", destination: "", routingKey: "", argumentsText: "" };
- void loadQueues();
showBindDialog.value = true;
}
@@ -312,20 +376,50 @@ function formatBindingArguments(bindingRow: MqBindingInfo): string {
watch(
() => [props.tenant, props.namespace],
() => {
+ if (exchangeSearchTimer) clearTimeout(exchangeSearchTimer);
+ exchangePage.value = 1;
selectedExchange.value = undefined;
bindings.value = [];
loadExchanges();
},
{ immediate: true },
);
+
+watch(exchangeSearch, () => {
+ if (exchangeSearchTimer) clearTimeout(exchangeSearchTimer);
+ exchangeSearchTimer = setTimeout(() => {
+ exchangeSearchTimer = undefined;
+ exchangePage.value = 1;
+ void loadExchanges();
+ }, RABBITMQ_SEARCH_DEBOUNCE_MS);
+});
+
+watch(
+ () => [bindForm.value.destination, bindForm.value.destinationType, showBindDialog.value] as const,
+ ([destination, destinationType, open]) => {
+ if (queueSearchTimer) clearTimeout(queueSearchTimer);
+ if (!open || destinationType !== "queue") return;
+ queueSearchTimer = setTimeout(() => {
+ queueSearchTimer = undefined;
+ void loadQueues(destination);
+ }, RABBITMQ_SEARCH_DEBOUNCE_MS);
+ },
+);
+
+onBeforeUnmount(() => {
+ exchangeLoadSequence += 1;
+ queueLoadSequence += 1;
+ if (exchangeSearchTimer) clearTimeout(exchangeSearchTimer);
+ if (queueSearchTimer) clearTimeout(queueSearchTimer);
+});
</script>
<template>
<div class="exchanges-panel">
<div class="panel-toolbar">
<div class="toolbar-left">
- <input v-model="exchangeSearch" type="search" class="exchange-search" :placeholder="t('mqExchanges.searchPlaceholder')" :disabled="loading && !exchanges.length" />
- <span v-if="exchanges.length" class="exchange-count">{{ filteredExchanges.length }} / {{ exchanges.length }}</span>
+ <input v-model="exchangeSearch" type="search" class="exchange-search" :placeholder="t('mqExchanges.searchPlaceholder')" :disabled="loading && !exchanges.length && !exchangeSearch" />
+ <span v-if="exchanges.length" class="exchange-count">{{ filteredExchanges.length }} / {{ exchangeTotalCount }}</span>
</div>
<div class="toolbar-actions">
<button @click="loadExchanges" :disabled="loading || !tenant || !namespace" class="btn-secondary">
@@ -341,7 +435,7 @@ watch(
<div v-else-if="loading && !exchanges.length" class="panel-loading">{{ t("mqExchanges.loading") }}</div>
- <div v-else-if="!exchanges.length" class="panel-placeholder">{{ t("mqExchanges.noExchanges") }}</div>
+ <div v-else-if="!exchanges.length" class="panel-placeholder">{{ exchangeSearch.trim() ? t("mqExchanges.noMatches") : t("mqExchanges.noExchanges") }}</div>
<div v-else-if="!filteredExchanges.length" class="panel-placeholder">{{ t("mqExchanges.noMatches") }}</div>
@@ -382,6 +476,8 @@ watch(
</table>
</div>
+ <MqListPagination v-if="exchangeTotalCount > exchangePageSize || exchangePage > 1" :page="exchangePage" :page-size="exchangePageSize" :total-count="exchangeTotalCount" :has-more="exchangeHasMore" :loading="loading" @page-change="changeExchangePage" @page-size-change="changeExchangePageSize" />
+
<!-- Bindings of the selected exchange -->
<div v-if="selectedExchange" class="bindings-section">
<div class="bindings-header">
@@ -495,6 +591,7 @@ watch(
<datalist id="mq-exchange-bind-queues">
<option v-for="queue in availableQueues" :key="queue.name" :value="queue.shortName" />
</datalist>
+ <small v-if="bindForm.destinationType === 'queue' && availableQueueTotal > availableQueues.length" class="queue-suggestion-count">{{ availableQueues.length }} / {{ availableQueueTotal }}</small>
</div>
<div class="form-group">
<label>{{ t("mqExchanges.routingKey") }}</label>
@@ -591,6 +688,13 @@ watch(
font-size: 12px;
}
+.queue-suggestion-count {
+ display: block;
+ margin-top: 4px;
+ color: var(--color-text-tertiary);
+ font-size: 11px;
+}
+
.panel-placeholder,
.panel-error,
.panel-loading {
diff --git a/apps/desktop/src/components/mq/TopicsPanel.vue b/apps/desktop/src/components/mq/TopicsPanel.vue
index 6609388d3c..f2f6c06043 100644
--- a/apps/desktop/src/components/mq/TopicsPanel.vue
+++ b/apps/desktop/src/components/mq/TopicsPanel.vue
@@ -1,10 +1,10 @@
<script setup lang="ts">
-import { ref, watch, computed } from "vue";
+import { ref, watch, computed, onBeforeUnmount } from "vue";
import { useI18n } from "vue-i18n";
import { RecycleScroller } from "vue-virtual-scroller";
import "vue-virtual-scroller/dist/vue-virtual-scroller.css";
-import type { NamespaceRef, TopicRef, TopicInfo, ListTopicsOpts, MqSystemKind, RocketMqTopicMessageType } from "@/types/mq";
-import { mqListTopics, mqCreateTopic, mqDeleteTopic, mqUpdatePartitions, mqGetClusterInfo } from "@/lib/backend/api";
+import type { NamespaceRef, TopicRef, TopicInfo, ListTopicsOpts, MqListPageRequest, MqSystemKind, RocketMqTopicMessageType } from "@/types/mq";
+import { mqListTopics, mqListTopicsPage, mqCreateTopic, mqDeleteTopic, mqUpdatePartitions, mqGetClusterInfo } from "@/lib/backend/api";
import type { ClusterInfo } from "@/types/mq";
import RocketMqTopicDialogs, { type RocketMqTopicDialogKind } from "./rocketmq/RocketMqTopicDialogs.vue";
import SendMessagePanel from "./SendMessagePanel.vue";
@@ -17,8 +17,11 @@ import { formatError } from "@/lib/backend/errorUtils";
import { DEFAULT_ROCKETMQ_TOPIC_TYPE_FILTERS, isProtectedRocketMqTopic, isRocketMqBusinessMessageType, matchesRocketMqTypeFilters, resolveRocketMqMessageType, ROCKETMQ_CREATABLE_TOPIC_MESSAGE_TYPES, ROCKETMQ_TOPIC_MESSAGE_TYPES } from "@/lib/mq/rocketmqTopicTypes";
import { useMqMutationGuard } from "@/composables/useMqMutationGuard";
import DangerConfirmDialog from "@/components/editor/DangerConfirmDialog.vue";
+import MqListPagination from "./shared/MqListPagination.vue";
const TOPIC_ROW_HEIGHT = 44;
+const RABBITMQ_DEFAULT_PAGE_SIZE = 100;
+const RABBITMQ_SEARCH_DEBOUNCE_MS = 250;
type VirtualTopicRow = {
id: string;
@@ -98,6 +101,12 @@ const showNamespaceColumn = computed(() => isRabbitMqCluster.value && isAllVhost
const showRabbitMqSubTabs = computed(() => isRabbitMqCluster.value && props.supportsExchanges === true);
const rabbitMqSubTab = ref<"queues" | "exchanges">("queues");
const rabbitMqMessageSort = ref<"asc" | "desc" | null>(null);
+const rabbitMqPage = ref(1);
+const rabbitMqPageSize = ref(RABBITMQ_DEFAULT_PAGE_SIZE);
+const rabbitMqTotalCount = ref(0);
+const rabbitMqHasMore = ref(false);
+let topicLoadSequence = 0;
+let topicSearchTimer: ReturnType<typeof setTimeout> | undefined;
const rocketMqTopicTypeOptions = ROCKETMQ_TOPIC_MESSAGE_TYPES;
const rocketMqCreatableTopicTypes = ROCKETMQ_CREATABLE_TOPIC_MESSAGE_TYPES;
const rocketMqClusterName = computed(() => clusterInfo.value?.clusterId ?? "-");
@@ -224,6 +233,8 @@ function rabbitMqRatesTitle(): string {
function toggleRabbitMqMessageSort() {
rabbitMqMessageSort.value = rabbitMqMessageSort.value === "desc" ? "asc" : "desc";
+ rabbitMqPage.value = 1;
+ void loadTopics();
}
function topicTypeLabel(topic: TopicInfo): string {
@@ -269,9 +280,13 @@ async function guardWritable(operation: string): Promise<boolean> {
async function loadTopics() {
if (!props.tenant || !props.namespace) {
+ topicLoadSequence += 1;
topics.value = [];
+ rabbitMqTotalCount.value = 0;
+ rabbitMqHasMore.value = false;
return;
}
+ const loadSequence = ++topicLoadSequence;
loading.value = true;
error.value = undefined;
try {
@@ -282,14 +297,53 @@ async function loadTopics() {
const opts: ListTopicsOpts = {
includeNonPersistent: includeNonPersistent.value,
};
- topics.value = await mqListTopics(props.connectionId, ns, opts);
+ if (isRabbitMqCluster.value) {
+ const pagination: MqListPageRequest = {
+ page: rabbitMqPage.value,
+ pageSize: rabbitMqPageSize.value,
+ search: topicSearch.value.trim() || undefined,
+ sort: rabbitMqMessageSort.value ? "messagesReady" : "name",
+ sortDescending: rabbitMqMessageSort.value === "desc",
+ };
+ const result = await mqListTopicsPage(props.connectionId, ns, opts, pagination);
+ if (loadSequence !== topicLoadSequence) return;
+ const lastPage = Math.max(1, Math.ceil(result.totalCount / result.pageSize));
+ if (result.page > lastPage) {
+ rabbitMqPage.value = lastPage;
+ void loadTopics();
+ return;
+ }
+ topics.value = result.items;
+ rabbitMqPage.value = result.page;
+ rabbitMqPageSize.value = result.pageSize;
+ rabbitMqTotalCount.value = result.totalCount;
+ rabbitMqHasMore.value = result.hasMore;
+ } else {
+ topics.value = await mqListTopics(props.connectionId, ns, opts);
+ if (loadSequence !== topicLoadSequence) return;
+ rabbitMqTotalCount.value = topics.value.length;
+ rabbitMqHasMore.value = false;
+ }
} catch (e: unknown) {
+ if (loadSequence !== topicLoadSequence) return;
error.value = formatError(e);
} finally {
- loading.value = false;
+ if (loadSequence === topicLoadSequence) loading.value = false;
}
}
+function changeRabbitMqPage(page: number) {
+ if (page < 1 || page === rabbitMqPage.value) return;
+ rabbitMqPage.value = page;
+ void loadTopics();
+}
+
+function changeRabbitMqPageSize(pageSize: number) {
+ rabbitMqPageSize.value = pageSize;
+ rabbitMqPage.value = 1;
+ void loadTopics();
+}
+
async function loadClusterInfo() {
if (!isRocketMqCluster.value) return;
try {
@@ -513,6 +567,8 @@ function normalizePartitionInput() {
watch(
() => [props.tenant, props.namespace],
() => {
+ if (topicSearchTimer) clearTimeout(topicSearchTimer);
+ rabbitMqPage.value = 1;
selectedTopic.value = undefined;
loadTopics();
if (isRocketMqCluster.value) void loadClusterInfo();
@@ -529,14 +585,30 @@ watch(
);
watch(includeNonPersistent, () => {
+ rabbitMqPage.value = 1;
loadTopics();
});
+watch(topicSearch, () => {
+ if (!isRabbitMqCluster.value) return;
+ if (topicSearchTimer) clearTimeout(topicSearchTimer);
+ topicSearchTimer = setTimeout(() => {
+ topicSearchTimer = undefined;
+ rabbitMqPage.value = 1;
+ void loadTopics();
+ }, RABBITMQ_SEARCH_DEBOUNCE_MS);
+});
+
watch(newPartitions, () => {
if (dialogError.value === t("mqTopics.partitionMustIncrease") && canSubmitPartitionUpdate.value) {
dialogError.value = undefined;
}
});
+
+onBeforeUnmount(() => {
+ topicLoadSequence += 1;
+ if (topicSearchTimer) clearTimeout(topicSearchTimer);
+});
</script>
<template>
@@ -552,8 +624,8 @@ watch(newPartitions, () => {
<div class="panel-toolbar">
<div class="toolbar-left">
<h3>{{ t("mqTopics.title") }}</h3>
- <input v-model="topicSearch" type="search" class="topic-search" :placeholder="t('mqTopics.searchPlaceholder')" :disabled="loading && !topics.length" />
- <span v-if="topics.length" class="topic-count"> {{ filteredTopics.length }} / {{ typeFilteredTopics.length }} </span>
+ <input v-model="topicSearch" type="search" class="topic-search" :placeholder="t('mqTopics.searchPlaceholder')" :disabled="loading && !topics.length && !topicSearch" />
+ <span v-if="topics.length" class="topic-count"> {{ filteredTopics.length }} / {{ isRabbitMqCluster ? rabbitMqTotalCount : typeFilteredTopics.length }} </span>
<label v-if="isKafkaCluster" class="checkbox-label">
<input v-model="includeSystemTopics" type="checkbox" />
{{ t("mqTopics.includeSystemTopics") }}
@@ -584,7 +656,7 @@ watch(newPartitions, () => {
<div v-else-if="loading && !topics.length" class="panel-loading">{{ t("mqTopics.loading") }}</div>
- <div v-else-if="!topics.length" class="panel-placeholder">{{ t("mqTopics.noTopics") }}</div>
+ <div v-else-if="!topics.length" class="panel-placeholder">{{ isRabbitMqCluster && topicSearch.trim() ? t("mqTopics.noMatches") : t("mqTopics.noTopics") }}</div>
<div v-else-if="!filteredTopics.length" class="panel-placeholder">
{{ isRocketMqCluster && userTopicCount === 0 ? t("mqTopics.noUserTopics") : isKafkaCluster && !includeSystemTopics && userTopicCount === 0 ? t("mqTopics.noUserTopics") : t("mqTopics.noMatches") }}
@@ -690,6 +762,17 @@ watch(newPartitions, () => {
</div>
</div>
+ <MqListPagination
+ v-if="isRabbitMqCluster && (rabbitMqTotalCount > rabbitMqPageSize || rabbitMqPage > 1)"
+ :page="rabbitMqPage"
+ :page-size="rabbitMqPageSize"
+ :total-count="rabbitMqTotalCount"
+ :has-more="rabbitMqHasMore"
+ :loading="loading"
+ @page-change="changeRabbitMqPage"
+ @page-size-change="changeRabbitMqPageSize"
+ />
+
<!-- Create Dialog -->
<div v-if="showCreateDialog" class="dialog-overlay" @click="showCreateDialog = false">
<div class="dialog" @click.stop>
diff --git a/apps/desktop/src/components/mq/__tests__/ExchangesPanel.spec.ts b/apps/desktop/src/components/mq/__tests__/ExchangesPanel.spec.ts
new file mode 100644
index 0000000000..5740e7935d
--- /dev/null
+++ b/apps/desktop/src/components/mq/__tests__/ExchangesPanel.spec.ts
@@ -0,0 +1,127 @@
+// @vitest-environment happy-dom
+
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { createApp, defineComponent, h, nextTick, type App } from "vue";
+
+const backend = vi.hoisted(() => ({
+ mqBind: vi.fn(),
+ mqCreateExchange: vi.fn(),
+ mqDeleteExchange: vi.fn(),
+ mqListBindings: vi.fn(),
+ mqListExchangesPage: vi.fn(),
+ mqListTopicsPage: vi.fn(),
+ mqUnbind: vi.fn(),
+}));
+
+vi.mock("vue-i18n", () => ({
+ useI18n: () => ({ t: (key: string, params?: { page?: number }) => (params?.page ? `${key}:${params.page}` : key) }),
+}));
+
+vi.mock("@/lib/backend/api", () => backend);
+
+vi.mock("@/composables/useMqMutationGuard", () => ({
+ useMqMutationGuard: () => ({ confirmMqWrite: vi.fn().mockResolvedValue(true) }),
+}));
+
+vi.mock("@/components/editor/DangerConfirmDialog.vue", () => ({
+ default: defineComponent({ setup: () => () => h("div") }),
+}));
+
+import ExchangesPanel from "@/components/mq/ExchangesPanel.vue";
+
+let app: App<Element> | null = null;
+let root: HTMLDivElement | null = null;
+
+async function flushUi() {
+ await Promise.resolve();
+ await Promise.resolve();
+ await nextTick();
+}
+
+async function mountPanel(namespace = "/") {
+ root = document.createElement("div");
+ document.body.appendChild(root);
+ app = createApp(ExchangesPanel, {
+ connectionId: "rabbit-1",
+ tenant: "_rabbitmq",
+ namespace,
+ });
+ app.mount(root);
+ await flushUi();
+ return root;
+}
+
+function exchangeNames(container: ParentNode): string[] {
+ return [...container.querySelectorAll<HTMLElement>(".exchange-name-cell > span:first-child")].map((item) => item.textContent ?? "");
+}
+
+beforeEach(() => {
+ vi.useRealTimers();
+ Object.values(backend).forEach((mock) => mock.mockReset());
+ backend.mqListBindings.mockResolvedValue([]);
+ backend.mqListTopicsPage.mockResolvedValue({ items: [], page: 1, pageSize: 100, totalCount: 0, hasMore: false });
+ backend.mqListExchangesPage.mockResolvedValue({
+ items: [{ name: "events", type: "topic", durable: true, autoDelete: false, internal: false }],
+ page: 1,
+ pageSize: 100,
+ totalCount: 1,
+ hasMore: false,
+ });
+});
+
+afterEach(() => {
+ app?.unmount();
+ app = null;
+ root?.remove();
+ root = null;
+ vi.useRealTimers();
+});
+
+describe("ExchangesPanel RabbitMQ pagination", () => {
+ it("requests one page at a time and retains all-vhost row identity", async () => {
+ backend.mqListExchangesPage
+ .mockResolvedValueOnce({
+ items: [{ name: "events", namespace: "/", type: "topic", durable: true, autoDelete: false, internal: false }],
+ page: 1,
+ pageSize: 100,
+ totalCount: 101,
+ hasMore: true,
+ })
+ .mockResolvedValueOnce({
+ items: [{ name: "events", namespace: "/staging", type: "topic", durable: true, autoDelete: false, internal: false }],
+ page: 2,
+ pageSize: 100,
+ totalCount: 101,
+ hasMore: false,
+ });
+ const panel = await mountPanel("*");
+
+ expect(exchangeNames(panel)).toEqual(["events"]);
+ expect(panel.querySelector("tbody td:nth-child(2)")?.textContent?.trim()).toBe("/");
+ const next = panel.querySelector<HTMLButtonElement>('[data-testid="mq-list-next"]');
+ if (!next) throw new Error("next page button not found");
+ next.click();
+ await flushUi();
+
+ expect(panel.querySelector("tbody td:nth-child(2)")?.textContent?.trim()).toBe("/staging");
+ expect(backend.mqListExchangesPage).toHaveBeenLastCalledWith("rabbit-1", { tenant: "_rabbitmq", namespace: "*" }, expect.objectContaining({ page: 2, pageSize: 100, sort: "name" }));
+ });
+
+ it("debounces search into the server-side page request", async () => {
+ vi.useFakeTimers();
+ const panel = await mountPanel();
+ backend.mqListExchangesPage.mockClear();
+ backend.mqListExchangesPage.mockResolvedValue({ items: [], page: 1, pageSize: 100, totalCount: 0, hasMore: false });
+
+ const search = panel.querySelector<HTMLInputElement>(".exchange-search");
+ if (!search) throw new Error("exchange search not found");
+ search.value = "orders";
+ search.dispatchEvent(new Event("input"));
+ await nextTick();
+ expect(backend.mqListExchangesPage).not.toHaveBeenCalled();
+
+ await vi.advanceTimersByTimeAsync(250);
+ await flushUi();
+ expect(backend.mqListExchangesPage).toHaveBeenCalledWith("rabbit-1", { tenant: "_rabbitmq", namespace: "/" }, expect.objectContaining({ page: 1, search: "orders" }));
+ });
+});
diff --git a/apps/desktop/src/components/mq/__tests__/TopicsPanel.spec.ts b/apps/desktop/src/components/mq/__tests__/TopicsPanel.spec.ts
index f6bfb2cc3f..6f957d5cba 100644
--- a/apps/desktop/src/components/mq/__tests__/TopicsPanel.spec.ts
+++ b/apps/desktop/src/components/mq/__tests__/TopicsPanel.spec.ts
@@ -5,6 +5,7 @@ import { createApp, defineComponent, h, nextTick, type App } from "vue";
const backend = vi.hoisted(() => ({
mqListTopics: vi.fn(),
+ mqListTopicsPage: vi.fn(),
mqCreateTopic: vi.fn(),
mqDeleteTopic: vi.fn(),
mqUpdatePartitions: vi.fn(),
@@ -99,42 +100,64 @@ async function mountRabbitMqAllVhostsPanel() {
return root;
}
+async function mountKafkaPanel() {
+ root = document.createElement("div");
+ document.body.appendChild(root);
+ app = createApp(TopicsPanel, {
+ connectionId: "kafka-1",
+ tenant: "_flat_mq",
+ namespace: "_flat_mq",
+ mqSystemKind: "kafka",
+ isFlatMqCluster: true,
+ });
+ app.mount(root);
+ await flushUi();
+ return root;
+}
+
function rowNames(container: ParentNode): string[] {
return [...container.querySelectorAll<HTMLElement>(".topic-name-text")].map((item) => item.textContent ?? "");
}
beforeEach(() => {
+ vi.useRealTimers();
Object.values(backend).forEach((mock) => mock.mockReset());
- backend.mqListTopics.mockResolvedValue([
- {
- name: "alpha",
- shortName: "alpha",
- partitioned: false,
- persistent: true,
- messageCount: 4,
- messagesReady: 3,
- messagesUnacked: 1,
- queueType: "quorum",
- state: "running",
- autoDelete: true,
- consumerCount: 2,
- arguments: { "x-queue-type": "quorum", "x-message-ttl": 60000, "x-dead-letter-exchange": "dlx" },
- publishRate: 12.5,
- deliverRate: 11.8,
- ackRate: 11.2,
- },
- {
- name: "beta",
- shortName: "beta",
- partitioned: false,
- persistent: true,
- messageCount: 12,
- messagesReady: 12,
- messagesUnacked: 0,
- // No queue type, no arguments, and no message_stats sample:
- // type stays unknown, rates render as "-" (never fabricated zeros).
- },
- ]);
+ backend.mqListTopicsPage.mockResolvedValue({
+ items: [
+ {
+ name: "alpha",
+ shortName: "alpha",
+ partitioned: false,
+ persistent: true,
+ messageCount: 4,
+ messagesReady: 3,
+ messagesUnacked: 1,
+ queueType: "quorum",
+ state: "running",
+ autoDelete: true,
+ consumerCount: 2,
+ arguments: { "x-queue-type": "quorum", "x-message-ttl": 60000, "x-dead-letter-exchange": "dlx" },
+ publishRate: 12.5,
+ deliverRate: 11.8,
+ ackRate: 11.2,
+ },
+ {
+ name: "beta",
+ shortName: "beta",
+ partitioned: false,
+ persistent: true,
+ messageCount: 12,
+ messagesReady: 12,
+ messagesUnacked: 0,
+ // No queue type, no arguments, and no message_stats sample:
+ // type stays unknown, rates render as "-" (never fabricated zeros).
+ },
+ ],
+ page: 1,
+ pageSize: 100,
+ totalCount: 2,
+ hasMore: false,
+ });
});
afterEach(() => {
@@ -142,6 +165,7 @@ afterEach(() => {
app = null;
root?.remove();
root = null;
+ vi.useRealTimers();
});
describe("TopicsPanel RabbitMQ queue messages", () => {
@@ -155,11 +179,12 @@ describe("TopicsPanel RabbitMQ queue messages", () => {
if (!sortButton) throw new Error("RabbitMQ message sort button not found");
sortButton.click();
- await nextTick();
+ await flushUi();
expect(rowNames(panel)).toEqual(["beta", "alpha"]);
+ expect(backend.mqListTopicsPage).toHaveBeenLastCalledWith("rabbit-1", { tenant: "_rabbitmq", namespace: "/" }, { includeNonPersistent: false }, expect.objectContaining({ page: 1, pageSize: 100, sort: "messagesReady", sortDescending: true }));
sortButton.click();
- await nextTick();
+ await flushUi();
expect(rowNames(panel)).toEqual(["alpha", "beta"]);
});
@@ -203,10 +228,16 @@ describe("TopicsPanel RabbitMQ queue messages", () => {
});
it("keeps per-queue vhosts separate in all-vhosts mode (#5984 regression guard)", async () => {
- backend.mqListTopics.mockResolvedValue([
- { name: "orders", shortName: "orders", partitioned: false, persistent: true, namespace: "/", messageCount: 3, messagesReady: 3 },
- { name: "orders", shortName: "orders", partitioned: false, persistent: true, namespace: "/staging", messageCount: 7, messagesReady: 7 },
- ]);
+ backend.mqListTopicsPage.mockResolvedValue({
+ items: [
+ { name: "orders", shortName: "orders", partitioned: false, persistent: true, namespace: "/", messageCount: 3, messagesReady: 3 },
+ { name: "orders", shortName: "orders", partitioned: false, persistent: true, namespace: "/staging", messageCount: 7, messagesReady: 7 },
+ ],
+ page: 1,
+ pageSize: 100,
+ totalCount: 2,
+ hasMore: false,
+ });
const panel = await mountRabbitMqAllVhostsPanel();
// Both rows are named "orders" but must stay distinct per virtual host;
@@ -216,4 +247,60 @@ describe("TopicsPanel RabbitMQ queue messages", () => {
const counts = [...panel.querySelectorAll<HTMLElement>('[data-testid="rabbitmq-message-count"]')].map((item) => item.textContent?.trim());
expect(counts).toEqual(["3", "7"]);
});
+
+ it("loads only the requested RabbitMQ page and keeps the total visible", async () => {
+ backend.mqListTopicsPage
+ .mockResolvedValueOnce({
+ items: [{ name: "page-one", shortName: "page-one", partitioned: false, persistent: true }],
+ page: 1,
+ pageSize: 100,
+ totalCount: 101,
+ hasMore: true,
+ })
+ .mockResolvedValueOnce({
+ items: [{ name: "page-two", shortName: "page-two", partitioned: false, persistent: true }],
+ page: 2,
+ pageSize: 100,
+ totalCount: 101,
+ hasMore: false,
+ });
+ const panel = await mountRabbitMqPanel();
+
+ expect(rowNames(panel)).toEqual(["page-one"]);
+ expect(panel.querySelector(".topic-count")?.textContent?.replace(/\s+/g, " ").trim()).toBe("1 / 101");
+ const next = panel.querySelector<HTMLButtonElement>('[data-testid="mq-list-next"]');
+ if (!next) throw new Error("next page button not found");
+ next.click();
+ await flushUi();
+
+ expect(rowNames(panel)).toEqual(["page-two"]);
+ expect(backend.mqListTopicsPage).toHaveBeenLastCalledWith("rabbit-1", { tenant: "_rabbitmq", namespace: "/" }, { includeNonPersistent: false }, expect.objectContaining({ page: 2, pageSize: 100 }));
+ });
+
+ it("debounces queue search into the bounded backend request", async () => {
+ vi.useFakeTimers();
+ const panel = await mountRabbitMqPanel();
+ backend.mqListTopicsPage.mockClear();
+ backend.mqListTopicsPage.mockResolvedValue({ items: [], page: 1, pageSize: 100, totalCount: 0, hasMore: false });
+
+ const search = panel.querySelector<HTMLInputElement>(".topic-search");
+ if (!search) throw new Error("topic search not found");
+ search.value = "orders";
+ search.dispatchEvent(new Event("input"));
+ await nextTick();
+ expect(backend.mqListTopicsPage).not.toHaveBeenCalled();
+
+ await vi.advanceTimersByTimeAsync(250);
+ await flushUi();
+ expect(backend.mqListTopicsPage).toHaveBeenCalledWith("rabbit-1", { tenant: "_rabbitmq", namespace: "/" }, { includeNonPersistent: false }, expect.objectContaining({ page: 1, search: "orders" }));
+ });
+
+ it("keeps non-RabbitMQ providers on the legacy unbounded contract", async () => {
+ backend.mqListTopics.mockResolvedValue([{ name: "orders", shortName: "orders", partitioned: false, persistent: true }]);
+ const panel = await mountKafkaPanel();
+
+ expect(rowNames(panel)).toEqual(["orders"]);
+ expect(backend.mqListTopics).toHaveBeenCalledWith("kafka-1", { tenant: "_flat_mq", namespace: "_flat_mq" }, { includeNonPersistent: false });
+ expect(backend.mqListTopicsPage).not.toHaveBeenCalled();
+ });
});
diff --git a/apps/desktop/src/components/mq/shared/MqListPagination.vue b/apps/desktop/src/components/mq/shared/MqListPagination.vue
new file mode 100644
index 0000000000..b1f639acbf
--- /dev/null
+++ b/apps/desktop/src/components/mq/shared/MqListPagination.vue
@@ -0,0 +1,96 @@
+<script setup lang="ts">
+import { computed } from "vue";
+import { useI18n } from "vue-i18n";
+
+const props = defineProps<{
+ page: number;
+ pageSize: number;
+ totalCount: number;
+ hasMore: boolean;
+ loading?: boolean;
+}>();
+
+const emit = defineEmits<{
+ pageChange: [page: number];
+ pageSizeChange: [pageSize: number];
+}>();
+
+const { t } = useI18n();
+const pageSizeOptions = [50, 100, 200, 500];
+const pageCount = computed(() => Math.max(1, Math.ceil(props.totalCount / props.pageSize)));
+const rangeStart = computed(() => (props.totalCount ? (props.page - 1) * props.pageSize + 1 : 0));
+const rangeEnd = computed(() => Math.min(props.page * props.pageSize, props.totalCount));
+
+function changePageSize(event: Event) {
+ const pageSize = Number((event.target as HTMLSelectElement).value);
+ if (Number.isSafeInteger(pageSize) && pageSize > 0 && pageSize !== props.pageSize) {
+ emit("pageSizeChange", pageSize);
+ }
+}
+</script>
+
+<template>
+ <div class="mq-list-pagination" data-testid="mq-list-pagination">
+ <span class="mq-list-range">{{ rangeStart }}–{{ rangeEnd }} / {{ totalCount }}</span>
+ <label class="mq-list-page-size">
+ <span>{{ t("grid.rowsPerPage") }}</span>
+ <select :value="pageSize" :disabled="loading" @change="changePageSize">
+ <option v-for="size in pageSizeOptions" :key="size" :value="size">{{ size }}</option>
+ </select>
+ </label>
+ <button type="button" class="mq-list-page-button" data-testid="mq-list-previous" :aria-label="t('grid.page', { page: Math.max(1, page - 1) })" :disabled="loading || page <= 1" @click="emit('pageChange', page - 1)">‹</button>
+ <span class="mq-list-page-number">{{ t("grid.page", { page }) }} / {{ pageCount }}</span>
+ <button type="button" class="mq-list-page-button" data-testid="mq-list-next" :aria-label="t('grid.page', { page: page + 1 })" :disabled="loading || !hasMore" @click="emit('pageChange', page + 1)">›</button>
+ </div>
+</template>
+
+<style scoped>
+.mq-list-pagination {
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ gap: 8px;
+ min-height: 30px;
+ color: var(--color-text-secondary);
+ font-size: 12px;
+}
+
+.mq-list-range,
+.mq-list-page-number {
+ font-variant-numeric: tabular-nums;
+ white-space: nowrap;
+}
+
+.mq-list-page-size {
+ display: flex;
+ align-items: center;
+ gap: 6px;
+}
+
+.mq-list-page-size select,
+.mq-list-page-button {
+ height: 28px;
+ border: 1px solid var(--color-border);
+ border-radius: var(--dbx-radius-fixed-4);
+ background: var(--color-background);
+ color: var(--color-text);
+}
+
+.mq-list-page-size select {
+ padding: 0 6px;
+}
+
+.mq-list-page-button {
+ min-width: 30px;
+ padding: 0 8px;
+ cursor: pointer;
+ font-size: 18px;
+ line-height: 1;
+}
+
+.mq-list-page-button:disabled,
+.mq-list-page-size select:disabled {
+ cursor: not-allowed;
+ opacity: 0.5;
+}
+</style>
diff --git a/apps/desktop/src/lib/backend/__tests__/mqExchangesApi.spec.ts b/apps/desktop/src/lib/backend/__tests__/mqExchangesApi.spec.ts
index be2de9ec9c..0c5ac6dc47 100644
--- a/apps/desktop/src/lib/backend/__tests__/mqExchangesApi.spec.ts
+++ b/apps/desktop/src/lib/backend/__tests__/mqExchangesApi.spec.ts
@@ -9,6 +9,7 @@ vi.mock("@tauri-apps/api/core", () => ({
}));
const NS = { tenant: "_rabbitmq", namespace: "/" };
+const PAGINATION = { page: 2, pageSize: 100, search: "orders", sort: "name" as const, sortDescending: false };
describe("mq exchanges/bindings tauri API", () => {
beforeEach(() => {
@@ -27,6 +28,18 @@ describe("mq exchanges/bindings tauri API", () => {
expect(result[0]?.name).toBe("dbx-events");
});
+ it("invokes the bounded exchange and topic list commands with pagination", async () => {
+ const { mqListExchangesPage, mqListTopicsPage } = await import("@/lib/backend/mq-tauri");
+ mocks.invoke.mockResolvedValue({ items: [], page: 2, pageSize: 100, totalCount: 125, hasMore: false });
+
+ await mqListExchangesPage("conn-1", NS, PAGINATION);
+ expect(mocks.invoke).toHaveBeenCalledWith("mq_list_exchanges_page", { connectionId: "conn-1", ns: NS, pagination: PAGINATION });
+
+ const opts = { includeNonPersistent: false };
+ await mqListTopicsPage("conn-1", NS, opts, PAGINATION);
+ expect(mocks.invoke).toHaveBeenCalledWith("mq_list_topics_page", { connectionId: "conn-1", ns: NS, opts, pagination: PAGINATION });
+ });
+
it("invokes mq_create_exchange with flattened fields", async () => {
const { mqCreateExchange } = await import("@/lib/backend/mq-tauri");
mocks.invoke.mockResolvedValue(undefined);
@@ -113,6 +126,18 @@ describe("mq exchanges/bindings HTTP API", () => {
expect(lastCall(fetchMock)).toEqual({ url: "/api/mq/exchanges/delete", body: { connectionId: "conn-1", ns: NS, name: "dbx-events" } });
});
+ it("posts bounded exchange and topic list requests", async () => {
+ const fetchMock = stubFetch();
+ const { mqListExchangesPage, mqListTopicsPage } = await import("@/lib/backend/mq-http");
+
+ await mqListExchangesPage("conn-1", NS, PAGINATION);
+ expect(lastCall(fetchMock)).toEqual({ url: "/api/mq/exchanges/list-page", body: { connectionId: "conn-1", ns: NS, pagination: PAGINATION } });
+
+ const opts = { includeNonPersistent: false };
+ await mqListTopicsPage("conn-1", NS, opts, PAGINATION);
+ expect(lastCall(fetchMock)).toEqual({ url: "/api/mq/topics/list-page", body: { connectionId: "conn-1", ns: NS, opts, pagination: PAGINATION } });
+ });
+
it("posts to the bindings endpoints", async () => {
const fetchMock = stubFetch();
const { mqListBindings, mqBind, mqUnbind } = await import("@/lib/backend/mq-http");
diff --git a/apps/desktop/src/lib/backend/api.ts b/apps/desktop/src/lib/backend/api.ts
index 0cb1838175..2f0fc6354c 100644
--- a/apps/desktop/src/lib/backend/api.ts
+++ b/apps/desktop/src/lib/backend/api.ts
@@ -766,12 +766,14 @@ export const mqCreateNamespace = forward("mqCreateNamespace");
export const mqDeleteNamespace = forward("mqDeleteNamespace");
export const mqGetNamespacePolicies = forward("mqGetNamespacePolicies");
export const mqListTopics = forward("mqListTopics");
+export const mqListTopicsPage = forward("mqListTopicsPage");
export const mqCreateTopic = forward("mqCreateTopic");
export const mqDeleteTopic = forward("mqDeleteTopic");
export const mqUpdatePartitions = forward("mqUpdatePartitions");
export const mqGetTopicStats = forward("mqGetTopicStats");
export const mqGetTopicInternalStats = forward("mqGetTopicInternalStats");
export const mqListExchanges = forward("mqListExchanges");
+export const mqListExchangesPage = forward("mqListExchangesPage");
export const mqCreateExchange = forward("mqCreateExchange");
export const mqDeleteExchange = forward("mqDeleteExchange");
export const mqListBindings = forward("mqListBindings");
diff --git a/apps/desktop/src/lib/backend/mq-http.ts b/apps/desktop/src/lib/backend/mq-http.ts
index 8c5291ac57..9adc80ae8a 100644
--- a/apps/desktop/src/lib/backend/mq-http.ts
+++ b/apps/desktop/src/lib/backend/mq-http.ts
@@ -11,6 +11,8 @@ import type {
TopicRef,
TopicInfo,
ListTopicsOpts,
+ MqListPage,
+ MqListPageRequest,
TopicStats,
SubscriptionInfo,
KafkaConsumerGroupSnapshot,
@@ -75,6 +77,10 @@ export async function mqListExchanges(connectionId: string, ns: NamespaceRef): P
return post("/api/mq/exchanges/list", { connectionId, ns });
}
+export async function mqListExchangesPage(connectionId: string, ns: NamespaceRef, pagination: MqListPageRequest): Promise<MqListPage<MqExchangeInfo>> {
+ return post("/api/mq/exchanges/list-page", { connectionId, ns, pagination });
+}
+
export async function mqCreateExchange(connectionId: string, ns: NamespaceRef, exchange: MqExchangeCreateRequest): Promise<void> {
return post("/api/mq/exchanges/create", { connectionId, ns, name: exchange.name, exchangeType: exchange.type, durable: exchange.durable, autoDelete: exchange.autoDelete });
}
@@ -194,6 +200,10 @@ export async function mqListTopics(connectionId: string, ns: NamespaceRef, opts:
return post("/api/mq/topics/list", { connectionId, ns, opts });
}
+export async function mqListTopicsPage(connectionId: string, ns: NamespaceRef, opts: ListTopicsOpts, pagination: MqListPageRequest): Promise<MqListPage<TopicInfo>> {
+ return post("/api/mq/topics/list-page", { connectionId, ns, opts, pagination });
+}
+
export async function mqCreateTopic(connectionId: string, topic: TopicRef, partitions?: number): Promise<void> {
return post("/api/mq/topics/create", { connectionId, topic, partitions });
}
diff --git a/apps/desktop/src/lib/backend/mq-tauri.ts b/apps/desktop/src/lib/backend/mq-tauri.ts
index 9a545a36a1..b07d976298 100644
--- a/apps/desktop/src/lib/backend/mq-tauri.ts
+++ b/apps/desktop/src/lib/backend/mq-tauri.ts
@@ -11,6 +11,8 @@ import type {
TopicRef,
TopicInfo,
ListTopicsOpts,
+ MqListPage,
+ MqListPageRequest,
TopicStats,
SubscriptionInfo,
KafkaConsumerGroupSnapshot,
@@ -64,6 +66,10 @@ export async function mqListExchanges(connectionId: string, ns: NamespaceRef): P
return invoke("mq_list_exchanges", { connectionId, ns });
}
+export async function mqListExchangesPage(connectionId: string, ns: NamespaceRef, pagination: MqListPageRequest): Promise<MqListPage<MqExchangeInfo>> {
+ return invoke("mq_list_exchanges_page", { connectionId, ns, pagination });
+}
+
export async function mqCreateExchange(connectionId: string, ns: NamespaceRef, exchange: MqExchangeCreateRequest): Promise<void> {
return invoke("mq_create_exchange", { connectionId, ns, name: exchange.name, exchangeType: exchange.type, durable: exchange.durable, autoDelete: exchange.autoDelete });
}
@@ -187,6 +193,10 @@ export async function mqListTopics(connectionId: string, ns: NamespaceRef, opts:
return invoke("mq_list_topics", { connectionId, ns, opts });
}
+export async function mqListTopicsPage(connectionId: string, ns: NamespaceRef, opts: ListTopicsOpts, pagination: MqListPageRequest): Promise<MqListPage<TopicInfo>> {
+ return invoke("mq_list_topics_page", { connectionId, ns, opts, pagination });
+}
+
export async function mqCreateTopic(connectionId: string, topic: TopicRef, partitions?: number): Promise<void> {
return invoke("mq_create_topic", { connectionId, topic, partitions });
}
diff --git a/apps/desktop/src/types/mq.ts b/apps/desktop/src/types/mq.ts
index 7789e6b470..fd37a9bfd4 100644
--- a/apps/desktop/src/types/mq.ts
+++ b/apps/desktop/src/types/mq.ts
@@ -186,6 +186,26 @@ export interface ListTopicsOpts {
includeNonPersistent?: boolean;
}
+export type MqListSort = "name" | "messagesReady";
+
+export interface MqListPageRequest {
+ /** One-based page number. */
+ page: number;
+ pageSize: number;
+ search?: string;
+ sort?: MqListSort;
+ sortDescending?: boolean;
+}
+
+export interface MqListPage<T> {
+ items: T[];
+ page: number;
+ pageSize: number;
+ /** Number of items matching the current search across all pages. */
+ totalCount: number;
+ hasMore: boolean;
+}
+
export interface TopicStats {
msgRateIn: number;
msgRateOut: number;
diff --git a/crates/dbx-core/src/admin/mq/adapters/rabbitmq.rs b/crates/dbx-core/src/admin/mq/adapters/rabbitmq.rs
index be4e665e89..fc5e159a66 100644
--- a/crates/dbx-core/src/admin/mq/adapters/rabbitmq.rs
+++ b/crates/dbx-core/src/admin/mq/adapters/rabbitmq.rs
@@ -186,6 +186,33 @@ impl MessageQueueAdmin for RabbitMqAdmin {
Ok(topics.into_iter().map(|topic| topic_info_from_agent_value(&topic)).collect())
}
+ async fn list_topics_page(
+ &self,
+ ns: &NamespaceRef,
+ _opts: ListTopicsOpts,
+ pagination: MqListPageRequest,
+ ) -> Result<MqListPage<TopicInfo>, String> {
+ let params = with_virtual_host(rabbitmq_page_params(&pagination), &ns.namespace);
+ let result: serde_json::Value = self.call("mq_list_topics", params).await?;
+ let topics = result
+ .get("topics")
+ .and_then(|value| value.as_array())
+ .cloned()
+ .unwrap_or_default()
+ .into_iter()
+ .map(|topic| topic_info_from_agent_value(&topic))
+ .collect::<Vec<_>>();
+
+ if let Some(metadata) = agent_page_metadata(&result, &pagination) {
+ return Ok(metadata.with_items(topics));
+ }
+
+ // Older installed agents ignore the optional page fields and return
+ // the legacy full-list envelope. Keep that wire combination working
+ // and bound what crosses the command boundary after it arrives.
+ Ok(paginate_topic_infos(topics, &pagination))
+ }
+
async fn create_topic(&self, topic: &TopicRef, _partitions: Option<u32>) -> Result<(), String> {
require_specific_vhost(&topic.namespace)?;
let params = with_virtual_host(
@@ -237,6 +264,32 @@ impl MessageQueueAdmin for RabbitMqAdmin {
.collect()
}
+ async fn list_exchanges_page(
+ &self,
+ ns: &NamespaceRef,
+ pagination: MqListPageRequest,
+ ) -> Result<MqListPage<MqExchangeInfo>, String> {
+ let params = with_virtual_host(rabbitmq_page_params(&pagination), &ns.namespace);
+ let result: serde_json::Value = self.call("mq_list_exchanges", params).await?;
+ let exchanges = result
+ .get("exchanges")
+ .and_then(|value| value.as_array())
+ .cloned()
+ .unwrap_or_default()
+ .into_iter()
+ .map(|exchange| {
+ serde_json::from_value(map_item_namespace(exchange))
+ .map_err(|err| format!("Invalid exchange entry from agent: {err}"))
+ })
+ .collect::<Result<Vec<_>, _>>()?;
+
+ if let Some(metadata) = agent_page_metadata(&result, &pagination) {
+ return Ok(metadata.with_items(exchanges));
+ }
+
+ Ok(paginate_exchange_infos(exchanges, &pagination))
+ }
+
async fn create_exchange(
&self,
ns: &NamespaceRef,
@@ -679,6 +732,119 @@ impl MessageQueueAdmin for RabbitMqAdmin {
// Helpers
// ---------------------------------------------------------------------------
+struct AgentPageMetadata {
+ page: u32,
+ page_size: u32,
+ total_count: u64,
+ has_more: bool,
+}
+
+impl AgentPageMetadata {
+ fn with_items<T>(self, items: Vec<T>) -> MqListPage<T> {
+ MqListPage {
+ items,
+ page: self.page,
+ page_size: self.page_size,
+ total_count: self.total_count,
+ has_more: self.has_more,
+ }
+ }
+}
+
+fn rabbitmq_page_params(pagination: &MqListPageRequest) -> serde_json::Value {
+ let sort = match pagination.sort {
+ MqListSort::Name => "name",
+ MqListSort::MessagesReady => "messages_ready",
+ };
+ let mut params = serde_json::json!({
+ "page": pagination.page,
+ "page_size": pagination.page_size,
+ "sort": sort,
+ "sort_reverse": pagination.sort_descending,
+ });
+ if let Some(search) = pagination.search.as_deref().map(str::trim).filter(|search| !search.is_empty()) {
+ params["search"] = serde_json::json!(search);
+ }
+ params
+}
+
+fn agent_page_metadata(result: &serde_json::Value, request: &MqListPageRequest) -> Option<AgentPageMetadata> {
+ // `totalCount` distinguishes the new bounded agent envelope from the
+ // legacy `{topics:[...]}` / `{exchanges:[...]}` response.
+ let total_count = result.get("totalCount")?.as_u64()?;
+ let page = result
+ .get("page")
+ .and_then(serde_json::Value::as_u64)
+ .and_then(|value| u32::try_from(value).ok())
+ .unwrap_or(request.page);
+ let page_size = result
+ .get("pageSize")
+ .and_then(serde_json::Value::as_u64)
+ .and_then(|value| u32::try_from(value).ok())
+ .unwrap_or(request.page_size);
+ let has_more = result
+ .get("hasMore")
+ .and_then(serde_json::Value::as_bool)
+ .unwrap_or_else(|| u64::from(page).saturating_mul(u64::from(page_size)) < total_count);
+ Some(AgentPageMetadata { page, page_size, total_count, has_more })
+}
+
+fn paginate_topic_infos(mut topics: Vec<TopicInfo>, request: &MqListPageRequest) -> MqListPage<TopicInfo> {
+ let search = request.search.as_deref().map(str::trim).unwrap_or_default().to_lowercase();
+ if !search.is_empty() {
+ topics.retain(|topic| {
+ topic.name.to_lowercase().contains(&search) || topic.short_name.to_lowercase().contains(&search)
+ });
+ }
+ topics.sort_by(|left, right| {
+ let primary = match request.sort {
+ MqListSort::Name => left.name.cmp(&right.name),
+ MqListSort::MessagesReady => left
+ .messages_ready
+ .or(left.message_count)
+ .unwrap_or_default()
+ .cmp(&right.messages_ready.or(right.message_count).unwrap_or_default()),
+ };
+ let primary = if request.sort_descending { primary.reverse() } else { primary };
+ primary.then_with(|| left.short_name.cmp(&right.short_name))
+ });
+ paginate_items(topics, request)
+}
+
+fn paginate_exchange_infos(
+ mut exchanges: Vec<MqExchangeInfo>,
+ request: &MqListPageRequest,
+) -> MqListPage<MqExchangeInfo> {
+ let search = request.search.as_deref().map(str::trim).unwrap_or_default().to_lowercase();
+ if !search.is_empty() {
+ exchanges.retain(|exchange| {
+ let display_name = if exchange.name.is_empty() { "(AMQP default)" } else { &exchange.name };
+ display_name.to_lowercase().contains(&search)
+ });
+ }
+ exchanges.sort_by(|left, right| {
+ let ordering = left.name.cmp(&right.name);
+ if request.sort_descending {
+ ordering.reverse()
+ } else {
+ ordering
+ }
+ });
+ paginate_items(exchanges, request)
+}
+
+fn paginate_items<T>(items: Vec<T>, request: &MqListPageRequest) -> MqListPage<T> {
+ let total_count = items.len() as u64;
+ let start = u64::from(request.page.saturating_sub(1)).saturating_mul(u64::from(request.page_size));
+ let page_items = if start >= total_count {
+ Vec::new()
+ } else {
+ items.into_iter().skip(start as usize).take(request.page_size as usize).collect()
+ };
+ let has_more = start.saturating_add(page_items.len() as u64) < total_count;
+ MqListPage { items: page_items, page: request.page, page_size: request.page_size, total_count, has_more }
+}
+
/// Topic refs use flat queue names for RabbitMQ: the queue name is the short
/// topic name, the tenant is ignored. The namespace maps to a virtual host
/// and is passed through separately (see `with_virtual_host`).
@@ -1689,6 +1855,61 @@ mod tests {
assert!(params.get("virtual_host").is_none(), "all-vhosts listing must not scope to a vhost");
}
+ #[test]
+ fn rabbitmq_page_params_map_search_and_message_sort_for_the_agent() {
+ let params = rabbitmq_page_params(&MqListPageRequest {
+ page: 3,
+ page_size: 200,
+ search: Some("orders".to_string()),
+ sort: MqListSort::MessagesReady,
+ sort_descending: true,
+ });
+
+ assert_eq!(params.get("page").and_then(|value| value.as_u64()), Some(3));
+ assert_eq!(params.get("page_size").and_then(|value| value.as_u64()), Some(200));
+ assert_eq!(params.get("search").and_then(|value| value.as_str()), Some("orders"));
+ assert_eq!(params.get("sort").and_then(|value| value.as_str()), Some("messages_ready"));
+ assert_eq!(params.get("sort_reverse").and_then(|value| value.as_bool()), Some(true));
+ }
+
+ #[test]
+ fn legacy_agent_topic_result_is_filtered_sorted_and_bounded_locally() {
+ let topics = vec![
+ TopicInfo {
+ name: "orders-low".to_string(),
+ short_name: "orders-low".to_string(),
+ messages_ready: Some(2),
+ ..TopicInfo::default()
+ },
+ TopicInfo {
+ name: "unrelated".to_string(),
+ short_name: "unrelated".to_string(),
+ messages_ready: Some(99),
+ ..TopicInfo::default()
+ },
+ TopicInfo {
+ name: "orders-high".to_string(),
+ short_name: "orders-high".to_string(),
+ messages_ready: Some(8),
+ ..TopicInfo::default()
+ },
+ ];
+ let page = paginate_topic_infos(
+ topics,
+ &MqListPageRequest {
+ page: 1,
+ page_size: 1,
+ search: Some("orders".to_string()),
+ sort: MqListSort::MessagesReady,
+ sort_descending: true,
+ },
+ );
+
+ assert_eq!(page.total_count, 2);
+ assert!(page.has_more);
+ assert_eq!(page.items[0].name, "orders-high");
+ }
+
#[test]
fn map_item_namespace_moves_vhost_into_namespace_field() {
let item = map_item_namespace(serde_json::json!({ "name": "dbx-q", "vhost": "orders" }));
diff --git a/crates/dbx-core/src/admin/mq/port.rs b/crates/dbx-core/src/admin/mq/port.rs
index 266c0a1524..ba9b54d18d 100644
--- a/crates/dbx-core/src/admin/mq/port.rs
+++ b/crates/dbx-core/src/admin/mq/port.rs
@@ -40,6 +40,19 @@ pub trait MessageQueueAdmin: Send + Sync {
// ---- Topics ----
async fn list_topics(&self, ns: &NamespaceRef, opts: ListTopicsOpts) -> Result<Vec<TopicInfo>, String>;
+
+ /// Bounded topic listing for providers that support server-side paging.
+ /// The legacy unbounded method remains available for existing callers and
+ /// providers whose native APIs already return small lists.
+ async fn list_topics_page(
+ &self,
+ _ns: &NamespaceRef,
+ _opts: ListTopicsOpts,
+ _pagination: MqListPageRequest,
+ ) -> Result<MqListPage<TopicInfo>, String> {
+ Err("Paged topic listing is not supported by this MQ system".to_string())
+ }
+
async fn create_topic(&self, topic: &TopicRef, partitions: Option<u32>) -> Result<(), String>;
async fn delete_topic(&self, topic: &TopicRef, force: bool) -> Result<(), String>;
async fn update_partitions(&self, topic: &TopicRef, partitions: u32) -> Result<(), String>;
@@ -56,6 +69,14 @@ pub trait MessageQueueAdmin: Send + Sync {
Err("Exchanges are not supported by this MQ system".to_string())
}
+ async fn list_exchanges_page(
+ &self,
+ _ns: &NamespaceRef,
+ _pagination: MqListPageRequest,
+ ) -> Result<MqListPage<MqExchangeInfo>, String> {
+ Err("Paged exchange listing is not supported by this MQ system".to_string())
+ }
+
async fn create_exchange(
&self,
_ns: &NamespaceRef,
diff --git a/crates/dbx-core/src/admin/mq/service.rs b/crates/dbx-core/src/admin/mq/service.rs
index 2510a3b569..40a2aba914 100644
--- a/crates/dbx-core/src/admin/mq/service.rs
+++ b/crates/dbx-core/src/admin/mq/service.rs
@@ -153,6 +153,18 @@ pub async fn mq_list_topics_core(
adapter.list_topics(&ns, opts).await
}
+pub async fn mq_list_topics_page_core(
+ state: &AppState,
+ conn_id: &str,
+ ns: NamespaceRef,
+ opts: ListTopicsOpts,
+ pagination: MqListPageRequest,
+) -> Result<MqListPage<TopicInfo>, String> {
+ pagination.validate()?;
+ let adapter = get_adapter(state, conn_id).await?;
+ adapter.list_topics_page(&ns, opts, pagination).await
+}
+
pub async fn mq_create_topic_core(
state: &AppState,
conn_id: &str,
@@ -206,6 +218,17 @@ pub async fn mq_list_exchanges_core(
adapter.list_exchanges(&ns).await
}
+pub async fn mq_list_exchanges_page_core(
+ state: &AppState,
+ conn_id: &str,
+ ns: NamespaceRef,
+ pagination: MqListPageRequest,
+) -> Result<MqListPage<MqExchangeInfo>, String> {
+ pagination.validate()?;
+ let adapter = get_adapter(state, conn_id).await?;
+ adapter.list_exchanges_page(&ns, pagination).await
+}
+
pub async fn mq_create_exchange_core(
state: &AppState,
conn_id: &str,
diff --git a/crates/dbx-core/src/admin/mq/types.rs b/crates/dbx-core/src/admin/mq/types.rs
index eb9400562f..6d928b9c2b 100644
--- a/crates/dbx-core/src/admin/mq/types.rs
+++ b/crates/dbx-core/src/admin/mq/types.rs
@@ -380,6 +380,79 @@ pub struct ListTopicsOpts {
pub include_non_persistent: bool,
}
+pub const DEFAULT_MQ_LIST_PAGE_SIZE: u32 = 100;
+pub const MAX_MQ_LIST_PAGE_SIZE: u32 = 500;
+
+/// Sort keys shared by the bounded MQ list endpoints. `MessagesReady` is used
+/// by RabbitMQ queues; exchange listings use the default name ordering.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Default)]
+#[serde(rename_all = "camelCase")]
+pub enum MqListSort {
+ #[default]
+ Name,
+ MessagesReady,
+}
+
+/// One-based request for a bounded MQ list page.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct MqListPageRequest {
+ #[serde(default = "default_mq_list_page")]
+ pub page: u32,
+ #[serde(default = "default_mq_list_page_size")]
+ pub page_size: u32,
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ pub search: Option<String>,
+ #[serde(default)]
+ pub sort: MqListSort,
+ #[serde(default)]
+ pub sort_descending: bool,
+}
+
+impl Default for MqListPageRequest {
+ fn default() -> Self {
+ Self {
+ page: default_mq_list_page(),
+ page_size: default_mq_list_page_size(),
+ search: None,
+ sort: MqListSort::default(),
+ sort_descending: false,
+ }
+ }
+}
+
+impl MqListPageRequest {
+ pub fn validate(&self) -> Result<(), String> {
+ if self.page == 0 {
+ return Err("page must be at least 1".to_string());
+ }
+ if self.page_size == 0 || self.page_size > MAX_MQ_LIST_PAGE_SIZE {
+ return Err(format!("pageSize must be between 1 and {MAX_MQ_LIST_PAGE_SIZE}"));
+ }
+ Ok(())
+ }
+}
+
+const fn default_mq_list_page() -> u32 {
+ 1
+}
+
+const fn default_mq_list_page_size() -> u32 {
+ DEFAULT_MQ_LIST_PAGE_SIZE
+}
+
+/// A bounded list response. `total_count` is the number of rows matching the
+/// request's search filter, not merely the number loaded in this page.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct MqListPage<T> {
+ pub items: Vec<T>,
+ pub page: u32,
+ pub page_size: u32,
+ pub total_count: u64,
+ pub has_more: bool,
+}
+
/// Aggregated, UI-friendly topic statistics. Parsed from the version-specific
/// raw stats payload by the adapter's version profile.
#[derive(Debug, Clone, Default, Serialize, Deserialize)]
diff --git a/crates/dbx-web/src/main.rs b/crates/dbx-web/src/main.rs
index 30f4bfae7c..90c29c33a7 100644
--- a/crates/dbx-web/src/main.rs
+++ b/crates/dbx-web/src/main.rs
@@ -310,6 +310,7 @@ fn add_mq_routes(router: Router<Arc<WebState>>) -> Router<Arc<WebState>> {
.route("/mq/namespaces/delete", post(routes::mq::delete_namespace))
.route("/mq/namespaces/policies", post(routes::mq::get_namespace_policies))
.route("/mq/topics/list", post(routes::mq::list_topics))
+ .route("/mq/topics/list-page", post(routes::mq::list_topics_page))
.route("/mq/topics/create", post(routes::mq::create_topic))
.route("/mq/topics/delete", post(routes::mq::delete_topic))
.route("/mq/topics/update-partitions", post(routes::mq::update_partitions))
@@ -319,6 +320,7 @@ fn add_mq_routes(router: Router<Arc<WebState>>) -> Router<Arc<WebState>> {
.route("/mq/topics/alter-config", post(routes::mq::alter_topic_config))
.route("/mq/topics/skip-accumulation", post(routes::mq::skip_topic_accumulation))
.route("/mq/exchanges/list", post(routes::mq::list_exchanges))
+ .route("/mq/exchanges/list-page", post(routes::mq::list_exchanges_page))
.route("/mq/exchanges/create", post(routes::mq::create_exchange))
.route("/mq/exchanges/delete", post(routes::mq::delete_exchange))
.route("/mq/bindings/list", post(routes::mq::list_bindings))
diff --git a/crates/dbx-web/src/routes/mq.rs b/crates/dbx-web/src/routes/mq.rs
index 61cfbfc007..04bf79911d 100644
--- a/crates/dbx-web/src/routes/mq.rs
+++ b/crates/dbx-web/src/routes/mq.rs
@@ -90,6 +90,15 @@ pub(crate) struct ListTopicsReq {
opts: dbx_core::mq::ListTopicsOpts,
}
+#[derive(serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct ListTopicsPageReq {
+ connection_id: String,
+ ns: dbx_core::mq::NamespaceRef,
+ opts: dbx_core::mq::ListTopicsOpts,
+ pagination: dbx_core::mq::MqListPageRequest,
+}
+
#[derive(serde::Deserialize)]
#[serde(rename_all = "camelCase")]
pub(crate) struct CreateTopicReq {
@@ -129,6 +138,14 @@ pub(crate) struct ListExchangesReq {
ns: dbx_core::mq::NamespaceRef,
}
+#[derive(serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct ListExchangesPageReq {
+ connection_id: String,
+ ns: dbx_core::mq::NamespaceRef,
+ pagination: dbx_core::mq::MqListPageRequest,
+}
+
#[derive(serde::Deserialize)]
#[serde(rename_all = "camelCase")]
pub(crate) struct CreateExchangeReq {
@@ -591,6 +608,24 @@ pub async fn list_topics(
Ok(Json(result))
}
+pub async fn list_topics_page(
+ State(state): State<Arc<WebState>>,
+ headers: HeaderMap,
+ Json(req): Json<ListTopicsPageReq>,
+) -> Result<Json<dbx_core::mq::MqListPage<dbx_core::mq::TopicInfo>>, AppError> {
+ super::mcp_policy::ensure_scope(&state, &headers, &req.connection_id).await?;
+ let result = dbx_core::mq::service::mq_list_topics_page_core(
+ &state.app,
+ &req.connection_id,
+ req.ns,
+ req.opts,
+ req.pagination,
+ )
+ .await
+ .map_err(AppError::from)?;
+ Ok(Json(result))
+}
+
pub async fn create_topic(
State(state): State<Arc<WebState>>,
headers: HeaderMap,
@@ -666,6 +701,19 @@ pub async fn list_exchanges(
Ok(Json(result))
}
+pub async fn list_exchanges_page(
+ State(state): State<Arc<WebState>>,
+ headers: HeaderMap,
+ Json(req): Json<ListExchangesPageReq>,
+) -> Result<Json<dbx_core::mq::MqListPage<dbx_core::mq::MqExchangeInfo>>, AppError> {
+ super::mcp_policy::ensure_scope(&state, &headers, &req.connection_id).await?;
+ let result =
+ dbx_core::mq::service::mq_list_exchanges_page_core(&state.app, &req.connection_id, req.ns, req.pagination)
+ .await
+ .map_err(AppError::internal)?;
+ Ok(Json(result))
+}
+
pub async fn create_exchange(
State(state): State<Arc<WebState>>,
headers: HeaderMap,
diff --git a/scripts/check-mq-integration.mjs b/scripts/check-mq-integration.mjs
index 31e8c44638..56ec9464de 100644
--- a/scripts/check-mq-integration.mjs
+++ b/scripts/check-mq-integration.mjs
@@ -37,11 +37,11 @@ assertIncludes("apps/desktop/src/lib/backend/mq-tauri.ts", 'invoke("mq_get_consu
assertIncludes("crates/dbx-web/src/main.rs", '"/mq/consumers/group-config/get"', "dbx-web must register consumer group config get route.");
assertIncludes("src-tauri/src/lib.rs", "mq_get_consumer_group_config", "Tauri must register consumer group config command.");
-for (const route of ["exchanges/list", "exchanges/create", "exchanges/delete", "bindings/list", "bindings/bind", "bindings/unbind", "client-connections/list", "client-connections/close", "channels/list"]) {
+for (const route of ["topics/list-page", "exchanges/list", "exchanges/list-page", "exchanges/create", "exchanges/delete", "bindings/list", "bindings/bind", "bindings/unbind", "client-connections/list", "client-connections/close", "channels/list"]) {
assertIncludes("apps/desktop/src/lib/backend/mq-http.ts", `post("/api/mq/${route}"`, `MQ HTTP client must call /api/mq/${route} route.`);
assertIncludes("crates/dbx-web/src/main.rs", `"/mq/${route}"`, `dbx-web must register /mq/${route} route.`);
}
-for (const command of ["mq_list_exchanges", "mq_create_exchange", "mq_delete_exchange", "mq_list_bindings", "mq_bind", "mq_unbind", "mq_list_client_connections", "mq_list_client_channels", "mq_close_client_connection"]) {
+for (const command of ["mq_list_topics_page", "mq_list_exchanges", "mq_list_exchanges_page", "mq_create_exchange", "mq_delete_exchange", "mq_list_bindings", "mq_bind", "mq_unbind", "mq_list_client_connections", "mq_list_client_channels", "mq_close_client_connection"]) {
assertIncludes("apps/desktop/src/lib/backend/mq-tauri.ts", `invoke("${command}"`, `MQ Tauri client must invoke ${command} command.`);
assertIncludes("src-tauri/src/lib.rs", command, `Tauri must register ${command} command.`);
}
diff --git a/src-tauri/src/commands/mq_cmd.rs b/src-tauri/src/commands/mq_cmd.rs
index 01083d5a89..2f62a13304 100644
--- a/src-tauri/src/commands/mq_cmd.rs
+++ b/src-tauri/src/commands/mq_cmd.rs
@@ -125,6 +125,17 @@ pub async fn mq_list_topics(
dbx_core::mq::service::mq_list_topics_core(&state, &connection_id, ns, opts).await
}
+#[tauri::command]
+pub async fn mq_list_topics_page(
+ state: State<'_, Arc<AppState>>,
+ connection_id: String,
+ ns: dbx_core::mq::NamespaceRef,
+ opts: dbx_core::mq::ListTopicsOpts,
+ pagination: dbx_core::mq::MqListPageRequest,
+) -> Result<dbx_core::mq::MqListPage<dbx_core::mq::TopicInfo>, String> {
+ dbx_core::mq::service::mq_list_topics_page_core(&state, &connection_id, ns, opts, pagination).await
+}
+
#[tauri::command]
pub async fn mq_create_topic(
state: State<'_, Arc<AppState>>,
@@ -187,6 +198,16 @@ pub async fn mq_list_exchanges(
dbx_core::mq::service::mq_list_exchanges_core(&state, &connection_id, ns).await
}
+#[tauri::command]
+pub async fn mq_list_exchanges_page(
+ state: State<'_, Arc<AppState>>,
+ connection_id: String,
+ ns: dbx_core::mq::NamespaceRef,
+ pagination: dbx_core::mq::MqListPageRequest,
+) -> Result<dbx_core::mq::MqListPage<dbx_core::mq::MqExchangeInfo>, String> {
+ dbx_core::mq::service::mq_list_exchanges_page_core(&state, &connection_id, ns, pagination).await
+}
+
#[tauri::command]
pub async fn mq_create_exchange(
state: State<'_, Arc<AppState>>,
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 20cef09570..d605389169 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -2516,6 +2516,8 @@ pub fn run() {
#[cfg(feature = "mq-admin")]
commands::mq_cmd::mq_list_topics,
#[cfg(feature = "mq-admin")]
+ commands::mq_cmd::mq_list_topics_page,
+ #[cfg(feature = "mq-admin")]
commands::mq_cmd::mq_create_topic,
#[cfg(feature = "mq-admin")]
commands::mq_cmd::mq_delete_topic,
@@ -2528,6 +2530,8 @@ pub fn run() {
#[cfg(feature = "mq-admin")]
commands::mq_cmd::mq_list_exchanges,
#[cfg(feature = "mq-admin")]
+ commands::mq_cmd::mq_list_exchanges_page,
+ #[cfg(feature = "mq-admin")]
commands::mq_cmd::mq_create_exchange,
#[cfg(feature = "mq-admin")]
commands::mq_cmd::mq_delete_exchange,