SawatoMosswartsEnjoyersClub/MosswartMassacre
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Phase 5: Extract QuestStreamingService and introduce IGameStats

Browse source 
- Extract QuestStreamingService.cs from PluginCore (timer, IsHighPriorityQuest, FormatCountdown)
- Create IGameStats interface for WebSocket telemetry decoupling
- PluginCore implements IGameStats, WebSocket.BuildPayloadJson reads from IGameStats
- WebSocket.cs no longer references PluginCore directly
- Update queststatus command to use QuestStreamingService
- Static bridge properties remain for VVSTabbedMainView compatibility

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
erik 2026-02-27 07:56:13 +00:00
parent f9264f2767
commit 0713e96a99
6 changed files with 192 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

160
MosswartMassacre/PluginCore.cs
View file

@ -18,7 +18,7 @@ using Mag.Shared.Constants;
namespace MosswartMassacre
{
[FriendlyName("Mosswart Massacre")]
public class PluginCore : PluginBase, IPluginLogger
public class PluginCore : PluginBase, IPluginLogger, IGameStats
{
// Hot Reload Support Properties
private static string _assemblyDirectory = null;
@ -47,10 +47,9 @@ namespace MosswartMassacre
public static bool IsHotReload { get; set; }
internal static PluginHost MyHost;
// Bridge properties for WebSocket telemetry until IGameStats migration (Phase 5)
// Static bridge properties for VVSTabbedMainView (reads from manager instances)
private static InventoryMonitor _staticInventoryMonitor;
internal static int cachedPrismaticCount => _staticInventoryMonitor?.CachedPrismaticCount ?? 0;
// Bridge properties for WebSocket telemetry until IGameStats migration (Phase 5)
private static KillTracker _staticKillTracker;
internal static int totalKills => _staticKillTracker?.TotalKills ?? 0;
internal static double killsPerHour => _staticKillTracker?.KillsPerHour ?? 0;
@ -58,6 +57,16 @@ namespace MosswartMassacre
internal static int totalDeaths => _staticKillTracker?.TotalDeaths ?? 0;
internal static DateTime statsStartTime => _staticKillTracker?.StatsStartTime ?? DateTime.Now;
internal static DateTime lastKillTime => _staticKillTracker?.LastKillTime ?? DateTime.Now;
// IGameStats explicit implementation (for WebSocket telemetry)
int IGameStats.TotalKills => _staticKillTracker?.TotalKills ?? 0;
double IGameStats.KillsPerHour => _staticKillTracker?.KillsPerHour ?? 0;
int IGameStats.SessionDeaths => _staticKillTracker?.SessionDeaths ?? 0;
int IGameStats.TotalDeaths => _staticKillTracker?.TotalDeaths ?? 0;
int IGameStats.CachedPrismaticCount => _staticInventoryMonitor?.CachedPrismaticCount ?? 0;
string IGameStats.CharTag => CharTag;
DateTime IGameStats.StatsStartTime => _staticKillTracker?.StatsStartTime ?? DateTime.Now;
private static Timer vitalsTimer;
private static System.Windows.Forms.Timer commandTimer;
private static Timer characterStatsTimer;
@ -122,7 +131,6 @@ namespace MosswartMassacre
// Quest Management for always-on quest streaming
public static QuestManager questManager;
private static Timer questStreamingTimer;
private static readonly Queue<string> _chatQueue = new Queue<string>();
@ -132,6 +140,7 @@ namespace MosswartMassacre
private InventoryMonitor _inventoryMonitor;
private ChatEventRouter _chatEventRouter;
private GameEventRouter _gameEventRouter;
private QuestStreamingService _questStreamingService;
private CommandRouter _commandRouter;
protected override void Startup()
@ -236,6 +245,7 @@ namespace MosswartMassacre
vTank.Enable();
// Set logger for WebSocket
WebSocket.SetLogger(this);
WebSocket.SetGameStats(this);
//lyssna på commands
WebSocket.OnServerCommand += HandleServerCommand;
//starta inventory. Hanterar subscriptions i den med
@ -305,14 +315,9 @@ namespace MosswartMassacre
commandTimer = null;
}
// Stop and dispose quest streaming timer
if (questStreamingTimer != null)
{
questStreamingTimer.Stop();
questStreamingTimer.Elapsed -= OnQuestStreamingUpdate;
questStreamingTimer.Dispose();
questStreamingTimer = null;
}
// Stop quest streaming service
_questStreamingService?.Stop();
_questStreamingService = null;
// Stop and dispose character stats timer
if (characterStatsTimer != null)
@ -427,11 +432,9 @@ namespace MosswartMassacre
// Trigger full quest data refresh (same as clicking refresh button)
Views.FlagTrackerView.RefreshQuestData();
// Initialize quest streaming timer (30 seconds)
questStreamingTimer = new Timer(Constants.QuestStreamingIntervalMs);
questStreamingTimer.Elapsed += OnQuestStreamingUpdate;
questStreamingTimer.AutoReset = true;
questStreamingTimer.Start();
// Initialize quest streaming service (30 seconds)
_questStreamingService = new QuestStreamingService(this);
_questStreamingService.Start();
WriteToChat("[OK] Quest streaming initialized with full data refresh");
}
@ -470,102 +473,6 @@ namespace MosswartMassacre
}
#region Quest Streaming Methods
private static void OnQuestStreamingUpdate(object sender, ElapsedEventArgs e)
{
try
{
// Debug: Log when timer fires
if (PluginSettings.Instance?.VerboseLogging == true)
{
WriteToChat("[QUEST-STREAM] Timer fired, checking conditions...");
}
// Stream high priority quest data via WebSocket
if (!WebSocketEnabled)
{
if (PluginSettings.Instance?.VerboseLogging == true)
{
WriteToChat("[QUEST-STREAM] WebSocket not enabled, skipping");
}
return;
}
if (questManager?.QuestList == null || questManager.QuestList.Count == 0)
{
if (PluginSettings.Instance?.VerboseLogging == true)
{
WriteToChat($"[QUEST-STREAM] No quest data available (null: {questManager?.QuestList == null}, count: {questManager?.QuestList?.Count ?? 0})");
}
return;
}
var currentTime = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
// Find and stream priority quests (deduplicated by quest ID)
var priorityQuests = questManager.QuestList
.Where(q => IsHighPriorityQuest(q.Id))
.GroupBy(q => q.Id)
.Select(g => g.First()) // Take first occurrence of each quest ID
.ToList();
if (PluginSettings.Instance?.VerboseLogging == true)
{
WriteToChat($"[QUEST-STREAM] Found {priorityQuests.Count} priority quests to stream");
}
foreach (var quest in priorityQuests)
{
try
{
string questName = questManager.GetFriendlyQuestName(quest.Id);
long timeRemaining = quest.ExpireTime - currentTime;
string countdown = FormatCountdown(timeRemaining);
if (PluginSettings.Instance?.VerboseLogging == true)
{
WriteToChat($"[QUEST-STREAM] Sending: {questName} - {countdown}");
}
// Stream quest data
System.Threading.Tasks.Task.Run(() => WebSocket.SendQuestDataAsync(questName, countdown));
}
catch (Exception ex)
{
WriteToChat($"[QUEST-STREAM] Error streaming quest {quest.Id}: {ex.Message}");
}
}
}
catch (Exception ex)
{
WriteToChat($"[QUEST-STREAM] Error in timer handler: {ex.Message}");
}
}
private static bool IsHighPriorityQuest(string questId)
{
return questId == "stipendtimer_0812" || // Changed from stipendtimer_monthly to stipendtimer_0812
questId == "augmentationblankgemacquired" ||
questId == "insatiableeaterjaw";
}
private static string FormatCountdown(long seconds)
{
if (seconds <= 0)
return "READY";
var timeSpan = TimeSpan.FromSeconds(seconds);
if (timeSpan.TotalDays >= 1)
return $"{(int)timeSpan.TotalDays}d {timeSpan.Hours:D2}h";
else if (timeSpan.TotalHours >= 1)
return $"{timeSpan.Hours}h {timeSpan.Minutes:D2}m";
else if (timeSpan.TotalMinutes >= 1)
return $"{timeSpan.Minutes}m {timeSpan.Seconds:D2}s";
else
return $"{timeSpan.Seconds}s";
}
#endregion
private void InitializeForHotReload()
{
@ -654,29 +561,18 @@ namespace MosswartMassacre
WriteToChat($"[ERROR] Quest manager hot reload failed: {ex.Message}");
}
// 9. Reinitialize quest streaming timer for hot reload
// 9. Reinitialize quest streaming service for hot reload
try
{
// Stop existing timer if any
if (questStreamingTimer != null)
{
questStreamingTimer.Stop();
questStreamingTimer.Elapsed -= OnQuestStreamingUpdate;
questStreamingTimer.Dispose();
questStreamingTimer = null;
}
// Create new timer
questStreamingTimer = new Timer(Constants.QuestStreamingIntervalMs);
questStreamingTimer.Elapsed += OnQuestStreamingUpdate;
questStreamingTimer.AutoReset = true;
questStreamingTimer.Start();
_questStreamingService?.Stop();
_questStreamingService = new QuestStreamingService(this);
_questStreamingService.Start();
WriteToChat("[OK] Quest streaming timer reinitialized (30s interval)");
WriteToChat("[OK] Quest streaming service reinitialized (30s interval)");
}
catch (Exception ex)
{
WriteToChat($"[ERROR] Quest streaming timer hot reload failed: {ex.Message}");
WriteToChat($"[ERROR] Quest streaming service hot reload failed: {ex.Message}");
}
WriteToChat("Hot reload initialization completed!");
@ -1485,7 +1381,7 @@ namespace MosswartMassacre
try
{
WriteToChat("=== Quest Streaming Status ===");
WriteToChat($"Timer Active: {questStreamingTimer != null && questStreamingTimer.Enabled}");
WriteToChat($"Timer Active: {_questStreamingService?.IsRunning ?? false}");
WriteToChat($"WebSocket Enabled: {WebSocketEnabled}");
WriteToChat($"Quest Manager: {(questManager != null ? "Active" : "Not Active")}");
WriteToChat($"Quest Count: {questManager?.QuestList?.Count ?? 0}");
@ -1493,7 +1389,7 @@ namespace MosswartMassacre
if (questManager?.QuestList != null)
{
var priorityQuests = questManager.QuestList
.Where(q => IsHighPriorityQuest(q.Id))
.Where(q => QuestStreamingService.IsHighPriorityQuest(q.Id))
.GroupBy(q => q.Id)
.Select(g => g.First())
.ToList();