refactor NodesStatus.vue

update NodesStatus
2026-06-21 20:45:40 +03:00 · 2026-06-21 17:51:54 +03:00
3 changed files with 109 additions and 103 deletions
@@ -1,6 +1,6 @@
 {
-  "name": "uvpn.shop",
-  "version": "0.8.1",
+  "name": "frontend",
+  "version": "0.9.0",
  "private": true,
  "type": "module",
  "scripts": {
@@ -1,45 +1,52 @@
 <template>
-  <section class="px-6 py-12 max-w-7xl mx-auto">
-    <h2 class="text-2xl font-bold mb-6">🌍 Статус серверов</h2>
+  <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">
+      Статус серверов
+    </h2>

-    <div v-if="loading" class="flex justify-center py-8">
-      <div class="animate-spin rounded-full h-8 w-8 border-b-2 border-blue-600"></div>
+    <div v-if="loading" 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-red-500">{{ error }}</p>
+    <p v-else-if="error" class="text-center text-red-500 py-12">{{ error }}</p>

-    <div v-else class="grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-4 gap-3">
+    <div v-else class="space-y-3 max-w-3xl mx-auto">
      <div
-        v-for="node in nodes"
-        :key="node.name"
-        class="bg-white dark:bg-gray-900 rounded-lg p-3 border text-sm"
-        :class="node.isOnline ? 'border-green-400' : 'border-red-400 opacity-60'"
+        v-for="host in hosts"
+        :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="host.isOnline ? 'border-green-500/30' : 'border-red-500/30 opacity-60'"
      >
-        <div class="flex items-center gap-1.5 mb-1">
+        <div class="flex items-center gap-3">
          <img
-            v-if="node.country_code.toLowerCase()"
-            :src="`https://cdn.jsdelivr.net/npm/flag-icons@7.2.3/flags/4x3/${node.country_code.toLowerCase()}.svg`"
-            class="h-3.5 w-auto"
+            v-if="host.countryCode"
+            :src="`https://cdn.jsdelivr.net/npm/flag-icons@7.2.3/flags/4x3/${host.countryCode}.svg`"
+            class="h-5 w-auto rounded-sm"
          />
-          <span class="font-semibold text-gray-800 dark:text-white">{{ node.name }}</span>
-          <span class="ml-auto text-[10px] px-1.5 py-0.5 rounded-full font-medium" 
-                :class="node.isOnline ? 'bg-green-100 text-green-700' : 'bg-red-100 text-red-700'">
-            {{ node.isOnline ? 'online' : 'offline' }}
+          <span class="font-semibold text-gray-800 dark:text-white">{{ host.cleanName }}</span>
+          <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' }}
          </span>
        </div>
-        <div class="flex justify-between text-gray-500 dark:text-gray-400 text-xs">
-          <span>👤 {{ node.users_online }}</span>
-          <span>⏱ {{ formatUptime(node.uptime) }}</span>
-          <span v-if="node.ping !== undefined && node.ping !== null" class="font-mono font-semibold"
+
+        <div class="flex items-center gap-4 text-sm text-gray-500 dark:text-gray-400">
+          <span
+            v-if="host.ping !== undefined && host.ping !== null"
+            class="font-mono font-semibold flex items-center gap-1"
            :class="{
-                  'text-green-600': node.ping < 50,
-                  'text-yellow-600': node.ping >= 50 && node.ping < 150,
-                  'text-orange-600': node.ping >= 150 && node.ping < 300,
-                  'text-red-600': node.ping >= 300
-                }">
-            {{ node.ping }}ms
+              '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,
+            }"
+          >
+            <Wifi :size="14" />
+            {{ host.ping }}ms
          </span>
-          <span v-else class="text-gray-300">⏳</span>
+          <span v-else class="text-gray-300">—</span>
        </div>
      </div>
    </div>
@@ -48,34 +55,78 @@

 <script setup>
 import { ref, onMounted, onUnmounted } from 'vue'
+import { Wifi } from '@lucide/vue'
+import { getAllCountries } from '@tw-labs/countries'

-const nodes = ref([])
+const hosts = ref([])
 const loading = ref(true)
 const error = ref(null)
 let interval = null

-const formatUptime = (s) => {
-  if (!s) return '0м'
-  const d = Math.floor(s/86400), h = Math.floor((s%86400)/3600), m = Math.floor((s%3600)/60)
-  return d>0 ? `${d}д ${h}ч` : h>0 ? `${h}ч ${m}м` : `${m}м`
+const countriesList = getAllCountries()
+
+// Поиск страны по названию (из 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 pingNode = (node) => new Promise(resolve => {
+// Очистка имени от эмодзи и лишних символов
+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()
-  const ws = new WebSocket(`wss://${node.ip}:${node.port}`)
-  const timer = setTimeout(() => { ws.close(); resolve(null) }, 3000)
-  ws.onopen = () => { clearTimeout(timer); resolve(Math.round(performance.now()-start)); ws.close() }
-  ws.onerror = () => { clearTimeout(timer); resolve(null) }
-})

-const fetchNodes = async () => {
  try {
-    const res = await fetch('/api/v1/nodes')
+    await fetch(url, {
+      method: 'HEAD',
+      mode: 'no-cors',
+      cache: 'no-cache',
+      signal: AbortSignal.timeout(5000),
+    })
+    return Math.round(performance.now() - start)
+  } catch {
+    return Math.round(performance.now() - start)
+  }
+}
+
+const fetchHosts = async () => {
+  try {
+    const res = await fetch('/api/v1/hosts')
    if (!res.ok) throw new Error()
    const data = await res.json()
-    nodes.value = data.map(n => ({ ...n, isOnline: true, ping: null }))
-    const pings = await Promise.all(nodes.value.map(n => pingNode(n)))
-    nodes.value.forEach((n, i) => n.ping = pings[i])
+    
+    hosts.value = data.map((h) => {
+      const countryName = extractCountryName(h.name)
+      const country = findCountryByName(countryName)
+      
+      return {
+        ...h,
+        cleanName: cleanName(h.name),
+        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) => (h.ping = pings[i]))
  } catch {
    error.value = 'Ошибка загрузки'
  } finally {
@@ -84,8 +135,8 @@ const fetchNodes = async () => {
 }

 onMounted(() => {
-  fetchNodes()
-  interval = setInterval(fetchNodes, 30000)
+  fetchHosts()
+  interval = setInterval(fetchHosts, 30000)
 })
 onUnmounted(() => clearInterval(interval))
 </script>
@@ -1,5 +1,4 @@
 <template>
-  <div>
  <HeroSection />
  <FeaturesSection />
  <CompatibilitySection />
@@ -8,7 +7,6 @@
  <StepsSection />
  <TestimonialsSection />
  <FaqSection />
-  </div>
 </template>

 <script setup>
@@ -21,51 +19,8 @@ import StepsSection from '../components/StepsSection.vue'
 import TestimonialsSection from '../components/TestimonialsSection.vue'
 import FaqSection from '../components/FaqSection.vue'

-// import { useHead } from '@vueuse/head';
 import { useRoute } from 'vue-router';

 const route = useRoute();

-// useHead({
-//   title: route.meta.title,
-//   meta: [
-//     {
-//       name: 'description',
-//       content: route.meta.description
-//     },
-//     {
-//       name: 'keywords',
-//       content: route.meta.keywords
-//     },
-//     // Open Graph теги для соцсетей
-//     {
-//       property: 'og:title',
-//       content: route.meta.title
-//     },
-//     {
-//       property: 'og:description',
-//       content: route.meta.description
-//     },
-//     {
-//       property: 'og:type',
-//       content: 'website'
-//     },
-//     {
-//       property: 'og:url',
-//       content: window.location.href // Здесь можно также задать каноничный URL
-//     },
-//     {
-//       property: 'og:site_name',
-//       content: route.meta.title
-//     },
-//     {
-//       property: 'telegram:channel',
-//       content: '@uvpn_shop'
-//     },
-//     {
-//       property: 'tg:site_verification',
-//       content: 'g7j8/rPFXfhyrq5q0QQV7EsYWv4='
-//     },
-//   ]
-// });
 </script>
Author	SHA1	Message	Date
austnv	4b7b2bc5c6	refactor NodesStatus.vue Build and Deploy Frontend via SSH / deploy (push) Successful in 46s Details	2026-06-21 20:45:40 +03:00
austnv	f6af141f56	update NodesStatus	2026-06-21 17:51:54 +03:00