diff --git a/pom.xml b/pom.xml
index 2ba89f552..7507b67ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,7 +168,7 @@
2.6
2.2.50
2.0.5
- 5.0.12
+ 5.1.1
0.48.1
diff --git a/sqrl-cli/src/main/resources/templates/server-config.json b/sqrl-cli/src/main/resources/templates/server-config.json
index 51d30d10a..5709f9e4f 100644
--- a/sqrl-cli/src/main/resources/templates/server-config.json
+++ b/sqrl-cli/src/main/resources/templates/server-config.json
@@ -31,6 +31,9 @@
"reusePort" : false,
"tcpNoDelay" : true,
"tcpKeepAlive" : false,
+ "tcpKeepAliveCount" : 0,
+ "tcpKeepAliveIdleSeconds" : 0,
+ "tcpKeepAliveIntervalSeconds" : 0,
"soLinger" : -1,
"idleTimeout" : 0,
"readIdleTimeout" : 0,
@@ -48,9 +51,10 @@
"crlValues" : [ ],
"useAlpn" : false,
"enabledSecureTransportProtocols" : [ "TLSv1", "TLSv1.1", "TLSv1.2" ],
- "applicationLayerProtocols" : null,
+ "applicationLayerProtocols" : [ "h2", "http/1.1" ],
"clientAuth" : "NONE",
- "sni" : false
+ "sni" : false,
+ "useHybridKeyExchangeProtocol" : false
},
"tcpFastOpen" : false,
"tcpCork" : false,
@@ -67,7 +71,22 @@
"proxyProtocolTimeoutUnit" : "SECONDS",
"registerWriteHandler" : false,
"trafficShapingOptions" : null,
+ "transportOptions" : {
+ "sendBufferSize" : -1,
+ "receiveBufferSize" : -1,
+ "trafficClass" : -1,
+ "reuseAddress" : true,
+ "soLinger" : -1,
+ "soKeepAlive" : false,
+ "soReusePort" : false
+ },
"compressionSupported" : false,
+ "compression" : {
+ "compressionEnabled" : false,
+ "compressors" : null,
+ "contentSizeThreshold" : 0,
+ "decompressionEnabled" : false
+ },
"compressionLevel" : 6,
"compressionContentSizeThreshold" : 0,
"compressors" : null,
@@ -78,6 +97,12 @@
"maxChunkSize" : 8192,
"maxInitialLineLength" : 4096,
"maxHeaderSize" : 8192,
+ "http1Config" : {
+ "decoderInitialBufferSize" : 128,
+ "maxChunkSize" : 8192,
+ "maxHeaderSize" : 8192,
+ "maxInitialLineLength" : 4096
+ },
"maxFormAttributeSize" : 8192,
"maxFormFields" : 256,
"maxFormBufferedBytes" : 1024,
@@ -93,12 +118,41 @@
"alpnVersions" : [ "HTTP_2", "HTTP_1_1" ],
"http2ClearTextEnabled" : true,
"http2ConnectionWindowSize" : -1,
+ "http2Config" : {
+ "connectionWindowSize" : -1,
+ "initialSettings" : {
+ "headerTableSize" : 4096,
+ "pushEnabled" : true,
+ "maxConcurrentStreams" : 100,
+ "initialWindowSize" : 65535,
+ "maxFrameSize" : 16384,
+ "maxHeaderListSize" : 8192,
+ "extraSettings" : null
+ },
+ "maxSmallContinuationFrames" : 16,
+ "multiplexImplementation" : false,
+ "rstFloodMaxRstFramePerWindow" : 200,
+ "rstFloodWindowDuration" : 30.000000000
+ },
+ "http2MultiplexImplementation" : false,
"decompressionSupported" : false,
"acceptUnmaskedFrames" : false,
"decoderInitialBufferSize" : 128,
"perFrameWebSocketCompressionSupported" : true,
"perMessageWebSocketCompressionSupported" : true,
"webSocketCompressionLevel" : 6,
+ "webSocketConfig" : {
+ "closingTimeout" : 10.000000000,
+ "compressionLevel" : 6,
+ "maxFrameSize" : 65536,
+ "maxMessageSize" : 262144,
+ "subProtocols" : [ "graphql-transport-ws", "graphql-ws" ],
+ "useClientNoContext" : false,
+ "usePerFrameCompression" : true,
+ "usePerMessageCompression" : true,
+ "useServerNoContext" : false,
+ "useUnmaskedFrames" : false
+ },
"webSocketAllowServerNoContext" : false,
"webSocketPreferredClientNoContext" : false,
"webSocketClosingTimeout" : 10,
@@ -109,6 +163,7 @@
"http2RstFloodWindowDuration" : 30,
"http2RstFloodWindowDurationTimeUnit" : "SECONDS",
"strictThreadMode" : false,
+ "metricsName" : "",
"enabledSecureTransportProtocols" : [ "TLSv1", "TLSv1.1", "TLSv1.2" ],
"useAlpn" : false,
"sni" : false,
@@ -141,6 +196,7 @@
"sslOptions" : null,
"pipeliningLimit" : 256,
"sslMode" : "DISABLE",
+ "sslNegotiation" : "POSTGRES",
"useLayer7Proxy" : false,
"socketAddress" : {
"inetSocket" : true,
diff --git a/sqrl-testing/sqrl-testing-container/src/test/java/com/datasqrl/container/testing/VertxContainerIT.java b/sqrl-testing/sqrl-testing-container/src/test/java/com/datasqrl/container/testing/VertxContainerIT.java
index 6473dd8fd..6f679de54 100644
--- a/sqrl-testing/sqrl-testing-container/src/test/java/com/datasqrl/container/testing/VertxContainerIT.java
+++ b/sqrl-testing/sqrl-testing-container/src/test/java/com/datasqrl/container/testing/VertxContainerIT.java
@@ -89,17 +89,14 @@ void givenTraceRequestsEnabled_whenHttpRequestsMade_thenLogPathAndBody() {
}
assertThat(graphiql)
- .contains("")
+ .containsIgnoringCase("")
.contains("")
.contains("
GraphiQL")
.contains("window.VERTX_GRAPHIQL_CONFIG")
.contains("\"httpEnabled\":true")
.contains("\"graphQLUri\":\"/v1/graphql\"")
.contains("\"graphQLWSEnabled\":true")
- .contains("\"graphQLWSUri\":\"/v1/graphql\"")
- .contains("static/js/main.")
- .contains("static/css/main.")
- .contains("");
+ .contains("\"graphQLWSUri\":\"/v1/graphql\"");
assertTraceLogContains("GET /v1/graphiql/");
}