3 Commits
Author SHA1 Message Date
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
3 changed files with 81 additions and 93 deletions
+42 -29
View File
@@ -24,35 +24,48 @@ jobs:
- name: Build project - name: Build project
run: npm run build run: npm run build
- name: Create Gitea Release - name: Create Gitea Release via API
uses: actions/gitea-release-action@v1 run: |
with: # Получаем описание из тега (если есть)
release_name: ${{ gitea.ref_name }} TAG_MESSAGE=$(git tag -l --format='%(contents)' "${{ gitea.ref_name }}" 2>/dev/null || echo "Автоматический релиз через CI/CD")
release_notes: |
## Релиз ${{ gitea.ref_name }} # Экранируем кавычки и переносы для JSON
TAG_MESSAGE_ESCAPED=$(echo "$TAG_MESSAGE" | sed 's/"/\\"/g' | awk '{printf "%s\\n", $0}')
${{ (github.event.head_commit.message != '' && format('📝 {0}', github.event.head_commit.message)) || '' }}
# Формируем JSON
### 📦 Что изменилось JSON_PAYLOAD=$(cat <<EOF
${{ github.event.head_commit.message || 'Автоматический релиз через CI/CD' }} {
"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,
- **Тег:** `${{ gitea.ref_name }}` "prerelease": false
- **Ветка:** `${{ gitea.ref }}` }
- **Автор:** ${{ gitea.actor }} EOF
)
### 🚀 Деплой
- ✅ Сервер обновлён автоматически # Отправляем запрос
RESPONSE=$(curl -s -w "\n%{http_code}" \
--- -X POST \
-H "Authorization: token ${{ secrets.ACCESS_TOKEN }}" \
> Релиз создан автоматически через Gitea Actions -H "Content-Type: application/json" \
draft: false -d "$JSON_PAYLOAD" \
prerelease: false "https://git.uvpn.shop/api/v1/repos/${{ gitea.repository }}/releases")
env:
GITEA_API_KEY: ${{ secrets.ACCESS_TOKEN }} # Проверяем ответ
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
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "frontend", "name": "frontend",
"version": "0.9.2", "version": "0.9.4",
"private": true, "private": true,
"type": "module", "type": "module",
"scripts": { "scripts": {
+38 -63
View File
@@ -1,17 +1,16 @@
<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="flex items-center justify-between mb-10 flex-wrap gap-4">
Статус серверов <h2 class="text-3xl md:text-4xl font-bold">
</h2> Статус серверов
</h2>
<div class="flex justify-end mb-4">
<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"
> >
<RefreshCw :size="16" :class="{ 'animate-spin': loading }" /> <RefreshCw :size="16" :class="{ 'animate-spin': loading }" />
{{ loading ? 'Обновление...' : 'Обновить все' }} {{ loading ? 'Обновление...' : 'Обновить пинг' }}
</button> </button>
</div> </div>
@@ -43,10 +42,10 @@
</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,
@@ -56,20 +55,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>
@@ -77,32 +63,26 @@
</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 findCountryByFirstWord = (name) => { const findCountryByFirstWord = (name) => {
if (!name) return null if (!name) return null
// Берём первое слово из названия
const firstWord = name.split(' ')[0] const firstWord = name.split(' ')[0]
if (!firstWord) return null if (!firstWord) return null
// Ищем точное совпадение
const exact = countriesList.find(c => const exact = countriesList.find(c =>
c.label.toLowerCase() === firstWord.toLowerCase() c.label.toLowerCase() === firstWord.toLowerCase()
) )
if (exact) return exact if (exact) return exact
// Ищем частичное совпадение
const partial = countriesList.find(c => const partial = countriesList.find(c =>
firstWord.toLowerCase().includes(c.label.toLowerCase()) || firstWord.toLowerCase().includes(c.label.toLowerCase()) ||
c.label.toLowerCase().includes(firstWord.toLowerCase()) c.label.toLowerCase().includes(firstWord.toLowerCase())
@@ -110,7 +90,6 @@ const findCountryByFirstWord = (name) => {
return partial || null return partial || null
} }
// Сортировка по пингу
const sortedHosts = computed(() => { const sortedHosts = computed(() => {
return [...hosts.value].sort((a, b) => { return [...hosts.value].sort((a, b) => {
if (a.ping === null && b.ping === null) return 0 if (a.ping === null && b.ping === null) return 0
@@ -120,18 +99,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()
@@ -149,19 +116,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')
@@ -175,11 +129,8 @@ const fetchHosts = async () => {
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 {
@@ -189,13 +140,37 @@ 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(() => { onMounted(() => {
fetchHosts() fetchHosts()
interval = setInterval(refreshData, 30000)
}) })
onUnmounted(() => clearInterval(interval))
</script> </script>