improve clientHttp disconnect

Author: fabik111

arduino-cloud.js

@@ -57,6 +57,7 @@ module.exports = function (RED) {
           if (config.thing !== "" && config.property !== "") {
             this.arduinoRestClient = await connectionManager.getClientHttp(connectionConfig);
             if (this.arduinoRestClient){
+              this.arduinoRestClient.openConnections++;
               this.thing = config.thing;
               this.propertyId = config.property;
               this.propertyName = config.name;
@@ -73,8 +74,8 @@ module.exports = function (RED) {
                   this.status({ fill: "red", shape: "dot", text: "Error setting value" });
                 }
               });
-              this.on('close', function () {
-                connectionManager.deleteClientHttp(connectionConfig.credentials.clientid);
+              this.on('close', function (done) {
+                connectionManager.deleteClientHttp(connectionConfig.credentials.clientid).then(() => { done(); });
               });
             }else{
               this.status({ fill: "red", shape: "ring", text: "Connection Error" });
@@ -100,6 +101,7 @@ module.exports = function (RED) {
         try {
           this.arduinoRestClient = await connectionManager.getClientHttp(connectionConfig);
           if (this.arduinoRestClient){
+            this.arduinoRestClient.openConnections++;
             if (config.thing !== "" && config.property !== "") {
               this.thing = config.thing;
               this.propertyId = config.property;
@@ -135,8 +137,8 @@ module.exports = function (RED) {
                 }
               });
 
-              this.on('close', function () {
-                connectionManager.deleteClientHttp(connectionConfig.credentials.clientid);
+              this.on('close', function (done) {
+                connectionManager.deleteClientHttp(connectionConfig.credentials.clientid).then(() => { done(); });
               });
             }
           }else{
@@ -162,15 +164,16 @@ module.exports = function (RED) {
         try {
           this.arduinoRestClient = await connectionManager.getClientHttp(connectionConfig);
           if (this.arduinoRestClient){
+            this.arduinoRestClient.openConnections++;
             if (config.thing !== "" && config.property !== "") {
               this.thing = config.thing;
               this.propertyId = config.property;
               this.propertyName = config.name;
               const pollTime = this.timeWindowCount * this.timeWindowUnit;
               if (pollTime !== null && pollTime !== "" && pollTime !== undefined && Number.isInteger(parseInt(pollTime)) && parseInt(pollTime) !== 0) {
                 this.poll(connectionConfig, pollTime);
-                this.on('close', function () {
-                  connectionManager.deleteClientHttp(connectionConfig.credentials.clientid);
+                this.on('close', function (done) {
+                  connectionManager.deleteClientHttp(connectionConfig.credentials.clientid).then(() => { done(); });
                   if (this.pollTimeoutPoll)
                     clearTimeout(this.pollTimeoutPoll);
 
@@ -224,6 +227,7 @@ module.exports = function (RED) {
           if (config.thing !== "" && config.property !== "") {
             this.arduinoRestClient = await connectionManager.getClientHttp(connectionConfig);
             if (this.arduinoRestClient){
+              this.arduinoRestClient.openConnections++;
               this.thing = config.thing;
               this.propertyId = config.property;
               this.propertyName = config.name;
@@ -243,8 +247,8 @@ module.exports = function (RED) {
                 else
                   this.status({});
               });
-              this.on('close', function () {
-                connectionManager.deleteClientHttp(connectionConfig.credentials.clientid);
+              this.on('close', function (done) {
+                connectionManager.deleteClientHttp(connectionConfig.credentials.clientid).then(() => { done(); });
               });
             }else{
               this.status({ fill: "red", shape: "ring", text: "Connection Error" });

utils/arduino-cloud-api-wrapper.js

@@ -28,10 +28,10 @@ const apiProperties = new ArduinoIotClient.PropertiesV2Api(client);
 const apiSeries = new ArduinoIotClient.SeriesV2Api(client);
 const apiThings = new ArduinoIotClient.ThingsV2Api(client);
 
-class ArduinClientHttp {
+class ArduinoClientHttp {
   constructor(token) {
     this.token = token;
-
+    this.openConnections=0;
     if(process.env.API_BASE_PATH){
       client.basePath = process.env.API_BASE_PATH;
     }
@@ -74,4 +74,4 @@ class ArduinClientHttp {
     return apiSeries.seriesV2BatchQueryRaw(body);
   }
 }
-exports.ArduinClientHttp = ArduinClientHttp;
+exports.ArduinoClientHttp = ArduinoClientHttp;

utils/arduino-connection-manager.js

@@ -1,5 +1,5 @@
 const request = require("async-request");
-const ArduinClientHttp = require('./arduino-cloud-api-wrapper');
+const ArduinoClientHttp = require('./arduino-cloud-api-wrapper');
 const ArduinoClientMqtt = require ('../arduino-iot-client-mqtt/arduino-iot-client-mqtt');
 const accessTokenUri = process.env.NODE_RED_ACCESS_TOKEN_URI || 'https://login.arduino.cc/oauth/token';
 const accessTokenAudience = process.env.NODE_RED_ACCESS_TOKEN_AUDIENCE || 'https://api2.arduino.cc/iot';
@@ -129,7 +129,8 @@ async function getClientHttp(connectionConfig){
 
     var tokenInfo = await getToken(connectionConfig);
     if(tokenInfo !==undefined){
-      clientHttp= new ArduinClientHttp.ArduinClientHttp(tokenInfo.token);
+      clientHttp= new ArduinoClientHttp.ArduinoClientHttp(tokenInfo.token);
+
       var timeout = setTimeout(() => { updateToken(connectionConfig) }, tokenInfo.expires_in * 1000);
       connections.push({
         clientId: connectionConfig.credentials.clientid,
@@ -147,11 +148,12 @@ async function getClientHttp(connectionConfig){
     if(connections[user].clientHttp !== null){
       clientHttp = connections[user].clientHttp;
     }else{
-      clientHttp = new ArduinClientHttp.ArduinClientHttp(connections[user].token);
+      clientHttp = new ArduinoClientHttp.ArduinoClientHttp(connections[user].token);
 
       connections[user].clientHttp=clientHttp;
     }
   }
+
   releaseMutex();
   return clientHttp;
   }catch(err){
@@ -214,18 +216,23 @@ async function deleteClientMqtt(clientId, thing, propertyName ){
   releaseMutex();
 }
 
-function deleteClientHttp(clientId){
+async function deleteClientHttp(clientId){
+  const releaseMutex = await getClientMutex.acquire();
   var user = findUser(clientId);
   if(user !== -1){
     if(connections[user].clientHttp !== null){
-      connections[user].clientHttp= null;
+      connections[user].clientHttp.openConnections--;
+      if(connections[user].clientHttp.openConnections === 0){
+        connections[user].clientHttp= null;
+      }
     }
     if(connections[user].clientMqtt === null){
       if(connections[user].timeoutUpdateToken)
         clearTimeout(connections[user].timeoutUpdateToken);
       connections.splice(user,1);
     }
   }
+  releaseMutex();
 }
 
 async function reconnectMqtt(clientId){