Store the origin country-code

site/src/data.ts

@@ -12,6 +12,7 @@ export type AnalyticsData = Record<string, Analytics>;
 
 export interface Analytics {
   active_installations: number;
+  countries: Record<string, number>;
   addons: Addons;
   avg_addons: number;
   avg_automations: number;

worker/src/data.ts

@@ -1,5 +1,6 @@
 export interface SanitizedPayload {
   version: string;
+  country?: string;
   installation_type: string;
   integrations?: string[];
   addons?: { slug: string }[];

worker/src/handlers/get.ts

@@ -1,13 +1,13 @@
 // Serve JSON to https://analytics.home-assistant.io
 
 export async function handleGet(request: Request): Promise<Response> {
-  const core_analytics = await KV.get('core_analytics')
+  const core_analytics = await KV.get("core_analytics");
 
   return new Response(core_analytics, {
     status: 200,
     headers: {
-      'Content-Type': 'application/json',
-      'Access-Control-Allow-Origin': '*',
+      "Content-Type": "application/json",
+      "Access-Control-Allow-Origin": "*",
     },
-  })
+  });
 }

worker/src/handlers/post.ts

@@ -17,11 +17,12 @@ export async function handlePost(request: Request): Promise<Response> {
   }
 
   const storageKey = `huuid:${payload.huuid}`;
+  const country = request.headers.get("cf-ipcountry");
 
   let sanitizedPayload: SanitizedPayload;
 
   try {
-    sanitizedPayload = sanitizePayload(payload);
+    sanitizedPayload = sanitizePayload(payload, country);
   } catch (err) {
     return new Response(err.message, { status: 400 });
   }
@@ -63,7 +64,10 @@ async function storePayload(
   );
 }
 
-const sanitizePayload = (payload: any): SanitizedPayload => {
+const sanitizePayload = (
+  payload: any,
+  country: string | null
+): SanitizedPayload => {
   if (!payload.installation_type || !payload.version) {
     throw new Error("Missing required keys in the payload");
   }
@@ -91,5 +95,6 @@ const sanitizePayload = (payload: any): SanitizedPayload => {
     }
   }
 
+  payload.country = country;
   return payload;
 };

worker/src/handlers/schedule.ts

@@ -60,6 +60,7 @@ const generateCurrentDataset = (
   const installation_types = { os: 0, container: 0, core: 0, supervised: 0 };
   const integrations: Record<string, number> = {};
   const addons: Record<string, number> = {};
+  const countries: Record<string, number> = {};
   const versions: Record<string, number> = {};
   const count_addons: number[] = [];
   const count_automations: number[] = [];
@@ -74,6 +75,14 @@ const generateCurrentDataset = (
       versions[huuid.version]++;
     }
 
+    if (huuid.country) {
+      if (!countries[huuid.country]) {
+        countries[huuid.country] = 1;
+      } else {
+        countries[huuid.country]++;
+      }
+    }
+
     if (huuid.addon_count) {
       count_addons.push(huuid.addon_count);
     }
@@ -119,6 +128,7 @@ const generateCurrentDataset = (
 
   return {
     last_updated,
+    countries,
     installation_types,
     active_installations:
       installation_types.container +