From 93b663c2c8c9972f2b85ed87e0dd433b9b91e49b Mon Sep 17 00:00:00 2001
From: Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org>
Date: Thu, 21 Sep 2023 11:21:26 +0200
Subject: [PATCH] Makes sure it do not crashes when polling.

---
 src/lib/components/ServiceCard.svelte   |  3 ++-
 src/lib/server/serviceDataPolling.ts    | 17 +++++++++++++----
 src/lib/services/pihole/+content.svelte |  5 -----
 src/lib/services/pihole/+service.ts     | 10 ++++++++--
 src/routes/+page.svelte                 |  2 --
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/lib/components/ServiceCard.svelte b/src/lib/components/ServiceCard.svelte
index 2d5ccfa..915fd60 100644
--- a/src/lib/components/ServiceCard.svelte
+++ b/src/lib/components/ServiceCard.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
 	import type { BrandConfig, ServiceConfig } from '$lib/config';
+	import type { ServiceData } from '$lib/services/service';
 	import { getServiceComponent } from '$lib/services/services';
 	import Brand from './Brand.svelte';
 
 	export let service: ServiceConfig;
-	export let data: any;
+	export let data: ServiceData;
 
 	const component = getServiceComponent(service.type || '');
 
diff --git a/src/lib/server/serviceDataPolling.ts b/src/lib/server/serviceDataPolling.ts
index c1c4c24..a0f6376 100644
--- a/src/lib/server/serviceDataPolling.ts
+++ b/src/lib/server/serviceDataPolling.ts
@@ -11,10 +11,16 @@ function isPromise(p: any): boolean {
 
 async function pollGeneric(upstream: ServiceData, url: string): Promise<ServiceData> {
 	upstream.status = undefined;
-	return fetch(url).then((resp: Response): ServiceData => {
-		upstream.status = resp.ok ? 'online' : 'offline';
-		return upstream;
-	});
+	return fetch(url)
+		.then((resp: Response): ServiceData => {
+			upstream.status = resp.ok ? 'online' : 'offline';
+			return upstream;
+		})
+		.catch((error) => {
+			console.warn("could not fetch status for '" + url + "': " + error);
+			upstream.status = 'offline';
+			return upstream;
+		});
 }
 
 function wrapHandler(handler: ServiceHandler): AsyncServiceHandler {
@@ -55,6 +61,9 @@ export function initializeServiceData() {
 	serviceData.length = config.services.length;
 	for (let i = 0; i < serviceData.length; i++) {
 		serviceData[i] = [];
+		for (let j = 0; j < config.services[i].items.length; j++) {
+			serviceData[i][j] = {};
+		}
 	}
 }
 
diff --git a/src/lib/services/pihole/+content.svelte b/src/lib/services/pihole/+content.svelte
index 2f0710b..7e93f29 100644
--- a/src/lib/services/pihole/+content.svelte
+++ b/src/lib/services/pihole/+content.svelte
@@ -3,8 +3,3 @@
 </script>
 
 pihole status
-{#await data.raw}
-	waiting
-{:then value}
-	<pre>{JSON.stringify(value, null, 2)}</pre>
-{/await}
diff --git a/src/lib/services/pihole/+service.ts b/src/lib/services/pihole/+service.ts
index 8aa0cb7..f5225ed 100644
--- a/src/lib/services/pihole/+service.ts
+++ b/src/lib/services/pihole/+service.ts
@@ -11,9 +11,15 @@ export const handle: ServiceHandler = async (config: ServiceConfig) => {
 			config.url + '/api.php?summaryRaw&auth=' + config.api_token
 		);
 		res.status = resp.ok ? 'online' : 'offline';
-		res.raw = resp.json();
+		const raw = await resp.json();
+		res.data = {
+			queries_today: raw.dns_queries_today,
+			ads_percentage: raw.ads_percentage_today,
+			status: raw.status,
+			client: raw.unique_clients
+		};
 	} catch (error) {
-		res.status = undefined;
+		res.status = 'offline';
 		console.warn('could not fetch pihole status: ' + error);
 	}
 
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index f33aa67..555b99f 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -16,8 +16,6 @@
 	{#each data.config.services as group, i}
 		<ServiceGroup {group} groupData={data.serviceData[i]} columns={data.config.columns} />
 	{/each}
-
-	<pre>{JSON.stringify(data, null, 2)}</pre>
 </main>
 
 <footer class="flex h-8 w-full flex-row">