Implement alternative wasm caching (#36)

Author: bitbound

.build/Build.ps1

@@ -15,7 +15,9 @@ param (
 
   [switch]$BuildAgent,
 
-  [switch]$BuildDesktop
+  [switch]$BuildDesktop,
+
+  [switch]$BuildServer
 )
 
 #$InstallerDir = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer"
@@ -153,4 +155,9 @@ if ($BuildDesktop -or $BuildAgent) {
   }
 }
 
-dotnet publish -p:ExcludeApp_Data=true --runtime linux-x64 --configuration $Configuration -p:Version=$CurrentVersion -p:FileVersion=$CurrentVersion --output $OutputPath --self-contained true "$Root\ControlR.Web.Server\"
+if ($BuildServer) {
+  Write-Host "`n========================================" -ForegroundColor Cyan
+  Write-Host "Building Server Publish" -ForegroundColor Cyan
+  Write-Host "========================================" -ForegroundColor Cyan
+  dotnet publish -p:ExcludeApp_Data=true --runtime linux-x64 --configuration $Configuration -p:Version=$CurrentVersion -p:FileVersion=$CurrentVersion --output $OutputPath --self-contained true "$Root\ControlR.Web.Server\"
+}

ControlR.Web.Client/Components/Pages/Settings.razor

@@ -3,11 +3,13 @@
 @attribute [Authorize]
 
 @inject ISnackbar Snackbar
-@inject IUserSettingsProvider SettingsStore
-@inject ITenantSettingsProvider TenantSettingsProvider
+@inject IUserSettingsProvider UserSettings
+@inject ITenantSettingsProvider TenantSettings
 @inject IClipboardManager ClipboardManager
 @inject AuthenticationStateProvider AuthState
 @inject IMessenger Messenger
+@inject IJsInterop JsInterop
+@inject ILogger<Settings> Logger
 
 <PageTitle>Settings</PageTitle>
 
@@ -149,11 +151,11 @@
     }
 
     // Check if tenant has enforced the notify user setting
-    _tenantNotifySetting = await TenantSettingsProvider.GetNotifyUserOnSessionStart();
+    _tenantNotifySetting = await TenantSettings.GetNotifyUserOnSessionStart();
 
-    _notifyUser = await SettingsStore.GetNotifyUserOnSessionStart();
-    _userDisplayName = await SettingsStore.GetUserDisplayName();
-    _themeMode = await SettingsStore.GetThemeMode();
+    _notifyUser = await UserSettings.GetNotifyUserOnSessionStart();
+    _userDisplayName = await UserSettings.GetUserDisplayName();
+    _themeMode = await UserSettings.GetThemeMode();
 
     // If tenant setting is enforced, override the user setting display
     if (_tenantNotifySetting.HasValue)
@@ -185,21 +187,21 @@
     }
 
     _notifyUser = value;
-    await SettingsStore.SetNotifyUserOnSessionStart(value);
+    await UserSettings.SetNotifyUserOnSessionStart(value);
   }
 
   private async Task SetThemeMode(ThemeMode value)
   {
     _themeMode = value;
-    await SettingsStore.SetThemeMode(value);
+    await UserSettings.SetThemeMode(value);
     await Messenger.Send(new ThemeChangedMessage(value));
     Snackbar.Add("Theme updated", Severity.Success);
   }
 
   private async Task SetUserDisplayName(string value)
   {
     _userDisplayName = value;
-    await SettingsStore.SetUserDisplayName(value);
+    await UserSettings.SetUserDisplayName(value);
     Snackbar.Add("Display name updated", Severity.Success);
   }
 
@@ -219,5 +221,4 @@
       ? "Username can only contain letters, numbers, underscores, and hyphens."
       : null;
   }
-
 }

ControlR.Web.Client/Services/JsInterop.cs

@@ -11,17 +11,13 @@ public interface IJsInterop
 
   ValueTask Alert(string message);
 
-  ValueTask<bool> ClearWasmCache();
-
   ValueTask<bool> Confirm(string message);
   ValueTask<string?> CreateBlobUrl(byte[] imageData, string mimeType);
   ValueTask<string> GetClipboardText();
 
   ValueTask<int> GetCursorIndex(ElementReference inputElement);
   ValueTask<int> GetCursorIndexById(string inputElementId);
   ValueTask<bool> GetSystemDarkMode();
-  ValueTask<WasmCacheStatus?> GetWasmCacheStatus();
-
   ValueTask InvokeClick(string elementId);
   ValueTask<bool> IsTouchScreen();
 
@@ -65,11 +61,6 @@ public ValueTask Alert(string message)
     return jsRuntime.InvokeVoidAsync("invokeAlert", message);
   }
 
-  public ValueTask<bool> ClearWasmCache()
-  {
-    return jsRuntime.InvokeAsync<bool>("clearWasmCache");
-  }
-
   public ValueTask<bool> Confirm(string message)
   {
     return jsRuntime.InvokeAsync<bool>("invokeConfirm", message);
@@ -100,11 +91,6 @@ public ValueTask<bool> GetSystemDarkMode()
     return jsRuntime.InvokeAsync<bool>("getSystemDarkMode");
   }
 
-  public ValueTask<WasmCacheStatus?> GetWasmCacheStatus()
-  {
-    return jsRuntime.InvokeAsync<WasmCacheStatus?>("getWasmCacheStatus");
-  }
-
   public ValueTask InvokeClick(string elementId)
   {
     return jsRuntime.InvokeVoidAsync("invokeClick", elementId);
@@ -185,12 +171,3 @@ public ValueTask ToggleFullscreen(ElementReference? element = null)
     return jsRuntime.InvokeVoidAsync("toggleFullscreen", element);
   }
 }
-
-/// <summary>
-/// Represents the status of the WASM cache service worker.
-/// </summary>
-public sealed class WasmCacheStatus
-{
-  public string CacheName { get; set; } = string.Empty;
-  public int EntryCount { get; set; }
-}

ControlR.Web.Client/wwwroot/ControlR.Web.Client.lib.module.js

@@ -0,0 +1,3 @@
+export function onRuntimeConfigLoaded(config) {
+    config.disableNoCacheFetch = true;
+}

ControlR.Web.Server/Components/App.razor

@@ -5,7 +5,6 @@
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <base href="/" />
-  <script src="wasm-cache-init.js"></script>
   <ResourcePreloader />
   <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet" />
   <link rel="stylesheet" href="@Assets["_content/MudBlazor/MudBlazor.min.css"]" />

ControlR.Web.Server/appsettings.Development.json

@@ -27,6 +27,6 @@
     "InMemoryDatabaseName": ""
   },
   "DeveloperOptions": {
-    "RenderMode": "Server"
+    "RenderMode": "Auto"
   }
 }

ControlR.Web.Server/wwwroot/downloads/AgentVersion.txt

@@ -1 +1 @@
-0.15.167.0
+0.15.177.0