fix(debugger): Fix potential debugger lockups

angular · Aug 26, 2015 · f9b0a92 · f9b0a92
1 parent 4a97370
commit f9b0a92
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 26 deletions.
diff --git a/lib/debugger/debuggerCommons.js b/lib/debugger/debuggerCommons.js
@@ -20,6 +20,7 @@ exports.attachDebugger = function(pid, opt_port) {
       target: '.*executors\.js', //jshint ignore:line
       line: 37
     }, function() {
+      process.send('ready');
       client.reqContinue(function() {
         // Intentionally blank.
       });

diff --git a/lib/debugger/modes/debuggerRepl.js b/lib/debugger/modes/debuggerRepl.js
@@ -100,26 +100,26 @@ DebuggerRepl.prototype.printControlFlow_ = function(callback) {
       command: 'evaluate',
       arguments: {
         frame: 0,
-        maxStringLength: 4000,
-        expression: 'protractor.promise.controlFlow().getControlFlowText()'
+        maxStringLength: 1000,
+        expression: 'command.getName()'
       }
-    }, function(err, controlFlowResponse) {
-      if (!err) {
-        self.client.req({
-          command: 'evaluate',
-          arguments: {
-            frame: 0,
-            maxStringLength: 1000,
-            expression: 'command.getName()'
-          }
-        }, function(err, res) {
-          if (res.value) {
-            console.log('-- Next command: ' + res.value);
-          }
-          console.log(controlFlowResponse.value);
-          callback();
-        });
+    }, function(err, res) {
+      if (res.value) {
+        console.log('-- Next command: ' + res.value);
       }
+      self.client.req({
+        command: 'evaluate',
+        arguments: {
+          frame: 0,
+          maxStringLength: 4000,
+          expression: 'protractor.promise.controlFlow().getControlFlowText()'
+        }
+      }, function(err, controlFlowResponse) {
+        if (controlFlowResponse.value) {
+          console.log(controlFlowResponse.value);
+        }
+        callback();
+      });
     });
   };
   this.client.once('break', onBreak_);

diff --git a/lib/protractor.js b/lib/protractor.js
@@ -821,7 +821,8 @@ Protractor.prototype.initDebugger_ = function(debuggerClientPath, opt_debugPort)
   var sandbox = vm_.createContext(context);
 
   var browserUnderDebug = this;
-  flow.execute(function() {    
+  var debuggerReadyPromise = webdriver.promise.defer();
+  flow.execute(function() {   
     log.puts('Starting WebDriver debugger in a child process. Pause is ' +
         'still beta, please report issues at github.com/angular/protractor\n');
     process.debugPort = opt_debugPort || process.debugPort;
@@ -833,15 +834,21 @@ Protractor.prototype.initDebugger_ = function(debuggerClientPath, opt_debugPort)
       var nodedebug = require('child_process').fork(debuggerClientPath, args);
       process.on('exit', function() {
         nodedebug.kill('SIGTERM');
-      }); 
+      });
+      nodedebug.on('message', function(m) {
+        if (m === 'ready') {
+          debuggerReadyPromise.fulfill();
+        }
+      });
+    });
+  });
+
+  var pausePromise = flow.execute(function() {
+    return debuggerReadyPromise.then(function() {
+      // Necessary for backward compatibility with node < 0.12.0
+      return browserUnderDebug.executeScript_('', 'empty debugger hook');
     });
   });
-
-  var pausePromise = flow.timeout(1000, 'waiting for debugger to attach')
-      .then(function() {
-        // Necessary for backward compatibility with node < 0.12.0
-        browserUnderDebug.executeScript_('', 'empty debugger hook');
-      });
 
   // Helper used only by debuggers at './debugger/modes/*.js' to insert code
   // into the control flow.