dandri/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2026-06-07 11:01:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

CDN-CS: it works!!!

Browse Source
This commit is contained in:
Rory&
2026-04-12 02:21:09 +02:00
parent 1d76274546
commit a92d127ff6
18 changed files with 570 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extra/admin-api/Spacebar.Cdn/Controllers/UserController.cs
+74 -77
View File
@@ -1,77 +1,74 @@
// using ArcaneLibs.Extensions.Streams;
// using Microsoft.AspNetCore.Mvc;
// using Spacebar.AdminApi.TestClient.Services.Services;
// using Spacebar.Cdn.Extensions;
// using Spacebar.Interop.Cdn.Abstractions;
//
// namespace Spacebar.Cdn.Controllers;
//
// [ApiController]
// public class UserController(LruFileCache lfc, IFileSource fs, DiscordImageResizeService dirs) : ImageController {
// [HttpGet("/avatars/{userId}/{hash}.{ext}")]
// public async Task<IActionResult> GetUserAvatar(string userId, string hash, string ext) {
// var originalKey = fs.BaseUrl + Request.Path;
// var cacheKey = Request.Path + Request.QueryString;
//
// DiscordImageResizeParams resizeParams = GetResizeParams();
//
// var entry = await lfc.GetOrAdd(cacheKey, async () => {
// var original = await fs.GetFile(Request.Path);
//
// if (Request.Query.Any()) {
// using var img = await original.ToMagickImageCollectionAsync();
// dirs.Apply(img, resizeParams);
//
// var outStream = new MemoryStream();
// await img.WriteAsync(outStream, img.First().Format);
// outStream.Position = 0;
//
// return new LruFileCache.Entry() {
// Data = outStream.ReadToEnd().ToArray(),
// MimeType = original.MimeType
// };
// }
//
// return new LruFileCache.Entry() {
// Data = original.Stream.ReadToEnd().ToArray(),
// MimeType = original.MimeType
// };
// });
//
// // byte array with mime type result
// return new FileContentResult(entry.Data, entry.MimeType);
// }
// [HttpGet("/banners/{userId}/{hash}.{ext}")]
// public async Task<IActionResult> GetUserBanner(string userId, string hash, string ext) {
// var originalKey = fs.BaseUrl + Request.Path;
// var cacheKey = Request.Path + Request.QueryString;
//
// DiscordImageResizeParams resizeParams = GetResizeParams();
//
// var entry = await lfc.GetOrAdd(cacheKey, async () => {
// var original = await fs.GetFile(Request.Path);
//
// if (Request.Query.Any()) {
// using var img = await original.ToMagickImageCollectionAsync();
// dirs.Apply(img, resizeParams);
//
// var outStream = new MemoryStream();
// await img.WriteAsync(outStream, img.First().Format);
// outStream.Position = 0;
//
// return new LruFileCache.Entry() {
// Data = outStream.ReadToEnd().ToArray(),
// MimeType = original.MimeType
// };
// }
//
// return new LruFileCache.Entry() {
// Data = original.Stream.ReadToEnd().ToArray(),
// MimeType = original.MimeType
// };
// });
//
// // byte array with mime type result
// return new FileContentResult(entry.Data, entry.MimeType);
// }
// }
using ArcaneLibs.Extensions.Streams;
using Microsoft.AspNetCore.Mvc;
using Spacebar.AdminApi.TestClient.Services.Services;
using Spacebar.Cdn.Extensions;
using Spacebar.Cdn.Services;
using Spacebar.Interop.Cdn.Abstractions;
namespace Spacebar.Cdn.Controllers;
[ApiController]
public class UserController(LruFileCache lfc, IFileSource fs, CdnWorkerService cws) : ControllerBase {
[HttpGet("/avatars/{userId}/{hash}")]
[HttpGet("/avatars/{userId}/{hash}.{ext}")]
public async Task<IActionResult> GetUserAvatar(string userId, string hash, string ext = "png") {
DiscordImageResizeParams resizeParams = Request.GetResizeParams();
var originalKey = fs.BaseUrl + Request.Path;
var cacheKey = Request.Path + resizeParams.ToSerializedName();
LruFileCache.Entry? entry;
if (!Request.Query.Any() || resizeParams.Passthrough) {
var original = await fs.GetFile(Request.Path);
entry = new LruFileCache.Entry() {
Data = original.Stream.ReadToEnd().ToArray(),
MimeType = original.MimeType
};
}
else
entry = await lfc.GetOrAdd(cacheKey, async () => {
var original = await fs.GetFile(Request.Path);
var res = await cws.GetRawClient("q8").GetAsync("/scale" + Request.Path + Request.QueryString);
var outStream = await res.Content.ReadAsStreamAsync();
return new LruFileCache.Entry() {
Data = outStream.ReadToEnd().ToArray(),
MimeType = res.Content.Headers.ContentType?.ToString() ?? original.MimeType
};
});
// byte array with mime type result
return new FileContentResult(entry.Data, entry.MimeType);
}
// [HttpGet("/banners/{userId}/{hash}.{ext}")]
// public async Task<IActionResult> GetUserBanner(string userId, string hash, string ext) {
// var originalKey = fs.BaseUrl + Request.Path;
// var cacheKey = Request.Path + Request.QueryString;
//
// DiscordImageResizeParams resizeParams = GetResizeParams();
//
// var entry = await lfc.GetOrAdd(cacheKey, async () => {
// var original = await fs.GetFile(Request.Path);
//
// if (Request.Query.Any()) {
// using var img = await original.ToMagickImageCollectionAsync();
// dirs.Apply(img, resizeParams);
//
// var outStream = new MemoryStream();
// await img.WriteAsync(outStream, img.First().Format);
// outStream.Position = 0;
//
// return new LruFileCache.Entry() {
// Data = outStream.ReadToEnd().ToArray(),
// MimeType = original.MimeType
// };
// }
//
// return new LruFileCache.Entry() {
// Data = original.Stream.ReadToEnd().ToArray(),
// MimeType = original.MimeType
// };
// });
//
// // byte array with mime type result
// return new FileContentResult(entry.Data, entry.MimeType);
// }
}