fix arduinoWebSockets HTTP path (#283)

* use WS path instead of URL (#278)

* update arduinoWebSockets integration

Author: matth-x

CHANGELOG.md

@@ -40,6 +40,7 @@
 - Fix transaction freeze in offline mode ([#279](https://github.com/matth-x/MicroOcpp/pull/279), [#287](https://github.com/matth-x/MicroOcpp/pull/287))
 - Fix compilation error caused by `PRId32` ([#279](https://github.com/matth-x/MicroOcpp/pull/279))
 - Don't load FW-mngt. module when no handlers set ([#271](https://github.com/matth-x/MicroOcpp/pull/271))
+- Change arduinoWebSockets URL param to path ([#278](https://github.com/matth-x/MicroOcpp/issues/278))
 - Avoid creating conf when operation fails ([#290](https://github.com/matth-x/MicroOcpp/pull/290))
 - Fix whitespaces in MeterValues ([#301](https://github.com/matth-x/MicroOcpp/pull/301))
 

src/MicroOcpp.cpp

@@ -97,6 +97,7 @@ void mocpp_initialize(const char *backendUrl, const char *chargeBoxId, const cha
     //parse host, port
     std::string host_port_path = url.substr(url.find_first_of("://") + strlen("://"));
     std::string host_port = host_port_path.substr(0, host_port_path.find_first_of('/'));
+    std::string path = host_port_path.substr(host_port.length());
     std::string host = host_port.substr(0, host_port.find_first_of(':'));
     if (host.empty()) {
         MO_DBG_ERR("could not parse host: %s", url.c_str());
@@ -123,28 +124,29 @@ void mocpp_initialize(const char *backendUrl, const char *chargeBoxId, const cha
         }
     }
 
+    if (path.empty()) {
+        path = "/";
+    }
+
     if ((!*chargeBoxId) == '\0') {
-        if (url.back() != '/') {
-            url += '/';
+        if (path.back() != '/') {
+            path += '/';
         }
 
-        url += chargeBoxId;
+        path += chargeBoxId;
     }
 
-    MO_DBG_INFO("connecting to %s -- (host: %s, port: %u)", url.c_str(), host.c_str(), port);
+    MO_DBG_INFO("connecting to %s -- (host: %s, port: %u, path: %s)", url.c_str(), host.c_str(), port, path.c_str());
 
     if (!webSocket)
         webSocket = new WebSocketsClient();
 
-    if (isTLS)
-    {
-        // server address, port, URL and TLS certificate
-        webSocket->beginSslWithCA(host.c_str(), port, url.c_str(), CA_cert, "ocpp1.6");
-    }
-    else
-    {
-        // server address, port, URL
-        webSocket->begin(host.c_str(), port, url.c_str(), "ocpp1.6");
+    if (isTLS) {
+        // server address, port, path and TLS certificate
+        webSocket->beginSslWithCA(host.c_str(), port, path.c_str(), CA_cert, "ocpp1.6");
+    } else {
+        // server address, port, path
+        webSocket->begin(host.c_str(), port, path.c_str(), "ocpp1.6");
     }
 
     // try ever 5000 again if connection has failed

src/MicroOcpp/Core/Connection.cpp

@@ -72,7 +72,7 @@ void WSClient::setReceiveTXTcallback(ReceiveTXTcallback &callback) {
                 MO_DBG_INFO("Disconnected");
                 break;
             case WStype_CONNECTED:
-                MO_DBG_INFO("Connected to url: %s", payload);
+                MO_DBG_INFO("Connected (path: %s)", payload);
                 captureLastRecv = mocpp_tick_ms();
                 captureLastConnected = mocpp_tick_ms();
                 break;
@@ -112,4 +112,8 @@ unsigned long WSClient::getLastConnected() {
     return lastConnected;
 }
 
+bool WSClient::isConnected() {
+    return wsock->isConnected();
+}
+
 #endif

src/MicroOcpp/Core/Connection.h

@@ -118,6 +118,8 @@ class WSClient : public Connection {
     unsigned long getLastRecv() override; //get time of last successful receive in millis
 
     unsigned long getLastConnected() override; //get last connection creation in millis
+
+    bool isConnected() override;
 };
 
 } //end namespace EspWiFi