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';
 
 varchalk=require('chalk');
-varserveUtil=require('../utils/serve');
 varextend=require('../utils/extend');
 varnpmScripts=require('../utils/npmScripts');
 varos=require('os');
@@ -49,16 +48,14 @@ function run(ionic, argv, rawCliArguments) {
 varcmdName=argv._[0].toLowerCase();
 varhasBuildCommand=false;
 varhasServeCommand=false;
-varaddress=argv.address||serveUtil.DEFAULT_ADDRESS;
-varport=argv.port||serveUtil.DEFAULT_HTTP_PORT;
 
 varisLiveReload=argv.livereload||argv['live-reload']||argv.l||false;
 
 // If platform was not passed then add it to the rawArgs
 varrunPlatform=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
-returnnpmScripts.runIonicScript('serve',['-p',port,'--address',address,'--nobrowser'])
-.then(function(){
-returnConfigXml.setConfigXml(process.cwd(),{
-devServer: serveUtil.getUrl(address,port)
-});
-});
+// Also remove commandName from the rawArgs passed
+returncordovaUtils.startAppScriptsServer(argv);
+
 }elseif(isLiveReload){
 
 // not an app-scripts project but the user wants livereload

lib/ionic/run.js

@@ -1,7 +1,6 @@
 'use strict';
 
 varchalk=require('chalk');
-varserveUtil=require('../utils/serve');
 varextend=require('../utils/extend');
 varnpmScripts=require('../utils/npmScripts');
 varos=require('os');
@@ -49,16 +48,14 @@ function run(ionic, argv, rawCliArguments) {
 varcmdName=argv._[0].toLowerCase();
 varhasBuildCommand=false;
 varhasServeCommand=false;
-varaddress=argv.address||serveUtil.DEFAULT_ADDRESS;
-varport=argv.port||serveUtil.DEFAULT_HTTP_PORT;
 
 varisLiveReload=argv.livereload||argv['live-reload']||argv.l||false;
 
 // If platform was not passed then add it to the rawArgs
 varrunPlatform=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
-returnnpmScripts.runIonicScript('serve',['-p',port,'--address',address,'--nobrowser'])
-.then(function(){
-returnConfigXml.setConfigXml(process.cwd(),{
-devServer: serveUtil.getUrl(address,port)
-});
-});
+// Also remove commandName from the rawArgs passed
+returncordovaUtils.startAppScriptsServer(argv);
 }elseif(isLiveReload){
 
 // not an app-scripts project but the user wants livereload

lib/utils/cordova.js

@@ -13,6 +13,7 @@ var ConfigXml = IonicAppLib.configXml;
 varchildProcess=require('child_process');
 varchildExec=childProcess.exec;
 varpromiseExec=Q.denodeify(childExec);
+varnpmScripts=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
+ */
+functionstartAppScriptsServer(argv){
+varoptions=_.extend(argv,{
+runLivereload: true,
+isPlatformServe: true
+});
+
+returnServe.getAddress(options)
+.then(function(){
+
+// Check that the server port is available
+returnServe.checkPorts(true,options.port,options.address,options);
+})
+.then(function(){
+
+// Check that the liveReload port is available
+returnServe.checkPorts(false,options.liveReloadPort,options.address,options);
+})
+.then(function(){
+
+// Execute the serve command from app-scripts
+// Also remove platform from the raw args passed
+returnnpmScripts.runIonicScript('serve',
+[
+'--port',options.port,
+'--address',options.address,
+'--liveReloadPort',options.liveReloadPort,
+'--nobrowser'
+]
+.concat(options.consolelogs ? '--consolelogs' : [])
+.concat(options.serverlogs ? '--serverlogs' : [])
+);
+})
+.then(function(){
+returnConfigXml.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) {
 }
 
 functionrunIonicScript(name,argv){
-varspawn=require('cross-spawn-async');
+varspawn=require('cross-spawn-async');
 varscriptName=getScriptName(name);
 varq=Q.defer();
 
-varscriptSpawn=spawn('npm',['run',scriptName,'--','--colors'].concat(argv||[]),[process.stdin,'pipe',process.stderr])
+process.env['FORCE_COLOR']=true;
+varscriptSpawn=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) {
 }
 returnq.resolve();
 });
+
+// If this process ends ensure that we killed the spawned child
+process.on('exit',function(){
+scriptSpawn.kill();
+});
 
 returnq.promise;
 }