Skip to content

fix: prevent stale change:ref listener from triggering false QR disconnect #127090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Adi1231234 wants to merge 1 commit into from
Closed

fix: prevent stale change:ref listener from triggering false QR disconnect #127090

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/Client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,11 @@ class Client extends EventEmitter {
);
} else {
let qrRetries = 0;

this.on(Events.LOADING_SCREEN, () => {
qrRetries = 0;
});

await exposeFunctionIfAbsent(
this.pupPage,
'onQRChangedEvent',
Expand Down Expand Up @@ -270,10 +275,18 @@ class Client extends EventEmitter {
',' +
platform;

window.onQRChangedEvent(getQR(window.AuthStore.Conn.ref)); // initial qr
window.AuthStore.Conn.on('change:ref', (_, ref) => {
const onRefChange = (_, ref) => {
if (ref == null) return;
window.onQRChangedEvent(getQR(ref));
}); // future QR changes
};

window.onQRChangedEvent(getQR(window.AuthStore.Conn.ref)); // initial qr
window.AuthStore.Conn.on('change:ref', onRefChange); // future QR changes

// Remove QR listener once authentication succeeds
window.AuthStore.AppState.on('change:hasSynced', () => {
window.AuthStore.Conn.off('change:ref', onRefChange);
});
});
}
}
Expand Down