Merge branch 'release/1.0.2'

README.md

@@ -72,7 +72,7 @@ interface Http2WebSocketAcceptor {
 Http2WebSocketClientHandshaker handShaker = Http2WebSocketClientHandshaker.create(channel);
 
 Http2Headers headers =
-   new DefaultHttp2Headers().set("user-agent", "jauntsdn-websocket-http2-client/1.0.0");
+   new DefaultHttp2Headers().set("user-agent", "jauntsdn-websocket-http2-client/1.0.1");
 ChannelFuture handshakeFuture =
    /*http1 websocket handler*/
    handShaker.handshake("/echo", headers, new EchoWebSocketHandler());
@@ -259,7 +259,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.jauntsdn.netty:netty-websocket-http2:1.0.0'
+    implementation 'com.jauntsdn.netty:netty-websocket-http2:1.0.1'
 }
 ```
 

gradle.properties

@@ -1,14 +1,14 @@
 group=com.jauntsdn.netty
-version=1.0.1
+version=1.0.2
 
 googleJavaFormatPluginVersion=0.9
 dependencyManagementPluginVersion=1.0.10.RELEASE
 gitPluginVersion=0.12.3
 osDetectorPluginVersion=1.6.2
 versionsPluginVersion=0.36.0
 
-nettyVersion=4.1.59.Final
-nettyTcnativeVersion=2.0.36.Final
+nettyVersion=4.1.65.Final
+nettyTcnativeVersion=2.0.38.Final
 hdrHistogramVersion=2.1.12
 slf4jVersion=1.7.30
 logbackVersion=1.2.3

netty-websocket-http2-example/gradle/dependency-locks/compileClasspath.lockfile

@@ -3,13 +3,13 @@
 # This file is expected to be part of source control.
 ch.qos.logback:logback-classic:1.2.3
 ch.qos.logback:logback-core:1.2.3
-io.netty:netty-buffer:4.1.59.Final
-io.netty:netty-codec-http2:4.1.59.Final
-io.netty:netty-codec-http:4.1.59.Final
-io.netty:netty-codec:4.1.59.Final
-io.netty:netty-common:4.1.59.Final
-io.netty:netty-handler:4.1.59.Final
-io.netty:netty-resolver:4.1.59.Final
-io.netty:netty-tcnative-boringssl-static:2.0.36.Final
-io.netty:netty-transport:4.1.59.Final
+io.netty:netty-buffer:4.1.65.Final
+io.netty:netty-codec-http2:4.1.65.Final
+io.netty:netty-codec-http:4.1.65.Final
+io.netty:netty-codec:4.1.65.Final
+io.netty:netty-common:4.1.65.Final
+io.netty:netty-handler:4.1.65.Final
+io.netty:netty-resolver:4.1.65.Final
+io.netty:netty-tcnative-boringssl-static:2.0.38.Final
+io.netty:netty-transport:4.1.65.Final
 org.slf4j:slf4j-api:1.7.30

netty-websocket-http2-example/src/main/java/com/jauntsdn/netty/handler/codec/http2/websocketx/example/channelclient/Main.java

@@ -89,7 +89,7 @@ protected void initChannel(SocketChannel ch) {
     Http2WebSocketClientHandshaker handShaker = Http2WebSocketClientHandshaker.create(channel);
 
     Http2Headers headers =
-        new DefaultHttp2Headers().set("user-agent", "jauntsdn-websocket-http2-client/1.0.0");
+        new DefaultHttp2Headers().set("user-agent", "jauntsdn-websocket-http2-client/1.0.1");
     ChannelFuture handshake =
         handShaker.handshake("/echo", "com.jauntsdn.echo", headers, new EchoWebSocketHandler());
 

netty-websocket-http2-example/src/main/java/com/jauntsdn/netty/handler/codec/http2/websocketx/example/lwsclient/Main.java

@@ -89,7 +89,7 @@ protected void initChannel(SocketChannel ch) {
     Http2WebSocketClientHandshaker handShaker = Http2WebSocketClientHandshaker.create(channel);
 
     Http2Headers headers =
-        new DefaultHttp2Headers().set("user-agent", "jauntsdn-websocket-http2-client/1.0.0");
+        new DefaultHttp2Headers().set("user-agent", "jauntsdn-websocket-http2-client/1.0.1");
     ChannelFuture handshake =
         handShaker.handshake(
             "/", "dumb-increment-protocol", headers, new WebSocketDumbIncrementHandler());

netty-websocket-http2-example/src/main/resources/web/index.html

@@ -17,7 +17,7 @@
               display:block;color: #777;
               padding: 5px;
               margin-left: 100px;
-              height:50px;line-height: 50px;" href="https://jauntsdn.com/post/">
+              height:50px;line-height: 50px;" href="https://jauntsdn.com/post/netty-websocket-http2/">
         continue on jauntsdn.com
     </a>
 
@@ -54,11 +54,6 @@ <h4>rfc8441 - bootstrapping websockets with http2</h4>
                        display: inline-block;">
             start
         </button>
-        <div style="width: 185px;
-                    height: 49px;
-                    transform: translateY(17vh);
-                    margin: 0 auto;
-                    background: url(../jaunt_icon.png)">
         </div>
     </div>
 </main>

netty-websocket-http2-example/src/main/resources/web/index.js

@@ -37,7 +37,17 @@ websocket.onerror = error => {
    }
    stateView.style.textDecoration = 'underline';
    stateView.style.textDecorationColor = 'red';
-   stateView.innerHTML = `state: disconnected, websocket error ${address}`;
+   stateView.innerHTML = `state: disconnected, websocket error, message=${error.message}`;
+};
+
+websocket.onclose = event => {
+   pingButton.disabled = true;
+   if (pingHandle) {
+       clearInterval(pingHandle);
+   }
+   stateView.style.textDecoration = 'underline';
+   stateView.style.textDecorationColor = 'red';
+   stateView.innerHTML = `state: disconnected, websocket close, code=${event.code}`;
 };
 
 pingButton.onclick = () => {

netty-websocket-http2-perftest/gradle/dependency-locks/compileClasspath.lockfile

@@ -3,16 +3,16 @@
 # This file is expected to be part of source control.
 ch.qos.logback:logback-classic:1.2.3
 ch.qos.logback:logback-core:1.2.3
-io.netty:netty-buffer:4.1.59.Final
-io.netty:netty-codec-http2:4.1.59.Final
-io.netty:netty-codec-http:4.1.59.Final
-io.netty:netty-codec:4.1.59.Final
-io.netty:netty-common:4.1.59.Final
-io.netty:netty-handler:4.1.59.Final
-io.netty:netty-resolver:4.1.59.Final
-io.netty:netty-tcnative-boringssl-static:2.0.36.Final
-io.netty:netty-transport-native-epoll:4.1.59.Final
-io.netty:netty-transport-native-unix-common:4.1.59.Final
-io.netty:netty-transport:4.1.59.Final
+io.netty:netty-buffer:4.1.65.Final
+io.netty:netty-codec-http2:4.1.65.Final
+io.netty:netty-codec-http:4.1.65.Final
+io.netty:netty-codec:4.1.65.Final
+io.netty:netty-common:4.1.65.Final
+io.netty:netty-handler:4.1.65.Final
+io.netty:netty-resolver:4.1.65.Final
+io.netty:netty-tcnative-boringssl-static:2.0.38.Final
+io.netty:netty-transport-native-epoll:4.1.65.Final
+io.netty:netty-transport-native-unix-common:4.1.65.Final
+io.netty:netty-transport:4.1.65.Final
 org.hdrhistogram:HdrHistogram:2.1.12
 org.slf4j:slf4j-api:1.7.30

netty-websocket-http2/gradle/dependency-locks/compileClasspath.lockfile

@@ -2,12 +2,12 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.google.code.findbugs:jsr305:3.0.2
-io.netty:netty-buffer:4.1.59.Final
-io.netty:netty-codec-http2:4.1.59.Final
-io.netty:netty-codec-http:4.1.59.Final
-io.netty:netty-codec:4.1.59.Final
-io.netty:netty-common:4.1.59.Final
-io.netty:netty-handler:4.1.59.Final
-io.netty:netty-resolver:4.1.59.Final
-io.netty:netty-transport:4.1.59.Final
+io.netty:netty-buffer:4.1.65.Final
+io.netty:netty-codec-http2:4.1.65.Final
+io.netty:netty-codec-http:4.1.65.Final
+io.netty:netty-codec:4.1.65.Final
+io.netty:netty-common:4.1.65.Final
+io.netty:netty-handler:4.1.65.Final
+io.netty:netty-resolver:4.1.65.Final
+io.netty:netty-transport:4.1.65.Final
 org.slf4j:slf4j-api:1.7.30

netty-websocket-http2/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -1,14 +1,14 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-io.netty:netty-buffer:4.1.59.Final
-io.netty:netty-codec-http2:4.1.59.Final
-io.netty:netty-codec-http:4.1.59.Final
-io.netty:netty-codec:4.1.59.Final
-io.netty:netty-common:4.1.59.Final
-io.netty:netty-handler:4.1.59.Final
-io.netty:netty-resolver:4.1.59.Final
-io.netty:netty-transport:4.1.59.Final
+io.netty:netty-buffer:4.1.65.Final
+io.netty:netty-codec-http2:4.1.65.Final
+io.netty:netty-codec-http:4.1.65.Final
+io.netty:netty-codec:4.1.65.Final
+io.netty:netty-common:4.1.65.Final
+io.netty:netty-handler:4.1.65.Final
+io.netty:netty-resolver:4.1.65.Final
+io.netty:netty-transport:4.1.65.Final
 org.apiguardian:apiguardian-api:1.1.0
 org.assertj:assertj-core:3.19.0
 org.junit.jupiter:junit-jupiter-api:5.7.1

netty-websocket-http2/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -3,15 +3,15 @@
 # This file is expected to be part of source control.
 ch.qos.logback:logback-classic:1.2.3
 ch.qos.logback:logback-core:1.2.3
-io.netty:netty-buffer:4.1.59.Final
-io.netty:netty-codec-http2:4.1.59.Final
-io.netty:netty-codec-http:4.1.59.Final
-io.netty:netty-codec:4.1.59.Final
-io.netty:netty-common:4.1.59.Final
-io.netty:netty-handler:4.1.59.Final
-io.netty:netty-resolver:4.1.59.Final
-io.netty:netty-tcnative-boringssl-static:2.0.36.Final
-io.netty:netty-transport:4.1.59.Final
+io.netty:netty-buffer:4.1.65.Final
+io.netty:netty-codec-http2:4.1.65.Final
+io.netty:netty-codec-http:4.1.65.Final
+io.netty:netty-codec:4.1.65.Final
+io.netty:netty-common:4.1.65.Final
+io.netty:netty-handler:4.1.65.Final
+io.netty:netty-resolver:4.1.65.Final
+io.netty:netty-tcnative-boringssl-static:2.0.38.Final
+io.netty:netty-transport:4.1.65.Final
 org.apiguardian:apiguardian-api:1.1.0
 org.assertj:assertj-core:3.19.0
 org.junit.jupiter:junit-jupiter-api:5.7.1