Tidy up variable initialization

Author: Tkael

Tests/VoiceAttackPluginTests.cs

@@ -614,5 +614,29 @@ public async Task RuntimeReceiver_PascalCaseRuntimeMetadata_AppliesCommandAction
             Assert.AreEqual( "Ship", mockVAProxy.GetText( "Status vehicle" ) );
             Assert.IsFalse( mockVAProxy.GetBoolean( "Status being interdicted" ) );
         }
+
+        [TestMethod]
+        public void TestInitializeStandardValues_WithoutData_CompletesSuccessfully()
+        {
+            // Arrange: Clear cache to simulate fresh initialization
+            VoiceAttackVariables.ClearDispatchCache();
+
+            // Act: Call initializeStandardValues when EDDI data may not be fully loaded
+            // (simulates the early startup scenario where monitors haven't populated data yet)
+            try
+            {
+                VoiceAttackVariables.initializeStandardValues();
+            }
+            catch (Exception ex)
+            {
+                Assert.Fail($"initializeStandardValues should not throw exceptions during early startup. Exception: {ex.Message}");
+            }
+
+            // Assert: Verify that initialization completed successfully
+            // EDDI version should always be set (independent of EDDI data availability)
+            var eddiVersion = mockVAProxy.GetText("EDDI version");
+            Assert.IsFalse(string.IsNullOrEmpty(eddiVersion), 
+                "EDDI version should be set after initialization");
+        }
     }
 }

VoiceAttackResponder/VoiceAttackInvokationHandler.cs

@@ -366,7 +366,6 @@ private static void InvokeInaraSystem ()
                 var systemUri =
                     $"https://inara.cz/elite/starsystem/?search={EDDI.Instance.CurrentStarSystem.systemAddress}";
                 OpenOrStoreURI( systemUri );
-                VoiceAttackVariables.setStatus( "Operational" );
             }
             catch ( Exception e )
             {
@@ -396,7 +395,6 @@ private static void InvokeInaraStation ()
 
                 var stationUri = $"https://inara.cz/elite/station/?search={EDDI.Instance.CurrentStation.marketId}";
                 OpenOrStoreURI( stationUri );
-                VoiceAttackVariables.setStatus( "Operational" );
             }
             catch ( Exception e )
             {
@@ -420,7 +418,6 @@ private static void InvokeInaraFleetCarrier ()
                 var carrierUri =
                     $"https://inara.cz/elite/cmdr-fleetcarrier/?search={EDDI.Instance.FleetCarrier.callsign}";
                 OpenOrStoreURI( carrierUri );
-                VoiceAttackVariables.setStatus( "Operational" );
             }
             catch ( Exception e )
             {
@@ -444,7 +441,6 @@ private static void InvokeInaraProfile ()
 
                 var cmdrUri = $"https://inara.cz/elite/cmdr/{inaraID}/";
                 OpenOrStoreURI( cmdrUri );
-                VoiceAttackVariables.setStatus( "Operational" );
             }
             catch ( Exception e )
             {
@@ -467,7 +463,6 @@ private static void InvokeCoriolis ( bool beta = false )
 
                 var shipUri = EDDI.Instance.CurrentShip.CoriolisUri( beta );
                 OpenOrStoreURI( shipUri );
-                VoiceAttackVariables.setStatus( "Operational" );
             }
             catch ( Exception e )
             {
@@ -490,7 +485,6 @@ private static void InvokeEDShipyard ()
 
                 var shipUri = EDDI.Instance.CurrentShip.EDShipyardUri();
                 OpenOrStoreURI( shipUri );
-                VoiceAttackVariables.setStatus( "Operational" );
             }
             catch ( Exception e )
             {
@@ -1032,5 +1026,4 @@ private static async Task InvokeRouteDetailsAsync ()
             }
         }
     }
-}
-
+}

VoiceAttackResponder/VoiceAttackVariables.cs

@@ -109,17 +109,49 @@ protected internal static void initializeStandardValues()
         {
             RunWithRuntimeActionBatch( () =>
             {
+                setStatus( "Initializing" );
+                
                 foreach (var standardValue in StandardValues)
                 {
                     try
                     {
-                        LockManager.GetLock(standardValue.Key, standardValue.Value);
+                        // Wrap the standard value action to only execute if the underlying EDDI property has data
+                        // This prevents caching of null/empty values during early startup, allowing proper
+                        // initialization when monitors populate their data and PropertyChanged events fire
+                        LockManager.GetLock(standardValue.Key, () =>
+                        {
+                            // Determine if the property has data before executing the action
+                            var hasData = standardValue.Key switch
+                            {
+                                var k when k.Contains(nameof(EDDI.Instance.CurrentStarSystem)) => EDDI.Instance.CurrentStarSystem != null,
+                                var k when k.Contains(nameof(EDDI.Instance.LastStarSystem)) => EDDI.Instance.LastStarSystem != null,
+                                var k when k.Contains(nameof(EDDI.Instance.NextStarSystem)) => EDDI.Instance.NextStarSystem != null,
+                                var k when k.Contains(nameof(EDDI.Instance.DestinationStarSystem)) => EDDI.Instance.DestinationStarSystem != null,
+                                var k when k.Contains(nameof(EDDI.Instance.CurrentStellarBody)) => EDDI.Instance.CurrentStellarBody != null,
+                                var k when k.Contains(nameof(EDDI.Instance.CurrentStation)) => EDDI.Instance.CurrentStation != null,
+                                var k when k.Contains(nameof(EDDI.Instance.CurrentShip)) => EDDI.Instance.CurrentShip != null,
+                                _ => true, // Other properties are assumed to always have data
+                            };
+
+                            if (hasData)
+                            {
+                                standardValue.Value();
+                            }
+                        });
                     }
                     catch (Exception ex)
                     {
                         Logging.Error($"Failed to initialize {standardValue.Key}", ex);
                     }
                 }
+
+                // Initialize shipyard information
+                var shipConfig = ConfigService.Instance.shipMonitorConfiguration;
+                if ( shipConfig?.shipyard != null )
+                {
+                    setShipyardValues( shipConfig.shipyard.ToList() );
+                }
+
                 RuntimeSetText("EDDI version", Constants.EDDI_VERSION.ToString());
             } );
         }
@@ -327,8 +359,6 @@ protected static void setCommanderValues(Commander cmdr)
 
                     // Backwards-compatibility with 1.x
                     RuntimeSetText("System rank", cmdr?.title);
-
-                    setStatus( "Operational");
                 }
                 catch (Exception e)
                 {
@@ -422,8 +452,6 @@ public static void setShipValues(Ship ship, string prefix)
                         RuntimeSetText( $"{prefix} station", ship.station);
                         RuntimeSetDecimal( $"{prefix} distance", ship.distance);
                     }
-
-                    setStatus( "Operational");
                 }
                 catch (Exception e)
                 {