Fix #130, #147, #160 and #166 (#165)

* Solved setWill() cause mqtt could not connect with SSL enable #107
#107

* Fixed #160

* Fixed bug #147

* Fixed #166
- ESP32 now also uses a unique client id
- getClientId() fuction added

* Solved Minor Flaw #147 (comment)

Author: jeroenst

src/AsyncMqttClient.cpp

@@ -3,7 +3,7 @@
 AsyncMqttClient::AsyncMqttClient()
 : _connected(false)
 , _connectPacketNotEnoughSpace(false)
-, _disconnectFlagged(false)
+, _disconnectOnPoll(false)
 , _tlsBadFingerprint(false)
 , _lastClientActivity(0)
 , _lastServerActivity(0)
@@ -37,10 +37,10 @@ AsyncMqttClient::AsyncMqttClient()
   _client.onPoll([](void* obj, AsyncClient* c) { (static_cast<AsyncMqttClient*>(obj))->_onPoll(c); }, this);
 
 #ifdef ESP32
-  sprintf(_generatedClientId, "esp32%06x", ESP.getEfuseMac());
+  sprintf(_generatedClientId, "esp32-%06llx", ESP.getEfuseMac());
   _xSemaphore = xSemaphoreCreateMutex();
 #elif defined(ESP8266)
-  sprintf(_generatedClientId, "esp8266%06x", ESP.getChipId());
+  sprintf(_generatedClientId, "esp8266-%06x", ESP.getChipId());
 #endif
   _clientId = _generatedClientId;
 
@@ -158,7 +158,7 @@ void AsyncMqttClient::_freeCurrentParsedPacket() {
 void AsyncMqttClient::_clear() {
   _lastPingRequestTime = 0;
   _connected = false;
-  _disconnectFlagged = false;
+  _disconnectOnPoll = false;
   _connectPacketNotEnoughSpace = false;
   _tlsBadFingerprint = false;
   _freeCurrentParsedPacket();
@@ -311,12 +311,26 @@ void AsyncMqttClient::_onConnect(AsyncClient* client) {
   }
 
   _client.add(fixedHeader, 1 + remainingLengthLength);
-  _client.add(protocolNameLengthBytes, 2);
-  _client.add("MQTT", protocolNameLength);
-  _client.add(protocolLevel, 1);
-  _client.add(connectFlags, 1);
-  _client.add(keepAliveBytes, 2);
-  _client.add(clientIdLengthBytes, 2);
+
+  // Using a sendbuffer to fix bug setwill on SSL not working
+  char sendbuffer[12];
+  sendbuffer[0] = protocolNameLengthBytes[0];
+  sendbuffer[1] = protocolNameLengthBytes[1];
+
+  sendbuffer[2] = 'M';
+  sendbuffer[3] = 'Q';
+  sendbuffer[4] = 'T';
+  sendbuffer[5] = 'T';
+  
+  sendbuffer[6] = protocolLevel[0];
+  sendbuffer[7] = connectFlags[0];
+  sendbuffer[8] = keepAliveBytes[0];
+  sendbuffer[9] = keepAliveBytes[1];
+  sendbuffer[10] = clientIdLengthBytes[0];
+  sendbuffer[11] = clientIdLengthBytes[1];
+
+  _client.add(sendbuffer, 12);
+
   _client.add(_clientId, clientIdLength);
   if (_willTopic != nullptr) {
     _client.add(willTopicLengthBytes, 2);
@@ -340,19 +354,19 @@ void AsyncMqttClient::_onConnect(AsyncClient* client) {
 
 void AsyncMqttClient::_onDisconnect(AsyncClient* client) {
   (void)client;
-  if (!_disconnectFlagged) {
-    AsyncMqttClientDisconnectReason reason;
+  AsyncMqttClientDisconnectReason reason;
 
-    if (_connectPacketNotEnoughSpace) {
-      reason = AsyncMqttClientDisconnectReason::ESP8266_NOT_ENOUGH_SPACE;
-    } else if (_tlsBadFingerprint) {
-      reason = AsyncMqttClientDisconnectReason::TLS_BAD_FINGERPRINT;
-    } else {
-      reason = AsyncMqttClientDisconnectReason::TCP_DISCONNECTED;
-    }
-    for (auto callback : _onDisconnectUserCallbacks) callback(reason);
+  if (_connectPacketNotEnoughSpace) {
+    reason = AsyncMqttClientDisconnectReason::ESP8266_NOT_ENOUGH_SPACE;
+  } else if (_tlsBadFingerprint) {
+    reason = AsyncMqttClientDisconnectReason::TLS_BAD_FINGERPRINT;
+  } else {
+    reason = AsyncMqttClientDisconnectReason::TCP_DISCONNECTED;
   }
+
   _clear();
+
+  for (auto callback : _onDisconnectUserCallbacks) callback(reason);
 }
 
 void AsyncMqttClient::_onError(AsyncClient* client, int8_t error) {
@@ -460,13 +474,14 @@ void AsyncMqttClient::_onPoll(AsyncClient* client) {
     _sendPing();
   }
 
+
   // handle to send ack packets
 
   _sendAcks();
 
   // handle disconnect
 
-  if (_disconnectFlagged) {
+  if (_disconnectOnPoll) {
     _sendDisconnect();
   }
 }
@@ -485,8 +500,7 @@ void AsyncMqttClient::_onConnAck(bool sessionPresent, uint8_t connectReturnCode)
     _connected = true;
     for (auto callback : _onConnectUserCallbacks) callback(sessionPresent);
   } else {
-    for (auto callback : _onDisconnectUserCallbacks) callback(static_cast<AsyncMqttClientDisconnectReason>(connectReturnCode));
-    _disconnectFlagged = true;
+    // Callbacks are handled by the ondisconnect function which is called from the AsyncTcp lib
   }
 }
 
@@ -672,7 +686,7 @@ bool AsyncMqttClient::_sendDisconnect() {
   _client.send();
   _client.close(true);
 
-  _disconnectFlagged = false;
+  _disconnectOnPoll = false;
 
   SEMAPHORE_GIVE();
   return true;
@@ -715,8 +729,8 @@ void AsyncMqttClient::disconnect(bool force) {
   if (force) {
     _client.close(true);
   } else {
-    _disconnectFlagged = true;
     _sendDisconnect();
+    _disconnectOnPoll = false;
   }
 }
 
@@ -875,3 +889,7 @@ uint16_t AsyncMqttClient::publish(const char* topic, uint8_t qos, bool retain, c
     return 1;
   }
 }
+
+const char* AsyncMqttClient::getClientId() {
+  return _clientId;
+}

src/AsyncMqttClient.hpp

@@ -78,18 +78,20 @@ class AsyncMqttClient {
   uint16_t unsubscribe(const char* topic);
   uint16_t publish(const char* topic, uint8_t qos, bool retain, const char* payload = nullptr, size_t length = 0, bool dup = false, uint16_t message_id = 0);
 
+  const char* getClientId();
+
  private:
   AsyncClient _client;
 
   bool _connected;
   bool _connectPacketNotEnoughSpace;
-  bool _disconnectFlagged;
+  bool _disconnectOnPoll;
   bool _tlsBadFingerprint;
   uint32_t _lastClientActivity;
   uint32_t _lastServerActivity;
   uint32_t _lastPingRequestTime;
 
-  char _generatedClientId[13 + 1];  // esp8266abc123
+  char _generatedClientId[18 + 1];  // esp8266-abc123 and esp32-abcdef123456 
   IPAddress _ip;
   const char* _host;
   bool _useIp;