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

Typescript transition step 2: rename `require` to `import`, and rename...

Typescript transition step 2: rename `require` to `import`, and rename `module.exports` to `export default`
上级 b54bfbaf
......@@ -52,3 +52,5 @@ t/
t.*
.DS_Store
/dev.js
/typings
......@@ -7,11 +7,11 @@
* https://github.com/wechaty/wechaty
*
*/
const {
import {
Wechaty
, Config
, log
} = require('../')
} from '../'
const welcome = `
| __ __ _ _
......
const Wechaty = require('./src/wechaty')
const Config = require('./src/config')
import Wechaty from './src/wechaty'
import Config from './src/config'
const Message = require('./src/message')
const Contact = require('./src/contact')
const Room = require('./src/room')
import Message from './src/message'
import Contact from './src/contact'
import Room from './src/room'
const Puppet = require('./src/puppet')
const PuppetWeb = require('./src/puppet-web')
import Puppet from './src/puppet'
import PuppetWeb from './src/puppet-web'
const IoClient = require('./src/io-client')
import IoClient from './src/io-client'
const log = require('./src/brolog-env')
import log from './src/brolog-env'
const UtilLib = require('./src/util-lib')
import UtilLib from './src/util-lib'
// Object.assign(Wechaty, {
// default: Wechaty
// , Wechaty
// , Config
// , Message
// , Contact
// , Room
// , Puppet
// , PuppetWeb
// , IoClient
// , UtilLib
// , version: require('./package.json').version
// , log // for convenionce use npmlog with environment variable LEVEL
// })
// module.exports = Wechaty
const version = require('./package.json').version
export default Wechaty
export {
Config
Object.assign(Wechaty, {
default: Wechaty
, Wechaty
, Config
, Message
, Contact
, Room
, Puppet
, PuppetWeb
, IoClient
, UtilLib
, Wechaty
, version: require('./package.json').version
, version
, log // for convenionce use npmlog with environment variable LEVEL
})
module.exports = Wechaty
}
......@@ -28,8 +28,8 @@
"testdev": "cross-env LC_ALL=C WECHATY_LOG=silly ava --serial --verbose --fail-fast --timeout=3m",
"ava": "cross-env LC_ALL=C WECHATY_LOG=verbose ava \"{src,test}/**/*.spec.js\"",
"start": "ts-node bin/client",
"dev": "ts-node dev.js",
"demo": "ts-node example/ding-dong-bot.js"
"dev": "ts-node dev.ts",
"demo": "ts-node example/ding-dong-bot.ts"
},
"repository": {
"type": "git",
......@@ -104,6 +104,7 @@
"qrcode-terminal": "^0.10.0",
"sinon": "^1.17.5",
"sloc": "^0.1.11",
"ts-node": "^1.4.1",
"tslint": "^3.15.1",
"tuling123-client": "0.0.1",
"typescript": "^2.0.3",
......
......@@ -5,7 +5,7 @@
*
*/
// const log = require('npmlog')
const log = require('brolog')
import log from 'brolog'
const level = process.env.WECHATY_LOG
const levelRegexStr = 'silly|verbose|info|warn|error|silent'
......@@ -19,4 +19,5 @@ else if (level){
log.warn('Brolog', 'env WECHATY_LOG(%s) must be one of silly|verbose|info|warn|error|silent', level)
}
module.exports = log.default = log.log = log
// module.exports = log.default = log.log = log
export default log
import { test } from 'ava'
import { Config } from './config'
import Config from './config'
test('Config list vars', t => {
t.truthy(Config.default , 'should export default')
......
......@@ -81,4 +81,5 @@ Config.puppetInstance = function(instance) {
return Config._puppetInstance
}
module.exports = Config.default = Config.Config = Config
// module.exports = Config.default = Config.Config = Config
export default Config
......@@ -6,9 +6,10 @@
* https://github.com/zixia/wechaty
*
*/
const { log } = require('./brolog-env')
const { UtilLib } = require('./util-lib')
const { Config } = require('./config')
import Config from './config'
import UtilLib from './util-lib'
import log from './brolog-env'
class Contact {
constructor(id) {
......@@ -187,4 +188,6 @@ Contact.load = function(id) {
// return []
// }
module.exports = Contact.default = Contact.Contact = Contact
// module.exports = Contact.default = Contact.Contact = Contact
export default Contact
......@@ -10,8 +10,8 @@
*
*/
const Wechaty = require('./wechaty')
const Config = require('./config')
import Config from './config'
import Wechaty from './wechaty'
class FriendRequest {
constructor() {
......@@ -25,4 +25,5 @@ class FriendRequest {
}
module.exports = FriendRequest.default = FriendRequest.FriendRequest = FriendRequest
// module.exports = FriendRequest.default = FriendRequest.FriendRequest = FriendRequest
export default FriendRequest
......@@ -10,16 +10,16 @@
*
*/
const co = require('co')
// const co = require('co')
/**
* DO NOT use `require('../')` here!
* because it will casue a LOOP require ERROR
*/
const Wechaty = require('./wechaty')
const Config = require('./config')
const Io = require('./io')
const brolog = require('./brolog-env')
import Wechaty from './wechaty'
import Config from './config'
import Io from './io'
import brolog from './brolog-env'
class IoClient {
constructor({
......@@ -285,4 +285,5 @@ class IoClient {
}
}
module.exports = IoClient.default = IoClient.IoClient = IoClient
// module.exports = IoClient.default = IoClient.IoClient = IoClient
export default IoClient
......@@ -11,11 +11,12 @@
*/
const EventEmitter = require('events')
const WebSocket = require('ws')
const co = require('co')
// const co = require('co')
const log = require('./brolog-env')
const Contact = require('./contact')
const Config = require('./config')
import Config from './config'
import Contact from './contact'
import log from './brolog-env'
class Io {
......@@ -33,7 +34,7 @@ class Io {
this.token = token
this.apihost = apihost
this.protocol = protocol + '|' + wechaty.uuid
log.verbose('Io', 'instantiated with apihost[%s], token[%s], protocol[%s], uuid[%s]', apihost, token, protocol, this.uuid)
......@@ -128,19 +129,19 @@ class Io {
, payload: 'Wechaty version ' + this.wechaty.version() + ` with UUID: ${this.uuid}`
}
this.send(initEvent)
}.bind(this))
ws.on('message', (data, flags) => {
log.silly('Io', 'initWebSocket() ws.on(message): %s', data)
// flags.binary will be set if a binary data is received.
// flags.masked will be set if the data was masked.
const ioEvent = {
name: 'raw'
, payload: data
}
try {
const obj = JSON.parse(data)
ioEvent.name = obj.name
......@@ -162,12 +163,12 @@ class Io {
}
}
break
case 'reset':
log.verbose('Io', 'on(reset): %s', ioEvent.payload)
this.wechaty.reset()
break
case 'shutdown':
log.warn('Io', 'on(shutdown): %s', ioEvent.payload)
process.exit(0)
......@@ -182,8 +183,8 @@ class Io {
, payload: user.obj
}
this.send(loginEvent)
}
}
const scan = this.wechaty && this.wechaty.puppet && this.wechaty.puppet.scan
if (scan) {
const scanEvent = {
......@@ -192,13 +193,13 @@ class Io {
}
this.send(scanEvent)
}
break
case 'sys':
// do nothing
break
default:
log.warn('Io', 'UNKNOWN on(%s): %s', ioEvent.name, ioEvent.payload)
break
......@@ -250,7 +251,7 @@ class Io {
} else if (this.reconnectTimeout < 10000) {
this.reconnectTimeout *= 3
}
log.warn('Io', 'reconnect() will reconnect after %d s', Math.floor(this.reconnectTimeout/1000))
this.reconnectTimer = setTimeout(_ => {
this.reconnectTimer = null
......@@ -277,7 +278,7 @@ class Io {
name: event
, payload: data
}
switch (event) {
case 'login':
case 'logout':
......@@ -285,7 +286,7 @@ class Io {
ioEvent.payload = data.obj
}
break
case 'error':
ioEvent.payload = data.toString()
break
......@@ -296,11 +297,11 @@ class Io {
, data: data
}
break
default:
break
}
this.send(ioEvent)
})
})
......@@ -315,7 +316,7 @@ class Io {
// }
// this.send(messageEvent)
// })
return Promise.resolve()
}
......@@ -338,7 +339,7 @@ class Io {
)
}
}
close() {
log.verbose('Io', 'close()')
this.targetState('disconnected')
......@@ -376,10 +377,11 @@ class Io {
ioMessage(m) {
log.verbose('Io', 'ioMessage() is a nop function before be overwriten from cloud')
}
}
/**
* Expose `Wechaty`.
*/
module.exports = Io.default = Io.Io = Io
// module.exports = Io.default = Io.Io = Io
export default Io
......@@ -6,12 +6,13 @@
* https://github.com/zixia/wechaty
*
*/
const co = require('co')
// const co = require('co')
const log = require('./brolog-env')
const UtilLib = require('./util-lib')
const Message = require('./message')
const Config = require('./config')
import Config from './config'
import Message from './message'
import UtilLib from './util-lib'
import log from './brolog-env'
class MediaMessage extends Message {
constructor(rawObj) {
......@@ -58,4 +59,5 @@ class MediaMessage extends Message {
}
}
module.exports = MediaMessage.default = MediaMessage.MediaMessage = MediaMessage
// module.exports = MediaMessage.default = MediaMessage.MediaMessage = MediaMessage
export default MediaMessage
......@@ -6,14 +6,14 @@
* https://github.com/wechaty/wechaty
*
*/
const co = require('co')
// const co = require('co')
const Config = require('./config')
const Contact = require('./contact')
const Room = require('./room')
const UtilLib = require('./util-lib')
import Config from './config'
import Contact from './contact'
import Room from './room'
import UtilLib from './util-lib'
const log = require('./brolog-env')
import log from './brolog-env'
class Message {
constructor(rawObj) {
......@@ -218,7 +218,8 @@ Object.keys(Message.Type).forEach(k => {
// Message.puppet = puppet
// }
module.exports = Message.default = Message.Message = Message
// module.exports = Message.default = Message.Message = Message
export default Message
/*
* join room in mac client: https://support.weixin.qq.com/cgi-bin/mmsupport-bin/addchatroombyinvite?ticket=AUbv%2B4GQA1Oo65ozlIqRNw%3D%3D&exportkey=AS9GWEg4L82fl3Y8e2OeDbA%3D&lang=en&pass_ticket=T6dAZXE27Y6R29%2FFppQPqaBlNwZzw9DAN5RJzzzqeBA%3D&wechat_real_lang=en
......
......@@ -9,10 +9,10 @@
* https://github.com/zixia/wechaty-lib
*
*/
const co = require('co')
// const co = require('co')
const retryPromise = require('retry-promise').default
const log = require('../brolog-env')
import log from '../brolog-env'
class Bridge {
constructor(options) {
......@@ -370,7 +370,8 @@ class Bridge {
}
}
module.exports = Bridge
// module.exports = Bridge
export default Bridge
/**
*
......
......@@ -7,18 +7,17 @@
* https://github.com/zixia/wechaty
*
*/
const fs = require('fs')
const co = require('co')
// const co = require('co')
const path = require('path')
const util = require('util')
const EventEmitter = require('events')
const WebDriver = require('selenium-webdriver')
const retryPromise = require('retry-promise').default // https://github.com/olalonde/retry-promise
const log = require('../brolog-env')
import log from'../brolog-env'
const Config = require('../config')
import Config from'../config'
class Browser extends EventEmitter {
......@@ -638,4 +637,5 @@ this.onResourceRequested = function(request, net) {
}
}
module.exports = Browser
// module.exports = Browser
export default Browser
......@@ -20,15 +20,15 @@
***************************************/
const util = require('util')
const fs = require('fs')
const co = require('co')
// const co = require('co')
const log = require('../brolog-env')
const Contact = require('../contact')
const Message = require('../message')
const MediaMessage = require('../message-media')
import Contact from '../contact'
import MediaMessage from '../message-media'
import Message from '../message'
import log from '../brolog-env'
const FriendRequest = require('./friend-request')
const Firer = require('./firer')
import FriendRequest from './friend-request'
import Firer from './firer'
const PuppetWebEvent = {
onBrowserDead
......@@ -390,4 +390,5 @@ function onServerMessage(data) {
})
}
module.exports = PuppetWebEvent
// module.exports = PuppetWebEvent
export default PuppetWebEvent
......@@ -20,13 +20,13 @@
***************************************/
const util = require('util')
const fs = require('fs')
const co = require('co')
// const co = require('co')
const retryPromise = require('retry-promise').default
const log = require('../brolog-env')
const Contact = require('../contact')
const Message = require('../message')
const FriendRequest = require('./friend-request')
import Contact from '../contact'
import FriendRequest from './friend-request'
import Message from '../message'
import log from '../brolog-env'
const PuppetWebFirer = {
fireFriendConfirm
......@@ -324,4 +324,5 @@ function fireRoomTopic(m) {
})
}
module.exports = PuppetWebFirer
// module.exports = PuppetWebFirer
export default PuppetWebFirer
import { test } from 'ava'
import { PuppetWebFriendRequest } from './friend-request'
import { Wechaty } from '../wechaty'
import { Config } from '../config'
import { Contact } from '../contact'
import { Message } from '../message'
import Config from '../config'
import Contact from '../contact'
import Message from '../message'
import Wechaty from '../wechaty'
import PuppetWebFriendRequest from './friend-request'
Config.puppetInstance({})
......
......@@ -16,11 +16,11 @@
*
*/
const Wechaty = require('../wechaty')
const Contact = require('../contact')
const Config = require('../config')
const FriendRequest = require('../friend-request')
const log = require('../brolog-env')
import Contact from '../contact'
import Config from '../config'
import FriendRequest from '../friend-request'
import Wechaty from '../wechaty'
import log from '../brolog-env'
class PuppetWebFriendRequest extends FriendRequest {
constructor() {
......@@ -91,4 +91,5 @@ class PuppetWebFriendRequest extends FriendRequest {
}
module.exports = PuppetWebFriendRequest
// module.exports = PuppetWebFriendRequest
export default PuppetWebFriendRequest
import { test } from 'ava'
import { PuppetWeb } from './'
import { test } from 'ava'
import PuppetWeb from './'
test('PuppetWeb Module Exports', t => {
t.truthy(PuppetWeb.default , 'should export default')
......
const PuppetWeb = require('./puppet-web')
const Event = require('./event')
const Server = require('./server')
const Browser = require('./browser')
const Bridge = require('./bridge')
const Watchdog = require('./watchdog')
/**
*
* wechaty: Wechat for Bot. and for human who talk to bot/robot
*
* Class PuppetWeb Exportor
*
* Licenst: ISC
* https://github.com/zixia/wechaty
*
*/
import Bridge from './bridge'
import Browser from './browser'
import Event from './event'
import PuppetWeb from './puppet-web'
import Server from './server'
import Watchdog from './watchdog'
Object.assign(PuppetWeb, {
default: PuppetWeb
, PuppetWeb
, Server
// Object.assign(PuppetWeb, {
// default: PuppetWeb
// , PuppetWeb
// , Server
// , Browser
// , Bridge
// , Event
// , Watchdog
// })
// module.exports = PuppetWeb
export default PuppetWeb
export {
Bridge
, Browser
, Bridge
, Event
, PuppetWeb
, Server
, Watchdog
})
module.exports = PuppetWeb
}
......@@ -18,24 +18,22 @@
***************************************/
const util = require('util')
const fs = require('fs')
const co = require('co')
const log = require('../brolog-env')
const Puppet = require('../puppet')
const Contact = require('../contact')
const Room = require('../room')
const Message = require('../message')
const FriendRequest = require('../friend-request')
const Server = require('./server')
const Browser = require('./browser')
const Bridge = require('./bridge')
const Event = require('./event')
const Watchdog = require('./watchdog')
const UtilLib = require('../util-lib')
const Config = require('../config')
// const co = require('co')
import Config from '../config'
import Contact from '../contact'
import FriendRequest from '../friend-request'
import Message from '../message'
import Puppet from '../puppet'
import Room from '../room'
import UtilLib from '../util-lib'
import log from '../brolog-env'
import Bridge from './bridge'
import Browser from './browser'
import Event from './event'
import Server from './server'
import Watchdog from './watchdog'
const DEFAULT_PUPPET_PORT = 18788 // // W(87) X(88), ascii char code ;-]
......@@ -472,4 +470,5 @@ class PuppetWeb extends Puppet {
}
}
module.exports = PuppetWeb.default = PuppetWeb.PuppetWeb = PuppetWeb
// module.exports = PuppetWeb.default = PuppetWeb.PuppetWeb = PuppetWeb
export default PuppetWeb
......@@ -15,12 +15,12 @@ const path = require('path')
const https = require('https')
const bodyParser = require('body-parser')
const Config = require('../config')
const log = require('../brolog-env')
const Express = require('express')
const EventEmitter = require('events')
import Config from '../config'
import log from '../brolog-env'
class Server extends EventEmitter {
constructor({
port
......@@ -171,4 +171,5 @@ class Server extends EventEmitter {
}
}
module.exports = Server
// module.exports = Server
export default Server
......@@ -12,7 +12,7 @@
* http://blog.mgechev.com/2014/02/19/create-https-tls-ssl-application-with-express-nodejs/
* openssl req -x509 -days 3650 -nodes -newkey rsa:2048 -keyout key.pem -out cert.pem
* openssl rsa -in key.pem -out newkey.pem && mv newkey.pem key.pem
*
*
* Reference:
* What is a Pem file - http://serverfault.com/a/9717
*/
......@@ -69,8 +69,9 @@ g+Xdc4Ag/St5eqgrp95KOlVeepSlb35LAD1Cc91LddTXCYS7+dc4ndQYpgrLU0ru
Sw==
-----END CERTIFICATE-----
`
module.exports = {
cert: cert
, key: key
}
// module.exports = {
// cert: cert
// , key: key
// }
export { cert, key }
......@@ -16,10 +16,10 @@
* Class PuppetWeb
*
***************************************/
const co = require('co')
// const co = require('co')
const log = require('../brolog-env')
const Event = require('./event')
import log from '../brolog-env'
import Event from './event'
const Watchdog = {
onFeed
......@@ -154,4 +154,5 @@ function monitorScan(type) {
}
}
module.exports = Watchdog
// module.exports = Watchdog
export default Watchdog
......@@ -11,7 +11,8 @@
*/
const EventEmitter = require('events')
const log = require('./brolog-env')
import log from './brolog-env'
class Puppet extends EventEmitter {
constructor() {
......@@ -83,4 +84,5 @@ Object.assign(Puppet, {
, Room: require('./room')
})
module.exports = Puppet
// module.exports = Puppet
export default Puppet
......@@ -10,13 +10,13 @@
*/
const EventEmitter = require('events')
const Config = require('./config')
const Contact = require('./contact')
const Message = require('./message')
const UtilLib = require('./util-lib')
const WechatyEvent = require('./wechaty-event')
import Config from './config'
import Contact from './contact'
import Message from './message'
import UtilLib from './util-lib'
import WechatyEvent from './wechaty-event'
const log = require('./brolog-env')
import log from './brolog-env'
class Room extends EventEmitter{
constructor(id) {
......@@ -391,4 +391,5 @@ class Room extends EventEmitter{
Room.init()
module.exports = Room
// module.exports = Room
export default Room
/**
* Wechaty
*
*
* Helper Class for Manage State Change
*/
......@@ -31,3 +31,5 @@ class StateMonitor <A, B>{
return this._currentState
}
}
export default StateMonitor
const http = require('http')
const log = require('./brolog-env')
import log from './brolog-env'
const UtilLib = {
stripHtml
......@@ -129,10 +130,12 @@ function getPort(port) {
})
function nextPort(port) {
RANDOM_RANGE = 1024
const RANDOM_RANGE = 1024
const n = Math.floor(Math.random() * RANDOM_RANGE)
return port + n
}
}
module.exports = UtilLib.default = UtilLib.UtilLib = UtilLib
// module.exports = UtilLib.default = UtilLib.UtilLib = UtilLib
export default UtilLib
......@@ -14,19 +14,19 @@
*
*
***************************************/
const Config = require('./config')
const Contact = require('./contact')
const Message = require('./message')
// const Room = require('./room')
import Config import './config'
import Contact import './contact'
import Message import './message'
// import Room import './room'
const log = require('./brolog-env')
import log import './brolog-env'
const WechatyEvent = {
list
, wrap
}
EVENT_CONFIG = {
const EVENT_CONFIG = {
error: wrapFilehelper
, friend: wrapContact
, heartbeat: wrapFilehelper
......@@ -206,4 +206,5 @@ function wrapFilehelper(callback) {
}
}
module.exports = WechatyEvent.default = WechatyEvent
// module.exports = WechatyEvent.default = WechatyEvent
export default WechatyEvent
......@@ -8,17 +8,17 @@
* https://github.com/zixia/wechaty
*
*/
const EventEmitter = require('events')
import EventEmitter = require('events')
const path = require('path')
const co = require('co')
// const co = require('co')
const fs = require('fs')
const Config = require('./config')
const PuppetWeb = require('./puppet-web')
const UtilLib = require('./util-lib')
const WechatyEvent = require('./wechaty-event')
import Config from './config'
import PuppetWeb from './puppet-web'
import UtilLib from './util-lib'
import WechatyEvent from './wechaty-event'
const log = require('./brolog-env')
import log from './brolog-env'
class Wechaty extends EventEmitter {
......@@ -238,4 +238,5 @@ class Wechaty extends EventEmitter {
/**
* Expose `Wechaty`.
*/
module.exports = Wechaty.default = Wechaty.Wechaty = Wechaty
// module.exports = Wechaty.default = Wechaty.Wechaty = Wechaty
export default Wechaty
{
"globalDependencies": {
"node": "registry:env/node#6.0.0+20160918225031"
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册