feat(emulate): ensure emulate and run are choosing an IP and port that are available.

Author: jthoms1

lib/ionic/emulate.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var chalk = require('chalk');
-var serveUtil = require('../utils/serve');
 var extend = require('../utils/extend');
 var npmScripts = require('../utils/npmScripts');
 var os = require('os');
@@ -49,16 +48,14 @@ function run(ionic, argv, rawCliArguments) {
   var cmdName = argv._[0].toLowerCase();
   var hasBuildCommand = false;
   var hasServeCommand = false;
-  var address = argv.address || serveUtil.DEFAULT_ADDRESS;
-  var port = argv.port || serveUtil.DEFAULT_HTTP_PORT;
 
   var isLiveReload = argv.livereload || argv['live-reload'] || argv.l || false;
 
   // If platform was not passed then add it to the rawArgs
   var runPlatform = argv._[1];
   if (!runPlatform) {
     runPlatform = 'ios';
-    rawArgs.push(runPlatform);
+    rawArgs.splice(1, 0, runPlatform);
   }
 
   if (runPlatform === 'ios' && os.platform() !== 'darwin') {
@@ -92,12 +89,9 @@ function run(ionic, argv, rawCliArguments) {
     if (isLiveReload && hasServeCommand) {
 
       // using app-scripts and livereload is requested
-      return npmScripts.runIonicScript('serve', ['-p', port, '--address', address, '--nobrowser'])
-        .then(function() {
-          return ConfigXml.setConfigXml(process.cwd(), {
-            devServer: serveUtil.getUrl(address, port)
-          });
-        });
+      // Also remove commandName from the rawArgs passed
+      return cordovaUtils.startAppScriptsServer(argv);
+
     } else if (isLiveReload) {
 
       // not an app-scripts project but the user wants livereload

lib/ionic/run.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var chalk = require('chalk');
-var serveUtil = require('../utils/serve');
 var extend = require('../utils/extend');
 var npmScripts = require('../utils/npmScripts');
 var os = require('os');
@@ -49,16 +48,14 @@ function run(ionic, argv, rawCliArguments) {
   var cmdName = argv._[0].toLowerCase();
   var hasBuildCommand = false;
   var hasServeCommand = false;
-  var address = argv.address || serveUtil.DEFAULT_ADDRESS;
-  var port = argv.port || serveUtil.DEFAULT_HTTP_PORT;
 
   var isLiveReload = argv.livereload || argv['live-reload'] || argv.l || false;
 
   // If platform was not passed then add it to the rawArgs
   var runPlatform = argv._[1];
   if (!runPlatform) {
     runPlatform = 'ios';
-    rawArgs.push(runPlatform);
+    rawArgs.splice(1, 0, runPlatform);
   }
 
   if (runPlatform === 'ios' && os.platform() !== 'darwin') {
@@ -92,12 +89,8 @@ function run(ionic, argv, rawCliArguments) {
     if (isLiveReload && hasServeCommand) {
 
       // using app-scripts and livereload is requested
-      return npmScripts.runIonicScript('serve', ['-p', port, '--address', address, '--nobrowser'])
-        .then(function() {
-          return ConfigXml.setConfigXml(process.cwd(), {
-            devServer: serveUtil.getUrl(address, port)
-          });
-        });
+      // Also remove commandName from the rawArgs passed
+      return cordovaUtils.startAppScriptsServer(argv);
     } else if (isLiveReload) {
 
       // not an app-scripts project but the user wants livereload

lib/utils/cordova.js

@@ -13,6 +13,7 @@ var ConfigXml = IonicAppLib.configXml;
 var childProcess = require('child_process');
 var childExec = childProcess.exec;
 var promiseExec = Q.denodeify(childExec);
+var npmScripts = require('../utils/npmScripts');
 
 /**
  * Returns true or false after checking if the platform exists
@@ -266,12 +267,59 @@ function setupLiveReload(argv, baseDir) {
   });
 }
 
+/**
+ * Start the app scripts server for emulator or device
+ *
+ * @param {Number} port
+ * @param {String} address
+ * @return {Promise} Promise upon completion
+ */
+function startAppScriptsServer(argv) {
+  var options = _.extend(argv, {
+    runLivereload: true,
+    isPlatformServe: true
+  });
+
+  return Serve.getAddress(options)
+  .then(function() {
+
+    // Check that the server port is available
+    return Serve.checkPorts(true, options.port, options.address, options);
+  })
+  .then(function() {
+
+    // Check that the liveReload port is available
+    return Serve.checkPorts(false, options.liveReloadPort, options.address, options);
+  })
+  .then(function() {
+
+    // Execute the serve command from app-scripts
+    // Also remove platform from the raw args passed
+    return npmScripts.runIonicScript('serve',
+      [
+        '--port', options.port,
+        '--address', options.address,
+        '--liveReloadPort', options.liveReloadPort,
+        '--nobrowser'
+      ]
+      .concat(options.consolelogs ? '--consolelogs' : [])
+      .concat(options.serverlogs ? '--serverlogs' : [])
+    );
+  })
+  .then(function() {
+    return ConfigXml.setConfigXml(process.cwd(), {
+      devServer: Serve.host(options.address, options.port)
+    });
+  });
+}
+
 module.exports = {
   isPlatformInstalled: isPlatformInstalled,
   arePluginsInstalled: arePluginsInstalled,
   installPlatform: installPlatform,
   installPlugins: installPlugins,
   execCordovaCommand: execCordovaCommand,
   filterArgumentsForCordova: filterArgumentsForCordova,
-  setupLiveReload: setupLiveReload
+  setupLiveReload: setupLiveReload,
+  startAppScriptsServer: startAppScriptsServer
 };

lib/utils/npmScripts.js

@@ -20,11 +20,12 @@ function hasIonicScript(name) {
 }
 
 function runIonicScript(name, argv) {
-  var spawn = require('cross-spawn-async');
+  var spawn = require('cross-spawn-async');  
   var scriptName = getScriptName(name);
   var q = Q.defer();
 
-  var scriptSpawn = spawn('npm', ['run', scriptName, '--', '--colors'].concat(argv || []), [process.stdin, 'pipe', process.stderr])
+  process.env['FORCE_COLOR'] = true;
+  var scriptSpawn = spawn('npm', ['run', scriptName, '--'].concat(argv || []), [process.stdin, 'pipe', process.stderr])
     .on('error', function(err) {
       log.debug('Spawn command', scriptName, 'failed');
       q.reject('Unable to run spawn command ' + err);
@@ -48,6 +49,11 @@ function runIonicScript(name, argv) {
     }
     return q.resolve();
   });
+
+  // If this process ends ensure that we killed the spawned child
+  process.on('exit', function() {
+    scriptSpawn.kill();
+  });
 
   return q.promise;
 }