Added debug exp date

Author: JPVenson

.vscode/launch.json

@@ -6,7 +6,7 @@
             "type": "blazorwasm",
             "request": "launch",
             "hosted": true,
-            "preLaunchTask": "build",
+            "preLaunchTask": "build dotnet",
             "program": "${workspaceFolder}/Jellyfin.HardwareVisualizer/Server/bin/Debug/net8.0/Jellyfin.HardwareVisualizer.Server.dll",
             "cwd": "${workspaceFolder}/Jellyfin.HardwareVisualizer",
             "internalConsoleOptions": "openOnSessionStart",

Jellyfin.HardwareVisualizer/Server/Controllers/SubmissionApiController.cs

@@ -129,4 +129,21 @@ public async Task<IActionResult> GetData([FromQuery, Required]string deviceId)
 		var data = await _submissionService.GetSubmissions(deviceId);
 		return Ok(_mapperService.ViewModelMapper.Map<IEnumerable<HardwareDisplayModel>>(data));
 	}
+
+	
+#if DEBUG
+/// <summary>
+	///		Gets a set of aggregated data points of all submissions for the given <see cref="deviceId"/>
+	/// </summary>
+	/// <param name="deviceId"></param>
+	/// <returns></returns>
+	[HttpGet("Recalc")]
+	//[EnableRateLimiting("fixed_metadata")]
+	public IActionResult Recalc([FromQuery, Required]Guid groupId)
+	{
+		_submissionService.BeginRecalcHardwareStats(groupId);
+		return Ok();
+	}	
+#endif
+	
 }

Jellyfin.HardwareVisualizer/Server/Services/HangfireServices/RecalculateHardwareInfoJob.cs

@@ -20,28 +20,48 @@ public async Task RecalcHardwareStats(Guid deviceId)
 		try
 		{
 			await using var db = await _dbContextFactory.CreateDbContextAsync();
-			var submissionsByGpu =
-				await db.HardwareSurveyEntries.Where(e => e.GpuType.Id == deviceId || e.CpuType.Id == deviceId).GroupBy(
-						e => new
+			var cpuDevice = await db.CpuTypes.FirstOrDefaultAsync(e => e.Id == deviceId);
+			var gpuDevice = await db.GpuTypes.FirstOrDefaultAsync(e => e.Id == deviceId);
+
+			if(cpuDevice is null && gpuDevice is null)
+			{
+				throw new Exception("Cannot determine device type");
+			}
+
+			IQueryable<HardwareSurveyEntry> query = db.HardwareSurveyEntries;
+
+			if(cpuDevice is not null)
+			{
+				query = query.Where(e => e.CpuType.Id == deviceId);
+			}
+			else
+			{
+				query = query.Where(e => e.GpuType.Id == deviceId);
+			}
+
+			var submissions = await query
+					.GroupBy(e => new
 						{
-							DeviceType = e.GpuType == null ? DeviceType.Cpu : DeviceType.Gpu,
-							DeviceName = e.GpuType!.Name ?? e.CpuType!.Name,
 							CodecName = e.HardwareCodec.Name,
 							From = e.FromResolution.Name,
 							To = e.ToResolution.Name,
 						})
+						.ToArrayAsync()
+					.ConfigureAwait(true);
+
+			var submissionsByGpu =
+					submissions
 					.Select(e => new HardwareDisplay()
 					{
 						HardwareCodec = e.Key.CodecName,
 						Diviation = 0,
 						FromResolution = e.Key.From,
 						ToResolution = e.Key.To,
-						DeviceType = e.Key.DeviceType,
-						DeviceName = e.Key.DeviceName,
+						DeviceType = cpuDevice == null ? DeviceType.Gpu : DeviceType.Cpu,
+						DeviceName = gpuDevice?.Name ?? cpuDevice!.Name,
 						MaxStreams = e.Average(f => f.MaxStreams)
 					})
-					.ToArrayAsync()
-					.ConfigureAwait(true);
+					.ToArray();
 
 			var changedDevices = submissionsByGpu.Select(e => e.DeviceName).Distinct().ToArray();
 

Jellyfin.HardwareVisualizer/Server/Services/SubmitToken/SubmitTokenService.cs

@@ -74,7 +74,8 @@ public bool Validate(JwtPayload token, out TimeSpan? retryAfter)
 		var ipAddress = _httpContextAccessor.HttpContext.Connection.RemoteIpAddress.ToString();
 
 		var cacheKey = "ip-token-" + ipAddress;
-		if (_memoryCache.TryGetValue<TokenStore>(cacheKey, out var tokenStore) && tokenStore.JwtPayload.ValidTo > DateTime.UtcNow)
+		if (_memoryCache.TryGetValue<TokenStore>(cacheKey, out var tokenStore) 
+			&& tokenStore.JwtPayload.ValidTo > DateTime.UtcNow)
 		{
 			if (tokenStore.Expired)
 			{
@@ -84,12 +85,12 @@ public bool Validate(JwtPayload token, out TimeSpan? retryAfter)
 			return (Encrypt(tokenStore.JwtPayload), null);
 		}
 
-		var expiresAt = DateTime.UtcNow.AddHours(4);
+		var expiresAt = DateTime.UtcNow.AddHours(10);
 		tokenStore = new TokenStore();
 		tokenStore.JwtPayload = new JwtPayload("jhwa/server", "jhwa/client", [new Claim("ip", ipAddress)],
 			DateTime.UtcNow, expiresAt, DateTime.UtcNow);
 
-		_memoryCache.Set(cacheKey, tokenStore, expiresAt);
+		_memoryCache.Set(cacheKey, tokenStore, DateTime.Now.AddMinutes(10));
 		return (Encrypt(tokenStore.JwtPayload), null);
 	}