Fix: Bypass regional blocks using Google DNS (DoH)
- Updated StreamUrlResolver to use OkHttp with Google DoH - Updated PlayerActivity to use Google DoH (8.8.8.8) - Bumped version to 10.0.3
This commit is contained in:
@@ -8,8 +8,8 @@ android {
|
|||||||
applicationId "com.streamplayer"
|
applicationId "com.streamplayer"
|
||||||
minSdk 21
|
minSdk 21
|
||||||
targetSdk 33
|
targetSdk 33
|
||||||
versionCode 100200
|
versionCode 100300
|
||||||
versionName "10.0.2"
|
versionName "10.0.3"
|
||||||
buildConfigField "String", "DEVICE_REGISTRY_URL", '"http://194.163.191.200:4000"'
|
buildConfigField "String", "DEVICE_REGISTRY_URL", '"http://194.163.191.200:4000"'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -203,10 +203,10 @@ public class PlayerActivity extends AppCompatActivity {
|
|||||||
|
|
||||||
DnsOverHttps dohDns = new DnsOverHttps.Builder()
|
DnsOverHttps dohDns = new DnsOverHttps.Builder()
|
||||||
.client(bootstrap)
|
.client(bootstrap)
|
||||||
.url(HttpUrl.get("https://dns.adguard-dns.com/dns-query"))
|
.url(HttpUrl.get("https://dns.google/dns-query"))
|
||||||
.bootstrapDnsHosts(
|
.bootstrapDnsHosts(
|
||||||
InetAddress.getByName("94.140.14.14"),
|
InetAddress.getByName("8.8.8.8"),
|
||||||
InetAddress.getByName("94.140.15.15"))
|
InetAddress.getByName("8.8.4.4"))
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
okHttpClient = bootstrap.newBuilder()
|
okHttpClient = bootstrap.newBuilder()
|
||||||
|
|||||||
@@ -1,22 +1,29 @@
|
|||||||
package com.streamplayer;
|
package com.streamplayer;
|
||||||
|
|
||||||
import android.util.Base64;
|
import android.util.Base64;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStreamReader;
|
import java.net.InetAddress;
|
||||||
import java.net.HttpURLConnection;
|
import java.net.UnknownHostException;
|
||||||
import java.net.URL;
|
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
import okhttp3.HttpUrl;
|
||||||
|
import okhttp3.OkHttpClient;
|
||||||
|
import okhttp3.Request;
|
||||||
|
import okhttp3.Response;
|
||||||
|
import okhttp3.dnsoverhttps.DnsOverHttps;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Resuelve la URL real del stream analizando el JavaScript ofuscado de streamtpmedia.
|
* Resuelve la URL real del stream analizando el JavaScript ofuscado de streamtpcloud.
|
||||||
|
* Utiliza DNS de Google para evitar bloqueos.
|
||||||
*/
|
*/
|
||||||
public final class StreamUrlResolver {
|
public final class StreamUrlResolver {
|
||||||
|
|
||||||
@@ -27,6 +34,32 @@ public final class StreamUrlResolver {
|
|||||||
private static final String FUNCTION_TEMPLATE = "function\\s+%s\\(\\)\\s*\\{\\s*return\\s+(\\d+);\\s*\\}";
|
private static final String FUNCTION_TEMPLATE = "function\\s+%s\\(\\)\\s*\\{\\s*return\\s+(\\d+);\\s*\\}";
|
||||||
private static final String USER_AGENT = "Mozilla/5.0 (Linux; Android 13) ExoPlayerResolver/1.0";
|
private static final String USER_AGENT = "Mozilla/5.0 (Linux; Android 13) ExoPlayerResolver/1.0";
|
||||||
|
|
||||||
|
private static final OkHttpClient CLIENT;
|
||||||
|
|
||||||
|
static {
|
||||||
|
OkHttpClient.Builder builder = new OkHttpClient.Builder()
|
||||||
|
.connectTimeout(15, TimeUnit.SECONDS)
|
||||||
|
.readTimeout(15, TimeUnit.SECONDS)
|
||||||
|
.followRedirects(true);
|
||||||
|
|
||||||
|
try {
|
||||||
|
// DNS de Google (8.8.8.8)
|
||||||
|
OkHttpClient bootstrap = new OkHttpClient.Builder().build();
|
||||||
|
DnsOverHttps dns = new DnsOverHttps.Builder()
|
||||||
|
.client(bootstrap)
|
||||||
|
.url(HttpUrl.get("https://dns.google/dns-query"))
|
||||||
|
.bootstrapDnsHosts(
|
||||||
|
InetAddress.getByName("8.8.8.8"),
|
||||||
|
InetAddress.getByName("8.8.4.4"))
|
||||||
|
.build();
|
||||||
|
builder.dns(dns);
|
||||||
|
} catch (UnknownHostException e) {
|
||||||
|
// Fallback a DNS del sistema si falla la inicialización (raro con IPs hardcoded)
|
||||||
|
}
|
||||||
|
|
||||||
|
CLIENT = builder.build();
|
||||||
|
}
|
||||||
|
|
||||||
private StreamUrlResolver() {
|
private StreamUrlResolver() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -56,46 +89,37 @@ public final class StreamUrlResolver {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static String downloadPage(String pageUrl) throws IOException {
|
private static String downloadPage(String pageUrl) throws IOException {
|
||||||
HttpURLConnection connection = (HttpURLConnection) new URL(pageUrl).openConnection();
|
Request request = new Request.Builder()
|
||||||
connection.setConnectTimeout(15000);
|
.url(pageUrl)
|
||||||
connection.setReadTimeout(15000);
|
.header("User-Agent", USER_AGENT)
|
||||||
connection.setRequestProperty("User-Agent", USER_AGENT);
|
.header("Accept", "text/html,application/xhtml+xml")
|
||||||
connection.setRequestProperty("Accept", "text/html,application/xhtml+xml");
|
.build();
|
||||||
|
|
||||||
try {
|
try (Response response = CLIENT.newCall(request).execute()) {
|
||||||
int responseCode = connection.getResponseCode();
|
if (!response.isSuccessful()) {
|
||||||
if (responseCode != HttpURLConnection.HTTP_OK) {
|
throw new IOException("Error HTTP " + response.code() + " al cargar la página del stream");
|
||||||
throw new IOException("Error HTTP " + responseCode + " al cargar la página del stream");
|
}
|
||||||
|
if (response.body() == null) {
|
||||||
|
throw new IOException("Respuesta vacía del servidor");
|
||||||
}
|
}
|
||||||
|
|
||||||
String contentType = connection.getContentType();
|
// Validar Content-Type
|
||||||
// Validar que sea contenido web (HTML)
|
String contentType = response.header("Content-Type");
|
||||||
if (contentType != null && !contentType.contains("html") && !contentType.contains("text")) {
|
if (contentType != null && !contentType.contains("html") && !contentType.contains("text")) {
|
||||||
// A veces puede venir sin content type o application/octet-stream,
|
if (contentType.startsWith("image/") || contentType.startsWith("video/") || contentType.startsWith("audio/")) {
|
||||||
// pero si es explícitamente una imagen o algo así, abortamos.
|
|
||||||
if (contentType.startsWith("image/") || contentType.startsWith("video/") || contentType.startsWith("audio/")) {
|
|
||||||
throw new IOException("El servidor devolvió " + contentType + " en lugar de HTML");
|
throw new IOException("El servidor devolvió " + contentType + " en lugar de HTML");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
try (BufferedReader reader = new BufferedReader(
|
return response.body().string();
|
||||||
new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8))) {
|
|
||||||
StringBuilder builder = new StringBuilder();
|
|
||||||
String line;
|
|
||||||
while ((line = reader.readLine()) != null) {
|
|
||||||
builder.append(line);
|
|
||||||
}
|
|
||||||
return builder.toString();
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
connection.disconnect();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static long extractKeyOffset(String html) throws IOException {
|
private static long extractKeyOffset(String html) throws IOException {
|
||||||
Matcher matcher = KEY_FUNCTIONS_PATTERN.matcher(html);
|
Matcher matcher = KEY_FUNCTIONS_PATTERN.matcher(html);
|
||||||
if (!matcher.find()) {
|
if (!matcher.find()) {
|
||||||
throw new IOException("No se encontró la clave del stream");
|
// Logging para debug si es necesario, pero lanzamos excepción limpia
|
||||||
|
throw new IOException("No se encontró la clave del stream (posible bloqueo o cambio en la página)");
|
||||||
}
|
}
|
||||||
String first = matcher.group(1);
|
String first = matcher.group(1);
|
||||||
String second = matcher.group(2);
|
String second = matcher.group(2);
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versionCode": 100200,
|
"versionCode": 100300,
|
||||||
"versionName": "10.0.2",
|
"versionName": "10.0.3",
|
||||||
"minSupportedVersionCode": 91000,
|
"minSupportedVersionCode": 91000,
|
||||||
"forceUpdate": false,
|
"forceUpdate": false,
|
||||||
"downloadUrl": "https://gitea.cbcren.online/renato97/app/releases/download/v10.0.2/StreamPlayer-v10.0.2.apk",
|
"downloadUrl": "https://gitea.cbcren.online/renato97/app/releases/download/v10.0.3/StreamPlayer-v10.0.3.apk",
|
||||||
"fileName": "StreamPlayer-v10.0.2.apk",
|
"fileName": "StreamPlayer-v10.0.3.apk",
|
||||||
"sizeBytes": 0,
|
"sizeBytes": 0,
|
||||||
"notes": "StreamPlayer v10.0.2\n\nNovedades:\n- Eventos centralizados en servidor propio\n- Corrección de carga de eventos"
|
"notes": "StreamPlayer v10.0.3\n\nNovedades:\n- Fix: Evasión de bloqueos regionales mediante DNS de Google (DoH)\n- Corrección de error 'No se encontró la clave del stream'"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user