From 00d04db553eb53abb48f0b4e3649a6912fdc10df Mon Sep 17 00:00:00 2001 From: 0neGal Date: Fri, 20 Dec 2024 20:21:28 +0100 Subject: added request.check_with_toasts() and use it This makes it very simple to check if some endpoints are available, and show a toast if not, with an error message saying exactly what isn't available. Currently made use for updates with GitHub and installs with Thunderstore. --- src/app/js/browser.js | 10 +++++++++- src/app/js/request.js | 23 +++++++++++++++++++++++ src/app/js/update.js | 10 +++++++++- 3 files changed, 41 insertions(+), 2 deletions(-) (limited to 'src/app/js') diff --git a/src/app/js/browser.js b/src/app/js/browser.js index 10428bc..f306da8 100644 --- a/src/app/js/browser.js +++ b/src/app/js/browser.js @@ -107,7 +107,15 @@ var browser = { browser.filters.toggle(false); } }, - install: (package_obj, clear_queue = false) => { + install: async (package_obj, clear_queue = false) => { + let can_connect = await request.check_with_toasts( + "Thunderstore", "https://thunderstore.io" + ) + + if (! can_connect) { + return; + } + return mods.install_from_url( package_obj.download || package_obj.versions[0].download_url, package_obj.dependencies || package_obj.versions[0].dependencies, diff --git a/src/app/js/request.js b/src/app/js/request.js index ad8c25b..81e10b1 100644 --- a/src/app/js/request.js +++ b/src/app/js/request.js @@ -1,3 +1,5 @@ +const lang = require("../../lang"); +const toasts = require("./toasts"); const launcher = require("./launcher"); const set_buttons = require("./set_buttons"); const ipcRenderer = require("electron").ipcRenderer; @@ -18,6 +20,27 @@ request.delete_cache = () => { ipcRenderer.send("delete-request-cache"); } +// does `request.check(...args)` and shows toast if the check failed, +// using `name` inside the toast message +request.check_with_toasts = async (name, ...args) => { + // perform check + let can_connect = ( + await request.check(...args) + ).succeeded.length; + + // show toast, as the check failed + if (! can_connect) { + toasts.show({ + timeout: 10000, + scheme: "error", + title: lang("gui.toast.title.failed_to_connect"), + description: lang("gui.toast.desc.failed_to_connect").replaceAll("%s", name) + }) + } + + return can_connect; +} + // keeps track of whether we've already sent a toast since we last went // offline, to prevent multiple toasts let sent_error_toast = false; diff --git a/src/app/js/update.js b/src/app/js/update.js index d03db02..3732f89 100644 --- a/src/app/js/update.js +++ b/src/app/js/update.js @@ -125,7 +125,15 @@ let update = { // updates Northstar, `force_update` forcefully updates Northstar, // causing it to update, even if its already up-to-date - ns: (force_update) => { + ns: async (force_update) => { + let can_connect = await request.check_with_toasts( + "GitHub", "https://github.com" + ) + + if (! can_connect) { + return; + } + update.ns.last_checked = new Date().getTime(); ipcRenderer.send("update-northstar", force_update); update.ns.should_install = false; -- cgit v1.2.3