fix(debug): make protractor debug work in the new runner/launcher world

Closes #552

Author: juliemr

bin/protractor

@@ -2,41 +2,4 @@
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'test';
 
-/**
- * This tiny wrapper file checks for node debug flags and appends them
- * when found, before invoking the real executable. Thanks to mocha for the
- * pattern.
- */
-
-var spawn = require('child_process').spawn;
-var args = [__dirname + '/../lib/cli.js'];
-
-process.argv.slice(2).forEach(function(arg) {
-  var flag = arg.split('=')[0];
-
-  switch (flag) {
-    case '-d':
-      args.unshift('--debug');
-      break;
-    case 'debug':
-    case '--debug':
-    case '--debug-brk':
-      args.unshift(arg);
-      break;
-    default:
-      if (0 == arg.indexOf('--trace')) { args.unshift(arg); }
-      else { args.push(arg); }
-      break;
-  }
-});
-
-var proc = spawn(process.argv[0], args, { stdio: 'inherit' });
-proc.on('exit', function (code, signal) {
-  process.on('exit', function() {
-    if (signal) {
-      process.kill(process.pid, signal);
-    } else {
-      process.exit(code);
-    }
-  });
-});
+require('../lib/cli.js');

lib/cli.js

@@ -6,6 +6,28 @@
  */
 'use strict';
 
+var args = [];
+
+process.argv.slice(2).forEach(function(arg) {
+  var flag = arg.split('=')[0];
+
+  switch (flag) {
+    case 'debug':
+      args.push('--nodeDebug');
+      args.push('true');
+      break;
+    case '-d':
+    case '--debug':
+    case '--debug-brk':
+      args.push('--v8Debug');
+      args.push('true');
+      break;
+    default:
+      args.push(arg);
+      break;
+  }
+});
+
 var util = require('util');
 var path = require('path');
 var child = require('child_process');
@@ -44,7 +66,7 @@ var argv = require('optimist').
         throw '';
       }
     }).
-    argv;
+    parse(args);
 
 if (argv.version) {
   util.puts('Version ' + require(path.join(__dirname, '../package.json')).version);

lib/launcher.js

@@ -73,6 +73,9 @@ var init = function(argv) {
   }
 
   if (config.multiCapabilities.length) {
+    if (config.debug) {
+      throw new Error('Cannot run in debug mode with multiCapabilities');
+    }
     log_('Running using config.multiCapabilities - ' +
         'config.capabilities will be ignored');
   }

lib/runner.js

@@ -18,7 +18,26 @@ var Runner = function(config) {
   this.driverprovider_ = null;
   this.config_ = config;
 
-  // Init
+  if (config.v8Debug) {
+    process.kill(process.pid, 'SIGUSR1');
+  }
+
+  if (config.nodeDebug) {
+    process.kill(process.pid, 'SIGUSR1');
+    var flow = webdriver.promise.controlFlow();
+
+    flow.execute(function() {
+      var nodedebug = require('child_process').fork('debug', ['localhost:5858']);
+      process.on('exit', function() {
+        nodedebug.kill('SIGTERM');
+      });
+      nodedebug.on('exit', function() {
+        process.exit('1');
+      });
+    });
+    flow.timeout(1000, 'waiting for debugger to attach');
+  }
+
   this.loadDriverProvider_(config);
 };