Merge pull request #185 from MCS-Lite/bugfix/kill-port

Bugfix/kill port

Author: iamblue

.travis.yml

@@ -27,7 +27,7 @@ script:
   - ls . && cd ../..
 
 after_success:
-  - ./node_modules/.bin/codecov 
+  - ./node_modules/.bin/codecov
 
 cache:
   directories:

adminServer/controllers/service.js

@@ -2,11 +2,13 @@ var os = require('os');
 var fs = require('fs');
 var path = require('path');
 var exec = require('child_process').exec;
+var kill = require('cross-port-killer').kill;
 var $rest = require('../../configs/rest');
 var $wot = require('../../configs/wot');
 var $stream = require('../../configs/stream');
 var $admin = require('../../configs/admin');
 
+
 module.exports = function ($db) {
 
   var startService = function(req, res, next) {
@@ -16,7 +18,6 @@ module.exports = function ($db) {
   };
 
   var stopService = function(req, res, next) {
-    var kill = require('kill-port');
     kill($rest.port);
     kill($wot.port);
     kill($stream.serverPort);

index.js

@@ -3,7 +3,7 @@ global.logs = '';
 global.console.log = function(x){
   global.logs += JSON.stringify(x) + '\n';
   process.stdout.write(util.format.apply(util, arguments));
-}; 
+};
 
 var fs = require('fs');
 var gui = require('nw.gui');
@@ -12,6 +12,22 @@ var nwPath = process.execPath;
 var nwDir = path.dirname(nwPath);
 var exec = require('child_process').exec;
 var spawn = require('child_process').spawn;
+var execSync = require('child_process').execSync;
+
+function kill (port) {
+  if (!Number.parseInt(port)) {
+    return Promise.reject(new Error('Invalid argument provided for port'))
+  }
+  if (process.platform == "darwin") {
+  	return execSync(`lsof -i tcp:${port} | grep LISTEN | awk '{print $2}' | xargs kill -9`);
+  	console.log("run on MAC");
+  } else {
+  	return spawn('cmd.exe', ['for', '/f', '"tokens=5"', '%a', 'in', '(\'netstat', '-aon', ,'|', 'findstr', ':${port}', '|', 'find', '"LISTENING"\')', 'do', 'taskkill', '/f', '/pid', '%a']);
+  	console.log("run on Windows");
+  }
+  
+}
+
 
 var $ = function (selector) {
   return document.querySelector(selector);
@@ -30,27 +46,28 @@ function startNode(path) {
 
   if (process.env.NODE_ENV === 'dev' && /^win/.test(process.platform)) nodePath = global.__dirname + '\\node\\win32\\node.exe';
   // if (process.env.NODE_ENV === 'dev' && /^darwin/.test(process.platform)) nodePath = global.__dirname + '/node/osx64/node';
-  
+
   if (process.env.NODE_ENV != 'dev' && /^win/.test(process.platform)) {
     nodePath = nwDir + '\\node.exe';
   }
 
   if (process.env.NODE_ENV != 'dev' && process.platform === 'darwin') {
-    var folderDir = require(global.__dirname + '/config').path;  
+    var folderDir = require(global.__dirname + '/config').path;
     nodePath = folderDir + '/node';
   }
 
+  console.log("nodePath is " + nodePath);
   var lite_server = spawn(nodePath, [path]);
 
-  lite_server.stdout.on('data', function (data) {   
+  lite_server.stdout.on('data', function (data) {
     console.log(data.toString());
   });
 
-  lite_server.stderr.on('data', function (data) {   
-    console.log(data.toString());  
+  lite_server.stderr.on('data', function (data) {
+    console.log(data.toString());
   });
-  
-  lite_server.on('close', function (status) { 
+
+  lite_server.on('close', function (status) {
     console.log("Terminal MCS Lite server:" + status);
   });
 }
@@ -98,7 +115,7 @@ function initApp() {
       adminServer = require(folderDir + '\\adminServer\\index');
       $admin = require(folderDir + '\\configs\\admin');
     }
-     
+
     adminServer.listen($admin.port);
     var win = gui.Window.get();
     win.show();
@@ -127,14 +144,13 @@ function initApp() {
           $admin = require(folderDir + '/configs/admin');
         }
       }
-      var kill = require('kill-port');  
       kill($rest.port);
       kill($wot.port);
       kill($stream.serverPort);
       kill($stream.rtmpServerPort);
       win.close(true);
     });
-    
+
     if (process.env.NODE_ENV === 'dev') {
       document.body.innerHTML += '<iframe frameborder="0" src="http://' + $admin.host + ':' + $admin.port + '/login' + '" style="width: 100%; height: 580px; overflow: auto;" nwdisable nwfaketop>';
       // document.body.innerHTML += '<iframe frameborder="0" src="' + $admin.webClient.redirect.dev + '" style="width: 100%; height: 580px; overflow: auto;" nwdisable nwfaketop>';

package.json

@@ -47,7 +47,6 @@
     "jsonschema": "^1.1.1",
     "jsonwebtoken": "^7.2.1",
     "lodash": "^4.17.4",
-    "kill-port": "^1.0.0",
     "mcs-lite-admin-web": "^0.1.9",
     "mcs-lite-introduction": "^0.2.7",
     "mcs-lite-mobile-web": "^0.4.11",
@@ -61,7 +60,8 @@
     "superagent": "^3.5.0",
     "utils-merge": "^1.0.0",
     "wotcity.io": "^0.8.14",
-    "youmeb-generator": "0.0.1"
+    "youmeb-generator": "0.0.1", 
+    "cross-port-killer": "^1.0.1"
   },
   "devDependencies": {
     "babel-eslint": "^7.2.3",