Added Draft HTTP Health Check

Author: danielcaro

…hargetime/ocpp/HttpHealthCheckDraft.java …argetime/ocpp/Draft_HttpHealthCheck.javaocpp-v1_6/src/main/java/eu/chargetime/ocpp/HttpHealthCheckDraft.java renamed to OCPP-J/src/main/java/eu/chargetime/ocpp/Draft_HttpHealthCheck.java ocpp-v1_6/src/main/java/eu/chargetime/ocpp/HttpHealthCheckDraft.java renamed to OCPP-J/src/main/java/eu/chargetime/ocpp/Draft_HttpHealthCheck.java

@@ -1,5 +1,7 @@
 package eu.chargetime.ocpp;
-
+/*
+ * Based ON https://github.com/TooTallNate/Java-WebSocket/issues/1077
+ */
 import org.java_websocket.WebSocketImpl;
 import org.java_websocket.drafts.Draft;
 import org.java_websocket.enums.CloseHandshakeType;
@@ -14,9 +16,11 @@
 import java.util.Collections;
 import java.util.List;
 
-class HttpHealthCheckDraft extends Draft {
+class Draft_HttpHealthCheck extends Draft {
+
+    static final int HTTP_HEALTH_CHECK_CLOSE_CODE = 10200;
 
-    private Boolean isHttp(ClientHandshake handshakedata) {
+    static Boolean isHttp(ClientHandshake handshakedata) {
         String upgradeField = handshakedata.getFieldValue("Upgrade");
         return upgradeField == null || upgradeField == "";
     }
@@ -28,7 +32,7 @@ public List<ByteBuffer> createHandshake(Handshakedata handshakedata, boolean wit
                 "HTTP/1.0 200 OK\r\n" +
                         "Mime-Version: 1.0\r\n" +
                         "Content-Type: text/html\r\n" +
-                        "Content-Length: ${content.size}\r\n" +
+                        "Content-Length: " + content.length + " \r\n" +
                         "Connection: close\r\n" +
                         "\r\n"
         );

OCPP-J/src/main/java/eu/chargetime/ocpp/WebSocketListener.java

@@ -87,6 +87,11 @@ public void open(String hostname, int port, ListenerEvents handler) {
                 drafts) {
           @Override
           public void onOpen(WebSocket webSocket, ClientHandshake clientHandshake) {
+            if(Draft_HttpHealthCheck.isHttp(clientHandshake)){
+              logger.debug("On HTTP Request, for heathcheck");
+              webSocket.close(Draft_HttpHealthCheck.HTTP_HEALTH_CHECK_CLOSE_CODE);
+              return;
+            }
             logger.debug(
                 "On connection open (resource descriptor: {})",
                 clientHandshake.getResourceDescriptor());
@@ -183,6 +188,9 @@ public void onClose(WebSocket webSocket, int code, String reason, boolean remote
                 reason,
                 remote);
 
+            if(code == Draft_HttpHealthCheck.HTTP_HEALTH_CHECK_CLOSE_CODE)
+              return;
+
             WebSocketReceiver receiver = sockets.get(webSocket);
             if (receiver != null) {
               receiver.disconnect();

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/JSONServer.java

@@ -68,8 +68,13 @@ public JSONServer(ServerCoreProfile coreProfile, JSONConfiguration configuration
     protocols.add(new Protocol("ocpp1.6"));
     protocols.add(new Protocol(""));
     draftOcppOnly = new Draft_6455(Collections.emptyList(), protocols);
-    logger.info("JSONServer 1.6 with HttpHealthCheckDraft");
-    this.listener = new WebSocketListener(sessionFactory, configuration, draftOcppOnly, new HttpHealthCheckDraft());
+
+    if(configuration.getParameter("HTTP_HEALTH_CHECK_ENABLED", true)) {
+      logger.info("JSONServer 1.6 with HttpHealthCheckDraft");
+      this.listener = new WebSocketListener(sessionFactory, configuration, draftOcppOnly, new Draft_HttpHealthCheck());
+    } else {
+      this.listener = new WebSocketListener(sessionFactory, configuration, draftOcppOnly);
+    }
     server = new Server(this.listener, featureRepository, new PromiseRepository());
     featureRepository.addFeatureProfile(coreProfile);
   }