orbis1-sdk-rn 0.2.3 → 0.2.5

package/android/src/main/java/com/orbis1sdk/RgbModule.kt

@@ -335,14 +335,43 @@ class RgbModule(reactContext: ReactApplicationContext) :
         val session = WalletStore.get(walletId.toInt())
           ?: throw IllegalStateException("Wallet with id $walletId not found")
 
-        val online = session.wallet.goOnline(
-          skipConsistencyCheck = skipConsistencyCheck,
-          indexerUrl = indexerUrl
-        )
-        WalletStore.setOnline(walletId.toInt(), online)
+        val masterFingerprint = session.wallet.getWalletData().masterFingerprint
+
+        suspend fun runOnline(): Pair<Boolean, String>? {
+          return try {
+            val online = session.wallet.goOnline(
+              skipConsistencyCheck = skipConsistencyCheck,
+              indexerUrl = indexerUrl
+            )
+            WalletStore.setOnline(walletId.toInt(), online)
+            Pair(true, "")
+          } catch (e: Exception) {
+            Pair(false, parseErrorMessage(e.message))
+          }
+        }
 
-        withContext(Dispatchers.Main) {
-          promise.resolve(null)
+        val result = runOnline()
+
+        withContext(Dispatchers.Main) {
+          if (result != null) {
+            val (status, error) = result
+            if (status) {
+              val map = Arguments.createMap()
+              map.putBoolean("status", status)
+              map.putString("error", error)
+              promise.resolve(map)
+            } else {
+              deleteRuntimeLockFile(masterFingerprint)
+              val retryResult = runOnline()
+              if (retryResult != null) {
+                val (retryStatus, retryError) = retryResult
+                val map = Arguments.createMap()
+                map.putBoolean("status", retryStatus)
+                map.putString("error", retryError)
+                promise.resolve(map)
+              }
+            }
+          }
         }
       } catch (e: Exception) {
         Log.e(TAG, "goOnline error: ${e.message}", e)
@@ -353,6 +382,26 @@ class RgbModule(reactContext: ReactApplicationContext) :
     }
   }
 
+  fun deleteRuntimeLockFile(masterFingerprint: String) {
+        try {
+            val runtimeLockPath = AppConstants.rgbDir
+                .resolve(masterFingerprint)
+                .resolve("rgb_runtime.lock")
+            if (!runtimeLockPath.exists()) {
+                Log.i("RGB", "No runtime lock file exists at path: ${runtimeLockPath.path}")
+                return
+            }
+            Log.i("RGB", "Deleting runtime lock at: ${runtimeLockPath.path}")
+            if (runtimeLockPath.delete()) {
+                Log.i("RGB", "Runtime lock deleted successfully.")
+            } else {
+                Log.e("RGB", "Failed to delete runtime lock.")
+            }
+        } catch (e: Exception) {
+            Log.e("RGB", "Failed to delete runtime lock: ${e.message}", e)
+        }
+    }
+
   override fun getBtcBalance(
     walletId: Double,
     skipSync: Boolean,

package/ios/Rgb.swift

@@ -137,6 +137,30 @@ public class RgbSwiftHelper: NSObject {
     try fileManager.removeItem(at: URL(fileURLWithPath: targetPath))
   }
 
+  private static func deleteRuntimeLockFile(masterFingerprint: String) {
+    let constants = AppConstants.shared
+    constants.ensureInitialized()
+
+    guard let rgbDir = constants.rgbDir else {
+      return
+    }
+
+    let runtimeLockURL = rgbDir
+      .appendingPathComponent(masterFingerprint, isDirectory: true)
+      .appendingPathComponent("rgb_runtime.lock", isDirectory: false)
+
+    let fileManager = FileManager.default
+    guard fileManager.fileExists(atPath: runtimeLockURL.path) else {
+      return
+    }
+
+    do {
+      try fileManager.removeItem(at: runtimeLockURL)
+    } catch {
+      NSLog("RNRgb: Failed to delete runtime lock file: \(error.localizedDescription)")
+    }
+  }
+
   private static func getNetwork(_ network: String) -> BitcoinNetwork {
     switch network.uppercased() {
     case "MAINNET":
@@ -343,20 +367,45 @@ public class RgbSwiftHelper: NSObject {
       return ["error": "Wallet with id \(walletId) not found"] as NSDictionary
     }
     
-    do {
-      let online = try session.wallet.goOnline(
-        skipConsistencyCheck: skipConsistencyCheck,
-        indexerUrl: indexerUrl
-      )
-      WalletStore.shared.setOnline(id: walletId.intValue, online: online)
-      return [:] as NSDictionary
-    } catch {
-      let errorData = [
-        "error": parseErrorMessage(error),
-        "errorCode": getErrorClassName(error)
-      ] as NSDictionary
-      return errorData
+    let masterFingerprint = session.wallet.getWalletData().masterFingerprint
+
+    func runOnline() -> (Bool, String)? {
+      do {
+        let online = try session.wallet.goOnline(
+          skipConsistencyCheck: skipConsistencyCheck,
+          indexerUrl: indexerUrl
+        )
+        WalletStore.shared.setOnline(id: walletId.intValue, online: online)
+        return (true, "")
+      } catch {
+        return (false, parseErrorMessage(error))
+      }
     }
+
+    if let result = runOnline() {
+      let (status, errorMessage) = result
+      if status {
+        return [
+          "status": NSNumber(value: status),
+          "error": errorMessage
+        ] as NSDictionary
+      }
+
+      deleteRuntimeLockFile(masterFingerprint: masterFingerprint)
+
+      if let retryResult = runOnline() {
+        let (retryStatus, retryError) = retryResult
+        return [
+          "status": NSNumber(value: retryStatus),
+          "error": retryError
+        ] as NSDictionary
+      }
+    }
+
+    return [
+      "status": NSNumber(value: false),
+      "error": "Failed to go online"
+    ] as NSDictionary
   }
   
   @objc(_getBtcBalance:skipSync:)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orbis1-sdk-rn",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Orbis1 SDK for React Native with RGB core, Watch Tower, and Gas-Free transfers.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",