fix : env

Reviewed-on: #10

.env.example

@@ -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=

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [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)
 
 

components/BackupRun.vue

@@ -79,6 +79,7 @@
 <script setup lang="ts">
 import { computed, onMounted, ref } from "vue"
 import { Icon as IconifyIcon } from "@iconify/vue"
+import { useApiAuthHeader } from "~/composables/useApiAuth"
 
 type BackupScript = {
   key: string
@@ -118,6 +119,7 @@ const scripts = ref<BackupScript[]>([])
 const output = ref<string>("")
 const message = ref<string>("")
 const isError = ref(false)
+const apiAuthHeader = useApiAuthHeader()
 
 const statusClass = computed(() => (isError.value ? "status-error" : "status-success"))
 
@@ -134,12 +136,14 @@ const loadScripts = async () => {
     downloadFolders: []
   })
   try {
-    const data = await $fetch<BackupScriptListResponse>("/api/backup-script")
+    const data = await $fetch<BackupScriptListResponse>("/api/backup-script", {
+      headers: apiAuthHeader
+    })
     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: "",
@@ -162,7 +166,8 @@ const runScript = async (key: string) => {
   try {
     const data = await $fetch<BackupScriptRunResponse>("/api/backup-script", {
       method: "POST",
-      body: { key }
+      body: { key },
+      headers: apiAuthHeader
     })
     message.value = `${data.label} execute avec succes`
     output.value = data.output || "Aucune sortie retournee."
@@ -173,8 +178,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", {

components/Speed-test.vue

@@ -4,8 +4,8 @@
       <h2 class="card-title">Speedtest</h2>
       <button
         class="reload-btn"
-        @click="runTests"
         :disabled="isTesting"
+        @click="runTests"
       >
         <IconifyIcon
           icon="mdi:reload"

components/StatusSite.vue

@@ -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'"

composables/useApiAuth.ts

@@ -0,0 +1,86 @@
+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 async function downloadApiFile(url: string, fileNameFallback: string) {
+    // Les telechargements passent aussi par fetch pour pouvoir envoyer
+    // le header Authorization, contrairement a un simple <a href>.
+    const response = await fetch(url, {
+        headers: useApiAuthHeader()
+    })
+
+    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)
+        }
+    }
+}

eslint.config.mjs

@@ -0,0 +1,3 @@
+import createConfigForNuxt from "@nuxt/eslint-config"
+
+export default createConfigForNuxt()

layouts/default.vue

@@ -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>

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",

pages/backup.vue

@@ -132,6 +132,15 @@ const triggerDownload = (folder: string, file: string) => {
   link.remove()
 }
 
+const triggerBatchDownload = (folders: string[]) => {
+  const link = document.createElement("a")
+  link.href = `/api/download-latest?folders=${encodeURIComponent(folders.join(","))}`
+  link.style.display = "none"
+  document.body.appendChild(link)
+  link.click()
+  link.remove()
+}
+
 const downloadLatestBackup = async (folder: string) => {
   const latestFile = await fetchLatestBackup(folder)
 
@@ -147,6 +156,11 @@ const handleScriptResult = async (payload: ScriptResult) => {
     return
   }
 
+  if (payload.downloadFolders.length > 1) {
+    triggerBatchDownload(payload.downloadFolders)
+    return
+  }
+
   for (const folder of payload.downloadFolders) {
     try {
       await downloadLatestBackup(folder)

pages/index.vue

@@ -33,7 +33,7 @@
             </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>
@@ -47,8 +47,8 @@
 </template>
 
 <script setup lang="ts">
-definePageMeta({layout: false})
 import {computed, onMounted, ref} from "vue"
+definePageMeta({layout: false})
 
 type DiskSourceResult = {
   key: string
@@ -74,7 +74,6 @@ type DiagramItem = {
   totalText: string
 }
 
-const selectedBackup = ref<string | null>(null)
 const rawResults = ref<DiskSourceResult[]>([])
 const loading = ref(false)
 const chartRadius = 52

server/api/backups.get.ts

@@ -1,9 +1,9 @@
 import { execFile } 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 MAX_FILES_PER_FOLDER = Number(process.env.BACKUPS_MAX_FILES || "200")
+const REMOTE_HOST = process.env.BACKUPS_REMOTE_HOST
+const REMOTE_ROOT = process.env.BACKUPS_REMOTE_ROOT
+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>

server/api/disk.get.ts

@@ -12,7 +12,7 @@ function getCommand(source: DiskSource) {
   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> {
@@ -31,7 +31,13 @@ export default defineEventHandler(async () => {
   const results = await Promise.all(
     (diskSources as DiskSource[]).map(async (source) => {
       try {
-        const output = await runCommand(getCommand(source))
+        const command = getCommand(source)
+
+        if (!command) {
+          throw new Error(`Commande manquante pour ${source.key}`)
+        }
+
+        const output = await runCommand(command)
         return {
           key: source.key,
           label: source.label,

server/api/download-latest.get.ts

@@ -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)
+})

server/api/download.get.ts

@@ -56,7 +56,7 @@ function buildContentDisposition(fileName: string) {
   return `attachment; filename="${asciiName}"; filename*=UTF-8''${encodeURIComponent(fileName)}`
 }
 
-function speedtestStream(event: any) {
+function speedtestStream(event: H3Event) {
   const size = 128 * 1024 * 1024
   let sent = 0