kamma/xtream-player
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hls fix

Browse Source
This commit is contained in:
Radek Davidek 2026-03-04 14:37:51 +01:00
parent 87925a57de
commit 1659298aff
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/cz/kamma/xtreamplayer/XtreamPlayerApplication.java
View File

@ -268,7 +268,7 @@ public final class XtreamPlayerApplication {
return; return;
} }
attemptErrors.add(maskUri(candidate) + " -> " + compactError(candidateException)); attemptErrors.add(maskUri(candidate) + " -> " + compactError(candidateException));
LOGGER.warn("Stream proxy candidate failed uri={}", maskUri(candidate), candidateException); LOGGER.warn("Stream proxy candidate failed uri={} reason={}", maskUri(candidate), compactError(candidateException));
} }
} }
if (response == null) { if (response == null) {
@ -858,9 +858,10 @@ public final class XtreamPlayerApplication {
)); ));
copyRequestHeaderIfPresent(exchange, requestBuilder, "Range"); copyRequestHeaderIfPresent(exchange, requestBuilder, "Range");
copyRequestHeaderIfPresent(exchange, requestBuilder, "If-Range"); copyRequestHeaderIfPresent(exchange, requestBuilder, "If-Range");
if (sourceUrl != null && !sourceUrl.isBlank()) { String referer = resolveRefererForCandidate(candidate, sourceUrl);
requestBuilder.header("Referer", sourceUrl); if (!referer.isBlank()) {
String origin = originFromUrl(sourceUrl); requestBuilder.header("Referer", referer);
String origin = originFromUrl(referer);
if (!origin.isBlank()) { if (!origin.isBlank()) {
requestBuilder.header("Origin", origin); requestBuilder.header("Origin", origin);
} }
@ -869,6 +870,32 @@ public final class XtreamPlayerApplication {
return HTTP_CLIENT.send(request, HttpResponse.BodyHandlers.ofByteArray()); return HTTP_CLIENT.send(request, HttpResponse.BodyHandlers.ofByteArray());
} }
private static String resolveRefererForCandidate(URI candidate, String sourceUrl) {
URI candidateDir = directoryUri(candidate);
if (candidateDir != null) {
String path = candidateDir.getPath() == null ? "" : candidateDir.getPath().toLowerCase(Locale.ROOT);
if (path.contains("/hls/")) {
return candidateDir.toString();
}
}
if (sourceUrl != null && !sourceUrl.isBlank()) {
return sourceUrl;
}
return candidateDir == null ? "" : candidateDir.toString();
}
private static URI directoryUri(URI uri) {
if (uri == null || uri.getScheme() == null || uri.getRawAuthority() == null) {
return null;
}
String path = uri.getPath() == null ? "" : uri.getPath();
int slash = path.lastIndexOf('/');
String dirPath = slash >= 0 ? path.substring(0, slash + 1) : "/";
String query = uri.getRawQuery();
return URI.create(uri.getScheme() + "://" + uri.getRawAuthority() + dirPath
+ (query == null ? "" : "?" + query));
}
private static String pathBasename(URI uri) { private static String pathBasename(URI uri) {
String path = uri == null || uri.getPath() == null ? "" : uri.getPath(); String path = uri == null || uri.getPath() == null ? "" : uri.getPath();
int index = path.lastIndexOf('/'); int index = path.lastIndexOf('/');