@hot-updater/react-native 0.23.1 → 0.24.1

package/android/src/main/java/com/hotupdater/HotUpdaterImpl.kt

@@ -9,11 +9,33 @@ import kotlinx.coroutines.withContext
 /**
  * Core implementation class for HotUpdater functionality
  */
-class HotUpdaterImpl(
-    private val context: Context,
-    private val bundleStorage: BundleStorageService,
-    private val preferences: PreferencesService,
-) {
+class HotUpdaterImpl {
+    private val context: Context
+    private val bundleStorage: BundleStorageService
+    private val preferences: PreferencesService
+
+    /**
+     * Primary constructor with dependency injection (for testing)
+     */
+    constructor(
+        context: Context,
+        bundleStorage: BundleStorageService,
+        preferences: PreferencesService,
+    ) {
+        this.context = context.applicationContext
+        this.bundleStorage = bundleStorage
+        this.preferences = preferences
+    }
+
+    /**
+     * Convenience constructor for simple usage
+     */
+    constructor(context: Context) : this(
+        context = context,
+        bundleStorage = createBundleStorage(context),
+        preferences = createPreferences(context),
+    )
+
     /**
      * Gets the app version
      * @param context Application context
@@ -38,8 +60,62 @@ class HotUpdaterImpl(
         }
 
     companion object {
+        private const val TAG = "HotUpdaterImpl"
         private const val DEFAULT_CHANNEL = "production"
 
+        /**
+         * Create BundleStorageService with all dependencies
+         */
+        private fun createBundleStorage(context: Context): BundleStorageService {
+            val appContext = context.applicationContext
+            val fileSystem = FileManagerService(appContext)
+            val preferences = createPreferences(appContext)
+            val downloadService = OkHttpDownloadService()
+            val decompressService = DecompressService()
+
+            return BundleFileStorageService(
+                appContext,
+                fileSystem,
+                downloadService,
+                decompressService,
+                preferences,
+            )
+        }
+
+        /**
+         * Create PreferencesService with isolation key
+         */
+        private fun createPreferences(context: Context): PreferencesService {
+            val appContext = context.applicationContext
+            val isolationKey = getIsolationKey(appContext)
+            return VersionedPreferencesService(appContext, isolationKey)
+        }
+
+        /**
+         * Gets the complete isolation key for preferences storage
+         * @param context Application context
+         * @return The isolation key in format: HotUpdaterPrefs_{fingerprintOrVersion}_{channel}
+         */
+        private fun getIsolationKey(context: Context): String {
+            // Get fingerprint hash directly from resources
+            val fingerprintId = context.resources.getIdentifier("hot_updater_fingerprint_hash", "string", context.packageName)
+            val fingerprintHash =
+                if (fingerprintId != 0) {
+                    context.getString(fingerprintId).takeIf { it.isNotEmpty() }
+                } else {
+                    null
+                }
+
+            // Get app version and channel
+            val appVersion = getAppVersion(context) ?: "unknown"
+            val appChannel = getChannel(context)
+
+            // Use fingerprint if available, otherwise use app version
+            val baseKey = if (!fingerprintHash.isNullOrEmpty()) fingerprintHash else appVersion
+
+            return "HotUpdaterPrefs_${baseKey}_$appChannel"
+        }
+
         fun getAppVersion(context: Context): String? =
             try {
                 val packageInfo =
@@ -68,97 +144,72 @@ class HotUpdaterImpl(
         }
 
         /**
-         * Gets the complete isolation key for preferences storage
-         * @param context Application context
-         * @return The isolation key in format: HotUpdaterPrefs_{fingerprintOrVersion}_{channel}
+         * Get minimum bundle ID string
+         * @return The minimum bundle ID string
          */
-        fun getIsolationKey(context: Context): String {
-            // Get fingerprint hash directly from resources
-            val fingerprintId = context.resources.getIdentifier("hot_updater_fingerprint_hash", "string", context.packageName)
-            val fingerprintHash =
-                if (fingerprintId != 0) {
-                    context.getString(fingerprintId).takeIf { it.isNotEmpty() }
-                } else {
-                    null
-                }
-
-            // Get app version and channel
-            val appVersion = getAppVersion(context) ?: "unknown"
-            val appChannel = getChannel(context)
-
-            // Use fingerprint if available, otherwise use app version
-            val baseKey = if (!fingerprintHash.isNullOrEmpty()) fingerprintHash else appVersion
-
-            // Build complete isolation key
-            return "HotUpdaterPrefs_${baseKey}_$appChannel"
-        }
-    }
+        fun getMinBundleId(): String = BuildConfig.MIN_BUNDLE_ID.takeIf { it != "null" } ?: generateMinBundleIdFromBuildTimestamp()
 
-    /**
-     * Get minimum bundle ID string
-     * @return The minimum bundle ID string
-     */
-    fun getMinBundleId(): String = BuildConfig.MIN_BUNDLE_ID.takeIf { it != "null" } ?: generateMinBundleIdFromBuildTimestamp()
-
-    /**
-     * Generates a bundle ID based on build timestamp
-     * @return The generated minimum bundle ID string
-     */
-    private fun generateMinBundleIdFromBuildTimestamp(): String =
-        try {
-            val buildTimestampMs = BuildConfig.BUILD_TIMESTAMP
-            val bytes =
-                ByteArray(16).apply {
-                    this[0] = ((buildTimestampMs shr 40) and 0xFF).toByte()
-                    this[1] = ((buildTimestampMs shr 32) and 0xFF).toByte()
-                    this[2] = ((buildTimestampMs shr 24) and 0xFF).toByte()
-                    this[3] = ((buildTimestampMs shr 16) and 0xFF).toByte()
-                    this[4] = ((buildTimestampMs shr 8) and 0xFF).toByte()
-                    this[5] = (buildTimestampMs and 0xFF).toByte()
-                    this[6] = 0x70.toByte()
-                    this[7] = 0x00.toByte()
-                    this[8] = 0x80.toByte()
-                    this[9] = 0x00.toByte()
-                    this[10] = 0x00.toByte()
-                    this[11] = 0x00.toByte()
-                    this[12] = 0x00.toByte()
-                    this[13] = 0x00.toByte()
-                    this[14] = 0x00.toByte()
-                    this[15] = 0x00.toByte()
-                }
-            String.format(
-                "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-                bytes[0].toInt() and 0xFF,
-                bytes[1].toInt() and 0xFF,
-                bytes[2].toInt() and 0xFF,
-                bytes[3].toInt() and 0xFF,
-                bytes[4].toInt() and 0xFF,
-                bytes[5].toInt() and 0xFF,
-                bytes[6].toInt() and 0xFF,
-                bytes[7].toInt() and 0xFF,
-                bytes[8].toInt() and 0xFF,
-                bytes[9].toInt() and 0xFF,
-                bytes[10].toInt() and 0xFF,
-                bytes[11].toInt() and 0xFF,
-                bytes[12].toInt() and 0xFF,
-                bytes[13].toInt() and 0xFF,
-                bytes[14].toInt() and 0xFF,
-                bytes[15].toInt() and 0xFF,
-            )
-        } catch (e: Exception) {
-            "00000000-0000-0000-0000-000000000000"
-        }
+        /**
+         * Generates a bundle ID based on build timestamp
+         * @return The generated minimum bundle ID string
+         */
+        private fun generateMinBundleIdFromBuildTimestamp(): String =
+            try {
+                val buildTimestampMs = BuildConfig.BUILD_TIMESTAMP
+                val bytes =
+                    ByteArray(16).apply {
+                        this[0] = ((buildTimestampMs shr 40) and 0xFF).toByte()
+                        this[1] = ((buildTimestampMs shr 32) and 0xFF).toByte()
+                        this[2] = ((buildTimestampMs shr 24) and 0xFF).toByte()
+                        this[3] = ((buildTimestampMs shr 16) and 0xFF).toByte()
+                        this[4] = ((buildTimestampMs shr 8) and 0xFF).toByte()
+                        this[5] = (buildTimestampMs and 0xFF).toByte()
+                        this[6] = 0x70.toByte()
+                        this[7] = 0x00.toByte()
+                        this[8] = 0x80.toByte()
+                        this[9] = 0x00.toByte()
+                        this[10] = 0x00.toByte()
+                        this[11] = 0x00.toByte()
+                        this[12] = 0x00.toByte()
+                        this[13] = 0x00.toByte()
+                        this[14] = 0x00.toByte()
+                        this[15] = 0x00.toByte()
+                    }
+                String.format(
+                    "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+                    bytes[0].toInt() and 0xFF,
+                    bytes[1].toInt() and 0xFF,
+                    bytes[2].toInt() and 0xFF,
+                    bytes[3].toInt() and 0xFF,
+                    bytes[4].toInt() and 0xFF,
+                    bytes[5].toInt() and 0xFF,
+                    bytes[6].toInt() and 0xFF,
+                    bytes[7].toInt() and 0xFF,
+                    bytes[8].toInt() and 0xFF,
+                    bytes[9].toInt() and 0xFF,
+                    bytes[10].toInt() and 0xFF,
+                    bytes[11].toInt() and 0xFF,
+                    bytes[12].toInt() and 0xFF,
+                    bytes[13].toInt() and 0xFF,
+                    bytes[14].toInt() and 0xFF,
+                    bytes[15].toInt() and 0xFF,
+                )
+            } catch (e: Exception) {
+                "00000000-0000-0000-0000-000000000000"
+            }
 
-    /**
-     * Gets the current fingerprint hash
-     * @return The fingerprint hash or null if not set
-     */
-    fun getFingerprintHash(): String? {
-        val id = context.resources.getIdentifier("hot_updater_fingerprint_hash", "string", context.packageName)
-        return if (id != 0) {
-            context.getString(id).takeIf { it.isNotEmpty() }
-        } else {
-            null
+        /**
+         * Gets the current fingerprint hash
+         * @param context Application context
+         * @return The fingerprint hash or null if not set
+         */
+        fun getFingerprintHash(context: Context): String? {
+            val id = context.resources.getIdentifier("hot_updater_fingerprint_hash", "string", context.packageName)
+            return if (id != 0) {
+                context.getString(id).takeIf { it.isNotEmpty() }
+            } else {
+                null
+            }
         }
     }
 
@@ -187,14 +238,16 @@ class HotUpdaterImpl(
      * @param fileUrl URL of the bundle file to download (or null to reset)
      * @param fileHash Combined hash string for verification (sig:<signature> or <hex_hash>)
      * @param progressCallback Callback for download progress updates
-     * @return true if the update was successful
+     * @throws HotUpdaterException if the update fails
      */
     suspend fun updateBundle(
         bundleId: String,
         fileUrl: String?,
         fileHash: String?,
         progressCallback: (Double) -> Unit,
-    ): Boolean = bundleStorage.updateBundle(bundleId, fileUrl, fileHash, progressCallback)
+    ) {
+        bundleStorage.updateBundle(bundleId, fileUrl, fileHash, progressCallback)
+    }
 
     /**
      * Reloads the React Native application
@@ -217,4 +270,24 @@ class HotUpdaterImpl(
             Log.e("HotUpdaterImpl", "Failed to reload application", e)
         }
     }
+
+    /**
+     * Notifies the system that the app has successfully started with the given bundle.
+     * If the bundle matches the staging bundle, it promotes to stable.
+     * @param bundleId The ID of the currently running bundle
+     * @return Map containing status and optional crashedBundleId
+     */
+    fun notifyAppReady(bundleId: String): Map<String, Any?> = bundleStorage.notifyAppReady(bundleId)
+
+    /**
+     * Gets the crashed bundle history.
+     * @return List of crashed bundle IDs
+     */
+    fun getCrashHistory(): List<String> = bundleStorage.getCrashHistory().bundles.map { it.bundleId }
+
+    /**
+     * Clears the crashed bundle history.
+     * @return true if clearing was successful
+     */
+    fun clearCrashHistory(): Boolean = bundleStorage.clearCrashHistory()
 }

package/android/src/main/java/com/hotupdater/OkHttpDownloadService.kt

@@ -20,6 +20,14 @@ import java.net.URL
 import java.net.UnknownHostException
 import java.util.concurrent.TimeUnit
 
+/**
+ * Exception for incomplete downloads with size information
+ */
+class IncompleteDownloadException(
+    val expectedSize: Long,
+    val actualSize: Long,
+) : IOException("Download incomplete: received $actualSize bytes, expected $expectedSize bytes")
+
 /**
  * Result wrapper for download operations
  */
@@ -255,12 +263,16 @@ class OkHttpDownloadService : DownloadService {
                 // Verify file size
                 val finalSize = destination.length()
                 if (finalSize != totalSize) {
-                    val errorMsg = "Download incomplete: $finalSize / $totalSize bytes"
-                    Log.d(TAG, errorMsg)
+                    Log.d(TAG, "Download incomplete: $finalSize / $totalSize bytes")
 
                     // Delete incomplete file
                     destination.delete()
-                    return@withContext DownloadResult.Error(IOException(errorMsg))
+                    return@withContext DownloadResult.Error(
+                        IncompleteDownloadException(
+                            expectedSize = totalSize,
+                            actualSize = finalSize,
+                        ),
+                    )
                 }
 
                 Log.d(TAG, "Download completed successfully: $finalSize bytes")

package/android/src/main/java/com/hotupdater/SignatureVerifier.kt

@@ -35,24 +35,29 @@ sealed class SignatureVerificationException(
             "Public key format is invalid. Ensure the public key is in PEM format (BEGIN PUBLIC KEY)",
         )
 
+    class MissingFileHash :
+        SignatureVerificationException(
+            "File hash is missing or empty. Ensure the bundle update includes a valid file hash",
+        )
+
     class InvalidSignatureFormat :
         SignatureVerificationException(
-            "Signature format is invalid. The signature must be base64-encoded",
+            "Signature format is invalid or corrupted. The signature data is malformed or cannot be decoded",
         )
 
-    class VerificationFailed :
+    class SignatureVerificationFailed :
         SignatureVerificationException(
             "Bundle signature verification failed. The bundle may be corrupted or tampered with",
         )
 
-    class HashMismatch :
+    class FileHashMismatch :
         SignatureVerificationException(
-            "Bundle hash verification failed. The bundle file hash does not match. File may be corrupted",
+            "File hash verification failed. The bundle file hash does not match the expected value. File may be corrupted",
         )
 
-    class HashCalculationFailed :
+    class FileReadFailed :
         SignatureVerificationException(
-            "Failed to calculate file hash. Could not read file for hash verification",
+            "Failed to read file for verification. Could not read file for hash verification",
         )
 
     class UnsignedNotAllowed :
@@ -156,7 +161,7 @@ object SignatureVerifier {
         // Rule: null/empty fileHash → REJECT
         if (fileHash.isNullOrEmpty()) {
             Log.e(TAG, "fileHash is null or empty. Rejecting update.")
-            throw SignatureVerificationException.VerificationFailed()
+            throw SignatureVerificationException.MissingFileHash()
         }
 
         if (isSignedFormat(fileHash)) {
@@ -193,7 +198,7 @@ object SignatureVerifier {
      * Verifies SHA256 hash of a file.
      * @param bundleFile The file to verify
      * @param expectedHash Expected SHA256 hash (hex string)
-     * @throws SignatureVerificationException.HashMismatch if verification fails
+     * @throws SignatureVerificationException.FileHashMismatch if verification fails
      */
     fun verifyHash(
         bundleFile: File,
@@ -203,7 +208,7 @@ object SignatureVerifier {
 
         if (!HashUtils.verifyHash(bundleFile, expectedHash)) {
             Log.e(TAG, "Hash mismatch!")
-            throw SignatureVerificationException.HashMismatch()
+            throw SignatureVerificationException.FileHashMismatch()
         }
 
         Log.i(TAG, "✅ Hash verified successfully")
@@ -242,7 +247,7 @@ object SignatureVerifier {
                 HashUtils.calculateSHA256(bundleFile)
                     ?: run {
                         Log.e(TAG, "Failed to calculate file hash")
-                        throw SignatureVerificationException.HashCalculationFailed()
+                        throw SignatureVerificationException.FileReadFailed()
                     }
 
             Log.d(TAG, "Calculated file hash: $fileHashHex")
@@ -269,7 +274,7 @@ object SignatureVerifier {
                 Log.i(TAG, "✅ Signature verified successfully")
             } else {
                 Log.e(TAG, "❌ Signature verification failed")
-                throw SignatureVerificationException.VerificationFailed()
+                throw SignatureVerificationException.SignatureVerificationFailed()
             }
         } catch (e: SignatureVerificationException) {
             throw e
@@ -318,7 +323,7 @@ object SignatureVerifier {
      * Converts hex string to ByteArray.
      * @param hexString Hex-encoded string
      * @return ByteArray
-     * @throws SignatureVerificationException.InvalidSignatureFormat if conversion fails
+     * @throws SignatureVerificationException.SignatureVerificationFailed if conversion fails
      */
     private fun hexToByteArray(hexString: String): ByteArray {
         try {

package/android/src/newarch/HotUpdaterModule.kt

@@ -6,6 +6,7 @@ import androidx.lifecycle.lifecycleScope
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.WritableNativeArray
 import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import kotlinx.coroutines.CoroutineScope
@@ -19,10 +20,17 @@ class HotUpdaterModule internal constructor(
 
     override fun getName(): String = NAME
 
+    /**
+     * Gets the singleton HotUpdaterImpl instance
+     */
+    private fun getInstance(): HotUpdaterImpl = HotUpdater.getInstance(mReactApplicationContext)
+
     override fun reload(promise: Promise) {
         CoroutineScope(Dispatchers.Main.immediate).launch {
             try {
-                HotUpdater.reload(mReactApplicationContext)
+                val impl = getInstance()
+                val currentActivity = mReactApplicationContext.currentActivity
+                impl.reload(currentActivity)
                 promise.resolve(null)
             } catch (e: Exception) {
                 Log.d("HotUpdater", "Failed to reload", e)
@@ -32,41 +40,66 @@ class HotUpdaterModule internal constructor(
     }
 
     override fun updateBundle(
-        params: ReadableMap,
+        params: ReadableMap?,
         promise: Promise,
     ) {
         (mReactApplicationContext.currentActivity as FragmentActivity?)?.lifecycleScope?.launch {
             try {
-                val bundleId = params.getString("bundleId")!!
+                // Parameter validation
+                if (params == null) {
+                    promise.reject("UNKNOWN_ERROR", "Missing or invalid parameters for updateBundle")
+                    return@launch
+                }
+
+                val bundleId = params.getString("bundleId")
+                if (bundleId == null || bundleId.isEmpty()) {
+                    promise.reject("MISSING_BUNDLE_ID", "Missing or empty 'bundleId'")
+                    return@launch
+                }
+
                 val fileUrl = params.getString("fileUrl")
-                val fileHash = params.getString("fileHash")
-                val isSuccess =
-                    HotUpdater.updateBundle(
-                        mReactApplicationContext,
-                        bundleId,
-                        fileUrl,
-                        fileHash,
-                    ) { progress ->
-                        val progressParams =
-                            WritableNativeMap().apply {
-                                putDouble("progress", progress)
-                            }
-
-                        this@HotUpdaterModule
-                            .mReactApplicationContext
-                            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                            .emit("onProgress", progressParams)
+
+                // Validate fileUrl format if provided
+                if (fileUrl != null && fileUrl.isNotEmpty()) {
+                    try {
+                        java.net.URL(fileUrl)
+                    } catch (e: java.net.MalformedURLException) {
+                        promise.reject("INVALID_FILE_URL", "Invalid 'fileUrl' provided: $fileUrl")
+                        return@launch
                     }
-                promise.resolve(isSuccess)
+                }
+
+                val fileHash = params.getString("fileHash")
+
+                val impl = getInstance()
+
+                impl.updateBundle(
+                    bundleId,
+                    fileUrl,
+                    fileHash,
+                ) { progress ->
+                    val progressParams =
+                        WritableNativeMap().apply {
+                            putDouble("progress", progress)
+                        }
+
+                    this@HotUpdaterModule
+                        .mReactApplicationContext
+                        .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                        .emit("onProgress", progressParams)
+                }
+                promise.resolve(true)
+            } catch (e: HotUpdaterException) {
+                promise.reject(e.code, e.message)
             } catch (e: Exception) {
-                promise.reject("updateBundle", e)
+                promise.reject("UNKNOWN_ERROR", e.message ?: "An unknown error occurred")
             }
         }
     }
 
     override fun getTypedExportedConstants(): Map<String, Any?> {
         val constants: MutableMap<String, Any?> = HashMap()
-        constants["MIN_BUNDLE_ID"] = HotUpdater.getMinBundleId(mReactApplicationContext)
+        constants["MIN_BUNDLE_ID"] = HotUpdater.getMinBundleId()
         constants["APP_VERSION"] = HotUpdater.getAppVersion(mReactApplicationContext)
         constants["CHANNEL"] = HotUpdater.getChannel(mReactApplicationContext)
         constants["FINGERPRINT_HASH"] = HotUpdater.getFingerprintHash(mReactApplicationContext)
@@ -85,6 +118,38 @@ class HotUpdaterModule internal constructor(
         // No-op
     }
 
+    override fun notifyAppReady(params: ReadableMap?): WritableNativeMap {
+        val result = WritableNativeMap()
+        val bundleId = params?.getString("bundleId")
+        if (bundleId == null) {
+            result.putString("status", "STABLE")
+            return result
+        }
+
+        val impl = getInstance()
+        val statusMap = impl.notifyAppReady(bundleId)
+
+        result.putString("status", statusMap["status"] as? String ?: "STABLE")
+        statusMap["crashedBundleId"]?.let {
+            result.putString("crashedBundleId", it as String)
+        }
+
+        return result
+    }
+
+    override fun getCrashHistory(): WritableNativeArray {
+        val impl = getInstance()
+        val crashHistory = impl.getCrashHistory()
+        val result = WritableNativeArray()
+        crashHistory.forEach { result.pushString(it) }
+        return result
+    }
+
+    override fun clearCrashHistory(): Boolean {
+        val impl = getInstance()
+        return impl.clearCrashHistory()
+    }
+
     companion object {
         const val NAME = "HotUpdater"
     }