FIX race condition in startup of verdaccio && FIX typos

This commit is contained in:
Norbert de Langen 2019-06-03 20:26:24 +02:00
parent 26f4c04440
commit 7c59cbf1eb

View File

@ -4,6 +4,7 @@ import inquirer from 'inquirer';
import chalk from 'chalk';
import detectFreePort from 'detect-port';
import { stripIndents } from 'common-tags';
import fs from 'fs';
import nodeCleanup from 'node-cleanup';
@ -15,9 +16,10 @@ let verdaccioProcess;
const startVerdaccio = port => {
let resolved = false;
return new Promise((res, rej) => {
return Promise.race([
new Promise(res => {
verdaccioProcess = spawn('npx', [
'verdaccio@4.0.0-beta.1',
'verdaccio@4.0.1',
'-c',
'scripts/verdaccio.yaml',
'-l',
@ -29,14 +31,25 @@ const startVerdaccio = port => {
res(url);
resolved = true;
}
fs.appendFile('verdaccio.log', data, err => {
if (err) {
throw err;
}
});
});
}),
new Promise((res, rej) => {
setTimeout(() => {
if (!resolved) {
rej(new Error(`TIMEOUT - verdaccio didn't start within 60s`));
resolved = true;
verdaccioProcess.kill();
}
}, 60000);
});
}),
]);
};
const registryUrl = (command, url) =>
new Promise((res, rej) => {
@ -145,7 +158,7 @@ const askForReset = () =>
type: 'confirm',
message: `${chalk.red(
'THIS IS BAD'
)} looks like something bad hapened, OR you're already using a local registry, shall we reset to the default registry https://registry.npmjs.org/ ?`,
)} looks like something bad happened, OR you're already using a local registry, shall we reset to the default registry https://registry.npmjs.org/ ?`,
name: 'sure',
},
])