mirrors
/
keeweb
mirror of https://github.com/keeweb/keeweb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed error codes

pull/1856/head
antelle 2021-04-11 15:04:04 +02:00
parent 993f75b14e
commit 045e8ee96f
No known key found for this signature in database
GPG Key ID: 63C9777AAB7C563C
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/scripts/comp/app/browser-extension-connector.js
View File

@ -98,7 +98,12 @@ function isKeeWebConnect(request) {
return getClient(request).extensionName === 'keeweb-connect';
}
const noOpenFilesError = { error: 'No open files', errorCode: '1' };
const ErrorMessages = {
noOpenFiles: 'No open files'
};
const ErrorCode = {
[ErrorMessages.noOpenFiles]: 1
};
const ProtocolHandlers = {
'ping'({ data }) {
@ -156,7 +161,7 @@ const ProtocolHandlers = {
: undefined)
});
} else {
return { action: 'get-databasehash', ...noOpenFilesError };
throw new Error(ErrorMessages.noOpenFiles);
}
},
@ -185,7 +190,7 @@ const ProtocolHandlers = {
version: getVersion(request)
});
} else {
return { action: 'lock-database', ...noOpenFilesError };
throw new Error(ErrorMessages.noOpenFiles);
}
}
};
@ -386,7 +391,7 @@ const BrowserExtensionConnector = {
}
response = handler(request) || {};
} catch (e) {
response = { error: e.message || 'Unknown error' };
response = this.errorToResponse(e, request);
}
if (response) {
this.sendSocketResponse(socket, response);
@ -412,13 +417,21 @@ const BrowserExtensionConnector = {
}
response = handler(e.data) || {};
} catch (e) {
response = { error: e.message || 'Unknown error' };
response = this.errorToResponse(e, e.data);
}
if (response) {
this.sendWebResponse(response);
}
},
errorToResponse(e, request) {
return {
action: request.action,
error: e.message || 'Unknown error',
code: ErrorCode[e.message] ?? 0
};
},
sendWebResponse(response) {
response.kwConnect = 'response';
postMessage(response, window.location.origin);