init 2

LightlessSync/Services/BroadcastScanningService.cs

@@ -1,7 +1,7 @@
-using Dalamud.Game.ClientState.Objects.SubKinds;
-using Dalamud.Plugin.Services;
+using Dalamud.Plugin.Services;
 using LightlessSync.API.Dto.User;
 using LightlessSync.LightlessConfiguration;
+using LightlessSync.Services.ActorTracking;
 using LightlessSync.Services.Mediator;
 using Microsoft.Extensions.Logging;
 using System.Collections.Concurrent;
@@ -11,7 +11,7 @@ namespace LightlessSync.Services;
 public class BroadcastScannerService : DisposableMediatorSubscriberBase, IDisposable
 {
     private readonly ILogger<BroadcastScannerService> _logger;
-    private readonly IObjectTable _objectTable;
+    private readonly ActorObjectService _actorTracker;
     private readonly IFramework _framework;
 
     private readonly BroadcastService _broadcastService;
@@ -40,17 +40,14 @@ public class BroadcastScannerService : DisposableMediatorSubscriberBase, IDispos
     public readonly record struct BroadcastEntry(bool IsBroadcasting, DateTime ExpiryTime, string? GID);
 
     public BroadcastScannerService(ILogger<BroadcastScannerService> logger,
-        IClientState clientState,
-        IObjectTable objectTable,
         IFramework framework,
         BroadcastService broadcastService,
         LightlessMediator mediator,
         NameplateHandler nameplateHandler,
-        DalamudUtilService dalamudUtil,
-        LightlessConfigService configService) : base(logger, mediator)
+        ActorObjectService actorTracker) : base(logger, mediator)
     {
         _logger = logger;
-        _objectTable = objectTable;
+        _actorTracker = actorTracker;
         _broadcastService = broadcastService;
         _nameplateHandler = nameplateHandler;
 
@@ -76,12 +73,12 @@ public class BroadcastScannerService : DisposableMediatorSubscriberBase, IDispos
 
         var now = DateTime.UtcNow;
 
-        foreach (var obj in _objectTable)
+        foreach (var address in _actorTracker.PlayerAddresses)
         {
-            if (obj is not IPlayerCharacter player || player.Address == IntPtr.Zero)
+            if (address == nint.Zero)
                 continue;
 
-            var cid = DalamudUtilService.GetHashedCIDFromPlayerPointer(player.Address);
+            var cid = DalamudUtilService.GetHashedCIDFromPlayerPointer(address);
             var isStale = !_broadcastCache.TryGetValue(cid, out var entry) || entry.ExpiryTime <= now;
 
             if (isStale && _lookupQueuedCids.Add(cid) && _lookupQueue.Count < MaxQueueSize)
@@ -237,6 +234,7 @@ public class BroadcastScannerService : DisposableMediatorSubscriberBase, IDispos
         _framework.Update -= OnFrameworkUpdate;
         _cleanupCts.Cancel();
         _cleanupTask?.Wait(100);
+        _cleanupCts.Dispose();
         _nameplateHandler.Uninit();
     }
 }