Merge pull request #18 from complexdatacollective/feature/replace-max…

…mind

Replace Maxmind with IP-API

packages/analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codaco/analytics",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -12,7 +12,6 @@
     "dev": "npm run build -- --watch"
   },
   "peerDependencies": {
-    "@maxmind/geoip2-node": "^5.0.0",
     "next": "13 || 14"
   },
   "devDependencies": {

packages/analytics/src/index.ts

@@ -1,5 +1,4 @@
 import { type NextRequest } from "next/server";
-import { WebServiceClient } from "@maxmind/geoip2-node";
 import { ensureError, getBaseUrl } from "./utils";
 import z from "zod";
 
@@ -77,11 +76,9 @@ export type analyticsEvent = z.infer<typeof AnalyticsEventSchema>;
 export const createRouteHandler = ({
   platformUrl = "https://analytics.networkcanvas.com",
   installationId,
-  maxMindClient,
 }: {
   platformUrl?: string;
   installationId: string;
-  maxMindClient: WebServiceClient;
 }) => {
   return async (request: NextRequest) => {
     try {
@@ -113,8 +110,13 @@ export const createRouteHandler = ({
           throw new Error("Could not fetch IP address");
         }
 
-        const { country } = await maxMindClient.country(ip);
-        countryISOCode = country?.isoCode ?? "Unknown";
+        const geoData = await fetch(`http://ip-api.com/json/${ip}`).then((res) => res.json());
+
+        if(geoData.status === "success") {
+          countryISOCode = geoData.countryCode;
+        } else {
+          throw new Error(geoData.message);
+        }
       } catch (e) {
         console.error("Geolocation failed:", e);
       }