From b0141638136afc27cf0d96c8e3eed0c8e9696da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20M=C3=BCller?= Date: Mon, 25 Sep 2023 00:11:12 +0200 Subject: [PATCH] Improve exception handling --- src/node/utils/UpdateCheck.js | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/node/utils/UpdateCheck.js b/src/node/utils/UpdateCheck.js index 7bfef276f..9290380d8 100644 --- a/src/node/utils/UpdateCheck.js +++ b/src/node/utils/UpdateCheck.js @@ -17,25 +17,24 @@ const loadEtherpadInformations = () => { return axios.get('https://static.etherpad.org/info.json', {headers: headers}) .then(async resp => { - try { - infos = await resp.data; - if (infos === undefined || infos === null) { - await Promise.reject("Could not retrieve current version") - return - } - - lastLoadingTime = Date.now(); - return await Promise.resolve(infos); - } catch (err) { - return await Promise.reject(err); + infos = await resp.data; + if (infos === undefined || infos === null) { + await Promise.reject("Could not retrieve current version") + return } + + lastLoadingTime = Date.now(); + return await Promise.resolve(infos); }) + .catch(async err => { + return await Promise.reject(err); + }); } exports.getLatestVersion = () => { - exports.needsUpdate(); - return infos.latestVersion; + exports.needsUpdate().catch(); + return infos?.latestVersion; }; exports.needsUpdate = async (cb) => {