diff --git a/.gitignore b/.gitignore index e920c16718d133a2ef272e4b57b512739ecb002f..ac21f8e1e6332c5e636958f615f279cbfd89cbe1 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,7 @@ node_modules # Optional REPL history .node_repl_history + +cert.pem +key.pem +t.js diff --git a/lib/puppet-web.js b/lib/puppet-web.js index 3c08bb35fd981edb3e875c3666ad186d0b8aa763..d9570a5b4191fee9894cba3414ef23dab73d9530 100644 --- a/lib/puppet-web.js +++ b/lib/puppet-web.js @@ -5,7 +5,7 @@ const Express = require('express') const WebDriver = require('selenium-webdriver') -const Puppet = require('puppet') +const Puppet = require('./puppet') class PuppetWeb extends Puppet { @@ -17,7 +17,7 @@ class PuppetWeb extends Puppet { this.server = this.initServer() this.browser = this.initBrowser() - this.injectBrowser() +// this.injectBrowser() } initBrowser() { @@ -60,17 +60,17 @@ class PuppetWeb extends Puppet { */ - console.log('SOURCE: ############\n' + wechatyInjectedScript + '\n##############\n') + console.log('SOURCE: ############\n' + injectScript + '\n##############\n') console.log('waitting for dom ready') browser.wait(function () { - return browser.isElementPresent(webdriver.By.css('.login_box')) + return browser.isElementPresent(WebDriver.By.css('.login_box')) }, 5*1000, '\nFailed to wait .login_box') console.log('ready!') console.log('start injecting') - browser.executeScript(wechatyInjectedScript).then( function (ret) { + browser.executeScript(injectScript).then( function (ret) { console.log('injected: ' + ret) console.log('start wait Login') @@ -94,6 +94,7 @@ class PuppetWeb extends Puppet { //browser.quit(); + return browser } initServer() { @@ -129,7 +130,11 @@ class PuppetWeb extends Puppet { app.listen(this.PORT, function () { - console.log(`Example app listening on port ${this.PORT}!`); + console.log('Example app listening on port ' + this.PORT + '!') }); + + return server } } + +module.exports = PuppetWeb diff --git a/lib/puppet.js b/lib/puppet.js index 7c644de575e1535f03d1464c6c1137b7901cbd92..dd10d8ffc6a237e9bb8e5ba5a8c3703a6ea5f97d 100644 --- a/lib/puppet.js +++ b/lib/puppet.js @@ -1,5 +1,5 @@ const EventEmitter = require('events') -const PuppetWeb = require('puppet-web') +//const PuppetWeb = require('./puppet-web') class Puppet extends EventEmitter { constructor() { diff --git a/package.json b/package.json old mode 100644 new mode 100755 index c0f729614e2071805b5d852246f194504945e765..fe0db61d1f36a240d6f4c3432c0bc905c2553692 --- a/package.json +++ b/package.json @@ -24,10 +24,11 @@ }, "homepage": "https://github.com/zixia/wechaty-lib#readme", "dependencies": { + "body-parser": "^1.15.0", + "express": "^4.13.4", "selenium-webdriver": "" }, "devDependencies": { "tape": "^4.5.1" } - }