diff --git a/examples/ding-dong-bot.ts b/examples/ding-dong-bot.ts index 000f2ed21183e7d88a5af9db1abf7ce2197b7fa3..f38e989acf147a7ca9d211dfaa6f2ee8ea1420a2 100644 --- a/examples/ding-dong-bot.ts +++ b/examples/ding-dong-bot.ts @@ -73,8 +73,8 @@ bot log.info('Bot', `${user.name()} login`) bot.say('Wechaty login').catch(console.error) }) -.on('scan', (qrData, status, data) => { - QrcodeTerminal.generate(qrData, { small: true }, (asciiArt: string) => { +.on('scan', (qrcode, status, data) => { + QrcodeTerminal.generate(qrcode, { small: true }, (asciiArt: string) => { console.log(asciiArt) console.log(`[${status}] Scan QR Code above url to log in: `) if (data) { diff --git a/examples/self-testing-bot.ts b/examples/self-testing-bot.ts index 444db7902fa9d5173b7d67b9c588189815a6dc3b..1f080a26c293f08e48fb1ba4aa236c5fb98a1af7 100644 --- a/examples/self-testing-bot.ts +++ b/examples/self-testing-bot.ts @@ -75,9 +75,9 @@ bot log.info('Bot', `${user.name()} login`) bot.say('Wechaty login').catch(console.error) }) -.on('scan', (qrData, status, data) => { - QrcodeTerminal.generate(qrData, { small: true }, (asciiArt: string) => { - console.log(asciiArt) +.on('scan', (qrcode, status, data) => { + QrcodeTerminal.generate(qrcode, { small: true }, (asciiart: string) => { + console.log(asciiart) console.log(`[${status}] Scan QR Code above url to log in: `) if (data) { console.log(data) diff --git a/src/contact.ts b/src/contact.ts index d8158974315d2310991ebabae3277aff926eadeb..ec9d7ec92869d43632cfae84740e31c692821adf 100644 --- a/src/contact.ts +++ b/src/contact.ts @@ -637,7 +637,7 @@ export class ContactSelf extends Contact { throw new Error('only can get qrcode for the login userself') } - return await this.puppet.contactQrCode(this.id) + return await this.puppet.contactQrcode(this.id) } } diff --git a/src/puppet-mock/puppet-mock.ts b/src/puppet-mock/puppet-mock.ts index 0743663989f6220dd51f4138cba5d9ee377df48e..58802948eea863fe4196b58b40dd2bd3c7de8638 100644 --- a/src/puppet-mock/puppet-mock.ts +++ b/src/puppet-mock/puppet-mock.ts @@ -153,7 +153,7 @@ export class PuppetMock extends Puppet { return [] } - public async contactQrCode(contactId: string): Promise { + public async contactQrcode(contactId: string): Promise { if (contactId !== this.selfId()) { throw new Error('can not set avatar for others') } @@ -352,7 +352,7 @@ export class PuppetMock extends Puppet { log.verbose('PuppetMock', 'roomQuit(%s)', roomId) } - public async roomQrCode(roomId: string): Promise { + public async roomQrcode(roomId: string): Promise { return roomId + ' mock qrcode' } diff --git a/src/puppet-padchat/bridge.ts b/src/puppet-padchat/bridge.ts index 6e98851f29f18384f5c1283ad18b99bb27383f14..0a418dec9ebbf97e2ad5fe04acc3f26524fe037c 100644 --- a/src/puppet-padchat/bridge.ts +++ b/src/puppet-padchat/bridge.ts @@ -45,7 +45,7 @@ export class Bridge extends PadchatRpc { // private readonly padchatRpc : PadchatRpc private autoData : AutoDataType - private loginScanQrCode? : string + private loginScanQrcode? : string private loginScanStatus? : number private loginTimer?: NodeJS.Timer @@ -189,7 +189,7 @@ export class Bridge extends PadchatRpc { this.releaseCache() this.selfId = undefined - this.loginScanQrCode = undefined + this.loginScanQrcode = undefined this.state.off(true) } @@ -231,7 +231,7 @@ export class Bridge extends PadchatRpc { clearTimeout(this.loginTimer) this.loginTimer = undefined } - this.loginScanQrCode = undefined + this.loginScanQrcode = undefined this.loginScanStatus = undefined } @@ -257,11 +257,11 @@ export class Bridge extends PadchatRpc { // const result = await this.padchatRpc.WXCheckQRCode() const result = await this.WXCheckQRCode() - if (this.loginScanStatus !== result.status && this.loginScanQrCode) { + if (this.loginScanStatus !== result.status && this.loginScanQrcode) { this.loginScanStatus = result.status this.emit( 'scan', - this.loginScanQrCode, + this.loginScanQrcode, this.loginScanStatus, ) } @@ -269,7 +269,7 @@ export class Bridge extends PadchatRpc { if (result.expired_time && result.expired_time < 10) { // result.expire_time is second // emit new qrcode before the old one expired - this.loginScanQrCode = undefined + this.loginScanQrcode = undefined this.loginScanStatus = undefined waitUserResponse = false continue @@ -311,21 +311,21 @@ export class Bridge extends PadchatRpc { case WXCheckQRCodeStatus.Timeout: log.silly('PuppetPadchatBridge', 'checkQrcode: Timeout') - this.loginScanQrCode = undefined + this.loginScanQrcode = undefined this.loginScanStatus = undefined waitUserResponse = false break case WXCheckQRCodeStatus.Cancel: log.silly('PuppetPadchatBridge', 'user cancel') - this.loginScanQrCode = undefined + this.loginScanQrcode = undefined this.loginScanStatus = undefined waitUserResponse = false break default: log.warn('PadchatBridge', 'startLogin() unknown WXCheckQRCodeStatus: ' + result.status) - this.loginScanQrCode = undefined + this.loginScanQrcode = undefined this.loginScanStatus = undefined waitUserResponse = false break @@ -334,7 +334,7 @@ export class Bridge extends PadchatRpc { await new Promise(r => setTimeout(r, 1000)) } - await this.emitLoginQrCode() + await this.emitLoginQrcode() this.loginTimer = setTimeout(() => { this.loginTimer = undefined this.startLogin() @@ -401,7 +401,7 @@ export class Bridge extends PadchatRpc { /** * 1. No Auto Login, emit QrCode for scan */ - await this.emitLoginQrCode() + await this.emitLoginQrcode() return false } @@ -423,7 +423,7 @@ export class Bridge extends PadchatRpc { /** * 3.1 Login Request Not Valid, emit QrCode for scan. */ - await this.emitLoginQrCode() + await this.emitLoginQrcode() return false } else { @@ -435,10 +435,10 @@ export class Bridge extends PadchatRpc { } } - protected async emitLoginQrCode(): Promise { + protected async emitLoginQrcode(): Promise { log.verbose('PuppetPadchatBridge', `emitLoginQrCode()`) - if (this.loginScanQrCode) { + if (this.loginScanQrcode) { throw new Error('qrcode exist') } @@ -450,17 +450,17 @@ export class Bridge extends PadchatRpc { await this.WXInitialize() // wait 1 second and try again await new Promise(r => setTimeout(r, 1000)) - return await this.emitLoginQrCode() + return await this.emitLoginQrcode() } const qrCodeText = await pfHelper.imageBase64ToQrCode(result.qr_code) - this.loginScanQrCode = qrCodeText + this.loginScanQrcode = qrCodeText this.loginScanStatus = WXCheckQRCodeStatus.WaitScan this.emit( 'scan', - this.loginScanQrCode, + this.loginScanQrcode, this.loginScanStatus, ) diff --git a/src/puppet-padchat/puppet-padchat.ts b/src/puppet-padchat/puppet-padchat.ts index 551bc2b00cab6f671ed4770fb4dbbbc9f9f80b22..65f9f4e8ff428879fb7ee731da242b45ccba8d8d 100644 --- a/src/puppet-padchat/puppet-padchat.ts +++ b/src/puppet-padchat/puppet-padchat.ts @@ -348,7 +348,7 @@ export class PuppetPadchat extends Puppet { return fileBox } - public async contactQrCode(contactId: string): Promise { + public async contactQrcode(contactId: string): Promise { if (contactId !== this.selfId()) { throw new Error('can not set avatar for others') } @@ -570,7 +570,7 @@ export class PuppetPadchat extends Puppet { await this.bridge.WXDeleteChatRoomMember(roomId, contactId) } - public async roomQrCode(roomId: string): Promise { + public async roomQrcode(roomId: string): Promise { log.verbose('PuppetPadchat', 'roomQrCode(%s)', roomId) // TODO diff --git a/src/puppet-puppeteer/puppet-puppeteer.ts b/src/puppet-puppeteer/puppet-puppeteer.ts index 4f18e09bc263f9652875313c593ff5676fbe4fca..3c02d1b9479ca764d9ad796f0decbf350bdb634f 100644 --- a/src/puppet-puppeteer/puppet-puppeteer.ts +++ b/src/puppet-puppeteer/puppet-puppeteer.ts @@ -775,7 +775,7 @@ export class PuppetPuppeteer extends Puppet { } } - public async contactQrCode(contactId: string): Promise { + public async contactQrcode(contactId: string): Promise { if (contactId !== this.selfId()) { throw new Error('can not set avatar for others') } @@ -1088,7 +1088,7 @@ export class PuppetPuppeteer extends Puppet { log.warn('PuppetPuppeteer', 'roomQuit(%s) not supported by Web API', roomId) } - public async roomQrCode(roomId: string): Promise { + public async roomQrcode(roomId: string): Promise { throw new Error('not support ' + roomId) } diff --git a/src/puppet-wechat4u/puppet-wechat4u.ts b/src/puppet-wechat4u/puppet-wechat4u.ts index db62fbb43df21d1177e9559879bef63d56a538fc..02cd26ae9e43ed872bf3097bc1b27c7884c14464 100644 --- a/src/puppet-wechat4u/puppet-wechat4u.ts +++ b/src/puppet-wechat4u/puppet-wechat4u.ts @@ -316,7 +316,7 @@ export class PuppetWechat4u extends Puppet { return idList } - public async contactQrCode(contactId: string): Promise { + public async contactQrcode(contactId: string): Promise { if (contactId !== this.selfId()) { throw new Error('can not set avatar for others') } @@ -830,7 +830,7 @@ export class PuppetWechat4u extends Puppet { log.verbose('PuppetWechat4u', 'roomQuit(%s)', roomId) } - public async roomQrCode(roomId: string): Promise { + public async roomQrcode(roomId: string): Promise { throw new Error('not support ' + roomId) } diff --git a/src/puppet/puppet.spec.ts b/src/puppet/puppet.spec.ts index 7d7aed542089bffbbf822ed2067308150ad7608b..9e56e85f6c93d7cd2d79986c9fc03c25a7a0143b 100755 --- a/src/puppet/puppet.spec.ts +++ b/src/puppet/puppet.spec.ts @@ -58,7 +58,7 @@ class PuppetTest extends Puppet { public async contactAvatar(contactId: string, file?: FileBox) : Promise { return {contactId, file} as any } public async contactList() : Promise { return {} as any } - public async contactQrCode(contactId: string) : Promise { return {contactId} as any } + public async contactQrcode(contactId: string) : Promise { return {contactId} as any } public async contactRawPayload(id: string) : Promise { return {id} as any } public async contactRawPayloadParser(rawPayload: any) : Promise { return {rawPayload} as any } @@ -101,7 +101,7 @@ class PuppetTest extends Puppet { public async roomCreate(contactIdList: string[], topic?: string) : Promise { return {contactIdList, topic} as any } public async roomDel(roomId: string, contactId: string) : Promise { return {roomId, contactId} as any } public async roomQuit(roomId: string) : Promise { return {roomId} as any } - public async roomQrCode(roomId: string) : Promise { return {roomId} as any } + public async roomQrcode(roomId: string) : Promise { return {roomId} as any } public async roomTopic(roomId: string) : Promise public async roomTopic(roomId: string, topic: string) : Promise diff --git a/src/puppet/puppet.ts b/src/puppet/puppet.ts index af4aa37b3c9bbad9fa44b7e24dd68ac0518b7c06..a161c17170e09895eb10c39bb25de26faaa51864 100644 --- a/src/puppet/puppet.ts +++ b/src/puppet/puppet.ts @@ -181,7 +181,7 @@ export abstract class Puppet extends EventEmitter implements Sayable { public emit(event: 'room-join', roomId: string, inviteeIdList: string[], inviterId: string) : boolean public emit(event: 'room-leave', roomId: string, leaverIdList: string[], remover?: string) : boolean public emit(event: 'room-topic', roomId: string, topic: string, oldTopic: string, changerId: string) : boolean - public emit(event: 'scan', qrCode: string, status: number, data?: string) : boolean + public emit(event: 'scan', qrcode: string, status: number, data?: string) : boolean public emit(event: 'start') : boolean public emit(event: 'stop') : boolean // Internal Usage: watchdog @@ -211,7 +211,7 @@ export abstract class Puppet extends EventEmitter implements Sayable { public on(event: 'room-join', listener: (roomId: string, inviteeIdList: string[], inviterId: string) => void) : this public on(event: 'room-leave', listener: (roomId: string, leaverIdList : string[], removerId?: string) => void) : this public on(event: 'room-topic', listener: (roomId: string, topic: string, oldTopic: string, changerId: string) => void) : this - public on(event: 'scan', listener: (qrCode: string, status: number, data?: string) => void) : this + public on(event: 'scan', listener: (qrcode: string, status: number, data?: string) => void) : this public on(event: 'start', listener: () => void) : this public on(event: 'stop', listener: () => void) : this // Internal Usage: watchdog @@ -361,7 +361,7 @@ export abstract class Puppet extends EventEmitter implements Sayable { public abstract async contactList() : Promise - public abstract async contactQrCode(contactId: string) : Promise + public abstract async contactQrcode(contactId: string) : Promise public abstract async contactRawPayload(contactId: string) : Promise public abstract async contactRawPayloadParser(rawPayload: any) : Promise @@ -634,7 +634,7 @@ export abstract class Puppet extends EventEmitter implements Sayable { public abstract async roomTopic(roomId: string, topic: string) : Promise public abstract async roomTopic(roomId: string, topic?: string) : Promise - public abstract async roomQrCode(roomId: string) : Promise + public abstract async roomQrcode(roomId: string) : Promise public abstract async roomList() : Promise public abstract async roomMemberList(roomId: string) : Promise diff --git a/src/wechaty.ts b/src/wechaty.ts index 80d6b7ced9ab963b6bfd309095f2fc3d1c44d448..4231847ae3cc49a20fc90639632500d6c46d2e7e 100644 --- a/src/wechaty.ts +++ b/src/wechaty.ts @@ -254,7 +254,7 @@ export class Wechaty extends Accessory implements Sayable { public emit(event: 'room-join' , room: Room, inviteeList : Contact[], inviter : Contact) : boolean public emit(event: 'room-leave' , room: Room, leaverList : Contact[], remover? : Contact) : boolean public emit(event: 'room-topic' , room: Room, topic: string, oldTopic: string, changer: Contact) : boolean - public emit(event: 'scan' , qrData: string, status: number, data?: string) : boolean + public emit(event: 'scan' , qrcode: string, status: number, data?: string) : boolean public emit(event: 'start') : boolean public emit(event: 'stop') : boolean @@ -277,7 +277,7 @@ export class Wechaty extends Accessory implements Sayable { public on(event: 'room-join' , listener: string | ((this: Wechaty, room: Room, inviteeList: Contact[], inviter: Contact) => void)) : this public on(event: 'room-leave' , listener: string | ((this: Wechaty, room: Room, leaverList: Contact[], remover?: Contact) => void)) : this public on(event: 'room-topic' , listener: string | ((this: Wechaty, room: Room, topic: string, oldTopic: string, changer: Contact) => void)) : this - public on(event: 'scan' , listener: string | ((this: Wechaty, qrData: string, status: number, data?: string) => void)) : this + public on(event: 'scan' , listener: string | ((this: Wechaty, qrcode: string, status: number, data?: string) => void)) : this public on(event: 'start' , listener: string | ((this: Wechaty) => void)) : this public on(event: 'stop' , listener: string | ((this: Wechaty) => void)) : this @@ -643,8 +643,8 @@ export class Wechaty extends Accessory implements Sayable { case 'scan': puppet.removeAllListeners('scan') - puppet.on('scan', async (qrCode, statusCode, data) => { - this.emit('scan', qrCode, statusCode, data) + puppet.on('scan', async (qrcode, status, data) => { + this.emit('scan', qrcode, status, data) }) break