 42b15cb6b7
			
		
	
	42b15cb6b7
	
	
	
		
			
			* test add queueing to file service * further adjustments to download queueing * add check for whether the request is still in the queue to CheckQueue * forcefully release slot if download didn't finish in 15s * actually cancel the delay task * add metrics and refactor some of the request queue service * refactor pathing * reuse httpclient * add queue request dto to requestfile, enqueue users immediately if a slot is available * change startup to include all controllers * update server pathing * update pathing, again * several adjustments to auth, banning, jwt server tokens, renaming, authorization * update api I guess * adjust automated banning of charaident and reg * generate jwt on servers for internal authentication * remove mvcextensions Co-authored-by: rootdarkarchon <root.darkarchon@outlook.com>
		
			
				
	
	
		
			59 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			C#
		
	
	
	
	
	
			
		
		
	
	
			59 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			C#
		
	
	
	
	
	
| using MareSynchronosShared.Metrics;
 | |
| using MareSynchronosStaticFilesServer.Services;
 | |
| using Microsoft.AspNetCore.Mvc;
 | |
| 
 | |
| namespace MareSynchronosStaticFilesServer.Utils;
 | |
| 
 | |
| public class RequestFileStreamResult : FileStreamResult
 | |
| {
 | |
|     private readonly Guid _requestId;
 | |
|     private readonly RequestQueueService _requestQueueService;
 | |
|     private readonly MareMetrics _mareMetrics;
 | |
|     private readonly CancellationTokenSource _releaseCts = new();
 | |
|     private bool _releasedSlot = false;
 | |
| 
 | |
|     public RequestFileStreamResult(Guid requestId, int secondsUntilRelease, RequestQueueService requestQueueService,
 | |
|         MareMetrics mareMetrics, Stream fileStream, string contentType) : base(fileStream, contentType)
 | |
|     {
 | |
|         _requestId = requestId;
 | |
|         _requestQueueService = requestQueueService;
 | |
|         _mareMetrics = mareMetrics;
 | |
|         _mareMetrics.IncGauge(MetricsAPI.GaugeCurrentDownloads);
 | |
| 
 | |
|         // forcefully release slot after secondsUntilRelease
 | |
|         Task.Run(async () =>
 | |
|         {
 | |
|             try
 | |
|             {
 | |
|                 await Task.Delay(TimeSpan.FromSeconds(secondsUntilRelease), _releaseCts.Token).ConfigureAwait(false);
 | |
|                 _requestQueueService.FinishRequest(_requestId);
 | |
|                 _releasedSlot = true;
 | |
|             }
 | |
|             catch { }
 | |
|         });
 | |
|     }
 | |
| 
 | |
|     public override void ExecuteResult(ActionContext context)
 | |
|     {
 | |
|         base.ExecuteResult(context);
 | |
| 
 | |
|         _releaseCts.Cancel();
 | |
| 
 | |
|         if (!_releasedSlot)
 | |
|             _requestQueueService.FinishRequest(_requestId);
 | |
| 
 | |
|         _mareMetrics.DecGauge(MetricsAPI.GaugeCurrentDownloads);
 | |
|     }
 | |
| 
 | |
|     public override async Task ExecuteResultAsync(ActionContext context)
 | |
|     {
 | |
|         await base.ExecuteResultAsync(context).ConfigureAwait(false);
 | |
| 
 | |
|         _releaseCts.Cancel();
 | |
| 
 | |
|         if (!_releasedSlot)
 | |
|             _requestQueueService.FinishRequest(_requestId);
 | |
| 
 | |
|         _mareMetrics.DecGauge(MetricsAPI.GaugeCurrentDownloads);
 | |
|     }
 | |
| } |