j62
/
ctbrec
2
2
Fork 2
Code Issues 4 Pull Requests Packages Projects Releases 3 Wiki Activity

Add GZIP support for Flirt4Free HTTP requests

This commit is contained in:
0xb00bface 2021-05-16 15:12:47 +02:00
parent 6f92796158
commit fda65fdf2a
4 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeFavoritesUpdateService.java
View File

@ -1,5 +1,6 @@
package ctbrec.ui.sites.flirt4free;
import static ctbrec.io.HttpClient.*;
import static ctbrec.io.HttpConstants.*;
import java.io.IOException;
@ -47,12 +48,13 @@ public class Flirt4FreeFavoritesUpdateService extends PaginatedScheduledService
.url(url)
.header(ACCEPT, "*/*")
.header(ACCEPT_LANGUAGE, Locale.ENGLISH.getLanguage())
.header(ACCEPT_ENCODING, ACCEPT_ENCODING_GZIP)
.header(REFERER, flirt4free.getBaseUrl())
.header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
.build();
try (var response = flirt4free.getHttpClient().execute(request)) {
if (response.isSuccessful()) {
var body = response.body().string();
var body = gunzipBody(response);
Elements modelContainers = HtmlParser.getTags(body, "div.model-container");
for (Element modelContainer : modelContainers) {
String modelHtml = modelContainer.html();

14
client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeUpdateService.java
View File

@ -1,5 +1,6 @@
package ctbrec.ui.sites.flirt4free;
import static ctbrec.io.HttpClient.*;
import static ctbrec.io.HttpConstants.*;
import java.io.IOException;
@ -21,7 +22,6 @@ import ctbrec.sites.flirt4free.Flirt4FreeModel;
import ctbrec.ui.tabs.PaginatedScheduledService;
import javafx.concurrent.Task;
import okhttp3.Request;
import okhttp3.Response;
public class Flirt4FreeUpdateService extends PaginatedScheduledService {
@ -46,10 +46,12 @@ public class Flirt4FreeUpdateService extends PaginatedScheduledService {
var request = new Request.Builder()
.url(url)
.header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
.header(ACCEPT_ENCODING, ACCEPT_ENCODING_GZIP)
.build();
try (var response = flirt4Free.getHttpClient().execute(request)) {
if (response.isSuccessful()) {
return parseResponse(response);
var body = gunzipBody(response);
return parseResponse(body);
} else {
throw new HttpException(response.code(), response.message());
}
@ -58,9 +60,8 @@ public class Flirt4FreeUpdateService extends PaginatedScheduledService {
};
}
private List<Model> parseResponse(Response response) throws IOException {
private List<Model> parseResponse(String body) throws IOException {
List<Flirt4FreeModel> models = new ArrayList<>();
var body = response.body().string();
var m = Pattern.compile("window\\.__homePageData__ = (\\{.*\\})", Pattern.DOTALL).matcher(body);
if (m.find()) {
var data = new JSONObject(m.group(1));
@ -95,10 +96,9 @@ public class Flirt4FreeUpdateService extends PaginatedScheduledService {
var videoHost = modelData.getString("video_host");
var modelId = modelData.getString("model_id");
model.setId(modelId);
String streamUrl = "https://manifest.vscdns.com/manifest.m3u8.m3u8?key=nil&provider=level3&secure=true&host=" + videoHost
+ "&model_id=" + modelId;
String streamUrl = "https://manifest.vscdns.com/manifest.m3u8.m3u8?key=nil&provider=level3&secure=true&host=" + videoHost + "&model_id=" + modelId;
model.setStreamUrl(streamUrl);
model.setPreview("https://live-screencaps.vscdns.com/"+ modelId +"-desktop.jpg");
model.setPreview("https://live-screencaps.vscdns.com/" + modelId + "-desktop.jpg");
model.setOnlineState(ctbrec.Model.State.ONLINE);
model.setOnline(true);
return model;

20
common/src/main/java/ctbrec/io/HttpClient.java
View File

@ -1,12 +1,15 @@
package ctbrec.io;
import static ctbrec.io.HttpConstants.*;
import static java.nio.charset.StandardCharsets.*;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.Authenticator;
import java.net.PasswordAuthentication;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
@ -22,6 +25,7 @@ import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.zip.GZIPInputStream;
import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLContext;
@ -314,4 +318,20 @@ public abstract class HttpClient {
}
}).orElse("[]");
}
public static String gunzipBody(Response response) throws IOException {
if (Objects.equals(response.header(CONTENT_ENCODING), ACCEPT_ENCODING_GZIP)) {
GZIPInputStream gzipIn = new GZIPInputStream(response.body().byteStream());
ByteArrayOutputStream bos = new ByteArrayOutputStream();
byte[] b = new byte[1024];
int len = -1;
while ((len = gzipIn.read(b)) >= 0) {
bos.write(b, 0, len);
}
return bos.toString(StandardCharsets.UTF_8.toString());
} else {
return response.body().string();
}
}
}

3
common/src/main/java/ctbrec/io/HttpConstants.java
View File

@ -3,9 +3,12 @@ package ctbrec.io;
public class HttpConstants {
public static final String ACCEPT = "Accept";
public static final String ACCEPT_ENCODING = "Accept-Encoding";
public static final String ACCEPT_ENCODING_GZIP = "gzip";
public static final String ACCEPT_LANGUAGE = "Accept-Language";
public static final String CACHE_CONTROL = "Cache-Control";
public static final String CONNECTION = "Connection";
public static final String CONTENT_ENCODING = "Content-Encoding";
public static final String CONTENT_TYPE = "Content-Type";
public static final String COOKIE = "Cookie";
public static final String KEEP_ALIVE = "keep-alive";