From 5a411ec0aff91419f20af0ad25a4ae444f5fb297 Mon Sep 17 00:00:00 2001
From: "Zhuohuan LI (CARPE DIEM)" <zixia@zixia.net>
Date: Thu, 16 Jun 2016 19:52:38 +0800
Subject: [PATCH] rename HtmlUtil to WebUtil

---
 package.json               |  1 +
 src/message-media.js       | 12 ++++++------
 src/puppet-web-event.js    |  8 ++++----
 src/puppet-web-injectio.js |  4 ++--
 src/puppet-web.js          |  1 -
 src/web-util.js            |  7 +++----
 6 files changed, 16 insertions(+), 17 deletions(-)
 mode change 100644 => 100755 package.json

diff --git a/package.json b/package.json
old mode 100644
new mode 100755
index 81a7b297..eb77e105
--- a/package.json
+++ b/package.json
@@ -56,6 +56,7 @@
   },
   "devDependencies": {
     "apiai": "^2.0.5",
+    "cookie-parser": "^1.4.3",
     "cross-env": "^1.0.8",
     "eslint": "^2.9.0",
     "qrcode-terminal": "^0.10.0",
diff --git a/src/message-media.js b/src/message-media.js
index 4ace7f15..b36c1f42 100644
--- a/src/message-media.js
+++ b/src/message-media.js
@@ -12,13 +12,13 @@ const log = require('./npmlog-env')
 const webUtil = require('./web-util')
 const Message = require('./message')
 
-class ImageMessage extends Message {
+class MediaMessage extends Message {
   constructor(rawObj) {
     super(rawObj)
     this.bridge = Message.puppet.bridge
   }
   ready() {
-    log.silly('ImageMessage', 'ready()')
+    log.silly('MediaMessage', 'ready()')
 
     const parentReady = super.ready.bind(this)
     return co.call(this, function* () {
@@ -29,14 +29,14 @@ class ImageMessage extends Message {
       return this // IMPORTANT!
     })
     .catch(e => {
-      log.warn('ImageMessage', 'ready() exception: %s', e.message)
+      log.warn('MediaMessage', 'ready() exception: %s', e.message)
       throw e
     })
   }
   getMsgImg(id) {
     return this.bridge.getMsgImg(id)
     .catch(e => {
-      log.warn('ImageMessage', 'getMsgImg(%d) exception: %s', id, e.message)
+      log.warn('MediaMessage', 'getMsgImg(%d) exception: %s', id, e.message)
       throw e
     })
   }
@@ -50,10 +50,10 @@ class ImageMessage extends Message {
       return webUtil.downloadStream(this.obj.url, cookies)
     })
     .catch(e => {
-      log.warn('ImageMessage', 'stream() exception: %s', e.message)
+      log.warn('MediaMessage', 'stream() exception: %s', e.message)
       throw e
     })
   }
 }
 
-module.exports = ImageMessage
+module.exports = MediaMessage
diff --git a/src/puppet-web-event.js b/src/puppet-web-event.js
index d5f5049b..992a9401 100644
--- a/src/puppet-web-event.js
+++ b/src/puppet-web-event.js
@@ -27,13 +27,13 @@ const Contact = require('./contact')
 const Room    = require('./room')
 
 const Message = require('./message')
-const ImageMessage = require('./message-image')
+const MediaMessage = require('./message-media')
 
 const Server  = require('./puppet-web-server')
 const Browser = require('./puppet-web-browser')
 const Bridge  = require('./puppet-web-bridge')
 
-PuppetWebEvent{
+const PuppetWebEvent = {
   onBrowserDead: onBrowserDead
 
   , onServerLogin: onServerLogin
@@ -241,7 +241,7 @@ function onServerMessage(data) {
   switch (data.MsgType) {
     case Message.Type.IMAGE:
       // log.verbose('PuppetWeb', 'onServerMessage() IMAGE message')
-      m = new ImageMessage(data)
+      m = new MediaMessage(data)
       break;
 
     case 'TEXT':
@@ -266,4 +266,4 @@ function onServerMessage(data) {
   })
 }
 
-module.exports = PuppetWebEvents
+module.exports = PuppetWebEvent
diff --git a/src/puppet-web-injectio.js b/src/puppet-web-injectio.js
index 935fc6bf..887ec0e5 100644
--- a/src/puppet-web-injectio.js
+++ b/src/puppet-web-injectio.js
@@ -150,7 +150,7 @@ return (function(port) {
       return true
     }
 
-    if (!document.body) {
+    if (!document.body) { // Javascript Error Null is not an Object
       // log('initClog() not ready because document.body not ready')
       return false
     }
@@ -478,4 +478,4 @@ return (function(port) {
     : null
   }
 
-}.apply(window, arguments))
\ No newline at end of file
+}.apply(window, arguments))
diff --git a/src/puppet-web.js b/src/puppet-web.js
index 386be909..59616940 100644
--- a/src/puppet-web.js
+++ b/src/puppet-web.js
@@ -27,7 +27,6 @@ const Contact = require('./contact')
 const Room    = require('./room')
 
 const Message = require('./message')
-const ImageMessage = require('./message-image')
 
 const Server  = require('./puppet-web-server')
 const Browser = require('./puppet-web-browser')
diff --git a/src/web-util.js b/src/web-util.js
index 69fed08b..5a69634a 100644
--- a/src/web-util.js
+++ b/src/web-util.js
@@ -1,7 +1,7 @@
 const http  = require('http')
 const log = require('./npmlog-env')
 
-const HtmlUtil = {
+const WebUtil = {
   stripHtml:      stripHtml
   , unescapeHtml: unescapeHtml
   , digestEmoji:  digestEmoji
@@ -43,10 +43,9 @@ function plainText(html) {
   )
 }
 
-
 function downloadStream(url, cookies) {
   // const myurl = 'http://wx.qq.com/cgi-bin/mmwebwx-bin/webwxgetmsgimg?&MsgID=3080011908135131569&skey=%40crypt_c117402d_53a58f8fbb21978167a3fc7d3be7f8c9'
-  url = url.replace(/^https/i, 'http') // https not supported by nodejs http module?
+  url = url.replace(/^https/i, 'http') // use http for better performance
   const options = require('url').parse(url)
 
   options.headers = {
@@ -76,4 +75,4 @@ function downloadStream(url, cookies) {
     req.end()
   })
 }
-module.exports = HtmlUtil
+module.exports = WebUtil
-- 
GitLab