feat(etcd): add key TTL synchronization

This commit is contained in:
二丫讲梵 authored and GitHub committed 2026-07-26 11:55:52 +08:00
1 parent 43f73ca4ca
commit f56d3a86c1
32 files changed
+1249 -65

No files matched your search

+1
View File
@@ -416,6 +416,7 @@ DBX 是免费开源项目,但持续维护、数据库兼容性测试、基础
<details> <details>
<summary><strong>可以离线使用吗?</strong></summary> <summary><strong>可以离线使用吗?</strong></summary>
可以。桌面端完全支持离线使用。内网环境安装驱动时,可在有网机器打开[离线驱动下载页](https://dbxio.com/cn/drivers)下载离线驱动包,传输到内网机器后,在 DBX 的「设置 > 驱动管理」中导入。AI 功能需要网络访问模型端点(或通过 Ollama 使用本地模型)。 可以。桌面端完全支持离线使用。内网环境安装驱动时,可在有网机器打开[离线驱动下载页](https://dbxio.com/cn/drivers)下载离线驱动包,传输到内网机器后,在 DBX 的「设置 > 驱动管理」中导入。AI 功能需要网络访问模型端点(或通过 Ollama 使用本地模型)。
</details> </details>
@@ -76,6 +76,7 @@ public final class AgentProtocol {
public static final String CAPABILITY_TRANSACTION = "transaction"; public static final String CAPABILITY_TRANSACTION = "transaction";
public static final String CAPABILITY_DDL = "ddl"; public static final String CAPABILITY_DDL = "ddl";
public static final String CAPABILITY_KV = "kv"; public static final String CAPABILITY_KV = "kv";
public static final String CAPABILITY_KV_TTL = "kv_ttl";
public static final String CAPABILITY_MULTI_SESSION = "multi_session"; public static final String CAPABILITY_MULTI_SESSION = "multi_session";
public static final List<String> CAPABILITIES = Collections.unmodifiableList(Arrays.asList( public static final List<String> CAPABILITIES = Collections.unmodifiableList(Arrays.asList(
@@ -96,7 +97,8 @@ public final class AgentProtocol {
CAPABILITY_PAGED_QUERY, CAPABILITY_PAGED_QUERY,
CAPABILITY_TRANSACTION, CAPABILITY_TRANSACTION,
CAPABILITY_DDL, CAPABILITY_DDL,
CAPABILITY_KV CAPABILITY_KV,
CAPABILITY_KV_TTL
)); ));
public static final List<String> COMMON_METHODS = Collections.unmodifiableList(Arrays.asList( public static final List<String> COMMON_METHODS = Collections.unmodifiableList(Arrays.asList(
@@ -14,7 +14,8 @@
"paged_query", "paged_query",
"transaction", "transaction",
"ddl", "ddl",
"kv" "kv",
"kv_ttl"
], ],
"capabilities": [ "capabilities": [
"connect", "connect",
@@ -15,6 +15,7 @@
"transaction", "transaction",
"ddl", "ddl",
"kv", "kv",
"kv_ttl",
"multi_session" "multi_session"
], ],
"capabilities": [ "capabilities": [
@@ -14,7 +14,14 @@ import io.etcd.jetcd.KeyValue;
import io.etcd.jetcd.kv.DeleteResponse; import io.etcd.jetcd.kv.DeleteResponse;
import io.etcd.jetcd.kv.GetResponse; import io.etcd.jetcd.kv.GetResponse;
import io.etcd.jetcd.kv.PutResponse; import io.etcd.jetcd.kv.PutResponse;
import io.etcd.jetcd.kv.TxnResponse;
import io.etcd.jetcd.lease.LeaseGrantResponse;
import io.etcd.jetcd.lease.LeaseTimeToLiveResponse;
import io.etcd.jetcd.op.Cmp;
import io.etcd.jetcd.op.CmpTarget;
import io.etcd.jetcd.op.Op;
import io.etcd.jetcd.options.GetOption; import io.etcd.jetcd.options.GetOption;
import io.etcd.jetcd.options.LeaseOption;
import io.etcd.jetcd.options.PutOption; import io.etcd.jetcd.options.PutOption;
import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContext;
import io.netty.handler.ssl.SslContextBuilder; import io.netty.handler.ssl.SslContextBuilder;
@@ -38,10 +45,12 @@ public final class EtcdAgent {
private static final Gson GSON = new Gson(); private static final Gson GSON = new Gson();
private static final int DEFAULT_LIMIT = 100; private static final int DEFAULT_LIMIT = 100;
private static final int RPC_TIMEOUT_SECONDS = 30; private static final int RPC_TIMEOUT_SECONDS = 30;
private static final int PRESERVE_LEASE_MAX_ATTEMPTS = 3;
private static final List<String> CAPABILITIES = Collections.unmodifiableList(Arrays.asList( private static final List<String> CAPABILITIES = Collections.unmodifiableList(Arrays.asList(
AgentProtocol.CAPABILITY_CONNECT, AgentProtocol.CAPABILITY_CONNECT,
AgentProtocol.CAPABILITY_TEST_CONNECTION, AgentProtocol.CAPABILITY_TEST_CONNECTION,
AgentProtocol.CAPABILITY_KV AgentProtocol.CAPABILITY_KV,
AgentProtocol.CAPABILITY_KV_TTL
)); ));
private static Client client; private static Client client;
private static KV kv; private static KV kv;
@@ -162,7 +171,11 @@ public final class EtcdAgent {
private static Object get(JsonObject params) throws Exception { private static Object get(JsonObject params) throws Exception {
KV active = requireKv(); KV active = requireKv();
String key = params.get("key").getAsString(); String key = params.get("key").getAsString();
GetResponse response = active.get(byteSequence(key)).get(RPC_TIMEOUT_SECONDS, TimeUnit.SECONDS); boolean metadataOnly = boolOrDefault(params, "metadataOnly", false);
GetOption option = metadataOnly
? GetOption.builder().withKeysOnly(true).build()
: GetOption.DEFAULT;
GetResponse response = active.get(byteSequence(key), option).get(RPC_TIMEOUT_SECONDS, TimeUnit.SECONDS);
Map<String, Object> result = new LinkedHashMap<>(); Map<String, Object> result = new LinkedHashMap<>();
if (response.getKvs().isEmpty()) { if (response.getKvs().isEmpty()) {
result.put("found", false); result.put("found", false);
@@ -172,26 +185,101 @@ public final class EtcdAgent {
return result; return result;
} }
KeyValue item = response.getKvs().get(0); KeyValue item = response.getKvs().get(0);
Map<String, Object> metadata = metadata(item);
if (item.getLease() > 0) {
LeaseTimeToLiveResponse lease =
requireClient().getLeaseClient().timeToLive(item.getLease(), LeaseOption.DEFAULT)
.get(RPC_TIMEOUT_SECONDS, TimeUnit.SECONDS);
metadata.put("ttl", lease.getTTL());
}
result.put("found", true); result.put("found", true);
result.put("key", displayBytes(item.getKey().getBytes())); result.put("key", displayBytes(item.getKey().getBytes()));
result.put("value", valueObject(item.getValue().getBytes())); result.put("value", metadataOnly ? null : valueObject(item.getValue().getBytes()));
result.put("metadata", metadata(item)); result.put("metadata", metadata);
return result; return result;
} }
private static Object put(JsonObject params) throws Exception { private static Object put(JsonObject params) throws Exception {
KV active = requireKv(); KV active = requireKv();
Client activeClient = requireClient();
String key = params.get("key").getAsString(); String key = params.get("key").getAsString();
byte[] value = parseValue(params.getAsJsonObject("value")); byte[] value = parseValue(params.getAsJsonObject("value"));
ByteSequence keyBytes = byteSequence(key);
ByteSequence valueBytes = ByteSequence.from(value);
JsonElement leaseElement = params.get("lease"); JsonElement leaseElement = params.get("lease");
PutResponse response; JsonElement ttlElement = params.get("ttl");
if (leaseElement != null && !leaseElement.isJsonNull()) { boolean hasLease = leaseElement != null && !leaseElement.isJsonNull();
PutOption option = PutOption.newBuilder().withLeaseId(leaseElement.getAsLong()).build(); boolean hasTtl = ttlElement != null && !ttlElement.isJsonNull();
response = active.put(byteSequence(key), ByteSequence.from(value), option).get(RPC_TIMEOUT_SECONDS, TimeUnit.SECONDS); boolean preserveLease = boolOrDefault(params, "preserveLease", false);
} else { if ((hasLease && hasTtl) || (preserveLease && (hasLease || hasTtl))) {
response = active.put(byteSequence(key), ByteSequence.from(value)).get(RPC_TIMEOUT_SECONDS, TimeUnit.SECONDS); throw new IllegalArgumentException("lease, ttl, and preserveLease cannot be specified together");
} }
return Collections.singletonMap("revision", response.getHeader().getRevision());
if (preserveLease) {
long revision = putPreservingLease(active, keyBytes, valueBytes);
return Collections.singletonMap("revision", revision);
}
Long leaseId = null;
long grantedLeaseId = 0;
if (hasTtl) {
long ttl = ttlElement.getAsLong();
if (ttl <= 0) {
throw new IllegalArgumentException("ttl must be a positive integer");
}
LeaseGrantResponse grant =
activeClient.getLeaseClient().grant(ttl).get(RPC_TIMEOUT_SECONDS, TimeUnit.SECONDS);
grantedLeaseId = grant.getID();
leaseId = grantedLeaseId;
} else if (hasLease) {
leaseId = leaseElement.getAsLong();
}
try {
PutResponse response;
if (leaseId != null) {
PutOption option = PutOption.newBuilder().withLeaseId(leaseId).build();
response = active.put(keyBytes, valueBytes, option)
.get(RPC_TIMEOUT_SECONDS, TimeUnit.SECONDS);
} else {
response = active.put(keyBytes, valueBytes)
.get(RPC_TIMEOUT_SECONDS, TimeUnit.SECONDS);
}
return Collections.singletonMap("revision", response.getHeader().getRevision());
} catch (Exception error) {
if (grantedLeaseId != 0) {
try {
activeClient.getLeaseClient().revoke(grantedLeaseId)
.get(RPC_TIMEOUT_SECONDS, TimeUnit.SECONDS);
} catch (Exception revokeError) {
error.addSuppressed(revokeError);
}
}
throw error;
}
}
static long putPreservingLease(KV active, ByteSequence key, ByteSequence value) throws Exception {
for (int attempt = 0; attempt < PRESERVE_LEASE_MAX_ATTEMPTS; attempt++) {
GetResponse existing =
active.get(key, GetOption.DEFAULT).get(RPC_TIMEOUT_SECONDS, TimeUnit.SECONDS);
if (existing.getKvs().isEmpty() || existing.getKvs().get(0).getLease() <= 0) {
throw new IllegalStateException("Cannot preserve lease: key does not exist or has no lease");
}
KeyValue current = existing.getKvs().get(0);
PutOption option = PutOption.builder().withLeaseId(current.getLease()).build();
TxnResponse response = active.txn()
.If(new Cmp(key, Cmp.Op.EQUAL, CmpTarget.modRevision(current.getModRevision())))
.Then(Op.put(key, value, option))
.commit()
.get(RPC_TIMEOUT_SECONDS, TimeUnit.SECONDS);
if (response.isSucceeded()) {
return response.getHeader().getRevision();
}
}
throw new IllegalStateException("Cannot preserve lease: key changed concurrently; retry the save");
} }
private static Object delete(JsonObject params) throws Exception { private static Object delete(JsonObject params) throws Exception {
@@ -262,6 +350,13 @@ public final class EtcdAgent {
return kv; return kv;
} }
private static Client requireClient() {
if (client == null) {
throw new IllegalStateException("Not connected");
}
return client;
}
private static void closeClient() { private static void closeClient() {
if (kv != null) { if (kv != null) {
kv.close(); kv.close();
@@ -1,8 +1,24 @@
package com.dbx.agent.etcd; package com.dbx.agent.etcd;
import com.google.protobuf.ByteString;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import io.etcd.jetcd.ByteSequence;
import io.etcd.jetcd.KV;
import io.etcd.jetcd.Txn;
import io.etcd.jetcd.api.KeyValue;
import io.etcd.jetcd.api.RangeResponse;
import io.etcd.jetcd.api.ResponseHeader;
import io.etcd.jetcd.kv.GetResponse;
import io.etcd.jetcd.kv.TxnResponse;
import java.lang.reflect.Proxy;
import java.nio.charset.StandardCharsets;
import java.util.ArrayDeque;
import java.util.Arrays;
import java.util.Deque;
import java.util.List; import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@@ -17,6 +33,7 @@ final class EtcdAgentTest {
Assertions.assertEquals(1, result.get("protocolVersion").getAsInt()); Assertions.assertEquals(1, result.get("protocolVersion").getAsInt());
Assertions.assertTrue(result.getAsJsonArray("capabilities").contains(JsonParser.parseString("\"kv\""))); Assertions.assertTrue(result.getAsJsonArray("capabilities").contains(JsonParser.parseString("\"kv\"")));
Assertions.assertTrue(result.getAsJsonArray("capabilities").contains(JsonParser.parseString("\"kv_ttl\"")));
Assertions.assertTrue(result.getAsJsonArray("capabilities").contains(JsonParser.parseString("\"connect\""))); Assertions.assertTrue(result.getAsJsonArray("capabilities").contains(JsonParser.parseString("\"connect\"")));
} }
@@ -52,4 +69,155 @@ final class EtcdAgentTest {
Assertions.assertEquals(-1, error.get("code").getAsInt()); Assertions.assertEquals(-1, error.get("code").getAsInt());
Assertions.assertEquals("Not connected", error.get("message").getAsString()); Assertions.assertEquals("Not connected", error.get("message").getAsString());
} }
@Test
void preserveLeaseRetriesWithTheLatestLeaseAfterConcurrentChange() throws Exception {
AtomicInteger getCalls = new AtomicInteger();
AtomicInteger txnCalls = new AtomicInteger();
KV active = scriptedKv(
getCalls,
txnCalls,
List.of(getResponse("/app/name", 10, 101), getResponse("/app/name", 11, 202)),
List.of(txnResponse(false, 10), txnResponse(true, 12))
);
long revision = EtcdAgent.putPreservingLease(active, bytes("/app/name"), bytes("updated"));
Assertions.assertEquals(12, revision);
Assertions.assertEquals(2, getCalls.get());
Assertions.assertEquals(2, txnCalls.get());
}
@Test
void preserveLeaseRejectsMissingOrUnleasedKeys() {
KV missing = scriptedKv(
new AtomicInteger(),
new AtomicInteger(),
List.of(emptyGetResponse()),
List.of()
);
KV unleased = scriptedKv(
new AtomicInteger(),
new AtomicInteger(),
List.of(getResponse("/app/name", 10, 0)),
List.of()
);
IllegalStateException missingError = Assertions.assertThrows(
IllegalStateException.class,
() -> EtcdAgent.putPreservingLease(missing, bytes("/app/name"), bytes("updated"))
);
IllegalStateException unleasedError = Assertions.assertThrows(
IllegalStateException.class,
() -> EtcdAgent.putPreservingLease(unleased, bytes("/app/name"), bytes("updated"))
);
Assertions.assertEquals("Cannot preserve lease: key does not exist or has no lease", missingError.getMessage());
Assertions.assertEquals("Cannot preserve lease: key does not exist or has no lease", unleasedError.getMessage());
}
@Test
void preserveLeaseFailsClearlyAfterBoundedConcurrentChanges() {
AtomicInteger getCalls = new AtomicInteger();
AtomicInteger txnCalls = new AtomicInteger();
KV active = scriptedKv(
getCalls,
txnCalls,
List.of(
getResponse("/app/name", 10, 101),
getResponse("/app/name", 11, 202),
getResponse("/app/name", 12, 303)
),
List.of(txnResponse(false, 10), txnResponse(false, 11), txnResponse(false, 12))
);
IllegalStateException error = Assertions.assertThrows(
IllegalStateException.class,
() -> EtcdAgent.putPreservingLease(active, bytes("/app/name"), bytes("updated"))
);
Assertions.assertEquals("Cannot preserve lease: key changed concurrently; retry the save", error.getMessage());
Assertions.assertEquals(3, getCalls.get());
Assertions.assertEquals(3, txnCalls.get());
}
private static KV scriptedKv(
AtomicInteger getCalls,
AtomicInteger txnCalls,
List<GetResponse> getResponses,
List<TxnResponse> txnResponses
) {
Deque<GetResponse> gets = new ArrayDeque<>(getResponses);
Deque<TxnResponse> txns = new ArrayDeque<>(txnResponses);
return (KV) Proxy.newProxyInstance(
KV.class.getClassLoader(),
new Class<?>[] { KV.class },
(proxy, method, args) -> {
if (method.getName().equals("get")) {
getCalls.incrementAndGet();
return CompletableFuture.completedFuture(gets.removeFirst());
}
if (method.getName().equals("txn")) {
return scriptedTxn(txnCalls, txns);
}
if (method.getName().equals("close")) {
return null;
}
throw new UnsupportedOperationException(method.getName());
}
);
}
private static Txn scriptedTxn(AtomicInteger txnCalls, Deque<TxnResponse> responses) {
return (Txn) Proxy.newProxyInstance(
Txn.class.getClassLoader(),
new Class<?>[] { Txn.class },
(proxy, method, args) -> {
if (Arrays.asList("If", "Then", "Else").contains(method.getName())) {
return proxy;
}
if (method.getName().equals("commit")) {
txnCalls.incrementAndGet();
return CompletableFuture.completedFuture(responses.removeFirst());
}
throw new UnsupportedOperationException(method.getName());
}
);
}
private static ByteSequence bytes(String value) {
return ByteSequence.from(value, StandardCharsets.UTF_8);
}
private static GetResponse getResponse(String key, long modRevision, long lease) {
KeyValue keyValue = KeyValue.newBuilder()
.setKey(ByteString.copyFromUtf8(key))
.setModRevision(modRevision)
.setLease(lease)
.build();
RangeResponse response = RangeResponse.newBuilder()
.setHeader(header(modRevision))
.addKvs(keyValue)
.build();
return new GetResponse(response, ByteSequence.EMPTY);
}
private static GetResponse emptyGetResponse() {
return new GetResponse(
RangeResponse.newBuilder().setHeader(header(1)).build(),
ByteSequence.EMPTY
);
}
private static TxnResponse txnResponse(boolean succeeded, long revision) {
io.etcd.jetcd.api.TxnResponse response = io.etcd.jetcd.api.TxnResponse.newBuilder()
.setHeader(header(revision))
.setSucceeded(succeeded)
.build();
return new TxnResponse(response, ByteSequence.EMPTY);
}
private static ResponseHeader header(long revision) {
return ResponseHeader.newBuilder().setRevision(revision).build();
}
} }
@@ -1,5 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed, ref } from "vue"; import { computed, onBeforeUnmount, ref, watch } from "vue";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import KvKeyBrowser from "@/components/kv/KvKeyBrowser.vue"; import KvKeyBrowser from "@/components/kv/KvKeyBrowser.vue";
import * as api from "@/lib/backend/api"; import * as api from "@/lib/backend/api";
@@ -8,11 +8,18 @@ const props = defineProps<{ connectionId: string }>();
const { t } = useI18n(); const { t } = useI18n();
const browserRef = ref<InstanceType<typeof KvKeyBrowser> | null>(null); const browserRef = ref<InstanceType<typeof KvKeyBrowser> | null>(null);
const supportsTtl = ref(false);
const ttlCapabilityKnown = ref(false);
const ttlCapabilityRefreshIntervalMs = 5000;
let ttlCapabilityRequest = 0;
let ttlCapabilityInFlightConnection: string | null = null;
let ttlCapabilityRefreshTimer: ReturnType<typeof setInterval> | null = null;
const etcdApi = { const etcdApi = {
listPrefix: api.etcdListPrefix, listPrefix: api.etcdListPrefix,
get: api.etcdGet, get: api.etcdGet,
put: (connectionId: string, key: string, value: api.KvValue) => api.etcdPut(connectionId, key, value), getMetadata: (connectionId: string, key: string) => api.etcdGet(connectionId, key, { metadataOnly: true }),
put: (connectionId: string, key: string, value: api.KvValue, options?: api.KvPutOptions | null) => api.etcdPut(connectionId, key, value, options),
deleteKey: api.etcdDelete, deleteKey: api.etcdDelete,
}; };
@@ -31,11 +38,63 @@ const labels = computed(() => ({
deleteTitle: t("etcd.deleteTitle"), deleteTitle: t("etcd.deleteTitle"),
keyPlaceholder: t("etcd.keyPlaceholder"), keyPlaceholder: t("etcd.keyPlaceholder"),
keyRequired: t("etcd.keyRequired"), keyRequired: t("etcd.keyRequired"),
ttl: t("etcd.ttl"),
ttlPlaceholder: t("etcd.ttlPlaceholder"),
ttlInvalid: t("etcd.ttlInvalid"),
ttlUnavailable: t("etcd.ttlUnavailable"),
saved: t("etcd.saved"), saved: t("etcd.saved"),
deleted: t("etcd.deleted"), deleted: t("etcd.deleted"),
base64Readonly: t("etcd.base64Readonly"), base64Readonly: t("etcd.base64Readonly"),
})); }));
async function refreshTtlCapability() {
const connectionId = props.connectionId;
if (ttlCapabilityInFlightConnection === connectionId) return;
const request = ++ttlCapabilityRequest;
ttlCapabilityInFlightConnection = connectionId;
try {
const supported = await api.etcdSupportsTtl(connectionId);
if (request !== ttlCapabilityRequest || props.connectionId !== connectionId) return;
supportsTtl.value = supported;
ttlCapabilityKnown.value = true;
} catch {
// A transient connection failure is not evidence that the installed Agent lacks TTL support.
// Keep the last confirmed capability and let the interval or an explicit refresh retry.
} finally {
if (request === ttlCapabilityRequest) ttlCapabilityInFlightConnection = null;
}
}
function stopTtlCapabilityRefresh() {
ttlCapabilityRequest++;
ttlCapabilityInFlightConnection = null;
if (ttlCapabilityRefreshTimer !== null) {
clearInterval(ttlCapabilityRefreshTimer);
ttlCapabilityRefreshTimer = null;
}
}
function startTtlCapabilityRefresh() {
stopTtlCapabilityRefresh();
void refreshTtlCapability();
ttlCapabilityRefreshTimer = setInterval(() => {
void refreshTtlCapability();
}, ttlCapabilityRefreshIntervalMs);
}
watch(
() => props.connectionId,
() => {
supportsTtl.value = false;
ttlCapabilityKnown.value = false;
startTtlCapabilityRefresh();
},
{ immediate: true },
);
onBeforeUnmount(stopTtlCapabilityRefresh);
function focusSearch(): boolean { function focusSearch(): boolean {
return browserRef.value?.focusSearch() ?? false; return browserRef.value?.focusSearch() ?? false;
} }
@@ -48,5 +107,5 @@ defineExpose({ focusSearch, refresh });
</script> </script>
<template> <template>
<KvKeyBrowser ref="browserRef" :connection-id="props.connectionId" :api="etcdApi" :labels="labels" /> <KvKeyBrowser ref="browserRef" :connection-id="props.connectionId" :api="etcdApi" :labels="labels" :supports-ttl="supportsTtl" :ttl-capability-known="ttlCapabilityKnown" @refresh-requested="refreshTtlCapability" />
</template> </template>
@@ -0,0 +1,131 @@
// @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(() => ({
etcdSupportsTtl: vi.fn(),
}));
vi.mock("vue-i18n", () => ({
useI18n: () => ({ t: (key: string) => key }),
}));
vi.mock("@/lib/backend/api", () => ({
etcdListPrefix: vi.fn(),
etcdGet: vi.fn(),
etcdPut: vi.fn(),
etcdDelete: vi.fn(),
etcdSupportsTtl: backend.etcdSupportsTtl,
}));
vi.mock("@/components/kv/KvKeyBrowser.vue", () => ({
default: defineComponent({
name: "KvKeyBrowserStub",
props: {
supportsTtl: { type: Boolean, default: false },
ttlCapabilityKnown: { type: Boolean, default: true },
},
emits: ["refreshRequested"],
setup(props, { emit, expose }) {
expose({
focusSearch: () => true,
refresh: () => {
emit("refreshRequested");
return true;
},
});
return () =>
h(
"button",
{
id: "kv-browser-stub",
"data-supports-ttl": String(props.supportsTtl),
"data-capability-known": String(props.ttlCapabilityKnown),
onClick: () => emit("refreshRequested"),
},
"refresh",
);
},
}),
}));
import EtcdKeyBrowser from "@/components/etcd/EtcdKeyBrowser.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 mountBrowser() {
root = document.createElement("div");
document.body.appendChild(root);
app = createApp(EtcdKeyBrowser, { connectionId: "etcd-1" });
app.mount(root);
await flushUi();
return root.querySelector<HTMLButtonElement>("#kv-browser-stub")!;
}
beforeEach(() => {
vi.useFakeTimers();
backend.etcdSupportsTtl.mockReset();
});
afterEach(() => {
app?.unmount();
app = null;
root?.remove();
root = null;
vi.useRealTimers();
});
describe("EtcdKeyBrowser TTL capability recovery", () => {
it("keeps a transient probe failure unknown and retries automatically", async () => {
backend.etcdSupportsTtl.mockRejectedValueOnce(new Error("Agent is reconnecting")).mockResolvedValue(true);
const browser = await mountBrowser();
expect(browser.dataset.supportsTtl).toBe("false");
expect(browser.dataset.capabilityKnown).toBe("false");
await vi.advanceTimersByTimeAsync(5000);
await flushUi();
expect(backend.etcdSupportsTtl).toHaveBeenCalledTimes(2);
expect(browser.dataset.supportsTtl).toBe("true");
expect(browser.dataset.capabilityKnown).toBe("true");
});
it("rechecks a confirmed unsupported Agent when the user refreshes", async () => {
backend.etcdSupportsTtl.mockResolvedValueOnce(false).mockResolvedValueOnce(true);
const browser = await mountBrowser();
expect(browser.dataset.supportsTtl).toBe("false");
expect(browser.dataset.capabilityKnown).toBe("true");
browser.click();
await flushUi();
expect(backend.etcdSupportsTtl).toHaveBeenCalledTimes(2);
expect(browser.dataset.supportsTtl).toBe("true");
expect(browser.dataset.capabilityKnown).toBe("true");
});
it("keeps the last confirmed capability through a transient later failure", async () => {
backend.etcdSupportsTtl.mockResolvedValueOnce(true).mockRejectedValueOnce(new Error("temporary failure"));
const browser = await mountBrowser();
expect(browser.dataset.supportsTtl).toBe("true");
expect(browser.dataset.capabilityKnown).toBe("true");
await vi.advanceTimersByTimeAsync(5000);
await flushUi();
expect(backend.etcdSupportsTtl).toHaveBeenCalledTimes(2);
expect(browser.dataset.supportsTtl).toBe("true");
expect(browser.dataset.capabilityKnown).toBe("true");
});
});
+281 -25
View File
@@ -1,5 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed, onMounted, reactive, ref, watch } from "vue"; import { computed, onBeforeUnmount, onMounted, reactive, ref, watch } from "vue";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import { useConnectionStore } from "@/stores/connectionStore"; import { useConnectionStore } from "@/stores/connectionStore";
import { ChevronDown, ChevronRight, FolderClosed, FolderOpen, KeyRound, Loader2, Plus, RefreshCw, Search, Trash2 } from "@lucide/vue"; import { ChevronDown, ChevronRight, FolderClosed, FolderOpen, KeyRound, Loader2, Plus, RefreshCw, Search, Trash2 } from "@lucide/vue";
@@ -14,7 +14,10 @@ import CustomContextMenu, { type ContextMenuItem } from "@/components/ui/CustomC
import type { KvCreateMode, KvGetResponse, KvKeySummary, KvListPrefixOptions, KvPutOptions, KvPutResponse, KvValue } from "@/lib/backend/api"; import type { KvCreateMode, KvGetResponse, KvKeySummary, KvListPrefixOptions, KvPutOptions, KvPutResponse, KvValue } from "@/lib/backend/api";
import { buildKvKeyTree, flattenVisibleKvKeyTree, preserveKvExpandedGroupIds, type KvKeyTreeNode } from "@/lib/kv/kvKeyTree"; import { buildKvKeyTree, flattenVisibleKvKeyTree, preserveKvExpandedGroupIds, type KvKeyTreeNode } from "@/lib/kv/kvKeyTree";
import { refreshedKvSelectionKey } from "@/lib/kv/kvRefreshSelection"; import { refreshedKvSelectionKey } from "@/lib/kv/kvRefreshSelection";
import { decideKvMetadataRefresh, knownKvLeaseKeys, KvListRequestGuard, mergeKvKeyMetadata, mergeKvValueRefresh, nextKvLeaseRefreshDelay, removeMissingKvKey, updateKvResponseTtl } from "@/lib/kv/kvMetadataRefresh";
import { parseOptionalTtl } from "@/lib/kv/kvTtl";
import { formatZooKeeperMetadataRows, formatZooKeeperSummaryBadges, prettyPrintJsonText } from "@/lib/kv/kvValueDisplay"; import { formatZooKeeperMetadataRows, formatZooKeeperSummaryBadges, prettyPrintJsonText } from "@/lib/kv/kvValueDisplay";
import { formatTtl } from "@/lib/common/ttlFormat";
import { import {
createLazyKvKeyTreeState, createLazyKvKeyTreeState,
createZooKeeperChildPathDraft, createZooKeeperChildPathDraft,
@@ -50,6 +53,10 @@ interface KvKeyBrowserLabels {
deleted: string; deleted: string;
base64Readonly: string; base64Readonly: string;
createMode?: string; createMode?: string;
ttl?: string;
ttlPlaceholder?: string;
ttlInvalid?: string;
ttlUnavailable?: string;
add?: string; add?: string;
value?: string; value?: string;
metadata?: string; metadata?: string;
@@ -69,6 +76,7 @@ interface KvCreateModeOption {
interface KvKeyBrowserApi { interface KvKeyBrowserApi {
listPrefix: (connectionId: string, prefix: string, limit: number, continuation?: string | null, options?: KvListPrefixOptions | null) => Promise<{ keys: KvKeySummary[]; continuation?: string | null }>; listPrefix: (connectionId: string, prefix: string, limit: number, continuation?: string | null, options?: KvListPrefixOptions | null) => Promise<{ keys: KvKeySummary[]; continuation?: string | null }>;
get: (connectionId: string, key: string) => Promise<KvGetResponse>; get: (connectionId: string, key: string) => Promise<KvGetResponse>;
getMetadata?: (connectionId: string, key: string) => Promise<KvGetResponse>;
put: (connectionId: string, key: string, value: KvValue, options?: KvPutOptions | null) => Promise<KvPutResponse>; put: (connectionId: string, key: string, value: KvValue, options?: KvPutOptions | null) => Promise<KvPutResponse>;
deleteKey: (connectionId: string, key: string) => Promise<{ deleted: number }>; deleteKey: (connectionId: string, key: string) => Promise<{ deleted: number }>;
} }
@@ -82,6 +90,8 @@ const props = withDefaults(
labels: KvKeyBrowserLabels; labels: KvKeyBrowserLabels;
api: KvKeyBrowserApi; api: KvKeyBrowserApi;
supportsCreateModes?: boolean; supportsCreateModes?: boolean;
supportsTtl?: boolean;
ttlCapabilityKnown?: boolean;
createModeOptions?: KvCreateModeOption[]; createModeOptions?: KvCreateModeOption[];
enableNodeActions?: boolean; enableNodeActions?: boolean;
metadataStyle?: "default" | "zookeeper"; metadataStyle?: "default" | "zookeeper";
@@ -89,12 +99,17 @@ const props = withDefaults(
}>(), }>(),
{ {
supportsCreateModes: false, supportsCreateModes: false,
supportsTtl: false,
ttlCapabilityKnown: true,
createModeOptions: () => [], createModeOptions: () => [],
enableNodeActions: false, enableNodeActions: false,
metadataStyle: "default", metadataStyle: "default",
lazyHierarchy: false, lazyHierarchy: false,
}, },
); );
const emit = defineEmits<{
refreshRequested: [];
}>();
const { t } = useI18n(); const { t } = useI18n();
const { toast } = useToast(); const { toast } = useToast();
@@ -114,6 +129,7 @@ const showEditDialog = ref(false);
const isCreating = ref(false); const isCreating = ref(false);
const editKey = ref(""); const editKey = ref("");
const editValue = ref(""); const editValue = ref("");
const editTtl = ref<string | number>("");
const editError = ref(""); const editError = ref("");
const saving = ref(false); const saving = ref(false);
const showDeleteConfirm = ref(false); const showDeleteConfirm = ref(false);
@@ -122,6 +138,18 @@ const selectedCreateMode = ref<KvCreateMode>("persistent");
const selectedPrettyValue = ref<string | null>(null); const selectedPrettyValue = ref<string | null>(null);
const lazyTreeState = reactive(createLazyKvKeyTreeState()); const lazyTreeState = reactive(createLazyKvKeyTreeState());
const pageSize = 200; const pageSize = 200;
const metadataRefreshIntervalMs = 1000;
const keyListRefreshBaseIntervalMs = 2000;
const keyListRefreshMaxIntervalMs = 30000;
let detailRequestId = 0;
let metadataRefreshTimer: ReturnType<typeof setInterval> | null = null;
let metadataRefreshGeneration = 0;
let metadataRefreshInFlight = false;
let keyListRefreshTimer: ReturnType<typeof setTimeout> | null = null;
let keyListRefreshGeneration = 0;
let keyListRefreshDelayMs = keyListRefreshBaseIntervalMs;
let loadedPrefix = "";
const keyListRequestGuard = new KvListRequestGuard();
type LoadKeysOptions = { type LoadKeysOptions = {
preserveSelection?: boolean; preserveSelection?: boolean;
}; };
@@ -140,6 +168,8 @@ const selectedTextValue = computed(() => {
const displayedSelectedTextValue = computed(() => selectedPrettyValue.value ?? selectedTextValue.value); const displayedSelectedTextValue = computed(() => selectedPrettyValue.value ?? selectedTextValue.value);
const selectedValueIsBase64 = computed(() => selectedValue.value?.value?.encoding === "base64"); const selectedValueIsBase64 = computed(() => selectedValue.value?.value?.encoding === "base64");
const showCreateModeSelect = computed(() => props.supportsCreateModes && isCreating.value && props.createModeOptions.length > 0); const showCreateModeSelect = computed(() => props.supportsCreateModes && isCreating.value && props.createModeOptions.length > 0);
const showTtlInput = computed(() => props.supportsTtl && isCreating.value);
const showTtlUnavailable = computed(() => props.ttlCapabilityKnown && !props.supportsTtl && isCreating.value && !!props.labels.ttlUnavailable);
const zookeeperSummaryBadges = computed(() => const zookeeperSummaryBadges = computed(() =>
formatZooKeeperSummaryBadges(selectedMetadata.value, { formatZooKeeperSummaryBadges(selectedMetadata.value, {
revision: props.labels.summaryRevision, revision: props.labels.summaryRevision,
@@ -149,6 +179,10 @@ const zookeeperSummaryBadges = computed(() =>
}), }),
); );
const zookeeperMetadataRows = computed(() => formatZooKeeperMetadataRows(selectedMetadata.value)); const zookeeperMetadataRows = computed(() => formatZooKeeperMetadataRows(selectedMetadata.value));
const selectedTtlLabel = computed(() => {
const ttl = selectedMetadata.value?.ttl;
return typeof ttl === "number" && ttl > 0 ? formatTtl(ttl, t) : null;
});
const selectedValueCanPrettyJson = computed(() => selectedValue.value?.value?.encoding === "utf8" && prettyPrintJsonText(selectedTextValue.value).ok); const selectedValueCanPrettyJson = computed(() => selectedValue.value?.value?.encoding === "utf8" && prettyPrintJsonText(selectedTextValue.value).ok);
const editValueCanPrettyJson = computed(() => prettyPrintJsonText(editValue.value).ok); const editValueCanPrettyJson = computed(() => prettyPrintJsonText(editValue.value).ok);
@@ -162,37 +196,51 @@ async function loadKeys(reset = true, options: LoadKeysOptions = {}) {
return; return;
} }
const loadGeneration = keyListRequestGuard.beginForegroundRequest();
stopKeyListRefresh();
const connectionId = props.connectionId;
const keyToRestore = options.preserveSelection ? selectedKey.value : null; const keyToRestore = options.preserveSelection ? selectedKey.value : null;
const requestedPrefix = reset ? prefix.value.trim() : loadedPrefix;
const continuationToUse = reset ? null : continuation.value;
if (reset) { if (reset) {
loading.value = true; loading.value = true;
continuation.value = null; continuation.value = null;
keys.value = []; keys.value = [];
if (!options.preserveSelection) { if (!options.preserveSelection) {
selectedKey.value = null; clearSelectedKey();
selectedValue.value = null;
} }
} else { } else {
loadingMore.value = true; loadingMore.value = true;
} }
try { try {
const result = await props.api.listPrefix(props.connectionId, prefix.value.trim(), pageSize, reset ? null : continuation.value); const result = await props.api.listPrefix(connectionId, requestedPrefix, pageSize, continuationToUse);
if (!keyListRequestGuard.isForegroundRequestCurrent(loadGeneration) || props.connectionId !== connectionId) return;
const existing = new Set(keys.value.map((key) => key.key)); const existing = new Set(keys.value.map((key) => key.key));
const merged = reset ? result.keys : [...keys.value, ...result.keys.filter((key) => !existing.has(key.key))]; const merged = reset ? result.keys : [...keys.value, ...result.keys.filter((key) => !existing.has(key.key))];
keys.value = merged; keys.value = merged;
continuation.value = result.continuation || null; continuation.value = result.continuation || null;
preserveExpandedGroups(!!prefix.value.trim()); if (reset) {
loadedPrefix = requestedPrefix;
}
preserveExpandedGroups(!!requestedPrefix);
if (reset && options.preserveSelection) { if (reset && options.preserveSelection) {
const restoredKey = refreshedKvSelectionKey(keyToRestore, merged); const restoredKey = refreshedKvSelectionKey(keyToRestore, merged);
if (restoredKey) { if (restoredKey) {
await loadSelectedKey(restoredKey); await loadSelectedKey(restoredKey);
} else { } else {
selectedKey.value = null; clearSelectedKey();
selectedValue.value = null;
} }
} }
} catch (error) {
if (!keyListRequestGuard.isForegroundRequestCurrent(loadGeneration) || props.connectionId !== connectionId) return;
throw error;
} finally { } finally {
loading.value = false; if (keyListRequestGuard.isForegroundRequestCurrent(loadGeneration) && props.connectionId === connectionId) {
loadingMore.value = false; loading.value = false;
loadingMore.value = false;
startKeyListRefresh();
}
} }
} }
@@ -207,8 +255,7 @@ async function loadLazyRoot(reset = true, options: LoadKeysOptions = {}) {
loading.value = true; loading.value = true;
loadingMore.value = false; loadingMore.value = false;
if (!options.preserveSelection) { if (!options.preserveSelection) {
selectedKey.value = null; clearSelectedKey();
selectedValue.value = null;
} }
try { try {
@@ -232,8 +279,7 @@ async function loadLazyRoot(reset = true, options: LoadKeysOptions = {}) {
if (keyToRestore && lazyTreeState.nodeByKey.has(keyToRestore)) { if (keyToRestore && lazyTreeState.nodeByKey.has(keyToRestore)) {
await loadSelectedKey(keyToRestore); await loadSelectedKey(keyToRestore);
} else { } else {
selectedKey.value = null; clearSelectedKey();
selectedValue.value = null;
} }
} else { } else {
expandedGroupIds.value = focusedRootExpansion(rootPath); expandedGroupIds.value = focusedRootExpansion(rootPath);
@@ -341,16 +387,173 @@ async function refreshLazyParent(parentPath: string) {
} }
async function loadSelectedKey(key: string) { async function loadSelectedKey(key: string) {
stopMetadataRefresh();
const requestId = ++detailRequestId;
selectedKey.value = key; selectedKey.value = key;
selectedValue.value = null;
selectedPrettyValue.value = null; selectedPrettyValue.value = null;
detailLoading.value = true; detailLoading.value = true;
detailError.value = ""; detailError.value = "";
try { try {
selectedValue.value = await props.api.get(props.connectionId, key); const result = await props.api.get(props.connectionId, key);
if (requestId !== detailRequestId || selectedKey.value !== key) return;
if (!result.found) {
removeExpiredSelectedKey(key);
return;
}
selectedValue.value = result;
startMetadataRefresh(key);
} catch (error) { } catch (error) {
if (requestId !== detailRequestId || selectedKey.value !== key) return;
detailError.value = error instanceof Error ? error.message : String(error); detailError.value = error instanceof Error ? error.message : String(error);
} finally { } finally {
detailLoading.value = false; if (requestId === detailRequestId) detailLoading.value = false;
}
}
function clearSelectedKey() {
stopMetadataRefresh();
detailRequestId++;
selectedKey.value = null;
selectedValue.value = null;
selectedPrettyValue.value = null;
detailLoading.value = false;
}
function startMetadataRefresh(key: string) {
stopMetadataRefresh();
const metadata = selectedValue.value?.metadata;
if (!props.api.getMetadata || typeof metadata?.lease !== "number" || metadata.lease <= 0 || typeof metadata.ttl !== "number") return;
const generation = metadataRefreshGeneration;
metadataRefreshTimer = setInterval(() => {
void refreshSelectedMetadata(key, generation);
}, metadataRefreshIntervalMs);
}
function stopMetadataRefresh() {
metadataRefreshGeneration++;
metadataRefreshInFlight = false;
if (metadataRefreshTimer !== null) {
clearInterval(metadataRefreshTimer);
metadataRefreshTimer = null;
}
}
function startKeyListRefresh() {
stopKeyListRefresh();
keyListRefreshDelayMs = keyListRefreshBaseIntervalMs;
scheduleKeyListRefresh(keyListRefreshGeneration);
}
function activeMetadataRefreshKey(): string | null {
return metadataRefreshTimer !== null ? selectedKey.value : null;
}
function scheduleKeyListRefresh(generation: number) {
if (generation !== keyListRefreshGeneration || !props.supportsTtl || props.lazyHierarchy || !props.api.getMetadata || knownKvLeaseKeys(keys.value, activeMetadataRefreshKey()).length === 0) {
return;
}
keyListRefreshTimer = setTimeout(() => {
keyListRefreshTimer = null;
void refreshKnownLeaseKeys(generation);
}, keyListRefreshDelayMs);
}
function stopKeyListRefresh() {
keyListRefreshGeneration++;
if (keyListRefreshTimer !== null) {
clearTimeout(keyListRefreshTimer);
keyListRefreshTimer = null;
}
}
async function refreshKnownLeaseKeys(generation: number) {
const getMetadata = props.api.getMetadata;
if (!props.supportsTtl || props.lazyHierarchy || !getMetadata || loading.value || loadingMore.value || generation !== keyListRefreshGeneration) {
return;
}
const connectionId = props.connectionId;
const leaseKeys = knownKvLeaseKeys(keys.value, activeMetadataRefreshKey());
let failed = false;
for (const key of leaseKeys) {
try {
const result = await getMetadata(connectionId, key);
if (generation !== keyListRefreshGeneration || props.connectionId !== connectionId) return;
if (result.found && !result.metadata) {
failed = true;
continue;
}
if (!result.found && selectedKey.value === key) {
removeExpiredSelectedKey(key);
continue;
}
const previousLength = keys.value.length;
keys.value = mergeKvKeyMetadata(keys.value, key, result);
if (keys.value.length !== previousLength) {
preserveExpandedGroups();
}
} catch {
if (generation !== keyListRefreshGeneration || props.connectionId !== connectionId) return;
failed = true;
}
}
if (generation !== keyListRefreshGeneration || props.connectionId !== connectionId) return;
keyListRefreshDelayMs = nextKvLeaseRefreshDelay(keyListRefreshDelayMs, failed, keyListRefreshBaseIntervalMs, keyListRefreshMaxIntervalMs);
scheduleKeyListRefresh(generation);
}
function removeExpiredSelectedKey(key: string) {
keys.value = removeMissingKvKey(keys.value, key);
preserveExpandedGroups();
clearSelectedKey();
}
async function refreshSelectedValueSilently(key: string, generation: number) {
const result = await props.api.get(props.connectionId, key);
if (generation !== metadataRefreshGeneration || selectedKey.value !== key) return;
if (!result.found) {
removeExpiredSelectedKey(key);
return;
}
selectedValue.value = mergeKvValueRefresh(selectedValue.value, result);
const metadata = selectedValue.value.metadata;
if (typeof metadata?.lease !== "number" || metadata.lease <= 0 || typeof metadata.ttl !== "number") {
stopMetadataRefresh();
}
}
async function refreshSelectedMetadata(key: string, generation: number) {
const getMetadata = props.api.getMetadata;
if (!getMetadata || metadataRefreshInFlight || generation !== metadataRefreshGeneration || selectedKey.value !== key) return;
metadataRefreshInFlight = true;
try {
const result = await getMetadata(props.connectionId, key);
if (generation !== metadataRefreshGeneration || selectedKey.value !== key) return;
const current = selectedValue.value;
const decision = decideKvMetadataRefresh(current, result);
if (decision.type === "notFound") {
removeExpiredSelectedKey(key);
} else if (decision.type === "stop") {
stopMetadataRefresh();
} else if (decision.type === "reload") {
await refreshSelectedValueSilently(key, generation);
} else {
if (!current || !updateKvResponseTtl(current, decision.ttl)) {
stopMetadataRefresh();
}
}
} catch {
// Keep the timer alive so transient failures do not freeze the countdown.
} finally {
if (generation === metadataRefreshGeneration) metadataRefreshInFlight = false;
} }
} }
@@ -401,6 +604,7 @@ function openCreateDialog(parentPath?: string) {
isCreating.value = true; isCreating.value = true;
editKey.value = createKeyPrefix(parentPath); editKey.value = createKeyPrefix(parentPath);
editValue.value = ""; editValue.value = "";
editTtl.value = "";
editError.value = ""; editError.value = "";
selectedCreateMode.value = props.createModeOptions[0]?.value || "persistent"; selectedCreateMode.value = props.createModeOptions[0]?.value || "persistent";
showEditDialog.value = true; showEditDialog.value = true;
@@ -416,11 +620,23 @@ function openEditDialog() {
} }
function putOptions(): KvPutOptions | undefined { function putOptions(): KvPutOptions | undefined {
if (!props.supportsCreateModes) return undefined; const options: KvPutOptions = {};
if (isCreating.value) { if (props.supportsCreateModes) {
return { writeMode: "create", createMode: selectedCreateMode.value }; if (isCreating.value) {
options.writeMode = "create";
options.createMode = selectedCreateMode.value;
} else {
options.writeMode = "update";
}
} }
return { writeMode: "update" }; if (props.supportsTtl && isCreating.value) {
const parsed = parseOptionalTtl(editTtl.value);
if (parsed.ok && parsed.ttl != null) options.ttl = parsed.ttl;
}
if (!isCreating.value && typeof selectedMetadata.value?.lease === "number" && selectedMetadata.value.lease > 0) {
options.preserveLease = true;
}
return Object.keys(options).length > 0 ? options : undefined;
} }
async function saveKey() { async function saveKey() {
@@ -433,6 +649,10 @@ async function saveKey() {
editError.value = props.labels.rootReadonly || props.labels.keyRequired; editError.value = props.labels.rootReadonly || props.labels.keyRequired;
return; return;
} }
if (showTtlInput.value && !parseOptionalTtl(editTtl.value).ok) {
editError.value = props.labels.ttlInvalid || "TTL must be a positive integer";
return;
}
const key = props.lazyHierarchy ? normalizeZooKeeperPath(rawKey) : rawKey; const key = props.lazyHierarchy ? normalizeZooKeeperPath(rawKey) : rawKey;
saving.value = true; saving.value = true;
editError.value = ""; editError.value = "";
@@ -462,8 +682,7 @@ async function deleteSelectedKey() {
try { try {
await props.api.deleteKey(props.connectionId, selectedKey.value); await props.api.deleteKey(props.connectionId, selectedKey.value);
showDeleteConfirm.value = false; showDeleteConfirm.value = false;
selectedKey.value = null; clearSelectedKey();
selectedValue.value = null;
if (props.lazyHierarchy) { if (props.lazyHierarchy) {
await refreshLazyParent(parentPath); await refreshLazyParent(parentPath);
} else { } else {
@@ -553,20 +772,44 @@ function focusSearch(): boolean {
return true; return true;
} }
async function refreshKeys() {
emit("refreshRequested");
await loadKeys(true, { preserveSelection: true });
}
function refresh(): boolean { function refresh(): boolean {
void loadKeys(true, { preserveSelection: true }); void refreshKeys().catch((error) => {
console.warn("[DBX] KV key refresh failed", error);
});
return true; return true;
} }
watch( watch(
() => props.connectionId, () => props.connectionId,
async () => { async () => {
stopKeyListRefresh();
clearSelectedKey();
try { try {
await connectionStore.ensureConnected(props.connectionId); await connectionStore.ensureConnected(props.connectionId);
} catch { } catch {
// Connection failed — loadKeys will show the error state // Connection failed — loadKeys will show the error state
} }
void loadKeys(true); await loadKeys(true);
},
);
watch(
() => props.supportsTtl,
(supported) => {
if (supported) startKeyListRefresh();
else stopKeyListRefresh();
},
);
watch(
() => selectedKey.value,
() => {
startKeyListRefresh();
}, },
); );
@@ -586,7 +829,12 @@ onMounted(async () => {
} catch (e) { } catch (e) {
console.warn("[DBX] ensureConnected failed for", props.connectionId, e); console.warn("[DBX] ensureConnected failed for", props.connectionId, e);
} }
void loadKeys(true); await loadKeys(true);
});
onBeforeUnmount(() => {
clearSelectedKey();
stopKeyListRefresh();
}); });
defineExpose({ focusSearch, refresh }); defineExpose({ focusSearch, refresh });
</script> </script>
@@ -598,7 +846,7 @@ defineExpose({ focusSearch, refresh });
<Search class="pointer-events-none absolute left-2.5 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" /> <Search class="pointer-events-none absolute left-2.5 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
<Input ref="searchInputRef" v-model="prefix" class="h-8 pl-8" :placeholder="labels.prefixPlaceholder" @keyup.enter="loadKeys(true)" /> <Input ref="searchInputRef" v-model="prefix" class="h-8 pl-8" :placeholder="labels.prefixPlaceholder" @keyup.enter="loadKeys(true)" />
</div> </div>
<Button size="sm" variant="outline" class="h-8 gap-1.5" :disabled="loading" @click="loadKeys(true, { preserveSelection: true })"> <Button size="sm" variant="outline" class="h-8 gap-1.5" :disabled="loading" @click="refreshKeys">
<Loader2 v-if="loading" class="h-3.5 w-3.5 animate-spin" /> <Loader2 v-if="loading" class="h-3.5 w-3.5 animate-spin" />
<RefreshCw v-else class="h-3.5 w-3.5" /> <RefreshCw v-else class="h-3.5 w-3.5" />
{{ t("grid.refresh") }} {{ t("grid.refresh") }}
@@ -678,6 +926,7 @@ defineExpose({ focusSearch, refresh });
<Badge variant="secondary">rev {{ metadataLabel(selectedMetadata?.modRevision) }}</Badge> <Badge variant="secondary">rev {{ metadataLabel(selectedMetadata?.modRevision) }}</Badge>
<Badge variant="outline">ver {{ metadataLabel(selectedMetadata?.version) }}</Badge> <Badge variant="outline">ver {{ metadataLabel(selectedMetadata?.version) }}</Badge>
<Badge variant="outline">lease {{ metadataLabel(selectedMetadata?.lease) }}</Badge> <Badge variant="outline">lease {{ metadataLabel(selectedMetadata?.lease) }}</Badge>
<Badge v-if="selectedTtlLabel" variant="outline">TTL {{ selectedTtlLabel }}</Badge>
<Badge variant="outline">{{ metadataLabel(selectedMetadata?.valueSize) }} B</Badge> <Badge variant="outline">{{ metadataLabel(selectedMetadata?.valueSize) }} B</Badge>
</template> </template>
</div> </div>
@@ -744,6 +993,13 @@ defineExpose({ focusSearch, refresh });
</SelectContent> </SelectContent>
</Select> </Select>
</div> </div>
<div v-if="showTtlInput" class="grid grid-cols-4 items-center gap-3">
<Label class="text-right text-xs">{{ labels.ttl || "TTL (seconds)" }}</Label>
<Input v-model="editTtl" class="col-span-3" type="number" min="1" step="1" :placeholder="labels.ttlPlaceholder || 'Optional; leave blank for no expiry'" />
</div>
<div v-else-if="showTtlUnavailable" class="rounded-md border border-amber-500/30 bg-amber-500/10 px-3 py-2 text-sm text-amber-700 dark:text-amber-300">
{{ labels.ttlUnavailable }}
</div>
<textarea v-model="editValue" class="min-h-52 rounded-md border border-input bg-transparent px-3 py-2 text-sm shadow-sm focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring" spellcheck="false" /> <textarea v-model="editValue" class="min-h-52 rounded-md border border-input bg-transparent px-3 py-2 text-sm shadow-sm focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring" spellcheck="false" />
<div v-if="editValueCanPrettyJson" class="flex justify-end"> <div v-if="editValueCanPrettyJson" class="flex justify-end">
<Button size="sm" variant="outline" class="h-8" @click="prettifyEditJson"> <Button size="sm" variant="outline" class="h-8" @click="prettifyEditJson">
+4
View File
@@ -2634,6 +2634,10 @@ export default {
deleteTitle: "Delete etcd key", deleteTitle: "Delete etcd key",
keyPlaceholder: "/path/to/key", keyPlaceholder: "/path/to/key",
keyRequired: "Key is required", keyRequired: "Key is required",
ttl: "TTL (seconds)",
ttlPlaceholder: "Optional; leave blank for no expiry",
ttlInvalid: "TTL must be a positive integer",
ttlUnavailable: "Update the etcd Agent and reconnect to configure TTL.",
saved: "Key saved", saved: "Key saved",
deleted: "Key deleted", deleted: "Key deleted",
base64Readonly: "Base64 values are read-only in this version.", base64Readonly: "Base64 values are read-only in this version.",
+4
View File
@@ -2486,6 +2486,10 @@ export default withEnglishFallback({
deleteTitle: "Eliminar clave de etcd", deleteTitle: "Eliminar clave de etcd",
keyPlaceholder: "/ruta/a/clave", keyPlaceholder: "/ruta/a/clave",
keyRequired: "La clave es obligatoria", keyRequired: "La clave es obligatoria",
ttl: "TTL (segundos)",
ttlPlaceholder: "Opcional; vacío significa sin caducidad",
ttlInvalid: "El TTL debe ser un entero positivo",
ttlUnavailable: "Actualiza el Agent de etcd y vuelve a conectarte para configurar el TTL.",
saved: "Clave guardada", saved: "Clave guardada",
deleted: "Clave eliminada", deleted: "Clave eliminada",
base64Readonly: "Los valores Base64 son de solo lectura en esta versión.", base64Readonly: "Los valores Base64 son de solo lectura en esta versión.",
+4
View File
@@ -2484,6 +2484,10 @@ export default withEnglishFallback({
deleteTitle: "Elimina chiave etcd", deleteTitle: "Elimina chiave etcd",
keyPlaceholder: "/percorso/per/la/chiave", keyPlaceholder: "/percorso/per/la/chiave",
keyRequired: "La chiave e obbligatoria", keyRequired: "La chiave e obbligatoria",
ttl: "TTL (secondi)",
ttlPlaceholder: "Facoltativo; vuoto significa nessuna scadenza",
ttlInvalid: "Il TTL deve essere un numero intero positivo",
ttlUnavailable: "Aggiorna l'Agent etcd e riconnettiti per configurare il TTL.",
saved: "Chiave salvata", saved: "Chiave salvata",
deleted: "Chiave eliminata", deleted: "Chiave eliminata",
base64Readonly: "I valori Base64 sono in sola lettura in questa versione.", base64Readonly: "I valori Base64 sono in sola lettura in questa versione.",
+4
View File
@@ -2519,6 +2519,10 @@ export default withEnglishFallback({
deleteTitle: "etcdキーを削除", deleteTitle: "etcdキーを削除",
keyPlaceholder: "/path/to/key", keyPlaceholder: "/path/to/key",
keyRequired: "キーは必須です", keyRequired: "キーは必須です",
ttl: "TTL(秒)",
ttlPlaceholder: "任意。空欄の場合は有効期限なし",
ttlInvalid: "TTLには正の整数を指定してください",
ttlUnavailable: "TTLを設定するにはetcd Agentを更新して再接続してください。",
saved: "キーを保存しました", saved: "キーを保存しました",
deleted: "キーを削除しました", deleted: "キーを削除しました",
base64Readonly: "Base64値はこのバージョンでは読み取り専用です。", base64Readonly: "Base64値はこのバージョンでは読み取り専用です。",
+4
View File
@@ -2486,6 +2486,10 @@ export default withEnglishFallback({
deleteTitle: "Excluir chave etcd", deleteTitle: "Excluir chave etcd",
keyPlaceholder: "/caminho/para/chave", keyPlaceholder: "/caminho/para/chave",
keyRequired: "Chave é obrigatória", keyRequired: "Chave é obrigatória",
ttl: "TTL (segundos)",
ttlPlaceholder: "Opcional; vazio significa sem expiração",
ttlInvalid: "O TTL deve ser um número inteiro positivo",
ttlUnavailable: "Atualize o Agent do etcd e reconecte para configurar o TTL.",
saved: "Chave salva", saved: "Chave salva",
deleted: "Chave excluída", deleted: "Chave excluída",
base64Readonly: "Valores Base64 são somente leitura nesta versão.", base64Readonly: "Valores Base64 são somente leitura nesta versão.",
+4
View File
@@ -2634,6 +2634,10 @@ export default withEnglishFallback({
deleteTitle: "删除 etcd Key", deleteTitle: "删除 etcd Key",
keyPlaceholder: "/path/to/key", keyPlaceholder: "/path/to/key",
keyRequired: "Key 不能为空", keyRequired: "Key 不能为空",
ttl: "TTL(秒)",
ttlPlaceholder: "可选,留空表示永不过期",
ttlInvalid: "TTL 必须是正整数",
ttlUnavailable: "请更新 etcd Agent 并重新连接后再配置 TTL。",
saved: "Key 已保存", saved: "Key 已保存",
deleted: "Key 已删除", deleted: "Key 已删除",
base64Readonly: "Base64 值当前版本只读。", base64Readonly: "Base64 值当前版本只读。",
+4
View File
@@ -4415,6 +4415,10 @@ export default withEnglishFallback({
deleteTitle: "刪除 etcd key", deleteTitle: "刪除 etcd key",
keyPlaceholder: "/path/to/key", keyPlaceholder: "/path/to/key",
keyRequired: "Key 不能為空", keyRequired: "Key 不能為空",
ttl: "TTL(秒)",
ttlPlaceholder: "選填,留空表示永不過期",
ttlInvalid: "TTL 必須是正整數",
ttlUnavailable: "請更新 etcd Agent 並重新連線後再設定 TTL。",
saved: "Key 已儲存", saved: "Key 已儲存",
deleted: "Key 已刪除", deleted: "Key 已刪除",
base64Readonly: "Base64 值在此版本中為唯讀。", base64Readonly: "Base64 值在此版本中為唯讀。",
@@ -0,0 +1,17 @@
import { describe, expect, it } from "vitest";
import { etcdDelete, etcdGet, etcdListPrefix, etcdPut, etcdSupportsTtl, type KvPutOptions } from "@/lib/backend/api";
describe("etcd frontend API contract", () => {
it("exposes TTL capability detection and TTL-aware put options", () => {
const expiring: KvPutOptions = { ttl: 30 };
const preserving: KvPutOptions = { preserveLease: true };
expect(expiring.ttl).toBe(30);
expect(preserving.preserveLease).toBe(true);
expect(typeof etcdSupportsTtl).toBe("function");
expect(typeof etcdListPrefix).toBe("function");
expect(typeof etcdGet).toBe("function");
expect(typeof etcdPut).toBe("function");
expect(typeof etcdDelete).toBe("function");
});
});
@@ -0,0 +1,112 @@
import { describe, expect, it } from "vitest";
import type { KvGetResponse } from "@/lib/backend/api";
import { decideKvMetadataRefresh, knownKvLeaseKeys, KvListRequestGuard, mergeKvKeyMetadata, mergeKvValueRefresh, nextKvLeaseRefreshDelay, removeMissingKvKey, updateKvResponseTtl } from "@/lib/kv/kvMetadataRefresh";
function found(metadata: NonNullable<KvGetResponse["metadata"]>): KvGetResponse {
return {
found: true,
key: "/service",
value: { encoding: "utf8", data: "value" },
metadata,
};
}
describe("decideKvMetadataRefresh", () => {
it("keeps only the latest foreground request current", () => {
const guard = new KvListRequestGuard();
const firstPageRequest = guard.beginForegroundRequest();
expect(guard.isForegroundRequestCurrent(firstPageRequest)).toBe(true);
const loadMoreRequest = guard.beginForegroundRequest();
expect(guard.isForegroundRequestCurrent(firstPageRequest)).toBe(false);
expect(guard.isForegroundRequestCurrent(loadMoreRequest)).toBe(true);
});
it("updates only the TTL when the selected key metadata is unchanged", () => {
const current = found({ modRevision: 10, lease: 20, ttl: 8, valueSize: 5 });
const incoming = found({ modRevision: 10, lease: 20, ttl: 7 });
expect(decideKvMetadataRefresh(current, incoming)).toEqual({ type: "update", ttl: 7 });
});
it("reloads the full value when the revision or lease changes", () => {
const current = found({ modRevision: 10, lease: 20, ttl: 8 });
expect(decideKvMetadataRefresh(current, found({ modRevision: 11, lease: 20, ttl: 7 }))).toEqual({ type: "reload" });
expect(decideKvMetadataRefresh(current, found({ modRevision: 10, lease: 21, ttl: 7 }))).toEqual({ type: "reload" });
});
it("keeps polling without a full reload while etcd finalizes an expired lease", () => {
const current = found({ modRevision: 10, lease: 20, ttl: 1 });
expect(decideKvMetadataRefresh(current, found({ modRevision: 10, lease: 20, ttl: 0 }))).toEqual({ type: "update", ttl: 0 });
expect(decideKvMetadataRefresh(current, found({ modRevision: 10, lease: 20 }))).toEqual({ type: "reload" });
});
it("updates TTL in place without replacing the value response", () => {
const current = found({ modRevision: 10, lease: 20, ttl: 8 });
const value = current.value;
expect(updateKvResponseTtl(current, 7)).toBe(true);
expect(current.metadata?.ttl).toBe(7);
expect(current.value).toBe(value);
});
it("keeps the existing response during a silent full refresh when only TTL changed", () => {
const current = found({ modRevision: 10, lease: 20, ttl: 8 });
const incoming = found({ modRevision: 10, lease: 20, ttl: 7 });
expect(mergeKvValueRefresh(current, incoming)).toBe(current);
expect(current.metadata?.ttl).toBe(7);
});
it("replaces the response when a silent refresh finds a new value revision", () => {
const current = found({ modRevision: 10, lease: 20, ttl: 8 });
const incoming = found({ modRevision: 11, lease: 20, ttl: 7 });
incoming.value = { encoding: "utf8", data: "updated" };
expect(mergeKvValueRefresh(current, incoming)).toBe(incoming);
});
it("stops and exposes a missing key without reloading", () => {
expect(decideKvMetadataRefresh(found({ modRevision: 10, lease: 20, ttl: 1 }), { found: false })).toEqual({ type: "notFound" });
});
it("stops when a metadata refresh cannot be reconciled with the current value", () => {
expect(decideKvMetadataRefresh(null, found({ modRevision: 10, lease: 20, ttl: 1 }))).toEqual({ type: "stop" });
});
it("removes an expired key from the cached key list", () => {
const keys = [{ key: "/dbx/a" }, { key: "/dbx/aaaaa" }, { key: "/test/a" }];
expect(removeMissingKvKey(keys, "/dbx/aaaaa")).toEqual([{ key: "/dbx/a" }, { key: "/test/a" }]);
});
it("tracks only known leased keys and excludes the selected key", () => {
const keys = [{ key: "/no-lease", lease: 0 }, { key: "/leased", lease: 10 }, { key: "/selected", lease: 20 }, { key: "/unknown" }];
expect(knownKvLeaseKeys(keys, "/selected")).toEqual(["/leased"]);
expect(knownKvLeaseKeys(keys, null)).toEqual(["/leased", "/selected"]);
});
it("merges refreshed metadata without replacing the known value size and removes expired keys", () => {
const keys = [
{ key: "/leased", lease: 10, ttl: 4, valueSize: 12 },
{ key: "/expired", lease: 20, ttl: 1 },
];
expect(mergeKvKeyMetadata(keys, "/leased", found({ lease: 11, ttl: 3, modRevision: 5, valueSize: 0 }))).toEqual([
{ key: "/leased", lease: 11, ttl: 3, modRevision: 5, valueSize: 12 },
{ key: "/expired", lease: 20, ttl: 1 },
]);
expect(mergeKvKeyMetadata(keys, "/expired", { found: false })).toEqual([{ key: "/leased", lease: 10, ttl: 4, valueSize: 12 }]);
});
it("backs off after failures and resets after a successful cycle", () => {
expect(nextKvLeaseRefreshDelay(2000, true)).toBe(4000);
expect(nextKvLeaseRefreshDelay(4000, true)).toBe(8000);
expect(nextKvLeaseRefreshDelay(16000, true)).toBe(30000);
expect(nextKvLeaseRefreshDelay(30000, true)).toBe(30000);
expect(nextKvLeaseRefreshDelay(16000, false)).toBe(2000);
});
});
+25
View File
@@ -0,0 +1,25 @@
import { describe, expect, it } from "vitest";
import { parseOptionalTtl } from "@/lib/kv/kvTtl";
describe("parseOptionalTtl", () => {
it("treats an empty TTL as a permanent key", () => {
expect(parseOptionalTtl("")).toEqual({ ok: true, ttl: null });
expect(parseOptionalTtl(" ")).toEqual({ ok: true, ttl: null });
expect(parseOptionalTtl(undefined)).toEqual({ ok: true, ttl: null });
expect(parseOptionalTtl(null)).toEqual({ ok: true, ttl: null });
});
it("accepts positive integer seconds from text and number inputs", () => {
expect(parseOptionalTtl("1")).toEqual({ ok: true, ttl: 1 });
expect(parseOptionalTtl(" 3600 ")).toEqual({ ok: true, ttl: 3600 });
expect(parseOptionalTtl(10)).toEqual({ ok: true, ttl: 10 });
});
it("rejects zero, negative, decimal, and unsafe TTL values", () => {
expect(parseOptionalTtl("0")).toEqual({ ok: false });
expect(parseOptionalTtl("-1")).toEqual({ ok: false });
expect(parseOptionalTtl("1.5")).toEqual({ ok: false });
expect(parseOptionalTtl(1.5)).toEqual({ ok: false });
expect(parseOptionalTtl("9007199254740992")).toEqual({ ok: false });
});
});
+2
View File
@@ -406,6 +406,7 @@ export const redisClusterMasterNodes = forward("redisClusterMasterNodes");
// etcd // etcd
export const etcdListPrefix = forward("etcdListPrefix"); export const etcdListPrefix = forward("etcdListPrefix");
export const etcdSupportsTtl = forward("etcdSupportsTtl");
export const etcdGet = forward("etcdGet"); export const etcdGet = forward("etcdGet");
export const etcdPut = forward("etcdPut"); export const etcdPut = forward("etcdPut");
export const etcdDelete = forward("etcdDelete"); export const etcdDelete = forward("etcdDelete");
@@ -623,6 +624,7 @@ export type {
KvListPrefixResponse, KvListPrefixResponse,
KvListPrefixOptions, KvListPrefixOptions,
KvGetResponse, KvGetResponse,
KvGetOptions,
KvWriteMode, KvWriteMode,
KvCreateMode, KvCreateMode,
KvPutOptions, KvPutOptions,
+18 -4
View File
@@ -76,6 +76,7 @@ import type {
KvListPrefixResponse, KvListPrefixResponse,
KvListPrefixOptions, KvListPrefixOptions,
KvGetResponse, KvGetResponse,
KvGetOptions,
KvPutOptions, KvPutOptions,
KvPutResponse, KvPutResponse,
KvDeleteResponse, KvDeleteResponse,
@@ -2051,12 +2052,25 @@ export async function etcdListPrefix(connectionId: string, prefix: string, limit
return post("/api/etcd/list-prefix", { connectionId, prefix, limit, continuation }); return post("/api/etcd/list-prefix", { connectionId, prefix, limit, continuation });
} }
export async function etcdGet(connectionId: string, key: string): Promise<KvGetResponse> { export async function etcdSupportsTtl(connectionId: string): Promise<boolean> {
return post("/api/etcd/get", { connectionId, key }); return post("/api/etcd/supports-ttl", { connectionId });
} }
export async function etcdPut(connectionId: string, key: string, value: KvValue, lease?: number | null): Promise<KvPutResponse> { export async function etcdGet(connectionId: string, key: string, options?: KvGetOptions | null): Promise<KvGetResponse> {
return post("/api/etcd/put", { connectionId, key, value, lease }); return post("/api/etcd/get", { connectionId, key, metadataOnly: options?.metadataOnly ?? null });
}
export async function etcdPut(connectionId: string, key: string, value: KvValue, options?: KvPutOptions | number | null): Promise<KvPutResponse> {
const legacyLease = typeof options === "number" ? options : null;
const putOptions = typeof options === "object" ? options : null;
return post("/api/etcd/put", {
connectionId,
key,
value,
lease: legacyLease ?? putOptions?.lease ?? null,
ttl: putOptions?.ttl ?? null,
preserveLease: putOptions?.preserveLease ?? null,
});
} }
export async function etcdDelete(connectionId: string, key: string): Promise<KvDeleteResponse> { export async function etcdDelete(connectionId: string, key: string): Promise<KvDeleteResponse> {
+25 -4
View File
@@ -1777,6 +1777,7 @@ export interface KvKeyMetadata {
modRevision?: number | null; modRevision?: number | null;
version?: number | null; version?: number | null;
lease?: number | null; lease?: number | null;
ttl?: number | null;
valueSize?: number | null; valueSize?: number | null;
czxid?: number | null; czxid?: number | null;
mzxid?: number | null; mzxid?: number | null;
@@ -1811,6 +1812,10 @@ export interface KvGetResponse {
metadata?: KvKeyMetadata | null; metadata?: KvKeyMetadata | null;
} }
export interface KvGetOptions {
metadataOnly?: boolean | null;
}
export interface KvPutResponse { export interface KvPutResponse {
revision?: number | null; revision?: number | null;
version?: number | null; version?: number | null;
@@ -1823,6 +1828,9 @@ export type KvWriteMode = "upsert" | "create" | "update";
export type KvCreateMode = "persistent" | "ephemeral" | "persistent_sequential" | "ephemeral_sequential"; export type KvCreateMode = "persistent" | "ephemeral" | "persistent_sequential" | "ephemeral_sequential";
export interface KvPutOptions { export interface KvPutOptions {
lease?: number | null;
ttl?: number | null;
preserveLease?: boolean | null;
writeMode?: KvWriteMode | null; writeMode?: KvWriteMode | null;
createMode?: KvCreateMode | null; createMode?: KvCreateMode | null;
} }
@@ -1836,12 +1844,25 @@ export async function etcdListPrefix(connectionId: string, prefix: string, limit
return invoke("etcd_list_prefix", { connectionId, prefix, limit, continuation }); return invoke("etcd_list_prefix", { connectionId, prefix, limit, continuation });
} }
export async function etcdGet(connectionId: string, key: string): Promise<KvGetResponse> { export async function etcdSupportsTtl(connectionId: string): Promise<boolean> {
return invoke("etcd_get", { connectionId, key }); return invoke("etcd_supports_ttl", { connectionId });
} }
export async function etcdPut(connectionId: string, key: string, value: KvValue, lease?: number | null): Promise<KvPutResponse> { export async function etcdGet(connectionId: string, key: string, options?: KvGetOptions | null): Promise<KvGetResponse> {
return invoke("etcd_put", { connectionId, key, value, lease }); return invoke("etcd_get", { connectionId, key, metadataOnly: options?.metadataOnly ?? null });
}
export async function etcdPut(connectionId: string, key: string, value: KvValue, options?: KvPutOptions | number | null): Promise<KvPutResponse> {
const legacyLease = typeof options === "number" ? options : null;
const putOptions = typeof options === "object" ? options : null;
return invoke("etcd_put", {
connectionId,
key,
value,
lease: legacyLease ?? putOptions?.lease ?? null,
ttl: putOptions?.ttl ?? null,
preserveLease: putOptions?.preserveLease ?? null,
});
} }
export async function etcdDelete(connectionId: string, key: string): Promise<KvDeleteResponse> { export async function etcdDelete(connectionId: string, key: string): Promise<KvDeleteResponse> {
@@ -0,0 +1,65 @@
import type { KvGetResponse, KvKeySummary } from "@/lib/backend/api";
export type KvMetadataRefreshDecision = { type: "notFound" } | { type: "stop" } | { type: "reload" } | { type: "update"; ttl: number };
export class KvListRequestGuard {
private foregroundGeneration = 0;
beginForegroundRequest(): number {
return ++this.foregroundGeneration;
}
isForegroundRequestCurrent(generation: number): boolean {
return generation === this.foregroundGeneration;
}
}
export function decideKvMetadataRefresh(current: KvGetResponse | null, incoming: KvGetResponse): KvMetadataRefreshDecision {
if (!incoming.found) return { type: "notFound" };
if (!current?.found || !incoming.metadata) return { type: "stop" };
if (!current.metadata) return { type: "reload" };
const revisionChanged = current.metadata.modRevision != null && incoming.metadata.modRevision != null && current.metadata.modRevision !== incoming.metadata.modRevision;
const leaseChanged = current.metadata.lease != null && incoming.metadata.lease != null && current.metadata.lease !== incoming.metadata.lease;
const ttl = incoming.metadata.ttl;
if (revisionChanged || leaseChanged || ttl == null) return { type: "reload" };
return { type: "update", ttl: Math.max(0, ttl) };
}
export function updateKvResponseTtl(current: KvGetResponse, ttl: number): boolean {
if (!current.metadata) return false;
current.metadata.ttl = ttl;
return true;
}
export function mergeKvValueRefresh(current: KvGetResponse | null, incoming: KvGetResponse): KvGetResponse {
if (!current?.found || !incoming.found || !current.metadata || !incoming.metadata) return incoming;
const sameValue = current.value?.encoding === incoming.value?.encoding && current.value?.data === incoming.value?.data;
const sameRevision = current.metadata.modRevision === incoming.metadata.modRevision;
const sameLease = current.metadata.lease === incoming.metadata.lease;
if (!sameValue || !sameRevision || !sameLease) return incoming;
if (incoming.metadata.ttl != null) current.metadata.ttl = Math.max(0, incoming.metadata.ttl);
return current;
}
export function removeMissingKvKey(keys: readonly KvKeySummary[], missingKey: string): KvKeySummary[] {
return keys.filter((key) => key.key !== missingKey);
}
export function knownKvLeaseKeys(keys: readonly KvKeySummary[], selectedKey: string | null): string[] {
return keys.filter((key) => key.key !== selectedKey && typeof key.lease === "number" && key.lease > 0).map((key) => key.key);
}
export function mergeKvKeyMetadata(keys: readonly KvKeySummary[], key: string, incoming: KvGetResponse): KvKeySummary[] {
if (!incoming.found) return removeMissingKvKey(keys, key);
if (!incoming.metadata) return [...keys];
return keys.map((item) => (item.key === key ? { ...item, ...incoming.metadata, key: item.key, valueSize: item.valueSize } : item));
}
export function nextKvLeaseRefreshDelay(currentDelayMs: number, failed: boolean, baseDelayMs = 2000, maxDelayMs = 30000): number {
if (!failed) return baseDelayMs;
return Math.min(maxDelayMs, Math.max(baseDelayMs, currentDelayMs) * 2);
}
+13
View File
@@ -0,0 +1,13 @@
export type ParsedOptionalTtl = { ok: true; ttl: number | null } | { ok: false };
export function parseOptionalTtl(value: string | number | null | undefined): ParsedOptionalTtl {
if (value == null) return { ok: true, ttl: null };
const trimmed = String(value).trim();
if (!trimmed) return { ok: true, ttl: null };
if (!/^[1-9]\d*$/.test(trimmed)) return { ok: false };
const ttl = Number(trimmed);
if (!Number.isSafeInteger(ttl)) return { ok: false };
return { ok: true, ttl };
}
@@ -14,7 +14,8 @@
"paged_query", "paged_query",
"transaction", "transaction",
"ddl", "ddl",
"kv" "kv",
"kv_ttl"
], ],
"capabilities": [ "capabilities": [
"connect", "connect",
@@ -15,6 +15,7 @@
"transaction", "transaction",
"ddl", "ddl",
"kv", "kv",
"kv_ttl",
"multi_session" "multi_session"
], ],
"capabilities": [ "capabilities": [
+117 -4
View File
@@ -24,6 +24,7 @@ pub struct KvKeyMetadata {
pub mod_revision: Option<i64>, pub mod_revision: Option<i64>,
pub version: Option<i64>, pub version: Option<i64>,
pub lease: Option<i64>, pub lease: Option<i64>,
pub ttl: Option<i64>,
pub value_size: Option<u64>, pub value_size: Option<u64>,
pub czxid: Option<i64>, pub czxid: Option<i64>,
pub mzxid: Option<i64>, pub mzxid: Option<i64>,
@@ -68,6 +69,8 @@ pub struct KvListPrefixResponse {
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct KvGetRequest { pub struct KvGetRequest {
pub key: String, pub key: String,
#[serde(skip_serializing_if = "Option::is_none")]
pub metadata_only: Option<bool>,
} }
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
@@ -87,6 +90,10 @@ pub struct KvPutRequest {
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub lease: Option<i64>, pub lease: Option<i64>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub ttl: Option<i64>,
#[serde(skip_serializing_if = "Option::is_none")]
pub preserve_lease: Option<bool>,
#[serde(skip_serializing_if = "Option::is_none")]
pub write_mode: Option<KvWriteMode>, pub write_mode: Option<KvWriteMode>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub create_mode: Option<KvCreateMode>, pub create_mode: Option<KvCreateMode>,
@@ -98,6 +105,10 @@ pub struct KvPutOptions {
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub lease: Option<i64>, pub lease: Option<i64>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub ttl: Option<i64>,
#[serde(skip_serializing_if = "Option::is_none")]
pub preserve_lease: Option<bool>,
#[serde(skip_serializing_if = "Option::is_none")]
pub write_mode: Option<KvWriteMode>, pub write_mode: Option<KvWriteMode>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub create_mode: Option<KvCreateMode>, pub create_mode: Option<KvCreateMode>,
@@ -161,7 +172,12 @@ pub fn kv_list_prefix_params_with_options(
} }
pub fn kv_get_params(key: &str) -> serde_json::Value { pub fn kv_get_params(key: &str) -> serde_json::Value {
serde_json::to_value(KvGetRequest { key: key.to_string() }).expect("KV get request should serialize") kv_get_params_with_options(key, false)
}
pub fn kv_get_params_with_options(key: &str, metadata_only: bool) -> serde_json::Value {
serde_json::to_value(KvGetRequest { key: key.to_string(), metadata_only: metadata_only.then_some(true) })
.expect("KV get request should serialize")
} }
pub fn kv_put_params(key: &str, value: KvValue, lease: Option<i64>) -> serde_json::Value { pub fn kv_put_params(key: &str, value: KvValue, lease: Option<i64>) -> serde_json::Value {
@@ -173,6 +189,8 @@ pub fn kv_put_params_with_options(key: &str, value: KvValue, options: KvPutOptio
key: key.to_string(), key: key.to_string(),
value, value,
lease: options.lease, lease: options.lease,
ttl: options.ttl,
preserve_lease: options.preserve_lease,
write_mode: options.write_mode, write_mode: options.write_mode,
create_mode: options.create_mode, create_mode: options.create_mode,
}) })
@@ -206,12 +224,22 @@ pub async fn kv_list_prefix_core_with_options(
connection_id, connection_id,
AgentKvMethod::ListPrefix, AgentKvMethod::ListPrefix,
kv_list_prefix_params_with_options(prefix, limit, continuation, recursive), kv_list_prefix_params_with_options(prefix, limit, continuation, recursive),
None,
) )
.await .await
} }
pub async fn kv_get_core(state: &AppState, connection_id: &str, key: &str) -> Result<KvGetResponse, String> { pub async fn kv_get_core(state: &AppState, connection_id: &str, key: &str) -> Result<KvGetResponse, String> {
call_agent_kv(state, connection_id, AgentKvMethod::Get, kv_get_params(key)).await kv_get_core_with_options(state, connection_id, key, false).await
}
pub async fn kv_get_core_with_options(
state: &AppState,
connection_id: &str,
key: &str,
metadata_only: bool,
) -> Result<KvGetResponse, String> {
call_agent_kv(state, connection_id, AgentKvMethod::Get, kv_get_params_with_options(key, metadata_only), None).await
} }
pub async fn kv_put_core( pub async fn kv_put_core(
@@ -231,11 +259,37 @@ pub async fn kv_put_core_with_options(
value: KvValue, value: KvValue,
options: KvPutOptions, options: KvPutOptions,
) -> Result<KvPutResponse, String> { ) -> Result<KvPutResponse, String> {
call_agent_kv(state, connection_id, AgentKvMethod::Put, kv_put_params_with_options(key, value, options)).await let required_capability = kv_put_required_capability(&options);
call_agent_kv(
state,
connection_id,
AgentKvMethod::Put,
kv_put_params_with_options(key, value, options),
required_capability,
)
.await
}
fn kv_put_required_capability(options: &KvPutOptions) -> Option<AgentCapability> {
(options.ttl.is_some() || options.preserve_lease == Some(true)).then_some(AgentCapability::KvTtl)
} }
pub async fn kv_delete_core(state: &AppState, connection_id: &str, key: &str) -> Result<KvDeleteResponse, String> { pub async fn kv_delete_core(state: &AppState, connection_id: &str, key: &str) -> Result<KvDeleteResponse, String> {
call_agent_kv(state, connection_id, AgentKvMethod::Delete, kv_delete_params(key)).await call_agent_kv(state, connection_id, AgentKvMethod::Delete, kv_delete_params(key), None).await
}
pub async fn kv_supports_ttl_core(state: &AppState, connection_id: &str) -> Result<bool, String> {
ensure_agent_kv_pool(state, connection_id).await?;
let connections = state.connections.read().await;
let pool = connections.get(connection_id).ok_or("Connection not found")?;
match pool {
PoolKind::Agent(client) => {
let client = client.lock().await;
Ok(client.supports_capability(AgentCapability::KvTtl))
}
_ => Err("Not an agent key-value connection".to_string()),
}
} }
async fn ensure_agent_kv_pool(state: &AppState, connection_id: &str) -> Result<(), String> { async fn ensure_agent_kv_pool(state: &AppState, connection_id: &str) -> Result<(), String> {
@@ -247,6 +301,7 @@ async fn call_agent_kv<T: serde::de::DeserializeOwned + Send + 'static>(
connection_id: &str, connection_id: &str,
method: AgentKvMethod, method: AgentKvMethod,
params: serde_json::Value, params: serde_json::Value,
required_capability: Option<AgentCapability>,
) -> Result<T, String> { ) -> Result<T, String> {
ensure_agent_kv_pool(state, connection_id).await?; ensure_agent_kv_pool(state, connection_id).await?;
@@ -258,6 +313,11 @@ async fn call_agent_kv<T: serde::de::DeserializeOwned + Send + 'static>(
if !client.supports_capability(AgentCapability::Kv) { if !client.supports_capability(AgentCapability::Kv) {
return Err("Agent does not support key-value operations".to_string()); return Err("Agent does not support key-value operations".to_string());
} }
if required_capability.is_some_and(|capability| !client.supports_capability(capability)) {
return Err(
"Installed etcd Agent does not support TTL. Update the etcd driver and reconnect.".to_string()
);
}
client.call_kv_method(method, params).await client.call_kv_method(method, params).await
} }
_ => Err("Not an agent key-value connection".to_string()), _ => Err("Not an agent key-value connection".to_string()),
@@ -302,6 +362,13 @@ mod tests {
#[test] #[test]
fn serializes_kv_get_put_delete_params() { fn serializes_kv_get_put_delete_params() {
assert_eq!(kv_get_params("/app/name"), serde_json::json!({ "key": "/app/name" })); assert_eq!(kv_get_params("/app/name"), serde_json::json!({ "key": "/app/name" }));
assert_eq!(
kv_get_params_with_options("/app/name", true),
serde_json::json!({
"key": "/app/name",
"metadataOnly": true
})
);
assert_eq!( assert_eq!(
kv_put_params("/app/name", KvValue { encoding: KvValueEncoding::Utf8, data: "dbx".to_string() }, Some(42),), kv_put_params("/app/name", KvValue { encoding: KvValueEncoding::Utf8, data: "dbx".to_string() }, Some(42),),
serde_json::json!({ serde_json::json!({
@@ -349,6 +416,50 @@ mod tests {
"createMode": "ephemeral_sequential" "createMode": "ephemeral_sequential"
}) })
); );
assert_eq!(
kv_put_params_with_options(
"/jobs/expiring",
KvValue { encoding: KvValueEncoding::Utf8, data: "value".to_string() },
KvPutOptions { ttl: Some(60), ..KvPutOptions::default() },
),
serde_json::json!({
"key": "/jobs/expiring",
"value": {
"encoding": "utf8",
"data": "value"
},
"ttl": 60
})
);
assert_eq!(
kv_put_params_with_options(
"/jobs/expiring",
KvValue { encoding: KvValueEncoding::Utf8, data: "updated".to_string() },
KvPutOptions { preserve_lease: Some(true), ..KvPutOptions::default() },
),
serde_json::json!({
"key": "/jobs/expiring",
"value": {
"encoding": "utf8",
"data": "updated"
},
"preserveLease": true
})
);
}
#[test]
fn requires_ttl_capability_only_for_ttl_aware_puts() {
assert_eq!(kv_put_required_capability(&KvPutOptions::default()), None);
assert_eq!(kv_put_required_capability(&KvPutOptions { lease: Some(42), ..KvPutOptions::default() }), None);
assert_eq!(
kv_put_required_capability(&KvPutOptions { ttl: Some(60), ..KvPutOptions::default() }),
Some(AgentCapability::KvTtl)
);
assert_eq!(
kv_put_required_capability(&KvPutOptions { preserve_lease: Some(true), ..KvPutOptions::default() }),
Some(AgentCapability::KvTtl)
);
} }
#[test] #[test]
@@ -360,6 +471,7 @@ mod tests {
"modRevision": 2, "modRevision": 2,
"version": 3, "version": 3,
"lease": 0, "lease": 0,
"ttl": 30,
"valueSize": 5 "valueSize": 5
}], }],
"continuation": "next-token", "continuation": "next-token",
@@ -369,6 +481,7 @@ mod tests {
assert_eq!(decoded.keys[0].key, "/app/name"); assert_eq!(decoded.keys[0].key, "/app/name");
assert_eq!(decoded.keys[0].metadata.mod_revision, Some(2)); assert_eq!(decoded.keys[0].metadata.mod_revision, Some(2));
assert_eq!(decoded.keys[0].metadata.ttl, Some(30));
assert_eq!(decoded.continuation.as_deref(), Some("next-token")); assert_eq!(decoded.continuation.as_deref(), Some("next-token"));
assert_eq!(decoded.revision, Some(9)); assert_eq!(decoded.revision, Some(9));
} }
+9 -3
View File
@@ -353,11 +353,12 @@ pub enum AgentCapability {
Transaction, Transaction,
Ddl, Ddl,
Kv, Kv,
KvTtl,
MultiSession, MultiSession,
} }
impl AgentCapability { impl AgentCapability {
pub const ALL: [Self; 9] = [ pub const ALL: [Self; 10] = [
Self::Connect, Self::Connect,
Self::TestConnection, Self::TestConnection,
Self::Metadata, Self::Metadata,
@@ -366,6 +367,7 @@ impl AgentCapability {
Self::Transaction, Self::Transaction,
Self::Ddl, Self::Ddl,
Self::Kv, Self::Kv,
Self::KvTtl,
Self::MultiSession, Self::MultiSession,
]; ];
@@ -379,6 +381,7 @@ impl AgentCapability {
Self::Transaction => "transaction", Self::Transaction => "transaction",
Self::Ddl => "ddl", Self::Ddl => "ddl",
Self::Kv => "kv", Self::Kv => "kv",
Self::KvTtl => "kv_ttl",
Self::MultiSession => "multi_session", Self::MultiSession => "multi_session",
} }
} }
@@ -1635,7 +1638,7 @@ pub fn is_unsupported_handshake_error(error: &str) -> bool {
} }
pub fn agent_supports_capability(handshake: Option<&AgentHandshake>, capability: AgentCapability) -> bool { pub fn agent_supports_capability(handshake: Option<&AgentHandshake>, capability: AgentCapability) -> bool {
if capability == AgentCapability::Kv { if matches!(capability, AgentCapability::Kv | AgentCapability::KvTtl) {
return handshake.map(|value| value.supports(capability)).unwrap_or(false); return handshake.map(|value| value.supports(capability)).unwrap_or(false);
} }
handshake.map(|value| value.supports(capability)).unwrap_or(true) handshake.map(|value| value.supports(capability)).unwrap_or(true)
@@ -2306,8 +2309,9 @@ for line in sys.stdin:
assert_eq!(AgentCapability::Transaction.as_str(), "transaction"); assert_eq!(AgentCapability::Transaction.as_str(), "transaction");
assert_eq!(AgentCapability::Ddl.as_str(), "ddl"); assert_eq!(AgentCapability::Ddl.as_str(), "ddl");
assert_eq!(AgentCapability::Kv.as_str(), "kv"); assert_eq!(AgentCapability::Kv.as_str(), "kv");
assert_eq!(AgentCapability::KvTtl.as_str(), "kv_ttl");
assert_eq!(AgentCapability::MultiSession.as_str(), "multi_session"); assert_eq!(AgentCapability::MultiSession.as_str(), "multi_session");
assert_eq!(AgentCapability::ALL.len(), 9); assert_eq!(AgentCapability::ALL.len(), 10);
} }
#[test] #[test]
@@ -2625,6 +2629,8 @@ for line in sys.stdin:
assert!(!agent_supports_capability(Some(&handshake), AgentCapability::Query)); assert!(!agent_supports_capability(Some(&handshake), AgentCapability::Query));
assert!(!agent_supports_capability(None, AgentCapability::Kv)); assert!(!agent_supports_capability(None, AgentCapability::Kv));
assert!(!agent_supports_capability(Some(&handshake), AgentCapability::Kv)); assert!(!agent_supports_capability(Some(&handshake), AgentCapability::Kv));
assert!(!agent_supports_capability(None, AgentCapability::KvTtl));
assert!(!agent_supports_capability(Some(&handshake), AgentCapability::KvTtl));
} }
#[test] #[test]
+1
View File
@@ -444,6 +444,7 @@ async fn main() {
.route("/redis/slowlog-get", post(routes::redis::slowlog_get)) .route("/redis/slowlog-get", post(routes::redis::slowlog_get))
.route("/redis/cluster-master-nodes", post(routes::redis::cluster_master_nodes)) .route("/redis/cluster-master-nodes", post(routes::redis::cluster_master_nodes))
// etcd // etcd
.route("/etcd/supports-ttl", post(routes::etcd::supports_ttl))
.route("/etcd/list-prefix", post(routes::etcd::list_prefix)) .route("/etcd/list-prefix", post(routes::etcd::list_prefix))
.route("/etcd/get", post(routes::etcd::get)) .route("/etcd/get", post(routes::etcd::get))
.route("/etcd/put", post(routes::etcd::put)) .route("/etcd/put", post(routes::etcd::put))
+40 -5
View File
@@ -31,11 +31,18 @@ pub struct EtcdListPrefixRequest {
pub continuation: Option<String>, pub continuation: Option<String>,
} }
#[derive(Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct EtcdConnectionRequest {
pub connection_id: String,
}
#[derive(Deserialize)] #[derive(Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct EtcdKeyRequest { pub struct EtcdKeyRequest {
pub connection_id: String, pub connection_id: String,
pub key: String, pub key: String,
pub metadata_only: Option<bool>,
} }
#[derive(Deserialize)] #[derive(Deserialize)]
@@ -45,6 +52,17 @@ pub struct EtcdPutRequest {
pub key: String, pub key: String,
pub value: dbx_core::agent_kv::KvValue, pub value: dbx_core::agent_kv::KvValue,
pub lease: Option<i64>, pub lease: Option<i64>,
pub ttl: Option<i64>,
pub preserve_lease: Option<bool>,
}
pub async fn supports_ttl(
State(state): State<Arc<WebState>>,
Json(req): Json<EtcdConnectionRequest>,
) -> Result<Json<bool>, AppError> {
let result =
dbx_core::agent_kv::kv_supports_ttl_core(&state.app, &req.connection_id).await.map_err(AppError::from)?;
Ok(Json(result))
} }
pub async fn list_prefix( pub async fn list_prefix(
@@ -67,8 +85,14 @@ pub async fn get(
State(state): State<Arc<WebState>>, State(state): State<Arc<WebState>>,
Json(req): Json<EtcdKeyRequest>, Json(req): Json<EtcdKeyRequest>,
) -> Result<Json<dbx_core::agent_kv::KvGetResponse>, AppError> { ) -> Result<Json<dbx_core::agent_kv::KvGetResponse>, AppError> {
let result = let result = dbx_core::agent_kv::kv_get_core_with_options(
dbx_core::agent_kv::kv_get_core(&state.app, &req.connection_id, &req.key).await.map_err(AppError::from)?; &state.app,
&req.connection_id,
&req.key,
req.metadata_only.unwrap_or(false),
)
.await
.map_err(AppError::from)?;
Ok(Json(result)) Ok(Json(result))
} }
@@ -77,9 +101,20 @@ pub async fn put(
Json(req): Json<EtcdPutRequest>, Json(req): Json<EtcdPutRequest>,
) -> Result<Json<dbx_core::agent_kv::KvPutResponse>, AppError> { ) -> Result<Json<dbx_core::agent_kv::KvPutResponse>, AppError> {
ensure_writable(&state.app, &req.connection_id, "Put").await?; ensure_writable(&state.app, &req.connection_id, "Put").await?;
let result = dbx_core::agent_kv::kv_put_core(&state.app, &req.connection_id, &req.key, req.value, req.lease) let result = dbx_core::agent_kv::kv_put_core_with_options(
.await &state.app,
.map_err(AppError::from)?; &req.connection_id,
&req.key,
req.value,
dbx_core::agent_kv::KvPutOptions {
lease: req.lease,
ttl: req.ttl,
preserve_lease: req.preserve_lease,
..dbx_core::agent_kv::KvPutOptions::default()
},
)
.await
.map_err(AppError::from)?;
Ok(Json(result)) Ok(Json(result))
} }
+18 -3
View File
@@ -2,7 +2,12 @@ use std::sync::Arc;
use tauri::State; use tauri::State;
use crate::commands::connection::{ensure_connection_writable, AppState}; use crate::commands::connection::{ensure_connection_writable, AppState};
use dbx_core::agent_kv::{KvDeleteResponse, KvGetResponse, KvListPrefixResponse, KvPutResponse, KvValue}; use dbx_core::agent_kv::{KvDeleteResponse, KvGetResponse, KvListPrefixResponse, KvPutOptions, KvPutResponse, KvValue};
#[tauri::command]
pub async fn etcd_supports_ttl(state: State<'_, Arc<AppState>>, connection_id: String) -> Result<bool, String> {
dbx_core::agent_kv::kv_supports_ttl_core(&state, &connection_id).await
}
#[tauri::command] #[tauri::command]
pub async fn etcd_list_prefix( pub async fn etcd_list_prefix(
@@ -20,8 +25,9 @@ pub async fn etcd_get(
state: State<'_, Arc<AppState>>, state: State<'_, Arc<AppState>>,
connection_id: String, connection_id: String,
key: String, key: String,
metadata_only: Option<bool>,
) -> Result<KvGetResponse, String> { ) -> Result<KvGetResponse, String> {
dbx_core::agent_kv::kv_get_core(&state, &connection_id, &key).await dbx_core::agent_kv::kv_get_core_with_options(&state, &connection_id, &key, metadata_only.unwrap_or(false)).await
} }
#[tauri::command] #[tauri::command]
@@ -31,9 +37,18 @@ pub async fn etcd_put(
key: String, key: String,
value: KvValue, value: KvValue,
lease: Option<i64>, lease: Option<i64>,
ttl: Option<i64>,
preserve_lease: Option<bool>,
) -> Result<KvPutResponse, String> { ) -> Result<KvPutResponse, String> {
ensure_connection_writable(&state, &connection_id, "Put").await?; ensure_connection_writable(&state, &connection_id, "Put").await?;
dbx_core::agent_kv::kv_put_core(&state, &connection_id, &key, value, lease).await dbx_core::agent_kv::kv_put_core_with_options(
&state,
&connection_id,
&key,
value,
KvPutOptions { lease, ttl, preserve_lease, ..KvPutOptions::default() },
)
.await
} }
#[tauri::command] #[tauri::command]
+1
View File
@@ -1540,6 +1540,7 @@ pub fn run() {
commands::redis_pubsub_server::redis_pubsub_server_port, commands::redis_pubsub_server::redis_pubsub_server_port,
commands::redis_cmd::redis_slowlog_get, commands::redis_cmd::redis_slowlog_get,
commands::redis_cmd::redis_cluster_master_nodes, commands::redis_cmd::redis_cluster_master_nodes,
commands::etcd_cmd::etcd_supports_ttl,
commands::etcd_cmd::etcd_list_prefix, commands::etcd_cmd::etcd_list_prefix,
commands::etcd_cmd::etcd_get, commands::etcd_cmd::etcd_get,
commands::etcd_cmd::etcd_put, commands::etcd_cmd::etcd_put,