Changed api build

api/@types/express/index.d.ts

@@ -0,0 +1,6 @@
+declare namespace Express {
+    export interface Request {
+        tracking : string;
+        redis : ReturnType<typeof import("redis").createClient>
+    }
+}

api/Dockerfile

@@ -10,6 +10,8 @@ RUN npm ci
 
 COPY . .
 
+RUN npm run build
+
 EXPOSE 8080
 
 ENTRYPOINT ["npm", "start"]

api/package.json

@@ -2,8 +2,10 @@
     "name": "portfolio-api",
     "version": "0.0.1",
     "description": "",
+    "main": "dist/index.js",
     "scripts": {
-        "start": "node -r ts-node/register src/index.ts",
+        "start": "node .",
+        "build": "tsc",
         "dev": "nodemon src/index.ts",
         "clean": "rimraf dist"
     },

api/src/index.ts

@@ -1,16 +1,24 @@
 import express from "express";
 
 import dotenv from 'dotenv';
-import analytics from "./routes/analytics";
+import analytics, { AnalyticsMiddleware } from "./routes/analytics";
 
 import cookieMiddleware from "cookie-parser";
+import { DatabaseMiddleware } from "./modules/database";
 
 dotenv.config();
 
 const app = express();
 
-app.use(cookieMiddleware(process.env.COOKIE_SECRET || "cookie_secret"))
+app.use(express.json({
+
+}));
 
+app.use(cookieMiddleware(process.env.COOKIE_SECRET || "cookie_secret"));
+
+app.use(DatabaseMiddleware);
+
+app.use(AnalyticsMiddleware);
 
 const port = process.env.PORT || 8080;
 

api/src/modules/database/database.ts

@@ -1,4 +1,4 @@
-import { RedisClientType } from "@redis/client";
+import { Request, Response, NextFunction } from "express";
 import { createClient } from "redis";
 
 export async function CreateDatabase() {
@@ -10,3 +10,15 @@ export async function CreateDatabase() {
 
     return client;
 }
+
+export async function DatabaseMiddleware(req : Request, res : Response, next : NextFunction) {
+    const client = await CreateDatabase();
+
+    req.redis = client;
+
+    req.on("finish", () => {
+        client.quit();
+    });
+
+    next();
+}

api/src/routes/analytics/analytics.ts

@@ -1,5 +1,5 @@
 import { Router } from "express";
-import { getTrackingData } from "./util";
+import { getTrackingData, logRequest } from "./util";
 
 export const router = Router();
 
@@ -10,3 +10,8 @@ router.get("/", async (req, res) => {
 
     res.json(userData);
 });
+
+router.post("/log", async (req, res) => {
+    await logRequest(req, res, req.body);
+    res.json({});
+});

api/src/routes/analytics/index.ts

@@ -1 +1,2 @@
-export { router as default } from "./analytics";
+export { router as default } from "./analytics";
+export { AnalyticsMiddleware } from "./middleware";

api/src/routes/analytics/middleware.ts

@@ -0,0 +1,32 @@
+import { randomBytes } from "crypto";
+import { NextFunction, Request, Response } from "express";
+import { CreateDatabase } from "../../modules/database";
+import { TrackingInstance } from "./types";
+
+export async function AnalyticsMiddleware(req : Request, res : Response, next : NextFunction) {
+    req.tracking = await getCookie(req, res);
+    next();
+}
+
+async function createTrackingInstance(req : Request, cookie : string) {
+    const data : TrackingInstance = {
+        id: cookie,
+        visits: []
+    }
+
+    await req.redis.json.set(`tracking:${cookie}`, ".", data as any);
+}
+
+async function getCookie(req : Request, res : Response) {
+    let cookie = req.signedCookies["tracker"];
+    if(!cookie) {
+        cookie = randomBytes(20).toString("hex");
+        res.cookie("tracker", cookie, {
+            signed: true
+        });
+
+        await createTrackingInstance(req, cookie);
+    }
+
+    return cookie as string;
+}

api/src/routes/analytics/types.ts

@@ -0,0 +1,10 @@
+export interface TrackingInstance {
+    id : string;
+    visits : TrackingVisit[];
+}
+
+export interface TrackingVisit {
+    ts : number;    
+    route : string;
+    data : any;
+}

api/src/routes/analytics/util.ts

@@ -1,28 +1,15 @@
-import { randomBytes } from "crypto";
 import { Request, Response } from "express";
 import { CreateDatabase } from "../../modules/database";
+import { TrackingInstance, TrackingVisit } from "./types";
 
 export async function getTrackingData(req : Request, res : Response) {
-    const db = await CreateDatabase();
-
-    const cookie = getCookie(req, res);
-
-
-
-    const data = await db.json.get(`tracker:${cookie}`);
-
+    const data = await req.redis.json.get(`tracking:${req.tracking}`);
 
     return data;
 }
 
-function getCookie(req : Request, res : Response) {
-    let cookie = req.signedCookies["tracker"];
-    if(!cookie) {
-        cookie = randomBytes(20).toString("hex");
-        res.cookie("tracker", cookie, {
-            signed: true
-        })
-    }
+export async function logRequest(req : Request, res : Response, visit : TrackingVisit) {
+    visit.ts = Date.now();
+    await req.redis.json.arrAppend(`tracking:${req.tracking}`, ".visits", visit as any);
+}
 
-    return cookie as string;
-}

api/tsconfig.json

@@ -28,7 +28,10 @@
         "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */
         // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
         // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
-        // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
+        "typeRoots": [
+            "@types",
+            "./node_modules/@types"
+        ],                                  /* Specify multiple folders that act like './node_modules/@types'. */
         // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
         // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
         // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
@@ -93,6 +96,7 @@
         "skipLibCheck": true /* Skip type checking all .d.ts files. */
     },
     "include": [
-        "src/**/*"
+        "src/**/*",
+        "@types/**/*"
     ]
 }