Complete Daybreak.GWCA implementation

Fix metrics view Upgrade dependencies
gwdevhub · Oct 26, 2023 · d24b3cd · d24b3cd
1 parent cb01dda
commit d24b3cd
Show file tree

Hide file tree

Showing 47 changed files with 1,050 additions and 80 deletions.
diff --git a/Daybreak.GWCA/header/payloads/PathingTrapezoid.h b/Daybreak.GWCA/header/payloads/PathingTrapezoid.h
@@ -8,6 +8,7 @@ using json = nlohmann::json;
 namespace Daybreak {
     struct PathingTrapezoid {
         uint32_t Id;
+        uint32_t PathingMapId;
         float XTL;
         float XTR;
         float XBL;

diff --git a/Daybreak.GWCA/source/GameModule.cpp b/Daybreak.GWCA/source/GameModule.cpp
@@ -32,6 +32,10 @@ namespace Daybreak::Modules::GameModule {
     volatile bool initialized = false;
 
     std::string GetString(wchar_t* chars) {
+        if (!chars) {
+            return "";
+        }
+
         std::string str(64, '\0');
         auto length = std::wcstombs(&str[0], chars, 64);
         str.resize(length);
@@ -41,6 +45,10 @@ namespace Daybreak::Modules::GameModule {
     std::list<QuestMetadata> GetQuestLog() {
         std::list<QuestMetadata> questMetadatas;
         auto questLog = GW::QuestMgr::GetQuestLog();
+        if (!questLog) {
+            return questMetadatas;
+        }
+
         for (auto& quest : *questLog) {
             QuestMetadata metadata;
             metadata.FromId = (uint32_t)quest.map_from;
@@ -88,6 +96,10 @@ namespace Daybreak::Modules::GameModule {
         std::list<GW::AgentLiving> agentList;
         const GW::AgentArray* agents_ptr = GW::Agents::GetAgentArray();
         GW::AgentArray* agents = GW::Agents::GetAgentArray();
+        if (!agents) {
+            return agentList;
+        }
+
         for (auto* a : *agents) {
             const GW::AgentLiving* agent = a ? a->GetAsAgentLiving() : nullptr;
             if (agent) {
@@ -132,6 +144,10 @@ namespace Daybreak::Modules::GameModule {
         std::list<Temp::GWPlayer> players;
         auto worldContext = GW::GetWorldContext();
         Temp::GWPlayer *tempPlayerArray = (Temp::GWPlayer*)worldContext->players.m_buffer;
+        if (!tempPlayerArray) {
+            return players;
+        }
+
         for (auto i = 0; i < worldContext->players.m_size; i++) {
             if (tempPlayerArray->agent_id != 0) {
                 players.push_back(*tempPlayerArray);
@@ -145,6 +161,10 @@ namespace Daybreak::Modules::GameModule {
     std::map<uint32_t, std::list<uint32_t>> GetSkillbars() {
         std::map<uint32_t, std::list<uint32_t>> skillbarMap;
         auto skillbars = GW::SkillbarMgr::GetSkillbarArray();
+        if (!skillbars) {
+            return skillbarMap;
+        }
+
         for (auto& skillbar : *skillbars) {
             std::list<uint32_t> skillList;
             skillList.push_back((uint32_t)skillbar.skills[0].skill_id);

diff --git a/Daybreak.GWCA/source/MainPlayerModule.cpp b/Daybreak.GWCA/source/MainPlayerModule.cpp
@@ -32,6 +32,10 @@ namespace Daybreak::Modules::MainPlayerModule {
     volatile bool initialized = false;
 
     std::string GetString(wchar_t* chars) {
+        if (!chars) {
+            return "";
+        }
+
         std::string str(64, '\0');
         auto length = std::wcstombs(&str[0], chars, 64);
         str.resize(length);
@@ -41,6 +45,10 @@ namespace Daybreak::Modules::MainPlayerModule {
     std::list<QuestMetadata> GetQuestLog() {
         std::list<QuestMetadata> questMetadatas;
         auto questLog = GW::QuestMgr::GetQuestLog();
+        if (!questLog) {
+            return questMetadatas;
+        }
+
         for (auto& quest : *questLog) {
             QuestMetadata metadata;
             metadata.FromId = (uint32_t)quest.map_from;
@@ -88,6 +96,10 @@ namespace Daybreak::Modules::MainPlayerModule {
         std::list<GW::AgentLiving> agentList;
         const GW::AgentArray* agents_ptr = GW::Agents::GetAgentArray();
         GW::AgentArray* agents = GW::Agents::GetAgentArray();
+        if (!agents) {
+            return agentList;
+        }
+
         for (auto* a : *agents) {
             const GW::AgentLiving* agent = a ? a->GetAsAgentLiving() : nullptr;
             if (agent) {
@@ -132,6 +144,10 @@ namespace Daybreak::Modules::MainPlayerModule {
         std::list<Temp::GWPlayer> players;
         auto worldContext = GW::GetWorldContext();
         Temp::GWPlayer *tempPlayerArray = (Temp::GWPlayer*)worldContext->players.m_buffer;
+        if (!tempPlayerArray) {
+            return players;
+        }
+
         for (auto i = 0; i < worldContext->players.m_size; i++) {
             if (tempPlayerArray->agent_id != 0) {
                 players.push_back(*tempPlayerArray);
@@ -145,6 +161,10 @@ namespace Daybreak::Modules::MainPlayerModule {
     std::map<uint32_t, std::list<uint32_t>> GetSkillbars() {
         std::map<uint32_t, std::list<uint32_t>> skillbarMap;
         auto skillbars = GW::SkillbarMgr::GetSkillbarArray();
+        if (!skillbars) {
+            return skillbarMap;
+        }
+
         for (auto& skillbar : *skillbars) {
             std::list<uint32_t> skillList;
             skillList.push_back((uint32_t)skillbar.skills[0].skill_id);

diff --git a/Daybreak.GWCA/source/PathingModule.cpp b/Daybreak.GWCA/source/PathingModule.cpp
@@ -31,6 +31,7 @@ namespace Daybreak::Modules::PathingModule {
                 auto gwTrapezoid = gwPathingMap.trapezoids[j];
                 PathingTrapezoid trapezoid;
                 trapezoid.Id = gwTrapezoid.id;
+                trapezoid.PathingMapId = i;
                 trapezoid.XTL = gwTrapezoid.XTL;
                 trapezoid.XBL = gwTrapezoid.XBL;
                 trapezoid.XTR = gwTrapezoid.XTR;

diff --git a/Daybreak.GWCA/source/dllmain.cpp b/Daybreak.GWCA/source/dllmain.cpp
@@ -30,7 +30,7 @@ static DWORD WINAPI ThreadProc(LPVOID lpModule)
     HMODULE hModule = static_cast<HMODULE>(lpModule);
 #ifdef BUILD_TYPE_DEBUG
     AllocConsole();
-    SetConsoleTitleA("PacketLogger Console");
+    SetConsoleTitleA("Daybreak.GWCA Console");
     freopen_s(&stdout_proxy, "CONOUT$", "w", stdout);
     freopen_s(&stderr_proxy, "CONOUT$", "w", stderr);
 #endif

diff --git a/Daybreak.GWCA/source/payloads/PathingTrapezoid.cpp b/Daybreak.GWCA/source/payloads/PathingTrapezoid.cpp
@@ -10,6 +10,7 @@ namespace Daybreak {
         j = json
         {
             {"Id", p.Id},
+            {"PathingMapId", p.PathingMapId},
             {"XTL", p.XTL},
             {"XTR", p.XTR},
             {"XBL", p.XBL},

diff --git a/Daybreak/Converters/AttributeJsonConverter.cs b/Daybreak/Converters/AttributeJsonConverter.cs
@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using Daybreak.Models.Guildwars;
+using Newtonsoft.Json;
 using System;
 
 namespace Daybreak.Converters;
@@ -25,9 +26,9 @@ public sealed class AttributeJsonConverter : JsonConverter
 
                 return namedAttribute;
             case JsonToken.Integer:
-                var id = reader.ReadAsInt32();
-                if (id is not int ||
-                    !Models.Guildwars.Attribute.TryParse(id.Value, out var parsedAttribute))
+                var id = reader.Value as long?;
+                if (id is not long ||
+                    !Models.Guildwars.Attribute.TryParse((int)id.Value, out var parsedAttribute))
                 {
                     return default;
                 }

diff --git a/Daybreak/Converters/CampaignJsonConverter.cs b/Daybreak/Converters/CampaignJsonConverter.cs
@@ -26,9 +26,9 @@ public sealed class CampaignJsonConverter : JsonConverter
 
                 return namedCampaign;
             case JsonToken.Integer:
-                var id = reader.ReadAsInt32();
-                if (id is not int ||
-                    !Campaign.TryParse(id.Value, out var parsedCampaign))
+                var id = reader.Value as long?;
+                if (id is not long ||
+                    !Campaign.TryParse((int)id.Value, out var parsedCampaign))
                 {
                     return default;
                 }

diff --git a/Daybreak/Converters/ContinentJsonConverter.cs b/Daybreak/Converters/ContinentJsonConverter.cs
@@ -26,9 +26,9 @@ public sealed class ContinentJsonConverter : JsonConverter
 
                 return namedContinent;
             case JsonToken.Integer:
-                var id = reader.ReadAsInt32();
-                if (id is not int ||
-                    !Continent.TryParse(id.Value, out var parsedContinent))
+                var id = reader.Value as long?;
+                if (id is not long ||
+                    !Continent.TryParse((int)id.Value, out var parsedContinent))
                 {
                     return default;
                 }

diff --git a/Daybreak/Converters/GuildwarsIconJsonConverter.cs b/Daybreak/Converters/GuildwarsIconJsonConverter.cs
@@ -26,9 +26,9 @@ public sealed class GuildwarsIconJsonConverter : JsonConverter
 
                 return namedGuildwarsIcon;
             case JsonToken.Integer:
-                var id = reader.ReadAsInt32();
-                if (id is not int ||
-                    !GuildwarsIcon.TryParse(id.Value, out var parsedGuildwarsIcon))
+                var id = reader.Value as long?;
+                if (id is not long ||
+                    !GuildwarsIcon.TryParse((int)id.Value, out var parsedGuildwarsIcon))
                 {
                     return default;
                 }

diff --git a/Daybreak/Converters/ItemBaseJsonConverter.cs b/Daybreak/Converters/ItemBaseJsonConverter.cs
@@ -26,9 +26,9 @@ public sealed class ItemBaseJsonConverter : JsonConverter
 
                 return namedItem;
             case JsonToken.Integer:
-                var id = reader.ReadAsInt32();
-                if (id is not int ||
-                    !ItemBase.TryParse(id.Value, modifiers: default, out var parsedItem))
+                var id = reader.Value as long?;
+                if (id is not long ||
+                    !ItemBase.TryParse((int)id.Value, null, out var parsedItem))
                 {
                     return default;
                 }

diff --git a/Daybreak/Converters/MapJsonConverter.cs b/Daybreak/Converters/MapJsonConverter.cs
@@ -26,9 +26,9 @@ public sealed class MapJsonConverter : JsonConverter
 
                 return namedMap;
             case JsonToken.Integer:
-                var id = reader.ReadAsInt32();
-                if (id is not int ||
-                    !Map.TryParse(id.Value, out var parsedMap))
+                var id = reader.Value as long?;
+                if (id is not long ||
+                    !Map.TryParse((int)id.Value, out var parsedMap))
                 {
                     return default;
                 }

diff --git a/Daybreak/Converters/NpcJsonConverter.cs b/Daybreak/Converters/NpcJsonConverter.cs
@@ -27,9 +27,9 @@ public sealed class NpcJsonConverter : JsonConverter
 
                 return namedNpc;
             case JsonToken.Integer:
-                var id = reader.ReadAsInt32();
-                if (id is not int ||
-                    !Npc.TryParse(id.Value, out var parsedNpc))
+                var id = reader.Value as long?;
+                if (id is not long ||
+                    !Npc.TryParse((int)id.Value, out var parsedNpc))
                 {
                     return default;
                 }

diff --git a/Daybreak/Converters/ProfessionJsonConverter.cs b/Daybreak/Converters/ProfessionJsonConverter.cs
@@ -26,9 +26,9 @@ public sealed class ProfessionJsonConverter : JsonConverter
 
                 return namedProfession;
             case JsonToken.Integer:
-                var id = reader.ReadAsInt32();
-                if (id is not int ||
-                    !Profession.TryParse(id.Value, out var parsedProfession))
+                var id = reader.Value as long?;
+                if (id is not long ||
+                    !Profession.TryParse((int)id.Value, out var parsedProfession))
                 {
                     return default;
                 }

diff --git a/Daybreak/Converters/QuestJsonConverter.cs b/Daybreak/Converters/QuestJsonConverter.cs
@@ -26,9 +26,9 @@ public sealed class QuestJsonConverter : JsonConverter
 
                 return namedQuest;
             case JsonToken.Integer:
-                var id = reader.ReadAsInt32();
-                if (id is not int ||
-                    !Quest.TryParse(id.Value, out var parsedQuest))
+                var id = reader.Value as long?;
+                if (id is not long ||
+                    !Quest.TryParse((int)id.Value, out var parsedQuest))
                 {
                     return default;
                 }

diff --git a/Daybreak/Converters/RegionJsonConverter.cs b/Daybreak/Converters/RegionJsonConverter.cs
@@ -26,9 +26,9 @@ public sealed class RegionJsonConverter : JsonConverter
 
                 return namedRegion;
             case JsonToken.Integer:
-                var id = reader.ReadAsInt32();
-                if (id is not int ||
-                    !Region.TryParse(id.Value, out var parsedRegion))
+                var id = reader.Value as long?;
+                if (id is not long ||
+                    !Region.TryParse((int)id.Value, out var parsedRegion))
                 {
                     return default;
                 }

diff --git a/Daybreak/Converters/SkillJsonConverter.cs b/Daybreak/Converters/SkillJsonConverter.cs
@@ -26,9 +26,9 @@ public sealed class SkillJsonConverter : JsonConverter
 
                 return namedSkill;
             case JsonToken.Integer:
-                var id = reader.ReadAsInt32();
-                if (id is not int ||
-                    !Skill.TryParse(id.Value, out var parsedSkill))
+                var id = reader.Value as long?;
+                if (id is not long ||
+                    !Skill.TryParse((int)id.Value, out var parsedSkill))
                 {
                     return default;
                 }

diff --git a/Daybreak/Converters/TitleJsonConverter.cs b/Daybreak/Converters/TitleJsonConverter.cs
@@ -26,9 +26,9 @@ public sealed class TitleJsonConverter : JsonConverter
 
                 return namedTitle;
             case JsonToken.Integer:
-                var id = reader.ReadAsInt32();
-                if (id is not int ||
-                    !Title.TryParse(id.Value, out var parsedTitle))
+                var id = reader.Value as long?;
+                if (id is not long ||
+                    !Title.TryParse((int)id.Value, out var parsedTitle))
                 {
                     return default;
                 }

diff --git a/Daybreak/Daybreak.csproj b/Daybreak/Daybreak.csproj
@@ -91,8 +91,8 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2045.28" />
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2088.41" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.75" />
     <PackageReference Include="NAudio" Version="2.2.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Plumsy" Version="1.1.0" />

diff --git a/Daybreak/Services/ApplicationLauncher/ApplicationLauncher.cs b/Daybreak/Services/ApplicationLauncher/ApplicationLauncher.cs
@@ -258,38 +258,10 @@ public void RestartDaybreakAsNormalUser()
             CloseHandle(clientHandle);
         }
 
-        /*
-         * Run the actions one by one, to avoid injection issues
-         */
-        foreach (var mod in mods)
-        {
-            using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(this.launcherOptions.Value.ModStartupTimeout));
-            try
-            {
-                await mod.OnGuildwarsStarted(process, cts.Token);
-            }
-            catch (TaskCanceledException)
-            {
-                this.logger.LogError($"{mod.Name} timeout");
-                this.notificationService.NotifyError(
-                    title: $"{mod.Name} timeout",
-                    description: $"Mod timed out while processing {nameof(mod.OnGuildwarsStarted)}");
-            }
-            catch (Exception e)
-            {
-                this.KillGuildWarsProcess(process);
-                this.logger.LogError(e, $"{mod.Name} unhandled exception");
-                this.notificationService.NotifyError(
-                    title: $"{mod.Name} exception",
-                    description: $"Mod encountered exception of type {e.GetType().Name} while processing {nameof(mod.OnGuildwarsStarted)}");
-                return default;
-            }
-        }
-
         var retries = 0;
         while (retries < MaxRetries)
         {
-            await Task.Delay(100);
+            await Task.Delay(1000);
             retries++;
             var gwProcess = Process.GetProcessesByName("gw").FirstOrDefault();
             if (gwProcess is null && retries < MaxRetries)
@@ -322,6 +294,34 @@ public void RestartDaybreakAsNormalUser()
                 continue;
             }
 
+            /*
+             * Run the actions one by one, to avoid injection issues
+             */
+            foreach (var mod in mods)
+            {
+                using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(this.launcherOptions.Value.ModStartupTimeout));
+                try
+                {
+                    await mod.OnGuildwarsStarted(process, cts.Token);
+                }
+                catch (TaskCanceledException)
+                {
+                    this.logger.LogError($"{mod.Name} timeout");
+                    this.notificationService.NotifyError(
+                        title: $"{mod.Name} timeout",
+                        description: $"Mod timed out while processing {nameof(mod.OnGuildwarsStarted)}");
+                }
+                catch (Exception e)
+                {
+                    this.KillGuildWarsProcess(process);
+                    this.logger.LogError(e, $"{mod.Name} unhandled exception");
+                    this.notificationService.NotifyError(
+                        title: $"{mod.Name} exception",
+                        description: $"Mod encountered exception of type {e.GetType().Name} while processing {nameof(mod.OnGuildwarsStarted)}");
+                    return default;
+                }
+            }
+
             return gwProcess;
         }