feat(connection): add reusable tunnel profiles
This commit is contained in:
1 parent
4dcee1aca0
commit
977e7f78ca
34 files changed
+1335
-22
No files matched your search
@@ -18,6 +18,8 @@ import type { InfluxDbExternalConfig, InfluxDbVersion } from "@/types/influxdb";
|
||||
import type { MqAdminConfig, MqAuth, MqSystemKind } from "@/types/mq";
|
||||
import type { NacosAdminConfig, NacosAuthConfig } from "@/types/nacos";
|
||||
import { CONNECTION_ATTEMPT_CANCELLED_MESSAGE, useConnectionStore } from "@/stores/connectionStore";
|
||||
import { useTunnelProfileStore } from "@/stores/tunnelProfileStore";
|
||||
import { detachTunnelProfileLayer, tunnelProfileReferenceLayer, tunnelProfileSummary } from "@/lib/connection/tunnelProfiles";
|
||||
import { REDIS_SCAN_PAGE_SIZE_DEFAULT, REDIS_SCAN_PAGE_SIZE_MIN, REDIS_SCAN_PAGE_SIZE_MAX, REDIS_SCAN_PAGE_SIZE_OPTIONS } from "@/lib/redis/redisKeyPattern";
|
||||
import { useSettingsStore } from "@/stores/settingsStore";
|
||||
import { useToast } from "@/composables/useToast";
|
||||
@@ -114,9 +116,11 @@ const emit = defineEmits<{
|
||||
connectSucceeded: [name: string];
|
||||
connectFailed: [message: string];
|
||||
openDriverStore: [];
|
||||
openTunnelProfileSettings: [];
|
||||
}>();
|
||||
|
||||
const store = useConnectionStore();
|
||||
const tunnelProfileStore = useTunnelProfileStore();
|
||||
const isTesting = ref(false);
|
||||
const isSaving = ref(false);
|
||||
const testResult = ref<{ ok: boolean; message: string } | null>(null);
|
||||
@@ -251,6 +255,7 @@ function normalizeSshTunnel(hop: Partial<SshTunnelConfig>): SshTunnelConfig {
|
||||
use_ssh_agent: !!hop.use_ssh_agent,
|
||||
ssh_agent_sock_path: hop.ssh_agent_sock_path || "",
|
||||
auth_method: hop.auth_method || inferSshAuthMethod(hop),
|
||||
profile_id: hop.profile_id || undefined,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -288,6 +293,7 @@ function normalizeProxyTunnel(layer: Partial<ProxyTunnelConfig>): ProxyTunnelCon
|
||||
port: Number(layer.port) || 1080,
|
||||
username: layer.username || "",
|
||||
password: layer.password || "",
|
||||
profile_id: layer.profile_id || undefined,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -299,6 +305,7 @@ function normalizeHttpTunnel(layer: Partial<HttpTunnelConfig>): HttpTunnelConfig
|
||||
url: layer.url || "",
|
||||
token: layer.token || "",
|
||||
connect_timeout_secs: Number(layer.connect_timeout_secs) || 10,
|
||||
profile_id: layer.profile_id || undefined,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1534,6 +1541,32 @@ const selectedSshLayer = computed(() => (selectedTransportLayer.value?.type ===
|
||||
const selectedProxyLayer = computed(() => (selectedTransportLayer.value?.type === "proxy" ? selectedTransportLayer.value : null));
|
||||
const selectedHttpTunnelLayer = computed(() => (selectedTransportLayer.value?.type === "http_tunnel" ? selectedTransportLayer.value : null));
|
||||
|
||||
const tunnelProfiles = computed(() => tunnelProfileStore.profiles);
|
||||
const selectedLayerProfileId = computed(() => selectedTransportLayer.value?.profile_id || "");
|
||||
const selectedLayerProfile = computed(() => tunnelProfileStore.profileById(selectedLayerProfileId.value));
|
||||
|
||||
function tunnelProfileOptionLabel(profile: (typeof tunnelProfiles.value)[number]): string {
|
||||
const summary = tunnelProfileSummary(profile);
|
||||
if (!profile.name?.trim()) return summary || profile.id;
|
||||
return summary ? `${profile.name} (${summary})` : profile.name;
|
||||
}
|
||||
|
||||
function applyTunnelProfileSelection(value: unknown) {
|
||||
const selected = selectedTransportLayer.value;
|
||||
if (!selected) return;
|
||||
if (!value || value === "custom") {
|
||||
if (!selected.profile_id) return;
|
||||
const detached = detachTunnelProfileLayer(selected, tunnelProfileStore.profileById(selected.profile_id));
|
||||
form.value.transport_layers = transportLayers.value.map((layer) => (layer.id === selected.id ? detached : layer));
|
||||
} else {
|
||||
const profile = tunnelProfileStore.profileById(String(value));
|
||||
if (!profile) return;
|
||||
const stub = tunnelProfileReferenceLayer(profile, selected);
|
||||
form.value.transport_layers = transportLayers.value.map((layer) => (layer.id === selected.id ? stub : layer));
|
||||
}
|
||||
resetTestState();
|
||||
}
|
||||
|
||||
function transportLayerDefaultName(layer: TransportLayerConfig, index: number): string {
|
||||
if (layer.type === "proxy") return `Proxy ${index + 1}`;
|
||||
if (layer.type === "http_tunnel") return t("connection.httpTunnelDefaultName", { index: index + 1 });
|
||||
@@ -1541,6 +1574,11 @@ function transportLayerDefaultName(layer: TransportLayerConfig, index: number):
|
||||
}
|
||||
|
||||
function transportLayerDisplayName(layer: TransportLayerConfig, index: number): string {
|
||||
if (layer.profile_id) {
|
||||
const profile = tunnelProfileStore.profileById(layer.profile_id);
|
||||
if (profile) return profile.name?.trim() || tunnelProfileSummary(profile) || transportLayerDefaultName(layer, index);
|
||||
return layer.name?.trim() || t("connection.tunnelProfileMissingName");
|
||||
}
|
||||
const target = layer.type === "http_tunnel" ? layer.url?.trim() : layer.host?.trim();
|
||||
return layer.name?.trim() || target || transportLayerDefaultName(layer, index);
|
||||
}
|
||||
@@ -3306,6 +3344,9 @@ function validateTransportLayers(config: LegacyConnectionConfig) {
|
||||
const layers = config.transport_layers || [];
|
||||
layers.forEach((layer, index) => {
|
||||
if (layer.enabled === false) return;
|
||||
// Profile-referencing layers are stubs: the shared profile supplies the
|
||||
// whole configuration at connect time, so there is nothing to validate.
|
||||
if (layer.profile_id) return;
|
||||
const label = layer.name?.trim() || transportLayerDefaultName(layer, index);
|
||||
if (layer.type === "http_tunnel") {
|
||||
if (index !== 0) throw new Error(t("connection.httpTunnelInvalidOrder", { hop: label }));
|
||||
@@ -3713,6 +3754,7 @@ function onJdbcDriverSelect(id: any) {
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
void tunnelProfileStore.init();
|
||||
unlistenAgentInstallProgress = await api.listenAgentInstallProgress(handleAgentInstallProgress);
|
||||
});
|
||||
|
||||
@@ -5372,7 +5414,35 @@ function openExternalUrl(url: string) {
|
||||
<Label :class="connectionLabelSmallClass">{{ t("connection.sshHopName") }}</Label>
|
||||
<Input v-model="selectedTransportLayer.name" class="col-span-3" :placeholder="t('connection.sshHopNamePlaceholder')" />
|
||||
</div>
|
||||
<div class="grid grid-cols-4 items-center gap-4">
|
||||
<div v-if="tunnelProfiles.length || selectedLayerProfileId" class="grid grid-cols-4 items-center gap-4">
|
||||
<Label :class="connectionLabelSmallClass">{{ t("connection.tunnelProfile") }}</Label>
|
||||
<div class="col-span-3 flex min-w-0 items-center gap-2">
|
||||
<Select :model-value="selectedLayerProfileId || 'custom'" @update:model-value="applyTunnelProfileSelection">
|
||||
<SelectTrigger class="h-9 min-w-0 flex-1">
|
||||
<SelectValue />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="custom">{{ t("connection.tunnelProfileCustom") }}</SelectItem>
|
||||
<SelectItem v-for="profile in tunnelProfiles" :key="profile.id" :value="profile.id">{{ tunnelProfileOptionLabel(profile) }}</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
<Button type="button" variant="outline" size="sm" class="shrink-0" @click="emit('openTunnelProfileSettings')">
|
||||
{{ t("connection.tunnelProfileManage") }}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="selectedLayerProfileId" class="grid grid-cols-4 items-start gap-4">
|
||||
<span />
|
||||
<div class="col-span-3 grid min-w-0 gap-1 rounded-md border bg-muted/30 px-3 py-2 text-xs text-muted-foreground">
|
||||
<template v-if="selectedLayerProfile">
|
||||
<span class="truncate font-medium text-foreground">{{ selectedLayerProfile.name || tunnelProfileSummary(selectedLayerProfile) }}</span>
|
||||
<span v-if="selectedLayerProfile.name && tunnelProfileSummary(selectedLayerProfile)" class="truncate">{{ tunnelProfileSummary(selectedLayerProfile) }}</span>
|
||||
<span>{{ t("connection.tunnelProfileManaged") }}</span>
|
||||
</template>
|
||||
<span v-else class="text-red-500">{{ t("connection.tunnelProfileMissing") }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="!selectedLayerProfileId" class="grid grid-cols-4 items-center gap-4">
|
||||
<Label :class="connectionLabelSmallClass">Type</Label>
|
||||
<Select :model-value="selectedTransportLayer.type" @update:model-value="(value: any) => changeSelectedTransportLayerType(value)">
|
||||
<SelectTrigger class="col-span-3 h-9">
|
||||
@@ -5385,7 +5455,7 @@ function openExternalUrl(url: string) {
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
<template v-if="selectedSshLayer">
|
||||
<template v-if="selectedSshLayer && !selectedLayerProfileId">
|
||||
<div class="grid grid-cols-4 items-center gap-4">
|
||||
<Label :class="connectionLabelSmallClass">{{ t("connection.sshHost") }}</Label>
|
||||
<Input v-model="selectedSshLayer.host" class="col-span-2" list="ssh-config-host-aliases" :placeholder="t('connection.sshHostPlaceholder')" :disabled="selectedSshLayer.enabled === false" @change="applySshConfigHostAliasPrefill(selectedSshLayer!)" />
|
||||
@@ -5463,7 +5533,7 @@ function openExternalUrl(url: string) {
|
||||
<Input v-model.number="selectedSshLayer.connect_timeout_secs" type="number" min="1" max="300" step="1" class="col-span-3" :disabled="selectedSshLayer.enabled === false" />
|
||||
</div>
|
||||
</template>
|
||||
<template v-else-if="selectedProxyLayer">
|
||||
<template v-else-if="selectedProxyLayer && !selectedLayerProfileId">
|
||||
<div class="grid grid-cols-4 items-center gap-4">
|
||||
<Label :class="connectionLabelSmallClass">{{ t("connection.proxyType") }}</Label>
|
||||
<Select :model-value="selectedProxyLayer.proxy_type || 'socks5'" :disabled="selectedProxyLayer.enabled === false" @update:model-value="updateSelectedProxyType">
|
||||
@@ -5490,7 +5560,7 @@ function openExternalUrl(url: string) {
|
||||
<PasswordInput v-model="selectedProxyLayer.password" class="col-span-3" :placeholder="t('connection.proxyPasswordPlaceholder')" :disabled="selectedProxyLayer.enabled === false" />
|
||||
</div>
|
||||
</template>
|
||||
<template v-else-if="selectedHttpTunnelLayer">
|
||||
<template v-else-if="selectedHttpTunnelLayer && !selectedLayerProfileId">
|
||||
<div class="grid grid-cols-4 items-center gap-4">
|
||||
<Label :class="connectionLabelSmallClass">{{ t("connection.httpTunnelUrl") }}</Label>
|
||||
<Input v-model="selectedHttpTunnelLayer.url" class="col-span-3" placeholder="https://dbx.example.com/dbx_tunnel.php" :disabled="selectedHttpTunnelLayer.enabled === false" />
|
||||
|
||||
Reference in new issue
Block a user