From cd7edee3bd213362eff1402af559b4d56a96d650 Mon Sep 17 00:00:00 2001 From: Nicolas Meienberger Date: Thu, 15 Jan 2026 08:15:42 +0100 Subject: [PATCH] chore: pr feedbacks --- .../backups/__tests__/backups.service.test.ts | 12 ++++++------ app/server/utils/restic.ts | 8 ++++---- vite.config.ts | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/server/modules/backups/__tests__/backups.service.test.ts b/app/server/modules/backups/__tests__/backups.service.test.ts index 2c70f82e..d99c5819 100644 --- a/app/server/modules/backups/__tests__/backups.service.test.ts +++ b/app/server/modules/backups/__tests__/backups.service.test.ts @@ -7,7 +7,7 @@ import { generateBackupOutput } from "~/test/helpers/restic"; import { faker } from "@faker-js/faker"; import * as spawnModule from "~/server/utils/spawn"; -const resticBackupMock = mock(() => Promise.resolve({ exitCode: 0, stdout: "", stderr: "" })); +const resticBackupMock = mock(() => Promise.resolve({ exitCode: 0, summary: "", error: "" })); beforeEach(() => { resticBackupMock.mockClear(); @@ -31,7 +31,7 @@ describe("execute backup", () => { expect(schedule.nextBackupAt).toBeNull(); resticBackupMock.mockImplementationOnce(() => - Promise.resolve({ exitCode: 0, stdout: generateBackupOutput(), stderr: "" }), + Promise.resolve({ exitCode: 0, summary: generateBackupOutput(), error: "" }), ); // act @@ -76,7 +76,7 @@ describe("execute backup", () => { }); resticBackupMock.mockImplementationOnce(() => - Promise.resolve({ exitCode: 0, stdout: generateBackupOutput(), stderr: "" }), + Promise.resolve({ exitCode: 0, summary: generateBackupOutput(), error: "" }), ); // act @@ -97,7 +97,7 @@ describe("execute backup", () => { resticBackupMock.mockImplementation(async () => { await new Promise((resolve) => setTimeout(resolve, 100)); - return Promise.resolve({ exitCode: 0, stdout: generateBackupOutput(), stderr: "" }); + return Promise.resolve({ exitCode: 0, summary: generateBackupOutput(), error: "" }); }); // act @@ -119,7 +119,7 @@ describe("execute backup", () => { }); resticBackupMock.mockImplementationOnce(() => - Promise.resolve({ exitCode: 3, stdout: generateBackupOutput(), stderr: "Some error occurred" }), + Promise.resolve({ exitCode: 3, summary: generateBackupOutput(), error: "Some error occurred" }), ); // act @@ -140,7 +140,7 @@ describe("execute backup", () => { }); resticBackupMock.mockImplementationOnce(() => - Promise.resolve({ exitCode: 1, stdout: generateBackupOutput(), stderr: "Some error occurred" }), + Promise.resolve({ exitCode: 1, summary: generateBackupOutput(), error: "Some error occurred" }), ); // act diff --git a/app/server/utils/restic.ts b/app/server/utils/restic.ts index 23a6e408..dd5f7b64 100644 --- a/app/server/utils/restic.ts +++ b/app/server/utils/restic.ts @@ -9,7 +9,7 @@ import { config as appConfig } from "../core/config"; import { logger } from "./logger"; import { cryptoUtils } from "./crypto"; import type { RetentionPolicy } from "../modules/backups/backups.dto"; -import { safeSpawn } from "./spawn"; +import { safeSpawn, exec } from "./spawn"; import type { CompressionMode, RepositoryConfig, OverwriteMode, BandwidthLimit } from "~/schemas/restic"; import { ResticError } from "./errors"; @@ -355,8 +355,8 @@ const backup = async ( }, }); - includeFile && (await fs.unlink(includeFile).catch(() => {})); - excludeFile && (await fs.unlink(excludeFile).catch(() => {})); + if (includeFile) await fs.unlink(includeFile).catch(() => {}); + if (excludeFile) await fs.unlink(excludeFile).catch(() => {}); await cleanupTemporaryKeys(env); if (options?.signal?.aborted) { @@ -385,7 +385,7 @@ const backup = async ( summaryLine = "{}"; } - logger.debug(`Restic restore output last line: ${summaryLine}`); + logger.debug(`Restic backup output last line: ${summaryLine}`); const result = backupOutputSchema(summaryLine); if (result instanceof type.errors) { diff --git a/vite.config.ts b/vite.config.ts index a21be80a..910ccc06 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -14,7 +14,7 @@ export default defineConfig({ }, }, server: { - host: true, + host: '0.0.0.0', port: 4096, }, });