From dd0312c020d299bb56740a475526f8801299cf3f Mon Sep 17 00:00:00 2001 From: UnfamiliarLegacy <74633542+UnfamiliarLegacy@users.noreply.github.com> Date: Fri, 26 Nov 2021 18:33:38 +0100 Subject: [PATCH] Improve nitro constants --- .../protocol/connection/proxy/nitro/NitroConstants.java | 6 ++++-- .../protocol/connection/proxy/nitro/NitroProxyProvider.java | 2 +- .../connection/proxy/nitro/http/NitroHttpProxy.java | 4 ++-- .../proxy/nitro/http/NitroHttpProxyFilterSource.java | 3 ++- .../proxy/nitro/websocket/NitroWebsocketClient.java | 3 +-- .../proxy/nitro/websocket/NitroWebsocketProxy.java | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/NitroConstants.java b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/NitroConstants.java index d64a88f..2d111f3 100644 --- a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/NitroConstants.java +++ b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/NitroConstants.java @@ -2,10 +2,12 @@ package gearth.protocol.connection.proxy.nitro; public final class NitroConstants { - public static final int PORT_WEBSOCKET = 2096; - public static final int PORT_HTTP = 9090; + public static final int HTTP_PORT = 9090; + public static final int HTTP_BUFFER_SIZE = 1024 * 1024 * 10; + public static final int WEBSOCKET_PORT = 2096; public static final int WEBSOCKET_BUFFER_SIZE = 1024 * 1024 * 10; public static final String WEBSOCKET_REVISION = "PRODUCTION-201611291003-338511768"; + public static final String WEBSOCKET_CLIENT_IDENTIFIER = "HTML5"; } diff --git a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/NitroProxyProvider.java b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/NitroProxyProvider.java index a3ac2ec..3cb47a1 100644 --- a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/NitroProxyProvider.java +++ b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/NitroProxyProvider.java @@ -79,7 +79,7 @@ public class NitroProxyProvider implements ProxyProvider, NitroHttpProxyServerCa @Override public String replaceWebsocketServer(String configUrl, String websocketUrl) { originalWebsocketUrl = websocketUrl; - return String.format("ws://127.0.0.1:%d", NitroConstants.PORT_WEBSOCKET); + return String.format("ws://127.0.0.1:%d", NitroConstants.WEBSOCKET_PORT); } @Override diff --git a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/http/NitroHttpProxy.java b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/http/NitroHttpProxy.java index 7e23a75..84885ee 100644 --- a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/http/NitroHttpProxy.java +++ b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/http/NitroHttpProxy.java @@ -31,7 +31,7 @@ public class NitroHttpProxy { * Register HTTP(s) proxy on the system. */ private boolean registerProxy() { - return this.osFunctions.registerSystemProxy("127.0.0.1", NitroConstants.PORT_HTTP); + return this.osFunctions.registerSystemProxy("127.0.0.1", NitroConstants.HTTP_PORT); } /** @@ -44,7 +44,7 @@ public class NitroHttpProxy { public boolean start() { try { proxyServer = DefaultHttpProxyServer.bootstrap() - .withPort(NitroConstants.PORT_HTTP) + .withPort(NitroConstants.HTTP_PORT) .withManInTheMiddle(new CertificateSniffingMitmManager(authority)) .withFiltersSource(new NitroHttpProxyFilterSource(serverCallback)) .start(); diff --git a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/http/NitroHttpProxyFilterSource.java b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/http/NitroHttpProxyFilterSource.java index fae9deb..c736458 100644 --- a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/http/NitroHttpProxyFilterSource.java +++ b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/http/NitroHttpProxyFilterSource.java @@ -1,5 +1,6 @@ package gearth.protocol.connection.proxy.nitro.http; +import gearth.protocol.connection.proxy.nitro.NitroConstants; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.http.HttpMethod; import io.netty.handler.codec.http.HttpRequest; @@ -41,6 +42,6 @@ public class NitroHttpProxyFilterSource extends HttpFiltersSourceAdapter { @Override public int getMaximumResponseBufferSizeInBytes() { // Increasing this causes LittleProxy to output "FullHttpResponse" objects. - return 1024 * 1024 * 1024; + return NitroConstants.HTTP_BUFFER_SIZE; } } diff --git a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/websocket/NitroWebsocketClient.java b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/websocket/NitroWebsocketClient.java index d1c8fa5..ab890da 100644 --- a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/websocket/NitroWebsocketClient.java +++ b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/websocket/NitroWebsocketClient.java @@ -5,7 +5,6 @@ import gearth.protocol.HMessage; import gearth.protocol.connection.*; import gearth.protocol.connection.proxy.nitro.NitroConstants; import gearth.protocol.connection.proxy.nitro.NitroProxyProvider; -import gearth.services.internal_extensions.uilogger.hexdumper.Hexdump; import javax.websocket.*; import javax.websocket.server.ServerEndpoint; @@ -45,7 +44,7 @@ public class NitroWebsocketClient implements NitroSession { this.server.getPacketHandler(), this.packetHandler, NitroConstants.WEBSOCKET_REVISION, - "HTML5" // TODO: What is its purpose? + NitroConstants.WEBSOCKET_CLIENT_IDENTIFIER ); proxySetter.setProxy(proxy); diff --git a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/websocket/NitroWebsocketProxy.java b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/websocket/NitroWebsocketProxy.java index d162347..11122d1 100644 --- a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/websocket/NitroWebsocketProxy.java +++ b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/websocket/NitroWebsocketProxy.java @@ -28,7 +28,7 @@ public class NitroWebsocketProxy { this.stateSetter = stateSetter; this.connection = connection; this.proxyProvider = proxyProvider; - this.server = new Server(NitroConstants.PORT_WEBSOCKET); + this.server = new Server(NitroConstants.WEBSOCKET_PORT); } public boolean start() {