Compare commits
21 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a2f2e8f255 | ||
| 5cfafa88cf | |||
| 656917c776 | |||
| 90fd395a26 | |||
| 35cfcb1bcf | |||
| 92ed9b040f | |||
| e52fbaf799 | |||
| 00dc2daa3d | |||
| 7643600196 | |||
| b6375b4242 | |||
| 9393abc8df | |||
| b3fc6f77b1 | |||
| 47bc8ba966 | |||
| 31e101abbd | |||
|
|
126d6b505a | ||
| c758c4d904 | |||
| ffe463e130 | |||
|
|
a8447d6ee1 | ||
| 91d429c4dd | |||
| 505ebd9325 | |||
| d0e39c92b2 |
8
.env.example
Normal file
8
.env.example
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
API_SECRET_KEY=
|
||||||
|
DISCORD_BOT_TOKEN=
|
||||||
|
DISCORD_CHANNEL_ID=
|
||||||
|
BACKUPS_REMOTE_HOST=
|
||||||
|
BACKUPS_REMOTE_ROOT=
|
||||||
|
BACKUPS_MAX_FILES=
|
||||||
|
DISK_COMMAND_REMOTE=
|
||||||
|
DISK_COMMAND_LOCAL=
|
||||||
22
CHANGELOG.md
22
CHANGELOG.md
@@ -1,3 +1,25 @@
|
|||||||
|
# [1.3.0](https://gitea.malio.fr/MALIO-DEV/Supervisor/compare/v1.2.4...v1.3.0) (2026-03-13)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add system metrics dashboard ([31e101a](https://gitea.malio.fr/MALIO-DEV/Supervisor/commit/31e101abbd3ed82c22770d840a4f7fd20de1c936))
|
||||||
|
|
||||||
|
## [1.2.4](https://gitea.malio.fr/MALIO-DEV/Supervisor/compare/v1.2.3...v1.2.4) (2026-03-10)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* bundle latest backup downloads ([ffe463e](https://gitea.malio.fr/MALIO-DEV/Supervisor/commit/ffe463e13034601843446514abbd7c69cbaee081))
|
||||||
|
|
||||||
|
## [1.2.3](https://gitea.malio.fr/MALIO-DEV/Supervisor/compare/v1.2.2...v1.2.3) (2026-03-10)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* add scroll to backup history ([505ebd9](https://gitea.malio.fr/MALIO-DEV/Supervisor/commit/505ebd9325c0aa54adb034c012c45c913bb36d73))
|
||||||
|
* restore backup history listing ([d0e39c9](https://gitea.malio.fr/MALIO-DEV/Supervisor/commit/d0e39c92b270993c99cde0eed8577c6dde817fdd))
|
||||||
|
|
||||||
## [1.2.2](https://gitea.malio.fr/MALIO-DEV/Supervisor/compare/v1.2.1...v1.2.2) (2026-03-10)
|
## [1.2.2](https://gitea.malio.fr/MALIO-DEV/Supervisor/compare/v1.2.1...v1.2.2) (2026-03-10)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,13 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div v-else-if="errorMessage" class="empty-state error-state">
|
||||||
|
<IconifyIcon icon="mdi:alert-circle-outline" class="text-3xl text-m-error/70" />
|
||||||
|
<p class="mt-2 font-mono text-xs text-m-error/80">
|
||||||
|
{{ errorMessage }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div v-else-if="backups.length === 0" class="empty-state">
|
<div v-else-if="backups.length === 0" class="empty-state">
|
||||||
<IconifyIcon icon="mdi:file-hidden" class="text-3xl text-m-muted/40" />
|
<IconifyIcon icon="mdi:file-hidden" class="text-3xl text-m-muted/40" />
|
||||||
<p class="mt-2 font-mono text-xs text-m-muted/50">
|
<p class="mt-2 font-mono text-xs text-m-muted/50">
|
||||||
@@ -55,6 +62,7 @@
|
|||||||
import {Icon as IconifyIcon} from "@iconify/vue"
|
import {Icon as IconifyIcon} from "@iconify/vue"
|
||||||
import CircleSkeleton from "~/components/skeleton/CircleSkeleton.vue"
|
import CircleSkeleton from "~/components/skeleton/CircleSkeleton.vue"
|
||||||
import TextSkeleton from "~/components/skeleton/TextSkeleton.vue"
|
import TextSkeleton from "~/components/skeleton/TextSkeleton.vue"
|
||||||
|
import { apiFetch, downloadApiFile } from "~/composables/useApiAuth"
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
folder: string | null
|
folder: string | null
|
||||||
@@ -62,31 +70,42 @@ const props = defineProps<{
|
|||||||
|
|
||||||
const backups = ref<string[]>([])
|
const backups = ref<string[]>([])
|
||||||
const loading = ref(false)
|
const loading = ref(false)
|
||||||
|
const errorMessage = ref("")
|
||||||
const title = computed(() => {
|
const title = computed(() => {
|
||||||
if (!props.folder) return "Fichiers"
|
if (!props.folder) return "Fichiers"
|
||||||
return `Backup — ${props.folder.toUpperCase()}`
|
return `Backup — ${props.folder.toUpperCase()}`
|
||||||
})
|
})
|
||||||
|
|
||||||
const downloadBackup = (file: string) => {
|
const downloadBackup = async (file: string) => {
|
||||||
if (!props.folder) return
|
if (!props.folder) return
|
||||||
const url = `/api/download?folder=${encodeURIComponent(props.folder)}&file=${encodeURIComponent(file)}`
|
const url = `/api/download?folder=${encodeURIComponent(props.folder)}&file=${encodeURIComponent(file)}`
|
||||||
window.location.href = url
|
errorMessage.value = ""
|
||||||
|
|
||||||
|
try {
|
||||||
|
await downloadApiFile(url, file)
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Erreur telechargement backup:", error)
|
||||||
|
errorMessage.value = "Erreur lors de l'opération"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
watch(() => props.folder, async (folder) => {
|
watch(() => props.folder, async (folder) => {
|
||||||
if (!folder) {
|
if (!folder) {
|
||||||
loading.value = false
|
loading.value = false
|
||||||
backups.value = []
|
backups.value = []
|
||||||
|
errorMessage.value = ""
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
loading.value = true
|
loading.value = true
|
||||||
|
errorMessage.value = ""
|
||||||
try {
|
try {
|
||||||
const data = await $fetch<string[]>(`/api/backups?folder=${folder}`)
|
const data = await apiFetch<string[]>(`/api/backups?folder=${encodeURIComponent(folder)}`)
|
||||||
backups.value = data.slice(0, 6)
|
backups.value = data
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Erreur récupération backups:", error)
|
console.error("Erreur récupération backups:", error)
|
||||||
backups.value = []
|
backups.value = []
|
||||||
|
errorMessage.value = "Erreur lors de l'opération"
|
||||||
} finally {
|
} finally {
|
||||||
loading.value = false
|
loading.value = false
|
||||||
}
|
}
|
||||||
@@ -120,10 +139,19 @@ watch(() => props.folder, async (folder) => {
|
|||||||
padding: 2.5rem 1rem;
|
padding: 2.5rem 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.error-state {
|
||||||
|
border-radius: 8px;
|
||||||
|
border: 1px solid rgb(var(--m-error) / 0.12);
|
||||||
|
background: rgb(var(--m-error) / 0.06);
|
||||||
|
}
|
||||||
|
|
||||||
.file-list {
|
.file-list {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: 0.375rem;
|
gap: 0.375rem;
|
||||||
|
max-height: calc((2.875rem * 5) + (0.375rem * 4));
|
||||||
|
overflow-y: auto;
|
||||||
|
padding-right: 0.25rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.file-row {
|
.file-row {
|
||||||
|
|||||||
@@ -79,6 +79,8 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, onMounted, ref } from "vue"
|
import { computed, onMounted, ref } from "vue"
|
||||||
import { Icon as IconifyIcon } from "@iconify/vue"
|
import { Icon as IconifyIcon } from "@iconify/vue"
|
||||||
|
import { apiFetch } from "~/composables/useApiAuth"
|
||||||
|
import { useApiAuthHeader } from "~/composables/useApiAuth"
|
||||||
|
|
||||||
type BackupScript = {
|
type BackupScript = {
|
||||||
key: string
|
key: string
|
||||||
@@ -118,6 +120,7 @@ const scripts = ref<BackupScript[]>([])
|
|||||||
const output = ref<string>("")
|
const output = ref<string>("")
|
||||||
const message = ref<string>("")
|
const message = ref<string>("")
|
||||||
const isError = ref(false)
|
const isError = ref(false)
|
||||||
|
const apiAuthHeader = useApiAuthHeader()
|
||||||
|
|
||||||
const statusClass = computed(() => (isError.value ? "status-error" : "status-success"))
|
const statusClass = computed(() => (isError.value ? "status-error" : "status-success"))
|
||||||
|
|
||||||
@@ -134,12 +137,12 @@ const loadScripts = async () => {
|
|||||||
downloadFolders: []
|
downloadFolders: []
|
||||||
})
|
})
|
||||||
try {
|
try {
|
||||||
const data = await $fetch<BackupScriptListResponse>("/api/backup-script")
|
const data = await apiFetch<BackupScriptListResponse>("/api/backup-script")
|
||||||
scripts.value = data.scripts
|
scripts.value = data.scripts
|
||||||
} catch (error) {
|
} catch {
|
||||||
scripts.value = []
|
scripts.value = []
|
||||||
isError.value = true
|
isError.value = true
|
||||||
message.value = `Erreur chargement scripts: ${error instanceof Error ? error.message : String(error)}`
|
message.value = "Erreur lors de l'opération"
|
||||||
emit("result", {
|
emit("result", {
|
||||||
key: null,
|
key: null,
|
||||||
label: "",
|
label: "",
|
||||||
@@ -160,7 +163,7 @@ const runScript = async (key: string) => {
|
|||||||
isError.value = false
|
isError.value = false
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const data = await $fetch<BackupScriptRunResponse>("/api/backup-script", {
|
const data = await apiFetch<BackupScriptRunResponse>("/api/backup-script", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
body: { key }
|
body: { key }
|
||||||
})
|
})
|
||||||
@@ -173,8 +176,20 @@ const runScript = async (key: string) => {
|
|||||||
isError: false,
|
isError: false,
|
||||||
downloadFolders: data.downloadFolders || []
|
downloadFolders: data.downloadFolders || []
|
||||||
})
|
})
|
||||||
} catch (error: any) {
|
} catch (error: unknown) {
|
||||||
isError.value = true
|
isError.value = true
|
||||||
|
const statusMessage =
|
||||||
|
typeof error === "object" &&
|
||||||
|
error !== null &&
|
||||||
|
"data" in error &&
|
||||||
|
typeof error.data === "object" &&
|
||||||
|
error.data !== null &&
|
||||||
|
"statusMessage" in error.data &&
|
||||||
|
typeof error.data.statusMessage === "string"
|
||||||
|
? error.data.statusMessage
|
||||||
|
: null
|
||||||
|
|
||||||
|
message.value = statusMessage || "Erreur lors de l'opération"
|
||||||
message.value = error?.data?.statusMessage || "Erreur execution script"
|
message.value = error?.data?.statusMessage || "Erreur execution script"
|
||||||
output.value = ""
|
output.value = ""
|
||||||
emit("result", {
|
emit("result", {
|
||||||
|
|||||||
@@ -1,6 +1,11 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import {Icon as IconifyIcon} from "@iconify/vue"
|
import {Icon as IconifyIcon} from "@iconify/vue"
|
||||||
const { data: messages } = await useFetch('/api/discord/messages')
|
import { apiFetch } from "~/composables/useApiAuth"
|
||||||
|
|
||||||
|
const { data: messages, error } = await useFetch('/api/discord/messages', {
|
||||||
|
$fetch: apiFetch,
|
||||||
|
server: false
|
||||||
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
@@ -13,7 +18,14 @@ const { data: messages } = await useFetch('/api/discord/messages')
|
|||||||
<span class="font-mono text-[10px] text-m-muted tracking-widest uppercase">Messages</span>
|
<span class="font-mono text-[10px] text-m-muted tracking-widest uppercase">Messages</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="!messages || messages.length === 0" class="empty-state">
|
<div v-if="error" class="empty-state error-state">
|
||||||
|
<IconifyIcon icon="mdi:alert-circle-outline" class="text-3xl text-m-error/70" />
|
||||||
|
<p class="mt-2 font-mono text-xs text-m-error/80">
|
||||||
|
Erreur lors de l'opération
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-else-if="!messages || messages.length === 0" class="empty-state">
|
||||||
<IconifyIcon icon="mdi:chat-outline" class="text-3xl text-m-muted/40" />
|
<IconifyIcon icon="mdi:chat-outline" class="text-3xl text-m-muted/40" />
|
||||||
<p class="mt-2 font-mono text-xs text-m-muted/50">
|
<p class="mt-2 font-mono text-xs text-m-muted/50">
|
||||||
Aucun message
|
Aucun message
|
||||||
@@ -74,6 +86,12 @@ const { data: messages } = await useFetch('/api/discord/messages')
|
|||||||
padding: 2rem 1rem;
|
padding: 2rem 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.error-state {
|
||||||
|
border-radius: 8px;
|
||||||
|
border: 1px solid rgb(var(--m-error) / 0.12);
|
||||||
|
background: rgb(var(--m-error) / 0.06);
|
||||||
|
}
|
||||||
|
|
||||||
.message-list {
|
.message-list {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
<h2 class="card-title">Speedtest</h2>
|
<h2 class="card-title">Speedtest</h2>
|
||||||
<button
|
<button
|
||||||
class="reload-btn"
|
class="reload-btn"
|
||||||
@click="runTests"
|
|
||||||
:disabled="isTesting"
|
:disabled="isTesting"
|
||||||
|
@click="runTests"
|
||||||
>
|
>
|
||||||
<IconifyIcon
|
<IconifyIcon
|
||||||
icon="mdi:reload"
|
icon="mdi:reload"
|
||||||
@@ -36,17 +36,23 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<p v-if="errorMessage" class="error-text" role="status" aria-live="polite">
|
||||||
|
{{ errorMessage }}
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import {computed, ref} from "vue"
|
import {computed, ref} from "vue"
|
||||||
import {Icon as IconifyIcon} from "@iconify/vue"
|
import {Icon as IconifyIcon} from "@iconify/vue"
|
||||||
|
import { apiRequest } from "~/composables/useApiAuth"
|
||||||
|
|
||||||
const ping = ref<number | null>(null)
|
const ping = ref<number | null>(null)
|
||||||
const download = ref<number | null>(null)
|
const download = ref<number | null>(null)
|
||||||
const upload = ref<number | null>(null)
|
const upload = ref<number | null>(null)
|
||||||
const isTesting = ref(false)
|
const isTesting = ref(false)
|
||||||
|
const errorMessage = ref("")
|
||||||
|
|
||||||
const metrics = computed(() => [
|
const metrics = computed(() => [
|
||||||
{ label: "Download", icon: "mdi:arrow-down-bold", value: download.value, unit: "Mbps" },
|
{ label: "Download", icon: "mdi:arrow-down-bold", value: download.value, unit: "Mbps" },
|
||||||
@@ -56,7 +62,10 @@ const metrics = computed(() => [
|
|||||||
|
|
||||||
async function testDownload() {
|
async function testDownload() {
|
||||||
const start = performance.now()
|
const start = performance.now()
|
||||||
const res = await fetch('/api/download')
|
const res = await apiRequest('/api/download')
|
||||||
|
if (!res.ok) {
|
||||||
|
throw new Error(`HTTP ${res.status}`)
|
||||||
|
}
|
||||||
const blob = await res.blob()
|
const blob = await res.blob()
|
||||||
const end = performance.now()
|
const end = performance.now()
|
||||||
const size = blob.size
|
const size = blob.size
|
||||||
@@ -68,7 +77,10 @@ async function testUpload() {
|
|||||||
const size = 5 * 1024 * 1024
|
const size = 5 * 1024 * 1024
|
||||||
const data = new Uint8Array(size)
|
const data = new Uint8Array(size)
|
||||||
const start = performance.now()
|
const start = performance.now()
|
||||||
await fetch('/api/upload', { method: 'POST', body: data })
|
const response = await apiRequest('/api/upload', { method: 'POST', body: data })
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`HTTP ${response.status}`)
|
||||||
|
}
|
||||||
const end = performance.now()
|
const end = performance.now()
|
||||||
const seconds = (end - start) / 1000
|
const seconds = (end - start) / 1000
|
||||||
upload.value = Math.round((size * 8) / seconds / 1000000)
|
upload.value = Math.round((size * 8) / seconds / 1000000)
|
||||||
@@ -76,7 +88,10 @@ async function testUpload() {
|
|||||||
|
|
||||||
async function testPing() {
|
async function testPing() {
|
||||||
const start = performance.now()
|
const start = performance.now()
|
||||||
await fetch('/api/ping')
|
const response = await fetch('/api/ping')
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`HTTP ${response.status}`)
|
||||||
|
}
|
||||||
const end = performance.now()
|
const end = performance.now()
|
||||||
ping.value = Math.round(end - start)
|
ping.value = Math.round(end - start)
|
||||||
}
|
}
|
||||||
@@ -86,11 +101,15 @@ async function runTests() {
|
|||||||
download.value = null
|
download.value = null
|
||||||
upload.value = null
|
upload.value = null
|
||||||
ping.value = null
|
ping.value = null
|
||||||
|
errorMessage.value = ""
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await testDownload()
|
await testDownload()
|
||||||
await testUpload()
|
await testUpload()
|
||||||
await testPing()
|
await testPing()
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Erreur speedtest:", error)
|
||||||
|
errorMessage.value = "Erreur lors de l'opération"
|
||||||
} finally {
|
} finally {
|
||||||
isTesting.value = false
|
isTesting.value = false
|
||||||
}
|
}
|
||||||
@@ -189,4 +208,15 @@ async function runTests() {
|
|||||||
letter-spacing: 0.1em;
|
letter-spacing: 0.1em;
|
||||||
color: rgb(var(--m-muted));
|
color: rgb(var(--m-muted));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.error-text {
|
||||||
|
margin-top: 0.75rem;
|
||||||
|
border-radius: 8px;
|
||||||
|
border: 1px solid rgb(var(--m-error) / 0.12);
|
||||||
|
background: rgb(var(--m-error) / 0.06);
|
||||||
|
padding: 0.75rem 0.875rem;
|
||||||
|
font-family: var(--font-mono);
|
||||||
|
font-size: 0.75rem;
|
||||||
|
color: rgb(var(--m-error));
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
@@ -20,8 +20,8 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
v-else
|
|
||||||
v-for="row in rows"
|
v-for="row in rows"
|
||||||
|
v-else
|
||||||
:key="`${row.label}-${row.url}`"
|
:key="`${row.label}-${row.url}`"
|
||||||
class="status-row"
|
class="status-row"
|
||||||
:class="row.status === 200 ? 'row-ok' : 'row-error'"
|
:class="row.status === 200 ? 'row-ok' : 'row-error'"
|
||||||
@@ -43,6 +43,7 @@
|
|||||||
import CircleSkeleton from "~/components/skeleton/CircleSkeleton.vue"
|
import CircleSkeleton from "~/components/skeleton/CircleSkeleton.vue"
|
||||||
import TextSkeleton from "~/components/skeleton/TextSkeleton.vue"
|
import TextSkeleton from "~/components/skeleton/TextSkeleton.vue"
|
||||||
import {onBeforeUnmount, onMounted, ref} from "vue"
|
import {onBeforeUnmount, onMounted, ref} from "vue"
|
||||||
|
import { apiFetch } from "~/composables/useApiAuth"
|
||||||
|
|
||||||
interface StatusRow {
|
interface StatusRow {
|
||||||
label: string
|
label: string
|
||||||
@@ -84,7 +85,7 @@ const checkStatus = async () => {
|
|||||||
loading.value = true
|
loading.value = true
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
const data = await $fetch<StatusResponse>(props.endpoint)
|
const data = await apiFetch<StatusResponse>(props.endpoint)
|
||||||
rows.value = data.results
|
rows.value = data.results
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
rows.value = [
|
rows.value = [
|
||||||
|
|||||||
333
components/SystemMetricsChart.vue
Normal file
333
components/SystemMetricsChart.vue
Normal file
@@ -0,0 +1,333 @@
|
|||||||
|
<template>
|
||||||
|
<section class="chart-card card-glow">
|
||||||
|
<div class="card-header">
|
||||||
|
<div>
|
||||||
|
<h2 class="card-title">Historique systeme</h2>
|
||||||
|
<p class="card-copy">CPU, RAM et debit reseau sur les derniers releves</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="toggle-group" role="radiogroup" aria-label="Metrique affichee">
|
||||||
|
<label
|
||||||
|
v-for="option in options"
|
||||||
|
:key="option.value"
|
||||||
|
class="toggle-pill"
|
||||||
|
:class="{ 'toggle-pill-active': selectedMetric === option.value }"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
v-model="selectedMetric"
|
||||||
|
type="radio"
|
||||||
|
name="system-metric"
|
||||||
|
class="sr-only"
|
||||||
|
:value="option.value"
|
||||||
|
>
|
||||||
|
<span class="toggle-dot" :style="{ backgroundColor: option.color }" />
|
||||||
|
<span>{{ option.label }}</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="chart-shell">
|
||||||
|
<template v-if="loading && points.length === 0">
|
||||||
|
<div class="chart-skeleton animate-shimmer" />
|
||||||
|
</template>
|
||||||
|
<template v-else>
|
||||||
|
<div class="chart-meta">
|
||||||
|
<div>
|
||||||
|
<span class="meta-label">Actuel</span>
|
||||||
|
<strong class="meta-value" :style="{ color: activeOption.color }">{{ formattedCurrentValue }}</strong>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<span class="meta-label">Pic</span>
|
||||||
|
<strong class="meta-value">{{ formattedPeakValue }}</strong>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<span class="meta-label">Echelle</span>
|
||||||
|
<strong class="meta-value">{{ scaleLabel }}</strong>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<svg
|
||||||
|
class="chart-svg"
|
||||||
|
viewBox="0 0 960 320"
|
||||||
|
preserveAspectRatio="none"
|
||||||
|
aria-label="Graphique des ressources"
|
||||||
|
>
|
||||||
|
<line
|
||||||
|
v-for="line in gridLines"
|
||||||
|
:key="line"
|
||||||
|
x1="0"
|
||||||
|
:y1="line"
|
||||||
|
x2="960"
|
||||||
|
:y2="line"
|
||||||
|
class="grid-line"
|
||||||
|
/>
|
||||||
|
<polyline
|
||||||
|
:points="polylinePoints"
|
||||||
|
class="chart-line"
|
||||||
|
:style="{ stroke: activeOption.color }"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</template>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import {computed, ref, watch} from "vue"
|
||||||
|
|
||||||
|
type MetricKey = "cpu" | "ram" | "incoming" | "outgoing"
|
||||||
|
|
||||||
|
type SystemMetrics = {
|
||||||
|
cpuPercent: number
|
||||||
|
memoryPercent: number
|
||||||
|
totalMemory: number
|
||||||
|
usedMemory: number
|
||||||
|
incomingMbps: number
|
||||||
|
outgoingMbps: number
|
||||||
|
sampledAt: string
|
||||||
|
}
|
||||||
|
|
||||||
|
type HistoryPoint = {
|
||||||
|
sampledAt: string
|
||||||
|
cpu: number
|
||||||
|
ram: number
|
||||||
|
incoming: number
|
||||||
|
outgoing: number
|
||||||
|
}
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
metrics: SystemMetrics | null
|
||||||
|
loading: boolean
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const selectedMetric = ref<MetricKey>("ram")
|
||||||
|
const history = ref<HistoryPoint[]>([])
|
||||||
|
const maxPoints = 40
|
||||||
|
|
||||||
|
const options: Array<{value: MetricKey; label: string; color: string}> = [
|
||||||
|
{value: "cpu", label: "CPU", color: "#5aa9ff"},
|
||||||
|
{value: "ram", label: "RAM", color: "#31c48d"},
|
||||||
|
{value: "incoming", label: "Entrant", color: "#f59e0b"},
|
||||||
|
{value: "outgoing", label: "Sortant", color: "#ef4444"}
|
||||||
|
]
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => props.metrics?.sampledAt,
|
||||||
|
() => {
|
||||||
|
if (!props.metrics) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
history.value = [
|
||||||
|
...history.value,
|
||||||
|
{
|
||||||
|
sampledAt: props.metrics.sampledAt,
|
||||||
|
cpu: props.metrics.cpuPercent,
|
||||||
|
ram: props.metrics.memoryPercent,
|
||||||
|
incoming: props.metrics.incomingMbps,
|
||||||
|
outgoing: props.metrics.outgoingMbps
|
||||||
|
}
|
||||||
|
].slice(-maxPoints)
|
||||||
|
},
|
||||||
|
{immediate: true}
|
||||||
|
)
|
||||||
|
|
||||||
|
const activeOption = computed(() => {
|
||||||
|
return options.find((option) => option.value === selectedMetric.value) || options[0]
|
||||||
|
})
|
||||||
|
|
||||||
|
const points = computed(() => history.value.map((point) => point[selectedMetric.value]))
|
||||||
|
|
||||||
|
const peakValue = computed(() => {
|
||||||
|
return points.value.reduce((max, value) => Math.max(max, value), 0)
|
||||||
|
})
|
||||||
|
|
||||||
|
const scaleMax = computed(() => {
|
||||||
|
if (selectedMetric.value === "cpu" || selectedMetric.value === "ram") {
|
||||||
|
return 100
|
||||||
|
}
|
||||||
|
|
||||||
|
return Math.max(1, Math.ceil(peakValue.value))
|
||||||
|
})
|
||||||
|
|
||||||
|
const formatValue = (value: number, metric: MetricKey) => {
|
||||||
|
if (metric === "cpu" || metric === "ram") {
|
||||||
|
return `${Math.round(value)}%`
|
||||||
|
}
|
||||||
|
|
||||||
|
return `${value.toFixed(2)} Mbps`
|
||||||
|
}
|
||||||
|
|
||||||
|
const formattedCurrentValue = computed(() => {
|
||||||
|
const currentValue = points.value.at(-1) ?? 0
|
||||||
|
return formatValue(currentValue, selectedMetric.value)
|
||||||
|
})
|
||||||
|
|
||||||
|
const formattedPeakValue = computed(() => {
|
||||||
|
return formatValue(peakValue.value, selectedMetric.value)
|
||||||
|
})
|
||||||
|
|
||||||
|
const scaleLabel = computed(() => {
|
||||||
|
return formatValue(scaleMax.value, selectedMetric.value)
|
||||||
|
})
|
||||||
|
|
||||||
|
const gridLines = [40, 120, 200, 280]
|
||||||
|
|
||||||
|
const polylinePoints = computed(() => {
|
||||||
|
if (points.value.length === 0) {
|
||||||
|
return "0,280"
|
||||||
|
}
|
||||||
|
|
||||||
|
if (points.value.length === 1) {
|
||||||
|
const normalizedValue = points.value[0] / scaleMax.value
|
||||||
|
const y = 280 - normalizedValue * 240
|
||||||
|
return `0,${y} 960,${y}`
|
||||||
|
}
|
||||||
|
|
||||||
|
return points.value
|
||||||
|
.map((value, index) => {
|
||||||
|
const x = (index / (points.value.length - 1)) * 960
|
||||||
|
const normalizedValue = scaleMax.value > 0 ? value / scaleMax.value : 0
|
||||||
|
const y = 280 - normalizedValue * 240
|
||||||
|
|
||||||
|
return `${x},${Math.max(24, Math.min(280, y))}`
|
||||||
|
})
|
||||||
|
.join(" ")
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.chart-card {
|
||||||
|
margin-top: 1.5rem;
|
||||||
|
background: rgb(var(--m-secondary));
|
||||||
|
border-radius: 12px;
|
||||||
|
padding: 1.25rem;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card-header {
|
||||||
|
display: flex;
|
||||||
|
align-items: flex-start;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 1rem;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card-title {
|
||||||
|
font-family: var(--font-display);
|
||||||
|
font-size: 1.25rem;
|
||||||
|
font-weight: 700;
|
||||||
|
color: rgb(var(--m-text));
|
||||||
|
}
|
||||||
|
|
||||||
|
.card-copy {
|
||||||
|
margin-top: 0.25rem;
|
||||||
|
font-family: var(--font-mono);
|
||||||
|
font-size: 0.75rem;
|
||||||
|
color: rgb(var(--m-muted));
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.12em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.toggle-group {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.625rem;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.toggle-pill {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.5rem;
|
||||||
|
border-radius: 999px;
|
||||||
|
border: 1px solid rgb(var(--m-accent) / 0.1);
|
||||||
|
background: rgb(var(--m-tertiary));
|
||||||
|
padding: 0.55rem 0.8rem;
|
||||||
|
font-family: var(--font-mono);
|
||||||
|
font-size: 0.72rem;
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.12em;
|
||||||
|
color: rgb(var(--m-muted));
|
||||||
|
cursor: pointer;
|
||||||
|
transition: border-color 0.2s ease, color 0.2s ease, transform 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.toggle-pill-active {
|
||||||
|
border-color: rgb(var(--m-accent) / 0.28);
|
||||||
|
color: rgb(var(--m-text));
|
||||||
|
transform: translateY(-1px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.toggle-dot {
|
||||||
|
width: 10px;
|
||||||
|
height: 10px;
|
||||||
|
border-radius: 999px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chart-shell {
|
||||||
|
border-radius: 12px;
|
||||||
|
padding: 1rem;
|
||||||
|
background:
|
||||||
|
linear-gradient(180deg, rgb(var(--m-tertiary)) 0%, rgb(var(--m-secondary)) 100%);
|
||||||
|
border: 1px solid rgb(var(--m-accent) / 0.08);
|
||||||
|
}
|
||||||
|
|
||||||
|
.chart-meta {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(3, minmax(0, 1fr));
|
||||||
|
gap: 0.75rem;
|
||||||
|
margin-bottom: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.meta-label {
|
||||||
|
display: block;
|
||||||
|
margin-bottom: 0.25rem;
|
||||||
|
font-family: var(--font-mono);
|
||||||
|
font-size: 0.68rem;
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.14em;
|
||||||
|
color: rgb(var(--m-muted));
|
||||||
|
}
|
||||||
|
|
||||||
|
.meta-value {
|
||||||
|
font-family: var(--font-display);
|
||||||
|
font-size: 1.1rem;
|
||||||
|
font-weight: 700;
|
||||||
|
color: rgb(var(--m-text));
|
||||||
|
}
|
||||||
|
|
||||||
|
.chart-svg {
|
||||||
|
width: 100%;
|
||||||
|
height: 320px;
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.grid-line {
|
||||||
|
stroke: rgb(var(--m-border) / 0.35);
|
||||||
|
stroke-width: 1;
|
||||||
|
stroke-dasharray: 6 10;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chart-line {
|
||||||
|
fill: none;
|
||||||
|
stroke-width: 4;
|
||||||
|
stroke-linecap: round;
|
||||||
|
stroke-linejoin: round;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chart-skeleton {
|
||||||
|
width: 100%;
|
||||||
|
height: 320px;
|
||||||
|
border-radius: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 820px) {
|
||||||
|
.chart-meta {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
199
components/SystemResources.vue
Normal file
199
components/SystemResources.vue
Normal file
@@ -0,0 +1,199 @@
|
|||||||
|
<template>
|
||||||
|
<div class="resources-card card-glow">
|
||||||
|
<div class="card-header">
|
||||||
|
<h2 class="card-title">Ressources</h2>
|
||||||
|
<span class="font-mono text-[10px] uppercase tracking-widest text-m-muted">CPU / RAM</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="metrics-list">
|
||||||
|
<div
|
||||||
|
v-for="metric in metrics"
|
||||||
|
:key="metric.label"
|
||||||
|
class="metric-row"
|
||||||
|
>
|
||||||
|
<div class="metric-copy">
|
||||||
|
<div class="metric-head">
|
||||||
|
<span class="font-display text-sm font-semibold text-m-text">{{ metric.label }}</span>
|
||||||
|
<span class="font-mono text-xs text-m-muted">{{ metric.detail }}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<template v-if="isLoading">
|
||||||
|
<div class="metric-skeleton animate-shimmer" />
|
||||||
|
</template>
|
||||||
|
<template v-else>
|
||||||
|
<div class="metric-bar">
|
||||||
|
<div
|
||||||
|
class="metric-bar-fill"
|
||||||
|
:class="metric.toneClass"
|
||||||
|
:style="{ width: `${metric.percent}%` }"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="metric-value-area">
|
||||||
|
<template v-if="isLoading">
|
||||||
|
<div class="value-skeleton animate-shimmer" />
|
||||||
|
</template>
|
||||||
|
<template v-else>
|
||||||
|
<span class="metric-value font-mono">{{ metric.percent }}%</span>
|
||||||
|
</template>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import {computed} from "vue"
|
||||||
|
|
||||||
|
type SystemMetrics = {
|
||||||
|
cpuPercent: number
|
||||||
|
memoryPercent: number
|
||||||
|
totalMemory: number
|
||||||
|
usedMemory: number
|
||||||
|
incomingMbps: number
|
||||||
|
outgoingMbps: number
|
||||||
|
sampledAt: string
|
||||||
|
}
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
metrics: SystemMetrics | null
|
||||||
|
loading: boolean
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const formatMemory = (value: number) => {
|
||||||
|
if (!Number.isFinite(value) || value <= 0) {
|
||||||
|
return "0 GB"
|
||||||
|
}
|
||||||
|
|
||||||
|
return `${(value / 1024 / 1024 / 1024).toFixed(1)} GB`
|
||||||
|
}
|
||||||
|
|
||||||
|
const toneClass = (percent: number) => {
|
||||||
|
if (percent >= 85) return "tone-error"
|
||||||
|
if (percent >= 65) return "tone-warning"
|
||||||
|
return "tone-success"
|
||||||
|
}
|
||||||
|
|
||||||
|
const isLoading = computed(() => props.loading || !props.metrics)
|
||||||
|
|
||||||
|
const metrics = computed(() => [
|
||||||
|
{
|
||||||
|
label: "CPU",
|
||||||
|
percent: props.metrics?.cpuPercent ?? 0,
|
||||||
|
detail: "Charge instantanee",
|
||||||
|
toneClass: toneClass(props.metrics?.cpuPercent ?? 0)
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "RAM",
|
||||||
|
percent: props.metrics?.memoryPercent ?? 0,
|
||||||
|
detail: `${formatMemory(props.metrics?.usedMemory ?? 0)} / ${formatMemory(props.metrics?.totalMemory ?? 0)}`,
|
||||||
|
toneClass: toneClass(props.metrics?.memoryPercent ?? 0)
|
||||||
|
}
|
||||||
|
])
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.resources-card {
|
||||||
|
background: rgb(var(--m-secondary));
|
||||||
|
border-radius: 12px;
|
||||||
|
padding: 1.25rem;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 1rem;
|
||||||
|
transition: background-color 0.4s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card-header {
|
||||||
|
display: flex;
|
||||||
|
align-items: baseline;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 0.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card-title {
|
||||||
|
font-family: var(--font-display);
|
||||||
|
font-size: 1.25rem;
|
||||||
|
font-weight: 700;
|
||||||
|
color: rgb(var(--m-text));
|
||||||
|
}
|
||||||
|
|
||||||
|
.metrics-list {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0.875rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.metric-row {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: minmax(0, 1fr) auto;
|
||||||
|
gap: 0.75rem;
|
||||||
|
align-items: center;
|
||||||
|
padding: 0.875rem 1rem;
|
||||||
|
border-radius: 10px;
|
||||||
|
background: rgb(var(--m-tertiary));
|
||||||
|
border: 1px solid rgb(var(--m-accent) / 0.06);
|
||||||
|
}
|
||||||
|
|
||||||
|
.metric-copy {
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.metric-head {
|
||||||
|
display: flex;
|
||||||
|
align-items: baseline;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 0.75rem;
|
||||||
|
margin-bottom: 0.625rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.metric-bar {
|
||||||
|
height: 10px;
|
||||||
|
border-radius: 999px;
|
||||||
|
overflow: hidden;
|
||||||
|
background: rgb(var(--m-bg) / 0.45);
|
||||||
|
}
|
||||||
|
|
||||||
|
.metric-bar-fill {
|
||||||
|
height: 100%;
|
||||||
|
border-radius: inherit;
|
||||||
|
transition: width 0.35s ease, background-color 0.35s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.metric-value-area {
|
||||||
|
min-width: 54px;
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
}
|
||||||
|
|
||||||
|
.metric-value {
|
||||||
|
font-size: 1.25rem;
|
||||||
|
font-weight: 700;
|
||||||
|
color: rgb(var(--m-text));
|
||||||
|
}
|
||||||
|
|
||||||
|
.metric-skeleton {
|
||||||
|
height: 10px;
|
||||||
|
width: 100%;
|
||||||
|
border-radius: 999px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.value-skeleton {
|
||||||
|
width: 48px;
|
||||||
|
height: 28px;
|
||||||
|
border-radius: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tone-success {
|
||||||
|
background: rgb(var(--m-success));
|
||||||
|
}
|
||||||
|
|
||||||
|
.tone-warning {
|
||||||
|
background: rgb(var(--m-warning));
|
||||||
|
}
|
||||||
|
|
||||||
|
.tone-error {
|
||||||
|
background: rgb(var(--m-error));
|
||||||
|
}
|
||||||
|
</style>
|
||||||
90
composables/useApiAuth.ts
Normal file
90
composables/useApiAuth.ts
Normal file
@@ -0,0 +1,90 @@
|
|||||||
|
function toHeadersObject(headers?: HeadersInit): Record<string, string> {
|
||||||
|
if (!headers) {
|
||||||
|
return {}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (headers instanceof Headers) {
|
||||||
|
return Object.fromEntries(headers.entries())
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Array.isArray(headers)) {
|
||||||
|
return Object.fromEntries(headers)
|
||||||
|
}
|
||||||
|
|
||||||
|
return { ...headers }
|
||||||
|
}
|
||||||
|
|
||||||
|
function getDownloadFileName(contentDisposition: string | null, fallback: string) {
|
||||||
|
if (!contentDisposition) {
|
||||||
|
return fallback
|
||||||
|
}
|
||||||
|
|
||||||
|
const utf8Match = contentDisposition.match(/filename\*=UTF-8''([^;]+)/i)
|
||||||
|
if (utf8Match?.[1]) {
|
||||||
|
return decodeURIComponent(utf8Match[1])
|
||||||
|
}
|
||||||
|
|
||||||
|
const asciiMatch = contentDisposition.match(/filename="([^"]+)"/i)
|
||||||
|
if (asciiMatch?.[1]) {
|
||||||
|
return asciiMatch[1]
|
||||||
|
}
|
||||||
|
|
||||||
|
return fallback
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useApiAuthHeader() {
|
||||||
|
const runtimeConfig = useRuntimeConfig()
|
||||||
|
const token = runtimeConfig.public.apiSecretKey
|
||||||
|
|
||||||
|
if (!token) {
|
||||||
|
return {}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Tous les appels frontend vers /api/* reutilisent ce header commun.
|
||||||
|
return {
|
||||||
|
Authorization: `Bearer ${token}`
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const apiFetch = $fetch.create({})
|
||||||
|
|
||||||
|
export function apiRequest(input: RequestInfo | URL, init: RequestInit = {}) {
|
||||||
|
return fetch(input, withApiAuth(init))
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function downloadApiFile(url: string, fileNameFallback: string) {
|
||||||
|
// Les telechargements passent aussi par fetch pour pouvoir recuperer
|
||||||
|
// le contenu et le nom de fichier renvoye par l'API.
|
||||||
|
const response = await apiRequest(url)
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`HTTP ${response.status}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
const blob = await response.blob()
|
||||||
|
const objectUrl = URL.createObjectURL(blob)
|
||||||
|
const fileName = getDownloadFileName(
|
||||||
|
response.headers.get("content-disposition"),
|
||||||
|
fileNameFallback
|
||||||
|
)
|
||||||
|
const link = document.createElement("a")
|
||||||
|
|
||||||
|
link.href = objectUrl
|
||||||
|
link.download = fileName
|
||||||
|
link.style.display = "none"
|
||||||
|
document.body.appendChild(link)
|
||||||
|
link.click()
|
||||||
|
link.remove()
|
||||||
|
URL.revokeObjectURL(objectUrl)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function withApiAuth(init: RequestInit = {}) {
|
||||||
|
// Fusionne le header d'auth avec d'eventuels headers deja fournis.
|
||||||
|
return {
|
||||||
|
...init,
|
||||||
|
headers: {
|
||||||
|
...useApiAuthHeader(),
|
||||||
|
...toHeadersObject(init.headers)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
3
eslint.config.mjs
Normal file
3
eslint.config.mjs
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
import createConfigForNuxt from "@nuxt/eslint-config"
|
||||||
|
|
||||||
|
export default createConfigForNuxt()
|
||||||
@@ -7,7 +7,7 @@
|
|||||||
:src="logoSrc"
|
:src="logoSrc"
|
||||||
alt="Logo Malio"
|
alt="Logo Malio"
|
||||||
class="logo"
|
class="logo"
|
||||||
/>
|
>
|
||||||
</div>
|
</div>
|
||||||
<div class="brand-copy">
|
<div class="brand-copy">
|
||||||
<p class="brand-title">Supervisor</p>
|
<p class="brand-title">Supervisor</p>
|
||||||
@@ -67,7 +67,7 @@
|
|||||||
:src="logoSrc"
|
:src="logoSrc"
|
||||||
alt="Logo Malio"
|
alt="Logo Malio"
|
||||||
class="logo"
|
class="logo"
|
||||||
/>
|
>
|
||||||
</div>
|
</div>
|
||||||
<div class="brand-copy">
|
<div class="brand-copy">
|
||||||
<p class="brand-kicker">Control Center</p>
|
<p class="brand-kicker">Control Center</p>
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ export default defineNuxtConfig({
|
|||||||
head: {
|
head: {
|
||||||
link: [
|
link: [
|
||||||
{ rel: "preconnect", href: "https://fonts.googleapis.com" },
|
{ rel: "preconnect", href: "https://fonts.googleapis.com" },
|
||||||
{ rel: "preconnect", href: "https://fonts.gstatic.com", crossorigin: "" },
|
{ rel: "preconnect", href: "https://fonts.gstatic.com ", crossorigin: "" },
|
||||||
{
|
{
|
||||||
rel: "stylesheet",
|
rel: "stylesheet",
|
||||||
href: "https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@400;500;600;700&family=Outfit:wght@300;400;500;600;700;800;900&display=swap"
|
href: "https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@400;500;600;700&family=Outfit:wght@300;400;500;600;700;800;900&display=swap"
|
||||||
@@ -35,6 +35,7 @@ export default defineNuxtConfig({
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
runtimeConfig: {
|
runtimeConfig: {
|
||||||
|
apiSecretKey: process.env.API_SECRET_KEY,
|
||||||
public: {
|
public: {
|
||||||
appVersion: getRepoVersion()
|
appVersion: getRepoVersion()
|
||||||
}
|
}
|
||||||
|
|||||||
3138
package-lock.json
generated
3138
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
10
package.json
10
package.json
@@ -7,14 +7,14 @@
|
|||||||
"dev": "nuxt dev",
|
"dev": "nuxt dev",
|
||||||
"generate": "nuxt generate",
|
"generate": "nuxt generate",
|
||||||
"preview": "nuxt preview",
|
"preview": "nuxt preview",
|
||||||
"postinstall": "nuxt prepare"
|
"postinstall": "nuxt prepare",
|
||||||
|
"lint": "eslint .",
|
||||||
|
"lint:fix": "eslint . --fix"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@iconify/vue": "^5.0.0",
|
"@iconify/vue": "^5.0.0",
|
||||||
"iconify": "^1.4.0",
|
"@nuxt/eslint": "^1.15.2",
|
||||||
"nuxt": "^4.3.1",
|
"nuxt": "^4.3.1"
|
||||||
"vue": "^3.5.29",
|
|
||||||
"vue-router": "^4.6.4"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@semantic-release/changelog": "^6.0.3",
|
"@semantic-release/changelog": "^6.0.3",
|
||||||
|
|||||||
@@ -96,6 +96,7 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref } from "vue"
|
import { ref } from "vue"
|
||||||
import BackupRun from "~/components/BackupRun.vue"
|
import BackupRun from "~/components/BackupRun.vue"
|
||||||
|
import { apiFetch, downloadApiFile } from "~/composables/useApiAuth"
|
||||||
|
|
||||||
definePageMeta({ layout: false })
|
definePageMeta({ layout: false })
|
||||||
|
|
||||||
@@ -119,24 +120,25 @@ const selectedBackup = ref<string | null>(null)
|
|||||||
const scriptResult = ref<ScriptResult>(emptyScriptResult())
|
const scriptResult = ref<ScriptResult>(emptyScriptResult())
|
||||||
|
|
||||||
const fetchLatestBackup = async (folder: string) => {
|
const fetchLatestBackup = async (folder: string) => {
|
||||||
const files = await $fetch<string[]>(`/api/backups?folder=${encodeURIComponent(folder)}`)
|
const files = await apiFetch<string[]>(`/api/backups?folder=${encodeURIComponent(folder)}`)
|
||||||
return files[0] || null
|
return files[0] || null
|
||||||
}
|
}
|
||||||
|
|
||||||
const triggerDownload = (folder: string, file: string) => {
|
const triggerDownload = async (folder: string, file: string) => {
|
||||||
const link = document.createElement("a")
|
const url = `/api/download?folder=${encodeURIComponent(folder)}&file=${encodeURIComponent(file)}`
|
||||||
link.href = `/api/download?folder=${encodeURIComponent(folder)}&file=${encodeURIComponent(file)}`
|
await downloadApiFile(url, file)
|
||||||
link.style.display = "none"
|
}
|
||||||
document.body.appendChild(link)
|
|
||||||
link.click()
|
const triggerBatchDownload = async (folders: string[]) => {
|
||||||
link.remove()
|
const url = `/api/download-latest?folders=${encodeURIComponent(folders.join(","))}`
|
||||||
|
await downloadApiFile(url, "backup-latest.tar.gz")
|
||||||
}
|
}
|
||||||
|
|
||||||
const downloadLatestBackup = async (folder: string) => {
|
const downloadLatestBackup = async (folder: string) => {
|
||||||
const latestFile = await fetchLatestBackup(folder)
|
const latestFile = await fetchLatestBackup(folder)
|
||||||
|
|
||||||
if (latestFile) {
|
if (latestFile) {
|
||||||
triggerDownload(folder, latestFile)
|
await triggerDownload(folder, latestFile)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -147,6 +149,11 @@ const handleScriptResult = async (payload: ScriptResult) => {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (payload.downloadFolders.length > 1) {
|
||||||
|
await triggerBatchDownload(payload.downloadFolders)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
for (const folder of payload.downloadFolders) {
|
for (const folder of payload.downloadFolders) {
|
||||||
try {
|
try {
|
||||||
await downloadLatestBackup(folder)
|
await downloadLatestBackup(folder)
|
||||||
|
|||||||
@@ -33,9 +33,24 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="grid-middle">
|
<div class="grid-middle">
|
||||||
<Speedtest class="animate-fade-in-up speedtest-card-mobile" style="animation-delay: 150ms" />
|
<SpeedTest class="animate-fade-in-up speedtest-card-mobile" style="animation-delay: 150ms" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="metrics-row">
|
||||||
|
<SystemMetricsChart
|
||||||
|
:metrics="systemMetrics"
|
||||||
|
:loading="systemLoading"
|
||||||
|
class="animate-fade-in-up"
|
||||||
|
style="animation-delay: 200ms"
|
||||||
|
/>
|
||||||
|
<SystemResources
|
||||||
|
:metrics="systemMetrics"
|
||||||
|
:loading="systemLoading"
|
||||||
|
class="animate-fade-in-up"
|
||||||
|
style="animation-delay: 225ms"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="content-aside">
|
<div class="content-aside">
|
||||||
@@ -47,8 +62,9 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
definePageMeta({layout: false})
|
|
||||||
import {computed, onMounted, ref} from "vue"
|
import {computed, onMounted, ref} from "vue"
|
||||||
|
definePageMeta({layout: false})
|
||||||
|
import { apiFetch } from "~/composables/useApiAuth"
|
||||||
|
|
||||||
type DiskSourceResult = {
|
type DiskSourceResult = {
|
||||||
key: string
|
key: string
|
||||||
@@ -74,11 +90,23 @@ type DiagramItem = {
|
|||||||
totalText: string
|
totalText: string
|
||||||
}
|
}
|
||||||
|
|
||||||
const selectedBackup = ref<string | null>(null)
|
type SystemMetrics = {
|
||||||
|
cpuPercent: number
|
||||||
|
memoryPercent: number
|
||||||
|
totalMemory: number
|
||||||
|
usedMemory: number
|
||||||
|
incomingMbps: number
|
||||||
|
outgoingMbps: number
|
||||||
|
sampledAt: string
|
||||||
|
}
|
||||||
|
|
||||||
const rawResults = ref<DiskSourceResult[]>([])
|
const rawResults = ref<DiskSourceResult[]>([])
|
||||||
const loading = ref(false)
|
const loading = ref(false)
|
||||||
|
const systemMetrics = ref<SystemMetrics | null>(null)
|
||||||
|
const systemLoading = ref(true)
|
||||||
const chartRadius = 52
|
const chartRadius = 52
|
||||||
const chartCircumference = 2 * Math.PI * chartRadius
|
const chartCircumference = 2 * Math.PI * chartRadius
|
||||||
|
let systemTimer: ReturnType<typeof setInterval> | null = null
|
||||||
|
|
||||||
const getHostName = (output: string, fallback: string) => {
|
const getHostName = (output: string, fallback: string) => {
|
||||||
const hostMatch = output.match(/Name:\s*(.+)/i)
|
const hostMatch = output.match(/Name:\s*(.+)/i)
|
||||||
@@ -151,16 +179,15 @@ const runScript = async () => {
|
|||||||
rawResults.value = []
|
rawResults.value = []
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const output = await $fetch<DiskApiResponse>("/api/disk")
|
const output = await apiFetch<DiskApiResponse>("/api/disk")
|
||||||
rawResults.value = output.results
|
rawResults.value = output.results
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
const message = `Erreur: ${error instanceof Error ? error.message : String(error)}`
|
|
||||||
rawResults.value = [
|
rawResults.value = [
|
||||||
{
|
{
|
||||||
key: "error",
|
key: "error",
|
||||||
label: "Source indisponible",
|
label: "Source indisponible",
|
||||||
ok: false,
|
ok: false,
|
||||||
output: message
|
output: "Erreur lors de l'opération"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
} finally {
|
} finally {
|
||||||
@@ -168,8 +195,27 @@ const runScript = async () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const loadSystemMetrics = async () => {
|
||||||
|
try {
|
||||||
|
systemMetrics.value = await $fetch<SystemMetrics>("/api/system")
|
||||||
|
} catch {
|
||||||
|
systemMetrics.value = null
|
||||||
|
} finally {
|
||||||
|
systemLoading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
runScript()
|
runScript()
|
||||||
|
loadSystemMetrics()
|
||||||
|
systemTimer = setInterval(loadSystemMetrics, 2000)
|
||||||
|
})
|
||||||
|
|
||||||
|
onBeforeUnmount(() => {
|
||||||
|
if (systemTimer) {
|
||||||
|
clearInterval(systemTimer)
|
||||||
|
systemTimer = null
|
||||||
|
}
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -229,6 +275,14 @@ onMounted(() => {
|
|||||||
align-items: start;
|
align-items: start;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.metrics-row {
|
||||||
|
margin-top: 1.5rem;
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: minmax(0, 1fr) 280px;
|
||||||
|
gap: 1.5rem;
|
||||||
|
align-items: start;
|
||||||
|
}
|
||||||
|
|
||||||
.grid-left,
|
.grid-left,
|
||||||
.grid-middle,
|
.grid-middle,
|
||||||
.grid-right {
|
.grid-right {
|
||||||
@@ -260,7 +314,8 @@ onMounted(() => {
|
|||||||
|
|
||||||
.storage-grid,
|
.storage-grid,
|
||||||
.content-grid,
|
.content-grid,
|
||||||
.dashboard-grid {
|
.dashboard-grid,
|
||||||
|
.metrics-row {
|
||||||
grid-template-columns: 1fr;
|
grid-template-columns: 1fr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { exec } from "node:child_process"
|
import { execFile } from "node:child_process"
|
||||||
import scripts from "../config/backup-script.json"
|
import scripts from "../config/backup-script.json"
|
||||||
|
|
||||||
type BackupScript = {
|
type BackupScript = {
|
||||||
@@ -6,11 +6,12 @@ type BackupScript = {
|
|||||||
label: string
|
label: string
|
||||||
downloadFolders?: string[]
|
downloadFolders?: string[]
|
||||||
command: string
|
command: string
|
||||||
|
args?: string[]
|
||||||
}
|
}
|
||||||
|
|
||||||
function runCommand(command: string): Promise<string> {
|
function runCommand(command: string, args: string[] = []): Promise<string> {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
exec(command, { timeout: 10 * 60 * 1000 }, (error, stdout, stderr) => {
|
execFile(command, args, { timeout: 10 * 60 * 1000 }, (error, stdout, stderr) => {
|
||||||
if (error) {
|
if (error) {
|
||||||
reject(stderr || error.message)
|
reject(stderr || error.message)
|
||||||
return
|
return
|
||||||
@@ -40,7 +41,7 @@ export default defineEventHandler(async (event) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const output = await runCommand(script.command)
|
const output = await runCommand(script.command, script.args || [])
|
||||||
return {
|
return {
|
||||||
ok: true,
|
ok: true,
|
||||||
key: script.key,
|
key: script.key,
|
||||||
@@ -49,9 +50,11 @@ export default defineEventHandler(async (event) => {
|
|||||||
output: output.trim()
|
output: output.trim()
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.error("Erreur execution script:", error)
|
||||||
|
|
||||||
throw createError({
|
throw createError({
|
||||||
statusCode: 500,
|
statusCode: 500,
|
||||||
statusMessage: `Erreur execution script: ${String(error)}`
|
statusMessage: "Erreur lors de l'opération"
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
import { execFile } from "node:child_process"
|
import { execFile } from "node:child_process"
|
||||||
import folderMap from "../config/backup-folders.json"
|
import folderMap from "../config/backup-folders.json"
|
||||||
|
|
||||||
const REMOTE_HOST = process.env.BACKUPS_REMOTE_HOST || "malio-b@192.168.0.179"
|
const REMOTE_HOST = process.env.BACKUPS_REMOTE_HOST
|
||||||
const REMOTE_ROOT = process.env.BACKUPS_REMOTE_ROOT || "/home/malio-b/backups"
|
const REMOTE_ROOT = process.env.BACKUPS_REMOTE_ROOT
|
||||||
const MAX_FILES_PER_FOLDER = Number(process.env.BACKUPS_MAX_FILES || "200")
|
const MAX_FILES_PER_FOLDER = Number(process.env.BACKUPS_MAX_FILES)
|
||||||
const isSafeFolder = (value: string) => /^[a-zA-Z0-9._-]+$/.test(value)
|
const isSafeFolder = (value: string) => /^[a-zA-Z0-9._-]+$/.test(value)
|
||||||
const shellQuote = (value: string) => `'${value.replace(/'/g, `'\\''`)}'`
|
const shellQuote = (value: string) => `'${value.replace(/'/g, `'\\''`)}'`
|
||||||
const FOLDER_MAP = folderMap as Record<string, string>
|
const FOLDER_MAP = folderMap as Record<string, string>
|
||||||
@@ -31,9 +31,11 @@ function isMissingPathError(error: unknown): boolean {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function toServerError(error: unknown) {
|
function toServerError(error: unknown) {
|
||||||
|
console.error("Erreur backups:", error)
|
||||||
|
|
||||||
return createError({
|
return createError({
|
||||||
statusCode: 500,
|
statusCode: 500,
|
||||||
statusMessage: `Erreur SSH backups: ${String(error)}`
|
statusMessage: "Erreur lors de l'opération"
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,15 +1,31 @@
|
|||||||
export default defineEventHandler(async () => {
|
export default defineEventHandler(async () => {
|
||||||
const token = process.env.DISCORD_BOT_TOKEN
|
const token = process.env.DISCORD_BOT_TOKEN
|
||||||
const channel = process.env.DISCORD_CHANNEL_ID
|
const channel = process.env.DISCORD_CHANNEL_ID
|
||||||
|
|
||||||
|
if (!token || !channel) {
|
||||||
|
throw createError({
|
||||||
|
statusCode: 503,
|
||||||
|
statusMessage: "Service indisponible"
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
const messages = await $fetch(
|
const messages = await $fetch(
|
||||||
`https://discord.com/api/v10/channels/${channel}/messages?limit=20`,
|
`https://discord.com/api/v10/channels/${channel}/messages?limit=20`,
|
||||||
{
|
{
|
||||||
headers: {
|
headers: {
|
||||||
Authorization: `Bot ${token}`
|
Authorization: `Bot ${token}`
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
return messages
|
return messages
|
||||||
})
|
} catch (error) {
|
||||||
|
console.error("Erreur Discord messages:", error)
|
||||||
|
|
||||||
|
throw createError({
|
||||||
|
statusCode: 500,
|
||||||
|
statusMessage: "Erreur lors de l'opération"
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|||||||
@@ -1,21 +1,34 @@
|
|||||||
import { exec } from "child_process"
|
import { exec, execFile } from "child_process"
|
||||||
import diskSources from "../config/disk-commands.json"
|
import diskSources from "../config/disk-commands.json"
|
||||||
|
|
||||||
type DiskSource = {
|
type DiskSource = {
|
||||||
key: string
|
key: string
|
||||||
label: string
|
label: string
|
||||||
command: string
|
command: string
|
||||||
|
args?: string[]
|
||||||
}
|
}
|
||||||
|
|
||||||
function getCommand(source: DiskSource) {
|
function getEnvCommand(source: DiskSource) {
|
||||||
const envKey = `DISK_COMMAND_${source.key.toUpperCase()}`
|
const envKey = `DISK_COMMAND_${source.key.toUpperCase()}`
|
||||||
const legacyEnvKey =
|
const legacyEnvKey =
|
||||||
source.key === "remote" ? "DISK_REMOTE_COMMAND" : source.key === "local" ? "DISK_LOCAL_COMMAND" : ""
|
source.key === "remote" ? "DISK_REMOTE_COMMAND" : source.key === "local" ? "DISK_LOCAL_COMMAND" : ""
|
||||||
|
|
||||||
return process.env[envKey] || (legacyEnvKey ? process.env[legacyEnvKey] : undefined) || source.command
|
return process.env[envKey] || (legacyEnvKey ? process.env[legacyEnvKey] : undefined) || null
|
||||||
}
|
}
|
||||||
|
|
||||||
function runCommand(command: string): Promise<string> {
|
function runCommand(command: string, args: string[] = []): Promise<string> {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
execFile(command, args, (error, stdout, stderr) => {
|
||||||
|
if (error) {
|
||||||
|
reject(stderr || error.message)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
resolve(stdout)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function runShellCommand(command: string): Promise<string> {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
exec(command, (error, stdout, stderr) => {
|
exec(command, (error, stdout, stderr) => {
|
||||||
if (error) {
|
if (error) {
|
||||||
@@ -31,7 +44,10 @@ export default defineEventHandler(async () => {
|
|||||||
const results = await Promise.all(
|
const results = await Promise.all(
|
||||||
(diskSources as DiskSource[]).map(async (source) => {
|
(diskSources as DiskSource[]).map(async (source) => {
|
||||||
try {
|
try {
|
||||||
const output = await runCommand(getCommand(source))
|
const envCommand = getEnvCommand(source)
|
||||||
|
const output = envCommand
|
||||||
|
? await runShellCommand(envCommand)
|
||||||
|
: await runCommand(source.command, source.args || [])
|
||||||
return {
|
return {
|
||||||
key: source.key,
|
key: source.key,
|
||||||
label: source.label,
|
label: source.label,
|
||||||
@@ -39,11 +55,12 @@ export default defineEventHandler(async () => {
|
|||||||
output
|
output
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.error(`Erreur disk source ${source.key}:`, error)
|
||||||
return {
|
return {
|
||||||
key: source.key,
|
key: source.key,
|
||||||
label: source.label,
|
label: source.label,
|
||||||
ok: false,
|
ok: false,
|
||||||
output: `Erreur: ${String(error)}`
|
output: "Erreur lors de l'opération"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
139
server/api/download-latest.get.ts
Normal file
139
server/api/download-latest.get.ts
Normal file
@@ -0,0 +1,139 @@
|
|||||||
|
import { execFile, spawn } from "node:child_process"
|
||||||
|
import folderMap from "../config/backup-folders.json"
|
||||||
|
|
||||||
|
const REMOTE_HOST = process.env.BACKUPS_REMOTE_HOST || "malio-b"
|
||||||
|
const REMOTE_ROOT = process.env.BACKUPS_REMOTE_ROOT || "/home/malio-b/backups"
|
||||||
|
const FOLDER_MAP = folderMap as Record<string, string>
|
||||||
|
|
||||||
|
const isSafeFolder = (value: string) => /^[a-zA-Z0-9._-]+$/.test(value)
|
||||||
|
const shellQuote = (value: string) => `'${value.replace(/'/g, `'\\''`)}'`
|
||||||
|
|
||||||
|
function runSsh(command: string): Promise<string> {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
execFile(
|
||||||
|
"ssh",
|
||||||
|
["-o", "BatchMode=yes", "-o", "ConnectTimeout=5", REMOTE_HOST, command],
|
||||||
|
{ maxBuffer: 10 * 1024 * 1024 },
|
||||||
|
(error, stdout, stderr) => {
|
||||||
|
if (error) {
|
||||||
|
reject(stderr || error.message)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
resolve(stdout)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
async function remoteDirExists(remoteDir: string): Promise<boolean> {
|
||||||
|
const output = await runSsh(`[ -d ${shellQuote(remoteDir)} ] && echo yes || echo no`)
|
||||||
|
return output.trim() === "yes"
|
||||||
|
}
|
||||||
|
|
||||||
|
async function resolveFolderRemoteDir(folderName: string): Promise<string | null> {
|
||||||
|
const mapped = FOLDER_MAP[folderName]
|
||||||
|
if (mapped) {
|
||||||
|
return `${REMOTE_ROOT}/${mapped}`
|
||||||
|
}
|
||||||
|
|
||||||
|
const direct = `${REMOTE_ROOT}/${folderName}`
|
||||||
|
if (await remoteDirExists(direct)) {
|
||||||
|
return direct
|
||||||
|
}
|
||||||
|
|
||||||
|
const nested = `${REMOTE_ROOT}/bdd_recette/${folderName}`
|
||||||
|
if (await remoteDirExists(nested)) {
|
||||||
|
return nested
|
||||||
|
}
|
||||||
|
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getLatestRemoteFile(remoteDir: string): Promise<string | null> {
|
||||||
|
const output = await runSsh(`cd ${shellQuote(remoteDir)} && ls -1A | sort -r | head -n 1`)
|
||||||
|
const fileName = output.trim()
|
||||||
|
return fileName || null
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildContentDisposition(fileName: string) {
|
||||||
|
const asciiName = fileName.replace(/[^\x20-\x7E]/g, "_").replace(/["\\]/g, "_")
|
||||||
|
return `attachment; filename="${asciiName}"; filename*=UTF-8''${encodeURIComponent(fileName)}`
|
||||||
|
}
|
||||||
|
|
||||||
|
export default defineEventHandler(async (event) => {
|
||||||
|
const { folders } = getQuery(event)
|
||||||
|
const folderParam = typeof folders === "string" ? folders : ""
|
||||||
|
const folderNames = folderParam
|
||||||
|
.split(",")
|
||||||
|
.map((folder) => folder.trim())
|
||||||
|
.filter(Boolean)
|
||||||
|
|
||||||
|
if (folderNames.length === 0) {
|
||||||
|
throw createError({ statusCode: 400, statusMessage: "Paramètre folders invalide" })
|
||||||
|
}
|
||||||
|
|
||||||
|
if (folderNames.some((folder) => !isSafeFolder(folder))) {
|
||||||
|
throw createError({ statusCode: 400, statusMessage: "Paramètre folders invalide" })
|
||||||
|
}
|
||||||
|
|
||||||
|
const uniqueFolders = [...new Set(folderNames)]
|
||||||
|
const archiveEntries: Array<{ remoteDir: string; fileName: string; archiveName: string }> = []
|
||||||
|
|
||||||
|
for (const folderName of uniqueFolders) {
|
||||||
|
const remoteDir = await resolveFolderRemoteDir(folderName)
|
||||||
|
if (!remoteDir) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
const fileName = await getLatestRemoteFile(remoteDir)
|
||||||
|
if (!fileName) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
archiveEntries.push({
|
||||||
|
remoteDir,
|
||||||
|
fileName,
|
||||||
|
archiveName: `${folderName}/${fileName}`
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
if (archiveEntries.length === 0) {
|
||||||
|
throw createError({ statusCode: 404, statusMessage: "Aucun fichier a telecharger" })
|
||||||
|
}
|
||||||
|
|
||||||
|
const dateLabel = new Date().toISOString().slice(0, 19).replace(/[:T]/g, "-")
|
||||||
|
const archiveName = `backup-latest-${dateLabel}.tar.gz`
|
||||||
|
const tarArgs = archiveEntries.flatMap(({ remoteDir, fileName, archiveName: entryName }) => [
|
||||||
|
"--transform",
|
||||||
|
shellQuote(`s|^${fileName}$|${entryName}|`),
|
||||||
|
"-C",
|
||||||
|
shellQuote(remoteDir),
|
||||||
|
shellQuote(fileName)
|
||||||
|
])
|
||||||
|
const remoteCommand = `tar -czf - ${tarArgs.join(" ")}`
|
||||||
|
|
||||||
|
setHeader(event, "Content-Type", "application/gzip")
|
||||||
|
setHeader(event, "Content-Disposition", buildContentDisposition(archiveName))
|
||||||
|
|
||||||
|
const child = spawn("ssh", [
|
||||||
|
"-o",
|
||||||
|
"BatchMode=yes",
|
||||||
|
"-o",
|
||||||
|
"ConnectTimeout=5",
|
||||||
|
REMOTE_HOST,
|
||||||
|
remoteCommand
|
||||||
|
])
|
||||||
|
|
||||||
|
let stderr = ""
|
||||||
|
child.stderr.on("data", (chunk) => {
|
||||||
|
stderr += chunk.toString()
|
||||||
|
})
|
||||||
|
|
||||||
|
child.on("close", (code) => {
|
||||||
|
if (code !== 0) {
|
||||||
|
console.error(`Erreur archive SSH (${code}): ${stderr}`)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
return sendStream(event, child.stdout)
|
||||||
|
})
|
||||||
@@ -2,12 +2,12 @@ import { execFile, spawn } from "node:child_process"
|
|||||||
import { Readable } from "node:stream"
|
import { Readable } from "node:stream"
|
||||||
import folderMap from "../config/backup-folders.json"
|
import folderMap from "../config/backup-folders.json"
|
||||||
|
|
||||||
const REMOTE_HOST = process.env.BACKUPS_REMOTE_HOST || "malio-b@192.168.0.179"
|
const REMOTE_HOST = process.env.BACKUPS_REMOTE_HOST || "malio-b"
|
||||||
const REMOTE_ROOT = process.env.BACKUPS_REMOTE_ROOT || "/home/malio-b/backups"
|
const REMOTE_ROOT = process.env.BACKUPS_REMOTE_ROOT || "/home/malio-b/backups"
|
||||||
const FOLDER_MAP = folderMap as Record<string, string>
|
const FOLDER_MAP = folderMap as Record<string, string>
|
||||||
|
|
||||||
const isSafeFolder = (value: string) => /^[a-zA-Z0-9._-]+$/.test(value)
|
const isSafeFolder = (value: string) => /^[a-zA-Z0-9._-]+$/.test(value)
|
||||||
const isSafeFile = (value: string) => /^[^/\\]+$/.test(value)
|
const isSafeFile = (value: string) => /^[a-zA-Z0-9._-]+$/.test(value)
|
||||||
const shellQuote = (value: string) => `'${value.replace(/'/g, `'\\''`)}'`
|
const shellQuote = (value: string) => `'${value.replace(/'/g, `'\\''`)}'`
|
||||||
|
|
||||||
function runSsh(command: string): Promise<string> {
|
function runSsh(command: string): Promise<string> {
|
||||||
@@ -56,7 +56,7 @@ function buildContentDisposition(fileName: string) {
|
|||||||
return `attachment; filename="${asciiName}"; filename*=UTF-8''${encodeURIComponent(fileName)}`
|
return `attachment; filename="${asciiName}"; filename*=UTF-8''${encodeURIComponent(fileName)}`
|
||||||
}
|
}
|
||||||
|
|
||||||
function speedtestStream(event: any) {
|
function speedtestStream(event: H3Event) {
|
||||||
const size = 128 * 1024 * 1024
|
const size = 128 * 1024 * 1024
|
||||||
let sent = 0
|
let sent = 0
|
||||||
|
|
||||||
|
|||||||
165
server/api/system.get.ts
Normal file
165
server/api/system.get.ts
Normal file
@@ -0,0 +1,165 @@
|
|||||||
|
import fs from "node:fs"
|
||||||
|
import os from "node:os"
|
||||||
|
|
||||||
|
type CpuTimesSnapshot = {
|
||||||
|
idle: number
|
||||||
|
total: number
|
||||||
|
}
|
||||||
|
|
||||||
|
type NetworkSnapshot = {
|
||||||
|
rxBytes: number
|
||||||
|
txBytes: number
|
||||||
|
timestamp: number
|
||||||
|
}
|
||||||
|
|
||||||
|
let previousNetworkSnapshot: NetworkSnapshot | null = null
|
||||||
|
|
||||||
|
function getCpuSnapshot(): CpuTimesSnapshot {
|
||||||
|
const cpus = os.cpus()
|
||||||
|
|
||||||
|
return cpus.reduce(
|
||||||
|
(snapshot, cpu) => {
|
||||||
|
const total = Object.values(cpu.times).reduce((sum, value) => sum + value, 0)
|
||||||
|
|
||||||
|
snapshot.idle += cpu.times.idle
|
||||||
|
snapshot.total += total
|
||||||
|
|
||||||
|
return snapshot
|
||||||
|
},
|
||||||
|
{idle: 0, total: 0}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function wait(durationMs: number) {
|
||||||
|
return new Promise((resolve) => {
|
||||||
|
setTimeout(resolve, durationMs)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getCpuUsagePercent(sampleMs: number) {
|
||||||
|
const start = getCpuSnapshot()
|
||||||
|
await wait(sampleMs)
|
||||||
|
const end = getCpuSnapshot()
|
||||||
|
|
||||||
|
const idleDelta = end.idle - start.idle
|
||||||
|
const totalDelta = end.total - start.total
|
||||||
|
|
||||||
|
if (totalDelta <= 0) {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
return Math.max(0, Math.min(100, Math.round((1 - idleDelta / totalDelta) * 100)))
|
||||||
|
}
|
||||||
|
|
||||||
|
function getNetworkTotals() {
|
||||||
|
try {
|
||||||
|
const content = fs.readFileSync("/proc/net/dev", "utf8")
|
||||||
|
const totals = content
|
||||||
|
.split("\n")
|
||||||
|
.slice(2)
|
||||||
|
.map((line) => line.trim())
|
||||||
|
.filter(Boolean)
|
||||||
|
.reduce(
|
||||||
|
(accumulator, line) => {
|
||||||
|
const [namePart, valuesPart] = line.split(":")
|
||||||
|
const interfaceName = namePart?.trim()
|
||||||
|
|
||||||
|
if (!interfaceName || interfaceName === "lo" || !valuesPart) {
|
||||||
|
return accumulator
|
||||||
|
}
|
||||||
|
|
||||||
|
const values = valuesPart.trim().split(/\s+/)
|
||||||
|
const rxBytes = Number.parseInt(values[0] || "0", 10)
|
||||||
|
const txBytes = Number.parseInt(values[8] || "0", 10)
|
||||||
|
|
||||||
|
if (Number.isFinite(rxBytes)) {
|
||||||
|
accumulator.rxBytes += rxBytes
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Number.isFinite(txBytes)) {
|
||||||
|
accumulator.txBytes += txBytes
|
||||||
|
}
|
||||||
|
|
||||||
|
return accumulator
|
||||||
|
},
|
||||||
|
{rxBytes: 0, txBytes: 0}
|
||||||
|
)
|
||||||
|
|
||||||
|
return totals
|
||||||
|
} catch {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function getNetworkRatesMbps() {
|
||||||
|
const totals = getNetworkTotals()
|
||||||
|
const now = Date.now()
|
||||||
|
|
||||||
|
if (!totals) {
|
||||||
|
previousNetworkSnapshot = null
|
||||||
|
return {
|
||||||
|
incomingMbps: 0,
|
||||||
|
outgoingMbps: 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const currentSnapshot: NetworkSnapshot = {
|
||||||
|
...totals,
|
||||||
|
timestamp: now
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!previousNetworkSnapshot) {
|
||||||
|
previousNetworkSnapshot = currentSnapshot
|
||||||
|
|
||||||
|
return {
|
||||||
|
incomingMbps: 0,
|
||||||
|
outgoingMbps: 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const elapsedSeconds = (currentSnapshot.timestamp - previousNetworkSnapshot.timestamp) / 1000
|
||||||
|
|
||||||
|
if (elapsedSeconds <= 0) {
|
||||||
|
previousNetworkSnapshot = currentSnapshot
|
||||||
|
|
||||||
|
return {
|
||||||
|
incomingMbps: 0,
|
||||||
|
outgoingMbps: 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const incomingMbps = Math.max(
|
||||||
|
0,
|
||||||
|
Number((((currentSnapshot.rxBytes - previousNetworkSnapshot.rxBytes) * 8) / elapsedSeconds / 1000000).toFixed(2))
|
||||||
|
)
|
||||||
|
const outgoingMbps = Math.max(
|
||||||
|
0,
|
||||||
|
Number((((currentSnapshot.txBytes - previousNetworkSnapshot.txBytes) * 8) / elapsedSeconds / 1000000).toFixed(2))
|
||||||
|
)
|
||||||
|
|
||||||
|
previousNetworkSnapshot = currentSnapshot
|
||||||
|
|
||||||
|
return {
|
||||||
|
incomingMbps,
|
||||||
|
outgoingMbps
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default defineEventHandler(async () => {
|
||||||
|
const totalMemory = os.totalmem()
|
||||||
|
const freeMemory = os.freemem()
|
||||||
|
const usedMemory = totalMemory - freeMemory
|
||||||
|
const memoryPercent = totalMemory > 0 ? Math.round((usedMemory / totalMemory) * 100) : 0
|
||||||
|
const cpuPercent = await getCpuUsagePercent(200)
|
||||||
|
const {incomingMbps, outgoingMbps} = getNetworkRatesMbps()
|
||||||
|
|
||||||
|
return {
|
||||||
|
cpuPercent,
|
||||||
|
memoryPercent,
|
||||||
|
totalMemory,
|
||||||
|
usedMemory,
|
||||||
|
incomingMbps,
|
||||||
|
outgoingMbps,
|
||||||
|
sampledAt: new Date().toISOString()
|
||||||
|
}
|
||||||
|
})
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"ferme": "bdd_recette/ferme",
|
"ferme": "bdd-recette/ferme",
|
||||||
"inventory": "bdd_recette/inventory",
|
"inventory": "bdd-recette/inventory",
|
||||||
"sirh": "bdd_recette/sirh",
|
"sirh": "bdd-recette/sirh",
|
||||||
"user": "bdd_recette/user",
|
"user": "bdd-recette/user",
|
||||||
"bitwarden": "bitwarden"
|
"bitwarden": "bitwarden"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,19 +4,31 @@
|
|||||||
"label": "Backup BDD recette",
|
"label": "Backup BDD recette",
|
||||||
"icon": "mdi:database-export",
|
"icon": "mdi:database-export",
|
||||||
"downloadFolders": ["ferme", "inventory", "sirh", "user"],
|
"downloadFolders": ["ferme", "inventory", "sirh", "user"],
|
||||||
"command": "ssh ferme 'cd /home/malio/Malio-ops/RecetteScripts && bash backup-bdd-recette.sh && exit'"
|
"command": "ssh",
|
||||||
|
"args": [
|
||||||
|
"ferme",
|
||||||
|
"cd /home/malio/Malio-ops/RecetteScripts && bash backup-bdd-recette.sh"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"key": "check-statut-recette",
|
"key": "check-statut-recette",
|
||||||
"label": "Check statut recette",
|
"label": "Check statut recette",
|
||||||
"icon": "mdi:server-network",
|
"icon": "mdi:server-network",
|
||||||
"command": "ssh ferme 'cd /home/malio/Malio-ops/RecetteScripts && bash check-statut-recette.sh && exit'"
|
"command": "ssh",
|
||||||
|
"args": [
|
||||||
|
"ferme",
|
||||||
|
"cd /home/malio/Malio-ops/RecetteScripts && bash check-statut-recette.sh"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"key": "backup-vaultwarden",
|
"key": "backup-vaultwarden",
|
||||||
"label": "Backup vaultwarden",
|
"label": "Backup vaultwarden",
|
||||||
"icon": "mdi:data",
|
"icon": "mdi:data",
|
||||||
"downloadFolders": ["bitwarden"],
|
"downloadFolders": ["bitwarden"],
|
||||||
"command": "ssh bitwarden 'cd /home/matt/vaultwarden/Malio-ops/BackupVaultWarden && bash backup-vaultwarden.sh && exit'"
|
"command": "ssh",
|
||||||
|
"args": [
|
||||||
|
"bitwarden",
|
||||||
|
"cd /home/matt/vaultwarden/Malio-ops/BackupVaultWarden && bash backup-vaultwarden.sh"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -2,11 +2,18 @@
|
|||||||
{
|
{
|
||||||
"key": "remote",
|
"key": "remote",
|
||||||
"label": "Serveur distant",
|
"label": "Serveur distant",
|
||||||
"command": "ssh malio-b 'cd /home/malio-b/Malio-ops/CheckStorage && bash check-storage.sh && exit'"
|
"command": "ssh",
|
||||||
|
"args": [
|
||||||
|
"malio-b",
|
||||||
|
"cd /home/malio-b/Malio-ops/CheckStorage && bash check-storage.sh"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"key": "local",
|
"key": "local",
|
||||||
"label": "Machine locale",
|
"label": "Machine locale",
|
||||||
"command": "bash /home/kevin/check_storage.sh"
|
"command": "bash",
|
||||||
|
"args": [
|
||||||
|
"/home/kevin/check_storage.sh"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
25
server/middleware/auth-cookie.ts
Normal file
25
server/middleware/auth-cookie.ts
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
export default defineEventHandler((event) => {
|
||||||
|
const path = event.path || event.node.req.url || ""
|
||||||
|
|
||||||
|
if (path.startsWith("/api/")) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const runtimeConfig = useRuntimeConfig(event)
|
||||||
|
const expectedToken = runtimeConfig.apiSecretKey
|
||||||
|
|
||||||
|
if (!expectedToken) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (getCookie(event, "api_auth_token") === expectedToken) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
setCookie(event, "api_auth_token", expectedToken, {
|
||||||
|
httpOnly: true,
|
||||||
|
sameSite: "lax",
|
||||||
|
secure: process.env.NODE_ENV === "production",
|
||||||
|
path: "/"
|
||||||
|
})
|
||||||
|
})
|
||||||
31
server/middleware/auth.ts
Normal file
31
server/middleware/auth.ts
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
export default defineEventHandler((event) => {
|
||||||
|
const path = event.path || event.node.req.url || ""
|
||||||
|
|
||||||
|
// Le middleware ne s'applique qu'aux routes API, sauf l'endpoint de ping
|
||||||
|
// qui reste public pour les tests de connectivite.
|
||||||
|
if (!path.startsWith("/api/") || path === "/api/ping") {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const runtimeConfig = useRuntimeConfig(event)
|
||||||
|
const authorization = getHeader(event, "authorization")
|
||||||
|
const cookieToken = getCookie(event, "api_auth_token")
|
||||||
|
const expectedToken = runtimeConfig.apiSecretKey
|
||||||
|
|
||||||
|
// Si aucun secret n'est configure cote serveur, on refuse la requete.
|
||||||
|
if (!expectedToken) {
|
||||||
|
throw createError({
|
||||||
|
statusCode: 401,
|
||||||
|
statusMessage: "Unauthorized"
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Le secret peut venir soit d'un header serveur explicite,
|
||||||
|
// soit du cookie httpOnly pose pour l'application web.
|
||||||
|
if (authorization !== `Bearer ${expectedToken}` && cookieToken !== expectedToken) {
|
||||||
|
throw createError({
|
||||||
|
statusCode: 401,
|
||||||
|
statusMessage: "Unauthorized"
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
Reference in New Issue
Block a user