Compare commits
23 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3f00c229cb | ||
| f4f38cf6d1 | |||
| 6eddc11253 | |||
| c6d5843022 | |||
| ffb84b41a9 | |||
| 7c3467d85f | |||
|
|
a2f2e8f255 | ||
| 5cfafa88cf | |||
| 656917c776 | |||
| 90fd395a26 | |||
| 35cfcb1bcf | |||
| 92ed9b040f | |||
| e52fbaf799 | |||
| 00dc2daa3d | |||
| 7643600196 | |||
| b6375b4242 | |||
| 9393abc8df | |||
| b3fc6f77b1 | |||
| 47bc8ba966 | |||
| 31e101abbd | |||
|
|
126d6b505a | ||
| c758c4d904 | |||
| ffe463e130 |
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=
|
||||
24
CHANGELOG.md
24
CHANGELOG.md
@@ -1,3 +1,27 @@
|
||||
## [1.3.1](https://gitea.malio.fr/MALIO-DEV/Supervisor/compare/v1.3.0...v1.3.1) (2026-03-16)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* arch-02 make type file ([ffb84b4](https://gitea.malio.fr/MALIO-DEV/Supervisor/commit/ffb84b41a9e15b2edc98378c94050c74c9d200c6))
|
||||
* arch-03 worker system metric ([6eddc11](https://gitea.malio.fr/MALIO-DEV/Supervisor/commit/6eddc1125316bb0d77a7c71cfc4674cd99c6e296))
|
||||
* arch-03 worker system metric ([c6d5843](https://gitea.malio.fr/MALIO-DEV/Supervisor/commit/c6d5843022bbdcf909662c2c9ce47fb14f88b5a2))
|
||||
* extract shared ssh utilities ([7c3467d](https://gitea.malio.fr/MALIO-DEV/Supervisor/commit/7c3467d85f987f1d9b8fe2546a13c2d23ea841b4))
|
||||
|
||||
# [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)
|
||||
|
||||
|
||||
|
||||
@@ -22,6 +22,13 @@
|
||||
</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">
|
||||
<IconifyIcon icon="mdi:file-hidden" class="text-3xl text-m-muted/40" />
|
||||
<p class="mt-2 font-mono text-xs text-m-muted/50">
|
||||
@@ -55,6 +62,7 @@
|
||||
import {Icon as IconifyIcon} from "@iconify/vue"
|
||||
import CircleSkeleton from "~/components/skeleton/CircleSkeleton.vue"
|
||||
import TextSkeleton from "~/components/skeleton/TextSkeleton.vue"
|
||||
import { apiFetch, downloadApiFile } from "~/composables/useApiAuth"
|
||||
|
||||
const props = defineProps<{
|
||||
folder: string | null
|
||||
@@ -62,31 +70,42 @@ const props = defineProps<{
|
||||
|
||||
const backups = ref<string[]>([])
|
||||
const loading = ref(false)
|
||||
const errorMessage = ref("")
|
||||
const title = computed(() => {
|
||||
if (!props.folder) return "Fichiers"
|
||||
return `Backup — ${props.folder.toUpperCase()}`
|
||||
})
|
||||
|
||||
const downloadBackup = (file: string) => {
|
||||
const downloadBackup = async (file: string) => {
|
||||
if (!props.folder) return
|
||||
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) => {
|
||||
if (!folder) {
|
||||
loading.value = false
|
||||
backups.value = []
|
||||
errorMessage.value = ""
|
||||
return
|
||||
}
|
||||
|
||||
loading.value = true
|
||||
errorMessage.value = ""
|
||||
try {
|
||||
const data = await $fetch<string[]>(`/api/backups?folder=${encodeURIComponent(folder)}`)
|
||||
const data = await apiFetch<string[]>(`/api/backups?folder=${encodeURIComponent(folder)}`)
|
||||
backups.value = data
|
||||
} catch (error) {
|
||||
console.error("Erreur récupération backups:", error)
|
||||
backups.value = []
|
||||
errorMessage.value = "Erreur lors de l'opération"
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -120,6 +139,12 @@ watch(() => props.folder, async (folder) => {
|
||||
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 {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
@@ -79,6 +79,7 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onMounted, ref } from "vue"
|
||||
import { Icon as IconifyIcon } from "@iconify/vue"
|
||||
import { apiFetch } from "~/composables/useApiAuth"
|
||||
|
||||
type BackupScript = {
|
||||
key: string
|
||||
@@ -134,12 +135,12 @@ const loadScripts = async () => {
|
||||
downloadFolders: []
|
||||
})
|
||||
try {
|
||||
const data = await $fetch<BackupScriptListResponse>("/api/backup-script")
|
||||
const data = await apiFetch<BackupScriptListResponse>("/api/backup-script")
|
||||
scripts.value = data.scripts
|
||||
} catch (error) {
|
||||
} catch {
|
||||
scripts.value = []
|
||||
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", {
|
||||
key: null,
|
||||
label: "",
|
||||
@@ -160,7 +161,7 @@ const runScript = async (key: string) => {
|
||||
isError.value = false
|
||||
|
||||
try {
|
||||
const data = await $fetch<BackupScriptRunResponse>("/api/backup-script", {
|
||||
const data = await apiFetch<BackupScriptRunResponse>("/api/backup-script", {
|
||||
method: "POST",
|
||||
body: { key }
|
||||
})
|
||||
@@ -173,8 +174,20 @@ const runScript = async (key: string) => {
|
||||
isError: false,
|
||||
downloadFolders: data.downloadFolders || []
|
||||
})
|
||||
} catch (error: any) {
|
||||
} catch (error: unknown) {
|
||||
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"
|
||||
output.value = ""
|
||||
emit("result", {
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
<script setup>
|
||||
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>
|
||||
|
||||
<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>
|
||||
</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" />
|
||||
<p class="mt-2 font-mono text-xs text-m-muted/50">
|
||||
Aucun message
|
||||
@@ -74,6 +86,12 @@ const { data: messages } = await useFetch('/api/discord/messages')
|
||||
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 {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
<h2 class="card-title">Speedtest</h2>
|
||||
<button
|
||||
class="reload-btn"
|
||||
@click="runTests"
|
||||
:disabled="isTesting"
|
||||
@click="runTests"
|
||||
>
|
||||
<IconifyIcon
|
||||
icon="mdi:reload"
|
||||
@@ -36,17 +36,23 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p v-if="errorMessage" class="error-text" role="status" aria-live="polite">
|
||||
{{ errorMessage }}
|
||||
</p>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import {computed, ref} from "vue"
|
||||
import {Icon as IconifyIcon} from "@iconify/vue"
|
||||
import { apiRequest } from "~/composables/useApiAuth"
|
||||
|
||||
const ping = ref<number | null>(null)
|
||||
const download = ref<number | null>(null)
|
||||
const upload = ref<number | null>(null)
|
||||
const isTesting = ref(false)
|
||||
const errorMessage = ref("")
|
||||
|
||||
const metrics = computed(() => [
|
||||
{ label: "Download", icon: "mdi:arrow-down-bold", value: download.value, unit: "Mbps" },
|
||||
@@ -56,7 +62,10 @@ const metrics = computed(() => [
|
||||
|
||||
async function testDownload() {
|
||||
const start = performance.now()
|
||||
const res = await fetch('/api/download')
|
||||
const res = await apiRequest('/api/speedtest')
|
||||
if (!res.ok) {
|
||||
throw new Error(`HTTP ${res.status}`)
|
||||
}
|
||||
const blob = await res.blob()
|
||||
const end = performance.now()
|
||||
const size = blob.size
|
||||
@@ -68,7 +77,10 @@ async function testUpload() {
|
||||
const size = 5 * 1024 * 1024
|
||||
const data = new Uint8Array(size)
|
||||
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 seconds = (end - start) / 1000
|
||||
upload.value = Math.round((size * 8) / seconds / 1000000)
|
||||
@@ -76,7 +88,10 @@ async function testUpload() {
|
||||
|
||||
async function testPing() {
|
||||
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()
|
||||
ping.value = Math.round(end - start)
|
||||
}
|
||||
@@ -86,11 +101,15 @@ async function runTests() {
|
||||
download.value = null
|
||||
upload.value = null
|
||||
ping.value = null
|
||||
errorMessage.value = ""
|
||||
|
||||
try {
|
||||
await testDownload()
|
||||
await testUpload()
|
||||
await testPing()
|
||||
} catch (error) {
|
||||
console.error("Erreur speedtest:", error)
|
||||
errorMessage.value = "Erreur lors de l'opération"
|
||||
} finally {
|
||||
isTesting.value = false
|
||||
}
|
||||
@@ -189,4 +208,15 @@ async function runTests() {
|
||||
letter-spacing: 0.1em;
|
||||
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>
|
||||
@@ -20,8 +20,8 @@
|
||||
</template>
|
||||
|
||||
<div
|
||||
v-else
|
||||
v-for="row in rows"
|
||||
v-else
|
||||
:key="`${row.label}-${row.url}`"
|
||||
class="status-row"
|
||||
:class="row.status === 200 ? 'row-ok' : 'row-error'"
|
||||
@@ -43,6 +43,7 @@
|
||||
import CircleSkeleton from "~/components/skeleton/CircleSkeleton.vue"
|
||||
import TextSkeleton from "~/components/skeleton/TextSkeleton.vue"
|
||||
import {onBeforeUnmount, onMounted, ref} from "vue"
|
||||
import { apiFetch } from "~/composables/useApiAuth"
|
||||
|
||||
interface StatusRow {
|
||||
label: string
|
||||
@@ -84,7 +85,7 @@ const checkStatus = async () => {
|
||||
loading.value = true
|
||||
}
|
||||
try {
|
||||
const data = await $fetch<StatusResponse>(props.endpoint)
|
||||
const data = await apiFetch<StatusResponse>(props.endpoint)
|
||||
rows.value = data.results
|
||||
} catch (error) {
|
||||
rows.value = [
|
||||
|
||||
652
components/SystemMetricsChart.vue
Normal file
652
components/SystemMetricsChart.vue
Normal file
@@ -0,0 +1,652 @@
|
||||
<template>
|
||||
<section class="chart-card card-glow">
|
||||
<div class="card-header">
|
||||
<div>
|
||||
<h2 class="card-title">Historique systeme</h2>
|
||||
<p class="card-copy">CPU et RAM avec cache journalier local</p>
|
||||
</div>
|
||||
|
||||
<div class="controls">
|
||||
<div class="toggle-group" role="group" aria-label="Metriques affichees">
|
||||
<button
|
||||
v-for="option in options"
|
||||
:key="option.value"
|
||||
type="button"
|
||||
class="toggle-pill"
|
||||
:class="{ 'toggle-pill-active': isMetricActive(option.value) }"
|
||||
@click="toggleMetric(option.value)"
|
||||
>
|
||||
<span class="toggle-dot" :style="{ backgroundColor: option.color }" />
|
||||
<span>{{ option.label }}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="history-toolbar">
|
||||
<label class="window-select">
|
||||
<span>Fenetre</span>
|
||||
<select v-model="selectedWindow">
|
||||
<option
|
||||
v-for="windowOption in windowOptions"
|
||||
:key="windowOption.value"
|
||||
:value="windowOption.value"
|
||||
>
|
||||
{{ windowOption.label }}
|
||||
</option>
|
||||
</select>
|
||||
</label>
|
||||
|
||||
<button type="button" class="clear-btn" @click="clearHistory">
|
||||
Vider le cache
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="chart-shell">
|
||||
<template v-if="loading && visibleHistory.length === 0">
|
||||
<div class="chart-skeleton animate-shimmer" />
|
||||
</template>
|
||||
<template v-else>
|
||||
<div class="chart-meta">
|
||||
<div>
|
||||
<span class="meta-label">Echelle</span>
|
||||
<strong class="meta-value">{{ scaleLabel }}</strong>
|
||||
</div>
|
||||
<div>
|
||||
<span class="meta-label">Periode</span>
|
||||
<strong class="meta-value">{{ activeWindowLabel }}</strong>
|
||||
</div>
|
||||
<div
|
||||
v-for="option in displayedOptions"
|
||||
:key="option.value"
|
||||
class="meta-metric"
|
||||
>
|
||||
<span class="meta-label">{{ option.label }}</span>
|
||||
<strong class="meta-value" :style="{ color: option.color }">
|
||||
{{ formatValue(currentMetricValue(option.value)) }}
|
||||
</strong>
|
||||
<span class="meta-subvalue">Pic {{ formatValue(peakMetricValue(option.value)) }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<svg
|
||||
class="chart-svg"
|
||||
viewBox="0 0 960 320"
|
||||
preserveAspectRatio="none"
|
||||
aria-label="Graphique des ressources"
|
||||
>
|
||||
<line
|
||||
:x1="chartLeft"
|
||||
:y1="chartBottom"
|
||||
:x2="chartRight"
|
||||
:y2="chartBottom"
|
||||
class="axis-line"
|
||||
/>
|
||||
<line
|
||||
:x1="chartLeft"
|
||||
:y1="chartTop"
|
||||
:x2="chartLeft"
|
||||
:y2="chartBottom"
|
||||
class="axis-line"
|
||||
/>
|
||||
<line
|
||||
v-for="line in yAxisTicks"
|
||||
:key="`grid-${line.y}`"
|
||||
:x1="chartLeft"
|
||||
:y1="line.y"
|
||||
:x2="chartRight"
|
||||
:y2="line.y"
|
||||
class="grid-line"
|
||||
/>
|
||||
<text
|
||||
v-for="line in yAxisTicks"
|
||||
:key="`y-label-${line.y}`"
|
||||
:x="chartLeft - 12"
|
||||
:y="line.y + 4"
|
||||
class="axis-label axis-label-y"
|
||||
>
|
||||
{{ line.label }}
|
||||
</text>
|
||||
<line
|
||||
v-for="tick in xAxisTicks"
|
||||
:key="`x-grid-${tick.x}`"
|
||||
:x1="tick.x"
|
||||
:y1="chartTop"
|
||||
:x2="tick.x"
|
||||
:y2="chartBottom"
|
||||
class="grid-line grid-line-vertical"
|
||||
/>
|
||||
<text
|
||||
v-for="tick in xAxisTicks"
|
||||
:key="`x-label-${tick.x}`"
|
||||
:x="tick.x"
|
||||
:y="304"
|
||||
class="axis-label axis-label-x"
|
||||
>
|
||||
{{ tick.label }}
|
||||
</text>
|
||||
<polyline
|
||||
v-for="option in displayedOptions"
|
||||
:key="option.value"
|
||||
:points="polylinePoints(option.value)"
|
||||
class="chart-line"
|
||||
:style="{ stroke: option.color }"
|
||||
/>
|
||||
</svg>
|
||||
</template>
|
||||
</div>
|
||||
</section>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed, onMounted, ref, watch } from "vue"
|
||||
import type { SystemMetrics } from "~/types/system"
|
||||
|
||||
type MetricKey = "cpu" | "ram"
|
||||
type WindowKey = "day" | "hour" | "5m" | "1m" | "30s"
|
||||
|
||||
type HistoryPoint = {
|
||||
sampledAt: number
|
||||
cpu: number
|
||||
ram: number
|
||||
}
|
||||
|
||||
const HISTORY_STORAGE_KEY = "supervisor-system-history"
|
||||
|
||||
const props = defineProps<{
|
||||
metrics: SystemMetrics | null
|
||||
loading: boolean
|
||||
}>()
|
||||
|
||||
const activeMetrics = ref<MetricKey[]>(["cpu", "ram"])
|
||||
const selectedWindow = ref<WindowKey>("hour")
|
||||
const history = ref<HistoryPoint[]>([])
|
||||
|
||||
const options: Array<{ value: MetricKey; label: string; color: string }> = [
|
||||
{ value: "cpu", label: "CPU", color: "#5aa9ff" },
|
||||
{ value: "ram", label: "RAM", color: "#31c48d" }
|
||||
]
|
||||
|
||||
const windowOptions: Array<{ value: WindowKey; label: string; durationMs: number | null }> = [
|
||||
{ value: "day", label: "Journee", durationMs: null },
|
||||
{ value: "hour", label: "1 h", durationMs: 60 * 60 * 1000 },
|
||||
{ value: "5m", label: "5 min", durationMs: 5 * 60 * 1000 },
|
||||
{ value: "1m", label: "1 min", durationMs: 60 * 1000 },
|
||||
{ value: "30s", label: "30 s", durationMs: 30 * 1000 }
|
||||
]
|
||||
|
||||
const getStartOfToday = (timestamp: number) => {
|
||||
const date = new Date(timestamp)
|
||||
date.setHours(0, 0, 0, 0)
|
||||
return date.getTime()
|
||||
}
|
||||
|
||||
const normalizeHistory = (points: HistoryPoint[]) => {
|
||||
if (points.length === 0) {
|
||||
return []
|
||||
}
|
||||
|
||||
const startOfToday = getStartOfToday(Date.now())
|
||||
|
||||
return points
|
||||
.filter((point) => point.sampledAt >= startOfToday)
|
||||
.sort((left, right) => left.sampledAt - right.sampledAt)
|
||||
}
|
||||
|
||||
const persistHistory = () => {
|
||||
if (!import.meta.client) {
|
||||
return
|
||||
}
|
||||
|
||||
localStorage.setItem(HISTORY_STORAGE_KEY, JSON.stringify(history.value))
|
||||
}
|
||||
|
||||
const appendHistoryPoint = (metrics: SystemMetrics) => {
|
||||
const sampledAt = new Date(metrics.sampledAt).getTime()
|
||||
|
||||
if (!Number.isFinite(sampledAt)) {
|
||||
return
|
||||
}
|
||||
|
||||
const nextPoint: HistoryPoint = {
|
||||
sampledAt,
|
||||
cpu: metrics.cpuPercent,
|
||||
ram: metrics.memoryPercent
|
||||
}
|
||||
|
||||
const previousPoint = history.value.at(-1)
|
||||
const nextHistory = normalizeHistory(
|
||||
previousPoint?.sampledAt === nextPoint.sampledAt
|
||||
? [...history.value.slice(0, -1), nextPoint]
|
||||
: [...history.value, nextPoint]
|
||||
)
|
||||
|
||||
history.value = nextHistory
|
||||
persistHistory()
|
||||
}
|
||||
|
||||
const clearHistory = () => {
|
||||
history.value = []
|
||||
|
||||
if (!import.meta.client) {
|
||||
return
|
||||
}
|
||||
|
||||
localStorage.removeItem(HISTORY_STORAGE_KEY)
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
if (!import.meta.client) {
|
||||
return
|
||||
}
|
||||
|
||||
try {
|
||||
const rawHistory = localStorage.getItem(HISTORY_STORAGE_KEY)
|
||||
|
||||
if (!rawHistory) {
|
||||
return
|
||||
}
|
||||
|
||||
const parsedHistory = JSON.parse(rawHistory) as HistoryPoint[]
|
||||
history.value = normalizeHistory(
|
||||
parsedHistory.filter((point) => {
|
||||
return (
|
||||
point &&
|
||||
Number.isFinite(point.sampledAt) &&
|
||||
Number.isFinite(point.cpu) &&
|
||||
Number.isFinite(point.ram)
|
||||
)
|
||||
})
|
||||
)
|
||||
persistHistory()
|
||||
} catch {
|
||||
localStorage.removeItem(HISTORY_STORAGE_KEY)
|
||||
}
|
||||
})
|
||||
|
||||
watch(
|
||||
() => props.metrics?.sampledAt,
|
||||
() => {
|
||||
if (!props.metrics) {
|
||||
return
|
||||
}
|
||||
|
||||
appendHistoryPoint(props.metrics)
|
||||
},
|
||||
{ immediate: true }
|
||||
)
|
||||
|
||||
const activeWindow = computed(() => {
|
||||
return windowOptions.find((option) => option.value === selectedWindow.value) || windowOptions[0]
|
||||
})
|
||||
|
||||
const displayedOptions = computed(() => {
|
||||
return options.filter((option) => activeMetrics.value.includes(option.value))
|
||||
})
|
||||
|
||||
const visibleHistory = computed(() => {
|
||||
if (activeWindow.value.durationMs === null) {
|
||||
return history.value
|
||||
}
|
||||
|
||||
const minTimestamp = Date.now() - activeWindow.value.durationMs
|
||||
return history.value.filter((point) => point.sampledAt >= minTimestamp)
|
||||
})
|
||||
|
||||
const scaleMax = computed(() => 100)
|
||||
|
||||
const formatValue = (value: number) => `${Math.round(value)}%`
|
||||
|
||||
const scaleLabel = computed(() => {
|
||||
return formatValue(scaleMax.value)
|
||||
})
|
||||
|
||||
const activeWindowLabel = computed(() => activeWindow.value.label)
|
||||
|
||||
const isMetricActive = (metric: MetricKey) => activeMetrics.value.includes(metric)
|
||||
|
||||
const toggleMetric = (metric: MetricKey) => {
|
||||
if (isMetricActive(metric)) {
|
||||
activeMetrics.value = activeMetrics.value.filter((value) => value !== metric)
|
||||
return
|
||||
}
|
||||
|
||||
activeMetrics.value = [...activeMetrics.value, metric]
|
||||
}
|
||||
|
||||
const currentMetricValue = (metric: MetricKey) => {
|
||||
return visibleHistory.value.at(-1)?.[metric] ?? 0
|
||||
}
|
||||
|
||||
const peakMetricValue = (metric: MetricKey) => {
|
||||
return visibleHistory.value.reduce((max, point) => Math.max(max, point[metric]), 0)
|
||||
}
|
||||
|
||||
const chartLeft = 72
|
||||
const chartRight = 936
|
||||
const chartTop = 24
|
||||
const chartBottom = 280
|
||||
const chartWidth = chartRight - chartLeft
|
||||
const chartHeight = chartBottom - chartTop
|
||||
|
||||
const yAxisTicks = computed(() => {
|
||||
const steps = 4
|
||||
|
||||
return Array.from({ length: steps + 1 }, (_, index) => {
|
||||
const ratio = index / steps
|
||||
const value = scaleMax.value * (1 - ratio)
|
||||
const y = chartTop + chartHeight * ratio
|
||||
|
||||
return {
|
||||
y,
|
||||
label: formatValue(value)
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
const formatTimeLabel = (timestamp: number) => {
|
||||
return new Intl.DateTimeFormat("fr-FR", {
|
||||
hour: "2-digit",
|
||||
minute: "2-digit",
|
||||
second: activeWindow.value.durationMs !== null && activeWindow.value.durationMs <= 5 * 60 * 1000
|
||||
? "2-digit"
|
||||
: undefined
|
||||
}).format(timestamp)
|
||||
}
|
||||
|
||||
const xAxisTicks = computed(() => {
|
||||
if (visibleHistory.value.length === 0) {
|
||||
return []
|
||||
}
|
||||
|
||||
if (visibleHistory.value.length === 1) {
|
||||
return [
|
||||
{
|
||||
x: chartLeft,
|
||||
label: formatTimeLabel(visibleHistory.value[0].sampledAt)
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
const steps = 3
|
||||
const firstTimestamp = visibleHistory.value[0].sampledAt
|
||||
const lastTimestamp = visibleHistory.value.at(-1)?.sampledAt || firstTimestamp
|
||||
const span = Math.max(1, lastTimestamp - firstTimestamp)
|
||||
|
||||
return Array.from({ length: steps + 1 }, (_, index) => {
|
||||
const ratio = index / steps
|
||||
const targetTimestamp = firstTimestamp + span * ratio
|
||||
const closestPoint = visibleHistory.value.reduce((closest, point) => {
|
||||
const currentDistance = Math.abs(point.sampledAt - targetTimestamp)
|
||||
const closestDistance = Math.abs(closest.sampledAt - targetTimestamp)
|
||||
return currentDistance < closestDistance ? point : closest
|
||||
}, visibleHistory.value[0])
|
||||
|
||||
return {
|
||||
x: chartLeft + chartWidth * ratio,
|
||||
label: formatTimeLabel(closestPoint.sampledAt)
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
const polylinePoints = (metric: MetricKey) => {
|
||||
const points = visibleHistory.value.map((point) => point[metric])
|
||||
|
||||
if (points.length === 0) {
|
||||
return `${chartLeft},${chartBottom}`
|
||||
}
|
||||
|
||||
if (points.length === 1) {
|
||||
const normalizedValue = points[0] / scaleMax.value
|
||||
const y = chartBottom - normalizedValue * chartHeight
|
||||
return `${chartLeft},${y} ${chartRight},${y}`
|
||||
}
|
||||
|
||||
return points
|
||||
.map((value, index) => {
|
||||
const x = chartLeft + (index / (points.length - 1)) * chartWidth
|
||||
const normalizedValue = scaleMax.value > 0 ? value / scaleMax.value : 0
|
||||
const y = chartBottom - normalizedValue * chartHeight
|
||||
|
||||
return `${x},${Math.max(chartTop, Math.min(chartBottom, 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;
|
||||
}
|
||||
|
||||
.controls {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: flex-end;
|
||||
gap: 0.75rem;
|
||||
}
|
||||
|
||||
.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;
|
||||
appearance: none;
|
||||
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;
|
||||
}
|
||||
|
||||
.history-toolbar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.75rem;
|
||||
flex-wrap: wrap;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
|
||||
.window-select {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
font-family: var(--font-mono);
|
||||
font-size: 0.7rem;
|
||||
letter-spacing: 0.12em;
|
||||
text-transform: uppercase;
|
||||
color: rgb(var(--m-muted));
|
||||
}
|
||||
|
||||
.window-select select {
|
||||
border-radius: 999px;
|
||||
border: 1px solid rgb(var(--m-accent) / 0.14);
|
||||
background: rgb(var(--m-tertiary));
|
||||
padding: 0.55rem 0.8rem;
|
||||
font: inherit;
|
||||
color: rgb(var(--m-text));
|
||||
}
|
||||
|
||||
.clear-btn {
|
||||
border-radius: 999px;
|
||||
border: 1px solid rgb(var(--m-error) / 0.18);
|
||||
background: rgb(var(--m-error) / 0.08);
|
||||
padding: 0.55rem 0.85rem;
|
||||
font-family: var(--font-mono);
|
||||
font-size: 0.72rem;
|
||||
letter-spacing: 0.12em;
|
||||
text-transform: uppercase;
|
||||
color: rgb(var(--m-error));
|
||||
cursor: pointer;
|
||||
transition: border-color 0.2s ease, background-color 0.2s ease, color 0.2s ease;
|
||||
}
|
||||
|
||||
.clear-btn:hover {
|
||||
border-color: rgb(var(--m-error) / 0.32);
|
||||
background: rgb(var(--m-error) / 0.14);
|
||||
}
|
||||
|
||||
.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(4, minmax(0, 1fr));
|
||||
gap: 0.75rem;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
.meta-metric {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.2rem;
|
||||
}
|
||||
|
||||
.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.35rem;
|
||||
font-weight: 700;
|
||||
color: rgb(var(--m-text));
|
||||
}
|
||||
|
||||
.meta-subvalue {
|
||||
font-family: var(--font-mono);
|
||||
font-size: 0.7rem;
|
||||
letter-spacing: 0.08em;
|
||||
text-transform: uppercase;
|
||||
color: rgb(var(--m-muted));
|
||||
}
|
||||
|
||||
.chart-svg {
|
||||
width: 100%;
|
||||
height: 320px;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.axis-line {
|
||||
stroke: rgb(var(--m-border) / 0.55);
|
||||
stroke-width: 1.5;
|
||||
}
|
||||
|
||||
.grid-line {
|
||||
stroke: rgb(var(--m-border) / 0.35);
|
||||
stroke-width: 1;
|
||||
stroke-dasharray: 6 10;
|
||||
}
|
||||
|
||||
.grid-line-vertical {
|
||||
stroke-dasharray: 4 12;
|
||||
}
|
||||
|
||||
.axis-label {
|
||||
font-family: var(--font-mono);
|
||||
font-size: 11px;
|
||||
fill: rgb(var(--m-muted));
|
||||
}
|
||||
|
||||
.axis-label-y {
|
||||
text-anchor: end;
|
||||
}
|
||||
|
||||
.axis-label-x {
|
||||
text-anchor: middle;
|
||||
}
|
||||
|
||||
.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) {
|
||||
.controls {
|
||||
width: 100%;
|
||||
align-items: stretch;
|
||||
}
|
||||
|
||||
.history-toolbar {
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.chart-meta {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
190
components/SystemResources.vue
Normal file
190
components/SystemResources.vue
Normal file
@@ -0,0 +1,190 @@
|
||||
<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"
|
||||
import type { SystemMetrics } from "~/types/system";
|
||||
|
||||
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"
|
||||
alt="Logo Malio"
|
||||
class="logo"
|
||||
/>
|
||||
>
|
||||
</div>
|
||||
<div class="brand-copy">
|
||||
<p class="brand-title">Supervisor</p>
|
||||
@@ -67,7 +67,7 @@
|
||||
:src="logoSrc"
|
||||
alt="Logo Malio"
|
||||
class="logo"
|
||||
/>
|
||||
>
|
||||
</div>
|
||||
<div class="brand-copy">
|
||||
<p class="brand-kicker">Control Center</p>
|
||||
|
||||
@@ -26,7 +26,7 @@ export default defineNuxtConfig({
|
||||
head: {
|
||||
link: [
|
||||
{ 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",
|
||||
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: {
|
||||
apiSecretKey: process.env.API_SECRET_KEY,
|
||||
public: {
|
||||
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",
|
||||
"generate": "nuxt generate",
|
||||
"preview": "nuxt preview",
|
||||
"postinstall": "nuxt prepare"
|
||||
"postinstall": "nuxt prepare",
|
||||
"lint": "eslint .",
|
||||
"lint:fix": "eslint . --fix"
|
||||
},
|
||||
"dependencies": {
|
||||
"@iconify/vue": "^5.0.0",
|
||||
"iconify": "^1.4.0",
|
||||
"nuxt": "^4.3.1",
|
||||
"vue": "^3.5.29",
|
||||
"vue-router": "^4.6.4"
|
||||
"@nuxt/eslint": "^1.15.2",
|
||||
"nuxt": "^4.3.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@semantic-release/changelog": "^6.0.3",
|
||||
|
||||
@@ -96,6 +96,7 @@
|
||||
<script setup lang="ts">
|
||||
import { ref } from "vue"
|
||||
import BackupRun from "~/components/BackupRun.vue"
|
||||
import { apiFetch, downloadApiFile } from "~/composables/useApiAuth"
|
||||
|
||||
definePageMeta({ layout: false })
|
||||
|
||||
@@ -119,24 +120,25 @@ const selectedBackup = ref<string | null>(null)
|
||||
const scriptResult = ref<ScriptResult>(emptyScriptResult())
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
const triggerDownload = (folder: string, file: string) => {
|
||||
const link = document.createElement("a")
|
||||
link.href = `/api/download?folder=${encodeURIComponent(folder)}&file=${encodeURIComponent(file)}`
|
||||
link.style.display = "none"
|
||||
document.body.appendChild(link)
|
||||
link.click()
|
||||
link.remove()
|
||||
const triggerDownload = async (folder: string, file: string) => {
|
||||
const url = `/api/download?folder=${encodeURIComponent(folder)}&file=${encodeURIComponent(file)}`
|
||||
await downloadApiFile(url, file)
|
||||
}
|
||||
|
||||
const triggerBatchDownload = async (folders: string[]) => {
|
||||
const url = `/api/download-latest?folders=${encodeURIComponent(folders.join(","))}`
|
||||
await downloadApiFile(url, "backup-latest.tar.gz")
|
||||
}
|
||||
|
||||
const downloadLatestBackup = async (folder: string) => {
|
||||
const latestFile = await fetchLatestBackup(folder)
|
||||
|
||||
if (latestFile) {
|
||||
triggerDownload(folder, latestFile)
|
||||
await triggerDownload(folder, latestFile)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -147,6 +149,11 @@ const handleScriptResult = async (payload: ScriptResult) => {
|
||||
return
|
||||
}
|
||||
|
||||
if (payload.downloadFolders.length > 1) {
|
||||
await triggerBatchDownload(payload.downloadFolders)
|
||||
return
|
||||
}
|
||||
|
||||
for (const folder of payload.downloadFolders) {
|
||||
try {
|
||||
await downloadLatestBackup(folder)
|
||||
|
||||
@@ -33,9 +33,24 @@
|
||||
</div>
|
||||
|
||||
<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 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 class="content-aside">
|
||||
@@ -47,8 +62,11 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
definePageMeta({layout: false})
|
||||
import {computed, onMounted, ref} from "vue"
|
||||
import { apiFetch } from "~/composables/useApiAuth"
|
||||
import type { SystemMetrics } from "~/types/system";
|
||||
|
||||
definePageMeta({layout: false})
|
||||
|
||||
type DiskSourceResult = {
|
||||
key: string
|
||||
@@ -74,11 +92,13 @@ type DiagramItem = {
|
||||
totalText: string
|
||||
}
|
||||
|
||||
const selectedBackup = ref<string | null>(null)
|
||||
const rawResults = ref<DiskSourceResult[]>([])
|
||||
const loading = ref(false)
|
||||
const systemMetrics = ref<SystemMetrics | null>(null)
|
||||
const systemLoading = ref(true)
|
||||
const chartRadius = 52
|
||||
const chartCircumference = 2 * Math.PI * chartRadius
|
||||
let systemTimer: ReturnType<typeof setInterval> | null = null
|
||||
|
||||
const getHostName = (output: string, fallback: string) => {
|
||||
const hostMatch = output.match(/Name:\s*(.+)/i)
|
||||
@@ -151,16 +171,15 @@ const runScript = async () => {
|
||||
rawResults.value = []
|
||||
|
||||
try {
|
||||
const output = await $fetch<DiskApiResponse>("/api/disk")
|
||||
const output = await apiFetch<DiskApiResponse>("/api/disk")
|
||||
rawResults.value = output.results
|
||||
} catch (error) {
|
||||
const message = `Erreur: ${error instanceof Error ? error.message : String(error)}`
|
||||
} catch {
|
||||
rawResults.value = [
|
||||
{
|
||||
key: "error",
|
||||
label: "Source indisponible",
|
||||
ok: false,
|
||||
output: message
|
||||
output: "Erreur lors de l'opération"
|
||||
}
|
||||
]
|
||||
} finally {
|
||||
@@ -168,8 +187,27 @@ const runScript = async () => {
|
||||
}
|
||||
}
|
||||
|
||||
const loadSystemMetrics = async () => {
|
||||
try {
|
||||
systemMetrics.value = await $fetch<SystemMetrics>("/api/system")
|
||||
} catch {
|
||||
systemMetrics.value = null
|
||||
} finally {
|
||||
systemLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
runScript()
|
||||
loadSystemMetrics()
|
||||
systemTimer = setInterval(loadSystemMetrics, 2000)
|
||||
})
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
if (systemTimer) {
|
||||
clearInterval(systemTimer)
|
||||
systemTimer = null
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -229,6 +267,14 @@ onMounted(() => {
|
||||
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-middle,
|
||||
.grid-right {
|
||||
@@ -260,7 +306,8 @@ onMounted(() => {
|
||||
|
||||
.storage-grid,
|
||||
.content-grid,
|
||||
.dashboard-grid {
|
||||
.dashboard-grid,
|
||||
.metrics-row {
|
||||
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"
|
||||
|
||||
type BackupScript = {
|
||||
@@ -6,11 +6,12 @@ type BackupScript = {
|
||||
label: string
|
||||
downloadFolders?: string[]
|
||||
command: string
|
||||
args?: string[]
|
||||
}
|
||||
|
||||
function runCommand(command: string): Promise<string> {
|
||||
function runCommand(command: string, args: string[] = []): Promise<string> {
|
||||
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) {
|
||||
reject(stderr || error.message)
|
||||
return
|
||||
@@ -40,7 +41,7 @@ export default defineEventHandler(async (event) => {
|
||||
}
|
||||
|
||||
try {
|
||||
const output = await runCommand(script.command)
|
||||
const output = await runCommand(script.command, script.args || [])
|
||||
return {
|
||||
ok: true,
|
||||
key: script.key,
|
||||
@@ -49,9 +50,11 @@ export default defineEventHandler(async (event) => {
|
||||
output: output.trim()
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Erreur execution script:", error)
|
||||
|
||||
throw createError({
|
||||
statusCode: 500,
|
||||
statusMessage: `Erreur execution script: ${String(error)}`
|
||||
statusMessage: "Erreur lors de l'opération"
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,29 +1,15 @@
|
||||
import { execFile } from "node:child_process"
|
||||
import folderMap from "../config/backup-folders.json"
|
||||
import {
|
||||
runSsh,
|
||||
shellQuote,
|
||||
resolveFolderRemoteDir,
|
||||
REMOTE_ROOT,
|
||||
} from "../utils/ssh.ts"
|
||||
|
||||
const REMOTE_HOST = process.env.BACKUPS_REMOTE_HOST || "malio-b"
|
||||
const REMOTE_ROOT = process.env.BACKUPS_REMOTE_ROOT || "/home/malio-b/backups"
|
||||
const MAX_FILES_PER_FOLDER = Number(process.env.BACKUPS_MAX_FILES || "200")
|
||||
import {process} from "std-env";
|
||||
|
||||
const MAX_FILES_PER_FOLDER = Number(process.env.BACKUPS_MAX_FILES)
|
||||
const isSafeFolder = (value: string) => /^[a-zA-Z0-9._-]+$/.test(value)
|
||||
const shellQuote = (value: string) => `'${value.replace(/'/g, `'\\''`)}'`
|
||||
const FOLDER_MAP = folderMap as Record<string, string>
|
||||
|
||||
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)
|
||||
}
|
||||
)
|
||||
})
|
||||
}
|
||||
|
||||
function isMissingPathError(error: unknown): boolean {
|
||||
const message = String(error || "").toLowerCase()
|
||||
@@ -31,9 +17,11 @@ function isMissingPathError(error: unknown): boolean {
|
||||
}
|
||||
|
||||
function toServerError(error: unknown) {
|
||||
console.error("Erreur backups:", error)
|
||||
|
||||
return createError({
|
||||
statusCode: 500,
|
||||
statusMessage: `Erreur SSH backups: ${String(error)}`
|
||||
statusMessage: "Erreur lors de l'opération"
|
||||
})
|
||||
}
|
||||
|
||||
@@ -70,30 +58,6 @@ async function getLatestRemoteFile(remoteDir: string): Promise<string | null> {
|
||||
return files[0] || null
|
||||
}
|
||||
|
||||
async function remoteDirExists(remoteDir: string): Promise<boolean> {
|
||||
const output = await runSsh(`[ -d ${quoteDir(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
|
||||
}
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
const { folder } = getQuery(event)
|
||||
const folderName = typeof folder === "string" ? folder : null
|
||||
@@ -118,7 +82,7 @@ export default defineEventHandler(async (event) => {
|
||||
}
|
||||
}
|
||||
|
||||
// Sinon on récupère le dernier backup de chaque dossier distant.
|
||||
// Sinon, on récupère le dernier backup de chaque dossier distant.
|
||||
let dirs: string[] = []
|
||||
try {
|
||||
dirs = await listRemoteDirs(REMOTE_ROOT)
|
||||
|
||||
@@ -1,15 +1,31 @@
|
||||
export default defineEventHandler(async () => {
|
||||
const token = process.env.DISCORD_BOT_TOKEN
|
||||
const channel = process.env.DISCORD_CHANNEL_ID
|
||||
const token = process.env.DISCORD_BOT_TOKEN
|
||||
const channel = process.env.DISCORD_CHANNEL_ID
|
||||
|
||||
if (!token || !channel) {
|
||||
throw createError({
|
||||
statusCode: 503,
|
||||
statusMessage: "Service indisponible"
|
||||
})
|
||||
}
|
||||
|
||||
try {
|
||||
const messages = await $fetch(
|
||||
`https://discord.com/api/v10/channels/${channel}/messages?limit=20`,
|
||||
{
|
||||
headers: {
|
||||
Authorization: `Bot ${token}`
|
||||
}
|
||||
`https://discord.com/api/v10/channels/${channel}/messages?limit=20`,
|
||||
{
|
||||
headers: {
|
||||
Authorization: `Bot ${token}`
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
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"
|
||||
|
||||
type DiskSource = {
|
||||
key: string
|
||||
label: string
|
||||
command: string
|
||||
args?: string[]
|
||||
}
|
||||
|
||||
function getCommand(source: DiskSource) {
|
||||
function getEnvCommand(source: DiskSource) {
|
||||
const envKey = `DISK_COMMAND_${source.key.toUpperCase()}`
|
||||
const legacyEnvKey =
|
||||
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) => {
|
||||
exec(command, (error, stdout, stderr) => {
|
||||
if (error) {
|
||||
@@ -31,7 +44,10 @@ export default defineEventHandler(async () => {
|
||||
const results = await Promise.all(
|
||||
(diskSources as DiskSource[]).map(async (source) => {
|
||||
try {
|
||||
const output = await runCommand(getCommand(source))
|
||||
const envCommand = getEnvCommand(source)
|
||||
const output = envCommand
|
||||
? await runShellCommand(envCommand)
|
||||
: await runCommand(source.command, source.args || [])
|
||||
return {
|
||||
key: source.key,
|
||||
label: source.label,
|
||||
@@ -39,11 +55,12 @@ export default defineEventHandler(async () => {
|
||||
output
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`Erreur disk source ${source.key}:`, error)
|
||||
return {
|
||||
key: source.key,
|
||||
label: source.label,
|
||||
ok: false,
|
||||
output: `Erreur: ${String(error)}`
|
||||
output: "Erreur lors de l'opération"
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
99
server/api/download-latest.get.ts
Normal file
99
server/api/download-latest.get.ts
Normal file
@@ -0,0 +1,99 @@
|
||||
import {
|
||||
runSsh,
|
||||
shellQuote,
|
||||
resolveFolderRemoteDir,
|
||||
REMOTE_HOST,
|
||||
} from "../utils/ssh.ts"
|
||||
|
||||
import {spawn} from "unenv/node/child_process";
|
||||
|
||||
const isSafeFolder = (value: string) => /^[a-zA-Z0-9._-]+$/.test(value)
|
||||
|
||||
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)
|
||||
})
|
||||
@@ -1,92 +1,27 @@
|
||||
import { execFile, spawn } from "node:child_process"
|
||||
import { Readable } from "node:stream"
|
||||
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>
|
||||
import {
|
||||
runSsh,
|
||||
shellQuote,
|
||||
resolveFolderRemoteDir,
|
||||
REMOTE_HOST,
|
||||
} from "../utils/ssh.ts"
|
||||
import {spawn} from "unenv/node/child_process";
|
||||
|
||||
const isSafeFolder = (value: string) => /^[a-zA-Z0-9._-]+$/.test(value)
|
||||
const isSafeFile = (value: string) => /^[^/\\]+$/.test(value)
|
||||
const shellQuote = (value: string) => `'${value.replace(/'/g, `'\\''`)}'`
|
||||
const isSafeFile = (value: string) => /^[a-zA-Z0-9._-]+$/.test(value)
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
function buildContentDisposition(fileName: string) {
|
||||
const asciiName = fileName.replace(/[^\x20-\x7E]/g, "_").replace(/["\\]/g, "_")
|
||||
return `attachment; filename="${asciiName}"; filename*=UTF-8''${encodeURIComponent(fileName)}`
|
||||
}
|
||||
|
||||
function speedtestStream(event: any) {
|
||||
const size = 128 * 1024 * 1024
|
||||
let sent = 0
|
||||
|
||||
const stream = new Readable({
|
||||
read(chunkSize) {
|
||||
if (sent >= size) {
|
||||
this.push(null)
|
||||
return
|
||||
}
|
||||
|
||||
const remaining = size - sent
|
||||
const chunk = Buffer.alloc(Math.min(chunkSize, remaining), "a")
|
||||
sent += chunk.length
|
||||
this.push(chunk)
|
||||
}
|
||||
})
|
||||
|
||||
setHeader(event, "Content-Type", "application/octet-stream")
|
||||
setHeader(event, "Content-Length", size)
|
||||
return stream
|
||||
}
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
const { folder, file } = getQuery(event)
|
||||
const folderName = typeof folder === "string" ? folder : null
|
||||
const fileName = typeof file === "string" ? file : null
|
||||
|
||||
// Compat mode: utilisé par le test de débit.
|
||||
if (!folderName || !fileName) {
|
||||
return speedtestStream(event)
|
||||
throw createError({ statusCode: 400, statusMessage: "Paramètres manquants" })
|
||||
}
|
||||
|
||||
if (!isSafeFolder(folderName) || !isSafeFile(fileName)) {
|
||||
|
||||
24
server/api/speedtest.get.ts
Normal file
24
server/api/speedtest.get.ts
Normal file
@@ -0,0 +1,24 @@
|
||||
import { Readable } from "node:stream"
|
||||
|
||||
export default defineEventHandler((event) => {
|
||||
const size = 128 * 1024 * 1024
|
||||
let sent = 0
|
||||
|
||||
const stream = new Readable({
|
||||
read(chunkSize) {
|
||||
if (sent >= size) {
|
||||
this.push(null)
|
||||
return
|
||||
}
|
||||
|
||||
const remaining = size - sent
|
||||
const chunk = Buffer.alloc(Math.min(chunkSize, remaining), "a")
|
||||
sent += chunk.length
|
||||
this.push(chunk)
|
||||
}
|
||||
})
|
||||
|
||||
setHeader(event, "Content-Type", "application/octet-stream")
|
||||
setHeader(event, "Content-Length", size)
|
||||
return stream
|
||||
})
|
||||
5
server/api/system.get.ts
Normal file
5
server/api/system.get.ts
Normal file
@@ -0,0 +1,5 @@
|
||||
import { getSystemMetricsSnapshot } from "../plugins/metrics-worker"
|
||||
|
||||
export default defineEventHandler(() => {
|
||||
return getSystemMetricsSnapshot()
|
||||
})
|
||||
@@ -4,19 +4,31 @@
|
||||
"label": "Backup BDD recette",
|
||||
"icon": "mdi:database-export",
|
||||
"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",
|
||||
"label": "Check statut recette",
|
||||
"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",
|
||||
"label": "Backup vaultwarden",
|
||||
"icon": "mdi:data",
|
||||
"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",
|
||||
"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",
|
||||
"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"
|
||||
})
|
||||
}
|
||||
})
|
||||
195
server/plugins/metrics-worker.ts
Normal file
195
server/plugins/metrics-worker.ts
Normal file
@@ -0,0 +1,195 @@
|
||||
import fs from "node:fs"
|
||||
import os from "node:os"
|
||||
import type { SystemMetrics } from "~/types/system"
|
||||
|
||||
type CpuTimesSnapshot = {
|
||||
idle: number
|
||||
total: number
|
||||
}
|
||||
|
||||
type NetworkTotals = {
|
||||
rxBytes: number
|
||||
txBytes: number
|
||||
}
|
||||
|
||||
type NetworkSnapshot = NetworkTotals & {
|
||||
timestamp: number
|
||||
}
|
||||
|
||||
let lastCpuSnapshot: CpuTimesSnapshot | null = null
|
||||
let lastNetworkSnapshot: NetworkSnapshot | null = null
|
||||
let intervalId: NodeJS.Timeout | null = null
|
||||
let latestSnapshot: SystemMetrics = createSnapshot({
|
||||
cpuPercent: 0,
|
||||
incomingMbps: 0,
|
||||
outgoingMbps: 0
|
||||
})
|
||||
|
||||
function createSnapshot(overrides: {
|
||||
cpuPercent: number
|
||||
incomingMbps: number
|
||||
outgoingMbps: number
|
||||
}): SystemMetrics {
|
||||
const totalMemory = os.totalmem()
|
||||
const freeMemory = os.freemem()
|
||||
const usedMemory = totalMemory - freeMemory
|
||||
const memoryPercent = totalMemory > 0 ? Math.round((usedMemory / totalMemory) * 100) : 0
|
||||
|
||||
return {
|
||||
cpuPercent: overrides.cpuPercent,
|
||||
memoryPercent,
|
||||
totalMemory,
|
||||
usedMemory,
|
||||
incomingMbps: overrides.incomingMbps,
|
||||
outgoingMbps: overrides.outgoingMbps,
|
||||
sampledAt: new Date().toISOString()
|
||||
}
|
||||
}
|
||||
|
||||
function getCpuSnapshot(): CpuTimesSnapshot {
|
||||
return os.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 getCpuUsagePercent() {
|
||||
const currentSnapshot = getCpuSnapshot()
|
||||
|
||||
if (!lastCpuSnapshot) {
|
||||
lastCpuSnapshot = currentSnapshot
|
||||
return 0
|
||||
}
|
||||
|
||||
const idleDelta = currentSnapshot.idle - lastCpuSnapshot.idle
|
||||
const totalDelta = currentSnapshot.total - lastCpuSnapshot.total
|
||||
lastCpuSnapshot = currentSnapshot
|
||||
|
||||
if (totalDelta <= 0) {
|
||||
return 0
|
||||
}
|
||||
|
||||
return Math.max(0, Math.min(100, Math.round((1 - idleDelta / totalDelta) * 100)))
|
||||
}
|
||||
|
||||
function getNetworkTotals(): NetworkTotals | null {
|
||||
try {
|
||||
const content = fs.readFileSync("/proc/net/dev", "utf8")
|
||||
|
||||
return content
|
||||
.split("\n")
|
||||
.slice(2)
|
||||
.map((line) => line.trim())
|
||||
.filter(Boolean)
|
||||
.reduce(
|
||||
(totals, line) => {
|
||||
const [namePart, valuesPart] = line.split(":")
|
||||
const interfaceName = namePart?.trim()
|
||||
|
||||
if (!interfaceName || interfaceName === "lo" || !valuesPart) {
|
||||
return totals
|
||||
}
|
||||
|
||||
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)) {
|
||||
totals.rxBytes += rxBytes
|
||||
}
|
||||
|
||||
if (Number.isFinite(txBytes)) {
|
||||
totals.txBytes += txBytes
|
||||
}
|
||||
|
||||
return totals
|
||||
},
|
||||
{ rxBytes: 0, txBytes: 0 }
|
||||
)
|
||||
} catch {
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
function getNetworkRatesMbps() {
|
||||
const totals = getNetworkTotals()
|
||||
const now = Date.now()
|
||||
|
||||
if (!totals) {
|
||||
lastNetworkSnapshot = null
|
||||
return {
|
||||
incomingMbps: 0,
|
||||
outgoingMbps: 0
|
||||
}
|
||||
}
|
||||
|
||||
const currentSnapshot: NetworkSnapshot = {
|
||||
...totals,
|
||||
timestamp: now
|
||||
}
|
||||
|
||||
if (!lastNetworkSnapshot) {
|
||||
lastNetworkSnapshot = currentSnapshot
|
||||
return {
|
||||
incomingMbps: 0,
|
||||
outgoingMbps: 0
|
||||
}
|
||||
}
|
||||
|
||||
const elapsedSeconds = (currentSnapshot.timestamp - lastNetworkSnapshot.timestamp) / 1000
|
||||
|
||||
if (elapsedSeconds <= 0) {
|
||||
lastNetworkSnapshot = currentSnapshot
|
||||
return {
|
||||
incomingMbps: 0,
|
||||
outgoingMbps: 0
|
||||
}
|
||||
}
|
||||
|
||||
const incomingMbps = Math.max(
|
||||
0,
|
||||
Number((((currentSnapshot.rxBytes - lastNetworkSnapshot.rxBytes) * 8) / elapsedSeconds / 1000000).toFixed(2))
|
||||
)
|
||||
const outgoingMbps = Math.max(
|
||||
0,
|
||||
Number((((currentSnapshot.txBytes - lastNetworkSnapshot.txBytes) * 8) / elapsedSeconds / 1000000).toFixed(2))
|
||||
)
|
||||
|
||||
lastNetworkSnapshot = currentSnapshot
|
||||
|
||||
return {
|
||||
incomingMbps,
|
||||
outgoingMbps
|
||||
}
|
||||
}
|
||||
|
||||
function refreshSnapshot() {
|
||||
const cpuPercent = getCpuUsagePercent()
|
||||
const { incomingMbps, outgoingMbps } = getNetworkRatesMbps()
|
||||
|
||||
latestSnapshot = createSnapshot({
|
||||
cpuPercent,
|
||||
incomingMbps,
|
||||
outgoingMbps
|
||||
})
|
||||
}
|
||||
|
||||
export function getSystemMetricsSnapshot() {
|
||||
return latestSnapshot
|
||||
}
|
||||
|
||||
export default defineNitroPlugin(() => {
|
||||
if (intervalId) {
|
||||
return
|
||||
}
|
||||
|
||||
refreshSnapshot()
|
||||
intervalId = setInterval(refreshSnapshot, 2000)
|
||||
})
|
||||
51
server/utils/ssh.ts
Normal file
51
server/utils/ssh.ts
Normal file
@@ -0,0 +1,51 @@
|
||||
import { execFile } from "node:child_process"
|
||||
import {process} from "std-env";
|
||||
import folderMap from "#server/config/backup-folders.json";
|
||||
|
||||
export const REMOTE_HOST = process.env.BACKUPS_REMOTE_HOST
|
||||
export const REMOTE_ROOT = process.env.BACKUPS_REMOTE_ROOT || "/home/malio-b/backups"
|
||||
export const FOLDER_MAP = folderMap as Record<string, string>
|
||||
|
||||
|
||||
export const shellQuote = (value: string) => `'${value.replace(/'/g, `'\\''`)}'`
|
||||
|
||||
export 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"
|
||||
}
|
||||
|
||||
export 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
|
||||
}
|
||||
9
types/system.ts
Normal file
9
types/system.ts
Normal file
@@ -0,0 +1,9 @@
|
||||
export type SystemMetrics = {
|
||||
cpuPercent: number
|
||||
memoryPercent: number
|
||||
totalMemory: number
|
||||
usedMemory: number
|
||||
incomingMbps: number
|
||||
outgoingMbps: number
|
||||
sampledAt: string
|
||||
}
|
||||
Reference in New Issue
Block a user