v0.9.7

.gitea/workflows/deploy.yml

@@ -24,6 +24,49 @@ jobs:
       - name: Build project
         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
         uses: webfactory/ssh-agent@v0.9.0
         with:

package.json

@@ -1,12 +1,13 @@
 {
   "name": "frontend",
-  "version": "0.9.0",
+  "version": "0.9.7",
   "private": true,
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "postbuild": "scp -r dist/. root@uvpn.shop:/opt/uvpn.shop/frontend"
   },
   "dependencies": {
     "@lucide/vue": "^1.16.0",

src/components/NodesStatus.vue

@@ -1,52 +1,70 @@
 <template>
   <section class="px-6 py-20 md:px-12 max-w-7xl mx-auto">
+    <div class="mb-10">
       <h2 class="text-3xl md:text-4xl font-bold text-center mb-14">
         Статус серверов
       </h2>
+      <div class="flex justify-center mt-6">
+        <button
+          @click="refreshData"
+          :disabled="loading"
+          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 }" />
+          {{ loading ? 'Обновление...' : 'Обновить пинг' }}
+        </button>
+      </div>
+    </div>
 
-    <div v-if="loading" class="flex justify-center py-12">
+    <div v-if="loading && !hosts.length" class="flex justify-center py-12">
       <div class="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-600"></div>
     </div>
 
     <p v-else-if="error" class="text-center text-red-500 py-12">{{ error }}</p>
 
-    <div v-else class="space-y-3 max-w-3xl mx-auto">
+    <div v-else class="space-y-2 max-w-3xl mx-auto">
       <div
-        v-for="host in hosts"
+        v-for="host in sortedHosts"
         :key="host.address"
-        class="flex items-center justify-between bg-white dark:bg-gray-900 rounded-xl px-4 py-3 border transition hover:shadow-md"
+        class="flex items-center justify-between bg-white dark:bg-gray-900 rounded-xl px-4 py-2.5 border"
         :class="host.isOnline ? 'border-green-500/30' : 'border-red-500/30 opacity-60'"
       >
         <div class="flex items-center gap-3">
           <img
             v-if="host.countryCode"
-            :src="`https://cdn.jsdelivr.net/npm/flag-icons@7.2.3/flags/4x3/${host.countryCode}.svg`"
+            :src="`https://cdn.jsdelivr.net/npm/flag-icons@7.2.3/flags/4x3/${host.countryCode.toLowerCase()}.svg`"
             class="h-5 w-auto rounded-sm"
+            :alt="host.name"
           />
-          <span class="font-semibold text-gray-800 dark:text-white">{{ host.cleanName }}</span>
+          <span class="font-semibold text-gray-800 dark:text-white">{{ host.name }}</span>
+          
+          <!-- Индикатор состояния -->
+          <span class="relative flex h-2 w-2">
             <span
-            class="text-[10px] px-2 py-0.5 rounded-full font-medium"
-            :class="host.isOnline ? 'bg-green-100 text-green-700' : 'bg-red-100 text-red-700'"
-          >
-            {{ 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-2 w-2"
+              :class="host.isOnline ? 'bg-green-600' : 'bg-red-600'"
+            ></span>
           </span>
         </div>
 
-        <div class="flex items-center gap-4 text-sm text-gray-500 dark:text-gray-400">
+        <div class="flex items-center gap-3">
           <span
             v-if="host.ping !== undefined && host.ping !== null"
-            class="font-mono font-semibold flex items-center gap-1"
+            class="font-mono font-semibold flex items-center gap-1.5"
             :class="{
-              'text-green-600': host.ping < 50,
-              'text-yellow-600': host.ping >= 50 && host.ping < 150,
-              'text-orange-600': host.ping >= 150 && host.ping < 300,
-              'text-red-600': host.ping >= 300,
+              'text-green-600': host.ping < 200,
+              'text-yellow-600': host.ping >= 200 && host.ping < 500,
+              'text-red-600': host.ping >= 500,
             }"
           >
             <Wifi :size="14" />
             {{ host.ping }} ms
           </span>
-          <span v-else class="text-gray-300">—</span>
+          <span v-else class="text-gray-300 font-mono">—</span>
         </div>
       </div>
     </div>
@@ -54,41 +72,22 @@
 </template>
 
 <script setup>
-import { ref, onMounted, onUnmounted } from 'vue'
-import { Wifi } from '@lucide/vue'
-import { getAllCountries } from '@tw-labs/countries'
+import { ref, computed, onMounted } from 'vue'
+import { Wifi, RefreshCw } from '@lucide/vue'
 
 const hosts = ref([])
 const loading = ref(true)
 const error = ref(null)
-let interval = null
 
-const countriesList = getAllCountries()
+const sortedHosts = computed(() => {
+  return [...hosts.value].sort((a, b) => {
+    if (a.ping === null && b.ping === null) return 0
+    if (a.ping === null) return 1
+    if (b.ping === null) return -1
+    return a.ping - b.ping
+  })
+})
 
-// Поиск страны по названию (из IpSecurity.vue)
-const findCountryByName = (countryName) => {
-  if (!countryName) return null
-  const found = countriesList.find(c => c.label.toLowerCase() === countryName.toLowerCase())
-  if (found) return found
-  const partial = countriesList.find(c =>
-    countryName.toLowerCase().includes(c.label.toLowerCase()) ||
-    c.label.toLowerCase().includes(countryName.toLowerCase())
-  )
-  return partial || null
-}
-
-// Очистка имени от эмодзи и лишних символов
-const cleanName = (name) => {
-  return name.replace(/^[🇷🇺🇫🇮🇸🇪🇺🇸🇵🇱🇱🇻🇳🇱🇩🇪]\s*/, '').replace(/[🚀⭐🔥]/g, '').trim()
-}
-
-// Извлечение названия страны из name (удаляем эмодзи)
-const extractCountryName = (name) => {
-  const cleaned = cleanName(name)
-  return cleaned.replace(/\s*\d+$/, '').trim() // убираем цифры в конце (например "Finland 2" -> "Finland")
-}
-
-// Пинг через fetch (работает даже с невалидным сертификатом)
 const pingHost = async (host) => {
   const url = `https://${host.address}:${host.port}`
   const start = performance.now()
@@ -112,31 +111,50 @@ const fetchHosts = async () => {
     if (!res.ok) throw new Error()
     const data = await res.json()
 
-    hosts.value = data.map((h) => {
-      const countryName = extractCountryName(h.name)
-      const country = findCountryByName(countryName)
-      
-      return {
+    hosts.value = data.map((h) => ({
       ...h,
-        cleanName: cleanName(h.name),
-        countryCode: country?.code?.toLowerCase() || null,
+      countryCode: h.country_code ? h.country_code.toLowerCase() : null,
       isOnline: true,
       ping: null,
-      }
-    })
-
-    const pings = await Promise.all(hosts.value.map((h) => pingHost(h)))
-    hosts.value.forEach((h, i) => (h.ping = pings[i]))
+    }))
   } catch {
-    error.value = 'Ошибка загрузки'
+    error.value = 'Ошибка загрузки данных'
   } finally {
     loading.value = false
   }
 }
 
-onMounted(() => {
-  fetchHosts()
-  interval = setInterval(fetchHosts, 30000)
+const refreshData = async () => {
+  loading.value = true
+  error.value = null
+  
+  try {
+    const res = await fetch('/api/v1/hosts')
+    if (!res.ok) throw new Error()
+    const data = await res.json()
+    
+    hosts.value = data.map((h) => ({
+      ...h,
+      countryCode: h.country_code ? h.country_code.toLowerCase() : null,
+      isOnline: true,
+      ping: null,
+    }))
+    
+    // Пингуем все хосты параллельно
+    const pings = await Promise.all(hosts.value.map(h => pingHost(h)))
+    hosts.value.forEach((h, i) => {
+      h.ping = pings[i]
+    })
+    
+  } catch {
+    error.value = 'Ошибка обновления данных'
+  } finally {
+    loading.value = false
+  }
+}
+
+onMounted(async () => {
+  await fetchHosts()
+  await refreshData()
 })
-onUnmounted(() => clearInterval(interval))
 </script>