* 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>
111 lines
3.7 KiB
C#
111 lines
3.7 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.Threading.Tasks;
|
|
using VocaluxeWeb.Remote;
|
|
|
|
namespace VocaluxeWeb.Services
|
|
{
|
|
/// Watches the game from the main thread and turns changes into live events:
|
|
/// "state" when the screen or the current song changes, "queue" when the queue playlist was changed in the game.
|
|
/// When a song starts to be sung, its wish is removed from the queue.
|
|
public sealed class CLiveMonitor
|
|
{
|
|
public const string SingScreen = "Sing";
|
|
private static readonly TimeSpan _StateInterval = TimeSpan.FromMilliseconds(250);
|
|
private static readonly TimeSpan _QueueInterval = TimeSpan.FromSeconds(1);
|
|
|
|
private readonly IVocaluxeRemote _Remote;
|
|
private readonly CLiveEvents _Events;
|
|
private readonly CQueueService _Queue;
|
|
private readonly CSongLibrary _Songs;
|
|
private readonly Action<Exception> _OnError;
|
|
private DateTime _NextStateCheck;
|
|
private DateTime _NextQueueCheck;
|
|
private RemoteState _Last;
|
|
|
|
public CLiveMonitor(IVocaluxeRemote remote, CLiveEvents events, CQueueService queue, CSongLibrary songs, Action<Exception> onError)
|
|
{
|
|
_Remote = remote;
|
|
_Events = events;
|
|
_Queue = queue;
|
|
_Songs = songs;
|
|
_OnError = onError;
|
|
}
|
|
|
|
/// Called once per frame from the main thread. The queue is only watched while a WebApp is connected.
|
|
public void Tick()
|
|
{
|
|
var now = DateTime.UtcNow;
|
|
if (now >= _NextStateCheck)
|
|
{
|
|
_NextStateCheck = now + _StateInterval;
|
|
_CheckState();
|
|
}
|
|
|
|
if (now >= _NextQueueCheck && _Events.ClientCount > 0)
|
|
{
|
|
_NextQueueCheck = now + _QueueInterval;
|
|
if (_Queue.HasExternalChange())
|
|
{
|
|
_Run(_Queue.PublishAsync);
|
|
}
|
|
}
|
|
}
|
|
|
|
private void _CheckState()
|
|
{
|
|
var state = _Remote.GetState();
|
|
if (_Last != null && state.Screen == _Last.Screen && state.SongId == _Last.SongId)
|
|
{
|
|
return;
|
|
}
|
|
|
|
var startedSinging = state.Screen == SingScreen && state.SongId.HasValue && (_Last?.Screen != SingScreen || _Last.SongId != state.SongId);
|
|
_Last = state;
|
|
_Run(async () =>
|
|
{
|
|
if (_Events.ClientCount > 0)
|
|
{
|
|
_Events.Publish("state", await _Songs.CreateStateAsync(state));
|
|
}
|
|
|
|
if (startedSinging)
|
|
{
|
|
await _Queue.RemoveSungAsync(state.SongId.Value);
|
|
}
|
|
});
|
|
}
|
|
|
|
private void _Run(Func<Task> work)
|
|
{
|
|
Task.Run(async () =>
|
|
{
|
|
try
|
|
{
|
|
await work();
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
_OnError?.Invoke(e);
|
|
}
|
|
});
|
|
}
|
|
}
|
|
}
|