|
|
@ -1,26 +1,26 @@ |
|
|
#!/usr/bin/env node
|
|
|
#!/usr/bin/env node
|
|
|
|
|
|
|
|
|
// Native
|
|
|
// Native
|
|
|
import {resolve} from 'path'; |
|
|
import {resolve} from 'path' |
|
|
|
|
|
|
|
|
// Packages
|
|
|
// Packages
|
|
|
import Progress from 'progress'; |
|
|
import Progress from 'progress' |
|
|
import {stat} from 'fs-promise'; |
|
|
import {stat} from 'fs-promise' |
|
|
import bytes from 'bytes'; |
|
|
import bytes from 'bytes' |
|
|
import chalk from 'chalk'; |
|
|
import chalk from 'chalk' |
|
|
import minimist from 'minimist'; |
|
|
import minimist from 'minimist' |
|
|
import ms from 'ms'; |
|
|
import ms from 'ms' |
|
|
|
|
|
|
|
|
// Ours
|
|
|
// Ours
|
|
|
import copy from '../lib/copy'; |
|
|
import copy from '../lib/copy' |
|
|
import login from '../lib/login'; |
|
|
import login from '../lib/login' |
|
|
import * as cfg from '../lib/cfg'; |
|
|
import * as cfg from '../lib/cfg' |
|
|
import {version} from '../../package'; |
|
|
import {version} from '../../package' |
|
|
import Logger from '../lib/build-logger'; |
|
|
import Logger from '../lib/build-logger' |
|
|
import Now from '../lib'; |
|
|
import Now from '../lib' |
|
|
import toHumanPath from '../lib/utils/to-human-path'; |
|
|
import toHumanPath from '../lib/utils/to-human-path' |
|
|
import promptOptions from '../lib/utils/prompt-options'; |
|
|
import promptOptions from '../lib/utils/prompt-options' |
|
|
import {handleError, error} from '../lib/error'; |
|
|
import {handleError, error} from '../lib/error' |
|
|
|
|
|
|
|
|
const argv = minimist(process.argv.slice(2), { |
|
|
const argv = minimist(process.argv.slice(2), { |
|
|
string: [ |
|
|
string: [ |
|
|
@ -52,7 +52,7 @@ const argv = minimist(process.argv.slice(2), { |
|
|
'no-clipboard': 'C', |
|
|
'no-clipboard': 'C', |
|
|
'forward-npm': 'N' |
|
|
'forward-npm': 'N' |
|
|
} |
|
|
} |
|
|
}); |
|
|
}) |
|
|
|
|
|
|
|
|
const help = () => { |
|
|
const help = () => { |
|
|
console.log(` |
|
|
console.log(` |
|
|
@ -115,227 +115,243 @@ const help = () => { |
|
|
${chalk.gray('–')} Displays comprehensive help for the subcommand ${chalk.dim('`list`')} |
|
|
${chalk.gray('–')} Displays comprehensive help for the subcommand ${chalk.dim('`list`')} |
|
|
|
|
|
|
|
|
${chalk.cyan('$ now help list')} |
|
|
${chalk.cyan('$ now help list')} |
|
|
`);
|
|
|
`)
|
|
|
}; |
|
|
} |
|
|
|
|
|
|
|
|
let path = argv._[0]; |
|
|
let path = argv._[0] |
|
|
|
|
|
|
|
|
if (null != path) { |
|
|
if (path === null) { |
|
|
|
|
|
path = process.cwd() |
|
|
|
|
|
} else { |
|
|
// if path is relative: resolve
|
|
|
// if path is relative: resolve
|
|
|
// if path is absolute: clear up strange `/` etc
|
|
|
// if path is absolute: clear up strange `/` etc
|
|
|
path = resolve(process.cwd(), path); |
|
|
path = resolve(process.cwd(), path) |
|
|
} else { |
|
|
|
|
|
path = process.cwd(); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
const exit = (code) => { |
|
|
const exit = code => { |
|
|
// we give stdout some time to flush out
|
|
|
// we give stdout some time to flush out
|
|
|
// because there's a node bug where
|
|
|
// because there's a node bug where
|
|
|
// stdout writes are asynchronous
|
|
|
// stdout writes are asynchronous
|
|
|
// https://github.com/nodejs/node/issues/6456
|
|
|
// https://github.com/nodejs/node/issues/6456
|
|
|
setTimeout(() => process.exit(code || 0), 100); |
|
|
setTimeout(() => process.exit(code || 0), 100) |
|
|
}; |
|
|
} |
|
|
|
|
|
|
|
|
// options
|
|
|
// options
|
|
|
const debug = argv.debug; |
|
|
const debug = argv.debug |
|
|
const clipboard = !argv['no-clipboard']; |
|
|
const clipboard = !argv['no-clipboard'] |
|
|
const forwardNpm = argv['forward-npm']; |
|
|
const forwardNpm = argv['forward-npm'] |
|
|
const forceNew = argv.force; |
|
|
const forceNew = argv.force |
|
|
const forceSync = argv.forceSync; |
|
|
const forceSync = argv.forceSync |
|
|
const shouldLogin = argv.login; |
|
|
const shouldLogin = argv.login |
|
|
const wantsPublic = argv.public; |
|
|
const wantsPublic = argv.public |
|
|
const apiUrl = argv.url || 'https://api.zeit.co'; |
|
|
const apiUrl = argv.url || 'https://api.zeit.co' |
|
|
const isTTY = process.stdout.isTTY; |
|
|
const isTTY = process.stdout.isTTY |
|
|
const quiet = !isTTY; |
|
|
const quiet = !isTTY |
|
|
if (argv.config) cfg.setConfigFile(argv.config); |
|
|
|
|
|
const config = cfg.read(); |
|
|
if (argv.config) { |
|
|
const alwaysForwardNpm = config.forwardNpm; |
|
|
cfg.setConfigFile(argv.config) |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
const config = cfg.read() |
|
|
|
|
|
const alwaysForwardNpm = config.forwardNpm |
|
|
|
|
|
|
|
|
if (argv.h || argv.help) { |
|
|
if (argv.h || argv.help) { |
|
|
help(); |
|
|
help() |
|
|
exit(0); |
|
|
exit(0) |
|
|
} else if (argv.v || argv.version) { |
|
|
} else if (argv.v || argv.version) { |
|
|
console.log(chalk.bold('𝚫 now'), version); |
|
|
console.log(chalk.bold('𝚫 now'), version) |
|
|
process.exit(0); |
|
|
process.exit(0) |
|
|
} else if (!(argv.token || config.token) || shouldLogin) { |
|
|
} else if (!(argv.token || config.token) || shouldLogin) { |
|
|
login(apiUrl) |
|
|
login(apiUrl) |
|
|
.then((token) => { |
|
|
.then(token => { |
|
|
if (shouldLogin) { |
|
|
if (shouldLogin) { |
|
|
console.log('> Logged in successfully. Token saved in ~/.now.json'); |
|
|
console.log('> Logged in successfully. Token saved in ~/.now.json') |
|
|
process.exit(0); |
|
|
process.exit(0) |
|
|
} else { |
|
|
} else { |
|
|
sync(token).catch((err) => { |
|
|
sync(token).catch(err => { |
|
|
error(`Unknown error: ${err.stack}`); |
|
|
error(`Unknown error: ${err.stack}`) |
|
|
process.exit(1); |
|
|
process.exit(1) |
|
|
}); |
|
|
}) |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
.catch((e) => { |
|
|
.catch(e => { |
|
|
error(`Authentication error – ${e.message}`); |
|
|
error(`Authentication error – ${e.message}`) |
|
|
process.exit(1); |
|
|
process.exit(1) |
|
|
}); |
|
|
}) |
|
|
} else { |
|
|
} else { |
|
|
sync(argv.token || config.token).catch((err) => { |
|
|
sync(argv.token || config.token).catch(err => { |
|
|
error(`Unknown error: ${err.stack}`); |
|
|
error(`Unknown error: ${err.stack}`) |
|
|
process.exit(1); |
|
|
process.exit(1) |
|
|
}); |
|
|
}) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
async function sync(token) { |
|
|
async function sync(token) { |
|
|
const start = Date.now(); |
|
|
const start = Date.now() |
|
|
|
|
|
|
|
|
if (!quiet) { |
|
|
if (!quiet) { |
|
|
console.log(`> Deploying ${chalk.bold(toHumanPath(path))}`); |
|
|
console.log(`> Deploying ${chalk.bold(toHumanPath(path))}`) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
try { |
|
|
try { |
|
|
await stat(path); |
|
|
await stat(path) |
|
|
} catch (err) { |
|
|
} catch (err) { |
|
|
error(`Could not read directory ${chalk.bold(path)}`); |
|
|
error(`Could not read directory ${chalk.bold(path)}`) |
|
|
process.exit(1); |
|
|
process.exit(1) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
let deploymentType, hasPackage, hasDockerfile; |
|
|
let deploymentType |
|
|
|
|
|
let hasPackage |
|
|
|
|
|
let hasDockerfile |
|
|
|
|
|
|
|
|
if (argv.docker) { |
|
|
if (argv.docker) { |
|
|
if (debug) { |
|
|
if (debug) { |
|
|
console.log(`> [debug] Forcing \`deploymentType\` = \`docker\``); |
|
|
console.log(`> [debug] Forcing \`deploymentType\` = \`docker\``) |
|
|
} |
|
|
} |
|
|
deploymentType = 'docker'; |
|
|
deploymentType = 'docker' |
|
|
} else { |
|
|
} else if (argv.npm) { |
|
|
if (argv.npm) { |
|
|
deploymentType = 'npm' |
|
|
deploymentType = 'npm'; |
|
|
|
|
|
} else { |
|
|
} else { |
|
|
try { |
|
|
try { |
|
|
await stat(resolve(path, 'package.json')); |
|
|
await stat(resolve(path, 'package.json')) |
|
|
} catch (err) { |
|
|
} catch (err) { |
|
|
hasPackage = true; |
|
|
hasPackage = true |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
[hasPackage, hasDockerfile] = await Promise.all([ |
|
|
[hasPackage, hasDockerfile] = await Promise.all([ |
|
|
await (async () => { |
|
|
await (async () => { |
|
|
try { |
|
|
try { |
|
|
await stat(resolve(path, 'package.json')); |
|
|
await stat(resolve(path, 'package.json')) |
|
|
} catch (err) { |
|
|
} catch (err) { |
|
|
return false; |
|
|
return false |
|
|
} |
|
|
} |
|
|
return true; |
|
|
return true |
|
|
})(), |
|
|
})(), |
|
|
await (async () => { |
|
|
await (async () => { |
|
|
try { |
|
|
try { |
|
|
await stat(resolve(path, 'Dockerfile')); |
|
|
await stat(resolve(path, 'Dockerfile')) |
|
|
} catch (err) { |
|
|
} catch (err) { |
|
|
return false; |
|
|
return false |
|
|
} |
|
|
} |
|
|
return true; |
|
|
return true |
|
|
})() |
|
|
})() |
|
|
]); |
|
|
]) |
|
|
|
|
|
|
|
|
if (hasPackage && hasDockerfile) { |
|
|
if (hasPackage && hasDockerfile) { |
|
|
if (debug) console.log('[debug] multiple manifests found, disambiguating'); |
|
|
if (debug) { |
|
|
|
|
|
console.log('[debug] multiple manifests found, disambiguating') |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
if (isTTY) { |
|
|
if (isTTY) { |
|
|
try { |
|
|
try { |
|
|
console.log(`> Two manifests found. Press [${chalk.bold('n')}] to deploy or re-run with --flag`); |
|
|
console.log(`> Two manifests found. Press [${chalk.bold('n')}] to deploy or re-run with --flag`) |
|
|
deploymentType = await promptOptions([ |
|
|
deploymentType = await promptOptions([ |
|
|
['npm', `${chalk.bold('package.json')}\t${chalk.gray(' --npm')} `], |
|
|
['npm', `${chalk.bold('package.json')}\t${chalk.gray(' --npm')} `], |
|
|
['docker', `${chalk.bold('Dockerfile')}\t${chalk.gray('--docker')} `] |
|
|
['docker', `${chalk.bold('Dockerfile')}\t${chalk.gray('--docker')} `] |
|
|
]); |
|
|
]) |
|
|
} catch (err) { |
|
|
} catch (err) { |
|
|
error(err.message); |
|
|
error(err.message) |
|
|
process.exit(1); |
|
|
process.exit(1) |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
error('Ambiguous deployment (`package.json` and `Dockerfile` found). ' + |
|
|
error('Ambiguous deployment (`package.json` and `Dockerfile` found). ' + |
|
|
'Please supply `--npm` or `--docker` to disambiguate.'); |
|
|
'Please supply `--npm` or `--docker` to disambiguate.') |
|
|
} |
|
|
} |
|
|
} else if (hasPackage) { |
|
|
} else if (hasPackage) { |
|
|
if (debug) console.log('[debug] `package.json` found, assuming `deploymentType` = `npm`'); |
|
|
if (debug) { |
|
|
deploymentType = 'npm'; |
|
|
console.log('[debug] `package.json` found, assuming `deploymentType` = `npm`') |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
deploymentType = 'npm' |
|
|
} else if (hasDockerfile) { |
|
|
} else if (hasDockerfile) { |
|
|
if (debug) console.log('[debug] `Dockerfile` found, assuming `deploymentType` = `docker`'); |
|
|
if (debug) { |
|
|
deploymentType = 'docker'; |
|
|
console.log('[debug] `Dockerfile` found, assuming `deploymentType` = `docker`') |
|
|
} else { |
|
|
|
|
|
error(`Could not access a ${chalk.dim('`package.json`')} or ${chalk.dim('`Dockerfile`')} in ${chalk.bold(path)}`); |
|
|
|
|
|
console.log(`> To deploy statically, try: ${chalk.dim(chalk.underline('https://zeit.co/blog/serve-it-now'))}.`); |
|
|
|
|
|
process.exit(1); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
deploymentType = 'docker' |
|
|
|
|
|
} else { |
|
|
|
|
|
error(`Could not access a ${chalk.dim('`package.json`')} or ${chalk.dim('`Dockerfile`')} in ${chalk.bold(path)}`) |
|
|
|
|
|
console.log(`> To deploy statically, try: ${chalk.dim(chalk.underline('https://zeit.co/blog/serve-it-now'))}.`) |
|
|
|
|
|
process.exit(1) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
const now = new Now(apiUrl, token, { debug }); |
|
|
const now = new Now(apiUrl, token, {debug}) |
|
|
const envs = [].concat(argv.env || []); |
|
|
const envs = [].concat(argv.env || []) |
|
|
|
|
|
|
|
|
let secrets; |
|
|
let secrets |
|
|
const findSecret = async (uidOrName) => { |
|
|
const findSecret = async uidOrName => { |
|
|
if (!secrets) secrets = await now.listSecrets(); |
|
|
if (!secrets) { |
|
|
return secrets.filter((secret) => { |
|
|
secrets = await now.listSecrets() |
|
|
return secret.name === uidOrName || secret.uid === uidOrName; |
|
|
} |
|
|
}); |
|
|
|
|
|
}; |
|
|
return secrets.filter(secret => { |
|
|
|
|
|
return secret.name === uidOrName || secret.uid === uidOrName |
|
|
|
|
|
}) |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
const env_ = await Promise.all(envs.map(async (kv) => { |
|
|
const env_ = await Promise.all(envs.map(async kv => { |
|
|
const [key, ...rest] = kv.split('='); |
|
|
const [key, ...rest] = kv.split('=') |
|
|
let val; |
|
|
let val |
|
|
|
|
|
|
|
|
if (rest.length) { |
|
|
if (rest.length > 0) { |
|
|
val = rest.join('='); |
|
|
val = rest.join('=') |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (/[^A-z0-9_]/i.test(key)) { |
|
|
if (/[^A-z0-9_]/i.test(key)) { |
|
|
error(`Invalid ${chalk.dim('-e')} key ${chalk.bold(`"${chalk.bold(key)}"`)}. Only letters, digits and underscores are allowed.`); |
|
|
error(`Invalid ${chalk.dim('-e')} key ${chalk.bold(`"${chalk.bold(key)}"`)}. Only letters, digits and underscores are allowed.`) |
|
|
return process.exit(1); |
|
|
return process.exit(1) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if ('' === key || null == key) { |
|
|
if (key === '' || key === null) { |
|
|
error(`Invalid env option ${chalk.bold(`"${kv}"`)}`); |
|
|
error(`Invalid env option ${chalk.bold(`"${kv}"`)}`) |
|
|
return process.exit(1); |
|
|
return process.exit(1) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (val == null) { |
|
|
if (val === null) { |
|
|
if (!(key in process.env)) { |
|
|
if ((key in process.env)) { |
|
|
error(`No value specified for env ${chalk.bold(`"${chalk.bold(key)}"`)} and it was not found in your env.`); |
|
|
console.log(`> Reading ${chalk.bold(`"${chalk.bold(key)}"`)} from your env (as no value was specified)`) |
|
|
return process.exit(1); |
|
|
|
|
|
} else { |
|
|
|
|
|
console.log(`> Reading ${chalk.bold(`"${chalk.bold(key)}"`)} from your env (as no value was specified)`); |
|
|
|
|
|
// escape value if it begins with @
|
|
|
// escape value if it begins with @
|
|
|
val = process.env[key].replace(/^\@/, '\\@'); |
|
|
val = process.env[key].replace(/^\@/, '\\@') |
|
|
|
|
|
} else { |
|
|
|
|
|
error(`No value specified for env ${chalk.bold(`"${chalk.bold(key)}"`)} and it was not found in your env.`) |
|
|
|
|
|
return process.exit(1) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if ('@' === val[0]) { |
|
|
if (val[0] === '@') { |
|
|
const uidOrName = val.substr(1); |
|
|
const uidOrName = val.substr(1) |
|
|
const secrets = await findSecret(uidOrName); |
|
|
const secrets = await findSecret(uidOrName) |
|
|
if (secrets.length === 0) { |
|
|
if (secrets.length === 0) { |
|
|
if ('' === uidOrName) { |
|
|
if (uidOrName === '') { |
|
|
error(`Empty reference provided for env key ${chalk.bold(`"${chalk.bold(key)}"`)}`); |
|
|
error(`Empty reference provided for env key ${chalk.bold(`"${chalk.bold(key)}"`)}`) |
|
|
} else { |
|
|
} else { |
|
|
error(`No secret found by uid or name ${chalk.bold(`"${uidOrName}"`)}`); |
|
|
error(`No secret found by uid or name ${chalk.bold(`"${uidOrName}"`)}`) |
|
|
} |
|
|
} |
|
|
return process.exit(1); |
|
|
return process.exit(1) |
|
|
} else if (secrets.length > 1) { |
|
|
} else if (secrets.length > 1) { |
|
|
error(`Ambiguous secret ${chalk.bold(`"${uidOrName}"`)} (matches ${chalk.bold(secrets.length)} secrets)`); |
|
|
error(`Ambiguous secret ${chalk.bold(`"${uidOrName}"`)} (matches ${chalk.bold(secrets.length)} secrets)`) |
|
|
return process.exit(1); |
|
|
return process.exit(1) |
|
|
} else { |
|
|
|
|
|
val = { uid: secrets[0].uid }; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
val = {uid: secrets[0].uid} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
return [ |
|
|
return [ |
|
|
key, |
|
|
key, |
|
|
typeof val === 'string' |
|
|
typeof val === 'string' ? val.replace(/^\\@/, '@') : val |
|
|
// add support for escaping the @ as \@
|
|
|
] |
|
|
? val.replace(/^\\@/, '@') |
|
|
})) |
|
|
: val |
|
|
|
|
|
]; |
|
|
const env = {} |
|
|
})); |
|
|
|
|
|
|
|
|
|
|
|
let env = {}; |
|
|
|
|
|
env_ |
|
|
env_ |
|
|
.filter(v => !!v) |
|
|
.filter(v => Boolean(v)) |
|
|
.forEach(([key, val]) => { |
|
|
.forEach(([key, val]) => { |
|
|
if (key in env) console.log(`> ${chalk.yellow('NOTE:')} Overriding duplicate env key ${chalk.bold(`"${key}"`)}`); |
|
|
if (key in env) { |
|
|
|
|
|
console.log(`> ${chalk.yellow('NOTE:')} Overriding duplicate env key ${chalk.bold(`"${key}"`)}`) |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
env[key] = val |
|
|
env[key] = val |
|
|
}); |
|
|
}) |
|
|
|
|
|
|
|
|
try { |
|
|
try { |
|
|
await now.create(path, { |
|
|
await now.create(path, { |
|
|
@ -346,45 +362,49 @@ async function sync (token) { |
|
|
forwardNpm: alwaysForwardNpm || forwardNpm, |
|
|
forwardNpm: alwaysForwardNpm || forwardNpm, |
|
|
quiet, |
|
|
quiet, |
|
|
wantsPublic |
|
|
wantsPublic |
|
|
}); |
|
|
}) |
|
|
} catch (err) { |
|
|
} catch (err) { |
|
|
if (debug) console.log(`> [debug] error: ${err.stack}`); |
|
|
if (debug) { |
|
|
handleError(err); |
|
|
console.log(`> [debug] error: ${err.stack}`) |
|
|
process.exit(1); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
const { url } = now; |
|
|
handleError(err) |
|
|
const elapsed = ms(new Date() - start); |
|
|
process.exit(1) |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
const {url} = now |
|
|
|
|
|
const elapsed = ms(new Date() - start) |
|
|
|
|
|
|
|
|
if (isTTY) { |
|
|
if (isTTY) { |
|
|
if (clipboard) { |
|
|
if (clipboard) { |
|
|
try { |
|
|
try { |
|
|
await copy(url); |
|
|
await copy(url) |
|
|
console.log(`${chalk.cyan('> Ready!')} ${chalk.bold(url)} (copied to clipboard) [${elapsed}]`); |
|
|
console.log(`${chalk.cyan('> Ready!')} ${chalk.bold(url)} (copied to clipboard) [${elapsed}]`) |
|
|
} catch (err) { |
|
|
} catch (err) { |
|
|
console.log(`${chalk.cyan('> Ready!')} ${chalk.bold(url)} [${elapsed}]`); |
|
|
console.log(`${chalk.cyan('> Ready!')} ${chalk.bold(url)} [${elapsed}]`) |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
console.log(`> ${url} [${elapsed}]`); |
|
|
console.log(`> ${url} [${elapsed}]`) |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
process.stdout.write(url); |
|
|
process.stdout.write(url) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
const start_u = new Date(); |
|
|
const startU = new Date() |
|
|
|
|
|
|
|
|
const complete = () => { |
|
|
const complete = () => { |
|
|
if (!quiet) { |
|
|
if (!quiet) { |
|
|
const elapsed_u = ms(new Date() - start_u); |
|
|
const elapsedU = ms(new Date() - startU) |
|
|
console.log(`> Sync complete (${bytes(now.syncAmount)}) [${elapsed_u}] `); |
|
|
console.log(`> Sync complete (${bytes(now.syncAmount)}) [${elapsedU}] `) |
|
|
console.log('> Initializing…'); |
|
|
console.log('> Initializing…') |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// close http2 agent
|
|
|
// close http2 agent
|
|
|
now.close(); |
|
|
now.close() |
|
|
|
|
|
|
|
|
// show build logs
|
|
|
// show build logs
|
|
|
printLogs(now.host); |
|
|
printLogs(now.host) |
|
|
}; |
|
|
} |
|
|
|
|
|
|
|
|
if (now.syncAmount) { |
|
|
if (now.syncAmount) { |
|
|
const bar = new Progress('> Upload [:bar] :percent :etas', { |
|
|
const bar = new Progress('> Upload [:bar] :percent :etas', { |
|
|
@ -392,45 +412,45 @@ async function sync (token) { |
|
|
complete: '=', |
|
|
complete: '=', |
|
|
incomplete: '', |
|
|
incomplete: '', |
|
|
total: now.syncAmount |
|
|
total: now.syncAmount |
|
|
}); |
|
|
}) |
|
|
|
|
|
|
|
|
now.upload(); |
|
|
now.upload() |
|
|
|
|
|
|
|
|
now.on('upload', ({names, data}) => { |
|
|
now.on('upload', ({names, data}) => { |
|
|
const amount = data.length; |
|
|
const amount = data.length |
|
|
if (debug) { |
|
|
if (debug) { |
|
|
console.log(`> [debug] Uploaded: ${names.join(' ')} (${bytes(data.length)})`); |
|
|
console.log(`> [debug] Uploaded: ${names.join(' ')} (${bytes(data.length)})`) |
|
|
} |
|
|
} |
|
|
bar.tick(amount); |
|
|
bar.tick(amount) |
|
|
}); |
|
|
}) |
|
|
|
|
|
|
|
|
now.on('complete', complete); |
|
|
now.on('complete', complete) |
|
|
|
|
|
|
|
|
now.on('error', (err) => { |
|
|
now.on('error', err => { |
|
|
error('Upload failed'); |
|
|
error('Upload failed') |
|
|
handleError(err); |
|
|
handleError(err) |
|
|
process.exit(1); |
|
|
process.exit(1) |
|
|
}); |
|
|
}) |
|
|
} else { |
|
|
} else { |
|
|
if (!quiet) { |
|
|
if (!quiet) { |
|
|
console.log(`> Initializing…`); |
|
|
console.log(`> Initializing…`) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// close http2 agent
|
|
|
// close http2 agent
|
|
|
now.close(); |
|
|
now.close() |
|
|
|
|
|
|
|
|
// show build logs
|
|
|
// show build logs
|
|
|
printLogs(now.host); |
|
|
printLogs(now.host) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
function printLogs(host) { |
|
|
function printLogs(host) { |
|
|
// log build
|
|
|
// log build
|
|
|
const logger = new Logger(host, { debug, quiet }); |
|
|
const logger = new Logger(host, {debug, quiet}) |
|
|
logger.on('close', () => { |
|
|
logger.on('close', () => { |
|
|
if (!quiet) { |
|
|
if (!quiet) { |
|
|
console.log(`${chalk.cyan('> Deployment complete!')}`); |
|
|
console.log(`${chalk.cyan('> Deployment complete!')}`) |
|
|
} |
|
|
} |
|
|
process.exit(0); |
|
|
process.exit(0) |
|
|
}); |
|
|
}) |
|
|
} |
|
|
} |
|
|
|
Leo Lamprecht
8 years ago