* Replace the WCF webserver with an ASP.NET Core webserver (VocaluxeWeb) - New project VocaluxeWeb: ASP.NET Core 2.3 (Kestrel) on .NET Framework 4.8.1, HTTP or HTTPS with a self-signed certificate, REST API (/api/v1) with Swagger, live events (Server-Sent Events) - Access to the game only through IVocaluxeRemote; requests run on the main thread once per frame - Sessions with roles (guest, player, admin) and configurable permissions, PINs hashed with PBKDF2 - Queue as a playlist with requesters and singers, fair order (one song per person and round) - Admin: settings, server status, logged-in devices, activate/deactivate and delete profiles - Profile pictures: own photo or one of the Vocaluxe avatars - Game: WebApp queue screen (song options, playlist group) to start the next song with the chosen singers, return to it after singing, warning when the webserver is off, remote keyboard - Old WCF server, WebserverInitalConfig and URL reservations removed; libraries moved to libs/managed - Unit tests for PIN hashing, settings and permissions, queue order and device names - AppVeyor: Visual Studio 2022 image and Node.js 24 (the build compiles the WebApp) - Documentation in VocaluxeWeb/README.md * New WebApp (Vue 3, TypeScript, Vite) replacing the old jQuery Mobile website - Login with profile and PIN, create profiles - Songs with search, filters, sorting and 30 second previews - Queue: add songs with game mode, audio and singers, edit, reorder, start in the game - Playlists: create, edit, add to the queue - Now playing with live updates, remote control and keyboard - Players: own profile with picture (photo or Vocaluxe avatar), roles for admins - Admin settings: permissions, server status, devices, profiles - Help page, responsive layout for phones, tablets and desktops, light and dark mode - Texts in WebApp/src/locales/en.json, translated with Transifex - Old website and PhoneGap config removed --------- Co-authored-by: Florian Ostertag <flokuep@users.noreply.github.com>
84 lines
2.6 KiB
C#
84 lines
2.6 KiB
C#
#region license
|
|
// This file is part of Vocaluxe.
|
|
//
|
|
// Vocaluxe is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// Vocaluxe is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
|
|
#endregion
|
|
|
|
using System;
|
|
using System.Collections.Concurrent;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
|
|
namespace VocaluxeWeb.Dispatching
|
|
{
|
|
/// Runs work from request threads on the game's main thread.
|
|
/// Requests enqueue work, the game calls <see cref="ProcessPending" /> once per frame.
|
|
public sealed class CMainThreadDispatcher
|
|
{
|
|
private readonly ConcurrentQueue<Action> _Queue = new ConcurrentQueue<Action>();
|
|
private readonly TimeSpan _Timeout;
|
|
|
|
public CMainThreadDispatcher(TimeSpan timeout)
|
|
{
|
|
_Timeout = timeout;
|
|
}
|
|
|
|
public Task<T> InvokeAsync<T>(Func<T> func)
|
|
{
|
|
var tcs = new TaskCompletionSource<T>(TaskCreationOptions.RunContinuationsAsynchronously);
|
|
var cts = new CancellationTokenSource(_Timeout);
|
|
var registration = cts.Token.Register(() => tcs.TrySetException(new TimeoutException("The game did not respond in time.")));
|
|
|
|
_Queue.Enqueue(() =>
|
|
{
|
|
registration.Dispose();
|
|
cts.Dispose();
|
|
if (tcs.Task.IsCompleted)
|
|
{
|
|
return; //Timed out, the caller is gone
|
|
}
|
|
|
|
try
|
|
{
|
|
tcs.TrySetResult(func());
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
tcs.TrySetException(e);
|
|
}
|
|
});
|
|
|
|
return tcs.Task;
|
|
}
|
|
|
|
public Task InvokeAsync(Action action)
|
|
{
|
|
return InvokeAsync<object>(() =>
|
|
{
|
|
action();
|
|
return null;
|
|
});
|
|
}
|
|
|
|
/// Executes all queued work. Must be called from the main thread.
|
|
public void ProcessPending()
|
|
{
|
|
while (_Queue.TryDequeue(out var action))
|
|
{
|
|
action();
|
|
}
|
|
}
|
|
}
|
|
}
|