yuessir
/
matrix-puppeteer-line
forked from fair/matrix-puppeteer-line
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Better tracking of loginRunning/Cancelled

This commit is contained in:
Andrew Ferrazzutti 2021-02-12 02:16:09 -05:00
parent ab869083b3
commit e072d4709c
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
puppet/src/puppet.js
View File

@ -126,7 +126,6 @@ export default class MessagesPuppeteer {
return
}
this.loginRunning = true
this.loginCancelled = false
const loginContentArea = await this.page.waitForSelector("#login_content")
@ -226,6 +225,7 @@ export default class MessagesPuppeteer {
}
this.log("Waiting for sync")
try {
await this.page.waitForFunction(
messageSyncElement => {
const text = messageSyncElement.innerText
@ -234,9 +234,12 @@ export default class MessagesPuppeteer {
{},
result)
await this.startObserving()
this.loginRunning = false
await this.startObserving()
this.log("Login complete")
} catch (err) {
this._sendLoginFailure(`Failed to sync: ${err}`)
}
}
/**
@ -244,6 +247,7 @@ export default class MessagesPuppeteer {
*/
async cancelLogin() {
if (this.loginRunning) {
this.loginRunning = false
this.loginCancelled = true
await this._preparePage(false)
}
@ -252,6 +256,7 @@ export default class MessagesPuppeteer {
_waitForLoginCancel() {
return new Promise((resolve, reject) => {
if (this.loginCancelled) {
this.loginCancelled = false
resolve()
} else {
reject()
@ -523,6 +528,7 @@ export default class MessagesPuppeteer {
}
_sendLoginFailure(reason) {
this.loginRunning = false
this.error(`Login failure: ${reason ? reason : 'cancelled'}`)
if (this.client) {
this.client.sendFailure(reason).catch(err =>