franpcode/Baileys
1
0
Fork 0
mirror of https://github.com/FranP-code/Baileys.git synced 2025-10-13 00:32:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Invalid session fix

Browse Source
This commit is contained in:
Adhiraj Singh
2020-12-04 16:02:16 +05:30
parent 6d7dc4d9fe
commit 4a6c72c36c
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/WAConnection/1.Validation.ts
View File

@@ -33,6 +33,7 @@ export class WAConnection extends Base {
this.generateKeysForAuth (ref, ttl) this.generateKeysForAuth (ref, ttl)
} }
})(); })();
let loginTag: string
if (canLogin) { if (canLogin) {
// if we have the info to restore a closed session // if we have the info to restore a closed session
const json = [ const json = [
@@ -42,7 +43,7 @@ export class WAConnection extends Base {
this.authInfo?.serverToken, this.authInfo?.serverToken,
this.authInfo?.clientID, this.authInfo?.clientID,
] ]
const tag = this.generateMessageTag(true) loginTag = this.generateMessageTag(true)
if (reconnect) json.push(...['reconnect', reconnect.replace('@s.whatsapp.net', '@c.us')]) if (reconnect) json.push(...['reconnect', reconnect.replace('@s.whatsapp.net', '@c.us')])
else json.push ('takeover') else json.push ('takeover')
@@ -52,8 +53,12 @@ export class WAConnection extends Base {
this.logger.warn('Received login timeout req when WS not open, ignoring...') this.logger.warn('Received login timeout req when WS not open, ignoring...')
return return
} }
if (this.state === 'open') {
this.logger.warn('Received login timeout req when state=open, ignoring...')
return
}
this.logger.debug('sending login request') this.logger.debug('sending login request')
this.sendJSON(json, tag) this.sendJSON(json, loginTag)
this.initTimeout = setTimeout(sendLoginReq, 10_000) this.initTimeout = setTimeout(sendLoginReq, 10_000)
} }
sendLoginReq() sendLoginReq()
@@ -62,7 +67,13 @@ export class WAConnection extends Base {
await initQuery await initQuery
// wait for response with tag "s1" // wait for response with tag "s1"
let response = await this.waitForMessage('s1', false, undefined) let response = await Promise.race(
[
this.waitForMessage('s1', false, undefined),
loginTag && this.waitForMessage(loginTag, false, undefined)
]
.filter(Boolean)
)
this.startDebouncedTimeout() this.startDebouncedTimeout()
this.initTimeout && clearTimeout (this.initTimeout) this.initTimeout && clearTimeout (this.initTimeout)
this.initTimeout = null this.initTimeout = null