Handle aborting status check gracefully

7952b5f2c9a255d0f18a145a653a425d2e3ab13d

Wolfsblvt <wolfsblvt@gmail.com>

public/script.js+11 -5 Viewed

 import { initDynamicStyles } from './scripts/dynamic-styles.js';
 import { SlashCommandEnumValue, enumTypes } from './scripts/slash-commands/SlashCommandEnumValue.js';
 import { commonEnumProviders, enumIcons } from './scripts/slash-commands/SlashCommandCommonEnumsProvider.js';
+import { AbortReason } from './scripts/util/AbortReason.js';
 //exporting functions and vars for mods
 export {

@@ -978,8 +979,8 @@ async function fixViewport() {
978	document.body.style.position = '';	979	document.body.style.position = '';
979	}	980	}
980		981
981	function cancelStatusCheck() {	982	function cancelStatusCheck(reason = 'Manually cancelled status check') {
982	abortStatusCheck?.abort();	983	abortStatusCheck?.abort(new AbortReason(reason));
983	abortStatusCheck = new AbortController();	984	abortStatusCheck = new AbortController();
984	setOnlineStatus('no_connection');	985	setOnlineStatus('no_connection');
985	}	986	}

             toastr.error(data.response, 'API Error', { timeOut: 5000, preventDuplicates: true });
+        }
     } catch (err) {
-        console.error('Error getting status', err);
+        if (err instanceof AbortReason) {
+            console.info('Status check aborted.', err.reason);
+        } else {
+            console.error('Error getting status', err);
+        }
         setOnlineStatus('no_connection');
+    }

         $('#groupCurrentMemberListToggle .inline-drawer-icon').trigger('click');
     }, 200);
-    $(document).on('click', '.api_loading', cancelStatusCheck);
+    $(document).on('click', '.api_loading', () => cancelStatusCheck('Canceled because connecting was manually canceled'));
     //////////INPUT BAR FOCUS-KEEPING LOGIC/////////////
     let S_TAPreviouslyFocused = false;

     });
     $('#main_api').change(function () {
-        cancelStatusCheck();
+        cancelStatusCheck("Canceled because main api changed");
         changeMainAPI();
         saveSettingsDebounced();
     });

public/scripts/util/AbortReason.js+9 -0 Viewed

+export class AbortReason {
+    constructor(reason) {
+        this.reason = reason;
+    }
+    toString() {
+        return this.reason;
+    }
+}