ZFW Target Set

PackageSources/js-bundle/src/App.tsx

@@ -1,104 +1,40 @@
-import { FC, StrictMode, useCallback, useEffect, useRef, useState } from 'react';
-import Freight from './components/freight/Freight';
+import { FC, StrictMode, useCallback, useEffect, useState } from 'react';
 import Pax from './components/pax/Pax';
-import { PayloadFreight, calculateCGsFreight, getWeightsFreight } from './configs/freighter';
-import { PaxConfig, PayloadPax } from './configs/pax';
-import { Fuel, getFuel, initialFuel, initialPayload } from './configs/shared';
+import { COHERENT_COMBUS_WASM_CALL, COMM_BUS_LIVE_DATA_EVENT, TFDI_SIMBRIEF_USERNAME_EVENT } from './constants';
+import { WASMDataPax } from './types/WASMData';
 
 interface IAppProps {
   commBus: ViewListener.ViewListener;
 }
 
 const App: FC<IAppProps> = ({ commBus }) => {
-  // Inferred
-  const [unit, setUnit] = useState<'lbs' | 'kg'>('lbs');
-  const [isCargo, setIsCargo] = useState(false);
-  const [isER, setIsER] = useState(false);
   const [SBUsername, setSBUsername] = useState<string>();
-
-  // From sim
-  const [payloadLive, setPayloadLive] = useState<PayloadPax | PayloadFreight>(initialPayload);
-  const [fuel, setFuel] = useState<Fuel>(initialFuel);
-  const [GSXPaxNum, setGSXPaxNum] = useState(0);
-  const [GSXCargoPercent, setGSXCargoPercent] = useState(0);
-  const [GSXState, setGSXState] = useState<'boarding' | 'deboarding' | 'idle'>('idle');
-
-  // Calculated
-  const [CGs, setCGs] = useState<[number, number]>([0, 0]);
-
+  //FIXME: TS Type
+  const [WASMData, setWASMData] = useState<WASMDataPax>();
   const [isReady, setIsReady] = useState(false);
 
-  const requestRef = useRef<number | undefined>(undefined);
-
   // Main Loop for Live Payload
-  const mainLoop = () => {
-    try {
-      if (SimVar.IsReady()) {
-        setIsER(SimVar.GetSimVarValue('L:MD11_OPT_ER', 'bool'));
-        setIsCargo(SimVar.GetSimVarValue('L:MD11_EFB_IS_CARGO', 'bool'));
-        setUnit((SimVar.GetSimVarValue('L:MD11_EFB_OPTIONS_GENERAL', 'number') & 1) << 0 ? 'lbs' : 'kg');
-
-        // GSX
-        const boardingState = SimVar.GetSimVarValue('L:FSDT_GSX_BOARDING_STATE', 'number');
-        const deboardingState = SimVar.GetSimVarValue('L:FSDT_GSX_DEBOARDING_STATE', 'number');
-        setGSXState(boardingState === 5 ? 'boarding' : deboardingState === 5 ? 'deboarding' : 'idle');
-        setGSXPaxNum(
-          boardingState === 5
-            ? SimVar.GetSimVarValue('L:FSDT_GSX_NUMPASSENGERS_BOARDING_TOTAL', 'number')
-            : deboardingState === 5
-              ? SimVar.GetSimVarValue('L:FSDT_GSX_NUMPASSENGERS_DEBOARDING_TOTAL', 'number')
-              : 0
-        );
-        setGSXCargoPercent(
-          boardingState === 5
-            ? SimVar.GetSimVarValue('L:FSDT_GSX_BOARDING_CARGO_PERCENT', 'number')
-            : deboardingState === 5
-              ? 100 - SimVar.GetSimVarValue('L:FSDT_GSX_DEBOARDING_CARGO_PERCENT', 'number')
-              : 0
-        );
-
-        const payload = isCargo ? getWeightsFreight(unit) : PaxConfig.getWeights(unit);
-        const _fuel = getFuel(unit);
-
-        setCGs(
-          isCargo
-            ? calculateCGsFreight(payload as PayloadFreight, _fuel)
-            : PaxConfig.calculateCGs(payload as PayloadPax, _fuel)
-        );
-        setPayloadLive(payload);
-        setFuel(_fuel);
-      }
-    } catch {}
-
-    requestRef.current = requestAnimationFrame(mainLoop);
-  };
-  useEffect(() => {
-    requestRef.current = requestAnimationFrame(mainLoop);
-
-    if (requestRef.current !== undefined) return () => cancelAnimationFrame(requestRef.current as number);
-  }, [unit, isCargo]);
-
   // CommBus
   const usernameCallback = useCallback((username: string) => {
     setSBUsername(username);
     setIsReady(true);
   }, []);
-  const wasmCallback = useCallback((data: any) => {
-    console.log('WASM DATA', JSON.parse(data));
+  const wasmCallback = useCallback((data: string) => {
+    setWASMData(JSON.parse(data));
   }, []);
   useEffect(() => {
     console.log('Initializing CommBus');
 
-    commBus.on('receiveSimBriefUsername', usernameCallback);
-    commBus.on('khofmann_tfdi_md-11_load_manager_live_data', wasmCallback);
+    commBus.on(COMM_BUS_LIVE_DATA_EVENT, usernameCallback);
+    commBus.on(COMM_BUS_LIVE_DATA_EVENT, wasmCallback);
 
     setTimeout(() => {
-      Coherent.call('COMM_BUS_WASM_CALLBACK', 'requestSimBriefUsername', 'null');
+      Coherent.call(COHERENT_COMBUS_WASM_CALL, TFDI_SIMBRIEF_USERNAME_EVENT, 'null');
     }, 1000);
 
     return () => {
       commBus.off('receiveSimBriefUsername', usernameCallback);
-      commBus.off('khofmann_tfdi_md-11_load_manager_live_data', wasmCallback);
+      commBus.off(COMM_BUS_LIVE_DATA_EVENT, wasmCallback);
     };
   }, []);
 
@@ -106,21 +42,11 @@ const App: FC<IAppProps> = ({ commBus }) => {
     <StrictMode>
       <div className="flex w-full justify-center pt-2 bg-zinc-900">
         <div className="flex w-3/4 flex-col items-center">
-          {isReady ? (
-            isCargo ? (
-              <Freight isER={isER} unit={unit} OEW={payloadLive.empty} CGs={CGs} />
+          {isReady && WASMData ? (
+            WASMData.userData.isCargo ? (
+              <>Not yet Implemented</>
             ) : (
-              <Pax
-                isER={isER}
-                unit={unit}
-                CGs={CGs}
-                fuelLive={fuel}
-                payloadLive={payloadLive as PayloadPax}
-                username={SBUsername}
-                GSXPaxNum={GSXPaxNum}
-                GSXCargoPercent={GSXCargoPercent}
-                GSXState={GSXState}
-              />
+              <Pax WASMData={WASMData} username={SBUsername} />
             )
           ) : (
             <h1 className="text-sm font-medium">LOADING</h1>