kavin/Piped-Backend
1
0
Fork 0
mirror of https://github.com/TeamPiped/Piped-Backend.git synced 2025-04-29 08:20:30 +05:30
Code Issues Projects Releases Wiki Activity

Use a better threading model.

Browse Source
This commit is contained in:
FireMasterK 2021-03-31 16:48:43 +05:30
parent d9a84215d7
commit 009c776c71
No known key found for this signature in database
GPG Key ID: 8DFF5DD33E93DB58
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.properties
View File

@ -3,7 +3,7 @@
PORT: 8080 PORT: 8080
# The number of workers to use for the server # The number of workers to use for the server
HTTP_WORKERS: 128 HTTP_WORKERS: 2
# Proxy # Proxy
PROXY_PART: https://pipedproxy-ams.kavin.rocks PROXY_PART: https://pipedproxy-ams.kavin.rocks

33
src/main/java/me/kavin/piped/ServerLauncher.java
View File

@ -7,6 +7,8 @@ import static io.activej.http.HttpHeaders.CONTENT_TYPE;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.lang3.exception.ExceptionUtils;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -34,11 +36,16 @@ import me.kavin.piped.utils.resp.ErrorResponse;
public class ServerLauncher extends MultithreadedHttpServerLauncher { public class ServerLauncher extends MultithreadedHttpServerLauncher {
@Provides @Provides
AsyncServlet mainServlet() { Executor executor() {
return Executors.newCachedThreadPool();
}
@Provides
AsyncServlet mainServlet(Executor executor) {
RoutingServlet router = RoutingServlet.create().map(HttpMethod.GET, "/webhooks/pubsub", request -> { RoutingServlet router = RoutingServlet.create().map(HttpMethod.GET, "/webhooks/pubsub", request -> {
return HttpResponse.ok200().withPlainText(request.getQueryParameter("hub.challenge")); return HttpResponse.ok200().withPlainText(request.getQueryParameter("hub.challenge"));
}).map(HttpMethod.POST, "/webhooks/pubsub", request -> { }).map(HttpMethod.POST, "/webhooks/pubsub", AsyncServlet.ofBlocking(executor, request -> {
try { try {
SyndFeed feed = new SyndFeedInput() SyndFeed feed = new SyndFeedInput()
@ -54,7 +61,7 @@ public class ServerLauncher extends MultithreadedHttpServerLauncher {
} catch (Exception e) { } catch (Exception e) {
return getErrorResponse(e); return getErrorResponse(e);
} }
}).map("/sponsors/:videoId", request -> { })).map("/sponsors/:videoId", AsyncServlet.ofBlocking(executor, request -> {
try { try {
return getJsonResponse(SponsorBlockUtils return getJsonResponse(SponsorBlockUtils
.getSponsors(request.getPathParameter("videoId"), request.getQueryParameter("category")) .getSponsors(request.getPathParameter("videoId"), request.getQueryParameter("category"))
@ -62,21 +69,21 @@ public class ServerLauncher extends MultithreadedHttpServerLauncher {
} catch (Exception e) { } catch (Exception e) {
return getErrorResponse(e); return getErrorResponse(e);
} }
}).map("/streams/:videoId", request -> { })).map("/streams/:videoId", AsyncServlet.ofBlocking(executor, request -> {
try { try {
return getJsonResponse(ResponseHelper.streamsResponse(request.getPathParameter("videoId")), return getJsonResponse(ResponseHelper.streamsResponse(request.getPathParameter("videoId")),
"public, s-maxage=21540"); "public, s-maxage=21540");
} catch (Exception e) { } catch (Exception e) {
return getErrorResponse(e); return getErrorResponse(e);
} }
}).map("/channels/:channelId", request -> { })).map("/channels/:channelId", AsyncServlet.ofBlocking(executor, request -> {
try { try {
return getJsonResponse(ResponseHelper.channelResponse(request.getPathParameter("channelId")), return getJsonResponse(ResponseHelper.channelResponse(request.getPathParameter("channelId")),
"public, s-maxage=600"); "public, s-maxage=600");
} catch (Exception e) { } catch (Exception e) {
return getErrorResponse(e); return getErrorResponse(e);
} }
}).map("/nextpage/channels/:channelId", request -> { })).map("/nextpage/channels/:channelId", AsyncServlet.ofBlocking(executor, request -> {
try { try {
return getJsonResponse( return getJsonResponse(
ResponseHelper.channelPageResponse(request.getPathParameter("channelId"), ResponseHelper.channelPageResponse(request.getPathParameter("channelId"),
@ -85,14 +92,14 @@ public class ServerLauncher extends MultithreadedHttpServerLauncher {
} catch (Exception e) { } catch (Exception e) {
return getErrorResponse(e); return getErrorResponse(e);
} }
}).map("/playlists/:playlistId", request -> { })).map("/playlists/:playlistId", AsyncServlet.ofBlocking(executor, request -> {
try { try {
return getJsonResponse(ResponseHelper.playlistResponse(request.getPathParameter("playlistId")), return getJsonResponse(ResponseHelper.playlistResponse(request.getPathParameter("playlistId")),
"public, s-maxage=600"); "public, s-maxage=600");
} catch (Exception e) { } catch (Exception e) {
return getErrorResponse(e); return getErrorResponse(e);
} }
}).map("/nextpage/playlists/:playlistId", request -> { })).map("/nextpage/playlists/:playlistId", AsyncServlet.ofBlocking(executor, request -> {
try { try {
return getJsonResponse( return getJsonResponse(
ResponseHelper.playlistPageResponse(request.getPathParameter("playlistId"), ResponseHelper.playlistPageResponse(request.getPathParameter("playlistId"),
@ -101,21 +108,21 @@ public class ServerLauncher extends MultithreadedHttpServerLauncher {
} catch (Exception e) { } catch (Exception e) {
return getErrorResponse(e); return getErrorResponse(e);
} }
}).map("/suggestions", request -> { })).map("/suggestions", AsyncServlet.ofBlocking(executor, request -> {
try { try {
return getJsonResponse(ResponseHelper.suggestionsResponse(request.getQueryParameter("query")), return getJsonResponse(ResponseHelper.suggestionsResponse(request.getQueryParameter("query")),
"public, s-maxage=600"); "public, s-maxage=600");
} catch (Exception e) { } catch (Exception e) {
return getErrorResponse(e); return getErrorResponse(e);
} }
}).map("/search", request -> { })).map("/search", AsyncServlet.ofBlocking(executor, request -> {
try { try {
return getJsonResponse(ResponseHelper.searchResponse(request.getQueryParameter("q")), return getJsonResponse(ResponseHelper.searchResponse(request.getQueryParameter("q")),
"public, s-maxage=600"); "public, s-maxage=600");
} catch (Exception e) { } catch (Exception e) {
return getErrorResponse(e); return getErrorResponse(e);
} }
}).map("/nextpage/search", request -> { })).map("/nextpage/search", AsyncServlet.ofBlocking(executor, request -> {
try { try {
return getJsonResponse( return getJsonResponse(
ResponseHelper.searchPageResponse(request.getQueryParameter("q"), ResponseHelper.searchPageResponse(request.getQueryParameter("q"),
@ -124,13 +131,13 @@ public class ServerLauncher extends MultithreadedHttpServerLauncher {
} catch (Exception e) { } catch (Exception e) {
return getErrorResponse(e); return getErrorResponse(e);
} }
}).map("/trending", request -> { })).map("/trending", AsyncServlet.ofBlocking(executor, request -> {
try { try {
return getJsonResponse(ResponseHelper.trendingResponse(), "public, s-maxage=3600"); return getJsonResponse(ResponseHelper.trendingResponse(), "public, s-maxage=3600");
} catch (Exception e) { } catch (Exception e) {
return getErrorResponse(e); return getErrorResponse(e);
} }
}); }));
return new CustomServletDecorator(router); return new CustomServletDecorator(router);
} }

2
src/main/java/me/kavin/piped/consts/Constants.java
View File

@ -44,7 +44,7 @@ public class Constants {
prop.load(new FileReader("config.properties")); prop.load(new FileReader("config.properties"));
PORT = Integer.parseInt(prop.getProperty("PORT", "8080")); PORT = Integer.parseInt(prop.getProperty("PORT", "8080"));
HTTP_WORKERS = prop.getProperty("HTTP_WORKERS", "128"); HTTP_WORKERS = prop.getProperty("HTTP_WORKERS", String.valueOf(Runtime.getRuntime().availableProcessors()));
PROXY_PART = prop.getProperty("PROXY_PART"); PROXY_PART = prop.getProperty("PROXY_PART");
CAPTCHA_BASE_URL = prop.getProperty("CAPTCHA_BASE_URL"); CAPTCHA_BASE_URL = prop.getProperty("CAPTCHA_BASE_URL");
CAPTCHA_API_KEY = prop.getProperty("CAPTCHA_API_KEY"); CAPTCHA_API_KEY = prop.getProperty("CAPTCHA_API_KEY");