From f9735283df2fe47de91128a461dde84b069cbda2 Mon Sep 17 00:00:00 2001
From: "Zhuohuan LI (CARPE DIEM)" <zixia@zixia.net>
Date: Sun, 1 May 2016 23:36:41 +0800
Subject: [PATCH] coding...

---
 .gitignore        |  4 ++++
 lib/puppet-web.js | 17 +++++++++++------
 lib/puppet.js     |  2 +-
 package.json      |  3 ++-
 4 files changed, 18 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 package.json

diff --git a/.gitignore b/.gitignore
index e920c167..ac21f8e1 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 3c08bb35..d9570a5b 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 7c644de5..dd10d8ff 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 c0f72961..fe0db61d
--- 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"
   }
-
 }
-- 
GitLab