Testing

src/netatmo/netatmoaddindoordevice.hpp

@@ -70,7 +70,7 @@ namespace netatmo {
     virtual void updateData(JsonObjectPtr aJson) P44_OVERRIDE;
 
   };
-  
+
 
 } // namespace netatmo
 

src/netatmo/netatmocomm.cpp

@@ -55,6 +55,11 @@ Operation::Operation(
 
 void Operation::sendRequest()
 {
+  if (retryCounter-- == 0) {
+    abortOperation(TextError::err("Retry counter exceeded -> aborting"));
+    return;
+  }
+
   if (auto path = buildQuery(query)) {
     urlPath = *path;
     httpClient.getApi().clearRequestHeaders();
@@ -244,7 +249,7 @@ void Comm::requestRefreshToken(HttpCommCB aCompletedCB)
 void Comm::scheduleRefreshAccessToken()
 {
   refreshTokenCounter.increase();
-  LOG(LOG_DEBUG, "Schedule refresh access token in %d seconds", refreshTokenCounter.getInterval() / p44::Second);
+  LOG(LOG_DEBUG, "Schedule refresh access token in %llu seconds", refreshTokenCounter.getInterval() / p44::Second);
   auto requestTokenCB = [=](const string& aResponse, ErrorPtr aError){
     if (!p44::Error::isOK(aError)) {
       LOG(LOG_NOTICE, "Error %s Response %s", aError->description().c_str(), aResponse.c_str());
@@ -256,6 +261,7 @@ void Comm::scheduleRefreshAccessToken()
         LOG(LOG_NOTICE, "Error refreshing token: %s", aError->description().c_str());
         return;
       }
+      startPollCycle();
       LOG(LOG_NOTICE, "Token successfully refreshed");
       setAccountStatus(AccountStatus::connected);
     });
@@ -332,7 +338,6 @@ void Comm::setAccountStatus(AccountStatus aStatus)
   if (accountStatus != aStatus) {
     LOG(LOG_DEBUG, "Comm::setAccountStatus : account status changed from %s to %s", toString(accountStatus).c_str(), toString(aStatus).c_str());
     accountStatus = aStatus;
-    statusUpdatedCB(accountStatus);
   }
 }
 

src/netatmo/netatmocomm.hpp

@@ -20,8 +20,8 @@
 //
 #pragma once
 
+#include <limits>
 #include "p44vdc_common.hpp"
-
 #include "boost/optional.hpp"
 #include "boost/signals2.hpp"
 #include "jsonobject.hpp"
@@ -75,34 +75,40 @@ namespace netatmo {
      AccountStatus accountStatus;
 
      class RefreshTokenCounter {
-       unsigned int counter;
-       static constexpr unsigned int REFRESH_TOKEN_INTERVAL_MAX = 5;
+       using Counter_t = unsigned int;
+       Counter_t counter;
      public:
        RefreshTokenCounter() :
          counter(0) {}
-       void increase(){ if (counter < REFRESH_TOKEN_INTERVAL_MAX) ++counter; }
+       void increase(){ if (counter < std::numeric_limits<Counter_t>::max()) ++counter; }
        void reset() { counter = 0; }
-       p44::MLMicroSeconds getInterval() { return counter * p44::Minute; }
+       p44::MLMicroSeconds getInterval() {
+         switch (counter) {
+           case 0: return 0;
+           case 1: return 1 * p44::Minute;
+           case 2: return 1 * p44::Minute;
+           case 3: return 2 * p44::Minute;
+           case 4: return 4 * p44::Minute;
+           default:
+             return 10 * p44::Minute;
+         }
+       }
      } refreshTokenCounter ;
 
      boost::signals2::signal<void(JsonObjectPtr)> dataPollCBs;
      std::unique_ptr<IPersistentStorageWithRowId> storage;
 
-     // basing on api description: 
-     // "Do not try to pull data every minute. 
+     // basing on api description:
+     // "Do not try to pull data every minute.
      // Netatmo Weather Station sends its measures to the server every ten minutes"
      static const MLMicroSeconds POLLING_INTERVAL = (10*Minute);
 
-     StatusUpdateCB statusUpdatedCB;
      void setAccountStatus(AccountStatus aStatus);
 
    public:
-
      Comm(IPersistentStorageFactory& aStorageFactory, const string& aRowId, const string& aSslCAFile);
      virtual ~Comm();
 
-     void setAccountStatusChangedCB(StatusUpdateCB aStatusUpdatedCB){ statusUpdatedCB = std::move(aStatusUpdatedCB); };
-
      void setAccessData(const AccessData& aAccessData);
      string getAccessToken() const { return accessData.token; }
      string getRefreshToken() const { return accessData.refreshToken; }
@@ -146,12 +152,12 @@ namespace netatmo {
      static const string BASE_URL;
      static const string GET_STATIONS_DATA_URL;
      static const string GET_HOME_COACHS_URL;
-     
+     uint retryCounter {3};
+
      const string& accessToken;
      const Comm::Query query;
 
      virtual void sendRequest() P44_OVERRIDE;
-//      virtual void processAnswer(const string& aResponse, ErrorPtr aError) P44_OVERRIDE;
 
    public:
      Operation(

src/netatmo/netatmohealthycoachdevice.hpp

@@ -79,7 +79,7 @@ namespace netatmo {
     static boost::optional<StatusHealthIndex> getHealthIndex(uint8_t aIndex);
 
   };
-  
+
 
 } // namespace netatmo
 

src/netatmo/netatmoindoorbasedevice.hpp

@@ -74,7 +74,7 @@ namespace netatmo {
     virtual void configureDevice() P44_OVERRIDE;
     virtual void updateData(JsonObjectPtr aJson) P44_OVERRIDE;
   };
-  
+
 
 } // namespace netatmo