Merge pull request #140 from Moonlight-Panel/RemoveBundleService
Removed bundle service
This commit is contained in:
Marcel Baumgartner
GitHub
commit
84396c34e6
4 changed files with 42 additions and 205 deletions
|
|
@ -16,14 +16,12 @@ public class ResourcesController : Controller
|
|||
{
|
||||
private readonly SecurityLogService SecurityLogService;
|
||||
private readonly BucketService BucketService;
|
||||
private readonly BundleService BundleService;
|
||||
|
||||
public ResourcesController(SecurityLogService securityLogService,
|
||||
BucketService bucketService, BundleService bundleService)
|
||||
BucketService bucketService)
|
||||
{
|
||||
SecurityLogService = securityLogService;
|
||||
BucketService = bucketService;
|
||||
BundleService = bundleService;
|
||||
}
|
||||
|
||||
[HttpGet("images/{name}")]
|
||||
|
|
@ -77,34 +75,4 @@ public class ResourcesController : Controller
|
|||
return Problem();
|
||||
}
|
||||
}
|
||||
|
||||
[HttpGet("bundle/js")]
|
||||
public Task<ActionResult> GetJs()
|
||||
{
|
||||
if (BundleService.BundledFinished)
|
||||
{
|
||||
return Task.FromResult<ActionResult>(
|
||||
File(Encoding.ASCII.GetBytes(BundleService.BundledJs), "text/javascript")
|
||||
);
|
||||
}
|
||||
|
||||
return Task.FromResult<ActionResult>(
|
||||
NotFound()
|
||||
);
|
||||
}
|
||||
|
||||
[HttpGet("bundle/css")]
|
||||
public Task<ActionResult> GetCss()
|
||||
{
|
||||
if (BundleService.BundledFinished)
|
||||
{
|
||||
return Task.FromResult<ActionResult>(
|
||||
File(Encoding.ASCII.GetBytes(BundleService.BundledCss), "text/css")
|
||||
);
|
||||
}
|
||||
|
||||
return Task.FromResult<ActionResult>(
|
||||
NotFound()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,129 +0,0 @@
|
|||
using Logging.Net;
|
||||
|
||||
namespace Moonlight.App.Services.Sessions;
|
||||
|
||||
public class BundleService
|
||||
{
|
||||
public BundleService(ConfigService configService)
|
||||
{
|
||||
var url = configService
|
||||
.GetSection("Moonlight")
|
||||
.GetValue<string>("AppUrl");
|
||||
|
||||
#region JS
|
||||
|
||||
JsFiles = new();
|
||||
|
||||
JsFiles.AddRange(new[]
|
||||
{
|
||||
url + "/_framework/blazor.server.js",
|
||||
url + "/assets/plugins/global/plugins.bundle.js",
|
||||
url + "/_content/XtermBlazor/XtermBlazor.min.js",
|
||||
url + "/_content/BlazorTable/BlazorTable.min.js",
|
||||
url + "/_content/CurrieTechnologies.Razor.SweetAlert2/sweetAlert2.min.js",
|
||||
url + "/_content/Blazor.ContextMenu/blazorContextMenu.min.js",
|
||||
"https://www.google.com/recaptcha/api.js",
|
||||
"https://cdn.jsdelivr.net/npm/xterm-addon-fit@0.5.0/lib/xterm-addon-fit.min.js",
|
||||
"https://cdn.jsdelivr.net/npm/xterm-addon-search@0.8.2/lib/xterm-addon-search.min.js",
|
||||
"https://cdn.jsdelivr.net/npm/xterm-addon-web-links@0.5.0/lib/xterm-addon-web-links.min.js",
|
||||
url + "/_content/BlazorMonaco/lib/monaco-editor/min/vs/loader.js",
|
||||
"require.config({ paths: { 'vs': '/_content/BlazorMonaco/lib/monaco-editor/min/vs' } });",
|
||||
url + "/_content/BlazorMonaco/lib/monaco-editor/min/vs/editor/editor.main.js",
|
||||
url + "/_content/BlazorMonaco/jsInterop.js",
|
||||
url + "/assets/js/scripts.bundle.js",
|
||||
url + "/assets/js/moonlight.js",
|
||||
"moonlight.loading.registerXterm();",
|
||||
url + "/_content/Blazor-ApexCharts/js/apex-charts.min.js",
|
||||
url + "/_content/Blazor-ApexCharts/js/blazor-apex-charts.js"
|
||||
});
|
||||
|
||||
#endregion
|
||||
|
||||
#region CSS
|
||||
|
||||
CssFiles = new();
|
||||
|
||||
CssFiles.AddRange(new[]
|
||||
{
|
||||
"https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700",
|
||||
url + "/assets/css/style.bundle.css",
|
||||
url + "/assets/css/flashbang.css",
|
||||
url + "/assets/css/snow.css",
|
||||
url + "/assets/css/utils.css",
|
||||
url + "/assets/css/blazor.css",
|
||||
url + "/_content/XtermBlazor/XtermBlazor.css",
|
||||
url + "/_content/BlazorMonaco/lib/monaco-editor/min/vs/editor/editor.main.css",
|
||||
url + "/_content/Blazor.ContextMenu/blazorContextMenu.min.css",
|
||||
url + "/assets/plugins/global/plugins.bundle.css"
|
||||
});
|
||||
|
||||
#endregion
|
||||
|
||||
CacheId = Guid.NewGuid().ToString();
|
||||
|
||||
Task.Run(Bundle);
|
||||
}
|
||||
|
||||
// Javascript
|
||||
public string BundledJs { get; private set; }
|
||||
public readonly List<string> JsFiles;
|
||||
|
||||
// CSS
|
||||
public string BundledCss { get; private set; }
|
||||
public readonly List<string> CssFiles;
|
||||
|
||||
// States
|
||||
public string CacheId { get; private set; }
|
||||
public bool BundledFinished { get; set; } = false;
|
||||
private bool IsBundling { get; set; } = false;
|
||||
|
||||
private async Task Bundle()
|
||||
{
|
||||
if (!IsBundling)
|
||||
IsBundling = true;
|
||||
|
||||
Logger.Info("Bundling js and css files");
|
||||
|
||||
BundledJs = "";
|
||||
BundledCss = "";
|
||||
|
||||
BundledJs = await BundleFiles(
|
||||
JsFiles
|
||||
);
|
||||
|
||||
BundledCss = await BundleFiles(
|
||||
CssFiles
|
||||
);
|
||||
|
||||
Logger.Info("Successfully bundled");
|
||||
BundledFinished = true;
|
||||
}
|
||||
|
||||
private async Task<string> BundleFiles(IEnumerable<string> items)
|
||||
{
|
||||
var bundled = "";
|
||||
|
||||
using HttpClient client = new HttpClient();
|
||||
foreach (string item in items)
|
||||
{
|
||||
// Item is a url, fetch it
|
||||
if (item.StartsWith("http"))
|
||||
{
|
||||
try
|
||||
{
|
||||
var jsCode = await client.GetStringAsync(item);
|
||||
bundled += jsCode + "\n";
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Logger.Warn($"Error fetching '{item}' while bundling");
|
||||
Logger.Warn(e);
|
||||
}
|
||||
}
|
||||
else // If not, it is probably a manual addition, so add it
|
||||
bundled += item + "\n";
|
||||
}
|
||||
|
||||
return bundled;
|
||||
}
|
||||
}
|
||||
|
|
@ -7,7 +7,6 @@
|
|||
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
|
||||
|
||||
@inject ConfigService ConfigService
|
||||
@inject BundleService BundleService
|
||||
@inject LoadingMessageRepository LoadingMessageRepository
|
||||
|
||||
@{
|
||||
|
|
@ -38,29 +37,20 @@
|
|||
|
||||
<link rel="shortcut icon" href="@(moonlightConfig.GetValue<string>("AppUrl"))/api/moonlight/resources/images/logo.svg"/>
|
||||
|
||||
@*This import is not in the bundle because the files it references are linked relative to the current lath*@
|
||||
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700"/>
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="/assets/css/style.bundle.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="/assets/css/flashbang.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="/assets/css/snow.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="/assets/css/utils.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="/assets/css/boxicons.min.css"/>
|
||||
|
||||
@if (BundleService.BundledFinished)
|
||||
{
|
||||
<link rel="stylesheet" type="text/css" href="/api/moonlight/resources/bundle/css?idontwannabecached=@(BundleService.CacheId)"/>
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach (var cssFile in BundleService.CssFiles)
|
||||
{
|
||||
if (cssFile.StartsWith("http"))
|
||||
{
|
||||
<link rel="stylesheet" type="text/css" href="@(cssFile)">
|
||||
}
|
||||
else
|
||||
{
|
||||
<style>
|
||||
@cssFile
|
||||
</style>
|
||||
}
|
||||
}
|
||||
}
|
||||
<link rel="stylesheet" type="text/css" href="/assets/css/blazor.css"/>
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="/_content/XtermBlazor/XtermBlazor.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="/_content/BlazorMonaco/lib/monaco-editor/min/vs/editor/editor.main.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="/_content/Blazor.ContextMenu/blazorContextMenu.min.css"/>
|
||||
|
||||
<link href="/assets/plugins/global/plugins.bundle.css" rel="stylesheet" type="text/css"/>
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1"/>
|
||||
<base href="~/"/>
|
||||
|
|
@ -106,24 +96,33 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
@if (BundleService.BundledFinished)
|
||||
{
|
||||
<script src="/api/moonlight/resources/bundle/js?idontwannabecached=@(BundleService.CacheId)">
|
||||
</script>
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach (var jsFile in BundleService.JsFiles)
|
||||
{
|
||||
if (jsFile.StartsWith("http"))
|
||||
{
|
||||
<script src="@(jsFile)"></script>
|
||||
}
|
||||
else
|
||||
{
|
||||
@Html.Raw("<script>" + jsFile +"</script>")
|
||||
}
|
||||
}
|
||||
}
|
||||
<script src="/_framework/blazor.server.js"></script>
|
||||
<script src="/assets/plugins/global/plugins.bundle.js"></script>
|
||||
<script src="/_content/XtermBlazor/XtermBlazor.min.js"></script>
|
||||
<script src="/_content/BlazorTable/BlazorTable.min.js"></script>
|
||||
<script src="/_content/CurrieTechnologies.Razor.SweetAlert2/sweetAlert2.min.js"></script>
|
||||
<script src="/_content/Blazor.ContextMenu/blazorContextMenu.min.js"></script>
|
||||
|
||||
<script src="https://www.google.com/recaptcha/api.js"></script>
|
||||
|
||||
<script src="https://cdn.jsdelivr.net/npm/xterm-addon-fit@0.5.0/lib/xterm-addon-fit.min.js"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/xterm-addon-search@0.8.2/lib/xterm-addon-search.min.js"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/xterm-addon-web-links@0.5.0/lib/xterm-addon-web-links.min.js"></script>
|
||||
|
||||
<script src="/_content/BlazorMonaco/lib/monaco-editor/min/vs/loader.js"></script>
|
||||
<script>require.config({ paths: { 'vs': '/_content/BlazorMonaco/lib/monaco-editor/min/vs' } });</script>
|
||||
<script src="/_content/BlazorMonaco/lib/monaco-editor/min/vs/editor/editor.main.js"></script>
|
||||
<script src="/_content/BlazorMonaco/jsInterop.js"></script>
|
||||
|
||||
<script src="/assets/js/scripts.bundle.js"></script>
|
||||
<script src="/assets/js/moonlight.js"></script>
|
||||
|
||||
<script>
|
||||
moonlight.loading.registerXterm();
|
||||
</script>
|
||||
|
||||
<script src="_content/Blazor-ApexCharts/js/apex-charts.min.js"></script>
|
||||
<script src="_content/Blazor-ApexCharts/js/blazor-apex-charts.js"></script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -128,7 +128,6 @@ namespace Moonlight
|
|||
builder.Services.AddScoped<ReCaptchaService>();
|
||||
builder.Services.AddScoped<IpBanService>();
|
||||
builder.Services.AddSingleton<OAuth2Service>();
|
||||
builder.Services.AddSingleton<BundleService>();
|
||||
|
||||
builder.Services.AddScoped<SubscriptionService>();
|
||||
builder.Services.AddScoped<SubscriptionAdminService>();
|
||||
|
|
|
|||
Loading…
Reference in a new issue