fix: change in server side API for live stream
This commit is contained in:
@@ -701,11 +701,13 @@ public class StreamProxyService : IStreamProxyService
|
||||
/// </summary>
|
||||
/// <param name="itemId">The item ID.</param>
|
||||
/// <param name="segmentPath">The segment path.</param>
|
||||
/// <param name="queryString">The original query string from the request (preserves segment-specific parameters like timestamps).</param>
|
||||
/// <param name="cancellationToken">Cancellation token.</param>
|
||||
/// <returns>The segment content as bytes.</returns>
|
||||
public async Task<byte[]?> GetSegmentAsync(
|
||||
string itemId,
|
||||
string segmentPath,
|
||||
string? queryString = null,
|
||||
CancellationToken cancellationToken = default)
|
||||
{
|
||||
var authenticatedUrl = await GetAuthenticatedUrlAsync(itemId, cancellationToken).ConfigureAwait(false);
|
||||
@@ -720,17 +722,29 @@ public class StreamProxyService : IStreamProxyService
|
||||
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;
|
||||
// Use the original query string from the request (preserves segment-specific params like ?m=timestamp)
|
||||
// If no query string is provided, check if we need to add auth params from the master manifest
|
||||
var queryParams = string.Empty;
|
||||
if (!string.IsNullOrEmpty(queryString))
|
||||
{
|
||||
// Use the original query string from the segment request
|
||||
queryParams = queryString.StartsWith('?') ? queryString : $"?{queryString}";
|
||||
}
|
||||
else if (!segmentPath.Contains("hdntl=", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
// Only append master manifest query params if segment doesn't have path-based auth
|
||||
queryParams = baseUri.Query;
|
||||
}
|
||||
|
||||
// Build full segment URL
|
||||
var segmentUrl = $"{baseUrl}/{segmentPath}{queryParams}";
|
||||
|
||||
_logger.LogDebug(
|
||||
"Fetching segment - BaseUri: {BaseUri}, BaseUrl: {BaseUrl}, SegmentPath: {SegmentPath}, FullUrl: {FullUrl}",
|
||||
"Fetching segment - BaseUri: {BaseUri}, BaseUrl: {BaseUrl}, SegmentPath: {SegmentPath}, QueryString: {QueryString}, FullUrl: {FullUrl}",
|
||||
authenticatedUrl,
|
||||
baseUrl,
|
||||
segmentPath,
|
||||
queryString ?? "(none)",
|
||||
segmentUrl);
|
||||
using var httpClient = _httpClientFactory.CreateClient(NamedClient.Default);
|
||||
var segmentData = await httpClient.GetByteArrayAsync(segmentUrl, cancellationToken).ConfigureAwait(false);
|
||||
|
||||
Reference in New Issue
Block a user