feet: connect when simbridge status changes, not automatically

flybywiresim · Mar 31, 2024 · 021b20c · 021b20c
1 parent e4635e1
commit 021b20c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/fbw-common/src/systems/instruments/src/remote-client.ts b/fbw-common/src/systems/instruments/src/remote-client.ts
@@ -1,5 +1,5 @@
 import { Wait } from '@microsoft/msfs-sdk';
-import { NXDataStore } from '@flybywiresim/fbw-sdk';
+import { ClientState, NXDataStore, SimBridgeClientState } from '@flybywiresim/fbw-sdk';
 import { protocolV0 } from '@flybywiresim/remote-bridge-types';
 import { Base64 } from 'js-base64';
 
@@ -80,7 +80,14 @@ export class RemoteClient {
         this.clientName = options.clientName;
         this.fileDownloadBasePath = options.fileDownloadBasePath;
 
-        this.attemptConnect();
+        ClientState.getInstance().simBridgeConnectionState.sub((state) => {
+            if (state === SimBridgeClientState.CONNECTED) {
+                this.attemptConnect();
+            } else if (this.ws) {
+                this.ws.close();
+            }
+        });
+
         this.fetchInstrumentsMetadata(options.instrumentsMetadataFile).then((metadata) => this.instruments = metadata);
     }
 
@@ -109,6 +116,13 @@ export class RemoteClient {
     }
 
     private attemptConnect(): void {
+        const simBridgeClientState = ClientState.getInstance().getSimBridgeClientState();
+
+        if (simBridgeClientState !== SimBridgeClientState.CONNECTED) {
+            console.log(`[RemoteClient](attemptConnect) Not attempting to connect, as SimBridge client is in state "${simBridgeClientState}"`);
+            return;
+        }
+
         this.connectionAttemptCount++;
 
         console.log(`[RemoteClient](attemptConnect) Attempting to connect (${this.url}). attempt #${this.connectionAttemptCount}`);

diff --git a/fbw-common/src/systems/shared/src/simbridge/components/ClientState.ts b/fbw-common/src/systems/shared/src/simbridge/components/ClientState.ts
@@ -3,6 +3,7 @@
 
 /* eslint-disable no-console */
 import { NXDataStore } from '@flybywiresim/fbw-sdk';
+import { Subject, Subscribable } from '@microsoft/msfs-sdk';
 import { Health } from './Health';
 
 /**
@@ -41,7 +42,9 @@ export class ClientState {
     private maxSimBridgeConnectionAttempts: number = 60;
 
     // Indicates the state of the client connection to the SimBridge server
-    private simBridgeState: SimBridgeClientState = SimBridgeClientState.OFF;
+    private readonly simBridgeState = Subject.create(SimBridgeClientState.OFF);
+
+    public readonly simBridgeConnectionState: Subscribable<SimBridgeClientState> = this.simBridgeState;
 
     /**
      * Private constructor for the singleton. Start checking the server availability regularly
@@ -102,14 +105,14 @@ export class ClientState {
      * @returns {SimBridgeClientState}
      */
     public getSimBridgeClientState(): SimBridgeClientState {
-        return this.simBridgeState;
+        return this.simBridgeState.get();
     }
 
     /**
      * Returns true if the SimBridgeClientState is CONNECTED
      */
     public isConnected(): boolean {
-        return this.simBridgeState === SimBridgeClientState.CONNECTED;
+        return this.simBridgeState.get() === SimBridgeClientState.CONNECTED;
     }
 
     /**
@@ -119,18 +122,18 @@ export class ClientState {
      */
     private setSimBridgeState() {
         if (this.available) {
-            this.simBridgeState = SimBridgeClientState.CONNECTED;
+            this.simBridgeState.set(SimBridgeClientState.CONNECTED);
             return;
         }
         switch (this.simBridgeEnabledSetting) {
         case 'AUTO ON':
-            this.simBridgeState = SimBridgeClientState.CONNECTING;
+            this.simBridgeState.set(SimBridgeClientState.CONNECTING);
             break;
         case 'AUTO OFF':
-            this.simBridgeState = SimBridgeClientState.OFFLINE;
+            this.simBridgeState.set(SimBridgeClientState.OFFLINE);
             break;
         default:
-            this.simBridgeState = SimBridgeClientState.OFF;
+            this.simBridgeState.set(SimBridgeClientState.OFF);
         }
     }