refactor(fingerprint): start taking fingerprint snapshots in new table

server/routers/client/getClient.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import { db, olms } from "@server/db";
-import { clients, fingerprints } from "@server/db";
+import { clients, currentFingerprint } from "@server/db";
 import { eq, and } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
@@ -30,7 +30,10 @@ async function query(clientId?: number, niceId?: string, orgId?: string) {
             .from(clients)
             .where(eq(clients.clientId, clientId))
             .leftJoin(olms, eq(clients.clientId, olms.clientId))
-            .leftJoin(fingerprints, eq(olms.olmId, fingerprints.olmId))
+            .leftJoin(
+                currentFingerprint,
+                eq(olms.olmId, currentFingerprint.olmId)
+            )
             .limit(1);
         return res;
     } else if (niceId && orgId) {
@@ -39,7 +42,10 @@ async function query(clientId?: number, niceId?: string, orgId?: string) {
             .from(clients)
             .where(and(eq(clients.niceId, niceId), eq(clients.orgId, orgId)))
             .leftJoin(olms, eq(clients.clientId, olms.clientId))
-            .leftJoin(fingerprints, eq(olms.olmId, fingerprints.olmId))
+            .leftJoin(
+                currentFingerprint,
+                eq(olms.olmId, currentFingerprint.olmId)
+            )
             .limit(1);
         return res;
     }
@@ -125,24 +131,25 @@ export async function getClient(
         // Replace name with device name if OLM exists
         let clientName = client.clients.name;
         if (client.olms) {
-            const model = client.fingerprints?.deviceModel || null;
+            const model = client.currentFingerprint?.deviceModel || null;
             clientName = getUserDeviceName(model, client.clients.name);
         }
 
         // Build fingerprint data if available
-        const fingerprintData = client.fingerprints
+        const fingerprintData = client.currentFingerprint
             ? {
-                  username: client.fingerprints.username || null,
-                  hostname: client.fingerprints.hostname || null,
-                  platform: client.fingerprints.platform || null,
-                  osVersion: client.fingerprints.osVersion || null,
-                  kernelVersion: client.fingerprints.kernelVersion || null,
-                  arch: client.fingerprints.arch || null,
-                  deviceModel: client.fingerprints.deviceModel || null,
-                  serialNumber: client.fingerprints.serialNumber || null,
-                  firstSeen: client.fingerprints.firstSeen || null,
-                  lastSeen: client.fingerprints.lastSeen || null
-              }
+                username: client.currentFingerprint.username || null,
+                hostname: client.currentFingerprint.hostname || null,
+                platform: client.currentFingerprint.platform || null,
+                osVersion: client.currentFingerprint.osVersion || null,
+                kernelVersion:
+                    client.currentFingerprint.kernelVersion || null,
+                arch: client.currentFingerprint.arch || null,
+                deviceModel: client.currentFingerprint.deviceModel || null,
+                serialNumber: client.currentFingerprint.serialNumber || null,
+                firstSeen: client.currentFingerprint.firstSeen || null,
+                lastSeen: client.currentFingerprint.lastSeen || null
+            }
             : null;
 
         const data: GetClientResponse = {

server/routers/client/listClients.ts

@@ -6,7 +6,7 @@ import {
     sites,
     userClients,
     clientSitesAssociationsCache,
-    fingerprints
+    currentFingerprint
 } from "@server/db";
 import logger from "@server/logger";
 import HttpCode from "@server/types/HttpCode";
@@ -143,20 +143,20 @@ function queryClients(
             olmArchived: olms.archived,
             archived: clients.archived,
             blocked: clients.blocked,
-            deviceModel: fingerprints.deviceModel,
-            fingerprintPlatform: fingerprints.platform,
-            fingerprintOsVersion: fingerprints.osVersion,
-            fingerprintKernelVersion: fingerprints.kernelVersion,
-            fingerprintArch: fingerprints.arch,
-            fingerprintSerialNumber: fingerprints.serialNumber,
-            fingerprintUsername: fingerprints.username,
-            fingerprintHostname: fingerprints.hostname
+            deviceModel: currentFingerprint.deviceModel,
+            fingerprintPlatform: currentFingerprint.platform,
+            fingerprintOsVersion: currentFingerprint.osVersion,
+            fingerprintKernelVersion: currentFingerprint.kernelVersion,
+            fingerprintArch: currentFingerprint.arch,
+            fingerprintSerialNumber: currentFingerprint.serialNumber,
+            fingerprintUsername: currentFingerprint.username,
+            fingerprintHostname: currentFingerprint.hostname
         })
         .from(clients)
         .leftJoin(orgs, eq(clients.orgId, orgs.orgId))
         .leftJoin(olms, eq(clients.clientId, olms.clientId))
         .leftJoin(users, eq(clients.userId, users.userId))
-        .leftJoin(fingerprints, eq(olms.olmId, fingerprints.olmId))
+        .leftJoin(currentFingerprint, eq(olms.olmId, currentFingerprint.olmId))
         .where(and(...conditions));
 }