diff --git a/src/friend-request.ts b/src/friend-request.ts index 8d1049f89515bdfcb53302dae64dc3a7cfdcd86c..8433c1101edd1325718b5a0b4279273ec62a41e8 100644 --- a/src/friend-request.ts +++ b/src/friend-request.ts @@ -10,7 +10,10 @@ * */ -import { Config } from './config' +import { + Config + , log +} from './config' import { Contact } from './contact' export abstract class FriendRequest { @@ -20,6 +23,8 @@ export abstract class FriendRequest { public type: 'send' | 'receive' | 'confirm' constructor() { + log.verbose('FriendRequest', 'constructor()') + if (!Config.puppetInstance()) { throw new Error('no Config.puppetInstance() instanciated') } diff --git a/src/puppet-web/browser.ts b/src/puppet-web/browser.ts index aa875d33f1d52b5101d0fdddf16877322df6a787..4bba1a70ca3aa13a2498457b75a70f6ef97e2bf4 100644 --- a/src/puppet-web/browser.ts +++ b/src/puppet-web/browser.ts @@ -62,7 +62,7 @@ export class Browser extends EventEmitter { try { await this.driver.init() - log.verbose('PuppetWebBrowser', 'init() driver.init() succ') + log.verbose('PuppetWebBrowser', 'init() driver.init() done') await this.open(jumpUrl) await this.loadCookie() @@ -149,9 +149,9 @@ export class Browser extends EventEmitter { try { await this.driver.close().catch(e => { /* fail safe */ }) // http://stackoverflow.com/a/32341885/1123955 - log.silly('PuppetWebBrowser', 'quit() driver.close() succ') + log.silly('PuppetWebBrowser', 'quit() driver.close() done') await this.driver.quit() - log.silly('PuppetWebBrowser', 'quit() driver.quit() succ') + log.silly('PuppetWebBrowser', 'quit() driver.quit() done') /** * diff --git a/src/puppet-web/event.ts b/src/puppet-web/event.ts index 069a93244ff44977fa5a7e20310c2a99db63bf61..b8ef356cdb726d60b706e2915e748d1c60888d7f 100644 --- a/src/puppet-web/event.ts +++ b/src/puppet-web/event.ts @@ -80,7 +80,7 @@ async function onBrowserDead(this: PuppetWeb, e): Promise { try { await this.browser.quit() - log.verbose('PuppetWebEvent', 'onBrowserDead() browser.quit() succ') + log.verbose('PuppetWebEvent', 'onBrowserDead() browser.quit() done') if (browser.state.target() !== 'open') { log.warn('PuppetWebEvent', 'onBrowserDead() will not init browser because browser.state.target(%s) !== open' diff --git a/src/puppet-web/wechaty-bro.js b/src/puppet-web/wechaty-bro.js index 881ada14010b26251610e7b1f92e0b27a77b82f3..87c2009a1ce09e22a4a3e6479151af756cd584ed 100644 --- a/src/puppet-web/wechaty-bro.js +++ b/src/puppet-web/wechaty-bro.js @@ -646,7 +646,7 @@ }) .then(function() { // succ // alert('ok') - log('friendAdd(' + UserName + ', ' + VerifyContent + ') succ') + log('friendAdd(' + UserName + ', ' + VerifyContent + ') done') }, function(t) { // fail // alert('not ok') log('friendAdd(' + UserName + ', ' + VerifyContent + ') fail: ' + t) @@ -664,7 +664,7 @@ , Ticket }).then(function() { // succ // alert('ok') - log('friendVerify(' + UserName + ', ' + Ticket + ') succ') + log('friendVerify(' + UserName + ', ' + Ticket + ') done') }, function() { // fail // alert('err') log('friendVerify(' + UserName + ', ' + Ticket + ') fail') @@ -760,7 +760,7 @@ this.WechatyBro = WechatyBro retObj.code = 200 - retObj.message = 'WechatyBro Inject Succ' + retObj.message = 'WechatyBro Inject Done' /** * Two return mode of WebDriver (should be one of them at a time)