diff --git a/src/io.js b/src/io.js index c12a68c24d2237657b40260293b053cb7c36329b..a749237cd2765484e64b5bb83038102345bff01f 100644 --- a/src/io.js +++ b/src/io.js @@ -205,8 +205,8 @@ class Io { 'scan' , 'login' , 'logout' - , 'error' , 'heartbeat' + , 'error' ] hookEvents.map(event => { wechaty.on(event, data => { @@ -223,6 +223,10 @@ class Io { } break + case 'error': + ioEvent.payload = data.toString() + break + default: break } diff --git a/src/puppet-web/browser.js b/src/puppet-web/browser.js index 0c6a7e669d5721aae889e2ca5b47ee5e1ef16993..91bb096f1838d211f38335311c1dc53e2e7c973a 100644 --- a/src/puppet-web/browser.js +++ b/src/puppet-web/browser.js @@ -239,7 +239,7 @@ class Browser extends EventEmitter { let matchRegex = new RegExp(browserRe, 'i') const pids = children.filter(child => { - log.verbose('Browser', 'getBrowserPids() child: %s', JSON.stringify(child)) + log.silly('Browser', 'getBrowserPids() child: %s', JSON.stringify(child)) // https://github.com/indexzero/ps-tree/issues/18 return matchRegex.test('' + child.COMMAND + child.COMM) }) diff --git a/src/puppet-web/injectio.js b/src/puppet-web/injectio.js index 65a10d43e4dbe8e887a887f97b27c5d8ca6dbde3..ab0aba8d272c831fd43c095d2b9ec94a4f874267 100644 --- a/src/puppet-web/injectio.js +++ b/src/puppet-web/injectio.js @@ -447,7 +447,7 @@ return (function(port) { log('socket io lib loaded.') connectSocket() } - script.src = 'https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.4.5/socket.io.min.js' + script.src = '//cdnjs.cloudflare.com/ajax/libs/socket.io/1.4.5/socket.io.min.js' document.getElementsByTagName('head')[0].appendChild(script) return // wait to be called via script.onload() }