using stream.pipeline for better handling errors

This commit is contained in:
SPRINX0\prochazka
2025-03-04 09:51:29 +01:00
parent 69f781d3de
commit beca5c6e45
13 changed files with 87 additions and 96 deletions

View File

@@ -5,6 +5,7 @@ const { splitQueryStream } = require('dbgate-query-splitter/lib/splitQueryStream
const download = require('./download');
const stream = require('stream');
const { getLogger } = require('dbgate-tools');
const streamPipeline = require('../utility/streamPipeline');
const logger = getLogger('importDb');
@@ -43,17 +44,6 @@ class ImportStream extends stream.Transform {
}
}
function awaitStreamEnd(stream) {
return new Promise((resolve, reject) => {
stream.once('end', () => {
resolve(true);
});
stream.once('error', err => {
reject(err);
});
});
}
async function importDatabase({ connection = undefined, systemConnection = undefined, driver = undefined, inputFile }) {
logger.info(`Importing database`);
@@ -72,9 +62,8 @@ async function importDatabase({ connection = undefined, systemConnection = undef
returnRichInfo: true,
});
const importStream = new ImportStream(dbhan, driver);
// @ts-ignore
splittedStream.pipe(importStream);
await awaitStreamEnd(importStream);
await streamPipeline(splittedStream, importStream);
} finally {
if (!systemConnection) {
await driver.close(dbhan);