Skip to content

Fix system backup download execution #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dankritz merged 1 commit into from
Apr 30, 2026
Merged

Fix system backup download execution #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 57 additions & 2 deletions apps/api/src/system-backup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,28 @@ function run(command: string, args: string[], options: CommandOptions = {}): Pro
});
}

function output(command: string, args: string[], options: CommandOptions = {}): Promise<string> {
return new Promise((resolve, reject) => {
const child = spawn(command, args, {
cwd: options.cwd,
stdio: ['ignore', 'pipe', 'pipe']
});
const stdout: Buffer[] = [];
const stderr: Buffer[] = [];

child.stdout?.on('data', (chunk: Buffer) => stdout.push(chunk));
child.stderr?.on('data', (chunk: Buffer) => stderr.push(chunk));
child.on('error', reject);
child.on('close', (code) => {
if (code === 0) {
resolve(Buffer.concat(stdout).toString('utf8').trim());
return;
}
reject(new Error(`${command} ${args.join(' ')} failed with exit code ${code}: ${Buffer.concat(stderr).toString('utf8')}`));
});
});
}

async function copyIfExists(source: string, destination: string): Promise<boolean> {
try {
await fs.cp(source, destination, { recursive: true, force: true, errorOnExist: false });
Expand All @@ -93,6 +115,37 @@ async function copyIfExists(source: string, destination: string): Promise<boolea
}
}

function composeProjectName(config: Config): string {
return path.basename(config.installDir).toLowerCase().replace(/[^a-z0-9_-]/g, '');
}

async function postgresContainerName(config: Config): Promise<string> {
const project = composeProjectName(config);
const byProject = await output('docker', [
'ps',
'--filter',
`label=com.docker.compose.project=${project}`,
'--filter',
'label=com.docker.compose.service=postgres',
'--format',
'{{.Names}}'
]);
const projectMatch = byProject.split('\n').find(Boolean);
if (projectMatch) return projectMatch;

const byService = await output('docker', [
'ps',
'--filter',
'label=com.docker.compose.service=postgres',
'--format',
'{{.Names}}'
]);
const serviceMatch = byService.split('\n').find(Boolean);
if (serviceMatch) return serviceMatch;

return `${project}-postgres-1`;
Copy link
Copy Markdown

@kilo-code-bot kilo-code-bot Bot Apr 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WARNING: Defaults to ${project}-postgres-1 if no labeled container found. If the actual container name differs, backup/restore will fail.

Consider adding error handling or validation to ensure the container exists before proceeding.

}

export async function createSystemBackup(config: Config): Promise<BackupArchive> {
const tempRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'vibestack-backup-'));
const backupRoot = path.join(tempRoot, 'backup');
Expand All @@ -106,7 +159,8 @@ export async function createSystemBackup(config: Config): Promise<BackupArchive>
const composeCopied = await copyIfExists(path.join(config.sourceDir, 'docker-compose.yml'), path.join(configDir, 'docker-compose.yml'));
const secretsCopied = await copyIfExists(path.join(config.sourceDir, 'secrets'), path.join(configDir, 'secrets'));

await run('docker', ['compose', '--project-directory', config.sourceDir, 'exec', '-T', 'postgres', 'pg_dump', '-U', 'vibestack', '--clean', '--if-exists', '--no-owner', '--no-privileges', 'vibestack'], {
const postgresContainer = await postgresContainerName(config);
await run('docker', ['exec', postgresContainer, 'pg_dump', '-U', 'vibestack', '--clean', '--if-exists', '--no-owner', '--no-privileges', 'vibestack'], {
stdoutPath: path.join(backupRoot, 'database.sql')
});

Expand Down Expand Up @@ -154,7 +208,8 @@ export async function restoreSystemBackup(config: Config, archivePath: string):
const databasePath = path.join(restoreRoot, 'database.sql');
await fs.access(databasePath);

await run('docker', ['compose', '--project-directory', config.sourceDir, 'exec', '-T', 'postgres', 'psql', '-U', 'vibestack', 'vibestack'], {
const postgresContainer = await postgresContainerName(config);
await run('docker', ['exec', '-i', postgresContainer, 'psql', '-U', 'vibestack', 'vibestack'], {
stdinPath: databasePath
});
const restoredEnv = await copyIfExists(path.join(restoreRoot, 'config', '.env'), path.join(config.sourceDir, '.env'));
Expand Down
Loading