Comparing version 2.9.19 to 2.9.20
{ | ||
"name": "akkeris", | ||
"version": "2.9.19", | ||
"version": "2.9.20", | ||
"description": "Akkeris CLI", | ||
@@ -5,0 +5,0 @@ "main": "aka.js", |
@@ -27,3 +27,3 @@ "use strict" | ||
function create(appkit, args) { | ||
async function create(appkit, args) { | ||
if(!args.NAME) { | ||
@@ -43,11 +43,11 @@ args.NAME = rand.name() + Math.floor(Math.random() * 10000); | ||
appkit.api.post(JSON.stringify(payload), '/apps', (err, app) => { | ||
if(err) { | ||
task.end('error'); | ||
return appkit.terminal.error(err); | ||
} else { | ||
task.end('ok'); | ||
console.log(appkit.terminal.markdown('##' + app.web_url + '##')); | ||
} | ||
}); | ||
try { | ||
const app = await appkit.api.post(JSON.stringify(payload), '/apps'); | ||
await appkit.api.post(JSON.stringify({app: `${args.NAME}-${args.space}`}), '/favorites') | ||
task.end('ok'); | ||
console.log(appkit.terminal.markdown('##' + app.web_url + '##')); | ||
} catch (err) { | ||
task.end('error'); | ||
return appkit.terminal.error(err); | ||
} | ||
} | ||
@@ -54,0 +54,0 @@ |
@@ -37,34 +37,35 @@ "use strict" | ||
let subpath = ''; | ||
if(args.site.startsWith("https://")) { | ||
let parsed = new URL(args.site); | ||
args.site = parsed.hostname; | ||
subpath = parsed.pathname; | ||
if ( | ||
(args.app && args.site) || (!args.site && !args.app) || | ||
(args.app && args.app === '') || | ||
(args.site && args.site === '') | ||
) { | ||
return appkit.terminal.error('Please specify either an app OR site (-a or -s).') | ||
} | ||
if(!args.site && !args.app) { | ||
return appkit.terminal.error('Please specify either an app or a site (-a or -s).') | ||
} | ||
try { | ||
if (args.site && args.site !== ''){ | ||
if(args.app) { | ||
return appkit.terminal.error('Please specify either an app or a site (-a or -s).') | ||
if (args.site) { | ||
if (!(/http(s)?:\/\//.test(args.site))) { | ||
args.site = `https://${args.site}`; | ||
} | ||
({ hostname: args.site, pathname: subpath} = new URL(args.site)); | ||
args.site = clean_site(args.site); | ||
data = await get(`/sites/${args.site}/routes`); | ||
} else { | ||
if(args.site) { | ||
return appkit.terminal.error('Please specify either an app or a site (-a or -s).') | ||
} | ||
data = await get(`/apps/${args.app}/routes`); | ||
} | ||
if(!data || data.length === 0) { | ||
return console.log(appkit.terminal.markdown("**===** There were no routes found.")) | ||
} | ||
let routes = data.sort((x, y) => x.source_path < y.source_path ? -1 : 1).filter((x) => x.source_path.startsWith(subpath)); | ||
for (let route of routes) { | ||
let route_app = route.app.name | ||
let domain = route.site.domain | ||
let app = await app_or_error(appkit, route_app) | ||
console.log(appkit.terminal.markdown(`**→ Route (${route.id})** ${appkit.terminal.friendly_date(new Date(route.created_at))} | ||
##https://${clean_forward_slash(domain)}${route.source_path} ➝ ${clean_forward_slash(app.web_url)}${route.target_path}## | ||
`)) | ||
for (let i = 0; i < routes.length; i++) { | ||
const route = routes[i]; | ||
const app = await app_or_error(appkit, route.app.name) | ||
console.log(appkit.terminal.markdown(`**→ Route (${route.id})** ${appkit.terminal.friendly_date(new Date(route.created_at))}`)); | ||
console.log(appkit.terminal.markdown(` ##https://${clean_forward_slash(route.site.domain)}${route.source_path} ➝ ${clean_forward_slash(app.web_url)}${route.target_path}##`)); | ||
(i !== routes.length - 1) && console.log(); // don't add newline on last route | ||
} | ||
@@ -71,0 +72,0 @@ } catch(e) { |
251419
6607