提交 f9735283 编写于 作者: Huan (李卓桓)'s avatar Huan (李卓桓)

coding...

上级 d8d27bb2
......@@ -31,3 +31,7 @@ node_modules
# Optional REPL history
.node_repl_history
cert.pem
key.pem
t.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
const EventEmitter = require('events')
const PuppetWeb = require('puppet-web')
//const PuppetWeb = require('./puppet-web')
class Puppet extends EventEmitter {
constructor() {
......
......@@ -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"
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册