Merge pull request #248 from synonymdev/android-timeout-fix

fix: increase android connect timeout to 3s
synonymdev · Jun 6, 2024 · 58713d9 · 58713d9
2 parents 564684d + 9c08fbc
commit 58713d9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/lib/android/src/main/java/com/reactnativeldk/LdkModule.kt b/lib/android/src/main/java/com/reactnativeldk/LdkModule.kt
@@ -513,7 +513,7 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
                 override fun run() {
                     handleDroppedPeers()
                 }
-            }, 1000, 1000)
+            }, 1000, 3000)
             timerTaskScheduled = true
         }
 
@@ -638,7 +638,7 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
 
             try {
                 currentlyConnectingPeers.add(pubKey)
-                peerHandler!!.connect(pubKey.hexa(), InetSocketAddress(address, port.toInt()), 10)
+                peerHandler!!.connect(pubKey.hexa(), InetSocketAddress(address, port.toInt()), 3000)
                 LdkEventEmitter.send(EventTypes.native_log, "Connection to peer $pubKey re-established by handleDroppedPeers().")
             } catch (e: Exception) {
                 LdkEventEmitter.send(EventTypes.native_log, "Error connecting peer $pubKey. Error: $e")
@@ -667,19 +667,20 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
             currentlyConnectingPeers.add(pubKey)
             peerHandler!!.connect(pubKey.hexa(), InetSocketAddress(address, port.toInt()), timeout.toInt())
 
+            handleResolve(promise, LdkCallbackResponses.add_peer_success)
+        } catch (e: Exception) {
+            handleReject(promise, LdkErrors.add_peer_fail, Error(e))
+        } finally {
+            currentlyConnectingPeers.remove(pubKey)
+
+            //Should retry if success or fail
             if (!addedPeers.map { it["pubKey"] as String }.contains(pubKey)) {
                 addedPeers.add(hashMapOf(
                     "address" to address,
                     "port" to port,
                     "pubKey" to pubKey
                 ))
             }
-
-            handleResolve(promise, LdkCallbackResponses.add_peer_success)
-        } catch (e: Exception) {
-            handleReject(promise, LdkErrors.add_peer_fail, Error(e))
-        } finally {
-            currentlyConnectingPeers.remove(pubKey)
         }
     }
 

diff --git a/lib/package.json b/lib/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@synonymdev/react-native-ldk",
   "title": "React Native LDK",
-  "version": "0.0.141",
+  "version": "0.0.143",
   "description": "React Native wrapper for LDK",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",