Merge pull request #9 from PFConnect/Fixproblem

Fixproblem

Author: 1ceit

.github/workflows/lint.yml

@@ -0,0 +1,39 @@
+name: lint
+
+on:
+    push:
+        branches:
+            - main
+        paths-ignore:
+            - 'README.md'
+    pull_request:
+        branches:
+            - main
+        paths-ignore:
+            - 'README.md'
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v4
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 20
+                  cache: 'npm'
+
+            - name: Install dependencies
+              run: npm ci
+
+            - name: Run lint
+              run: npm run lint
+
+            - name: Run type check
+              run: npm run type-check
+
+            - name: Build project
+              run: npm run build-only

README.md

@@ -47,7 +47,6 @@ npm run dev
 
 **Note:**
 
--   Make sure Docker is installed and running on your machine.
 -   For any issues or missing environment variables, reach out to the maintainers.
 
----
+---

package-lock.json

@@ -8,16 +8,11 @@
     "prod": "cross-env NODE_ENV=production node server/server.js",
     "build": "vite build --mode production",
     "build:dev": "vite build --mode development",
-    "docker:build": "docker build -t pfcontrol-v2 .",
-    "docker:run": "docker run -p 9900:9900 --env-file .env.production pfcontrol-v2",
-    "docker:dev": "docker-compose -f docker-compose.dev.yml up --build",
-    "docker:prod": "docker-compose up --build -d",
-    "docker:stop": "docker-compose down",
-    "docker:restart": "docker-compose down && docker-compose up --build -d",
-    "docker:clean": "docker-compose down -v && docker system prune -f",
-    "docker:update": "git pull && docker-compose down && docker-compose up --build -d",
-    "docker:logs": "docker-compose logs -f",
-    "docker:status": "docker-compose ps"
+    "build-only": "vite build",
+    "lint": "eslint .",
+    "format:check": "prettier --check .",
+    "format": "prettier --write .",
+    "type-check": "tsc --noEmit"
   },
   "dependencies": {
     "@dnd-kit/core": "^6.3.1",
@@ -64,6 +59,7 @@
     "eslint-plugin-react-refresh": "^0.4.20",
     "globals": "^16.4.0",
     "nodemon": "^3.1.10",
+    "prettier": "^3.6.2",
     "typescript": "~5.8.3",
     "typescript-eslint": "^8.44.0",
     "vite": "^7.1.7"

package.json

@@ -1,9 +1,15 @@
-import { generateSID, generateSquawk, getWakeTurbulence, generateRandomId } from '../utils/flightUtils.js';
+import {
+    generateSID,
+    generateSquawk,
+    getWakeTurbulence,
+    generateRandomId,
+} from '../utils/flightUtils.js';
 import { getSessionById } from './sessions.js';
 import flightsPool from './connections/flightsConnection.js';
+import crypto from 'crypto';
 
 function sanitizeFlightForClient(flight) {
-    const { user_id, ip_address, ...sanitizedFlight } = flight;
+    const { user_id, ip_address, acars_token, ...sanitizedFlight } = flight;
     return {
         ...sanitizedFlight,
         cruisingFL: flight.cruisingfl,
@@ -17,35 +23,59 @@ export async function getFlightsBySession(sessionId) {
         `SELECT * FROM ${tableName} ORDER BY created_at ASC`
     );
 
-    const flights = result.rows.map(flight => sanitizeFlightForClient(flight));
+    const flights = result.rows.map((flight) =>
+        sanitizeFlightForClient(flight)
+    );
     return flights;
 }
 
+export async function validateAcarsAccess(sessionId, flightId, acarsToken) {
+    const tableName = `flights_${sessionId}`;
+    const result = await flightsPool.query(
+        `SELECT acars_token FROM ${tableName} WHERE id = $1`,
+        [flightId]
+    );
+
+    if (result.rows.length === 0) {
+        return false;
+    }
+
+    return result.rows[0].acars_token === acarsToken;
+}
+
 export async function getFlightsBySessionWithTime(sessionId, hoursBack = 2) {
     try {
         const tableName = `flights_${sessionId}`;
 
-        const tableExists = await flightsPool.query(`
+        const tableExists = await flightsPool.query(
+            `
             SELECT EXISTS (
                 SELECT FROM information_schema.tables 
                 WHERE table_name = $1
             )
-        `, [tableName]);
+        `,
+            [tableName]
+        );
 
         if (!tableExists.rows[0].exists) {
             return [];
         }
 
         const result = await flightsPool.query(
             `SELECT * FROM ${tableName} 
-             WHERE created_at >= NOW() - INTERVAL '${hoursBack} hours'
-             ORDER BY created_at ASC`
+            WHERE created_at >= NOW() - INTERVAL '${hoursBack} hours'
+            ORDER BY created_at ASC`
         );
 
-        const flights = result.rows.map(flight => sanitizeFlightForClient(flight));
+        const flights = result.rows.map((flight) =>
+            sanitizeFlightForClient(flight)
+        );
         return flights;
     } catch (error) {
-        console.error(`Error fetching flights for session ${sessionId}:`, error);
+        console.error(
+            `Error fetching flights for session ${sessionId}:`,
+            error
+        );
         return [];
     }
 }
@@ -68,21 +98,27 @@ function validateFlightFields(updates) {
     if (updates.cruisingFL !== undefined) {
         const fl = parseInt(updates.cruisingFL, 10);
         if (isNaN(fl) || fl < 0 || fl > 200 || fl % 5 !== 0) {
-            throw new Error('Cruising FL must be between 0 and 200 in 50-step increments');
+            throw new Error(
+                'Cruising FL must be between 0 and 200 in 50-step increments'
+            );
         }
     }
     if (updates.clearedFL !== undefined) {
         const fl = parseInt(updates.clearedFL, 10);
         if (isNaN(fl) || fl < 0 || fl > 200 || fl % 5 !== 0) {
-            throw new Error('Cleared FL must be between 0 and 200 in 50-step increments');
+            throw new Error(
+                'Cleared FL must be between 0 and 200 in 50-step increments'
+            );
         }
     }
 }
 
 export async function addFlight(sessionId, flightData) {
     const tableName = `flights_${sessionId}`;
     try {
-        await flightsPool.query(`ALTER TABLE ${tableName} ADD COLUMN IF NOT EXISTS gate VARCHAR(8);`);
+        await flightsPool.query(
+            `ALTER TABLE ${tableName} ADD COLUMN IF NOT EXISTS gate VARCHAR(8);`
+        );
     } catch (error) {
         // Column might already exist, continue
     }
@@ -98,6 +134,7 @@ export async function addFlight(sessionId, flightData) {
     if (!flightData.timestamp) {
         flightData.timestamp = new Date().toISOString();
     }
+    flightData.acars_token = crypto.randomBytes(4).toString('hex');
 
     if (flightData.aircraft_type) {
         flightData.aircraft = flightData.aircraft_type;
@@ -113,7 +150,10 @@ export async function addFlight(sessionId, flightData) {
                 flightData.runway = session.active_runway;
             }
         } catch (error) {
-            console.error('Error fetching session for runway assignment:', error);
+            console.error(
+                'Error fetching session for runway assignment:',
+                error
+            );
         }
     }
 
@@ -147,20 +187,32 @@ export async function addFlight(sessionId, flightData) {
     const result = await flightsPool.query(query, values);
 
     const flight = result.rows[0];
-    return sanitizeFlightForClient(flight);
+    return {
+        ...flight,
+        cruisingFL: flight.cruisingfl,
+        clearedFL: flight.clearedfl,
+    };
 }
 
 export async function updateFlight(sessionId, flightId, updates) {
     const tableName = `flights_${sessionId}`;
 
     // add this block to create missing text columns safely
-    const safeCols = Object.keys(updates).filter(k => /^[a-zA-Z0-9_]+$/.test(k));
+    const safeCols = Object.keys(updates).filter((k) =>
+        /^[a-zA-Z0-9_]+$/.test(k)
+    );
     for (const col of safeCols) {
         try {
-            await flightsPool.query(`ALTER TABLE ${tableName} ADD COLUMN IF NOT EXISTS "${col}" text;`);
+            await flightsPool.query(
+                `ALTER TABLE ${tableName} ADD COLUMN IF NOT EXISTS "${col}" text;`
+            );
         } catch (err) {
             // ignore - column creation failure shouldn't stop update
-            console.error('Could not ensure column exists:', col, err?.message || err);
+            console.error(
+                'Could not ensure column exists:',
+                col,
+                err?.message || err
+            );
         }
     }
 
@@ -204,5 +256,7 @@ export async function updateFlight(sessionId, flightId, updates) {
 
 export async function deleteFlight(sessionId, flightId) {
     const tableName = `flights_${sessionId}`;
-    await flightsPool.query(`DELETE FROM ${tableName} WHERE id = $1`, [flightId]);
-}
+    await flightsPool.query(`DELETE FROM ${tableName} WHERE id = $1`, [
+        flightId,
+    ]);
+}