Merge branch 'main' into main

Author: flogross89

apps/server/src/terrain/processing/terrainworker.ts

@@ -38,6 +38,8 @@ import { projectWgs84 } from 'apps/server/src/terrain/processing/gpu/helper';
 const DisplayScreenPixelHeightWithoutVerticalDisplay = 768;
 const DisplayScreenPixelHeightWithVerticalDisplay = 1024;
 
+const SimBridgeClientDataTimeout = 2 * 60 * 1_000; // ms, equals two minutes
+
 class TerrainWorker {
   private initialized: boolean = false;
 
@@ -54,6 +56,7 @@ class TerrainWorker {
   private currentTrackChangesSignificantlyAtDistance: { [side: string]: number } = { L: -1, R: -1 };
 
   private simBridgeClientUsed = false;
+  public simBridgeClientTimeout: NodeJS.Timeout = null;
 
   private gpu: GPU = null;
 
@@ -111,6 +114,13 @@ class TerrainWorker {
     this.simBridgeClientUsed = true;
   }
 
+  public disableSimBridgeClientData(): void {
+    if (this.simBridgeClientUsed) {
+      this.logging.info('SimBridge client data stopped (due to timeout), resuming SimConnect aircraftStatusUpdate.');
+    }
+    this.simBridgeClientUsed = false;
+  }
+
   private onPositionUpdate(data: PositionData): void {
     if (this.initialized === false) return;
 
@@ -630,6 +640,17 @@ parentPort.on('message', (data: MainToWorkerThreadMessage) => {
   } else if (data.type === MainToWorkerThreadMessageTypes.AircraftStatusData) {
     terrainWorker.enableSimBridgeClientData();
     terrainWorker.onAircraftStatusUpdate(data.content);
+
+    // Re-start timeout for disabling the SimBridge client data after two minutes of inactivity
+    if (terrainWorker.simBridgeClientTimeout !== null) {
+      clearTimeout(terrainWorker.simBridgeClientTimeout);
+      terrainWorker.simBridgeClientTimeout = null;
+    }
+
+    terrainWorker.simBridgeClientTimeout = setTimeout(
+      () => terrainWorker.disableSimBridgeClientData(),
+      SimBridgeClientDataTimeout,
+    );
   } else if (data.type === MainToWorkerThreadMessageTypes.VerticalDisplayPath) {
     terrainWorker.onVerticalPathDataUpdate(data.content);
   }

doExe.mjs

@@ -5,7 +5,7 @@ const build = exe({
   entry: './dist/main.js',
   out: './build/fbw-simbridge.exe',
   pkg: ['-C', 'GZip', '-c', './package.json'], // Specify extra pkg arguments
-  version: '0.6.3',
+  version: '0.7.0',
   target: 'node18-win-x64',
   icon: './apps/server/src/assets/images/tail.ico',
   properties: {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "fbw-simbridge",
-  "version": "0.6.3",
+  "version": "0.7.0",
   "description": "The simbridge server for FBW addons for various tasks the addons themselves can't achieve",
   "author": "",
   "private": false,