support standalone repl

webdriverio · Dec 8, 2016 · 89c584a · 89c584a
1 parent f553c25
commit 89c584a
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 16 deletions.
diff --git a/lib/commands/debug.js b/lib/commands/debug.js
@@ -28,8 +28,9 @@
 
 import vm from 'vm'
 import repl from 'repl'
+import { RuntimeError } from '../utils/ErrorHandler'
 
-let debug = function (enableStdout, enableLogging) {
+let debug = function (commandTimeout = 5000, enableStdout, enableLogging) {
     let commandIsRunning = false
     let logLevel = this.logger.logLevel
     this.logger.logLevel = 'verbose'
@@ -39,6 +40,44 @@ let debug = function (enableStdout, enableLogging) {
         this.logger.logLevel = logLevel
     }
 
+    const myEval = (cmd, context, filename, callback) => {
+        if (commandIsRunning) {
+            return
+        }
+
+        if (cmd === 'browser\n') {
+            return callback(null, '[WebdriverIO REPL client]')
+        }
+
+        commandIsRunning = true
+        if (typeof global.wdioSync === 'function') {
+            return global.wdioSync(() => {
+                vm.runInThisContext(`global._result = (function () { return ${cmd} }).apply(this)`)
+                callback(null, global._result)
+                commandIsRunning = false
+            })()
+        }
+
+        context.browser = this
+        vm.runInThisContext(`global._result = (function () { return ${cmd} }).apply(this)`)
+
+        if (!global._result || typeof global._result.then !== 'function') {
+            commandIsRunning = false
+            return callback(null, global._result)
+        }
+
+        const timeout = setTimeout(() => callback(new RuntimeError('Command execution timed out')), commandTimeout)
+        global._result.then((res) => {
+            commandIsRunning = false
+            clearTimeout(timeout)
+            return callback(null, res)
+        }, (e) => {
+            commandIsRunning = false
+            clearTimeout(timeout)
+            return callback(e)
+        })
+    }
+
     const replServer = repl.start({
         prompt: '> ',
         eval: myEval,
@@ -48,19 +87,6 @@ let debug = function (enableStdout, enableLogging) {
         ignoreUndefined: true
     })
 
-    function myEval (cmd, context, filename, callback) {
-        if (commandIsRunning) {
-            return
-        }
-
-        commandIsRunning = true
-        global.wdioSync(() => {
-            vm.runInThisContext(`global._result = (function () { return ${cmd} }).apply(this)`)
-            callback(null, global._result)
-            commandIsRunning = false
-        })()
-    }
-
     return new Promise((resolve) => {
         replServer.on('exit', () => {
             this.logger.logLevel = logLevel

diff --git a/lib/utils/Logger.js b/lib/utils/Logger.js
@@ -172,10 +172,10 @@ class Logger {
      * debugger info message
      */
     debug () {
-        this.write('\n')
+        this.write('')
         this.log(`${COLORS.yellow}DEBUG\t${COLORS.reset}Queue has stopped!`)
         this.log(`${COLORS.yellow}DEBUG\t${COLORS.reset}You can now go into the browser or use the command line as REPL`)
-        this.log(`${COLORS.yellow}DEBUG\t${COLORS.dkgray}(To exit, press ^C again or type .exit)${COLORS.reset}`)
+        this.log(`${COLORS.yellow}DEBUG\t${COLORS.dkgray}(To exit, press ^C again or type .exit)${COLORS.reset}\n`)
     }
 
     /**