featL android remote persist with auto retry

Author: Jasonvdb

lib/android/src/main/java/com/reactnativeldk/classes/BackupClient.kt

@@ -174,6 +174,36 @@ class BackupClient {
             }
         }
 
+        @Throws(BackupError::class)
+        fun persist(label: Label, bytes: ByteArray, retry: Int) {
+            var attempts = 0
+            var persistError: Exception? = null
+
+            while (attempts < retry) {
+                try {
+                    persist(label, bytes)
+
+                    LdkEventEmitter.send(
+                        EventTypes.native_log,
+                        "Remote persist success for ${label.string} after ${attempts+1} attempts"
+                    )
+                    return
+                } catch (error: Exception) {
+                    persistError = error
+                    attempts += 1
+                    LdkEventEmitter.send(
+                        EventTypes.native_log,
+                        "Remote persist failed for ${label.string} ($attempts attempts)"
+                    )
+                    Thread.sleep(attempts.toLong()) // Ease off with each attempt
+                }
+            }
+
+            if (persistError != null) {
+                throw persistError
+            }
+        }
+
         @Throws(BackupError::class)
         fun persist(label: Label, bytes: ByteArray) {
             if (skipRemoteBackup) {

lib/android/src/main/java/com/reactnativeldk/classes/LdkChannelManagerPersister.kt

@@ -173,10 +173,9 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
 
     override fun persist_manager(channel_manager_bytes: ByteArray?) {
         if (channel_manager_bytes != null && LdkModule.accountStoragePath != "") {
+            BackupClient.persist(BackupClient.Label.CHANNEL_MANAGER(), channel_manager_bytes, retry = 100)
             File(LdkModule.accountStoragePath + "/" + LdkFileNames.channel_manager.fileName).writeBytes(channel_manager_bytes)
 
-            BackupClient.persist(BackupClient.Label.CHANNEL_MANAGER(), channel_manager_bytes)
-
             LdkEventEmitter.send(EventTypes.native_log, "Persisted channel manager to disk")
             LdkEventEmitter.send(EventTypes.backup, "")
         }

lib/android/src/main/java/com/reactnativeldk/classes/LdkPersister.kt

@@ -24,8 +24,8 @@ class LdkPersister {
 
             val isNew = !file.exists()
 
+            BackupClient.persist(BackupClient.Label.CHANNEL_MONITOR(channelId=channelId), data.write(), retry = 100)
             file.writeBytes(data.write())
-            BackupClient.persist(BackupClient.Label.CHANNEL_MONITOR(channelId=channelId), data.write())
 
             LdkEventEmitter.send(EventTypes.native_log, "Persisted channel (${id.to_channel_id().hexEncodedString()}) to disk")
             LdkEventEmitter.send(EventTypes.backup, "")

lib/ios/Classes/LdkChannelManagerPersister.swift

@@ -267,7 +267,7 @@ class LdkChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
         }
 
         do {
-            try BackupClient.persist(.channelManager, channelManager.write(), retry: 10)
+            try BackupClient.persist(.channelManager, channelManager.write(), retry: 100)
 
             try Data(channelManager.write()).write(to: managerStorage)
             LdkEventEmitter.shared.send(withEvent: .native_log, body: "Persisted channel manager to disk")            

lib/ios/Classes/LdkPersist.swift

@@ -23,7 +23,7 @@ class LdkPersister: Persist {
 
             let isNew = !FileManager().fileExists(atPath: channelStoragePath.path)
 
-            try BackupClient.persist(.channelMonitor(id: channelId), data.write(), retry: 10)
+            try BackupClient.persist(.channelMonitor(id: channelId), data.write(), retry: 100)
             try Data(data.write()).write(to: channelStoragePath)
 
             LdkEventEmitter.shared.send(withEvent: .native_log, body: "Persisted channel (\(channelId)) to disk")