Merge branch 'master' of github.com:Chatie/wechaty

CODEOWNERS

@@ -2,7 +2,6 @@
 # https://help.github.com/articles/about-codeowners/
 #
 
-/package.json                       @lijiarui
 /docs/                              @lijiarui @hczhcz @TingYinHelen @ax4
 /example/                           @Gcaufy @hczhcz
 /src/puppet-web/bridge.*.ts         @mukaiu

package.json

@@ -124,7 +124,7 @@
     "babel-eslint": "^8.0.0",
     "babel-preset-env": "^1.6.0",
     "blue-tape": "^1.0.0",
-    "check-node-version": "^2.1.0",
+    "check-node-version": "^3.0.0",
     "cookie-parser": "^1.4.0",
     "coveralls": "^3.0.0",
     "cross-env": "^5.0.0",

src/puppet-web/puppet-web.ts

@@ -197,9 +197,9 @@ export class PuppetWeb extends Puppet {
       type: 'logout',
     }))
 
-    dog.on('reset', async (food, time) => {
-      log.warn('PuppetWeb', 'initScanWatchdog() on(reset) lastFood: %s, time: %s',
-                            food.data, time)
+    dog.on('reset', async (food, timePast) => {
+      log.warn('PuppetWeb', 'initScanWatchdog() on(reset) lastFood: %s, timePast: %s',
+                            food.data, timePast)
       try {
         await this.bridge.reload()
       } catch (e) {

src/room.ts

@@ -175,7 +175,7 @@ export class Room extends EventEmitter implements Sayable {
         await new Promise(r => setTimeout(r, 1000)) // wait for 1 second
       }
 
-      await this.readyAllMembers(this.rawObj.MemberList || [])
+      await this.readyAllMembers(this.rawObj && this.rawObj.MemberList || [])
       this.obj = this.parse(this.rawObj)
       if (!this.obj) {
         throw new Error('no this.obj set after contactGetter')