Skip to content

Commit 5e47cdd

Browse files
committed
fix: enhance error handling and improve code readability
- Refactor credential property overwrite to use async/await - Cache play button element to reduce DOM queries - Improve readability of version extraction logic
1 parent faa0c18 commit 5e47cdd

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

renderer.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ async function openClient() {
3838
(x) => x.accountId === selectedValue
3939
);
4040
if (selectedAccount) {
41-
await window.electron.overwriteCredentialProperties(selectedAccount);
4241
try {
42+
await window.electron.overwriteCredentialProperties(
43+
selectedAccount
44+
);
4345
const launchResult = await window.electron.openClient(
4446
version,
4547
proxy,
@@ -85,14 +87,15 @@ function getSelectedClientVersion() {
8587
*/
8688
async function playButtonClickHandler() {
8789
await checkForOutdatedLaunch();
90+
const playBtn = document.getElementById('play');
8891

8992
if (
90-
document.getElementById('play')?.innerText.toLowerCase() ===
93+
playBtn?.innerText.toLowerCase() ===
9194
'Play With Jagex Account'.toLowerCase()
9295
) {
9396
await openClient();
9497
} else {
95-
document.getElementById('play').classList.add('disabled');
98+
playBtn?.classList.add('disabled');
9699
try {
97100
const authResult = await window.electron.startAuthFlow();
98101
if (authResult?.error) {
@@ -101,7 +104,7 @@ async function playButtonClickHandler() {
101104
} catch (err) {
102105
window.electron.errorAlert(err?.message || String(err));
103106
} finally {
104-
document.getElementById('play').classList.remove('disabled');
107+
playBtn?.classList.remove('disabled');
105108
}
106109
}
107110
}
@@ -469,7 +472,8 @@ function setupAddAccountsButton() {
469472
* @returns {string} The extracted version number.
470473
*/
471474
function extractVersion(versionString) {
472-
return versionString?.replace(/^microbot-/, '').replace(/\.jar$/, '');
475+
const s = String(versionString ?? '');
476+
return s.replace(/^microbot-/, '').replace(/\.jar$/, '');
473477
}
474478

475479
/**

0 commit comments

Comments
 (0)