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

Use navigator.locks for messageBuffer

Browse source
This commit is contained in:
varjolintu 2023-08-17 16:10:10 +03:00
parent df9b1e8205
commit 62c17e38fb
2 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -96,7 +96,9 @@ class Message {
keepassClient.sendNativeMessage = async function(request, enableTimeout = false, timeoutValue) {
const message = new Message(request, enableTimeout, timeoutValue);
messageBuffer.addMessage({ request: request, message: message });
await navigator.locks.request('messageBuffer', async (lock) => {
messageBuffer.addMessage({ request: request, message: message });
});
// Send the request
if (keepassClient.nativePort) {
@ -107,29 +109,31 @@ keepassClient.sendNativeMessage = async function(request, enableTimeout = false,
return await message.promise;
};
keepassClient.handleNativeMessage = function(response) {
keepassClient.handleNativeMessage = async function(response) {
const isError = Boolean(!response.nonce && response.error && response.errorCode);
// Parse through the message buffer to find the corresponding Promise.
for (let i = 0; i < messageBuffer.buffer.length; ++i) {
if (! messageBuffer.buffer[i]) {
continue;
}
const request = messageBuffer.buffer[i]?.request;
const message = messageBuffer.buffer[i]?.message;
const errorFound = isError && request?.action === response?.action;
if ((response.nonce && response.nonce === keepassClient.incrementedNonce(request.nonce)) || errorFound) {
if (message.enableTimeout) {
clearTimeout(message.timeout);
await navigator.locks.request('messageBuffer', async (lock) => {
for (let i = 0; i < messageBuffer.buffer.length; ++i) {
if (! messageBuffer.buffer[i]) {
continue;
}
message.resolve(response);
messageBuffer.removeMessageFromIndex(i);
return;
const request = messageBuffer.buffer[i]?.request;
const message = messageBuffer.buffer[i]?.message;
const errorFound = isError && request?.action === response?.action;
if ((response.nonce && response.nonce === keepassClient.incrementedNonce(request.nonce)) || errorFound) {
if (message.enableTimeout) {
clearTimeout(message.timeout);
}
message.resolve(response);
messageBuffer.removeMessageFromIndex(i);
return;
}
}
}
});
};
keepassClient.handleResponse = function(response, incrementedNonce, tab) {

2
keepassxc-browser/manifest.json
View file

@ -159,7 +159,7 @@
"applications": {
"gecko": {
"id": "keepassxc-browser@keepassxc.org",
"strict_min_version": "93.0"
"strict_min_version": "96.0"
}
},
"default_locale": "en"