From 41cc13eed0187445183f43bb0a155d0f85c83c56 Mon Sep 17 00:00:00 2001
From: "Zhuohuan LI (CARPE DIEM)" <zixia@zixia.net>
Date: Sun, 23 Oct 2016 15:15:24 +0800
Subject: [PATCH] code clean

---
 src/puppet-web/browser.ts |  3 ++-
 src/wechaty.ts            | 36 +++++++++++++++++++-----------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/puppet-web/browser.ts b/src/puppet-web/browser.ts
index 3d19a4d2..edb54bcf 100644
--- a/src/puppet-web/browser.ts
+++ b/src/puppet-web/browser.ts
@@ -78,7 +78,7 @@ export class Browser extends EventEmitter {
 
   public toString() { return `Browser({head:${this.setting.head})` }
 
-  public async init(): Promise<Browser> {
+  public async init(): Promise<this> {
     this.targetState('open')
     this.currentState('opening')
 
@@ -136,6 +136,7 @@ export class Browser extends EventEmitter {
     if (this._driver) {
       await this._driver.close()
       await this._driver.quit()
+      this._driver = null
     }
 
     let driver: WebDriver
diff --git a/src/wechaty.ts b/src/wechaty.ts
index 52cd5522..212b41ca 100644
--- a/src/wechaty.ts
+++ b/src/wechaty.ts
@@ -150,7 +150,7 @@ export class Wechaty extends EventEmitter implements Sayable {
     return
   }
 
-  public async init(): Promise<void> {
+  public async init(): Promise<this> {
     log.info('Wechaty', 'v%s initializing...' , this.version())
     log.verbose('Wechaty', 'puppet: %s'       , this.setting.type)
     log.verbose('Wechaty', 'head: %s'         , this.setting.head)
@@ -159,7 +159,7 @@ export class Wechaty extends EventEmitter implements Sayable {
 
     if (this.inited) {
       log.error('Wechaty', 'init() already inited. return and do nothing.')
-      return
+      return this
     }
 
     try {
@@ -169,7 +169,7 @@ export class Wechaty extends EventEmitter implements Sayable {
       log.error('Wechaty', 'init() exception: %s', e && e.message)
       throw e
     }
-    return
+    return this
   }
 
   public on(event: 'error'      , listener: (this: Sayable, error: Error) => void): this
@@ -205,7 +205,7 @@ export class Wechaty extends EventEmitter implements Sayable {
     return this
   }
 
-  public async initPuppet(): Promise<void> {
+  public async initPuppet(): Promise<Puppet> {
     let puppet: Puppet
     switch (this.setting.type) {
       case 'web':
@@ -219,18 +219,20 @@ export class Wechaty extends EventEmitter implements Sayable {
         throw new Error('Puppet unsupport(yet): ' + this.setting.type)
     }
 
-  ; // must have a semicolon here to seperate the last line with `[]`
-  [   'error'
-    , 'friend'
-    , 'heartbeat'
-    , 'login'
-    , 'logout'
-    , 'message'
-    , 'room-join'
-    , 'room-leave'
-    , 'room-topic'
-    , 'scan'
-  ].map(e => {
+    const eventList: WechatyEventName[] = [
+        'error'
+      , 'friend'
+      , 'heartbeat'
+      , 'login'
+      , 'logout'
+      , 'message'
+      , 'room-join'
+      , 'room-leave'
+      , 'room-topic'
+      , 'scan'
+    ]
+
+    eventList.map(e => {
       // https://strongloop.com/strongblog/an-introduction-to-javascript-es6-arrow-functions/
       // We’ve lost () around the argument list when there’s just one argument (rest arguments are an exception, eg (...args) => ...)
       puppet.on(e, (...args: any[]) => {
@@ -253,7 +255,7 @@ export class Wechaty extends EventEmitter implements Sayable {
     Config.puppetInstance(puppet)
 
     await puppet.init()
-    return
+    return puppet
   }
 
   public async quit(): Promise<void> {
-- 
GitLab