From 49661297ab72e4b0d730c958d1e345c82baac83c Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 12 Oct 2018 12:25:28 +0300 Subject: [PATCH] fix(server) crash on open error (#196) --- bin/cloudcmd.js | 7 +++++-- server/server.js | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bin/cloudcmd.js b/bin/cloudcmd.js index a03fc557..297e0536 100755 --- a/bin/cloudcmd.js +++ b/bin/cloudcmd.js @@ -217,8 +217,11 @@ function version() { function start(config) { const SERVER = DIR_SERVER + 'server'; - if (args.server) - require(SERVER)(config); + if (!args.server) + return; + + const server = require(SERVER); + server(config); } function port(arg) { diff --git a/server/server.js b/server/server.js index 70122631..57eba761 100644 --- a/server/server.js +++ b/server/server.js @@ -7,6 +7,7 @@ const http = require('http'); const {promisify} = require('util'); const currify = require('currify'); const squad = require('squad'); +const tryToCatch = require('try-to-catch'); const config = require(DIR_SERVER + 'config'); @@ -62,6 +63,9 @@ module.exports = async (options) => { if (!config('open')) return; - opn(url); + const [openError] = await tryToCatch(opn, url); + + if (openError) + exit('cloudcmd --open:', openError); };