Moonlight-Panel/Moonlight
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed xterm console issues

Browse Source
This commit is contained in:
Marcel Baumgartner
2023-06-16 22:56:33 +02:00
parent 0fb97683bf
commit 9e80342e26
6 changed files with 123 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Moonlight/App/Helpers/Wings/WingsConsole.cs
View File

@@ -89,10 +89,6 @@ public class WingsConsole : IDisposable
{
await Work();
}
catch (JsonReaderException)
{
// ignore
}
catch (Exception e)
{
Logger.Warn("Error connecting to wings console");
@@ -247,6 +243,7 @@ public class WingsConsole : IDisposable
break;
}
}
catch(JsonReaderException){}
catch (Exception e)
{
if (!Disconnecting)

2
Moonlight/Moonlight.csproj
View File

@@ -48,7 +48,7 @@
<PackageReference Include="RestSharp" Version="109.0.0-preview.1" />
<PackageReference Include="SSH.NET" Version="2020.0.2" />
<PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="XtermBlazor" Version="1.6.1" />
<PackageReference Include="XtermBlazor" Version="1.8.1" />
</ItemGroup>
<ItemGroup>

4
Moonlight/Pages/_Layout.cshtml
View File

@@ -105,9 +105,7 @@
<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="https://cdn.jsdelivr.net/npm/xterm-addon-fit@0.7.0/lib/xterm-addon-fit.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>

14
Moonlight/Shared/Components/Xterm/Terminal.razor
View File

@@ -5,7 +5,7 @@
<Xterm
@ref="Xterm"
Options="TerminalOptions"
AddonIds="@(new[] { "xterm-addon-fit", "xterm-addon-search", "xterm-addon-web-links" })"
AddonIds="@(new[] { "xterm-addon-fit" })"
OnFirstRender="OnFirstRender">
</Xterm>
@@ -48,6 +48,18 @@
{
await Xterm.InvokeAddonFunctionVoidAsync("xterm-addon-fit", "fit");
RunOnFirstRender.Invoke();
await Task.Run(async () =>
{
try
{
await Task.Delay(1000);
await Xterm.InvokeAddonFunctionVoidAsync("xterm-addon-fit", "fit");
await Task.Delay(1000);
await Xterm.InvokeAddonFunctionVoidAsync("xterm-addon-fit", "fit");
}
catch (Exception){}
});
}
catch (Exception)
{

19
Moonlight/Shared/Layouts/MainLayout.razor
View File

@@ -22,8 +22,7 @@
@inject IpBanService IpBanService
@inject DynamicBackgroundService DynamicBackgroundService
<GlobalErrorBoundary>
@{
@{
var uri = new Uri(NavigationManager.Uri);
var pathParts = uri.LocalPath.Split("/").Reverse();
@@ -39,9 +38,9 @@
title += $"{pathPart.FirstCharToUpper()} - ";
}
}
}
}
<CascadingValue Value="User">
<CascadingValue Value="User">
<PageTitle>@(string.IsNullOrEmpty(title) ? "Dashboard - " : title)Moonlight</PageTitle>
<div class="d-flex flex-column flex-root app-root" id="kt_app_root">
@@ -60,7 +59,6 @@
<div id="kt_app_content" class="app-content flex-column-fluid" style="background-position: center; background-size: cover; background-repeat: no-repeat; background-attachment: fixed; background-image: url('@(DynamicBackgroundService.BackgroundImageUrl)')">
<div id="kt_app_content_container" class="app-container container-fluid">
<div class="mt-10">
<SoftErrorBoundary>
@if (!IsIpBanned)
{
if (UserProcessed)
@@ -142,7 +140,6 @@
</div>
</div>
}
</SoftErrorBoundary>
</div>
</div>
</div>
@@ -152,8 +149,7 @@
</div>
</div>
</div>
</CascadingValue>
</GlobalErrorBoundary>
</CascadingValue>
@code
{
@@ -190,14 +186,11 @@
{
try
{
DynamicBackgroundService.OnBackgroundImageChanged += async (_, _) =>
{
await InvokeAsync(StateHasChanged);
};
DynamicBackgroundService.OnBackgroundImageChanged += async (_, _) => { await InvokeAsync(StateHasChanged); };
IsIpBanned = await IpBanService.IsBanned();
if(IsIpBanned)
if (IsIpBanned)
await InvokeAsync(StateHasChanged);
await Event.On<Object>("ipBan.update", this, async _ =>

4
Moonlight/wwwroot/assets/js/moonlight.js
View File

@@ -302,8 +302,8 @@
console.log("Registering xterm addons");
window.XtermBlazor.registerAddon("xterm-addon-fit", new window.FitAddon.FitAddon());
window.XtermBlazor.registerAddon("xterm-addon-search", new window.SearchAddon.SearchAddon());
window.XtermBlazor.registerAddon("xterm-addon-web-links", new window.WebLinksAddon.WebLinksAddon());
//window.XtermBlazor.registerAddon("xterm-addon-search", new window.SearchAddon.SearchAddon());
//window.XtermBlazor.registerAddon("xterm-addon-web-links", new window.WebLinksAddon.WebLinksAddon());
},
loadMonaco: function ()
{