Merge pull request #121 from PFConnect/canary

Canary

Author: dev-banane

package-lock.json

@@ -103,165 +103,5 @@
     "type": "TBM9",
     "name": "TBM 900",
     "wtc": "L"
-  },
-  {
-    "type": "A319",
-    "name": "Airbus A319",
-    "wtc": "M"
-  },
-  {
-    "type": "A321",
-    "name": "Airbus A321",
-    "wtc": "M"
-  },
-  {
-    "type": "A21N",
-    "name": "Airbus A321neo",
-    "wtc": "M"
-  },
-  {
-    "type": "A20N",
-    "name": "Airbus A320neo",
-    "wtc": "M"
-  },
-  {
-    "type": "A359",
-    "name": "Airbus A350-900",
-    "wtc": "H"
-  },
-  {
-    "type": "A35K",
-    "name": "Airbus A350-1000",
-    "wtc": "H"
-  },
-  {
-    "type": "A388",
-    "name": "Airbus A380",
-    "wtc": "J"
-  },
-  {
-    "type": "B38M",
-    "name": "Boeing 737 MAX 8",
-    "wtc": "M"
-  },
-  {
-    "type": "B39M",
-    "name": "Boeing 737 MAX 9",
-    "wtc": "M"
-  },
-  {
-    "type": "B3XM",
-    "name": "Boeing 737 MAX 10",
-    "wtc": "M"
-  },
-  {
-    "type": "B738",
-    "name": "Boeing 737-800",
-    "wtc": "M"
-  },
-  {
-    "type": "B739",
-    "name": "Boeing 737-900",
-    "wtc": "M"
-  },
-  {
-    "type": "B744",
-    "name": "Boeing 747-400",
-    "wtc": "H"
-  },
-  {
-    "type": "B748",
-    "name": "Boeing 747-8",
-    "wtc": "H"
-  },
-  {
-    "type": "B752",
-    "name": "Boeing 757-200",
-    "wtc": "M"
-  },
-  {
-    "type": "B753",
-    "name": "Boeing 757-300",
-    "wtc": "M"
-  },
-  {
-    "type": "B762",
-    "name": "Boeing 767-200",
-    "wtc": "H"
-  },
-  {
-    "type": "B763",
-    "name": "Boeing 767-300",
-    "wtc": "H"
-  },
-  {
-    "type": "B764",
-    "name": "Boeing 767-400",
-    "wtc": "H"
-  },
-  {
-    "type": "B772",
-    "name": "Boeing 777-200",
-    "wtc": "H"
-  },
-  {
-    "type": "B773",
-    "name": "Boeing 777-300",
-    "wtc": "H"
-  },
-  {
-    "type": "B77L",
-    "name": "Boeing 777-200LR",
-    "wtc": "H"
-  },
-  {
-    "type": "B788",
-    "name": "Boeing 787-8",
-    "wtc": "H"
-  },
-  {
-    "type": "B789",
-    "name": "Boeing 787-9",
-    "wtc": "H"
-  },
-  {
-    "type": "B78X",
-    "name": "Boeing 787-10",
-    "wtc": "H"
-  },
-  {
-    "type": "CRJ2",
-    "name": "Bombardier CRJ-200",
-    "wtc": "M"
-  },
-  {
-    "type": "CRJ7",
-    "name": "Bombardier CRJ-700",
-    "wtc": "M"
-  },
-  {
-    "type": "CRJ9",
-    "name": "Bombardier CRJ-900",
-    "wtc": "M"
-  },
-  {
-    "type": "E170",
-    "name": "Embraer E170",
-    "wtc": "M"
-  },
-  {
-    "type": "E175",
-    "name": "Embraer E175",
-    "wtc": "M"
-  },
-  {
-    "type": "E190",
-    "name": "Embraer E190",
-    "wtc": "M"
-  },
-  {
-    "type": "E195",
-    "name": "Embraer E195",
-    "wtc": "M"
   }
 ]

server/data/aircraftData.json

@@ -248,6 +248,20 @@ export async function validateAcarsAccess(
     const validFlightId = validateFlightId(flightId);
     const tableName = `flights_${validSessionId}`;
 
+    // Check if the table exists before querying it
+    let tableExistsResult: boolean;
+    try {
+      await flightsDb.selectFrom(tableName).select('id').limit(1).execute();
+      tableExistsResult = true;
+    } catch {
+      tableExistsResult = false;
+    }
+
+    if (!tableExistsResult) {
+      console.error(`Table ${tableName} does not exist`);
+      return { valid: false };
+    }
+
     const result = await flightsDb
       .selectFrom(tableName)
       .select(['acars_token'])

server/db/flights.ts

@@ -51,7 +51,7 @@ export function validateCallsign(callsign: unknown) {
     throw new Error('Callsign must be 1-16 characters');
   }
 
-  if (!/^[A-Z0-9]+$/i.test(trimmed)) {
+  if (!/^[A-Z0-9\s]+$/i.test(trimmed)) {
     throw new Error('Callsign can only contain letters and numbers');
   }
 
@@ -101,6 +101,10 @@ export function validateStand(stand: unknown) {
     throw new Error('Stand must be 8 characters or less');
   }
 
+  if (!/^[A-Za-z0-9]+$/.test(trimmed)) {
+    throw new Error('Stand can only contain letters and numbers');
+  }
+
   return trimmed;
 }
 

server/utils/validation.ts

@@ -231,17 +231,17 @@ const WindDisplay: React.FC<WindDisplayProps> = ({
   if (error || !metarData) {
     return (
       <div
-        className={`flex items-center justify-between text-sm px-3 py-2 bg-gray-800 rounded border border-gray-700 ${
-          size === 'small' ? 'text-xs px-2 py-1' : ''
+        className={`flex items-center justify-between text-sm px-3 py-4 bg-gray-900 rounded-full border border-gray-800 ${
+          size === 'small' ? 'text-xs px-2 py-2' : ''
         }`}
       >
-        <div className="flex items-center gap-2 text-red-400">
+        <div className="flex items-center gap-2 text-red-400 ml-2">
           <AlertTriangle className={size === 'small' ? 'h-3 w-3' : 'h-4 w-4'} />
           <span>{error || 'No data available'}</span>
         </div>
         <button
           onClick={handleManualRefresh}
-          className="text-blue-400 hover:text-blue-300 transition-colors ml-2"
+          className="text-blue-400 hover:text-blue-300 transition-colors mr-2"
           title="Retry"
         >
           <RefreshCw className={size === 'small' ? 'h-3 w-3' : 'h-4 w-4'} />

src/components/tools/WindDisplay.tsx

@@ -257,8 +257,26 @@ export default function Submit() {
         });
         setSubmittedFlight(flight);
         setSuccess(true);
-      } catch {
-        setError('Failed to submit flight.');
+      } catch (error) {
+        if (error instanceof Error) {
+          if (error.message.includes('Callsign')) {
+            setError(
+              `Callsign error: ${error.message}. Callsign must contain at least one number.`
+            );
+          } else if (error.message.includes('Stand')) {
+            setError(
+              `Stand error: ${error.message}. Stand can only contain numbers and letters.`
+            );
+          } else if (error.message.includes('Cruising FL')) {
+            setError(`Flight Level error: ${error.message}`);
+          } else if (error.message.includes('Squawk')) {
+            setError(`Squawk error: ${error.message}`);
+          } else {
+            setError(`${error.message}`);
+          }
+        } else {
+          setError('Failed to submit flight. Please try again.');
+        }
       } finally {
         setIsSubmitting(false);
       }
@@ -470,7 +488,7 @@ export default function Submit() {
           <div className="bg-gray-900/70 backdrop-blur-md rounded-3xl border border-gray-800 shadow-2xl overflow-hidden">
             <form onSubmit={handleSubmit} className="p-6 space-y-6">
               {error && (
-                <div className="p-3 bg-red-900/40 border border-red-700 rounded-md flex items-center text-sm mb-2">
+                <div className="p-3 bg-red-900/40 border border-red-700 rounded-full flex items-center text-sm mb-2">
                   <AlertTriangle className="h-5 w-5 mr-2 text-red-400" />
                   {error}
                 </div>