Merge branch 'main' into alex/couldNotConnectMessage

src/tree/health/HealthTreeItemProvider.ts

@@ -34,7 +34,18 @@ export class HealthTreeItemProvider implements vscode.TreeDataProvider<vscode.Tr
 
         // get children for root
         if (element === undefined) {
-            const health = await promiseWithTimeout<AppwriteHealth | undefined>(10000, async () => await healthClient?.checkup(), 'Health request timed out');
+            try {
+                const health = await promiseWithTimeout<AppwriteHealth | undefined>(
+                    10000,
+                    async () => {
+                        try {
+                            return await healthClient?.checkup();
+                        } catch (e) {
+                            vscode.window.showErrorMessage('Could not connect to Appwrite project');
+                        }
+                    },
+                    "Health request timed out"
+                );
                 if (health === undefined) {
                     return [];
                 }
@@ -49,6 +60,9 @@ export class HealthTreeItemProvider implements vscode.TreeDataProvider<vscode.Tr
                     },
                     ...healthItems,
                 ];
+            } catch (e) {
+                //
+            }
         }
         return [];
     }

src/utils/promiseWithTimeout.ts

@@ -1,7 +1,9 @@
+import { window } from 'vscode';
+
 export const promiseWithTimeout = <T>(timeoutMs: number, promise: () => Promise<T>, failureMessage?: string): Promise<T> => {
     let timeoutHandle: NodeJS.Timeout;
-    const timeoutPromise = new Promise<never>((resolve, reject) => {
-        timeoutHandle = setTimeout(() => reject(new Error(failureMessage)), timeoutMs);
+    const timeoutPromise = new Promise<never>(() => {
+        timeoutHandle = setTimeout(() => window.showErrorMessage(failureMessage ?? 'Request timed out'), timeoutMs);
     });
 
     return Promise.race([promise(), timeoutPromise]).then((result) => {