Compare commits
8 commits
dev
...
pwa-testin
| Author | SHA1 | Date | |
|---|---|---|---|
|
c433286cab | ||
|
|
d359897bcd | ||
|
|
bf59339a4c | ||
|
|
f3c82e3f05 | ||
|
|
fa1590512f | ||
|
|
69f0727138 | ||
|
|
3ad40f8d2e | ||
|
|
d6717890ec |
14 changed files with 226 additions and 17 deletions
33
Iceshrimp.Backend/Controllers/Web/VersionController.cs
Normal file
33
Iceshrimp.Backend/Controllers/Web/VersionController.cs
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
using System.Net;
|
||||
using System.Net.Mime;
|
||||
using Iceshrimp.Backend.Controllers.Shared.Attributes;
|
||||
using Iceshrimp.Backend.Core.Middleware;
|
||||
using Iceshrimp.Shared.Helpers;
|
||||
using Iceshrimp.Shared.Schemas.Web;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.RateLimiting;
|
||||
|
||||
namespace Iceshrimp.Backend.Controllers.Web;
|
||||
|
||||
[ApiController]
|
||||
[Authenticate]
|
||||
[EnableRateLimiting("sliding")]
|
||||
[Route("/api/iceshrimp/version")]
|
||||
[Produces(MediaTypeNames.Application.Json)]
|
||||
public class VersionController : ControllerBase
|
||||
{
|
||||
[HttpGet]
|
||||
[ProducesResults(HttpStatusCode.OK)]
|
||||
public Task<VersionResponse> GetVersion()
|
||||
{
|
||||
var version = VersionHelpers.GetVersionInfo();
|
||||
return Task.FromResult(new VersionResponse
|
||||
{
|
||||
Codename = version.Codename,
|
||||
CommitHash = version.CommitHash,
|
||||
Edition = version.Edition,
|
||||
Version = version.Version,
|
||||
RawVersion = version.RawVersion
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -16,6 +16,9 @@
|
|||
<link rel="stylesheet" href="~/_content/Iceshrimp.Assets.PhosphorIcons/css/ph-fill.css" asp-append-version="true"/>
|
||||
<link rel="icon" type="image/png" href="~/favicon.png" asp-append-version="true"/>
|
||||
<link rel="stylesheet" href="~/Iceshrimp.Frontend.styles.css" asp-append-version="true"/>
|
||||
<link href="manifest.webmanifest" rel="manifest" />
|
||||
<link rel="apple-touch-icon" sizes="512x512" href="icon-512.png" />
|
||||
<link rel="apple-touch-icon" sizes="192x192" href="icon-192.png" />
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
@ -38,6 +41,7 @@
|
|||
</div>
|
||||
|
||||
<script src="~/_framework/blazor.webassembly.js" asp-append-version="true"></script>
|
||||
<script>navigator.serviceWorker.register('service-worker.js');</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ else
|
|||
<Line></Line>
|
||||
</div>
|
||||
<div class="note">
|
||||
<NoteComponent Note="Note.Reply" Indented="true"/>
|
||||
<NoteComponent Note="Note.Reply" Indented="true" AsQuote="true"/>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
|
|
|||
8
Iceshrimp.Frontend/Components/UpdateNotifier.razor
Normal file
8
Iceshrimp.Frontend/Components/UpdateNotifier.razor
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
<div class="body">
|
||||
<h3>UpdateNotifier</h3>
|
||||
New version available, pls update!
|
||||
aaa
|
||||
</div>
|
||||
|
||||
@code {
|
||||
}
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
using Iceshrimp.Frontend.Core.Services;
|
||||
using Iceshrimp.Shared.Schemas.Web;
|
||||
|
||||
namespace Iceshrimp.Frontend.Core.ControllerModels;
|
||||
|
||||
internal class VersionControllerModel(ApiClient api)
|
||||
{
|
||||
public Task<VersionResponse> GetVersion() =>
|
||||
api.Call<VersionResponse>(HttpMethod.Get, "/version");
|
||||
}
|
||||
|
|
@ -18,6 +18,7 @@ internal class ApiService(ApiClient client)
|
|||
public readonly MiscControllerModel Misc = new(client);
|
||||
public readonly ProfileControllerModel Profile = new(client);
|
||||
public readonly FilterControllerModel Filters = new(client);
|
||||
public readonly VersionControllerModel Version = new(client);
|
||||
|
||||
public void SetBearerToken(string token) => client.SetToken(token);
|
||||
}
|
||||
50
Iceshrimp.Frontend/Core/Services/UpdateService.cs
Normal file
50
Iceshrimp.Frontend/Core/Services/UpdateService.cs
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
using System.Timers;
|
||||
using Iceshrimp.Frontend.Core.Miscellaneous;
|
||||
using Iceshrimp.Shared.Helpers;
|
||||
using Iceshrimp.Shared.Schemas.Web;
|
||||
using Timer = System.Timers.Timer;
|
||||
|
||||
namespace Iceshrimp.Frontend.Core.Services;
|
||||
|
||||
internal class UpdateService
|
||||
{
|
||||
private readonly ApiService _api;
|
||||
private readonly ILogger<UpdateService> _logger;
|
||||
|
||||
public UpdateService(ApiService api, ILogger<UpdateService> logger)
|
||||
{
|
||||
_api = api;
|
||||
_logger = logger;
|
||||
UpdateTimer = new Timer { AutoReset = true, Enabled = true, Interval = 60000, };
|
||||
UpdateTimer.Elapsed += (_, _) => CheckVersion();
|
||||
CheckVersion();
|
||||
}
|
||||
|
||||
private VersionInfo FrontendVersion { get; } = VersionHelpers.GetVersionInfo();
|
||||
private Timer UpdateTimer { get; }
|
||||
|
||||
private async Task<VersionResponse?> GetVersion()
|
||||
{
|
||||
try
|
||||
{
|
||||
var backendVersion = await _api.Version.GetVersion();
|
||||
_logger.LogInformation("Successfully fetched backend version.");
|
||||
return backendVersion;
|
||||
}
|
||||
catch (ApiException e)
|
||||
{
|
||||
_logger.LogError(e, "Failed to fetch backend version.");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private async void CheckVersion()
|
||||
{
|
||||
var version = await GetVersion();
|
||||
if (version is null) return;
|
||||
if (version.Version != FrontendVersion.Version)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -13,6 +13,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<None Update="Components/MfmText.razor.css" CssScope="mfm"/>
|
||||
<None Include="wwwroot\icon-512.png" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
@ -42,6 +43,16 @@
|
|||
<PackageReference Include="MessagePack" Version="2.5.187"/>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Required for PWA Features -->
|
||||
<PropertyGroup>
|
||||
<ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ServiceWorker Include="wwwroot\service-worker.js"
|
||||
PublishedContent="wwwroot\service-worker.published.js"/>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Update="Localization\Localization.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ builder.Services.AddSingleton<EmojiService>();
|
|||
builder.Services.AddSingleton<VersionService>();
|
||||
builder.Services.AddSingleton<MessageService>();
|
||||
builder.Services.AddSingleton<GlobalComponentSvc>();
|
||||
builder.Services.AddSingleton<UpdateService>();
|
||||
builder.Services.AddAuthorizationCore();
|
||||
builder.Services.AddCascadingAuthenticationState();
|
||||
builder.Services.AddBlazoredLocalStorageAsSingleton();
|
||||
|
|
|
|||
BIN
Iceshrimp.Frontend/wwwroot/icon-512.png
Normal file
BIN
Iceshrimp.Frontend/wwwroot/icon-512.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.2 KiB |
22
Iceshrimp.Frontend/wwwroot/manifest.webmanifest
Normal file
22
Iceshrimp.Frontend/wwwroot/manifest.webmanifest
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{
|
||||
"name": "Iceshrimp.Frontend",
|
||||
"short_name": "Iceshrimp.Frontend",
|
||||
"id": "./",
|
||||
"start_url": "./",
|
||||
"display": "standalone",
|
||||
"background_color": "#ffffff",
|
||||
"theme_color": "#03173d",
|
||||
"prefer_related_applications": false,
|
||||
"icons": [
|
||||
{
|
||||
"src": "icon-512.png",
|
||||
"type": "image/png",
|
||||
"sizes": "512x512"
|
||||
},
|
||||
{
|
||||
"src": "icon-192.png",
|
||||
"type": "image/png",
|
||||
"sizes": "192x192"
|
||||
}
|
||||
]
|
||||
}
|
||||
4
Iceshrimp.Frontend/wwwroot/service-worker.js
Normal file
4
Iceshrimp.Frontend/wwwroot/service-worker.js
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
// In development, always fetch from the network and do not enable offline support.
|
||||
// This is because caching would make development more difficult (changes would not
|
||||
// be reflected on the first load after each change).
|
||||
self.addEventListener('fetch', () => { });
|
||||
55
Iceshrimp.Frontend/wwwroot/service-worker.published.js
Normal file
55
Iceshrimp.Frontend/wwwroot/service-worker.published.js
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
// Caution! Be sure you understand the caveats before publishing an application with
|
||||
// offline support. See https://aka.ms/blazor-offline-considerations
|
||||
|
||||
self.importScripts('./service-worker-assets.js');
|
||||
self.addEventListener('install', event => event.waitUntil(onInstall(event)));
|
||||
self.addEventListener('activate', event => event.waitUntil(onActivate(event)));
|
||||
self.addEventListener('fetch', event => event.respondWith(onFetch(event)));
|
||||
|
||||
const cacheNamePrefix = 'offline-cache-';
|
||||
const cacheName = `${cacheNamePrefix}${self.assetsManifest.version}`;
|
||||
const offlineAssetsInclude = [ /\.dll$/, /\.pdb$/, /\.wasm/, /\.html/, /\.js$/, /\.json$/, /\.css$/, /\.woff$/, /\.png$/, /\.jpe?g$/, /\.gif$/, /\.ico$/, /\.blat$/, /\.dat$/ ];
|
||||
const offlineAssetsExclude = [ /^service-worker\.js$/ ];
|
||||
|
||||
// Replace with your base path if you are hosting on a subfolder. Ensure there is a trailing '/'.
|
||||
const base = "/";
|
||||
const baseUrl = new URL(base, self.origin);
|
||||
const manifestUrlList = self.assetsManifest.assets.map(asset => new URL(asset.url, baseUrl).href);
|
||||
|
||||
async function onInstall(event) {
|
||||
console.info('Service worker: Install');
|
||||
|
||||
// Fetch and cache all matching items from the assets manifest
|
||||
const assetsRequests = self.assetsManifest.assets
|
||||
.filter(asset => offlineAssetsInclude.some(pattern => pattern.test(asset.url)))
|
||||
.filter(asset => !offlineAssetsExclude.some(pattern => pattern.test(asset.url)))
|
||||
.map(asset => new Request(asset.url, { integrity: asset.hash, cache: 'no-cache' }));
|
||||
await caches.open(cacheName).then(cache => cache.addAll(assetsRequests));
|
||||
}
|
||||
|
||||
async function onActivate(event) {
|
||||
console.info('Service worker: Activate');
|
||||
|
||||
// Delete unused caches
|
||||
const cacheKeys = await caches.keys();
|
||||
await Promise.all(cacheKeys
|
||||
.filter(key => key.startsWith(cacheNamePrefix) && key !== cacheName)
|
||||
.map(key => caches.delete(key)));
|
||||
}
|
||||
|
||||
async function onFetch(event) {
|
||||
let cachedResponse = null;
|
||||
if (event.request.method === 'GET') {
|
||||
// For all navigation requests, try to serve index.html from cache,
|
||||
// unless that request is for an offline resource.
|
||||
// If you need some URLs to be server-rendered, edit the following check to exclude those URLs
|
||||
const shouldServeIndexHtml = event.request.mode === 'navigate'
|
||||
&& !manifestUrlList.some(url => url === event.request.url);
|
||||
|
||||
const request = shouldServeIndexHtml ? 'index.html' : event.request;
|
||||
const cache = await caches.open(cacheName);
|
||||
cachedResponse = await cache.match(request);
|
||||
}
|
||||
|
||||
return cachedResponse || fetch(event.request);
|
||||
}
|
||||
10
Iceshrimp.Shared/Schemas/Web/VersionResponse.cs
Normal file
10
Iceshrimp.Shared/Schemas/Web/VersionResponse.cs
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
namespace Iceshrimp.Shared.Schemas.Web;
|
||||
|
||||
public class VersionResponse
|
||||
{
|
||||
public required string Codename { get; set; }
|
||||
public required string Edition { get; set; }
|
||||
public required string? CommitHash { get; set; }
|
||||
public required string RawVersion { get; set; }
|
||||
public required string Version { get; set; }
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue