New PlexMediaSourcesController (/api/media-sources/plex) P1-P8 wrapping
existing MediatR commands: state GET, pin-flow, sign-out, per-server
libraries/path-replacements GET+PUT, and refresh — VMs projected to the
S0 shared DTOs, ApiResults mapping, 404 controller pre-checks, #215-style
409 lock guards, [EndpointGroupName("general")].
Lock-lifecycle hardening (the tricky part):
- TryCompletePlexPinFlowHandler now releases the Plex lock ONLY on its
non-handoff exits (timeout-throw, poll exception, enqueue exception, the
dead return-false) via try/catch — NOT an unconditional finally. On
success the lock is handed off to SynchronizePlexMediaSources (the sole
releaser after discovery); a finally would double-release and release
before discovery, re-opening the finding-5 poll race. Fixes the latent
leak where an abandoned pin flow wedged Plex locked until restart.
- StartPlexPinFlow controller compensates UnlockPlex on the Left branch AND
any thrown dispatch/enqueue; only the Right/200 path holds the lock.
- SignOutOfPlexHandler wraps its work in try/finally { UnlockPlex() } — a
terminal handler with no handoff, so unconditional release is correct.
- Post-save library sync enqueues SynchronizePlexLibraryByIdIfNeeded
(Unlock:false) then SynchronizePlexNetworks (Unlock:true) — one lock, one
release on the last message, compensating-unlock if the 2nd enqueue throws
(corrects the Blazor Unlock-ordering bug, finding 6).
Data-integrity hardening:
- UpdatePlexPathReplacementsHandler rejects (422, no mutation) any positive
Id not owned by the route source, blank RemotePath/LocalPath, and null
list/items (findings 2c/8).
- MediaSourceRepository Plex path-replacement UPDATE gains
AND PlexMediaSourceId = @id (Jellyfin/Emby untouched — slice S3).
- ReplaceLibraryPreferences controller validates the id set against the
source's libraries (rejects unowned + Id=0), returns the reloaded list
(ids change on disable).
Tests (NUnit/Shouldly/NSubstitute), 34 new, all green: pin-flow lock
released on thrown-cancellation/poll-throw/enqueue-throw AND held on
success (no double-release); sign-out finally-release under a throwing
dependency; cross-source/nonblank/null path-replacement 422s; library-prefs
id-not-owned 422; post-save enqueue exact messages + Unlock flags; full
controller route/404/409/422 coverage.
Refs #202
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
67 lines
3.1 KiB
C#
67 lines
3.1 KiB
C#
using System.Threading.Channels;
|
|
using ErsatzTV.Core;
|
|
using ErsatzTV.Core.Interfaces.Locking;
|
|
using ErsatzTV.Core.Interfaces.Plex;
|
|
|
|
namespace ErsatzTV.Application.Plex;
|
|
|
|
public class TryCompletePlexPinFlowHandler : IRequestHandler<TryCompletePlexPinFlow, Either<BaseError, bool>>
|
|
{
|
|
private readonly ChannelWriter<IPlexBackgroundServiceRequest> _channel;
|
|
private readonly IEntityLocker _entityLocker;
|
|
private readonly IPlexTvApiClient _plexTvApiClient;
|
|
|
|
public TryCompletePlexPinFlowHandler(
|
|
IPlexTvApiClient plexTvApiClient,
|
|
ChannelWriter<IPlexBackgroundServiceRequest> channel,
|
|
IEntityLocker entityLocker)
|
|
{
|
|
_plexTvApiClient = plexTvApiClient;
|
|
_channel = channel;
|
|
_entityLocker = entityLocker;
|
|
}
|
|
|
|
public async Task<Either<BaseError, bool>>
|
|
Handle(TryCompletePlexPinFlow request, CancellationToken cancellationToken)
|
|
{
|
|
// Lock-release discipline (#202 §C1.6 / §C6): the Plex lock this pin flow holds is released
|
|
// ONLY on non-handoff exits — the 2-minute timeout (Task.Delay throws
|
|
// OperationCanceledException), a poll exception, a failed enqueue, or the (effectively dead)
|
|
// return-false at loop entry. On SUCCESS the lock is HANDED OFF to SynchronizePlexMediaSources,
|
|
// whose handler is the sole releaser after server discovery (SynchronizePlexMediaSourcesHandler).
|
|
// This is deliberately NOT an unconditional finally: a blanket release here would double-release
|
|
// AND release before discovery, re-opening the finding-5 race (an empty server list reading as
|
|
// success). Contrast the terminal SignOutOfPlexHandler, which DOES use finally (it has no handoff).
|
|
using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(2));
|
|
using var linkedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cts.Token, cancellationToken);
|
|
CancellationToken token = linkedTokenSource.Token;
|
|
try
|
|
{
|
|
while (!token.IsCancellationRequested)
|
|
{
|
|
bool result = await _plexTvApiClient.TryCompletePinFlow(request.AuthPin);
|
|
if (result)
|
|
{
|
|
// hand the lock off to the sync handler — do NOT release on this success path
|
|
await _channel.WriteAsync(new SynchronizePlexMediaSources(), token);
|
|
return true;
|
|
}
|
|
|
|
await Task.Delay(TimeSpan.FromSeconds(1), token);
|
|
}
|
|
|
|
// effectively unreachable (Task.Delay throws on cancellation before the loop condition is
|
|
// re-evaluated) but if the flow ever ends here it abandoned without auth → release
|
|
_entityLocker.UnlockPlex();
|
|
return false;
|
|
}
|
|
catch (Exception)
|
|
{
|
|
// non-handoff exit: timeout-throw, poll exception, or failed enqueue — release the lock so an
|
|
// abandoned flow does not wedge Plex locked, then rethrow (PlexService logs it as before)
|
|
_entityLocker.UnlockPlex();
|
|
throw;
|
|
}
|
|
}
|
|
}
|