fix await login unzip build

This commit is contained in:
Eugenio Romano
2018-09-11 22:15:53 +01:00
parent d037a16d3c
commit 3d5da1e622
2 changed files with 11 additions and 6 deletions

View File

@@ -76,7 +76,7 @@ async function main() {
hostEcm: program.host hostEcm: program.host
}); });
alfrescoJsApi.login(program.username, program.password); await alfrescoJsApi.login(program.username, program.password);
let zipDemoNode; let zipDemoNode;

View File

@@ -12,13 +12,15 @@ var exec = require('child_process').exec;
var alfrescoJsApi; var alfrescoJsApi;
unzipRetry = (url, outputFolder, pacakge, tentativeNumber) => { unzipRetry = (url, outputFolder, pacakge, tentativeNumber) => {
console.log(`Unzip ${pacakge}` + path.join(__dirname, `../${pacakge}.zip`)); console.log(`Unzip ${pacakge} in ` + path.join(__dirname, `../${pacakge}.zip`));
fs.createReadStream(path.join(__dirname, `../${pacakge}.zip`)) fs.createReadStream(path.join(__dirname, `../${pacakge}.zip`))
.pipe(unzip.Extract({path: path.join(__dirname, `../${outputFolder}/@alfresco/`)})) .pipe(unzip.Extract({path: path.join(__dirname, `../${outputFolder}/@alfresco/`)}))
.on('error', () => { .on('error', (error) => {
console.log('Error' + error)
if (tentativeNumber <= 4) { if (tentativeNumber <= 4) {
fs.unlinkSync(path.join(__dirname, `../${pacakge}.zip`));
setTimeout(() => { setTimeout(() => {
downloadZip(tentativeNumber, url, outputFolder, pacakge); downloadZip(url, outputFolder, pacakge, tentativeNumber);
}, 10000); }, 10000);
} }
}) })
@@ -48,9 +50,11 @@ downloadZip = async (url, outputFolder, pacakge, tentativeNumber) => {
return await http.get(`http://${url}`, (response) => { return await http.get(`http://${url}`, (response) => {
response.pipe(file); response.pipe(file);
file.on('finish', async () => { file.on('finish', async () => {
file.close(() => {
unzipRetry(url, outputFolder, pacakge, tentativeNumber); unzipRetry(url, outputFolder, pacakge, tentativeNumber);
}); });
}); });
});
} }
getUrl = async (folder, pacakge) => { getUrl = async (folder, pacakge) => {
@@ -64,6 +68,7 @@ getUrl = async (folder, pacakge) => {
console.log('error: ' + error); console.log('error: ' + error);
} }
return await alfrescoJsApi.content.getContentUrl(zipDemoNode.entry.id, true); return await alfrescoJsApi.content.getContentUrl(zipDemoNode.entry.id, true);
} }
@@ -88,7 +93,7 @@ async function main() {
program.output = 'node_modules' program.output = 'node_modules'
} }
alfrescoJsApi.login(program.username, program.password); await alfrescoJsApi.login(program.username, program.password);
let coreUrl = await getUrl(program.folder, 'core'); let coreUrl = await getUrl(program.folder, 'core');
downloadZip(coreUrl, program.output, 'core'); downloadZip(coreUrl, program.output, 'core');