prehistoric-systems/keepassxc-browser
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc-browser.git synced 2026-03-11 08:54:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2007 from keepassxreboot/fix/move_cancel_timeout

Browse source 
Move cancelTimeout() to the messageBuffer
This commit is contained in:
Sami Vänttinen 2023-10-16 15:51:23 +03:00 committed by GitHub
commit 74b09e369e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
keepassxc-browser/background/client.js
View file

@ -75,8 +75,17 @@ const messageBuffer = {
// return the first matching action from the buffer.
getMessage(response) {
const isError = Boolean(!response.nonce && response.error && response.errorCode);
return this.buffer.find(b => keepassClient.incrementedNonce(b.request.nonce) === response.nonce
|| (isError && b.request?.action === response?.action));
return this.buffer.find(message => {
if (keepassClient.incrementedNonce(message.request.nonce) === response.nonce
|| (isError && message.request?.action === response?.action)) {
// Cancel timeout
if (message.enableTimeout) {
message.cancelTimeout();
}
return message;
}}
);
},
removeMessage(message) {
@ -155,10 +164,6 @@ keepassClient.handleNativeMessage = async function(response) {
await navigator.locks.request('messageBuffer', async (lock) => {
const message = messageBuffer.getMessage(response);
if (message) {
if (message.enableTimeout) {
message.cancelTimeout();
}
message.resolve(response);
messageBuffer.removeMessage(message);
return;