Upgrade depends

alikemalocalan · Jan 10, 2021 · 4715884 · 4715884
1 parent f749f1a
commit 4715884
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 24 deletions.
diff --git a/build.gradle b/build.gradle
@@ -42,12 +42,10 @@ application {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    compile 'io.netty:netty-handler-proxy:4.1.53.Final'
+    compile 'io.netty:netty-handler-proxy:4.1.56.Final'
     compile 'com.squareup.okhttp3:okhttp:4.9.0'
     compile 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.0'
     implementation 'ch.qos.logback:logback-classic:1.2.3'
-    implementation 'ch.qos.logback:logback-core:1.2.3'
-    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30'
 }
 
 jar {

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 kotlin.code.style=official
-kotlin_version=1.4.10
+kotlin_version=1.4.21-2
 projectGroup=com.github.alikemalocalan
 projectName=greentunnel4jvm
 projectVersion=2.2-SNAPSHOT

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.alikemalocalan</groupId>
   <artifactId>greentunnel4jvm</artifactId>
-  <version>2.1-SNAPSHOT</version>
+  <version>2.2-SNAPSHOT</version>
   <inceptionYear>2008</inceptionYear>
   <licenses>
     <license>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-handler-proxy</artifactId>
-      <version>4.1.53.Final</version>
+      <version>4.1.56.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -43,17 +43,5 @@
       <version>1.2.3</version>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-core</artifactId>
-      <version>1.2.3</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.30</version>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/src/main/kotlin/com/github/alikemalocalan/greentunnel4jvm/HttpProxyClientHandler.kt b/src/main/kotlin/com/github/alikemalocalan/greentunnel4jvm/HttpProxyClientHandler.kt
@@ -39,12 +39,12 @@ class HttpProxyClientHandler : ChannelInboundHandlerAdapter() {
                     ctx.channel()
                         .writeAndFlush(Unpooled.wrappedBuffer("HTTP/1.1 200 Connection Established\r\n\r\n".commonAsUtf8ToByteArray()))
                 ctx.channel().config().isAutoRead = false // disable AutoRead until remote connection is ready
-                remoteChannel = Optional.of(sendRequestWithRemoteChannel(ctx, request))
+                remoteChannel = Optional.of(sendRequestToRemoteChannel(ctx, request))
                 buf.release()
             }
     }
 
-    private fun sendRequestWithRemoteChannel(
+    private fun sendRequestToRemoteChannel(
         ctx: ChannelHandlerContext,
         request: HttpRequest
     ): Channel {
@@ -59,7 +59,7 @@ class HttpProxyClientHandler : ChannelInboundHandlerAdapter() {
                 ctx.channel().config().isAutoRead = true // connection is ready, enable AutoRead
                 HttpServiceUtils.writeToHttps(request.toByteBuf(), remoteFuture.channel())
                 ctx.channel().read()
-            } else ctx.close()
+            }
         }
         return remoteFuture.channel()
     }

diff --git a/src/main/kotlin/com/github/alikemalocalan/greentunnel4jvm/models/HttpRequest.kt b/src/main/kotlin/com/github/alikemalocalan/greentunnel4jvm/models/HttpRequest.kt
@@ -26,7 +26,7 @@ data class HttpRequest(
                 }
         }.orElseGet { "" }
 
-    private fun getPath(): String =
+    fun path(): String =
         if (uri.path.isNullOrBlank()) "/"
         else uri.path
 
@@ -36,7 +36,7 @@ data class HttpRequest(
     override fun toString(): String = String.format(
         "%s  %s  %s%s%s",
         method,
-        getPath(),
+        path(),
         protocolVersion,
         headersAsString(),
         payload.map { payload -> "\r\n" + payload }.orElseGet { "" }

diff --git a/src/main/kotlin/com/github/alikemalocalan/greentunnel4jvm/utils/DNSOverHttps.kt b/src/main/kotlin/com/github/alikemalocalan/greentunnel4jvm/utils/DNSOverHttps.kt
@@ -37,7 +37,7 @@ object DNSOverHttps {
         try {
             dns.lookup(address).first().hostAddress
         } catch (ex: UnknownHostException) {
-            logger.error(ex.message)
+            logger.error("${ex.message} for : $address")
             "127.0.0.1"
         }
 }