jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

tgz: fix error handling

Browse Source
This commit is contained in:
Girish Ramakrishnan
2024-07-10 19:09:02 +02:00
parent ad4e0ba9aa
commit 3a21191fba
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/backupformat/tgz.js
View File

@@ -39,19 +39,19 @@ function addToPack(pack, header, options) {
const packEntry = safe(() => pack.entry(header, function (error) {
if (error) {
debug(`addToPack: error adding ${header.name} ${header.type} ${error.message}`);
reject(error);
reject(new BoxError(BoxError.FS_ERROR, error.message));
} else {
debug(`addToPack: added ${header.name} ${header.type}`);
resolve();
}
}));
if (packEntry && options?.input) {
safe(stream.pipeline(options.input, packEntry)); // background
if (!packEntry) {
return reject(new BoxError(BoxError.FS_ERROR, `Failed to add ${header.name}: ${safe.error.message}`));
}
if (!packEntry) {
reject(new Error(`Failed to add ${header.name}: ${safe.error.message}`));
if (options?.input) {
safe(stream.pipeline(options.input, packEntry), { debug }); // background. rely on pack.entry callback for promise completion
}
});
}
@@ -124,7 +124,7 @@ async function tarPack(dataLayout, encryption, uploader, progressCallback) {
pack.finalize();
const [error] = await safe(pipeline);
const [error] = await pipeline; // already wrapped in safe()
if (error) throw new BoxError(BoxError.EXTERNAL_ERROR, `tarPack pipeline error: ${error.message}`);
debug(`tarPack: pipeline finished: ${JSON.stringify(ps.stats())}`);