fix disconnect procedures

Author: fabik111

arduino-iot-client-mqtt/arduino-iot-client-mqtt.js

@@ -179,7 +179,8 @@ class ArduinoClientMqtt {
       });
 
       if (typeof this.opts.onDisconnect === 'function') {
-        client.on("close", this.opts.onDisconnect);
+        client.on("offline", this.opts.onDisconnect);
+        client.on("disconnect", this.opts.onDisconnect);
       }
     });
   }
@@ -221,7 +222,7 @@ class ArduinoClientMqtt {
       try {
         if (this.connection) {
           // Disconnect to the connection that is using the old token
-          this.connection.end();
+          await this.connection.end();
 
           // Remove the connection
           this.connection = null;

package-lock.json

@@ -25,6 +25,7 @@
     "jws": "^3.2.2",
     "lodash": "^4.17.15",
     "moment": "^2.24.0",
-    "mqtt": "^3.0.0"
+    "mqtt": "^3.0.0",
+    "request": "^2.88.0"
   }
 }

package.json

@@ -67,9 +67,9 @@ async function getClientMqtt(connectionConfig){
       const ArduinoCloudOptions = {
         host: arduinoCloudHost,
         token: tokenInfo.token,
-        onDisconnect: () => {
+        onDisconnect: (clientId) => {
           // TODO: cosa vuol dire ?
-          disconnected(clientId);
+          //disconnected(clientId);
           console.log(`connection lost for ${clientId}`);
         },
         useCloudProtocolV2: true
@@ -192,11 +192,12 @@ async function updateToken(connectionConfig){
 }
 
 async function deleteClientMqtt(clientId, thing, propertyName ){
+  const releaseMutex = await getClientMutex.acquire();
   var user = findUser(clientId);
   if(user !== -1){
     if(connections[user].clientMqtt !== null){
       var ret = await connections[user].clientMqtt.removePropertyValueCallback(thing, propertyName);
-      // TODO: NOT CLEAR WHAT FOLLOWS. SHOULD BE -1 INSTEAD OF 0 ?
+
       if(ret === 0){
         await connections[user].clientMqtt.disconnect();
         delete connections[user].clientMqtt;
@@ -209,6 +210,7 @@ async function deleteClientMqtt(clientId, thing, propertyName ){
       }
     }
   }
+  releaseMutex();
 }
 
 function deleteClientHttp(clientId){