fixes (final)

Author: dev-banane

nodemon.json

@@ -0,0 +1,5 @@
+{
+  "watch": ["server"],
+  "ext": "ts,json",
+  "exec": "tsx server/main.ts"
+}

package-lock.json

@@ -4,7 +4,7 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "dev": "set NODE_ENV=development && concurrently \"vite\" \"npx tsx server/main.ts\"",
+    "dev": "set NODE_ENV=development && concurrently \"vite\" \"npx nodemon\"",
     "prod": "cross-env NODE_ENV=production node server/dist/server.js",
     "build": "vite build --mode production",
     "build:dev": "vite build --mode development",
@@ -19,7 +19,6 @@
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
     "@tailwindcss/vite": "^4.1.13",
-    "@types/node": "^24.7.2",
     "axios": "^1.12.2",
     "chalk": "^5.6.2",
     "chart.js": "^4.5.0",
@@ -58,6 +57,7 @@
     "@types/express": "^5.0.3",
     "@types/jsonwebtoken": "^9.0.10",
     "@types/multer": "^2.0.0",
+    "@types/node": "^24.7.2",
     "@types/pg": "^8.15.5",
     "@types/react": "^19.1.13",
     "@types/react-dom": "^19.1.9",
@@ -70,6 +70,7 @@
     "nodemon": "^3.1.10",
     "prettier": "^3.6.2",
     "ts-node": "^10.9.2",
+    "tsx": "^4.20.6",
     "typescript": "~5.8.3",
     "typescript-eslint": "^8.44.0",
     "vite": "^7.1.7"

package.json

@@ -209,7 +209,7 @@ export async function getAllUsers(page = 1, limit = 50, search = '', filterAdmin
         }
       }
 
-      const countQuery = query.clearSelect().select(({ fn }) => fn.countAll().as('count'));
+      const countQuery = query.clearSelect().clearOrderBy().select(({ fn }) => fn.countAll().as('count'));
       const countResult = await countQuery.executeTakeFirst();
       totalUsers = Number(countResult?.count) || 0;
 

server/db/admin.ts

@@ -299,6 +299,15 @@ export async function addFlight(sessionId: string, flightData: AddFlightData) {
     flightData.sid = sidResult.sid;
   }
 
+  if (flightData.cruisingFL !== undefined) {
+    flightData.cruisingfl = flightData.cruisingFL;
+    delete flightData.cruisingFL;
+  }
+  if (flightData.clearedFL !== undefined) {
+    flightData.clearedfl = flightData.clearedFL;
+    delete flightData.clearedFL;
+  }
+
   const { icao, ...flightDataForDb } = flightData;
 
   const result = await flightsDb
@@ -367,7 +376,13 @@ export async function updateFlight(
     throw new Error('No valid fields to update');
   }
 
-  dbUpdates.updated = new Date().toISOString();
+  dbUpdates.updated_at = new Date();
+
+  try {
+    await sql`ALTER TABLE ${sql.table(tableName)} ADD COLUMN IF NOT EXISTS "updated_at" TIMESTAMP;`.execute(flightsDb);
+  } catch (err) {
+    console.error('Could not ensure column exists:', 'updated_at', String(err));
+  }
 
   const result = await flightsDb
     .updateTable(tableName)

server/db/flights.ts

@@ -84,10 +84,16 @@ router.post('/generate', requireAuth, async (req, res) => {
 
         const atisTimestamp = new Date().toISOString();
 
-        const updatedSession = await updateSession(sessionId, { atis: generatedAtis });
+        const atisData = {
+          letter: ident,
+          text: generatedAtis,
+          timestamp: atisTimestamp,
+        };
+        const updatedSession = await updateSession(sessionId, { atis: JSON.stringify(atisData) });
         if (!updatedSession) {
             throw new Error('Failed to update session with ATIS data');
         }
+        console.log('ATIS updated successfully. Session atis:', updatedSession.atis);
 
         res.json({
             atisText: generatedAtis,

server/routes/atis.ts

@@ -35,11 +35,11 @@ router.post('/:sessionId', optionalAuth, flightCreationLimiter, async (req, res)
 
         await recordNewFlight();
 
-    // Remove sensitive fields before broadcasting
-    const sanitizedFlight = flight ? Object.fromEntries(Object.entries(flight).filter(([k]) => !['acars_token', 'user_id', 'ip_address'].includes(k))) : {};
-    broadcastFlightEvent(req.params.sessionId, 'flightAdded', sanitizedFlight);
+        const sanitizedFlight = flight ? Object.fromEntries(Object.entries(flight).filter(([k]) => !['acars_token', 'user_id', 'ip_address'].includes(k))) : {};
+        broadcastFlightEvent(req.params.sessionId, 'flightAdded', sanitizedFlight);
         res.status(201).json(flight);
-    } catch {
+    } catch (err) {
+        console.error('Failed to add flight:', err);
         res.status(500).json({ error: 'Failed to add flight' });
     }
 });

server/routes/flights.ts

@@ -18,7 +18,6 @@ import { sanitizeAlphanumeric } from '../utils/sanitization';
 
 import { Request, Response } from 'express';
 import { JwtPayloadClient } from '../types/JwtPayload';
-import { decrypt } from '../utils/encryption';
 
 function isJwtPayloadClient(user: unknown): user is JwtPayloadClient {
     return (
@@ -142,8 +141,9 @@ router.get('/:sessionId', requireSessionAccess, async (req, res) => {
         let atis = { letter: 'A', text: '', timestamp: new Date().toISOString() };
         if (session.atis) {
             try {
-                atis = decrypt(JSON.parse(session.atis));
-            } catch {
+                atis = JSON.parse(session.atis);
+            } catch (e) {
+                console.log('parse error:', e);
                 // fallback to default atis
             }
         }
@@ -176,7 +176,7 @@ router.put('/:sessionId', requireSessionAccess, async (req, res) => {
         let decryptedAtis = { letter: 'A', text: '', timestamp: new Date().toISOString() };
         if (session.atis) {
             try {
-                decryptedAtis = decrypt(JSON.parse(session.atis));
+                decryptedAtis = JSON.parse(session.atis);
             } catch {
                 // fallback to default atis
             }