t0w0bi/ClubPenguinServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Single file transfer (#26)

Browse Source 
* move to single file transfer for server

* fix cache get

---------

Co-authored-by: rootdarkarchon <root.darkarchon@outlook.com>
This commit is contained in:
rootdarkarchon
2023-08-01 16:48:08 +02:00
committed by GitHub
parent 715bd87907
commit fd0327b2c4
7 changed files with 30 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/CacheController.cs
View File

@@ -2,6 +2,8 @@
using MareSynchronosStaticFilesServer.Services;
using MareSynchronosStaticFilesServer.Utils;
using Microsoft.AspNetCore.Mvc;
using System.Globalization;
using System.Text;
namespace MareSynchronosStaticFilesServer.Controllers;
@@ -21,7 +23,7 @@ public class CacheController : ControllerBase
}
[HttpGet(MareFiles.Cache_Get)]
public async Task<IActionResult> GetFile(Guid requestId)
public async Task<IActionResult> GetFiles(Guid requestId)
{
_logger.LogDebug($"GetFile:{MareUser}:{requestId}");
@@ -29,13 +31,23 @@ public class CacheController : ControllerBase
_requestQueue.ActivateRequest(requestId);
var fs = await _cachedFileProvider.GetAndDownloadFileStream(request.FileId);
if (fs == null)
Response.ContentType = "application/octet-stream";
var memoryStream = new MemoryStream();
var streamWriter = new BinaryWriter(memoryStream);
foreach (var file in request.FileIds)
{
_requestQueue.FinishRequest(requestId);
return NotFound();
var fs = await _cachedFileProvider.GetAndDownloadFileStream(file);
if (fs == null) continue;
streamWriter.Write(Encoding.ASCII.GetBytes("#" + file + ":" + fs.Length.ToString(CultureInfo.InvariantCulture) + "#"));
byte[] buffer = new byte[fs.Length];
_ = await fs.ReadAsync(buffer, HttpContext.RequestAborted);
streamWriter.Write(buffer);
}
return _requestFileStreamResultFactory.Create(requestId, fs);
streamWriter.Flush();
memoryStream.Position = 0;
return _requestFileStreamResultFactory.Create(requestId, memoryStream);
}
}

27
MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/RequestController.cs
View File

@@ -36,7 +36,7 @@ public class RequestController : ControllerBase
[HttpPost]
[Route(MareFiles.Request_Enqueue)]
public async Task<IActionResult> PreRequestFilesAsync([FromBody] List<string> files)
public async Task<IActionResult> PreRequestFilesAsync([FromBody] IEnumerable<string> files)
{
try
{
@@ -47,43 +47,26 @@ public class RequestController : ControllerBase
_cachedFileProvider.DownloadFileWhenRequired(file);
}
return Ok();
}
catch (OperationCanceledException) { return BadRequest(); }
finally
{
_parallelRequestSemaphore.Release();
}
}
Guid g = Guid.NewGuid();
await _requestQueue.EnqueueUser(new(g, MareUser, files.ToList()));
[HttpGet]
[Route(MareFiles.Request_RequestFile)]
public async Task<IActionResult> RequestFile(string file)
{
Guid g = Guid.NewGuid();
try
{
await _parallelRequestSemaphore.WaitAsync(HttpContext.RequestAborted);
_cachedFileProvider.DownloadFileWhenRequired(file);
return Ok(g);
}
catch (OperationCanceledException) { return BadRequest(); }
finally
{
_parallelRequestSemaphore.Release();
await _requestQueue.EnqueueUser(new(g, MareUser, file));
}
}
[HttpGet]
[Route(MareFiles.Request_Check)]
public async Task<IActionResult> CheckQueueAsync(Guid requestId, string file)
public async Task<IActionResult> CheckQueueAsync(Guid requestId, [FromBody] IEnumerable<string> files)
{
try
{
if (!_requestQueue.StillEnqueued(requestId, MareUser))
await _requestQueue.EnqueueUser(new(requestId, MareUser, file));
await _requestQueue.EnqueueUser(new(requestId, MareUser, files.ToList()));
return Ok();
}
catch (OperationCanceledException) { return BadRequest(); }