2 Commits
Author SHA1 Message Date
Denozordec 146afc1369 feat(dns): Implement DNS preview records generation and enhance hostname preview functionality
quality / commitlint (push) Skipped
CD / update-wiki (push) Successful in 5s
quality / changes (push) Successful in 5s
quality / docker-check (push) Skipped
quality / web (push) Successful in 56s
quality / api (push) Successful in 43s
CD / quality (push) Successful in 1m46s
CD / publish (push) Successful in 1m40s
- Added `buildDnsPreviewRecords` function to generate DNS records based on hostname, TTL, and provided IPv4/IPv6 addresses.
- Updated `fleetRoutes` to utilize the new DNS records generation for hostname previews.
- Enhanced frontend API calls to support IPv4, IPv6, and node ID parameters for more comprehensive hostname previews.
- Updated UI components to display DNS preview information, including A, AAAA, and CNAME records.
2026-09-04 15:09:30 +07:00
DenozordecandCursor ba66755a29 fix(ui): AutoComplete и флаги страны как в VPS Tracker
quality / commitlint (push) Skipped
CD / update-wiki (push) Successful in 6s
quality / changes (push) Successful in 5s
quality / api (push) Skipped
quality / docker-check (push) Skipped
quality / web (push) Successful in 1m6s
CD / quality (push) Successful in 1m14s
CD / publish (push) Successful in 1m37s
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-04 15:03:29 +07:00
8 changed files with 514 additions and 95 deletions
+24 -8
View File
@@ -35,6 +35,7 @@ import {
} from "@cdnmanager/db";
import { AppError } from "../errors.js";
import {
buildDnsPreviewRecords,
buildHostname,
isValidIpv4,
isValidIpv6,
@@ -322,15 +323,30 @@ export const fleetRoutes: FastifyPluginAsync = async (app) => {
const loc = listLocations(app.db).find((l) => l.id === q.locationId);
if (!loc) throw AppError.notFound("location not found");
const indexNum = Number(q.indexNum ?? "1") || 1;
const hostname = buildHostname({
template: q.template || zone.namingTemplate,
locationCode: loc.code,
role: q.role,
indexNum,
zoneName: zone.name,
providerTag: q.providerTag,
});
const aliases = q.nodeId
? listAliases(app.db, { zoneId: zone.id }).filter(
(a) => a.targetNodeId === q.nodeId,
)
: [];
const records = buildDnsPreviewRecords({
hostname,
ttl: zone.defaultTtl,
ipv4: q.ipv4,
ipv6: q.ipv6,
aliases: aliases.map((a) => ({ name: a.name, purpose: a.purpose })),
});
return {
hostname: buildHostname({
template: q.template || zone.namingTemplate,
locationCode: loc.code,
role: q.role,
indexNum,
zoneName: zone.name,
providerTag: q.providerTag,
}),
hostname,
ttl: zone.defaultTtl,
records,
};
});
};
+50
View File
@@ -24,6 +24,56 @@ export function buildHostname(opts: {
return host.replace(/\.$/, "");
}
export type DnsPreviewRecord = {
type: "A" | "AAAA" | "CNAME";
name: string;
content: string;
ttl: number;
/** purpose / note (e.g. alias purpose) */
note?: string;
};
/** Desired-state DNS for node form preview (A/AAAA + CNAME aliases → hostname). */
export function buildDnsPreviewRecords(opts: {
hostname: string;
ttl: number;
ipv4?: string | null;
ipv6?: string | null;
aliases?: Array<{ name: string; purpose?: string | null }>;
}): DnsPreviewRecord[] {
const records: DnsPreviewRecord[] = [];
const ipv4 = opts.ipv4?.trim();
const ipv6 = opts.ipv6?.trim();
if (ipv4) {
records.push({
type: "A",
name: opts.hostname,
content: ipv4,
ttl: opts.ttl,
note: "dns-only",
});
}
if (ipv6) {
records.push({
type: "AAAA",
name: opts.hostname,
content: ipv6,
ttl: opts.ttl,
note: "dns-only",
});
}
for (const alias of opts.aliases ?? []) {
records.push({
type: "CNAME",
name: alias.name,
content: opts.hostname,
ttl: opts.ttl,
note: alias.purpose ?? undefined,
});
}
return records;
}
export function normalizeFqdn(name: string): string {
return name.trim().toLowerCase().replace(/\.$/, "");
}
+39
View File
@@ -112,5 +112,44 @@ describe("fleet api", () => {
});
expect(topo.statusCode).toBe(200);
expect(topo.json().nodes).toHaveLength(1);
const preview = await app.inject({
method: "GET",
url: `/api/v1/naming/preview?${new URLSearchParams({
zoneId: zone.id,
locationId: msk.id,
role: "gw",
indexNum: "2",
ipv4: "198.51.100.10",
ipv6: "2001:db8::10",
nodeId: node.id,
})}`,
headers: authHeader,
});
expect(preview.statusCode).toBe(200);
const body = preview.json() as {
hostname: string;
records: Array<{ type: string; name: string; content: string }>;
};
expect(body.hostname).toBe("msk-gw02.rtnt.top");
expect(body.records).toEqual(
expect.arrayContaining([
expect.objectContaining({
type: "A",
name: "msk-gw02.rtnt.top",
content: "198.51.100.10",
}),
expect.objectContaining({
type: "AAAA",
name: "msk-gw02.rtnt.top",
content: "2001:db8::10",
}),
expect.objectContaining({
type: "CNAME",
name: "msk.rtnt.top",
content: "msk-gw02.rtnt.top",
}),
]),
);
});
});
@@ -0,0 +1,134 @@
'use client'
import * as React from 'react'
import { CheckIcon } from 'lucide-react'
import { cn } from '@cdnmanager/ui/lib/utils'
import {
Autocomplete,
AutocompleteContent,
AutocompleteEmpty,
AutocompleteInput,
AutocompleteItem,
AutocompleteList,
} from '@/components/reui/autocomplete'
import { TruncatedText } from '@/components/truncated-text'
export interface AutoCompleteOption {
value: string
label: string
/** Левый префикс (например флаг страны). */
leading?: React.ReactNode
}
interface AutoCompleteInputProps {
id?: string
value: string
onChange: (value: string) => void
options: AutoCompleteOption[]
placeholder?: string
searchPlaceholder?: string
emptyText?: string
className?: string
/** Показывать ли выбранный leading в поле (например флаг). */
showLeadingInInput?: boolean
/** Разрешать ли произвольный ввод (не только из списка). По умолчанию true. */
allowFreeText?: boolean
disabled?: boolean
}
export function AutoCompleteInput({
id,
value,
onChange,
options,
placeholder = 'Выбрать…',
searchPlaceholder,
emptyText = 'Ничего не найдено',
className,
showLeadingInInput = true,
allowFreeText = true,
disabled = false,
}: AutoCompleteInputProps) {
const trimmedValue = value.trim()
const selected = React.useMemo(
() => options.find((o) => o.value.toLowerCase() === trimmedValue.toLowerCase()),
[options, trimmedValue],
)
const leading = showLeadingInInput ? selected?.leading : undefined
const inputPlaceholder = searchPlaceholder ?? placeholder
const handleValueChange = React.useCallback(
(inputVal: string) => {
const q = inputVal.trim()
const match = options.find(
(o) =>
o.label.toLowerCase() === q.toLowerCase() ||
o.value.toLowerCase() === q.toLowerCase(),
)
if (match) {
onChange(match.value)
return
}
if (allowFreeText) {
onChange(inputVal)
}
},
[options, onChange, allowFreeText],
)
return (
<Autocomplete
items={options}
value={value}
onValueChange={handleValueChange}
itemToStringValue={(item) => item.label}
mode="list"
autoHighlight
openOnInputClick
disabled={disabled}
>
<div className="relative w-full">
{leading ? (
<span className="pointer-events-none absolute start-2.5 top-1/2 z-10 size-4 -translate-y-1/2 [&_svg]:size-full">
{leading}
</span>
) : null}
<AutocompleteInput
id={id}
placeholder={trimmedValue ? undefined : inputPlaceholder}
showTrigger
showClear={Boolean(trimmedValue)}
className={cn(leading && 'ps-8', className)}
/>
</div>
<AutocompleteContent>
<AutocompleteEmpty>{emptyText}</AutocompleteEmpty>
<AutocompleteList>
{(item) => {
const isSelected = item.value.toLowerCase() === trimmedValue.toLowerCase()
return (
<AutocompleteItem
key={item.value}
value={item}
className="gap-2.5 px-2 py-1.5"
>
{item.leading ? (
<span className="relative z-1 size-4 shrink-0">{item.leading}</span>
) : null}
<span className="relative z-1 min-w-0 flex-1">
<TruncatedText>{item.label}</TruncatedText>
</span>
{isSelected ? (
<CheckIcon className="relative z-1 size-4 shrink-0 opacity-60" />
) : null}
</AutocompleteItem>
)
}}
</AutocompleteList>
</AutocompleteContent>
</Autocomplete>
)
}
+22
View File
@@ -0,0 +1,22 @@
import { cn } from '@cdnmanager/ui/lib/utils'
import { countryCodeFromName, getCountryFlagUrl } from '@/lib/country-labels'
interface CountryFlagProps {
code?: string
country?: string
className?: string
}
export function CountryFlag({ code, country, className }: CountryFlagProps) {
const resolvedCode = code ?? (country ? countryCodeFromName(country) : undefined)
const url = getCountryFlagUrl(resolvedCode)
if (!url) return null
return (
<img
src={url}
alt=""
className={cn('size-4 shrink-0 rounded-full object-cover', className)}
/>
)
}
+21 -5
View File
@@ -1,5 +1,5 @@
/** ISO country codes from fleet locations seed → RU labels for selects. */
const COUNTRY_LABELS: Record<string, string> = {
/** ISO → русское название (seed fleet locations). */
const COUNTRY_NAME_BY_CODE: Record<string, string> = {
RU: 'Россия',
DE: 'Германия',
NL: 'Нидерланды',
@@ -7,7 +7,23 @@ const COUNTRY_LABELS: Record<string, string> = {
FR: 'Франция',
}
export function countrySelectLabel(code: string): string {
const name = COUNTRY_LABELS[code]
return name ? `${code}${name}` : code
const COUNTRY_CODE_BY_NAME: Record<string, string> = Object.fromEntries(
Object.entries(COUNTRY_NAME_BY_CODE).map(([code, name]) => [name.toLowerCase(), code]),
)
export function countryNameFromCode(code: string | null | undefined): string {
if (!code) return ''
return COUNTRY_NAME_BY_CODE[code.toUpperCase()] ?? code
}
export function countryCodeFromName(name: string | null | undefined): string {
if (!name?.trim()) return ''
const trimmed = name.trim()
if (trimmed.length === 2) return trimmed.toUpperCase()
return COUNTRY_CODE_BY_NAME[trimmed.toLowerCase()] ?? ''
}
export function getCountryFlagUrl(code?: string): string | undefined {
if (!code || code.length !== 2) return undefined
return `https://flagcdn.com/${code.toLowerCase()}.svg`
}
+17 -1
View File
@@ -180,6 +180,9 @@ export async function previewHostname(params: {
role: string
indexNum?: number
providerTag?: string
ipv4?: string
ipv6?: string
nodeId?: string
}) {
const p = new URLSearchParams({
zoneId: params.zoneId,
@@ -188,5 +191,18 @@ export async function previewHostname(params: {
indexNum: String(params.indexNum ?? 1),
})
if (params.providerTag) p.set('providerTag', params.providerTag)
return api.get<{ hostname: string }>(`/api/v1/naming/preview?${p}`)
if (params.ipv4) p.set('ipv4', params.ipv4)
if (params.ipv6) p.set('ipv6', params.ipv6)
if (params.nodeId) p.set('nodeId', params.nodeId)
return api.get<{
hostname: string
ttl: number
records: Array<{
type: 'A' | 'AAAA' | 'CNAME'
name: string
content: string
ttl: number
note?: string
}>
}>(`/api/v1/naming/preview?${p}`)
}
+207 -81
View File
@@ -1,5 +1,5 @@
import { createFileRoute, Link } from '@tanstack/react-router'
import { useMemo, useState } from 'react'
import { useEffect, useMemo, useState } from 'react'
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { useForm } from 'react-hook-form'
import { zodResolver } from '@hookform/resolvers/zod'
@@ -25,7 +25,13 @@ import { Button } from '@cdnmanager/ui/components/button'
import { Input } from '@cdnmanager/ui/components/input'
import { Label } from '@cdnmanager/ui/components/label'
import { SelectField } from '@/components/select-field'
import { countrySelectLabel } from '@/lib/country-labels'
import { AutoCompleteInput } from '@/components/auto-complete-input'
import { CountryFlag } from '@/components/country-flag'
import { FormFieldSimple } from '@/components/form-field'
import {
countryCodeFromName,
countryNameFromCode,
} from '@/lib/country-labels'
import { queryClient } from '@/lib/query-client'
import {
createNode,
@@ -80,8 +86,18 @@ function NodesPage() {
const [sheetOpen, setSheetOpen] = useState(false)
const [editing, setEditing] = useState<Node | null>(null)
const [deleteId, setDeleteId] = useState<string | null>(null)
const [preview, setPreview] = useState('')
const [countryCode, setCountryCode] = useState('')
const [previewHost, setPreviewHost] = useState('')
const [previewRecords, setPreviewRecords] = useState<
Array<{
type: 'A' | 'AAAA' | 'CNAME'
name: string
content: string
ttl: number
note?: string
}>
>([])
const [countryName, setCountryName] = useState('')
const [locationQuery, setLocationQuery] = useState('')
const form = useForm<FormValues>({
resolver: zodResolver(formSchema),
@@ -103,6 +119,10 @@ function NodesPage() {
const watchRole = form.watch('role')
const watchIndex = form.watch('indexNum')
const watchProvider = form.watch('providerTag')
const watchIpv4 = form.watch('ipv4')
const watchIpv6 = form.watch('ipv6')
const countryCode = countryCodeFromName(countryName)
const countryOptions = useMemo(() => {
const codes = new Set<string>()
@@ -110,8 +130,15 @@ function NodesPage() {
if (loc.country) codes.add(loc.country)
}
return [...codes]
.sort((a, b) => a.localeCompare(b))
.map((code) => ({ value: code, label: countrySelectLabel(code) }))
.map((code) => {
const name = countryNameFromCode(code)
return {
value: name,
label: name,
leading: <CountryFlag code={code} country={name} />,
}
})
.sort((a, b) => a.label.localeCompare(b.label, 'ru'))
}, [locations])
const locationOptions = useMemo(() => {
@@ -119,31 +146,85 @@ function NodesPage() {
return locations
.filter((l) => l.country === countryCode)
.map((l) => ({
value: l.id,
value: `${l.code}${l.name}`,
label: `${l.code}${l.name}`,
}))
}, [locations, countryCode])
function countryForLocationId(locationId: string): string {
return locations.find((l) => l.id === locationId)?.country ?? ''
function locationLabel(locationId: string): string {
const loc = locations.find((l) => l.id === locationId)
return loc ? `${loc.code}${loc.name}` : ''
}
async function refreshPreview() {
if (!watchZone || !watchLoc || !watchRole) return
function countryNameForLocationId(locationId: string): string {
const code = locations.find((l) => l.id === locationId)?.country
return countryNameFromCode(code)
}
function locationIdFromDisplay(display: string): string {
const q = display.trim().toLowerCase()
if (!q) return ''
const match = locations.find((l) => {
if (countryCode && l.country !== countryCode) return false
const label = `${l.code}${l.name}`.toLowerCase()
return label === q || l.code.toLowerCase() === q || l.name.toLowerCase() === q
})
return match?.id ?? ''
}
async function refreshPreview(
overrides?: Partial<{
zoneId: string
locationId: string
role: NodeRole
indexNum: number
providerTag: string
ipv4: string
ipv6: string
}>,
) {
const values = { ...form.getValues(), ...overrides }
if (!values.zoneId || !values.locationId || !values.role) {
setPreviewHost('')
setPreviewRecords([])
return
}
try {
const res = await previewHostname({
zoneId: watchZone,
locationId: watchLoc,
role: watchRole,
indexNum: Number(watchIndex) || 1,
providerTag: watchProvider || undefined,
zoneId: values.zoneId,
locationId: values.locationId,
role: values.role,
indexNum: Number(values.indexNum) || 1,
providerTag: values.providerTag || undefined,
ipv4: values.ipv4 || undefined,
ipv6: values.ipv6 || undefined,
nodeId: editing?.id,
})
setPreview(res.hostname)
setPreviewHost(res.hostname)
setPreviewRecords(res.records ?? [])
} catch {
setPreview('')
setPreviewHost('')
setPreviewRecords([])
}
}
useEffect(() => {
if (!sheetOpen) return
void refreshPreview()
// form + editing captured via refreshPreview closures; watches drive re-run
// eslint-disable-next-line react-hooks/exhaustive-deps -- intentional field watches
}, [
sheetOpen,
watchZone,
watchLoc,
watchRole,
watchIndex,
watchProvider,
watchIpv4,
watchIpv6,
editing?.id,
])
const saveMutation = useMutation({
mutationFn: async (values: FormValues) => {
if (editing) {
@@ -174,7 +255,8 @@ function NodesPage() {
toast.success(editing ? 'Нода обновлена' : 'Нода создана')
setSheetOpen(false)
setEditing(null)
setCountryCode('')
setCountryName('')
setLocationQuery('')
form.reset()
void qc.invalidateQueries({ queryKey: ['fleet'] })
},
@@ -294,7 +376,8 @@ function NodesPage() {
onClick={() => {
const n = row.original
setEditing(n)
setCountryCode(countryForLocationId(n.locationId))
setCountryName(countryNameForLocationId(n.locationId))
setLocationQuery(locationLabel(n.locationId))
form.reset({
zoneId: n.zoneId,
locationId: n.locationId,
@@ -306,7 +389,8 @@ function NodesPage() {
notes: n.notes ?? '',
hostname: n.hostname,
})
setPreview(n.hostname)
setPreviewHost(n.hostname)
setPreviewRecords([])
setSheetOpen(true)
}}
>
@@ -335,7 +419,8 @@ function NodesPage() {
onClick={() => {
setEditing(null)
const firstLoc = locations[0]
setCountryCode(firstLoc?.country ?? '')
setCountryName(countryNameFromCode(firstLoc?.country))
setLocationQuery(firstLoc ? `${firstLoc.code}${firstLoc.name}` : '')
form.reset({
zoneId: zones[0]?.id ?? '',
locationId: firstLoc?.id ?? '',
@@ -347,9 +432,9 @@ function NodesPage() {
notes: '',
hostname: '',
})
setPreview('')
setPreviewHost('')
setPreviewRecords([])
setSheetOpen(true)
void refreshPreview()
}}
disabled={zones.length === 0}
>
@@ -417,8 +502,7 @@ function NodesPage() {
<SelectField
value={form.watch('zoneId')}
onValueChange={(v) => {
form.setValue('zoneId', v ?? '')
void refreshPreview()
form.setValue('zoneId', v ?? '', { shouldDirty: true })
}}
placeholder="Зона"
options={zones.map((z) => ({ value: z.id, label: z.name }))}
@@ -426,42 +510,51 @@ function NodesPage() {
</div>
) : null}
<div className="grid grid-cols-2 gap-3">
<div className="flex flex-col gap-2">
<Label>Страна</Label>
<SelectField
value={countryCode || null}
onValueChange={(v) => {
const next = v ?? ''
setCountryCode(next)
const currentLoc = locations.find((l) => l.id === form.getValues('locationId'))
if (!next || !currentLoc || currentLoc.country !== next) {
form.setValue('locationId', '')
setPreview('')
}
void refreshPreview()
}}
placeholder="Страна"
options={countryOptions}
/>
</div>
<div className="flex flex-col gap-2">
<Label>Локация</Label>
<SelectField
value={form.watch('locationId') || null}
disabled={!countryCode}
onValueChange={(v) => {
const id = v ?? ''
form.setValue('locationId', id)
const loc = locations.find((l) => l.id === id)
if (loc?.country) setCountryCode(loc.country)
void refreshPreview()
}}
placeholder={countryCode ? 'Локация' : 'Сначала страна'}
options={locationOptions}
/>
</div>
</div>
<FormFieldSimple label="Страна" htmlFor="node-country">
<AutoCompleteInput
id="node-country"
placeholder="Любая"
value={countryName}
onChange={(v) => {
setCountryName(v)
const nextCode = countryCodeFromName(v)
const currentLoc = locations.find((l) => l.id === form.getValues('locationId'))
if (!nextCode || !currentLoc || currentLoc.country !== nextCode) {
form.setValue('locationId', '')
setLocationQuery('')
setPreviewHost('')
setPreviewRecords([])
}
}}
options={countryOptions}
searchPlaceholder="Поиск страны…"
emptyText="Нет вариантов"
/>
</FormFieldSimple>
<FormFieldSimple label="Локация" htmlFor="node-location">
<AutoCompleteInput
id="node-location"
placeholder="Любая"
value={locationQuery}
onChange={(v) => {
setLocationQuery(v)
const id = locationIdFromDisplay(v)
form.setValue('locationId', id)
const loc = locations.find((l) => l.id === id)
if (loc?.country) setCountryName(countryNameFromCode(loc.country))
if (id) void refreshPreview({ locationId: id })
else {
setPreviewHost('')
setPreviewRecords([])
}
}}
options={locationOptions}
searchPlaceholder="Поиск локации…"
emptyText={countryCode ? 'Нет вариантов' : 'Сначала выберите страну'}
showLeadingInInput={false}
disabled={!countryCode}
/>
</FormFieldSimple>
<div className="grid grid-cols-2 gap-3">
<div className="flex flex-col gap-2">
@@ -469,8 +562,9 @@ function NodesPage() {
<SelectField
value={form.watch('role')}
onValueChange={(v) => {
form.setValue('role', (v as NodeRole) ?? 'gw')
void refreshPreview()
const role = (v as NodeRole) ?? 'gw'
form.setValue('role', role)
void refreshPreview({ role })
}}
options={ROLES.map((r) => ({ value: r.value, label: r.label }))}
/>
@@ -481,27 +575,17 @@ function NodesPage() {
type="number"
min={1}
max={99}
{...form.register('indexNum', { valueAsNumber: true })}
onBlur={() => void refreshPreview()}
{...form.register('indexNum', {
valueAsNumber: true,
onChange: (e) => {
const n = Number(e.target.value) || 1
void refreshPreview({ indexNum: n })
},
})}
/>
</div>
</div>
<div className="bg-muted/40 flex items-center gap-2 rounded-lg border px-3 py-2 text-sm">
<CloudIcon className="size-4 shrink-0" />
<span className="text-muted-foreground">Preview:</span>
<code className="font-medium">{preview || '—'}</code>
<Button
type="button"
variant="ghost"
size="sm"
className="ml-auto"
onClick={() => void refreshPreview()}
>
<RefreshCwIcon className="size-3.5" />
</Button>
</div>
<div className="flex flex-col gap-2">
<Label>IPv4</Label>
<Input {...form.register('ipv4')} placeholder="198.51.100.10" />
@@ -518,6 +602,48 @@ function NodesPage() {
<Label>Заметки</Label>
<Input {...form.register('notes')} />
</div>
<div className="bg-muted/40 flex flex-col gap-2 rounded-lg border px-3 py-2 text-sm">
<div className="flex items-center gap-2">
<CloudIcon className="size-4 shrink-0" />
<span className="text-muted-foreground">Preview FQDN:</span>
<code className="font-medium">{previewHost || '—'}</code>
<Button
type="button"
variant="ghost"
size="sm"
className="ml-auto"
onClick={() => void refreshPreview()}
>
<RefreshCwIcon className="size-3.5" />
</Button>
</div>
{previewRecords.length > 0 ? (
<ul className="flex flex-col gap-1 font-mono text-xs tabular-nums">
{previewRecords.map((r) => (
<li
key={`${r.type}:${r.name}:${r.content}`}
className="text-muted-foreground flex flex-wrap items-baseline gap-x-2"
>
<span className="text-foreground w-12 shrink-0 font-semibold">
{r.type}
</span>
<span className="min-w-0 break-all">
{r.name} {r.content}
</span>
{r.note ? (
<span className="opacity-70">({r.note})</span>
) : null}
</li>
))}
</ul>
) : previewHost ? (
<p className="text-muted-foreground text-xs">
Укажите IPv4/IPv6 появятся A/AAAA. При редактировании CNAME
алиасов на эту ноду.
</p>
) : null}
</div>
</div>
</FormSheet>