mirror of
https://github.com/SoPat712/allstarr.git
synced 2026-02-09 23:55:10 -05:00
feat: add HTTP Range header support for iOS streaming clients (#48)
This commit is contained in:
@@ -16,6 +16,7 @@ builder.Services.AddControllers();
|
||||
builder.Services.AddHttpClient();
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
builder.Services.AddSwaggerGen();
|
||||
builder.Services.AddHttpContextAccessor();
|
||||
|
||||
// Exception handling
|
||||
builder.Services.AddExceptionHandler<GlobalExceptionHandler>();
|
||||
@@ -41,7 +42,7 @@ builder.Services.AddSingleton<ILocalLibraryService, LocalLibraryService>();
|
||||
builder.Services.AddSingleton<SubsonicRequestParser>();
|
||||
builder.Services.AddSingleton<SubsonicResponseBuilder>();
|
||||
builder.Services.AddSingleton<SubsonicModelMapper>();
|
||||
builder.Services.AddSingleton<SubsonicProxyService>();
|
||||
builder.Services.AddScoped<SubsonicProxyService>();
|
||||
|
||||
// Register music service based on configuration
|
||||
// IMPORTANT: Primary service MUST be registered LAST because ASP.NET Core DI
|
||||
|
||||
@@ -10,13 +10,16 @@ public class SubsonicProxyService
|
||||
{
|
||||
private readonly HttpClient _httpClient;
|
||||
private readonly SubsonicSettings _subsonicSettings;
|
||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||
|
||||
public SubsonicProxyService(
|
||||
IHttpClientFactory httpClientFactory,
|
||||
Microsoft.Extensions.Options.IOptions<SubsonicSettings> subsonicSettings)
|
||||
Microsoft.Extensions.Options.IOptions<SubsonicSettings> subsonicSettings,
|
||||
IHttpContextAccessor httpContextAccessor)
|
||||
{
|
||||
_httpClient = httpClientFactory.CreateClient();
|
||||
_subsonicSettings = subsonicSettings.Value;
|
||||
_httpContextAccessor = httpContextAccessor;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -57,6 +60,15 @@ public class SubsonicProxyService
|
||||
}
|
||||
}
|
||||
|
||||
private static readonly string[] StreamingRequiredHeaders =
|
||||
{
|
||||
"Accept-Ranges",
|
||||
"Content-Range",
|
||||
"Content-Length",
|
||||
"ETag",
|
||||
"Last-Modified"
|
||||
};
|
||||
|
||||
/// <summary>
|
||||
/// Relays a stream request to the Subsonic server with range processing support.
|
||||
/// </summary>
|
||||
@@ -66,11 +78,36 @@ public class SubsonicProxyService
|
||||
{
|
||||
try
|
||||
{
|
||||
// Get HTTP context for request/response forwarding
|
||||
var httpContext = _httpContextAccessor.HttpContext;
|
||||
if (httpContext == null)
|
||||
{
|
||||
return new ObjectResult(new { error = "HTTP context not available" })
|
||||
{
|
||||
StatusCode = 500
|
||||
};
|
||||
}
|
||||
|
||||
var incomingRequest = httpContext.Request;
|
||||
var outgoingResponse = httpContext.Response;
|
||||
|
||||
var query = string.Join("&", parameters.Select(kv =>
|
||||
$"{Uri.EscapeDataString(kv.Key)}={Uri.EscapeDataString(kv.Value)}"));
|
||||
var url = $"{_subsonicSettings.Url}/rest/stream?{query}";
|
||||
|
||||
using var request = new HttpRequestMessage(HttpMethod.Get, url);
|
||||
|
||||
// Forward Range headers for progressive streaming support (iOS clients)
|
||||
if (incomingRequest.Headers.TryGetValue("Range", out var range))
|
||||
{
|
||||
request.Headers.TryAddWithoutValidation("Range", range.ToArray());
|
||||
}
|
||||
|
||||
if (incomingRequest.Headers.TryGetValue("If-Range", out var ifRange))
|
||||
{
|
||||
request.Headers.TryAddWithoutValidation("If-Range", ifRange.ToArray());
|
||||
}
|
||||
|
||||
var response = await _httpClient.SendAsync(
|
||||
request,
|
||||
HttpCompletionOption.ResponseHeadersRead,
|
||||
@@ -81,6 +118,19 @@ public class SubsonicProxyService
|
||||
return new StatusCodeResult((int)response.StatusCode);
|
||||
}
|
||||
|
||||
// Forward HTTP status code (e.g., 206 Partial Content for range requests)
|
||||
outgoingResponse.StatusCode = (int)response.StatusCode;
|
||||
|
||||
// Forward streaming-required headers from upstream response
|
||||
foreach (var header in StreamingRequiredHeaders)
|
||||
{
|
||||
if (response.Headers.TryGetValues(header, out var values) ||
|
||||
response.Content.Headers.TryGetValues(header, out values))
|
||||
{
|
||||
outgoingResponse.Headers[header] = values.ToArray();
|
||||
}
|
||||
}
|
||||
|
||||
var stream = await response.Content.ReadAsStreamAsync(cancellationToken);
|
||||
var contentType = response.Content.Headers.ContentType?.ToString() ?? "audio/mpeg";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user