Implement game version and game build support in the EDDN header.

Ref. EDCD/EDDN#197
MemphyKitay · Nov 19, 2022 · cc65e07 · cc65e07
1 parent e905a8a
commit cc65e07
Show file tree

Hide file tree

Showing 19 changed files with 67 additions and 153 deletions.
diff --git a/EDDNResponder/EDDNResponder.cs b/EDDNResponder/EDDNResponder.cs
@@ -66,12 +66,8 @@ private void FrontierApiOnStationUpdatedEvent(object sender, CompanionApiEndpoin
         {
             foreach (var schema in capiSchemas)
             {
-                var handledData = schema.Handle(e.profileJson, e.marketJson, e.shipyardJson, e.fleetCarrierJson, eddnState);
-                if (handledData != null)
-                {
-                    // The same Frontier API data may be handled by multiple schemas so we always iterate through each.
-                    schema.SendCapi(handledData);
-                }
+                // The same Frontier API data may be handled by multiple schemas so we always iterate through each.
+                schema.Handle(e.profileJson, e.marketJson, e.shipyardJson, e.fleetCarrierJson, eddnState);
             }
         }
 
@@ -121,11 +117,7 @@ public void Handle(Event theEvent)
             // Handle events
             foreach (var schema in schemas)
             {
-                if (schema.Handle(edType, ref data, eddnState))
-                {
-                    schema.Send(data);
-                    break;
-                }
+                schema.Handle(edType, ref data, eddnState);
             }
         }
 

diff --git a/EDDNResponder/ISchema.cs b/EDDNResponder/ISchema.cs
@@ -11,14 +11,10 @@ public interface ISchema
 
         [UsedImplicitly]
         bool Handle(string edType, ref IDictionary<string, object> data, EDDNState eddnState);
-
-        void Send(IDictionary<string, object> data);
     }
 
     public interface ICapiSchema
     {
         IDictionary<string, object> Handle(JObject profileJson, JObject marketJson, JObject shipyardJson, JObject fleetCarrierJson, EDDNState eddnState);
-
-        void SendCapi(IDictionary<string, object> data);
     }
 }
diff --git a/EDDNResponder/Schemas/ApproachSettlementSchema.cs b/EDDNResponder/Schemas/ApproachSettlementSchema.cs
@@ -1,6 +1,6 @@
-using System;
-using EddiEddnResponder.Sender;
+using EddiEddnResponder.Sender;
 using JetBrains.Annotations;
+using System;
 using System.Collections.Generic;
 using Utilities;
 
@@ -27,6 +27,7 @@ public bool Handle(string edType, ref IDictionary<string, object> data, EDDNStat
                 data = eddnState.Location.AugmentStarPos(data);
                 data = eddnState.GameVersion.AugmentVersion(data);
 
+                EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/approachsettlement/1", data, eddnState);
                 return true;
             }
             catch (Exception e)
@@ -38,10 +39,5 @@ public bool Handle(string edType, ref IDictionary<string, object> data, EDDNStat
                 return false;
             }
         }
-
-        public void Send(IDictionary<string, object> data)
-        {
-            EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/approachsettlement/1", data);
-        }
     }
 }
diff --git a/EDDNResponder/Schemas/CodexEntrySchema.cs b/EDDNResponder/Schemas/CodexEntrySchema.cs
@@ -1,6 +1,6 @@
-using System;
-using EddiEddnResponder.Sender;
+using EddiEddnResponder.Sender;
 using JetBrains.Annotations;
+using System;
 using System.Collections.Generic;
 using Utilities;
 
@@ -25,6 +25,7 @@ public bool Handle(string edType, ref IDictionary<string, object> data, EDDNStat
                 data = eddnState.Location.AugmentStarPos(data);
                 data = eddnState.GameVersion.AugmentVersion(data);
 
+                EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/codexentry/1", data, eddnState);
                 return true;
             }
             catch (Exception e)
@@ -36,10 +37,5 @@ public bool Handle(string edType, ref IDictionary<string, object> data, EDDNStat
                 return false;
             }
         }
-
-        public void Send(IDictionary<string, object> data)
-        {
-            EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/codexentry/1", data);
-        }
     }
 }
diff --git a/EDDNResponder/Schemas/CommoditySchema.cs b/EDDNResponder/Schemas/CommoditySchema.cs
@@ -49,7 +49,7 @@ commoditiesList is List<object> commodities &&
                     // Apply data augments
                     handledData = eddnState.GameVersion.AugmentVersion(handledData);
 
-                    data = handledData;
+                    EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/commodity/3", handledData, eddnState);
                     return true;
                 }
             }
@@ -81,11 +81,6 @@ private bool ApplyJournalMarketFilter(JToken c)
             return true;
         }
 
-        public void Send(IDictionary<string, object> data)
-        {
-            EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/commodity/3", data);
-        }
-
         public IDictionary<string, object> Handle(JObject profileJson, JObject marketJson, JObject shipyardJson, JObject fleetCarrierJson, EDDNState eddnState)
         {
             try
@@ -125,8 +120,9 @@ public IDictionary<string, object> Handle(JObject profileJson, JObject marketJso
                     data = eddnState.PersonalData.Strip(data);
 
                     // Apply data augments
-                    data = eddnState.GameVersion.AugmentVersion(data, "CAPI-market");
+                    data = eddnState.GameVersion.AugmentVersion(data);
 
+                    EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/commodity/3", data, eddnState, "CAPI-market");
                     return data;
                 }
             }
@@ -140,11 +136,6 @@ public IDictionary<string, object> Handle(JObject profileJson, JObject marketJso
             return null;
         }
 
-        public void SendCapi(IDictionary<string, object> data)
-        {
-            EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/commodity/3", data);
-        }
-
         private bool ApplyFrontierApiMarketFilter(JToken c)
         {
             try

diff --git a/EDDNResponder/Schemas/FCMaterialsSchema.cs b/EDDNResponder/Schemas/FCMaterialsSchema.cs
@@ -1,7 +1,7 @@
-using System;
-using EddiEddnResponder.Sender;
+using EddiEddnResponder.Sender;
 using JetBrains.Annotations;
 using Newtonsoft.Json.Linq;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -46,11 +46,6 @@ public bool Handle(string edType, ref IDictionary<string, object> data, EDDNStat
             }
         }
 
-        public void Send(IDictionary<string, object> data)
-        {
-            EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/fcmaterials_journal/1", data);
-        }
-
         public IDictionary<string, object> Handle(JObject profileJson, JObject marketJson, JObject shipyardJson, JObject fleetCarrierJson, EDDNState eddnState)
         {
             try
@@ -83,8 +78,9 @@ public IDictionary<string, object> Handle(JObject profileJson, JObject marketJso
                         data = eddnState.PersonalData.Strip(data);
 
                         // Apply data augments
-                        data = eddnState.GameVersion.AugmentVersion(data, "CAPI-market");
+                        data = eddnState.GameVersion.AugmentVersion(data);
 
+                        EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/fcmaterials_capi/1", data, eddnState, "CAPI-market");
                         return data;
                     }
                 }
@@ -98,10 +94,5 @@ public IDictionary<string, object> Handle(JObject profileJson, JObject marketJso
 
             return null;
         }
-
-        public void SendCapi(IDictionary<string, object> data)
-        {
-            EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/fcmaterials_capi/1", data);
-        }
     }
 }
diff --git a/EDDNResponder/Schemas/FSSAllBodiesFoundSchema.cs b/EDDNResponder/Schemas/FSSAllBodiesFoundSchema.cs
@@ -1,6 +1,6 @@
-using System;
-using EddiEddnResponder.Sender;
+using EddiEddnResponder.Sender;
 using JetBrains.Annotations;
+using System;
 using System.Collections.Generic;
 using Utilities;
 
@@ -25,6 +25,7 @@ public bool Handle(string edType, ref IDictionary<string, object> data, EDDNStat
                 data = eddnState.Location.AugmentStarPos(data);
                 data = eddnState.GameVersion.AugmentVersion(data);
 
+                EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/fssallbodiesfound/1", data, eddnState);
                 return true;
             }
             catch (Exception e)
@@ -36,10 +37,5 @@ public bool Handle(string edType, ref IDictionary<string, object> data, EDDNStat
                 return false;
             }
         }
-
-        public void Send(IDictionary<string, object> data)
-        {
-            EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/fssallbodiesfound/1", data);
-        }
     }
 }
diff --git a/EDDNResponder/Schemas/FSSBodySignalsSchema.cs b/EDDNResponder/Schemas/FSSBodySignalsSchema.cs
@@ -1,6 +1,6 @@
-using System;
-using EddiEddnResponder.Sender;
+using EddiEddnResponder.Sender;
 using JetBrains.Annotations;
+using System;
 using System.Collections.Generic;
 using Utilities;
 
@@ -27,6 +27,7 @@ public bool Handle(string edType, ref IDictionary<string, object> data, EDDNStat
                 data = eddnState.Location.AugmentStarPos(data);
                 data = eddnState.GameVersion.AugmentVersion(data);
 
+                EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/fssbodysignals/1", data, eddnState);
                 return true;
             }
             catch (Exception e)
@@ -38,10 +39,5 @@ public bool Handle(string edType, ref IDictionary<string, object> data, EDDNStat
                 return false;
             }
         }
-
-        public void Send(IDictionary<string, object> data)
-        {
-            EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/fssbodysignals/1", data);
-        }
     }
 }
diff --git a/EDDNResponder/Schemas/FSSDiscoveryScanSchema.cs b/EDDNResponder/Schemas/FSSDiscoveryScanSchema.cs
@@ -1,6 +1,6 @@
-using System;
-using EddiEddnResponder.Sender;
+using EddiEddnResponder.Sender;
 using JetBrains.Annotations;
+using System;
 using System.Collections.Generic;
 using Utilities;
 
@@ -28,6 +28,7 @@ public bool Handle(string edType, ref IDictionary<string, object> data, EDDNStat
                 data = eddnState.Location.AugmentStarPos(data);
                 data = eddnState.GameVersion.AugmentVersion(data);
 
+                EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/fssdiscoveryscan/1", data, eddnState);
                 return true;
             }
             catch (Exception e)
@@ -39,10 +40,5 @@ public bool Handle(string edType, ref IDictionary<string, object> data, EDDNStat
                 return false;
             }
         }
-
-        public void Send(IDictionary<string, object> data)
-        {
-            EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/fssdiscoveryscan/1", data);
-        }
     }
 }
diff --git a/EDDNResponder/Schemas/FSSSignalDiscoveredSchema.cs b/EDDNResponder/Schemas/FSSSignalDiscoveredSchema.cs
@@ -31,6 +31,8 @@ public bool Handle(string edType, ref IDictionary<string, object> data, EDDNStat
                         {
                             data = PrepareSignalsData(latestSignalState);
                             lastEdType = edType;
+                            EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/fsssignaldiscovered/1", data, eddnState);
+                            latestSignalState = null;
                             return true;
                         }
                     }
@@ -117,11 +119,5 @@ private IDictionary<string, object> PrepareSignalsData(EDDNState eddnState)
 
             return data;
         }
-
-        public void Send(IDictionary<string, object> data)
-        {
-            EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/fsssignaldiscovered/1", data);
-            latestSignalState = null;
-        }
     }
 }
diff --git a/EDDNResponder/Schemas/JournalSchema.cs b/EDDNResponder/Schemas/JournalSchema.cs
@@ -1,6 +1,6 @@
-using System;
-using EddiEddnResponder.Sender;
+using EddiEddnResponder.Sender;
 using JetBrains.Annotations;
+using System;
 using System.Collections.Generic;
 using Utilities;
 
@@ -35,6 +35,7 @@ public bool Handle(string edType, ref IDictionary<string, object> data, EDDNStat
                 data = eddnState.Location.AugmentBody(data);
                 data = eddnState.GameVersion.AugmentVersion(data);
 
+                EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/journal/1", data, eddnState);
                 return true;
             }
             catch (Exception e)
@@ -47,11 +48,6 @@ public bool Handle(string edType, ref IDictionary<string, object> data, EDDNStat
             }
         }
 
-        public void Send(IDictionary<string, object> data)
-        {
-            EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/journal/1", data);
-        }
-
         private bool CheckSanity(string edType, IDictionary<string, object> data)
         {
             // We've already vetted location data via the CheckLocationData method.

diff --git a/EDDNResponder/Schemas/NavBeaconScanSchema.cs b/EDDNResponder/Schemas/NavBeaconScanSchema.cs
@@ -1,6 +1,6 @@
-using System;
-using EddiEddnResponder.Sender;
+using EddiEddnResponder.Sender;
 using JetBrains.Annotations;
+using System;
 using System.Collections.Generic;
 using Utilities;
 
@@ -26,6 +26,7 @@ public bool Handle(string edType, ref IDictionary<string, object> data, EDDNStat
                 data = eddnState.Location.AugmentStarPos(data);
                 data = eddnState.GameVersion.AugmentVersion(data);
 
+                EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/navbeaconscan/1", data, eddnState);
                 return true;
             }
             catch (Exception e)
@@ -37,10 +38,5 @@ public bool Handle(string edType, ref IDictionary<string, object> data, EDDNStat
                 return false;
             }
         }
-
-        public void Send(IDictionary<string, object> data)
-        {
-            EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/navbeaconscan/1", data);
-        }
     }
 }
diff --git a/EDDNResponder/Schemas/NavRouteSchema.cs b/EDDNResponder/Schemas/NavRouteSchema.cs
@@ -1,6 +1,6 @@
-using System;
-using EddiEddnResponder.Sender;
+using EddiEddnResponder.Sender;
 using JetBrains.Annotations;
+using System;
 using System.Collections.Generic;
 using Utilities;
 
@@ -18,6 +18,7 @@ public bool Handle(string edType, ref IDictionary<string, object> data, EDDNStat
                 if (!edTypes.Contains(edType)) { return false; }
                 if (eddnState?.GameVersion == null) { return false; }
                 data = eddnState.GameVersion.AugmentVersion(data);
+                EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/navroute/1", data, eddnState);
                 return true;
             }
             catch (Exception e)
@@ -29,10 +30,5 @@ public bool Handle(string edType, ref IDictionary<string, object> data, EDDNStat
                 return false;
             }
         }
-
-        public void Send(IDictionary<string, object> data)
-        {
-            EDDNSender.SendToEDDN("https://eddn.edcd.io/schemas/navroute/1", data);
-        }
     }
 }