提交 891675f7 编写于 作者: Huan (李卓桓)'s avatar Huan (李卓桓)

code clean up

上级 a7b2dc18
...@@ -29,7 +29,7 @@ let token = Config.token ...@@ -29,7 +29,7 @@ let token = Config.token
if (!token) { if (!token) {
log.error('Bot', 'token not found: please set WECHATY_TOKEN in environment before run io-bot') log.error('Bot', 'token not found: please set WECHATY_TOKEN in environment before run io-bot')
// process.exit(-1) // process.exit(-1)
token = 'TEST' token = Config.DEFAULT_TOKEN
log.warn('Bot', `set token to "${token}" for demo purpose`) log.warn('Bot', `set token to "${token}" for demo purpose`)
} }
......
const Wechaty = require('./src/wechaty') const Wechaty = require('./src/wechaty')
const Config = require('./src/config')
const Message = require('./src/message') const Message = require('./src/message')
const Contact = require('./src/contact') const Contact = require('./src/contact')
const Room = require('./src/room') const Room = require('./src/room')
const Puppet = require('./src/puppet') const Puppet = require('./src/puppet')
const PuppetWeb = require('./src/puppet-web') const PuppetWeb = require('./src/puppet-web')
const IoBot = require('./src/io-bot') const IoBot = require('./src/io-bot')
const log = require('./src/npmlog-env') const log = require('./src/npmlog-env')
const Config = require('./src/config') const UtilLib = require('./src/util-lib')
const UtilLib = require('./src/util-lib')
Object.assign(Wechaty, { Object.assign(Wechaty, {
default: Wechaty default: Wechaty
, Wechaty , Wechaty
, Config
, Message , Message
, Contact , Contact
...@@ -29,7 +30,6 @@ Object.assign(Wechaty, { ...@@ -29,7 +30,6 @@ Object.assign(Wechaty, {
, version: require('./package.json').version , version: require('./package.json').version
, log // for convenionce use npmlog with environment variable LEVEL , log // for convenionce use npmlog with environment variable LEVEL
, Config
, UtilLib , UtilLib
}) })
......
...@@ -6,15 +6,16 @@ ...@@ -6,15 +6,16 @@
"wechaty": { "wechaty": {
"DEFAULT_HEAD": "chrome", "DEFAULT_HEAD": "chrome",
"DEFAULT_PUPPET": "web", "DEFAULT_PUPPET": "web",
"DEFAULT_PROFILE": "default-profile", "DEFAULT_PROFILE": "profile",
"DEFAULT_PORT": 8788, "DEFAULT_PORT": 8788,
"DEFAULT_PUPPET_PORT": 18788, "DEFAULT_PUPPET_PORT": 18788,
"DEFAULT_PROTOCOL": "io|0.0.1", "DEFAULT_PROTOCOL": "io|0.0.1",
"DEFAULT_TOKEN": "WECHATY-TOKEN",
"ENDPOINT": "wss://api.wechaty.io/v0/websocket", "ENDPOINT": "wss://api.wechaty.io/v0/websocket",
"BINARY_CHROMIUM": "/wechaty/bin/xvfb-chromium" "BINARY_CHROMIUM": "/wechaty/bin/xvfb-chromium"
}, },
"scripts": { "scripts": {
"lint": "npm run eslint && echo npm run tslint", "lint": "npm run eslint && npm run tslint",
"eslint": "eslint \"{src,test}/**/*.js\"", "eslint": "eslint \"{src,test}/**/*.js\"",
"tslint": "tslint \"{src,test}/**/*.ts\"", "tslint": "tslint \"{src,test}/**/*.ts\"",
"pretest": "npm run lint", "pretest": "npm run lint",
......
...@@ -9,7 +9,12 @@ ...@@ -9,7 +9,12 @@
* https://github.com/zixia/wechaty * https://github.com/zixia/wechaty
* *
*/ */
const { Wechaty } = require('./wechaty')
/**
* do not use `require('../')` here, because it is a loop require
*/
const Wechaty = require('./wechaty')
const Config = require('./config')
class IoBot { class IoBot {
constructor({ constructor({
...@@ -51,12 +56,14 @@ class IoBot { ...@@ -51,12 +56,14 @@ class IoBot {
return wechaty.init() return wechaty.init()
.then(_ => this) .then(_ => {
this.log.verbose('IoBot', 'wechaty.init() succ')
return this
})
.catch(e => { .catch(e => {
this.log.error('IoBot', 'init() init fail: %s', e) this.log.error('IoBot', 'init() init fail: %s', e)
console.log(e)
wechaty.quit() wechaty.quit()
return e throw e
}) })
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册