census update

MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs

@@ -152,7 +152,7 @@ public partial class MareHub
     }
 
     [Authorize(Policy = "Identified")]
-    public async Task<List<OnlineUserIdentDto>> UserGetOnlinePairs()
+    public async Task<List<OnlineUserIdentDto>> UserGetOnlinePairs(CensusDataDto? censusData)
     {
         _logger.LogCallInfo();
 
@@ -161,6 +161,8 @@ public partial class MareHub
 
         await SendOnlineToAllPairedUsers().ConfigureAwait(false);
 
+        _mareCensus.PublishStatistics(UserUID, censusData);
+
         return pairs.Select(p => new OnlineUserIdentDto(new UserData(p.Key), p.Value)).ToList();
     }
 
@@ -278,6 +280,8 @@ public partial class MareHub
 
         await Clients.Users(recipientUids).Client_UserReceiveCharacterData(new OnlineUserCharaDataDto(new UserData(UserUID), dto.CharaData)).ConfigureAwait(false);
 
+        _mareCensus.PublishStatistics(UserUID, dto.CensusDataDto);
+
         _mareMetrics.IncCounter(MetricsAPI.CounterUserPushData);
         _mareMetrics.IncCounter(MetricsAPI.CounterUserPushDataTo, recipientUids.Count);
     }

MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs

@@ -30,6 +30,7 @@ public partial class MareHub : Hub<IMareHub>, IMareHub
     private readonly int _maxGroupUserCount;
     private readonly IRedisDatabase _redis;
     private readonly OnlineSyncedPairCacheService _onlineSyncedPairCacheService;
+    private readonly MareCensus _mareCensus;
     private readonly Uri _fileServerAddress;
     private readonly Version _expectedClientVersion;
     private readonly Lazy<MareDbContext> _dbContextLazy;
@@ -38,7 +39,7 @@ public partial class MareHub : Hub<IMareHub>, IMareHub
     public MareHub(MareMetrics mareMetrics,
         IDbContextFactory<MareDbContext> mareDbContextFactory, ILogger<MareHub> logger, SystemInfoService systemInfoService,
         IConfigurationService<ServerConfiguration> configuration, IHttpContextAccessor contextAccessor,
-        IRedisDatabase redisDb, OnlineSyncedPairCacheService onlineSyncedPairCacheService)
+        IRedisDatabase redisDb, OnlineSyncedPairCacheService onlineSyncedPairCacheService, MareCensus mareCensus)
     {
         _mareMetrics = mareMetrics;
         _systemInfoService = systemInfoService;
@@ -51,6 +52,7 @@ public partial class MareHub : Hub<IMareHub>, IMareHub
         _contextAccessor = contextAccessor;
         _redis = redisDb;
         _onlineSyncedPairCacheService = onlineSyncedPairCacheService;
+        _mareCensus = mareCensus;
         _logger = new MareHubLogger(this, logger);
         _dbContextLazy = new Lazy<MareDbContext>(() => mareDbContextFactory.CreateDbContext());
     }
@@ -158,6 +160,8 @@ public partial class MareHub : Hub<IMareHub>, IMareHub
 
             await RemoveUserFromRedis().ConfigureAwait(false);
 
+            _mareCensus.ClearStatistics(UserUID);
+
             await SendOfflineToAllPairedUsers().ConfigureAwait(false);
 
             DbContext.RemoveRange(DbContext.Files.Where(f => !f.Uploaded && f.UploaderUID == UserUID));