chore: Fix back-off logic

Author: zfields

src/AIoTC_Config.h

@@ -160,12 +160,19 @@
   #define AIOT_CONFIG_RECONNECTION_RETRY_DELAY_ms                  (1000UL)
   #define AIOT_CONFIG_MAX_RECONNECTION_RETRY_DELAY_ms             (32000UL)
 
-  #define AIOT_CONFIG_THING_ID_REQUEST_RETRY_DELAY_ms              (2000UL)
-  #define AIOT_CONFIG_MAX_THING_ID_REQUEST_RETRY_DELAY_ms         (32000UL)
+  #if defined(USE_NOTECARD)
+    // 10x the standard delays for Notecard
+    #define AIOT_CONFIG_THING_ID_REQUEST_RETRY_DELAY_ms             (20000UL)
+    #define AIOT_CONFIG_MAX_THING_ID_REQUEST_RETRY_DELAY_ms        (320000UL)
+  #else
+    #define AIOT_CONFIG_THING_ID_REQUEST_RETRY_DELAY_ms              (2000UL)
+    #define AIOT_CONFIG_MAX_THING_ID_REQUEST_RETRY_DELAY_ms         (32000UL)
+  #endif
+
   #define AIOT_CONFIG_THING_ID_REQUEST_MAX_RETRY_CNT                 (10UL)
 
   #define AIOT_CONFIG_DEVICE_REGISTERED_RETRY_DELAY_k                (10UL)
-  #define AIOT_CONFIG_MAX_DEVICE_REGISTERED_RETRY_DELAY_k             (4UL)
+  #define AIOT_CONFIG_MAX_DEVICE_REGISTERED_RETRY_DELAY_k            (40UL)
 
   #define AIOT_CONFIG_TIMEOUT_FOR_LASTVALUES_SYNC_ms              (30000UL)
   #define AIOT_CONFIG_LASTVALUES_SYNC_MAX_RETRY_CNT                  (10UL)

src/ArduinoIoTCloudNotecard.cpp

@@ -43,13 +43,9 @@
  * CONSTANTS
  ******************************************************************************/
 
-#ifdef BACKOFF
-static size_t const BACKOFF_BASE_MS = 60000;           // 1 minute
-static uint32_t const BACKOFF_MAX_MS = 3600000;        // 1 hour
-#endif
 static size_t const CBOR_NOTE_MSG_MAX_SIZE = 255;
 static size_t const DEFAULT_READ_INTERVAL_MS = 1000;   // 1 second
-static size_t const FAILSAFE_READ_INTERVAL_MS = 10000; // 10 seconds
+static size_t const FAILSAFE_READ_INTERVAL_MS = 15000; // 15 seconds
 
 /******************************************************************************
  * LOCAL MODULE FUNCTIONS
@@ -76,10 +72,6 @@ ArduinoIoTCloudNotecard::ArduinoIoTCloudNotecard()
   ,_message_stream(std::bind(&ArduinoIoTCloudNotecard::sendMessage, this, std::placeholders::_1))
   ,_thing(&_message_stream)
   ,_device(&_message_stream)
-#ifdef BACKOFF
-  ,_backoff_multiplier{1}
-  ,_last_failed_attach_request_ms{0}
-#endif
   ,_notecard_last_read_ms{static_cast<uint32_t>(-DEFAULT_READ_INTERVAL_MS)}
   ,_notecard_read_interval_ms{DEFAULT_READ_INTERVAL_MS}
   ,_interrupt_pin{-1}
@@ -120,7 +112,6 @@ int ArduinoIoTCloudNotecard::begin(ConnectionHandler &connection_, int interrupt
     return 0; // (false -> failure)
   }
 
-  //TODO: Remove if not needed
   // Pull the Arduino IoT Cloud Device ID from the Notecard
   setDeviceId(notecard_connection->getDeviceId());
 
@@ -153,7 +144,6 @@ void ArduinoIoTCloudNotecard::printDebugInfo()
   NetworkConnectionState conn_state = _connection->check();
   DEBUG_INFO("***** Arduino IoT Cloud Notecard - configuration info *****");
   DEBUG_INFO("Notecard UID: %s", reinterpret_cast<NotecardConnectionHandler *>(_connection)->getNotecardUid().c_str());
-  //TODO: Remove if not needed
   DEBUG_INFO("Arduino Device ID: %s", getDeviceId().c_str());
   if (NetworkConnectionState::CONNECTED == conn_state)
   {
@@ -221,20 +211,6 @@ ArduinoIoTCloudNotecard::State ArduinoIoTCloudNotecard::handle_Connected()
   /* Poll Notecard for new messages */
   pollNotecard();
 
-#ifdef BACKOFF
-  /* Respect back-off */
-  if (_last_failed_attach_request_ms) {
-    const uint32_t backoff_ms = (BACKOFF_BASE_MS * _backoff_multiplier);
-    if ((::millis() - _last_failed_attach_request_ms) < backoff_ms) {
-      return State::Connected;
-    } else {
-      DEBUG_DEBUG("ArduinoIoTCloudNotecard::%s back-off expired.", __FUNCTION__);
-      _backoff_multiplier <<= (BACKOFF_MAX_MS > backoff_ms);
-      _last_failed_attach_request_ms = 0;
-    }
-  }
-#endif
-
   /* Call CloudDevice process to get configuration */
   _device.update();
 
@@ -401,23 +377,14 @@ void ArduinoIoTCloudNotecard::processCommand(const uint8_t *buf, size_t len)
         String new_thing_id = String(command.thingUpdateCmd.params.thing_id);
 
         if (!new_thing_id.length()) {
-#ifdef BACKOFF
-          _last_failed_attach_request_ms = ::millis();
-          DEBUG_DEBUG("ArduinoIoTCloudNotecard::%s received null Thing ID (current back-off: %u minute%s).", __FUNCTION__, _backoff_multiplier, ((_backoff_multiplier == 1) ? "" : "s"));
-#endif
+          DEBUG_DEBUG("ArduinoIoTCloudNotecard::%s received null Thing ID.", __FUNCTION__);
           _thing_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx";
 
           /* Send message to device state machine to inform we have received a null thing-id */
           Message message;
           message = { DeviceRegisteredCmdId };
           _device.handleMessage(&message);
         } else {
-#ifdef BACKOFF
-          DEBUG_VERBOSE("ArduinoIoTCloudNotecard::%s resetting back-off variables", __FUNCTION__);
-          /* Reset back-off variables */
-          _backoff_multiplier = 1;
-          _last_failed_attach_request_ms = 0;
-#endif
           if (_device.isAttached() && _thing_id != new_thing_id) {
             DEBUG_DEBUG("ArduinoIoTCloudNotecard::%s detaching Thing ID: %s", __FUNCTION__, _thing_id.c_str());
             detachThing();

src/ArduinoIoTCloudNotecard.h

@@ -107,10 +107,6 @@ class ArduinoIoTCloudNotecard : public ArduinoIoTCloudClass
     ArduinoCloudDevice _device;
 
     // Notecard member variables
-#ifdef BACKOFF
-    uint32_t _backoff_multiplier;
-    uint32_t _last_failed_attach_request_ms;
-#endif // BACKOFF
     uint32_t _notecard_last_read_ms;
     uint32_t _notecard_read_interval_ms;
     int _interrupt_pin;