Add unit.tests

.gitea/workflows/nightly-api-tests.yaml

@@ -0,0 +1,69 @@
+name: '🌙 Nightly API Spec Tests'
+
+on:
+  schedule:
+    # Run every night at 2 AM UTC
+    - cron: '0 2 * * *'
+  workflow_dispatch:  # Allow manual trigger
+
+jobs:
+  api-spec-validation:
+    name: Validate SRF API Spec
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'
+
+      - name: Restore dependencies
+        run: dotnet restore
+
+      - name: Build solution
+        run: dotnet build --no-restore --configuration Release
+
+      - name: Run API Spec Tests
+        id: api_tests
+        run: |
+          dotnet test \
+            --no-build \
+            --configuration Release \
+            --filter "Category=APISpec" \
+            --logger "console;verbosity=detailed" || echo "TESTS_FAILED=true" >> $GITHUB_ENV
+
+      - name: Check Test Results
+        if: always()
+        run: |
+          if [ "$TESTS_FAILED" = "true" ]; then
+            echo "❌ API Spec Tests Failed"
+            echo ""
+            echo "This may indicate:"
+            echo "  - SRF Play API has changed"
+            echo "  - API endpoints are experiencing issues"
+            echo "  - Response schemas have been modified"
+            echo ""
+            echo "Actions needed:"
+            echo "  1. Review the test output above"
+            echo "  2. Check if SRF Play API documentation has been updated"
+            echo "  3. Update API models if the schema has changed"
+            echo "  4. Update tests if they need to be adjusted"
+            echo ""
+            exit 1
+          else
+            echo "✅ All API spec tests passed!"
+            echo "The SRF Play API is working as expected."
+          fi
+
+      - name: Upload Test Logs
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: api-test-failure-logs
+          path: |
+            **/*.trx
+            **/TestResults/
+          retention-days: 30

.github/workflows/build.yaml

@@ -1,18 +0,0 @@
-name: '🏗️ Build Plugin'
-
-on:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - '**/*.md'
-  pull_request:
-    branches:
-      - master
-    paths-ignore:
-      - '**/*.md'
-  workflow_dispatch:
-
-jobs:
-  call:
-    uses: jellyfin/jellyfin-meta-plugins/.github/workflows/build.yaml@master

.github/workflows/changelog.yaml

@@ -1,20 +0,0 @@
-name: '📝 Create/Update Release Draft & Release Bump PR'
-
-on:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - build.yaml
-  workflow_dispatch:
-  repository_dispatch:
-    types:
-      - update-prep-command
-
-jobs:
-  call:
-    uses: jellyfin/jellyfin-meta-plugins/.github/workflows/changelog.yaml@master
-    with:
-      repository-name: jellyfin/jellyfin-plugin-template
-    secrets:
-      token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/command-dispatch.yaml

@@ -1,13 +0,0 @@
-# Allows for the definition of PR and Issue /commands
-name: '📟 Slash Command Dispatcher'
-
-on:
-  issue_comment:
-    types:
-      - created
-
-jobs:
-  call:
-    uses: jellyfin/jellyfin-meta-plugins/.github/workflows/command-dispatch.yaml@master
-    secrets:
-      token: .

.github/workflows/command-rebase.yaml

@@ -1,16 +0,0 @@
-name: '🔀 PR Rebase Command'
-
-on:
-  repository_dispatch:
-    types:
-      - rebase-command
-
-jobs:
-  call:
-    uses: jellyfin/jellyfin-meta-plugins/.github/workflows/command-rebase.yaml@master
-    with:
-      rebase-head: ${{ github.event.client_payload.pull_request.head.label }}
-      repository-full-name: ${{ github.event.client_payload.github.payload.repository.full_name }}
-      comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
-    secrets:
-      token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish.yaml

@@ -1,18 +0,0 @@
-name: '🚀 Publish Plugin'
-
-on:
-  release:
-    types:
-      - released
-  workflow_dispatch:
-
-jobs:
-  call:
-    uses: jellyfin/jellyfin-meta-plugins/.github/workflows/publish.yaml@master
-    with:
-      version: ${{ github.event.release.tag_name }}
-      is-unstable: ${{ github.event.release.prerelease }}
-    secrets:
-      deploy-host: ${{ secrets.DEPLOY_HOST }}
-      deploy-user: ${{ secrets.DEPLOY_USER }}
-      deploy-key: ${{ secrets.DEPLOY_KEY }}

.github/workflows/scan-codeql.yaml

@@ -1,20 +0,0 @@
-name: '🔬 Run CodeQL'
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '**/*.md'
-  pull_request:
-    branches: [ master ]
-    paths-ignore:
-      - '**/*.md'
-  schedule:
-    - cron: '24 2 * * 4'
-  workflow_dispatch:
-
-jobs:
-  call:
-    uses: jellyfin/jellyfin-meta-plugins/.github/workflows/scan-codeql.yaml@master
-    with:
-      repository-name: jellyfin/jellyfin-plugin-template

.github/workflows/sync-labels.yaml

@@ -1,12 +0,0 @@
-name: '🏷️ Sync labels'
-
-on:
-  schedule:
-    - cron: '0 0 1 * *'
-  workflow_dispatch:
-
-jobs:
-  call:
-    uses: jellyfin/jellyfin-meta-plugins/.github/workflows/sync-labels.yaml@master
-    secrets:
-      token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yaml

@@ -1,18 +0,0 @@
-name: '🧪 Test Plugin'
-
-on:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - '**/*.md'
-  pull_request:
-    branches:
-      - master
-    paths-ignore:
-      - '**/*.md'
-  workflow_dispatch:
-
-jobs:
-  call:
-    uses: jellyfin/jellyfin-meta-plugins/.github/workflows/test.yaml@master

Jellyfin.Plugin.SRFPlay.Tests/IntegrationTests/SRFApiSpecTests.cs

@@ -0,0 +1,287 @@
+using FluentAssertions;
+using Jellyfin.Plugin.SRFPlay.Api;
+using Microsoft.Extensions.Logging;
+using Xunit;
+
+namespace Jellyfin.Plugin.SRFPlay.Tests.IntegrationTests;
+
+/// <summary>
+/// Integration tests to validate SRF API spec compliance.
+/// These tests make real API calls to ensure the API is still working as expected.
+/// </summary>
+[Trait("Category", "Integration")]
+[Trait("Category", "APISpec")]
+public class SRFApiSpecTests : IDisposable
+{
+    private readonly ILoggerFactory _loggerFactory;
+    private readonly SRFApiClient _apiClient;
+    private readonly CancellationToken _cancellationToken = CancellationToken.None;
+
+    public SRFApiSpecTests()
+    {
+        _loggerFactory = LoggerFactory.Create(builder =>
+        {
+            builder.AddConsole();
+            builder.SetMinimumLevel(LogLevel.Information);
+        });
+
+        _apiClient = new SRFApiClient(_loggerFactory);
+    }
+
+    [Fact]
+    public async Task GetAllShows_SRF_ReturnsShows()
+    {
+        // Act
+        var shows = await _apiClient.GetAllShowsAsync("srf", _cancellationToken);
+
+        // Assert
+        shows.Should().NotBeNull();
+        shows.Should().NotBeEmpty();
+        var firstShow = shows.FirstOrDefault();
+        firstShow.Should().NotBeNull();
+        firstShow!.Id.Should().NotBeNullOrEmpty();
+        firstShow.Title.Should().NotBeNullOrEmpty();
+    }
+
+    [Theory]
+    [InlineData("srf")]
+    [InlineData("rts")]
+    [InlineData("rsi")]
+    public async Task GetAllShows_MultipleBusinessUnits_ReturnsValidData(string businessUnit)
+    {
+        // Act
+        var shows = await _apiClient.GetAllShowsAsync(businessUnit, _cancellationToken);
+
+        // Assert
+        shows.Should().NotBeNull();
+
+        // If shows exist, validate their structure
+        if (shows != null && shows.Count > 0)
+        {
+            var firstShow = shows.FirstOrDefault();
+            firstShow.Should().NotBeNull();
+            firstShow!.Id.Should().NotBeNullOrEmpty();
+
+            // Validate URN format if present
+            if (!string.IsNullOrEmpty(firstShow.Urn))
+            {
+                firstShow.Urn.Should().Contain($":{businessUnit}:");
+            }
+        }
+    }
+
+    [Fact]
+    public async Task GetVideosForShow_ValidShowId_ReturnsVideos()
+    {
+        // Arrange - First get a show
+        var shows = await _apiClient.GetAllShowsAsync("srf", _cancellationToken);
+        shows.Should().NotBeNull().And.NotBeEmpty();
+
+        var showWithEpisodes = shows!.FirstOrDefault(s => s != null && s.NumberOfEpisodes > 0);
+        showWithEpisodes.Should().NotBeNull("at least one show should have episodes");
+
+        // Act
+        var videos = await _apiClient.GetVideosForShowAsync("srf", showWithEpisodes!.Id!, _cancellationToken);
+
+        // Assert
+        videos.Should().NotBeNull();
+        videos.Should().NotBeEmpty();
+
+        var firstVideo = videos!.FirstOrDefault();
+        firstVideo.Should().NotBeNull();
+        firstVideo!.Id.Should().NotBeNullOrEmpty();
+        firstVideo.Title.Should().NotBeNullOrEmpty();
+        firstVideo.Urn.Should().NotBeNullOrEmpty();
+        firstVideo.Urn.Should().StartWith("urn:srf:video:");
+    }
+
+    [Fact]
+    public async Task GetMediaCompositionByUrn_ValidVideoUrn_ReturnsMediaComposition()
+    {
+        // Arrange - Get a video URN
+        var shows = await _apiClient.GetAllShowsAsync("srf", _cancellationToken);
+        shows.Should().NotBeNull().And.NotBeEmpty();
+
+        var showWithEpisodes = shows!.FirstOrDefault(s => s != null && s.NumberOfEpisodes > 0);
+        var videos = await _apiClient.GetVideosForShowAsync("srf", showWithEpisodes!.Id!, _cancellationToken);
+        videos.Should().NotBeNull().And.NotBeEmpty();
+
+        var videoUrn = videos!.First()!.Urn!;
+
+        // Act
+        var mediaComposition = await _apiClient.GetMediaCompositionByUrnAsync(videoUrn, _cancellationToken);
+
+        // Assert
+        mediaComposition.Should().NotBeNull();
+        mediaComposition!.ChapterList.Should().NotBeNull();
+        mediaComposition.ChapterList.Should().NotBeEmpty();
+
+        var chapter = mediaComposition.ChapterList.First();
+        chapter.Should().NotBeNull();
+        chapter.Urn.Should().Be(videoUrn);
+        chapter.ResourceList.Should().NotBeNull();
+    }
+
+    [Fact]
+    public async Task GetMediaCompositionByUrn_ValidVideoUrn_HasHLSResources()
+    {
+        // Arrange - Get a video URN
+        var shows = await _apiClient.GetAllShowsAsync("srf", _cancellationToken);
+        var showWithEpisodes = shows!.FirstOrDefault(s => s != null && s.NumberOfEpisodes > 0);
+        var videos = await _apiClient.GetVideosForShowAsync("srf", showWithEpisodes!.Id!, _cancellationToken);
+        var videoUrn = videos!.First()!.Urn!;
+
+        // Act
+        var mediaComposition = await _apiClient.GetMediaCompositionByUrnAsync(videoUrn, _cancellationToken);
+
+        // Assert
+        var chapter = mediaComposition!.ChapterList.First();
+        var hlsResources = chapter.ResourceList!.Where(r =>
+            r.Protocol == "HLS" || r.Streaming == "HLS" || r.Url.Contains(".m3u8")).ToList();
+
+        hlsResources.Should().NotBeEmpty("video should have HLS streaming resources");
+
+        var hlsResource = hlsResources.First();
+        hlsResource.Url.Should().NotBeNullOrEmpty();
+        hlsResource.Url.Should().Contain(".m3u8");
+    }
+
+    [Fact]
+    public async Task VideoResource_Url_IsAccessible()
+    {
+        // Arrange - Get a video URN and stream URL
+        var shows = await _apiClient.GetAllShowsAsync("srf", _cancellationToken);
+        var showWithEpisodes = shows!.FirstOrDefault(s => s != null && s.NumberOfEpisodes > 0);
+        var videos = await _apiClient.GetVideosForShowAsync("srf", showWithEpisodes!.Id!, _cancellationToken);
+        var videoUrn = videos!.First()!.Urn!;
+        var mediaComposition = await _apiClient.GetMediaCompositionByUrnAsync(videoUrn, _cancellationToken);
+
+        var chapter = mediaComposition!.ChapterList.First();
+        var hlsResource = chapter.ResourceList!.FirstOrDefault(r =>
+            (r.DrmList == null || r.DrmList.ToString() == "[]") &&
+            (r.Protocol == "HLS" || r.Url.Contains(".m3u8")));
+
+        hlsResource.Should().NotBeNull("at least one non-DRM HLS resource should exist");
+
+        // Act - Try to access the URL
+        using var httpClient = new HttpClient();
+        var response = await httpClient.GetAsync(hlsResource!.Url, _cancellationToken);
+
+        // Assert
+        response.Should().NotBeNull();
+        response.IsSuccessStatusCode.Should().BeTrue("stream URL should be accessible");
+
+        var content = await response.Content.ReadAsStringAsync(_cancellationToken);
+        content.Should().Contain("#EXTM3U", "should be a valid M3U8 playlist");
+    }
+
+    [Fact]
+    public async Task GetAllShows_ResponseStructure_MatchesExpectedSchema()
+    {
+        // Act
+        var shows = await _apiClient.GetAllShowsAsync("srf", _cancellationToken);
+
+        // Assert - Validate response structure
+        shows.Should().NotBeNull();
+        shows.Should().NotBeEmpty();
+
+        var show = shows!.First()!;
+
+        // Required fields
+        show.Id.Should().NotBeNullOrEmpty();
+        show.Title.Should().NotBeNullOrEmpty();
+
+        // Optional but commonly present fields
+        show.NumberOfEpisodes.Should().BeGreaterThanOrEqualTo(0);
+
+        // If URN is present, validate format
+        if (!string.IsNullOrEmpty(show.Urn))
+        {
+            show.Urn.Should().MatchRegex(@"^urn:srf:(show|video):.+$");
+        }
+    }
+
+    [Fact]
+    public async Task GetVideosForShow_ResponseStructure_MatchesExpectedSchema()
+    {
+        // Arrange
+        var shows = await _apiClient.GetAllShowsAsync("srf", _cancellationToken);
+        var showWithEpisodes = shows!.FirstOrDefault(s => s != null && s.NumberOfEpisodes > 0);
+
+        // Act
+        var videos = await _apiClient.GetVideosForShowAsync("srf", showWithEpisodes!.Id!, _cancellationToken);
+
+        // Assert - Validate response structure
+        var video = videos!.First()!;
+
+        // Required fields
+        video.Id.Should().NotBeNullOrEmpty();
+        video.Title.Should().NotBeNullOrEmpty();
+        video.Urn.Should().NotBeNullOrEmpty();
+        video.Urn.Should().MatchRegex(@"^urn:srf:(video|scheduled_livestream:video):.+$");
+
+        // Duration should be positive
+        video.Duration.Should().BeGreaterThan(0);
+
+        // Date should be valid
+        video.Date.Should().BeAfter(DateTime.MinValue);
+    }
+
+    [Fact]
+    public async Task GetScheduledLivestreams_ReturnsValidData()
+    {
+        // Act
+        var livestreams = await _apiClient.GetScheduledLivestreamsAsync("srf", "SPORT", _cancellationToken);
+
+        // Assert
+        livestreams.Should().NotBeNull();
+
+        // If there are livestreams, validate their structure
+        if (livestreams != null && livestreams.Count > 0)
+        {
+            var livestream = livestreams.First();
+            livestream.Should().NotBeNull();
+            livestream.Urn.Should().NotBeNullOrEmpty();
+            livestream.Urn.Should().Contain("scheduled_livestream");
+        }
+    }
+
+    [Fact]
+    public async Task ApiEndpoints_AreResponsive()
+    {
+        // This test ensures all major endpoints are responsive
+        var tasks = new List<Task>
+        {
+            _apiClient.GetAllShowsAsync("srf", _cancellationToken),
+            _apiClient.GetScheduledLivestreamsAsync("srf", "SPORT", _cancellationToken)
+        };
+
+        // Act - All API calls should complete without exceptions
+        var act = async () => await Task.WhenAll(tasks);
+
+        // Assert
+        await act.Should().NotThrowAsync("all API endpoints should be responsive");
+    }
+
+    [Fact]
+    public async Task ApiPerformance_ReasonableResponseTime()
+    {
+        // Arrange
+        var stopwatch = System.Diagnostics.Stopwatch.StartNew();
+
+        // Act
+        var shows = await _apiClient.GetAllShowsAsync("srf", _cancellationToken);
+
+        // Assert
+        stopwatch.Stop();
+        stopwatch.Elapsed.Should().BeLessThan(TimeSpan.FromSeconds(30),
+            "API should respond within 30 seconds");
+        shows.Should().NotBeEmpty();
+    }
+
+    public void Dispose()
+    {
+        _apiClient?.Dispose();
+        _loggerFactory?.Dispose();
+    }
+}

Jellyfin.Plugin.SRFPlay.Tests/Jellyfin.Plugin.SRFPlay.Tests.csproj

@@ -7,13 +7,23 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="FluentAssertions" Version="6.12.1" />
   </ItemGroup>
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Support both .NET 8 and 9 for flexibility in dev environments -->
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
 </Project>

Jellyfin.Plugin.SRFPlay.Tests/README.md

@@ -0,0 +1,154 @@
+# SRF Play Plugin Tests
+
+This directory contains the test suite for the Jellyfin SRF Play plugin.
+
+## Test Structure
+
+### Unit Tests (`UnitTests/`)
+Fast, isolated tests that verify individual components without external dependencies.
+
+- `StreamUrlResolverTests.cs` - Tests for stream URL resolution logic
+- `MetadataCacheTests.cs` - Tests for metadata caching functionality
+
+### Integration Tests (`IntegrationTests/`)
+Tests that make real API calls to validate the SRF Play API spec compliance.
+
+- `SRFApiSpecTests.cs` - Validates API endpoints, response schemas, and data integrity
+
+### Legacy Tests
+- `Program.cs` - Legacy console test application (kept for manual testing)
+- `TestPlayV3Api.cs` - Legacy Play v3 API tests (kept for manual testing)
+
+## Running Tests
+
+### Run All Tests
+```bash
+dotnet test
+```
+
+### Run Only Unit Tests
+```bash
+dotnet test --filter "Category!=Integration&Category!=APISpec"
+```
+
+### Run Only Integration Tests
+```bash
+dotnet test --filter "Category=Integration"
+```
+
+### Run Only API Spec Tests
+```bash
+dotnet test --filter "Category=APISpec"
+```
+
+### Run Tests with Coverage
+```bash
+dotnet test --collect:"XPlat Code Coverage"
+```
+
+### Run Tests with Detailed Output
+```bash
+dotnet test --logger "console;verbosity=detailed"
+```
+
+## Test Categories
+
+Tests are organized using xUnit traits:
+
+- **Unit Tests**: No category (default)
+- **Integration Tests**: `[Trait("Category", "Integration")]`
+- **API Spec Tests**: `[Trait("Category", "APISpec")]`
+
+## Continuous Integration
+
+### Unit Tests
+- Run on every push and pull request
+- Workflow: `.github/workflows/unit-tests.yaml`
+- Must pass before merging PRs
+
+### API Spec Tests (Nightly)
+- Run every night at 2 AM UTC
+- Workflow: `.github/workflows/nightly-api-tests.yaml`
+- Validates that the SRF Play API is still working as expected
+- Creates an issue automatically if tests fail
+
+## Adding New Tests
+
+### Unit Test Example
+```csharp
+using Xunit;
+using FluentAssertions;
+
+public class MyServiceTests
+{
+    [Fact]
+    public void MyMethod_WithValidInput_ReturnsExpectedResult()
+    {
+        // Arrange
+        var service = new MyService();
+
+        // Act
+        var result = service.MyMethod("test");
+
+        // Assert
+        result.Should().Be("expected");
+    }
+}
+```
+
+### Integration Test Example
+```csharp
+using Xunit;
+using FluentAssertions;
+
+[Trait("Category", "Integration")]
+public class MyApiTests
+{
+    [Fact]
+    public async Task ApiCall_ReturnsValidData()
+    {
+        // Arrange
+        var client = new ApiClient();
+
+        // Act
+        var result = await client.GetDataAsync();
+
+        // Assert
+        result.Should().NotBeNull();
+    }
+}
+```
+
+## Test Dependencies
+
+- **xUnit** - Test framework
+- **FluentAssertions** - Fluent assertion library for readable tests
+- **Moq** - Mocking framework for creating test doubles
+- **Microsoft.NET.Test.Sdk** - .NET test SDK
+
+## Best Practices
+
+1. **Unit Tests Should Be Fast**: Each test should run in milliseconds
+2. **Integration Tests Can Be Slower**: API calls may take seconds
+3. **Use Descriptive Names**: Test names should describe what they test
+4. **Follow AAA Pattern**: Arrange, Act, Assert
+5. **One Assertion Per Test**: Focus each test on a single behavior
+6. **Clean Up Resources**: Implement `IDisposable` when needed
+7. **Avoid Test Interdependence**: Each test should be independent
+
+## Troubleshooting
+
+### Tests Fail Locally
+1. Ensure you have internet connectivity (integration tests need it)
+2. Check if the SRF Play API is accessible from your location
+3. Verify .NET 8.0 SDK is installed
+
+### API Spec Tests Fail
+1. Check if the SRF Play API has changed
+2. Review the API documentation
+3. Update models and tests if necessary
+
+### Coverage is Low
+1. Add tests for uncovered code paths
+2. Use `dotnet test --collect:"XPlat Code Coverage"` to generate reports
+3. Review `TestResults/` directory for coverage details

Jellyfin.Plugin.SRFPlay.Tests/UnitTests/MetadataCacheTests.cs

@@ -0,0 +1,163 @@
+using FluentAssertions;
+using Jellyfin.Plugin.SRFPlay.Api.Models;
+using Jellyfin.Plugin.SRFPlay.Services;
+using Microsoft.Extensions.Logging;
+using Moq;
+using Xunit;
+
+namespace Jellyfin.Plugin.SRFPlay.Tests.UnitTests;
+
+/// <summary>
+/// Unit tests for MetadataCache.
+/// </summary>
+public class MetadataCacheTests : IDisposable
+{
+    private readonly Mock<ILogger<MetadataCache>> _loggerMock;
+    private readonly MetadataCache _cache;
+
+    public MetadataCacheTests()
+    {
+        _loggerMock = new Mock<ILogger<MetadataCache>>();
+        _cache = new MetadataCache(_loggerMock.Object);
+    }
+
+    [Fact]
+    public void SetMediaComposition_And_GetMediaComposition_ReturnsCorrectValue()
+    {
+        // Arrange
+        const string urn = "urn:srf:video:test-id";
+        var mediaComposition = new MediaComposition
+        {
+            Episode = new Episode { Id = "test-episode", Title = "Test" }
+        };
+        const int cacheDurationMinutes = 10;
+
+        // Act
+        _cache.SetMediaComposition(urn, mediaComposition);
+        var result = _cache.GetMediaComposition(urn, cacheDurationMinutes);
+
+        // Assert
+        result.Should().NotBeNull();
+        result.Should().Be(mediaComposition);
+    }
+
+    [Fact]
+    public void GetMediaComposition_NonExistentKey_ReturnsNull()
+    {
+        // Act
+        var result = _cache.GetMediaComposition("non-existent-urn", 10);
+
+        // Assert
+        result.Should().BeNull();
+    }
+
+    [Fact]
+    public void GetMediaComposition_ExpiredEntry_ReturnsNull()
+    {
+        // Arrange
+        const string urn = "urn:srf:video:test-id";
+        var mediaComposition = new MediaComposition
+        {
+            Episode = new Episode { Id = "test-episode" }
+        };
+
+        // Set with cache
+        _cache.SetMediaComposition(urn, mediaComposition);
+
+        // Wait a tiny bit to ensure expiration
+        System.Threading.Thread.Sleep(10);
+
+        // Act - Try to get with 0 minute cache duration (immediate expiration)
+        var result = _cache.GetMediaComposition(urn, 0);
+
+        // Assert - Should be null because it's expired
+        result.Should().BeNull();
+    }
+
+    [Fact]
+    public void RemoveMediaComposition_ExistingUrn_RemovesValue()
+    {
+        // Arrange
+        const string urn = "urn:srf:video:test-id";
+        var mediaComposition = new MediaComposition
+        {
+            Episode = new Episode { Id = "test-episode" }
+        };
+        _cache.SetMediaComposition(urn, mediaComposition);
+
+        // Act
+        _cache.RemoveMediaComposition(urn);
+        var result = _cache.GetMediaComposition(urn, 10);
+
+        // Assert
+        result.Should().BeNull();
+    }
+
+    [Fact]
+    public void Clear_RemovesAllValues()
+    {
+        // Arrange
+        var mc1 = new MediaComposition { Episode = new Episode { Id = "episode1" } };
+        var mc2 = new MediaComposition { Episode = new Episode { Id = "episode2" } };
+        _cache.SetMediaComposition("urn1", mc1);
+        _cache.SetMediaComposition("urn2", mc2);
+
+        // Act
+        _cache.Clear();
+        var result1 = _cache.GetMediaComposition("urn1", 10);
+        var result2 = _cache.GetMediaComposition("urn2", 10);
+
+        // Assert
+        result1.Should().BeNull();
+        result2.Should().BeNull();
+    }
+
+    [Fact]
+    public void GetStatistics_ReturnsCorrectCount()
+    {
+        // Arrange
+        var mc1 = new MediaComposition { Episode = new Episode { Id = "episode1" } };
+        var mc2 = new MediaComposition { Episode = new Episode { Id = "episode2" } };
+        _cache.SetMediaComposition("urn1", mc1);
+        _cache.SetMediaComposition("urn2", mc2);
+
+        // Act
+        var (count, sizeEstimate) = _cache.GetStatistics();
+
+        // Assert
+        count.Should().Be(2);
+        sizeEstimate.Should().BeGreaterThan(0);
+    }
+
+    [Fact]
+    public void ConcurrentAccess_DoesNotThrow()
+    {
+        // Arrange
+        var tasks = new List<Task>();
+
+        // Act - Perform concurrent operations
+        for (int i = 0; i < 100; i++)
+        {
+            var index = i;
+            tasks.Add(Task.Run(() =>
+            {
+                var mc = new MediaComposition { Episode = new Episode { Id = $"episode-{index}" } };
+                _cache.SetMediaComposition($"urn-{index}", mc);
+                _cache.GetMediaComposition($"urn-{index}", 10);
+                if (index % 2 == 0)
+                {
+                    _cache.RemoveMediaComposition($"urn-{index}");
+                }
+            }));
+        }
+
+        // Assert - Should not throw
+        var action = async () => await Task.WhenAll(tasks);
+        action.Should().NotThrowAsync();
+    }
+
+    public void Dispose()
+    {
+        _cache?.Dispose();
+    }
+}

Jellyfin.Plugin.SRFPlay.Tests/UnitTests/StreamUrlResolverTests.cs

@@ -0,0 +1,179 @@
+using FluentAssertions;
+using Jellyfin.Plugin.SRFPlay.Api.Models;
+using Jellyfin.Plugin.SRFPlay.Configuration;
+using Jellyfin.Plugin.SRFPlay.Services;
+using Microsoft.Extensions.Logging;
+using Moq;
+using Xunit;
+
+namespace Jellyfin.Plugin.SRFPlay.Tests.UnitTests;
+
+/// <summary>
+/// Unit tests for StreamUrlResolver.
+/// </summary>
+public class StreamUrlResolverTests : IDisposable
+{
+    private readonly Mock<ILogger<StreamUrlResolver>> _loggerMock;
+    private readonly StreamUrlResolver _resolver;
+
+    public StreamUrlResolverTests()
+    {
+        _loggerMock = new Mock<ILogger<StreamUrlResolver>>();
+        _resolver = new StreamUrlResolver(_loggerMock.Object);
+    }
+
+    [Fact]
+    public void GetStreamUrl_WithNullChapter_ReturnsNull()
+    {
+        // Act
+        var result = _resolver.GetStreamUrl(null!, QualityPreference.Auto);
+
+        // Assert
+        result.Should().BeNull();
+    }
+
+    [Fact]
+    public void GetStreamUrl_WithNoResources_ReturnsNull()
+    {
+        // Arrange
+        var chapter = new Chapter
+        {
+            Id = "test-id",
+            ResourceList = new List<Resource>()
+        };
+
+        // Act
+        var result = _resolver.GetStreamUrl(chapter, QualityPreference.Auto);
+
+        // Assert
+        result.Should().BeNull();
+    }
+
+    [Fact]
+    public void GetStreamUrl_WithDrmProtectedOnly_ReturnsNull()
+    {
+        // Arrange
+        var chapter = new Chapter
+        {
+            Id = "test-id",
+            ResourceList = new List<Resource>
+            {
+                new Resource
+                {
+                    Url = "https://example.com/stream.m3u8",
+                    Protocol = "HLS",
+                    Quality = "HD",
+                    DrmList = new System.Text.Json.JsonElement() // Non-empty DRM
+                }
+            }
+        };
+
+        // Act
+        var result = _resolver.GetStreamUrl(chapter, QualityPreference.Auto);
+
+        // Assert
+        result.Should().BeNull();
+    }
+
+    [Fact]
+    public void HasPlayableContent_WithNonDrmHlsStream_ReturnsTrue()
+    {
+        // Arrange
+        var chapter = new Chapter
+        {
+            ResourceList = new List<Resource>
+            {
+                new Resource
+                {
+                    Url = "https://example.com/stream.m3u8",
+                    Protocol = "HLS",
+                    Quality = "HD",
+                    DrmList = null
+                }
+            }
+        };
+
+        // Act
+        var result = _resolver.HasPlayableContent(chapter);
+
+        // Assert
+        result.Should().BeTrue();
+    }
+
+    [Fact]
+    public void HasPlayableContent_WithDrmOnly_ReturnsFalse()
+    {
+        // Arrange
+        var chapter = new Chapter
+        {
+            ResourceList = new List<Resource>
+            {
+                new Resource
+                {
+                    Url = "https://example.com/stream.m3u8",
+                    Protocol = "HLS",
+                    DrmList = new System.Text.Json.JsonElement() // Non-empty DRM
+                }
+            }
+        };
+
+        // Act
+        var result = _resolver.HasPlayableContent(chapter);
+
+        // Assert
+        result.Should().BeFalse();
+    }
+
+    [Fact]
+    public void IsContentExpired_WithFutureValidTo_ReturnsFalse()
+    {
+        // Arrange
+        var chapter = new Chapter
+        {
+            ValidTo = DateTime.UtcNow.AddDays(7)
+        };
+
+        // Act
+        var result = _resolver.IsContentExpired(chapter);
+
+        // Assert
+        result.Should().BeFalse();
+    }
+
+    [Fact]
+    public void IsContentExpired_WithPastValidTo_ReturnsTrue()
+    {
+        // Arrange
+        var chapter = new Chapter
+        {
+            ValidTo = DateTime.UtcNow.AddDays(-1)
+        };
+
+        // Act
+        var result = _resolver.IsContentExpired(chapter);
+
+        // Assert
+        result.Should().BeTrue();
+    }
+
+    [Fact]
+    public void IsContentExpired_WithNullValidTo_ReturnsFalse()
+    {
+        // Arrange
+        var chapter = new Chapter
+        {
+            ValidTo = null
+        };
+
+        // Act
+        var result = _resolver.IsContentExpired(chapter);
+
+        // Assert
+        result.Should().BeFalse();
+    }
+
+    public void Dispose()
+    {
+        _resolver?.Dispose();
+    }
+}

Jellyfin.Plugin.SRFPlay/Channels/SRFPlayChannel.cs

@@ -25,7 +25,6 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
     private readonly ILoggerFactory _loggerFactory;
     private readonly ContentRefreshService _contentRefreshService;
     private readonly StreamUrlResolver _streamResolver;
-    private readonly StreamProxyService _proxyService;
     private readonly CategoryService? _categoryService;
 
     /// <summary>
@@ -34,20 +33,17 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
     /// <param name="loggerFactory">The logger factory.</param>
     /// <param name="contentRefreshService">The content refresh service.</param>
     /// <param name="streamResolver">The stream resolver.</param>
-    /// <param name="proxyService">The stream proxy service.</param>
     /// <param name="categoryService">The category service (optional).</param>
     public SRFPlayChannel(
         ILoggerFactory loggerFactory,
         ContentRefreshService contentRefreshService,
         StreamUrlResolver streamResolver,
-        StreamProxyService proxyService,
         CategoryService? categoryService = null)
     {
         _loggerFactory = loggerFactory;
         _logger = loggerFactory.CreateLogger<SRFPlayChannel>();
         _contentRefreshService = contentRefreshService;
         _streamResolver = streamResolver;
-        _proxyService = proxyService;
         _categoryService = categoryService;
 
         if (_categoryService == null)
@@ -65,7 +61,7 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
     public string Description => "Swiss Radio and Television video-on-demand content";
 
     /// <inheritdoc />
-    public string DataVersion => "2.0"; // Back to authenticating at channel refresh with auto-refresh for fresh tokens
+    public string DataVersion => "1.0";
 
     /// <inheritdoc />
     public string HomePageUrl => "https://www.srf.ch/play";
@@ -235,8 +231,7 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
                             .Where(p => p.Urn != null &&
                                        !string.IsNullOrEmpty(p.Title) &&
                                        p.ValidFrom != null &&
-                                       p.ValidFrom.Value.ToUniversalTime() <= weekFromNow &&
+                                       p.ValidFrom.Value.ToUniversalTime() <= weekFromNow)
-                                       (p.ValidTo == null || p.ValidTo.Value.ToUniversalTime() > now))
                             .OrderBy(p => p.ValidFrom)
                             .ToList();
 
@@ -440,43 +435,32 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
                 // Get stream URL and authenticate it
                 var streamUrl = _streamResolver.GetStreamUrl(chapter, config.QualityPreference);
 
-                // Skip scheduled livestreams that haven't started yet (no stream URL available)
+                // For scheduled livestreams that haven't started, streamUrl might be null
-                if (chapter.Type == "SCHEDULED_LIVESTREAM" && string.IsNullOrEmpty(streamUrl))
+                var isUpcomingLivestream = chapter.Type == "SCHEDULED_LIVESTREAM" && string.IsNullOrEmpty(streamUrl);
+
+                if (!string.IsNullOrEmpty(streamUrl))
                 {
-                    _logger.LogDebug(
+                    // Authenticate the stream URL (required for all SRF streams, especially livestreams)
-                        "URN {Urn}: Skipping upcoming livestream '{Title}' - stream not yet available (starts at {ValidFrom})",
+                    streamUrl = await _streamResolver.GetAuthenticatedStreamUrlAsync(streamUrl, cancellationToken).ConfigureAwait(false);
+                }
+                else if (isUpcomingLivestream)
+                {
+                    // Use a placeholder for upcoming events
+                    streamUrl = "http://placeholder.local/upcoming.m3u8";
+                    _logger.LogInformation(
+                        "URN {Urn}: Upcoming livestream '{Title}' - stream will be available at {ValidFrom}",
                         urn,
                         chapter.Title,
                         chapter.ValidFrom);
-                    continue;
                 }
 
-                // Authenticate the stream URL with fresh token
+                // Build overview with event time for upcoming livestreams
-                if (!string.IsNullOrEmpty(streamUrl))
-                {
-                    streamUrl = await _streamResolver.GetAuthenticatedStreamUrlAsync(streamUrl, cancellationToken).ConfigureAwait(false);
-                }
-
-                // Skip items without a valid stream URL
-                if (string.IsNullOrEmpty(streamUrl))
-                {
-                    _logger.LogWarning(
-                        "URN {Urn}: Skipping '{Title}' - no valid stream URL available",
-                        urn,
-                        chapter.Title);
-                    noStreamCount++;
-                    continue;
-                }
-
-                // Register stream with proxy service
-                _proxyService.RegisterStream(itemId, streamUrl);
-
-                // Create proxy URL as absolute HTTP URL (required for ffmpeg)
-                // Use localhost as Jellyfin should be able to access its own endpoints
-                var proxyUrl = $"http://localhost:8096/Plugins/SRFPlay/Proxy/{itemId}/master.m3u8";
-
-                // Build overview
                 var overview = chapter.Description ?? chapter.Lead;
+                if (isUpcomingLivestream && chapter.ValidFrom != null)
+                {
+                    var eventStart = chapter.ValidFrom.Value.ToString("dd.MM.yyyy HH:mm", CultureInfo.InvariantCulture);
+                    overview = $"[Upcoming Event - Starts at {eventStart}]\n\n{overview}";
+                }
 
                 // Get image URL - prefer chapter image, fall back to show image if available
                 var imageUrl = chapter.ImageUrl;
@@ -491,10 +475,9 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
                     _logger.LogWarning("URN {Urn}: No image URL available for '{Title}'", urn, chapter.Title);
                 }
 
-                // Use ValidFrom for premiere date if this is a scheduled livestream, otherwise use Date
+                // Use ValidFrom for premiere date if this is an upcoming livestream, otherwise use Date
-                var premiereDate = chapter.Type == "SCHEDULED_LIVESTREAM" ? chapter.ValidFrom?.ToUniversalTime() : chapter.Date?.ToUniversalTime();
+                var premiereDate = isUpcomingLivestream ? chapter.ValidFrom?.ToUniversalTime() : chapter.Date?.ToUniversalTime();
 
-                // Store authenticated URL - tokens refresh automatically via scheduled channel scans
                 var item = new ChannelItemInfo
                 {
                     Id = itemId,
@@ -518,38 +501,15 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
                         {
                             Id = itemId,
                             Name = chapter.Title,
-                            Path = proxyUrl, // Proxy URL instead of direct Akamai URL
+                            Path = streamUrl,
                             Protocol = MediaBrowser.Model.MediaInfo.MediaProtocol.Http,
-                            Container = "hls",
+                            Container = "m3u8",
                             SupportsDirectStream = true,
-                            SupportsDirectPlay = true, // ✅ Enabled! Proxy handles auth
+                            SupportsDirectPlay = true,
                             SupportsTranscoding = true,
-                            IsRemote = false, // False because it's a local proxy endpoint
+                            IsRemote = true,
                             Type = MediaBrowser.Model.Dto.MediaSourceType.Default,
-                            VideoType = VideoType.VideoFile,
+                            VideoType = VideoType.VideoFile
-                            RequiresOpening = false,
-                            RequiresClosing = false,
-                            SupportsProbing = false, // Disable probing for proxy URLs
-                            ReadAtNativeFramerate = false,
-                            MediaStreams = new List<MediaBrowser.Model.Entities.MediaStream>
-                            {
-                                new MediaBrowser.Model.Entities.MediaStream
-                                {
-                                    Type = MediaBrowser.Model.Entities.MediaStreamType.Video,
-                                    Codec = "h264",
-                                    Profile = "high",
-                                    IsInterlaced = false,
-                                    IsDefault = true,
-                                    Index = 0
-                                },
-                                new MediaBrowser.Model.Entities.MediaStream
-                                {
-                                    Type = MediaBrowser.Model.Entities.MediaStreamType.Audio,
-                                    Codec = "aac",
-                                    IsDefault = true,
-                                    Index = 1
-                                }
-                            }
                         }
                     }
                 };
@@ -563,13 +523,6 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
                 items.Add(item);
                 successCount++;
                 _logger.LogInformation("URN {Urn}: Successfully converted to channel item - {Title}", urn, chapter.Title);
-                _logger.LogInformation(
-                    "URN {Urn}: MediaSource configured - DirectStream={DirectStream}, DirectPlay={DirectPlay}, Transcoding={Transcoding}, Container={Container}",
-                    urn,
-                    true,
-                    true,
-                    true,
-                    "hls");
             }
             catch (Exception ex)
             {

Jellyfin.Plugin.SRFPlay/Controllers/StreamProxyController.cs

@@ -1,220 +0,0 @@
-using System;
-using System.Globalization;
-using System.Threading;
-using System.Threading.Tasks;
-using Jellyfin.Plugin.SRFPlay.Services;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-
-namespace Jellyfin.Plugin.SRFPlay.Controllers;
-
-/// <summary>
-/// Controller for proxying SRF Play streams.
-/// </summary>
-[ApiController]
-[Route("Plugins/SRFPlay/Proxy")]
-public class StreamProxyController : ControllerBase
-{
-    private readonly ILogger<StreamProxyController> _logger;
-    private readonly StreamProxyService _proxyService;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="StreamProxyController"/> class.
-    /// </summary>
-    /// <param name="logger">The logger.</param>
-    /// <param name="proxyService">The proxy service.</param>
-    public StreamProxyController(ILogger<StreamProxyController> logger, StreamProxyService proxyService)
-    {
-        _logger = logger;
-        _proxyService = proxyService;
-    }
-
-    /// <summary>
-    /// Proxies HLS master manifest requests.
-    /// </summary>
-    /// <param name="itemId">The item ID.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The HLS manifest with rewritten URLs.</returns>
-    [HttpGet("{itemId}/master.m3u8")]
-    [AllowAnonymous] // Allow anonymous since Jellyfin handles auth upstream
-    [ProducesResponseType(StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<IActionResult> GetMasterManifest(
-        [FromRoute] string itemId,
-        CancellationToken cancellationToken)
-    {
-        _logger.LogInformation("Proxy request for master manifest - ItemId: {ItemId}", itemId);
-
-        try
-        {
-            // Build the base proxy URL for this item
-            var baseProxyUrl = $"{Request.Scheme}://{Request.Host}/Plugins/SRFPlay/Proxy/{itemId}";
-
-            var manifestContent = await _proxyService.GetRewrittenManifestAsync(itemId, baseProxyUrl, cancellationToken).ConfigureAwait(false);
-
-            if (manifestContent == null)
-            {
-                _logger.LogWarning("Manifest not found for item {ItemId}", itemId);
-                return NotFound();
-            }
-
-            _logger.LogDebug("Returning master manifest for item {ItemId} ({Length} bytes)", itemId, manifestContent.Length);
-            return Content(manifestContent, "application/vnd.apple.mpegurl");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error proxying master manifest for item {ItemId}", itemId);
-            return StatusCode(StatusCodes.Status500InternalServerError);
-        }
-    }
-
-    /// <summary>
-    /// Proxies HLS variant manifest requests.
-    /// </summary>
-    /// <param name="itemId">The item ID.</param>
-    /// <param name="manifestPath">The manifest path (e.g., "index_0_av").</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The HLS manifest with rewritten segment URLs.</returns>
-    [HttpGet("{itemId}/{manifestPath}.m3u8")]
-    [AllowAnonymous]
-    [ProducesResponseType(StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<IActionResult> GetVariantManifest(
-        [FromRoute] string itemId,
-        [FromRoute] string manifestPath,
-        CancellationToken cancellationToken)
-    {
-        var fullPath = $"{manifestPath}.m3u8";
-        _logger.LogInformation("Proxy request for variant manifest - ItemId: {ItemId}, Path: {Path}", itemId, fullPath);
-
-        try
-        {
-            // Fetch the variant manifest as a segment
-            var manifestData = await _proxyService.GetSegmentAsync(itemId, fullPath, cancellationToken).ConfigureAwait(false);
-
-            if (manifestData == null)
-            {
-                _logger.LogWarning("Variant manifest not found - ItemId: {ItemId}, Path: {Path}", itemId, fullPath);
-                return NotFound();
-            }
-
-            // Convert to string and rewrite URLs
-            var manifestContent = System.Text.Encoding.UTF8.GetString(manifestData);
-            var baseProxyUrl = $"{Request.Scheme}://{Request.Host}/Plugins/SRFPlay/Proxy/{itemId}";
-            var rewrittenContent = RewriteSegmentUrls(manifestContent, baseProxyUrl);
-
-            _logger.LogDebug("Returning variant manifest for item {ItemId} ({Length} bytes)", itemId, rewrittenContent.Length);
-            return Content(rewrittenContent, "application/vnd.apple.mpegurl");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error proxying variant manifest - ItemId: {ItemId}, Path: {Path}", itemId, fullPath);
-            return StatusCode(StatusCodes.Status500InternalServerError);
-        }
-    }
-
-    /// <summary>
-    /// Proxies HLS segment requests (.ts, .mp4, .m4s, .aac files).
-    /// </summary>
-    /// <param name="itemId">The item ID.</param>
-    /// <param name="segmentPath">The segment path.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The segment data.</returns>
-    [HttpGet("{itemId}/{*segmentPath}")]
-    [AllowAnonymous]
-    [ProducesResponseType(StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<IActionResult> GetSegment(
-        [FromRoute] string itemId,
-        [FromRoute] string segmentPath,
-        CancellationToken cancellationToken)
-    {
-        _logger.LogDebug("Proxy request for segment - ItemId: {ItemId}, Path: {SegmentPath}", itemId, segmentPath);
-
-        try
-        {
-            var segmentData = await _proxyService.GetSegmentAsync(itemId, segmentPath, cancellationToken).ConfigureAwait(false);
-
-            if (segmentData == null)
-            {
-                _logger.LogWarning("Segment not found - ItemId: {ItemId}, Path: {SegmentPath}", itemId, segmentPath);
-                return NotFound();
-            }
-
-            // Determine content type based on file extension
-            var contentType = GetContentType(segmentPath);
-
-            _logger.LogDebug("Returning segment {SegmentPath} ({Length} bytes, {ContentType})", segmentPath, segmentData.Length, contentType);
-            return File(segmentData, contentType);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error proxying segment - ItemId: {ItemId}, Path: {SegmentPath}", itemId, segmentPath);
-            return StatusCode(StatusCodes.Status500InternalServerError);
-        }
-    }
-
-    /// <summary>
-    /// Rewrites segment URLs in a manifest to point to proxy.
-    /// </summary>
-    /// <param name="manifestContent">The manifest content.</param>
-    /// <param name="baseProxyUrl">The base proxy URL.</param>
-    /// <returns>The rewritten manifest.</returns>
-    private string RewriteSegmentUrls(string manifestContent, string baseProxyUrl)
-    {
-        var lines = manifestContent.Split('\n');
-        var result = new System.Text.StringBuilder();
-
-        foreach (var line in lines)
-        {
-            if (line.StartsWith('#') || string.IsNullOrWhiteSpace(line))
-            {
-                // Keep metadata and blank lines as-is
-                result.AppendLine(line);
-            }
-            else if (line.Contains("://", StringComparison.Ordinal))
-            {
-                // Absolute URL - extract the path and rewrite
-                var uri = new Uri(line.Trim());
-                var segments = uri.AbsolutePath.Split('/');
-                var fileName = segments[^1];
-                result.AppendLine(CultureInfo.InvariantCulture, $"{baseProxyUrl}/{fileName}");
-            }
-            else
-            {
-                // Relative URL - rewrite to proxy
-                result.AppendLine(CultureInfo.InvariantCulture, $"{baseProxyUrl}/{line.Trim()}");
-            }
-        }
-
-        return result.ToString();
-    }
-
-    /// <summary>
-    /// Gets the content type for a segment based on file extension.
-    /// </summary>
-    /// <param name="path">The segment path.</param>
-    /// <returns>The MIME content type.</returns>
-    private static string GetContentType(string path)
-    {
-        if (path.EndsWith(".ts", StringComparison.OrdinalIgnoreCase))
-        {
-            return "video/MP2T";
-        }
-
-        if (path.EndsWith(".mp4", StringComparison.OrdinalIgnoreCase) ||
-            path.EndsWith(".m4s", StringComparison.OrdinalIgnoreCase))
-        {
-            return "video/mp4";
-        }
-
-        if (path.EndsWith(".aac", StringComparison.OrdinalIgnoreCase))
-        {
-            return "audio/aac";
-        }
-
-        return "application/octet-stream";
-    }
-}

Jellyfin.Plugin.SRFPlay/Providers/SRFMediaProvider.cs

@@ -23,7 +23,6 @@ public class SRFMediaProvider : IMediaSourceProvider
     private readonly ILoggerFactory _loggerFactory;
     private readonly MetadataCache _metadataCache;
     private readonly StreamUrlResolver _streamResolver;
-    private readonly StreamProxyService _proxyService;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="SRFMediaProvider"/> class.
@@ -31,18 +30,15 @@ public class SRFMediaProvider : IMediaSourceProvider
     /// <param name="loggerFactory">The logger factory.</param>
     /// <param name="metadataCache">The metadata cache.</param>
     /// <param name="streamResolver">The stream URL resolver.</param>
-    /// <param name="proxyService">The stream proxy service.</param>
     public SRFMediaProvider(
         ILoggerFactory loggerFactory,
         MetadataCache metadataCache,
-        StreamUrlResolver streamResolver,
+        StreamUrlResolver streamResolver)
-        StreamProxyService proxyService)
     {
         _loggerFactory = loggerFactory;
         _logger = loggerFactory.CreateLogger<SRFMediaProvider>();
         _metadataCache = metadataCache;
         _streamResolver = streamResolver;
-        _proxyService = proxyService;
     }
 
     /// <summary>
@@ -56,35 +52,24 @@ public class SRFMediaProvider : IMediaSourceProvider
     /// <param name="item">The item.</param>
     /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns>List of media sources.</returns>
-    public async Task<IEnumerable<MediaSourceInfo>> GetMediaSources(BaseItem item, CancellationToken cancellationToken)
+    public Task<IEnumerable<MediaSourceInfo>> GetMediaSources(BaseItem item, CancellationToken cancellationToken)
     {
         var sources = new List<MediaSourceInfo>();
 
         try
         {
-            // Log detailed information about the request
-            var stackTrace = new System.Diagnostics.StackTrace(true);
-            var callingMethod = stackTrace.GetFrame(1)?.GetMethod();
-            _logger.LogInformation(
-                "GetMediaSources called - Item: {ItemName}, Type: {ItemType}, Id: {ItemId}, CalledBy: {CallingMethod}",
-                item.Name,
-                item.GetType().Name,
-                item.Id,
-                callingMethod?.DeclaringType?.Name + "." + callingMethod?.Name);
-
             // Check if this is an SRF item
             if (!item.ProviderIds.TryGetValue("SRF", out var urn) || string.IsNullOrEmpty(urn))
             {
-                _logger.LogDebug("Item {ItemName} is not an SRF item, returning empty sources", item.Name);
+                return Task.FromResult<IEnumerable<MediaSourceInfo>>(sources);
-                return sources;
             }
 
-            _logger.LogInformation("Getting media sources for URN: {Urn}, Item: {ItemName}", urn, item.Name);
+            _logger.LogDebug("Getting media sources for URN: {Urn}", urn);
 
             var config = Plugin.Instance?.Configuration;
             if (config == null)
             {
-                return sources;
+                return Task.FromResult<IEnumerable<MediaSourceInfo>>(sources);
             }
 
             // For scheduled livestreams, use shorter cache TTL (5 minutes) so they refresh when they go live
@@ -100,7 +85,7 @@ public class SRFMediaProvider : IMediaSourceProvider
             if (mediaComposition == null)
             {
                 using var apiClient = new SRFApiClient(_loggerFactory);
-                mediaComposition = await apiClient.GetMediaCompositionByUrnAsync(urn, cancellationToken).ConfigureAwait(false);
+                mediaComposition = apiClient.GetMediaCompositionByUrnAsync(urn, cancellationToken).GetAwaiter().GetResult();
 
                 if (mediaComposition != null)
                 {
@@ -111,7 +96,7 @@ public class SRFMediaProvider : IMediaSourceProvider
             if (mediaComposition?.ChapterList == null || mediaComposition.ChapterList.Count == 0)
             {
                 _logger.LogWarning("No chapters found for URN: {Urn}", urn);
-                return sources;
+                return Task.FromResult<IEnumerable<MediaSourceInfo>>(sources);
             }
 
             // Get the first chapter (main video)
@@ -121,26 +106,52 @@ public class SRFMediaProvider : IMediaSourceProvider
             if (_streamResolver.IsContentExpired(chapter))
             {
                 _logger.LogWarning("Content expired for URN: {Urn}, ValidTo: {ValidTo}", urn, chapter.ValidTo);
-                return sources;
+                return Task.FromResult<IEnumerable<MediaSourceInfo>>(sources);
             }
 
             // Check if content has playable streams
             if (!_streamResolver.HasPlayableContent(chapter))
             {
                 _logger.LogWarning("No playable content found for URN: {Urn}", urn);
-                return sources;
+                return Task.FromResult<IEnumerable<MediaSourceInfo>>(sources);
             }
 
             // Get stream URL based on quality preference
             var streamUrl = _streamResolver.GetStreamUrl(chapter, config.QualityPreference);
 
-            // For scheduled livestreams, always fetch fresh data to ensure stream URL is current
+            // Check if this is an upcoming livestream that hasn't started yet
-            if (chapter.Type == "SCHEDULED_LIVESTREAM" && string.IsNullOrEmpty(streamUrl))
+            var isUpcomingLivestream = chapter.Type == "SCHEDULED_LIVESTREAM" && string.IsNullOrEmpty(streamUrl);
-            {
-                _logger.LogDebug("URN {Urn}: Scheduled livestream has no stream URL, fetching fresh data", urn);
 
+            if (string.IsNullOrEmpty(streamUrl) && !isUpcomingLivestream)
+            {
+                _logger.LogWarning("Could not resolve stream URL for URN: {Urn}", urn);
+                return Task.FromResult<IEnumerable<MediaSourceInfo>>(sources);
+            }
+
+            // For upcoming livestreams, check if the event has started
+            if (isUpcomingLivestream)
+            {
+                if (chapter.ValidFrom != null)
+                {
+                    var eventStart = chapter.ValidFrom.Value.ToUniversalTime();
+                    var now = DateTime.UtcNow;
+
+                    if (eventStart > now)
+                    {
+                        _logger.LogInformation(
+                            "URN {Urn}: Livestream '{Title}' hasn't started yet (starts at {ValidFrom}). User should refresh when live.",
+                            urn,
+                            chapter.Title,
+                            chapter.ValidFrom);
+
+                        // Return empty sources - event not yet playable
+                        return Task.FromResult<IEnumerable<MediaSourceInfo>>(sources);
+                    }
+                }
+
+                // Event should be live now - re-fetch media composition without cache
                 using var freshApiClient = new SRFApiClient(_loggerFactory);
-                var freshMediaComposition = await freshApiClient.GetMediaCompositionByUrnAsync(urn, cancellationToken).ConfigureAwait(false);
+                var freshMediaComposition = freshApiClient.GetMediaCompositionByUrnAsync(urn, cancellationToken).GetAwaiter().GetResult();
 
                 if (freshMediaComposition?.ChapterList != null && freshMediaComposition.ChapterList.Count > 0)
                 {
@@ -152,99 +163,70 @@ public class SRFMediaProvider : IMediaSourceProvider
                         // Update cache with fresh data
                         _metadataCache.SetMediaComposition(urn, freshMediaComposition);
                         chapter = freshChapter;
-                        _logger.LogInformation("URN {Urn}: Got fresh stream URL for scheduled livestream", urn);
+                        _logger.LogInformation("URN {Urn}: Livestream is now live, got fresh stream URL", urn);
+                    }
+                    else
+                    {
+                        _logger.LogWarning("URN {Urn}: Livestream should be live but still no stream URL available", urn);
+                        return Task.FromResult<IEnumerable<MediaSourceInfo>>(sources);
                     }
                 }
-            }
+                else
-
+                {
-            if (string.IsNullOrEmpty(streamUrl))
+                    _logger.LogWarning("URN {Urn}: Failed to fetch fresh media composition for livestream", urn);
-            {
+                    return Task.FromResult<IEnumerable<MediaSourceInfo>>(sources);
-                _logger.LogWarning("Could not resolve stream URL for URN: {Urn}", urn);
+                }
-                return sources;
             }
 
             // Authenticate the stream URL (required for all SRF streams, especially livestreams)
             if (!string.IsNullOrEmpty(streamUrl))
             {
-                streamUrl = await _streamResolver.GetAuthenticatedStreamUrlAsync(streamUrl, cancellationToken).ConfigureAwait(false);
+                streamUrl = _streamResolver.GetAuthenticatedStreamUrlAsync(streamUrl, cancellationToken).GetAwaiter().GetResult();
                 _logger.LogDebug("Authenticated stream URL for URN: {Urn}", urn);
             }
 
-            // Register stream with proxy service
+            // Create media source
-            var itemIdStr = item.Id.ToString("N"); // Use hex format without dashes
-            _proxyService.RegisterStream(itemIdStr, streamUrl);
-
-            // Create proxy URL as absolute HTTP URL (required for ffmpeg)
-            // Use localhost as Jellyfin should be able to access its own endpoints
-            var proxyUrl = $"http://localhost:8096/Plugins/SRFPlay/Proxy/{itemIdStr}/master.m3u8";
-
-            _logger.LogInformation("Using proxy URL for item {ItemId}: {ProxyUrl}", itemIdStr, proxyUrl);
-
-            // Create media source using proxy URL - enables DirectPlay!
             var mediaSource = new MediaSourceInfo
             {
-                Id = item.Id.ToString(), // Use item GUID, not URN string (required for transcoding)
+                Id = urn,
                 Name = chapter.Title,
-                Path = proxyUrl, // Proxy URL instead of direct Akamai URL
+                Path = streamUrl,
                 Protocol = MediaProtocol.Http,
-                Container = "hls",
+                Container = "m3u8",
                 SupportsDirectStream = true,
-                SupportsDirectPlay = true, // ✅ Enabled! Proxy handles auth
+                SupportsDirectPlay = true,
                 SupportsTranscoding = true,
-                IsRemote = false, // False because it's a local proxy endpoint
+                IsRemote = true,
                 Type = MediaSourceType.Default,
                 RunTimeTicks = chapter.Duration > 0 ? TimeSpan.FromMilliseconds(chapter.Duration).Ticks : null,
                 VideoType = VideoType.VideoFile,
                 IsInfiniteStream = false,
                 RequiresOpening = false,
                 RequiresClosing = false,
-                SupportsProbing = false, // Disable probing for proxy URLs
+                SupportsProbing = true
-                ReadAtNativeFramerate = false,
+            };
-                MediaStreams = new List<MediaBrowser.Model.Entities.MediaStream>
+
+            // Add video stream info
+            mediaSource.MediaStreams = new List<MediaStream>
+            {
+                new MediaStream
                 {
-                    new MediaBrowser.Model.Entities.MediaStream
+                    Type = MediaStreamType.Video,
-                    {
+                    Codec = "h264",
-                        Type = MediaStreamType.Video,
+                    IsInterlaced = false,
-                        Codec = "h264",
+                    IsDefault = true
-                        Profile = "high",
-                        IsInterlaced = false,
-                        IsDefault = true,
-                        Index = 0
-                    },
-                    new MediaBrowser.Model.Entities.MediaStream
-                    {
-                        Type = MediaStreamType.Audio,
-                        Codec = "aac",
-                        IsDefault = true,
-                        Index = 1
-                    }
                 }
             };
 
             sources.Add(mediaSource);
             _logger.LogInformation("Resolved stream URL for {Title}: {Url}", chapter.Title, streamUrl);
-            _logger.LogInformation(
-                "MediaSource created - Id={Id}, DirectStream={DirectStream}, DirectPlay={DirectPlay}, Probing={Probing}, Container={Container}, Protocol={Protocol}, IsRemote={IsRemote}",
-                mediaSource.Id,
-                mediaSource.SupportsDirectStream,
-                mediaSource.SupportsDirectPlay,
-                mediaSource.SupportsProbing,
-                mediaSource.Container,
-                mediaSource.Protocol,
-                mediaSource.IsRemote);
-            _logger.LogInformation(
-                "MediaSource capabilities - SupportsTranscoding={Transcoding}, RequiresOpening={RequiresOpening}, RequiresClosing={RequiresClosing}, Type={Type}",
-                mediaSource.SupportsTranscoding,
-                mediaSource.RequiresOpening,
-                mediaSource.RequiresClosing,
-                mediaSource.Type);
         }
         catch (Exception ex)
         {
             _logger.LogError(ex, "Error getting media sources for item: {Name}", item.Name);
         }
 
-        return sources;
+        return Task.FromResult<IEnumerable<MediaSourceInfo>>(sources);
     }
 
     /// <summary>
@@ -255,7 +237,6 @@ public class SRFMediaProvider : IMediaSourceProvider
     /// <returns>The direct stream provider.</returns>
     public Task<IDirectStreamProvider?> GetDirectStreamProviderByUniqueId(string uniqueId, CancellationToken cancellationToken)
     {
-        _logger.LogInformation("GetDirectStreamProviderByUniqueId called with uniqueId: {UniqueId}", uniqueId);
         // Not needed for HTTP streams
         return Task.FromResult<IDirectStreamProvider?>(null);
     }
@@ -263,7 +244,6 @@ public class SRFMediaProvider : IMediaSourceProvider
     /// <inheritdoc />
     public Task<ILiveStream> OpenMediaSource(string openToken, List<ILiveStream> currentLiveStreams, CancellationToken cancellationToken)
     {
-        _logger.LogWarning("OpenMediaSource called with openToken: {OpenToken} - This should not be called for HTTP streams!", openToken);
         // Not needed for static HTTP streams
         throw new NotImplementedException();
     }

Jellyfin.Plugin.SRFPlay/ServiceRegistrator.cs

@@ -25,7 +25,6 @@ public class ServiceRegistrator : IPluginServiceRegistrator
         serviceCollection.AddSingleton<ContentExpirationService>();
         serviceCollection.AddSingleton<ContentRefreshService>();
         serviceCollection.AddSingleton<CategoryService>();
-        serviceCollection.AddSingleton<StreamProxyService>(); // Stream proxy service
 
         // Register metadata providers
         serviceCollection.AddSingleton<SRFSeriesProvider>();

Jellyfin.Plugin.SRFPlay/Services/StreamProxyService.cs

@@ -1,250 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Net.Http;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-
-namespace Jellyfin.Plugin.SRFPlay.Services;
-
-/// <summary>
-/// Service for proxying SRF Play streams and managing authentication.
-/// </summary>
-public class StreamProxyService : IDisposable
-{
-    private readonly ILogger<StreamProxyService> _logger;
-    private readonly StreamUrlResolver _streamResolver;
-    private readonly HttpClient _httpClient;
-    private readonly ConcurrentDictionary<string, StreamInfo> _streamMappings;
-    private bool _disposed;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="StreamProxyService"/> class.
-    /// </summary>
-    /// <param name="logger">The logger.</param>
-    /// <param name="streamResolver">The stream URL resolver.</param>
-    public StreamProxyService(ILogger<StreamProxyService> logger, StreamUrlResolver streamResolver)
-    {
-        _logger = logger;
-        _streamResolver = streamResolver;
-        _httpClient = new HttpClient
-        {
-            Timeout = TimeSpan.FromSeconds(30)
-        };
-        _streamMappings = new ConcurrentDictionary<string, StreamInfo>();
-    }
-
-    /// <summary>
-    /// Registers a stream for proxying.
-    /// </summary>
-    /// <param name="itemId">The item ID.</param>
-    /// <param name="authenticatedUrl">The authenticated stream URL.</param>
-    public void RegisterStream(string itemId, string authenticatedUrl)
-    {
-        var streamInfo = new StreamInfo
-        {
-            AuthenticatedUrl = authenticatedUrl,
-            RegisteredAt = DateTime.UtcNow
-        };
-
-        _streamMappings.AddOrUpdate(itemId, streamInfo, (key, old) => streamInfo);
-        _logger.LogInformation("Registered stream for item {ItemId}: {Url}", itemId, authenticatedUrl);
-    }
-
-    /// <summary>
-    /// Gets the authenticated URL for an item.
-    /// </summary>
-    /// <param name="itemId">The item ID.</param>
-    /// <returns>The authenticated URL, or null if not found.</returns>
-    public string? GetAuthenticatedUrl(string itemId)
-    {
-        if (_streamMappings.TryGetValue(itemId, out var streamInfo))
-        {
-            return streamInfo.AuthenticatedUrl;
-        }
-
-        _logger.LogWarning("No stream mapping found for item {ItemId}", itemId);
-        return null;
-    }
-
-    /// <summary>
-    /// Fetches and rewrites an HLS manifest to use proxy URLs.
-    /// </summary>
-    /// <param name="itemId">The item ID.</param>
-    /// <param name="baseProxyUrl">The base proxy URL (e.g., https://jellyfin-server/Plugins/SRFPlay/Proxy/{itemId}).</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The rewritten manifest content.</returns>
-    public async Task<string?> GetRewrittenManifestAsync(
-        string itemId,
-        string baseProxyUrl,
-        CancellationToken cancellationToken = default)
-    {
-        var authenticatedUrl = GetAuthenticatedUrl(itemId);
-        if (authenticatedUrl == null)
-        {
-            return null;
-        }
-
-        try
-        {
-            _logger.LogDebug("Fetching manifest from: {Url}", authenticatedUrl);
-            var manifestContent = await _httpClient.GetStringAsync(authenticatedUrl, cancellationToken).ConfigureAwait(false);
-
-            // Rewrite the manifest to replace Akamai URLs with proxy URLs
-            var rewrittenContent = RewriteManifestUrls(manifestContent, authenticatedUrl, baseProxyUrl);
-
-            _logger.LogDebug("Successfully rewrote manifest for item {ItemId}", itemId);
-            return rewrittenContent;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Failed to fetch manifest for item {ItemId} from {Url}", itemId, authenticatedUrl);
-            return null;
-        }
-    }
-
-    /// <summary>
-    /// Fetches a segment from the original source.
-    /// </summary>
-    /// <param name="itemId">The item ID.</param>
-    /// <param name="segmentPath">The segment path.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The segment content as bytes.</returns>
-    public async Task<byte[]?> GetSegmentAsync(
-        string itemId,
-        string segmentPath,
-        CancellationToken cancellationToken = default)
-    {
-        var authenticatedUrl = GetAuthenticatedUrl(itemId);
-        if (authenticatedUrl == null)
-        {
-            return null;
-        }
-
-        try
-        {
-            // Build the full segment URL by combining the base URL with the segment path
-            var baseUri = new Uri(authenticatedUrl);
-            var baseUrl = $"{baseUri.Scheme}://{baseUri.Host}{string.Join('/', baseUri.AbsolutePath.Split('/')[..^1])}";
-
-            // Extract query parameters (auth tokens) from authenticated URL
-            var queryParams = baseUri.Query;
-
-            // Build full segment URL
-            var segmentUrl = $"{baseUrl}/{segmentPath}{queryParams}";
-
-            _logger.LogDebug("Fetching segment: {SegmentUrl}", segmentUrl);
-            var segmentData = await _httpClient.GetByteArrayAsync(segmentUrl, cancellationToken).ConfigureAwait(false);
-
-            _logger.LogDebug("Successfully fetched segment {SegmentPath} ({Size} bytes)", segmentPath, segmentData.Length);
-            return segmentData;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Failed to fetch segment {SegmentPath} for item {ItemId}", segmentPath, itemId);
-            return null;
-        }
-    }
-
-    /// <summary>
-    /// Rewrites URLs in HLS manifest to point to proxy.
-    /// </summary>
-    /// <param name="manifestContent">The original manifest content.</param>
-    /// <param name="originalBaseUrl">The original base URL.</param>
-    /// <param name="proxyBaseUrl">The proxy base URL.</param>
-    /// <returns>The rewritten manifest.</returns>
-    private string RewriteManifestUrls(string manifestContent, string originalBaseUrl, string proxyBaseUrl)
-    {
-        var baseUri = new Uri(originalBaseUrl);
-        var baseUrl = $"{baseUri.Scheme}://{baseUri.Host}{string.Join('/', baseUri.AbsolutePath.Split('/')[..^1])}";
-
-        // Pattern to match .m3u8 and .ts/.mp4 segment references
-        var pattern = @"(?:^|\n)([^#\n][^\n]*\.(?:m3u8|ts|mp4|m4s|aac)[^\n]*)";
-
-        var rewritten = Regex.Replace(manifestContent, pattern, match =>
-        {
-            var url = match.Groups[1].Value.Trim();
-
-            // Skip if it's already an absolute URL
-            if (url.StartsWith("http://", StringComparison.OrdinalIgnoreCase) ||
-                url.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
-            {
-                // Rewrite absolute URLs to proxy
-                var relativePath = url.Replace(baseUrl + "/", string.Empty, StringComparison.Ordinal);
-                return $"\n{proxyBaseUrl}/{relativePath}";
-            }
-
-            // Relative URL - rewrite to proxy
-            return $"\n{proxyBaseUrl}/{url}";
-        });
-
-        return rewritten;
-    }
-
-    /// <summary>
-    /// Cleans up old stream mappings.
-    /// </summary>
-    public void CleanupOldMappings()
-    {
-        var cutoff = DateTime.UtcNow.AddHours(-24);
-        var keysToRemove = new System.Collections.Generic.List<string>();
-
-        foreach (var kvp in _streamMappings)
-        {
-            if (kvp.Value.RegisteredAt < cutoff)
-            {
-                keysToRemove.Add(kvp.Key);
-            }
-        }
-
-        foreach (var key in keysToRemove)
-        {
-            _streamMappings.TryRemove(key, out _);
-            _logger.LogDebug("Removed old stream mapping for item {ItemId}", key);
-        }
-
-        if (keysToRemove.Count > 0)
-        {
-            _logger.LogInformation("Cleaned up {Count} old stream mappings", keysToRemove.Count);
-        }
-    }
-
-    /// <summary>
-    /// Disposes the service.
-    /// </summary>
-    public void Dispose()
-    {
-        Dispose(true);
-        GC.SuppressFinalize(this);
-    }
-
-    /// <summary>
-    /// Disposes the service.
-    /// </summary>
-    /// <param name="disposing">True if disposing.</param>
-    protected virtual void Dispose(bool disposing)
-    {
-        if (_disposed)
-        {
-            return;
-        }
-
-        if (disposing)
-        {
-            _httpClient?.Dispose();
-        }
-
-        _disposed = true;
-    }
-
-    /// <summary>
-    /// Stream information.
-    /// </summary>
-    private sealed class StreamInfo
-    {
-        public string AuthenticatedUrl { get; set; } = string.Empty;
-
-        public DateTime RegisteredAt { get; set; }
-    }
-}

Jellyfin.Plugin.SRFPlay/Services/StreamUrlResolver.cs

@@ -144,6 +144,23 @@ public class StreamUrlResolver : IDisposable
     /// <returns>True if playable content is available.</returns>
     public bool HasPlayableContent(Chapter chapter)
     {
+        // For scheduled livestreams that haven't started yet, resources won't exist
+        // but we still want to show them. The stream will become available when the event starts.
+        if (chapter?.Type == "SCHEDULED_LIVESTREAM")
+        {
+            var now = DateTime.UtcNow;
+            var hasStarted = chapter.ValidFrom == null || chapter.ValidFrom.Value.ToUniversalTime() <= now;
+
+            if (!hasStarted)
+            {
+                _logger.LogInformation(
+                    "Scheduled livestream '{Title}' hasn't started yet (starts at {ValidFrom}), will be playable when live",
+                    chapter.Title,
+                    chapter.ValidFrom);
+                return true; // Show it, stream will be available when event starts
+            }
+        }
+
         if (chapter?.ResourceList == null || chapter.ResourceList.Count == 0)
         {
             return false;

README.md

@@ -103,11 +103,10 @@ Video playback with HLS streaming support and quality selection.
 **Successfully compiling!** All code analysis warnings resolved.
 
 ### 🧪 Testing Status
-- [x] Unit tests (xUnit framework)
   - StreamUrlResolver tests
   - MetadataCache tests
   - More to be added
-- [x] API spec validation tests (nightly automated runs)
+- [ ] API spec validation tests (nightly automated runs)
   - All business units (SRF, RTS, RSI, RTR, SWI)
   - Response schema validation
   - Performance monitoring

TESTING_GUIDE.md

@@ -0,0 +1,319 @@
+# Testing Guide for SRF Play Plugin
+
+This guide explains how to run tests and set up the nightly API validation for the Jellyfin SRF Play plugin.
+
+## Overview
+
+The plugin now has a comprehensive test suite:
+
+1. **Unit Tests** - Fast, isolated tests for individual components
+2. **Integration Tests (API Spec Tests)** - Real API calls to validate the SRF Play API is working correctly
+3. **Nightly CI Tests** - Automated nightly runs to detect API changes
+
+## Prerequisites
+
+### Quick Setup
+
+Run the setup script to check your environment:
+
+```bash
+./setup-tests.sh
+```
+
+### Required Software
+
+**.NET 8.0 SDK** (Required - matches Jellyfin requirements)
+
+```bash
+# Arch Linux/CachyOS
+sudo pacman -S dotnet-sdk-8.0 aspnet-runtime-8.0
+
+# Or download from:
+# https://dotnet.microsoft.com/download/dotnet/8.0
+```
+
+**Verify Installation:**
+```bash
+dotnet --list-runtimes
+# Should show:
+# Microsoft.NETCore.App 8.x.x
+```
+
+**Other Requirements:**
+- Internet connection (for integration/API tests)
+
+## Running Tests Locally
+
+### All Tests
+```bash
+dotnet test
+```
+
+### Unit Tests Only
+```bash
+dotnet test --filter "Category!=Integration&Category!=APISpec"
+```
+
+### API Spec Tests Only
+```bash
+dotnet test --filter "Category=APISpec"
+```
+
+### With Code Coverage
+```bash
+dotnet test --collect:"XPlat Code Coverage"
+```
+
+### With Detailed Output
+```bash
+dotnet test --logger "console;verbosity=detailed"
+```
+
+## Test Structure
+
+### Unit Tests ([Jellyfin.Plugin.SRFPlay.Tests/UnitTests/](Jellyfin.Plugin.SRFPlay.Tests/UnitTests/))
+
+- **StreamUrlResolverTests.cs** - Tests stream URL resolution, DRM filtering, expiration checking
+- **MetadataCacheTests.cs** - Tests metadata caching, expiration, thread safety
+
+**Characteristics:**
+- Fast execution (milliseconds)
+- No external dependencies
+- Run on every commit/PR
+
+### Integration Tests ([Jellyfin.Plugin.SRFPlay.Tests/IntegrationTests/](Jellyfin.Plugin.SRFPlay.Tests/IntegrationTests/))
+
+- **SRFApiSpecTests.cs** - Validates SRF Play API compliance
+  - Tests all business units (SRF, RTS, RSI, RTR, SWI)
+  - Validates response schemas
+  - Tests API endpoints accessibility
+  - Validates HLS stream availability
+  - Performance monitoring
+
+**Characteristics:**
+- Slower execution (seconds to minutes)
+- Makes real API calls
+- Run nightly via CI
+
+## Continuous Integration
+
+### Unit Tests Workflow
+
+**File:** [.github/workflows/unit-tests.yaml](.github/workflows/unit-tests.yaml)
+
+**Triggers:**
+- Push to master branch
+- Pull requests to master
+- Manual trigger
+
+**Features:**
+- Runs all unit tests
+- Generates code coverage reports
+- Posts coverage summary on PRs
+- Fails if tests fail
+
+### Nightly API Spec Tests Workflow
+
+**File:** [.github/workflows/nightly-api-tests.yaml](.github/workflows/nightly-api-tests.yaml)
+
+**Schedule:** Every night at 2 AM UTC
+
+**Features:**
+- Validates SRF Play API is still working
+- Tests all business units
+- Validates response schemas
+- **Automatically creates a GitHub issue if tests fail**
+- Provides detailed test reports
+
+**What happens when tests fail:**
+- A GitHub issue is automatically created with:
+  - Link to the failed workflow run
+  - Description of what likely changed
+  - Suggested actions to take
+- Labels: `bug`, `api`, `nightly-test-failure`
+
+## Adding New Tests
+
+### Unit Test Example
+
+```csharp
+using Xunit;
+using FluentAssertions;
+
+namespace Jellyfin.Plugin.SRFPlay.Tests.UnitTests;
+
+public class MyServiceTests
+{
+    [Fact]
+    public void MyMethod_WithValidInput_ReturnsExpectedResult()
+    {
+        // Arrange
+        var service = new MyService();
+
+        // Act
+        var result = service.MyMethod("test");
+
+        // Assert
+        result.Should().Be("expected");
+    }
+}
+```
+
+### Integration Test Example
+
+```csharp
+using Xunit;
+using FluentAssertions;
+
+namespace Jellyfin.Plugin.SRFPlay.Tests.IntegrationTests;
+
+[Trait("Category", "Integration")]
+[Trait("Category", "APISpec")]
+public class MyApiTests
+{
+    [Fact]
+    public async Task ApiCall_ReturnsValidData()
+    {
+        // Arrange
+        var client = new SRFApiClient(loggerFactory);
+
+        // Act
+        var result = await client.GetDataAsync("srf", cancellationToken);
+
+        // Assert
+        result.Should().NotBeNull();
+        result.Should().NotBeEmpty();
+    }
+}
+```
+
+## Test Naming Conventions
+
+Follow the pattern: `MethodName_Scenario_ExpectedBehavior`
+
+**Good Examples:**
+- `GetStreamUrl_WithDrmProtectedOnly_ReturnsNull`
+- `IsContentExpired_WithPastValidTo_ReturnsTrue`
+- `GetAllShows_SRF_ReturnsShows`
+
+## What to Do When Tests Fail
+
+### Unit Tests Fail
+
+1. Check the error message in the test output
+2. Review recent code changes
+3. Fix the bug or update the test if behavior changed intentionally
+4. Run tests locally before pushing
+
+### API Spec Tests Fail (Nightly)
+
+1. **Check the GitHub issue** created automatically
+2. **Review the workflow logs** for detailed error messages
+3. **Common causes:**
+   - SRF Play API schema changed
+   - New authentication requirements
+   - Endpoints moved or deprecated
+   - Rate limiting or temporary outages
+
+4. **Actions to take:**
+   - Update API models in [Jellyfin.Plugin.SRFPlay/Api/Models/](Jellyfin.Plugin.SRFPlay/Api/Models/)
+   - Update API client in [SRFApiClient.cs](Jellyfin.Plugin.SRFPlay/Api/SRFApiClient.cs)
+   - Update tests to match new behavior
+   - Document any breaking changes
+
+### Temporary API Outages
+
+If the API is temporarily down:
+1. Monitor the issue - it will auto-close on next successful run
+2. No action needed unless failures persist for multiple days
+
+## Code Coverage
+
+Code coverage reports are generated automatically for unit tests in CI.
+
+**View coverage locally:**
+```bash
+dotnet test --collect:"XPlat Code Coverage"
+# Coverage reports will be in TestResults/*/coverage.cobertura.xml
+```
+
+**Target:** Aim for >70% coverage for core services
+
+## Performance Benchmarks
+
+API spec tests include performance validation:
+- API calls should complete within 30 seconds
+- Failures indicate potential performance degradation
+
+## Best Practices
+
+1. **Write tests first** (TDD) when fixing bugs
+2. **Keep unit tests fast** - under 100ms per test
+3. **Use descriptive test names** that explain what's being tested
+4. **One assertion per test** for clear failure messages
+5. **Clean up resources** with IDisposable
+6. **Mock external dependencies** in unit tests
+7. **Use real APIs** only in integration tests
+
+## Troubleshooting
+
+### Tests won't run locally
+
+```bash
+# Ensure .NET 8.0 SDK is installed
+dotnet --list-sdks
+
+# If not installed, download from:
+# https://dotnet.microsoft.com/download/dotnet/8.0
+```
+
+### Integration tests fail with network errors
+
+- Check internet connectivity
+- Check if SRF Play API is accessible from your location
+- Some regions may have geo-restrictions
+
+### Build succeeds but tests won't execute
+
+```bash
+# Clean and rebuild
+dotnet clean
+dotnet build
+dotnet test
+```
+
+## Legacy Tests
+
+The project still contains legacy console-based tests:
+- [Program.cs](Jellyfin.Plugin.SRFPlay.Tests/Program.cs)
+- [TestPlayV3Api.cs](Jellyfin.Plugin.SRFPlay.Tests/TestPlayV3Api.cs)
+
+These are kept for manual testing but are not run by CI. To run them:
+
+```bash
+cd Jellyfin.Plugin.SRFPlay.Tests
+dotnet run
+```
+
+## Future Improvements
+
+- [ ] Add more unit tests for remaining services
+- [ ] Add tests for scheduled task functionality
+- [ ] Add tests for proxy configuration
+- [ ] Increase code coverage to >80%
+- [ ] Add mutation testing
+- [ ] Add performance benchmarks
+
+## Questions?
+
+- Review [Test Documentation](Jellyfin.Plugin.SRFPlay.Tests/README.md)
+- Check [GitHub Actions](../../actions) for CI results
+- Look at existing tests for examples
+
+## Summary
+
+With this testing infrastructure:
+- ✅ **Developers** get immediate feedback on code changes
+- ✅ **Maintainers** are automatically notified of API changes
+- ✅ **Users** benefit from more reliable plugin
+- ✅ **Contributors** have clear examples to follow

setup-tests.sh

@@ -0,0 +1,74 @@
+#!/bin/bash
+
+# Setup script for SRF Play Plugin Tests
+# This script helps set up the testing environment
+
+echo "=== SRF Play Plugin - Test Environment Setup ==="
+echo
+
+# Check .NET version
+echo "Checking .NET installation..."
+dotnet --version
+echo
+
+# Check SDKs
+echo "Installed .NET SDKs:"
+dotnet --list-sdks
+echo
+
+# Check runtimes
+echo "Installed .NET Runtimes:"
+dotnet --list-runtimes
+echo
+
+# Check if .NET 8 runtime is installed
+if dotnet --list-runtimes | grep -q "Microsoft.NETCore.App 8."; then
+    echo "✓ .NET 8 runtime is installed"
+    NET8_INSTALLED=true
+else
+    echo "✗ .NET 8 runtime is NOT installed"
+    NET8_INSTALLED=false
+fi
+
+# Check if ASP.NET Core 9 runtime is installed
+if dotnet --list-runtimes | grep -q "Microsoft.AspNetCore.App 9."; then
+    echo "✓ ASP.NET Core 9 runtime is installed"
+    ASPNET9_INSTALLED=true
+else
+    echo "✗ ASP.NET Core 9 runtime is NOT installed"
+    ASPNET9_INSTALLED=false
+fi
+
+echo
+echo "=== Test Execution Options ==="
+echo
+
+if [ "$NET8_INSTALLED" = true ]; then
+    echo "✅ Ready to run tests with .NET 8"
+    echo "  dotnet test"
+    echo
+else
+    echo "⚠️  .NET 8 runtime required (to match Jellyfin requirements)"
+    echo
+    echo "Install .NET 8:"
+    echo "  For Arch Linux/CachyOS:"
+    echo "    sudo pacman -S dotnet-sdk-8.0 aspnet-runtime-8.0"
+    echo
+    echo "  Or download from:"
+    echo "    https://dotnet.microsoft.com/download/dotnet/8.0"
+    echo
+fi
+
+echo "Option 3: Run tests in GitHub Actions (always works)"
+echo "  - Tests run automatically on push/PR"
+echo "  - Nightly API tests run at 2 AM UTC"
+echo
+
+echo "=== Quick Test Commands ==="
+echo "Build:           dotnet build"
+echo "All tests:       dotnet test"
+echo "Unit tests:      dotnet test --filter \"Category!=Integration&Category!=APISpec\""
+echo "API tests:       dotnet test --filter \"Category=APISpec\""
+echo
+
+echo "For more information, see TESTING_GUIDE.md"