merge

.editorconfig

@@ -9,7 +9,6 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-
 [*.md]
 max_line_length = 0
 trim_trailing_whitespace = false

index.ts

@@ -2,23 +2,23 @@ import {
   Config,
   Sayable,
   log,
-}                         from './src/config'
-import { Contact }        from './src/contact'
+}                     from './src/config'
+import Contact        from './src/contact'
 
 // ISSUE #70 import { FriendRequest }  from './src/friend-request'
-import { FriendRequest }  from './src/puppet-web/friend-request'
+import FriendRequest  from './src/puppet-web/friend-request'
 
-import { IoClient }       from './src/io-client'
+import IoClient       from './src/io-client'
 import {
   Message,
   MediaMessage,
   MsgType,
-}                         from './src/message'
-import { Puppet }         from './src/puppet'
-import { PuppetWeb }      from './src/puppet-web/'
-import { Room }           from './src/room'
-import { UtilLib }        from './src/util-lib'
-import { Wechaty }        from './src/wechaty'
+}                     from './src/message'
+import Puppet         from './src/puppet'
+import PuppetWeb      from './src/puppet-web/'
+import Room           from './src/room'
+import UtilLib        from './src/util-lib'
+import Wechaty        from './src/wechaty'
 
 const VERSION = require('./package.json').version
 

src/brolog-env.ts

@@ -26,3 +26,4 @@ if (levelRegex.test(level)) {
 }
 
 export { Brolog }
+export default Brolog

src/contact.ts

@@ -659,3 +659,5 @@ export class Contact implements Sayable {
 
 //   return []
 // }
+
+export default Contact

src/friend-request.ts

@@ -13,8 +13,8 @@
 import {
   Config,
   log,
-}                   from './config'
-import { Contact }  from './contact'
+}               from './config'
+import Contact  from './contact'
 
 export abstract class FriendRequest {
 
@@ -34,3 +34,5 @@ export abstract class FriendRequest {
   public abstract accept(): Promise<boolean>
 
 }
+
+export default FriendRequest

src/message.spec.ts

@@ -11,8 +11,8 @@ import {
   Config,
   log,
 }                 from './config'
-import { Message }    from './message'
-import { PuppetWeb }  from './puppet-web/'
+import Message    from './message'
+import PuppetWeb  from './puppet-web/'
 
 const MOCK_USER_ID = 'TEST-USER-ID'
 

src/message.ts

@@ -17,11 +17,11 @@ import {
   log,
 }  from './config'
 
-import { Contact }  from './contact'
-import { Room }     from './room'
-import { UtilLib }  from './util-lib'
-import { PuppetWeb }  from './puppet-web/puppet-web'
-import { Bridge }     from './puppet-web/bridge'
+import Contact    from './contact'
+import Room       from './room'
+import UtilLib    from './util-lib'
+import PuppetWeb  from './puppet-web/puppet-web'
+import Bridge     from './puppet-web/bridge'
 
 export type MsgRawObj = {
   MsgId:            string,
@@ -746,3 +746,5 @@ export class MediaMessage extends Message {
  * &lang=en&pass_ticket=T6dAZXE27Y6R29%2FFppQPqaBlNwZzw9DAN5RJzzzqeBA%3D
  * &wechat_real_lang=en
  */
+
+export default Message

src/puppet-web/bridge.ts

@@ -12,9 +12,9 @@
  /* tslint:disable:no-var-requires */
 const retryPromise  = require('retry-promise').default
 
-import { log }        from '../brolog-env'
+import log        from '../brolog-env'
 
-import { PuppetWeb }  from './puppet-web'
+import PuppetWeb  from './puppet-web'
 
 export class Bridge {
 
@@ -595,3 +595,5 @@ Object.keys(_contacts)
 
  *
  */
+
+export default Bridge

src/puppet-web/browser-cookie.ts

@@ -12,9 +12,9 @@
 import * as fs from 'fs'
 // const arrify = require('arrify')
 
-import { log }            from '../config'
+import { log }        from '../config'
 
-import { BrowserDriver }  from './browser-driver'
+import BrowserDriver  from './browser-driver'
 
 /**
  * The reason that driverCookie type defined here
@@ -251,3 +251,5 @@ export class BrowserCookie {
   }
 
 }
+
+export default BrowserCookie

src/puppet-web/browser-driver.ts

@@ -344,3 +344,5 @@ export class BrowserDriver {
   public navigate()           { return this.driver.navigate() as any }
   public quit()               { return this.driver.quit() as any as Promise<void> }
 }
+
+export default BrowserDriver

src/puppet-web/browser.ts

@@ -17,15 +17,15 @@ const retryPromise  = require('retry-promise').default // https://github.com/ola
 import {
   Config,
   HeadName,
-}                         from '../config'
-import { StateMonitor }   from '../state-monitor'
-import { log }            from '../brolog-env'
+}                     from '../config'
+import StateMonitor   from '../state-monitor'
+import log            from '../brolog-env'
 
 import {
   CookieType,
   BrowserCookie,
-}                         from './browser-cookie'
-import { BrowserDriver }  from './browser-driver'
+}                     from './browser-cookie'
+import BrowserDriver  from './browser-driver'
 
 export type BrowserSetting = {
   head:         HeadName,
@@ -445,3 +445,5 @@ export class Browser extends EventEmitter {
   public readCookie()   { return this.cookie.read()   }
   public cleanCookie()  { return this.cookie.clean()  }
 }
+
+export default Browser

src/puppet-web/event.ts

@@ -19,17 +19,17 @@ import {
   WatchdogFood,
   ScanInfo,
   log,
-}                     from '../config'
-import { Contact }    from '../contact'
+}                 from '../config'
+import Contact    from '../contact'
 import {
   Message,
   MediaMessage,
   MsgType,
   MsgRawObj,
-}                     from '../message'
+}                 from '../message'
 
-import { Firer }      from './firer'
-import { PuppetWeb }  from './puppet-web'
+import Firer      from './firer'
+import PuppetWeb  from './puppet-web'
 
 /* tslint:disable:variable-name */
 export const Event = {
@@ -348,3 +348,5 @@ async function onServerMessage(this: PuppetWeb, obj: MsgRawObj): Promise<void> {
 
   return
 }
+
+export default Event

src/puppet-web/firer.ts

@@ -21,11 +21,11 @@ const retryPromise  = require('retry-promise').default
 import {
   // RecommendInfo
   log,
-}                   from '../config'
-import { Contact }  from '../contact'
-import { Message }  from '../message'
+}                     from '../config'
+import Contact        from '../contact'
+import Message        from '../message'
 
-import { FriendRequest }  from './friend-request'
+import FriendRequest  from './friend-request'
 
 /* tslint:disable:variable-name */
 export const Firer = {
@@ -411,3 +411,5 @@ async function checkRoomTopic(m: Message): Promise<void> {
     log.error('PuppetWebFirer', 'fireRoomTopic() co exception: %s', e.stack)
   }
 }
+
+export default Firer

src/puppet-web/friend-request.spec.ts

@@ -5,13 +5,13 @@
  * https://github.com/wechaty/wechaty
  *
  */
-import { test }   from 'ava'
+import { test }               from 'ava'
 
-import { Config }   from '../config'
-import { Contact }  from '../contact'
-import { Message }  from '../message'
-import { Puppet }   from '../puppet'
-import { FriendRequest as PuppetWebFriendRequest } from './friend-request'
+import Config                 from '../config'
+import Contact                from '../contact'
+import Message                from '../message'
+import Puppet                 from '../puppet'
+import PuppetWebFriendRequest from './friend-request'
 
 Config.puppetInstance({
   userId: 'xxx',

src/puppet-web/friend-request.ts

@@ -19,15 +19,15 @@
 /* tslint:disable:no-var-requires */
 const retryPromise  = require('retry-promise').default
 
-import { Contact }        from '../contact'
+import Contact        from '../contact'
 import {
   Config,
   RecommendInfo,
   log,
-}                         from '../config'
-import { FriendRequest }  from '../friend-request'
+}                     from '../config'
+import FriendRequest  from '../friend-request'
 
-class PuppetWebFriendRequest extends FriendRequest {
+export class PuppetWebFriendRequest extends FriendRequest {
 
   public info: RecommendInfo
 
@@ -131,4 +131,4 @@ class PuppetWebFriendRequest extends FriendRequest {
 
 }
 
-export { PuppetWebFriendRequest as FriendRequest }
+export default PuppetWebFriendRequest

src/puppet-web/index.ts

@@ -8,10 +8,14 @@
  * https://github.com/zixia/wechaty
  *
  */
-export { Bridge }         from './bridge'
-export { Browser }        from './browser'
-export { Event }          from './event'
-export { FriendRequest }  from './friend-request'
-export { PuppetWeb }      from './puppet-web'
-export { Server }         from './server'
-export { Watchdog }       from './watchdog'
+export { Bridge }     from './bridge'
+export { Browser }    from './browser'
+export { Event }      from './event'
+export { PuppetWebFriendRequest as FriendRequest }  from './friend-request'
+
+export { Server }     from './server'
+export { Watchdog }   from './watchdog'
+
+import PuppetWeb      from './puppet-web'
+export { PuppetWeb }
+export default PuppetWeb

src/puppet-web/puppet-web.ts

@@ -19,22 +19,22 @@ import {
   ScanInfo,
   WatchdogFood,
   log,
-}                         from '../config'
+}                     from '../config'
 
-import { Contact }        from '../contact'
+import Contact        from '../contact'
 import {
   Message,
   MediaMessage,
- }                        from '../message'
-import { Puppet }         from '../puppet'
-import { Room }           from '../room'
-import { UtilLib }        from '../util-lib'
+ }                    from '../message'
+import Puppet         from '../puppet'
+import Room           from '../room'
+import UtilLib        from '../util-lib'
 
-import { Bridge }         from './bridge'
-import { Browser }        from './browser'
-import { Event }          from './event'
-import { Server }         from './server'
-import { Watchdog }       from './watchdog'
+import Bridge         from './bridge'
+import Browser        from './browser'
+import Event          from './event'
+import Server         from './server'
+import Watchdog       from './watchdog'
 
 import * as request from 'request'
 import * as bl from 'bl'
@@ -675,3 +675,5 @@ export class PuppetWeb extends Puppet {
     }
   }
 }
+
+export default PuppetWeb

src/puppet-web/server.ts

@@ -16,7 +16,7 @@ import * as bodyParser  from 'body-parser'
 import * as express     from 'express'
 import { EventEmitter } from 'events'
 
-import { log }  from '../config'
+import log  from '../brolog-env'
 
 export class Server extends EventEmitter {
   private express:      express.Application
@@ -171,3 +171,5 @@ export class Server extends EventEmitter {
     return
   }
 }
+
+export default Server

src/puppet-web/watchdog.ts

@@ -19,10 +19,10 @@ import {
   WatchdogFood,
   WatchdogFoodName,
   log,
-}                     from '../config'
+}                   from '../config'
 
-import { PuppetWeb }  from './puppet-web'
-import { Event }      from './event'
+import PuppetWeb    from './puppet-web'
+import Event        from './event'
 
 /* tslint:disable:variable-name */
 export const Watchdog = {
@@ -190,3 +190,5 @@ function monitorScan(this: PuppetWeb, type: WatchdogFoodName) {
     this.lastScanEventTime = Date.now()
   }
 }
+
+export default Watchdog

src/puppet.spec.ts

@@ -5,8 +5,8 @@
  * https://github.com/wechaty/wechaty
  *
  */
-import { test } from 'ava'
-import { PuppetWeb } from './puppet-web'
+import { test }   from 'ava'
+import PuppetWeb  from './puppet-web'
 
 test('Puppet smoking test', t => {
   const p = new PuppetWeb()

src/puppet.ts

@@ -3,13 +3,13 @@ import { EventEmitter } from 'events'
 import {
   Sayable,
 }                       from './config'
-import { Contact }      from './contact'
+import Contact          from './contact'
 import {
   Message,
   MediaMessage,
 }                       from './message'
-import { StateMonitor } from './state-monitor'
-import { Room }         from './room'
+import StateMonitor     from './state-monitor'
+import Room             from './room'
 
 // type ContactGetterFunc = {
 //   (id: string): Promise<any>
@@ -63,3 +63,5 @@ export abstract class Puppet extends EventEmitter implements Sayable {
   public abstract contactFind(filterFunc: string): Promise<Contact[]>
   public abstract contactAlias(contact: Contact, alias: string|null): Promise<boolean>
 }
+
+export default Puppet

src/room.ts

@@ -5,12 +5,12 @@ import {
   Sayable,
   log,
 }                     from './config'
-import { Contact }    from './contact'
+import Contact        from './contact'
 import {
   Message,
   MediaMessage,
 }                     from './message'
-import { UtilLib }    from './util-lib'
+import UtilLib        from './util-lib'
 
 type RoomObj = {
   id:               string,
@@ -584,3 +584,5 @@ export class Room extends EventEmitter implements Sayable {
   }
 
 }
+
+export default Room

src/state-monitor.spec.ts

@@ -12,7 +12,7 @@
  */
 import test from 'ava'
 
-import { StateMonitor } from './state-monitor'
+import StateMonitor from './state-monitor'
 
 test('StateMonitor target/current & stable', t => {
   const CLIENT_NAME = 'StateMonitorTest'

src/state-monitor.ts

@@ -117,3 +117,5 @@ export class StateMonitor <A, B>{
     return this._client
   }
 }
+
+export default StateMonitor

src/util-lib.spec.ts

@@ -8,7 +8,7 @@
 import { test }       from 'ava'
 import * as express   from 'express'
 
-import { UtilLib }  from './util-lib'
+import UtilLib        from './util-lib'
 
 // import * as http     from 'http'
 

src/util-lib.ts

@@ -283,3 +283,5 @@ export class UtilLib {
     }
   }
 }
+
+export default UtilLib

test/contact.spec.ts

@@ -5,10 +5,10 @@
  * https://github.com/wechaty/wechaty
  *
  */
-import { test }       from 'ava'
-import { Config }     from '../src/config'
-import { Contact }    from '../src/contact'
-import { PuppetWeb }  from '../src/puppet-web'
+import { test }   from 'ava'
+import Config     from '../src/config'
+import Contact    from '../src/contact'
+import PuppetWeb  from '../src/puppet-web'
 
 Config.puppetInstance(new PuppetWeb())
 

test/docker.spec.ts

@@ -11,7 +11,7 @@ import * as fs from 'fs'
 // import { execSync } from 'child_process'
 // import * as sinon from 'sinon'
 
-import { Config } from '../src/config'
+import Config from '../src/config'
 
 /**
  * need keep this !Config.isDocker because ava need at least one test() inside.

test/puppet-web/puppet-web.spec.ts

@@ -12,8 +12,8 @@ import {
   log,
 }                     from '../../src/config'
 // import { Message }    from '../../src/message'
-import { PuppetWeb }  from '../../src/puppet-web'
-import { Server }     from '../../src/puppet-web/server'
+import PuppetWeb  from '../../src/puppet-web'
+import Server     from '../../src/puppet-web/server'
 
 // import { spy } from 'sinon'
 

test/puppet-web/server.spec.ts

@@ -5,14 +5,14 @@
  * https://github.com/wechaty/wechaty
  *
  */
-import { test } from 'ava'
+import { test }     from 'ava'
 
-import * as https from 'https'
-import * as sinon from 'sinon'
+import * as https   from 'https'
+import * as sinon   from 'sinon'
 
 import { Server }   from '../../src/puppet-web/'
-import { UtilLib }  from '../../src/util-lib'
-import { log }      from '../../src/config'
+import UtilLib      from '../../src/util-lib'
+import log          from '../../src/brolog-env'
 
 test('create & close', async t => {
   const port = await UtilLib.getPort(18788)

test/puppet-web/watchdog.spec.ts

@@ -11,7 +11,7 @@ import * as sinon from 'sinon'
 /* tslint:disable:no-var-requires */
 const retryPromise = require('retry-promise').default
 
-import { log } from '../../src/config'
+import log from '../../src/brolog-env'
 
 import {
   PuppetWeb,

test/room.spec.ts

@@ -7,10 +7,10 @@
  */
 import { test } from 'ava'
 
-import { Config }     from '../src/config'
-import { Contact }    from '../src/contact'
-import { PuppetWeb }  from '../src/puppet-web'
-import { Room }       from '../src/room'
+import Config     from '../src/config'
+import Contact    from '../src/contact'
+import PuppetWeb  from '../src/puppet-web'
+import Room       from '../src/room'
 
 Config.puppetInstance(new PuppetWeb())
 // Room.attach(new PuppetWeb())