feat: move the geo convert to memphis functions (#602)

Co-authored-by: orig <[email protected]>
origranot · Dec 15, 2023 · 0102ba3 · 0102ba3
1 parent 030cb67
commit 0102ba3
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 155 deletions.
diff --git a/apps/backend/.dockerignore b/apps/backend/.dockerignore
@@ -1,8 +1,6 @@
 node_modules
 dist
 npm-debug.log
-CONTRIBUTE.MD
-README.md
-.gitignore
-LICENSE
+*.md
+.git
 .DS_Store
diff --git a/apps/frontend/.dockerignore b/apps/frontend/.dockerignore
@@ -1,9 +1,6 @@
 node_modules
 dist
 npm-debug.log
-CONTRIBUTE.MD
-README.md
-.gitignore
-LICENSE
+*.md
+.git
 .DS_Store
-server
diff --git a/apps/tracker/.dockerignore b/apps/tracker/.dockerignore
@@ -1,8 +1,6 @@
 node_modules
 dist
 npm-debug.log
-CONTRIBUTE.MD
-README.md
-.gitignore
-LICENSE
+*.md
+.git
 .DS_Store
diff --git a/apps/tracker/Dockerfile b/apps/tracker/Dockerfile
@@ -1,47 +1,29 @@
-# --------------------------------------------
-# Dependencies Stage
-# --------------------------------------------
-FROM node:19.2-alpine3.15 as dependencies
+FROM node:lts-alpine as dependencies
 WORKDIR /app
 
-COPY package*.json ./
-
-RUN apk add --update python3 make g++\
-   && rm -rf /var/cache/apk/*
+# Install Python for node-gyp
+RUN apk add --no-cache python3 make g++
 
+COPY package*.json ./
 RUN npm ci
 
-# --------------------------------------------
 # Build Stage
-# --------------------------------------------
-# Intermediate docker image to build the bundle in and install dependencies
-FROM node:19.2-alpine3.15 as build
+FROM node:lts-alpine as build
 WORKDIR /app
 
 COPY . .
 COPY --from=dependencies /app/node_modules ./node_modules
 
-# Run prisma generate & build the bundle in production mode
-RUN npx nx build tracker --prod --skip-nx-cache
+RUN npx nx build tracker --prod --skip-nx-cache \
+    && npm prune --production
 
-# --------------------------------------------
 # Production Stage
-# --------------------------------------------
-FROM node:19.2-alpine3.15 as production
+FROM node:lts-alpine as production
 WORKDIR /app
 
 COPY --from=build /app/dist/apps/tracker ./tracker
 COPY --from=build /app/node_modules ./node_modules
-COPY --from=build /app/libs/ ./libs
 
 EXPOSE 3001
 
-# Start the application
-CMD sh -c "node tracker/main.js"
-
-
-
-
-
-
-
+CMD ["node", "tracker/main.js"]
diff --git a/apps/tracker/src/stats/stats.consumer.ts b/apps/tracker/src/stats/stats.consumer.ts
@@ -3,7 +3,6 @@ import { ConsumerService } from '@reduced.to/queue-manager';
 import { AppConfigService } from '@reduced.to/config';
 import { AppLoggerSerivce } from '@reduced.to/logger';
 import { StatsService } from './stats.service';
-import * as geoip from 'geoip-lite';
 import { createHash } from 'node:crypto';
 import { Message } from 'memphis-dev/*';
 
@@ -14,8 +13,13 @@ export class StatsConsumer extends ConsumerService {
   }
 
   async onMessage(message: Message): Promise<void> {
-    const { ip, userAgent, key, url } = message.getDataAsJson() as { ip: string; userAgent: string; key: string; url: string };
-    message.ack();
+    const { ip, userAgent, key, geo, url } = message.getDataAsJson() as {
+      ip: string;
+      userAgent: string;
+      key: string;
+      url: string;
+      geo: string;
+    };
 
     const hashedIp = createHash('sha256').update(ip).digest('hex');
     const isUniqueVisit = await this.statsService.isUniqueVisit(key, hashedIp);
@@ -24,13 +28,20 @@ export class StatsConsumer extends ConsumerService {
       return;
     }
 
-    const geo = geoip.lookup(ip);
+    let geoLocation = null;
+    try {
+      geoLocation = JSON.parse(geo);
+    } catch (err) {
+      this.loggerService.error(`Failed to parse geo location for ${key} with error: ${err.message}`);
+    }
+
     await this.statsService.addVisit(key, {
       hashedIp,
       ua: userAgent,
-      geo,
+      ...(geoLocation?.status === 'success' && geoLocation),
     });
 
+    message.ack();
     this.loggerService.log(`Added unique visit for ${key}`);
   }
 }
diff --git a/apps/tracker/src/stats/stats.service.ts b/apps/tracker/src/stats/stats.service.ts
@@ -5,15 +5,15 @@ import { Prisma, PrismaService } from '@reduced.to/prisma';
 export class StatsService {
   constructor(private readonly prismaService: PrismaService) {}
 
-  async addVisit(key: string, opts: { hashedIp: string; ua: string; geo: object }) {
-    const { hashedIp, ua, geo } = opts;
+  async addVisit(key: string, opts: { hashedIp: string; ua: string; geoLocation?: object }) {
+    const { hashedIp, ua, geoLocation } = opts;
 
     try {
       await this.prismaService.visit.create({
         data: {
           ip: hashedIp,
           userAgent: ua,
-          ...(geo && { geo }),
+          ...(geoLocation && { geo: geoLocation }),
           link: {
             connect: {
               key,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -29,7 +29,6 @@
     "@types/canvas-confetti": "^1.6.1",
     "@types/cookie-parser": "^1.4.4",
     "@types/express": "^4.17.17",
-    "@types/geoip-lite": "^1.4.4",
     "@types/jest": "^29.4.0",
     "@types/node": "^18.17.14",
     "@types/passport-google-oauth20": "^2.0.14",
@@ -87,7 +86,6 @@
     "class-validator": "^0.14.0",
     "clsx": "^2.0.0",
     "cookie-parser": "^1.4.6",
-    "geoip-lite": "^1.4.9",
     "jwt-decode": "^3.1.2",
     "memphis-dev": "^1.2.2",
     "passport-google-oauth20": "^2.0.0",