browserstack-local - npm Package Compare versions

Comparing version 1.3.6 to 1.3.7

lib/Local.js

@@ -6,7 +6,8 @@ var childProcess = require('child_process'),
   LocalBinary = require('./LocalBinary'),
-  LocalError = require('./LocalError');
+  LocalError = require('./LocalError'),
+  psTree = require('ps-tree');
 
-
 function Local(){
   this.pid = undefined;
+  this.isProcessRunning = false;
   this.retriesLeft = 5;
@@ -61,41 +62,6 @@ this.key = process.env.BROWSERSTACK_ACCESS_KEY;
           that.pid = data['pid'];
+          that.isProcessRunning = true;
           callback();
         }
       });
-
-      // that.tunnel = childProcess.spawn(binaryPath, that.getBinaryArgs());
-      // that.tunnel.on('exit', function(){
-      //   that.tunnel = undefined;
-      //   if(that.exitCallback) that.exitCallback();
-      // });
-
-      // that.stdout = fs.openSync(that.logfile, 'r');
-      // var chunkSize = 512,
-      //   buffer = new Buffer(81920),
-      //   bytesRead = 0,
-      //   error = undefined;
-
-      // while(true){
-      //   var bytes = fs.readSync(that.stdout, buffer, bytesRead, chunkSize, bytesRead);
-      //   if(bytes == 0) continue;
-
-      //   var buffRead = buffer.slice(bytesRead, bytesRead+bytes);
-      //   bytesRead += bytes;
-
-      //   var data = buffRead.toString();
-
-      //   if(data.match(that.errorRegex)){
-      //     fs.closeSync(that.stdout);
-      //     error = data.match(that.errorRegex)[0].trim();
-      //     break;
-      //   }
-
-      //   if(data.match(that.doneRegex)){
-      //     fs.closeSync(that.stdout);
-      //     break;
-      //   }
-      // }
-
-      // if(error) throw new LocalError(error);
-      // callback();
     });
@@ -105,3 +71,3 @@ };
   this.isRunning = function(){
-    return this.pid && running(this.pid);
+    return this.pid && running(this.pid) && this.isProcessRunning;
   };
@@ -111,4 +77,3 @@
     if(!this.pid) return callback();
-    this.opcode = 'stop';
-    this.tunnel = childProcess.execFile(this.binaryPath, this.getBinaryArgs(), function(error){
+    this.killAllProcesses(function(error){
       if(error) callback(new LocalError(error.toString()));
@@ -294,3 +259,33 @@ callback();
   };
+
+  this.killAllProcesses = function(callback){
+    psTree(this.pid, (err, children) => {
+      var childPids = children.map(val => val.PID);
+      var killChecker = setInterval(() => {
+        if(childPids.length === 0) {
+          clearInterval(killChecker);
+          try {
+            process.kill(this.pid);
+            // This gives time to local binary to send kill signal to railsApp.
+            setTimeout(() => {
+              this.isProcessRunning = false;
+              callback();
+            }, 2000);
+          } catch(err) {
+            this.isProcessRunning = false;
+            callback();
+          }
+        }
+        for(var i in childPids) {
+          try {
+            process.kill(childPids[i]);
+          } catch(err) {
+            childPids.splice(i, 1);
+          }
+        }
+      },500);
+    });
+  };
 }
+
 module.exports = Local;

package.json

 {
   "name": "browserstack-local",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "description": "Nodejs bindings for BrowserStack Local",
@@ -22,2 +22,3 @@ "engine": "^0.10.44",
     "is-running": "^2.0.0",
+    "ps-tree": "=1.1.1",
     "sinon": "^1.17.6",
@@ -24,0 +25,0 @@ "temp-fs": "^0.9.9"

New alerts

URL strings

Supply chain risk

Package contains fragments of external URLs or IP addresses, which the package may be accessing at runtime.

Found 1 instance in 1 package

Fixed alerts

URL strings

Supply chain risk

Package contains fragments of external URLs or IP addresses, which the package may be accessing at runtime.

Found 1 instance in 1 package

Improved metrics

Lines of code

788

0.25%

Worsened metrics

Total package byte prevSize

34459

-0.49%

Dependency count

5

25%

Dependency changes

• + Added

  ps-tree@=1.1.1