Token refresh only in case of errors (#56)

* feat: reduce token refresh

* improve refresh token http

* fix get properties

* fix errors

* remove token refresh loop for http client

* remove expiration field

* make a single refresh token

* fix: add organizationID to getToken method

---------

Co-authored-by: mirkokurt <mirko.curtolo86@gmail.com>

Author: lucarin91

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

@@ -230,7 +230,7 @@ class ArduinoClientMqtt {
   }
 
   async reconnect() {
-    await this.connection.reconnect();
+    this.connection.reconnect();
   };
 
   async updateToken(token) {
@@ -241,7 +241,7 @@ class ArduinoClientMqtt {
       try {
         if (this.connection) {
           // Disconnect to the connection that is using the old token
-          await this.connection.end();
+          this.connection.end();
 
           // Remove the connection
           this.connection = null;
@@ -627,6 +627,9 @@ class ArduinoClientMqtt {
       node=nodeId;
     }
     const propOutputTopic = `/a/t/${thingId}/e/o`;
+    if (!this.propertyCallback[propOutputTopic] || !this.propertyCallback[propOutputTopic][name]) {
+      return Promise.resolve(this.numSubscriptions);
+    }
     var pos=-1;
     for(var i=0; i<this.propertyCallback[propOutputTopic][name].length; i++){
       var cbObject=this.propertyCallback[propOutputTopic][name][i];
@@ -656,4 +659,4 @@ function toArrayBuffer(buf) {
   return ab;
 }
 
-exports.ArduinoClientMqtt = ArduinoClientMqtt;
+exports.ArduinoClientMqtt = ArduinoClientMqtt;

arduino-iot-cloud.js

@@ -75,7 +75,7 @@ module.exports = function (RED) {
         try {
 
           if (config.thing !== "" && config.property !== "") {
-            this.arduinoRestClient = await connectionManager.getClientHttp(connectionConfig, this.organization);
+            this.arduinoRestClient = await connectionManager.getClientHttp(connectionConfig, config.organization);
             if (this.arduinoRestClient){
               this.arduinoRestClient.openConnections++;
               this.organization = config.organization;
@@ -152,7 +152,7 @@ module.exports = function (RED) {
       this.timeWindowUnit = config.timeWindowUnit;
       if (connectionConfig && config.thing !== "" && config.thing !== "0" && config.property !== "" && config.property !== "0") {
         try {
-          this.arduinoRestClient = await connectionManager.getClientHttp(connectionConfig, this.organization);
+          this.arduinoRestClient = await connectionManager.getClientHttp(connectionConfig, config.organization);
           if (this.arduinoRestClient){
             this.arduinoRestClient.openConnections++;
             if (config.thing !== "" && config.property !== "") {
@@ -251,7 +251,7 @@ module.exports = function (RED) {
       this.organization = config.organization;
       if (connectionConfig && config.thing !== "" && config.thing !== "0" && config.property !== "" && config.property !== "0") {
         try {
-          this.arduinoRestClient = await connectionManager.getClientHttp(connectionConfig, this.organization);
+          this.arduinoRestClient = await connectionManager.getClientHttp(connectionConfig, config.organization);
           if (this.arduinoRestClient){
             this.arduinoRestClient.openConnections++;
             if (config.thing !== "" && config.property !== "") {
@@ -340,7 +340,7 @@ module.exports = function (RED) {
         try {
 
           if (config.thing !== "" && config.property !== "") {
-            this.arduinoRestClient = await connectionManager.getClientHttp(connectionConfig, this.organization);
+            this.arduinoRestClient = await connectionManager.getClientHttp(connectionConfig, config.organization);
             if (this.arduinoRestClient){
               this.arduinoRestClient.openConnections++;
               this.organization = config.organization;
@@ -476,7 +476,7 @@ module.exports = function (RED) {
       }
     } catch (err) {
       str=RED._("arduino-iot-cloud.connection-error.wrong-cred-sys-unvail");
-      console.log(`Status: ${err.status}, message: ${err.error}`);
+      console.log(`getThingsOrProperties status: ${err.status}, message: ${err.error} (error: ${err})`);
       return res.send(JSON.stringify({ error: str }));
     }
   }