8 Commits
Author SHA1 Message Date
austnv 4a0ce08338 fix: header & button
Build and Deploy Frontend via SSH / deploy (push) Successful in 43s
2026-06-21 23:16:28 +03:00
austnv 43749647ca fix: bugs in flags & autoping
Build and Deploy Frontend via SSH / deploy (push) Successful in 43s
2026-06-21 23:03:50 +03:00
austnv 3dbacb4359 feat: minify component NodesStatus
Build and Deploy Frontend via SSH / deploy (push) Successful in 44s
2026-06-21 22:50:30 +03:00
austnv d8e20754c7 dix: release author 2026-06-21 22:44:14 +03:00
austnv 4e6e0d4d48 fix deploy
Build and Deploy Frontend via SSH / deploy (push) Successful in 47s
2026-06-21 22:39:42 +03:00
austnv a22662f11b v0.9.2
Build and Deploy Frontend via SSH / deploy (push) Failing after 4s
2026-06-21 21:56:47 +03:00
austnv 75531a9ec3 update workflow: add auto release 2026-06-21 21:56:19 +03:00
austnv e6ab2667c9 fix: micropatch NodesStatus 2026-06-21 21:50:00 +03:00
3 changed files with 147 additions and 84 deletions
+43
View File
@@ -24,6 +24,49 @@ jobs:
- name: Build project - name: Build project
run: npm run build run: npm run build
- name: Create Gitea Release via API
run: |
# Получаем описание из тега (если есть)
TAG_MESSAGE=$(git tag -l --format='%(contents)' "${{ gitea.ref_name }}" 2>/dev/null || echo "Автоматический релиз через CI/CD")
# Экранируем кавычки и переносы для JSON
TAG_MESSAGE_ESCAPED=$(echo "$TAG_MESSAGE" | sed 's/"/\\"/g' | awk '{printf "%s\\n", $0}')
# Формируем JSON
JSON_PAYLOAD=$(cat <<EOF
{
"tag_name": "${{ gitea.ref_name }}",
"name": "Release ${{ gitea.ref_name }}",
"body": "## Релиз ${{ gitea.ref_name }}\n\n📝 ${TAG_MESSAGE_ESCAPED}\n\n---\n\n**🏷️ Тег:** \`${{ gitea.ref_name }}\`\n**👤 Автор:** @${{ gitea.actor }}\n\n✅ Автоматически собрано и развёрнуто",
"draft": false,
"prerelease": false
}
EOF
)
# Отправляем запрос
RESPONSE=$(curl -s -w "\n%{http_code}" \
-X POST \
-H "Authorization: token ${{ secrets.ACCESS_TOKEN }}" \
-H "Content-Type: application/json" \
-d "$JSON_PAYLOAD" \
"https://git.uvpn.shop/api/v1/repos/${{ gitea.repository }}/releases")
# Проверяем ответ
HTTP_CODE=$(echo "$RESPONSE" | tail -n1)
BODY=$(echo "$RESPONSE" | sed '$d')
if [ "$HTTP_CODE" -eq 201 ]; then
echo "✅ Релиз успешно создан!"
echo "$BODY" | jq '.'
elif [ "$HTTP_CODE" -eq 409 ]; then
echo "⚠️ Релиз с таким тегом уже существует, пропускаем"
else
echo "❌ Ошибка создания релиза (HTTP $HTTP_CODE)"
echo "$BODY"
exit 1
fi
- name: Install SSH key - name: Install SSH key
uses: webfactory/ssh-agent@v0.9.0 uses: webfactory/ssh-agent@v0.9.0
with: with:
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "frontend", "name": "frontend",
"version": "0.9.1", "version": "0.9.6",
"private": true, "private": true,
"type": "module", "type": "module",
"scripts": { "scripts": {
+103 -83
View File
@@ -1,18 +1,19 @@
<template> <template>
<section class="px-6 py-20 md:px-12 max-w-7xl mx-auto"> <section class="px-6 py-20 md:px-12 max-w-7xl mx-auto">
<h2 class="text-3xl md:text-4xl font-bold text-center mb-14"> <div class="mb-14">
Статус серверов <h2 class="text-3xl md:text-4xl font-bold text-center">
</h2> Статус серверов
</h2>
<div class="flex justify-end mb-4"> <div class="flex justify-center mt-6">
<button <button
@click="refreshData" @click="refreshData"
:disabled="loading" :disabled="loading"
class="px-4 py-2 bg-blue-600 hover:bg-blue-700 text-white rounded-lg text-sm font-medium transition disabled:opacity-50 disabled:cursor-not-allowed flex items-center gap-2" class="px-5 py-2.5 bg-blue-600 hover:bg-blue-700 text-white rounded-xl text-sm font-medium transition disabled:opacity-50 disabled:cursor-not-allowed flex items-center gap-2 cursor-pointer"
> >
<RefreshCw :size="16" :class="{ 'animate-spin': loading }" /> <RefreshCw :size="16" :class="{ 'animate-spin': loading }" />
{{ loading ? 'Обновление...' : 'Обновить все' }} {{ loading ? 'Обновление...' : 'Обновить пинг' }}
</button> </button>
</div>
</div> </div>
<div v-if="loading && !hosts.length" class="flex justify-center py-12"> <div v-if="loading && !hosts.length" class="flex justify-center py-12">
@@ -35,19 +36,24 @@
class="h-5 w-auto rounded-sm" class="h-5 w-auto rounded-sm"
/> />
<span class="font-semibold text-gray-800 dark:text-white">{{ host.name }}</span> <span class="font-semibold text-gray-800 dark:text-white">{{ host.name }}</span>
<span
class="text-[10px] px-2 py-0.5 rounded-full font-medium" <!-- Индикатор состояния (вместо online/offline) -->
:class="host.isOnline ? 'bg-green-100 text-green-700' : 'bg-red-100 text-red-700'" <span class="relative flex h-3 w-3">
> <span
{{ host.isOnline ? 'online' : 'offline' }} class="animate-ping absolute inline-flex h-full w-full rounded-full opacity-75"
:class="host.isOnline ? 'bg-green-500' : 'bg-red-500'"
></span>
<span
class="relative inline-flex rounded-full h-3 w-3"
:class="host.isOnline ? 'bg-green-600' : 'bg-red-600'"
></span>
</span> </span>
</div> </div>
<div class="flex items-center gap-4"> <div class="flex items-center gap-3">
<!-- Пинг -->
<span <span
v-if="host.ping !== undefined && host.ping !== null" v-if="host.ping !== undefined && host.ping !== null"
class="font-mono font-semibold flex items-center gap-1 min-w-[60px] justify-end" class="font-mono font-semibold flex items-center gap-1.5"
:class="{ :class="{
'text-green-600': host.ping < 200, 'text-green-600': host.ping < 200,
'text-yellow-600': host.ping >= 200 && host.ping < 500, 'text-yellow-600': host.ping >= 200 && host.ping < 500,
@@ -57,21 +63,7 @@
<Wifi :size="14" /> <Wifi :size="14" />
{{ host.ping }}ms {{ host.ping }}ms
</span> </span>
<span v-else class="text-gray-300 min-w-[60px] text-right"></span> <span v-else class="text-gray-300 font-mono"></span>
<!-- Кнопка пинга -->
<button
@click="pingSingleHost(host)"
:disabled="host.pinging"
class="text-xs px-3 py-1 rounded-lg transition font-medium"
:class="[
host.isOnline && !host.pinging
? 'bg-gray-200 dark:bg-gray-700 text-gray-700 dark:text-gray-300 hover:bg-gray-300 dark:hover:bg-gray-600'
: 'bg-gray-100 dark:bg-gray-800 text-gray-400 cursor-not-allowed'
]"
>
{{ host.pinging ? '⏳' : 'Пинг' }}
</button>
</div> </div>
</div> </div>
</div> </div>
@@ -79,32 +71,62 @@
</template> </template>
<script setup> <script setup>
import { ref, computed, onMounted, onUnmounted } from 'vue' import { ref, computed, onMounted } from 'vue'
import { Wifi, RefreshCw } from '@lucide/vue' import { Wifi, RefreshCw } from '@lucide/vue'
import { getAllCountries } from '@tw-labs/countries' import { getAllCountries } from '@tw-labs/countries'
const hosts = ref([]) const hosts = ref([])
const loading = ref(true) const loading = ref(true)
const error = ref(null) const error = ref(null)
let interval = null
const countriesList = getAllCountries() const countriesList = getAllCountries()
const findCountryByName = (countryName) => { // Ручной маппинг для проблемных стран
if (!countryName) return null const countryOverrides = {
const found = countriesList.find(c => c.label.toLowerCase() === countryName.toLowerCase()) 'United States': 'us',
if (found) return found 'USA': 'us',
'U.S.A.': 'us',
'America': 'us',
'United Arab Emirates': 'ae',
'UAE': 'ae',
}
const findCountryByFirstWord = (name) => {
if (!name) return null
// 1. Проверяем ручные override
const override = countryOverrides[name]
if (override) {
return { code: override.toUpperCase() }
}
// 2. Ищем по первому слову
const firstWord = name.split(' ')[0]
if (!firstWord) return null
// Точное совпадение
const exact = countriesList.find(c =>
c.label.toLowerCase() === firstWord.toLowerCase()
)
if (exact) return exact
// Частичное совпадение
const partial = countriesList.find(c => const partial = countriesList.find(c =>
countryName.toLowerCase().includes(c.label.toLowerCase()) || firstWord.toLowerCase().includes(c.label.toLowerCase()) ||
c.label.toLowerCase().includes(countryName.toLowerCase()) c.label.toLowerCase().includes(firstWord.toLowerCase())
)
if (partial) return partial
// 3. Пробуем найти по полному имени
const fullMatch = countriesList.find(c =>
name.toLowerCase().includes(c.label.toLowerCase()) ||
c.label.toLowerCase().includes(name.toLowerCase())
) )
return partial || null return fullMatch || null
} }
// Сортировка по пингу (меньше -> выше)
const sortedHosts = computed(() => { const sortedHosts = computed(() => {
return [...hosts.value].sort((a, b) => { return [...hosts.value].sort((a, b) => {
// Если пинг null -> в конец
if (a.ping === null && b.ping === null) return 0 if (a.ping === null && b.ping === null) return 0
if (a.ping === null) return 1 if (a.ping === null) return 1
if (b.ping === null) return -1 if (b.ping === null) return -1
@@ -112,18 +134,6 @@ const sortedHosts = computed(() => {
}) })
}) })
// Пинг одного хоста
const pingSingleHost = async (host) => {
if (host.pinging || !host.isOnline) return
host.pinging = true
host.ping = null
const result = await pingHost(host)
host.ping = result
host.pinging = false
}
// Пинг через fetch
const pingHost = async (host) => { const pingHost = async (host) => {
const url = `https://${host.address}:${host.port}` const url = `https://${host.address}:${host.port}`
const start = performance.now() const start = performance.now()
@@ -141,19 +151,6 @@ const pingHost = async (host) => {
} }
} }
// Пинг всех хостов
const pingAllHosts = async () => {
const pings = await Promise.all(
hosts.value.map(async (h) => {
if (!h.isOnline) return null
return await pingHost(h)
})
)
hosts.value.forEach((h, i) => {
if (h.isOnline) h.ping = pings[i]
})
}
const fetchHosts = async () => { const fetchHosts = async () => {
try { try {
const res = await fetch('/api/v1/hosts') const res = await fetch('/api/v1/hosts')
@@ -161,17 +158,14 @@ const fetchHosts = async () => {
const data = await res.json() const data = await res.json()
hosts.value = data.map((h) => { hosts.value = data.map((h) => {
const country = findCountryByName(h.name) const country = findCountryByFirstWord(h.name)
return { return {
...h, ...h,
countryCode: country?.code?.toLowerCase() || null, countryCode: country?.code?.toLowerCase() || null,
isOnline: true, isOnline: true,
ping: null, ping: null,
pinging: false,
} }
}) })
await pingAllHosts()
} catch { } catch {
error.value = 'Ошибка загрузки' error.value = 'Ошибка загрузки'
} finally { } finally {
@@ -181,13 +175,39 @@ const fetchHosts = async () => {
const refreshData = async () => { const refreshData = async () => {
loading.value = true loading.value = true
await fetchHosts() error.value = null
loading.value = false
try {
const res = await fetch('/api/v1/hosts')
if (!res.ok) throw new Error()
const data = await res.json()
hosts.value = data.map((h) => {
const country = findCountryByFirstWord(h.name)
return {
...h,
countryCode: country?.code?.toLowerCase() || null,
isOnline: true,
ping: null,
}
})
const pings = await Promise.all(hosts.value.map(h => pingHost(h)))
hosts.value.forEach((h, i) => {
if (h.isOnline) h.ping = pings[i]
})
} catch {
error.value = 'Ошибка обновления'
} finally {
loading.value = false
}
} }
onMounted(() => { // При первом открытии — загружаем и пингуем
fetchHosts() onMounted(async () => {
interval = setInterval(refreshData, 30000) await fetchHosts()
// Автоматический пинг только при первом открытии
await refreshData()
}) })
onUnmounted(() => clearInterval(interval)) </script>
</script>s