pulse-updates 1.0.7 → 1.0.9

package/android/src/main/java/app/pulse/updates/PulseController.kt

@@ -199,6 +199,9 @@ class PulseController private constructor() {
     fun initializeWithoutStarting() {
         if (isStarted) return
 
+        // Mark as started to prevent re-initialization during reload
+        isStarted = true
+
         createDirectories()
         initializeDatabase()
         loadEmbeddedManifest()
@@ -538,8 +541,18 @@ class PulseController private constructor() {
                 result.fold(
                     onSuccess = { checkResult ->
                         if (checkResult.isAvailable && checkResult.manifest != null) {
+                            // Compare commitTime: if embedded is newer, don't show update
+                            val embeddedCommitTime = embeddedManifest?.commitTime ?: 0L
+                            val otaCommitTime = checkResult.manifest.commitTime?.time ?: 0L
+
+                            if (embeddedCommitTime > 0 && otaCommitTime > 0 && embeddedCommitTime >= otaCommitTime) {
+                                pulseLog(TAG, "checkForUpdate: embedded is newer or same (embedded=$embeddedCommitTime >= ota=$otaCommitTime), no update needed")
+                                callback(Result.success(CheckResult(isAvailable = false)))
+                                return@checkForUpdate
+                            }
+
                             lastCheckManifest = checkResult.manifest
-                            pulseLog(TAG, "checkForUpdate: cached manifest for fetch")
+                            pulseLog(TAG, "checkForUpdate: cached manifest for fetch (ota=$otaCommitTime > embedded=$embeddedCommitTime)")
                         }
                     },
                     onFailure = { }
@@ -746,6 +759,11 @@ class PulseController private constructor() {
                         bundleHash = update.bundleHash,
                         scopeKey = update.scopeKey
                     )
+
+                    // Load manifest from database for metadata (build number, etc.)
+                    update.manifest?.let { manifest ->
+                        launchedManifestJson = manifest.toString()
+                    }
                 }
             }
 

package/android/src/main/java/app/pulse/updates/launcher/PulseAppLauncher.kt

@@ -114,6 +114,12 @@ class PulseAppLauncher(
         try {
             val assets = database.assetsForUpdate(update.updateId)
 
+            pulseLog(TAG, "ensureAllAssetsExist for updateId=${update.updateId.take(16)}... found ${assets.size} assets")
+
+            // Initialize asset map with embedded assets (these are referenced directly, not copied)
+            val mutableAssetFilesMap = buildEmbeddedAssetsMap().toMutableMap()
+            pulseLog(TAG, "Embedded assets map has ${mutableAssetFilesMap.size} entries")
+
             if (assets.isEmpty()) {
                 // No assets to verify, just find the bundle
                 update.bundleHash?.let { hash ->
@@ -123,16 +129,59 @@ class PulseAppLauncher(
                 return
             }
 
-            // Initialize asset map with embedded assets (fallback)
-            val mutableAssetFilesMap = buildEmbeddedAssetsMap().toMutableMap()
+            // Separate assets into those we need to verify vs those already in embedded
+            val assetsToVerify = mutableListOf<PulseAsset>()
+
+            for (asset in assets) {
+                if (asset.isLaunchAsset) {
+                    // Always verify the launch asset (bundle) - it must be downloaded
+                    assetsToVerify.add(asset)
+                } else {
+                    val hashKey = asset.hash.lowercase()
+                    // If asset hash is already in embedded map, we can use it directly
+                    if (mutableAssetFilesMap.containsKey(hashKey)) {
+                        // Already referenced from embedded, no action needed
+                        continue
+                    }
+                    // Check if downloaded version exists
+                    val localFile = assetStorePath(asset.hash)
+                    if (localFile.exists()) {
+                        // Use downloaded version
+                        val localUri = localFile.toURI().toString()
+                        mutableAssetFilesMap[hashKey] = localUri
+                        asset.key?.let { key ->
+                            mutableAssetFilesMap[key] = localUri
+                        }
+                    } else {
+                        // Need to verify/download this asset
+                        assetsToVerify.add(asset)
+                    }
+                }
+            }
+
+            pulseLog(TAG, "${assets.size - assetsToVerify.size} assets from embedded, ${assetsToVerify.size} to verify/download")
 
-            val totalAssets = assets.size
+            if (assetsToVerify.isEmpty()) {
+                // All assets accounted for, but we need the bundle
+                update.bundleHash?.let { hash ->
+                    launchAssetFile = bundleStorePath(hash)
+                    if (launchAssetFile?.exists() != true) {
+                        callback(false, LauncherException("Bundle not found"))
+                        return
+                    }
+                }
+                assetFilesMap = mutableAssetFilesMap
+                callback(launchAssetFile != null, null)
+                return
+            }
+
+            val totalAssets = assetsToVerify.size
             val completedAssets = java.util.concurrent.atomic.AtomicInteger(0)
             val launchError = AtomicReference<Exception?>(null)
             val launchAssetFound = AtomicBoolean(false)
             val latch = CountDownLatch(totalAssets)
 
-            for (asset in assets) {
+            for (asset in assetsToVerify) {
                 val localFile = assetStorePath(asset.hash)
 
                 Thread {
@@ -146,9 +195,8 @@ class PulseAppLauncher(
                             } else {
                                 val localUri = localFile.toURI().toString()
                                 synchronized(mutableAssetFilesMap) {
-                                    // Store by SHA256 hash
-                                    mutableAssetFilesMap[asset.hash] = localUri
-                                    // Also store by path-based key for Metro compatibility
+                                    val hashKey = asset.hash.lowercase()
+                                    mutableAssetFilesMap[hashKey] = localUri
                                     asset.key?.let { key ->
                                         mutableAssetFilesMap[key] = localUri
                                     }
@@ -368,11 +416,25 @@ data class EmbeddedManifest(
         fun fromJson(json: String): EmbeddedManifest? {
             return try {
                 val root = org.json.JSONObject(json)
-                val manifest = root.optJSONObject("manifest") ?: return null
+                // Support both formats: wrapped in "manifest" key or directly at root
+                val manifest = root.optJSONObject("manifest") ?: root
 
                 val updateId = manifest.getString("updateId")
                 val runtimeVersion = manifest.getString("runtimeVersion")
-                val commitTime = manifest.optLong("commitTime", System.currentTimeMillis())
+
+                // Support both commitTime (ms) and createdAt (ISO 8601)
+                val commitTime = if (manifest.has("commitTime")) {
+                    manifest.optLong("commitTime", System.currentTimeMillis())
+                } else if (manifest.has("createdAt")) {
+                    try {
+                        java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", java.util.Locale.US)
+                            .parse(manifest.getString("createdAt"))?.time ?: System.currentTimeMillis()
+                    } catch (e: Exception) {
+                        System.currentTimeMillis()
+                    }
+                } else {
+                    System.currentTimeMillis()
+                }
 
                 val assets = mutableListOf<EmbeddedAsset>()
 
@@ -383,9 +445,21 @@ data class EmbeddedManifest(
                     }
                 }
 
-                // Parse launch asset
+                // Parse launch asset (either separate or from bundle field)
                 manifest.optJSONObject("launchAsset")?.let { launchAssetJson ->
                     EmbeddedAsset.fromJson(launchAssetJson, isLaunchAsset = true)?.let { assets.add(it) }
+                } ?: manifest.optJSONObject("bundle")?.let { bundleJson ->
+                    val bundleHash = bundleJson.optString("hash", "")
+                    if (bundleHash.isNotEmpty()) {
+                        assets.add(EmbeddedAsset(
+                            key = "bundle",
+                            hash = bundleHash,
+                            type = bundleJson.optString("contentType", null),
+                            mainBundleDir = null,
+                            mainBundleFilename = null,
+                            isLaunchAsset = true
+                        ))
+                    }
                 }
 
                 EmbeddedManifest(updateId, runtimeVersion, commitTime, assets)
@@ -440,10 +514,20 @@ data class PulseUpdateInfo(
 )
 
 class PulseDefaultSelectionPolicy : PulseSelectionPolicy {
+    /**
+     * Select the best update to launch
+     * Priority: 1) Ready updates (newest by commitTime), 2) Embedded updates (fallback)
+     */
     override fun selectUpdateToLaunch(updates: List<PulseUpdate>): PulseUpdate? {
-        return updates
-            .filter { it.status == PulseUpdateStatus.READY || it.status == PulseUpdateStatus.EMBEDDED }
-            .maxByOrNull { it.commitTime.time }
+        // First, try to find the newest ready (downloaded) update
+        val readyUpdates = updates.filter { it.status == PulseUpdateStatus.READY }
+        val newestReady = readyUpdates.maxByOrNull { it.commitTime.time }
+        if (newestReady != null) {
+            return newestReady
+        }
+
+        // Fall back to embedded update
+        return updates.find { it.status == PulseUpdateStatus.EMBEDDED }
     }
 
     override fun selectUpdatesToDelete(launchedUpdate: PulseUpdateInfo, allUpdates: List<PulseUpdateInfo>): List<PulseUpdateInfo> {

package/ios/PulseUpdates/AppLauncher/PulseAppLauncher.swift

@@ -126,6 +126,9 @@ final class PulseAppLauncher {
         do {
             let assets = try database.assets(forUpdateId: update.updateId)
 
+            // Initialize asset map with embedded assets (these are referenced directly, not copied)
+            assetFilesMap = buildEmbeddedAssetsMap()
+
             if assets.isEmpty {
                 // No assets to verify, just find the bundle
                 if let bundleHash = update.bundleHash {
@@ -135,15 +138,54 @@ final class PulseAppLauncher {
                 return
             }
 
-            // Initialize asset map with embedded assets (fallback)
-            assetFilesMap = buildEmbeddedAssetsMap()
+            // Separate assets into those we need to verify vs those already in embedded
+            var assetsToVerify: [PulseAsset] = []
+
+            for asset in assets {
+                if asset.isLaunchAsset {
+                    // Always verify the launch asset (bundle) - it must be downloaded
+                    assetsToVerify.append(asset)
+                } else {
+                    let hashKey = asset.hash.lowercased()
+                    // If asset hash is already in embedded map, we can use it directly
+                    if assetFilesMap[hashKey] != nil {
+                        // Already referenced from embedded, no action needed
+                        continue
+                    }
+                    // Check if downloaded version exists
+                    let localUrl = assetStorePath(hash: asset.hash)
+                    if FileManager.default.fileExists(atPath: localUrl.path) {
+                        // Use downloaded version
+                        if let key = asset.key {
+                            assetFilesMap[key] = localUrl.absoluteString
+                        }
+                        assetFilesMap[hashKey] = localUrl.absoluteString
+                    } else {
+                        // Need to verify/download this asset
+                        assetsToVerify.append(asset)
+                    }
+                }
+            }
+
+            if assetsToVerify.isEmpty {
+                // All assets accounted for, but we need the bundle
+                if let bundleHash = update.bundleHash {
+                    launchAssetUrl = bundleStorePath(hash: bundleHash)
+                    if !FileManager.default.fileExists(atPath: launchAssetUrl!.path) {
+                        completion(false, PulseLauncherError.bundleNotFound)
+                        return
+                    }
+                }
+                completion(launchAssetUrl != nil, nil)
+                return
+            }
 
             completedAssets = 0
             launchError = nil
 
-            let totalAssets = assets.count
+            let totalAssets = assetsToVerify.count
 
-            for asset in assets {
+            for asset in assetsToVerify {
                 let localUrl = assetStorePath(hash: asset.hash)
 
                 ensureAssetExists(asset: asset, localUrl: localUrl) { [weak self] exists in
@@ -155,8 +197,12 @@ final class PulseAppLauncher {
                         if exists {
                             if asset.isLaunchAsset {
                                 self.launchAssetUrl = localUrl
-                            } else if let key = asset.key {
-                                self.assetFilesMap[key] = localUrl.absoluteString
+                            } else {
+                                let hashKey = asset.hash.lowercased()
+                                self.assetFilesMap[hashKey] = localUrl.absoluteString
+                                if let key = asset.key {
+                                    self.assetFilesMap[key] = localUrl.absoluteString
+                                }
                             }
                         }
 
@@ -229,22 +275,44 @@ final class PulseAppLauncher {
         }
 
         guard let match = matchingAsset,
-              let bundleFilename = match.nsBundleFilename else {
+              let bundleFilename = match.nsBundleFilename,
+              let assetType = match.type else {
             completion(false)
             return
         }
 
-        // Get bundle path
+        // Get bundle path using FileManager (handles deep nested paths)
         DispatchQueue.global(qos: .userInitiated).async {
-            let bundlePath: String?
+            let bundleRoot = Bundle.main.bundlePath
+            let fileManager = FileManager.default
+            let ext = assetType.components(separatedBy: "/").last ?? "png"
+            var sourcePath: String? = nil
+
+            // 1. Try in assets folder with subdirectory path
+            if let dir = match.nsBundleDir, !dir.isEmpty {
+                let path = "\(bundleRoot)/assets/\(dir)/\(bundleFilename).\(ext)"
+                if fileManager.fileExists(atPath: path) {
+                    sourcePath = path
+                }
+            }
 
-            if let bundleDir = match.nsBundleDir, !bundleDir.isEmpty {
-                bundlePath = Bundle.main.path(forResource: bundleFilename, ofType: nil, inDirectory: bundleDir)
-            } else {
-                bundlePath = Bundle.main.path(forResource: bundleFilename, ofType: nil)
+            // 2. Try without assets/ prefix
+            if sourcePath == nil, let dir = match.nsBundleDir, !dir.isEmpty {
+                let path = "\(bundleRoot)/\(dir)/\(bundleFilename).\(ext)"
+                if fileManager.fileExists(atPath: path) {
+                    sourcePath = path
+                }
             }
 
-            guard let sourcePath = bundlePath else {
+            // 3. Try at root
+            if sourcePath == nil {
+                let path = "\(bundleRoot)/\(bundleFilename).\(ext)"
+                if fileManager.fileExists(atPath: path) {
+                    sourcePath = path
+                }
+            }
+
+            guard let finalSourcePath = sourcePath else {
                 self.launcherQueue.async {
                     completion(false)
                 }
@@ -260,13 +328,13 @@ final class PulseAppLauncher {
                 )
 
                 // Copy file
-                try FileManager.default.copyItem(atPath: sourcePath, toPath: localUrl.path)
+                try FileManager.default.copyItem(atPath: finalSourcePath, toPath: localUrl.path)
 
                 self.launcherQueue.async {
                     completion(true)
                 }
             } catch {
-                print("[PulseUpdates] Failed to copy asset from bundle: \(error)")
+                pulseLogWarn("Failed to copy asset from bundle: \(error)")
                 self.launcherQueue.async {
                     completion(false)
                 }
@@ -310,7 +378,7 @@ final class PulseAppLauncher {
                     completion(true, nil)
                 }
             } catch {
-                print("[PulseUpdates] Failed to download asset: \(error)")
+                pulseLogWarn("Failed to download asset: \(error)")
                 self.launcherQueue.async {
                     completion(false, error)
                 }
@@ -337,29 +405,59 @@ final class PulseAppLauncher {
 
     // MARK: - Embedded Assets Map
 
-    /// Build map of embedded assets (key -> file URL)
+    /// Build map of embedded assets (hash -> file URL, key -> file URL)
+    /// Uses FileManager to find assets with deep nested paths
     private func buildEmbeddedAssetsMap() -> [String: String] {
         guard let embedded = embeddedManifest ?? loadEmbeddedManifest() else {
             return [:]
         }
 
         var map: [String: String] = [:]
+        let bundleRoot = Bundle.main.bundlePath
+        let fileManager = FileManager.default
 
         for asset in embedded.assets where !asset.isLaunchAsset {
-            guard let key = asset.key,
-                  let filename = asset.nsBundleFilename else {
+            guard let filename = asset.nsBundleFilename,
+                  let assetType = asset.type else {
                 continue
             }
 
-            let bundlePath: String?
+            // Get file extension from type (e.g., "image/png" -> "png")
+            let ext = assetType.components(separatedBy: "/").last ?? "png"
+            var bundlePath: String? = nil
+
+            // 1. Try in assets folder with subdirectory path (RN stores assets here)
             if let dir = asset.nsBundleDir, !dir.isEmpty {
-                bundlePath = Bundle.main.path(forResource: filename, ofType: nil, inDirectory: dir)
-            } else {
-                bundlePath = Bundle.main.path(forResource: filename, ofType: nil)
+                let path = "\(bundleRoot)/assets/\(dir)/\(filename).\(ext)"
+                if fileManager.fileExists(atPath: path) {
+                    bundlePath = path
+                }
+            }
+
+            // 2. Try without assets/ prefix
+            if bundlePath == nil, let dir = asset.nsBundleDir, !dir.isEmpty {
+                let path = "\(bundleRoot)/\(dir)/\(filename).\(ext)"
+                if fileManager.fileExists(atPath: path) {
+                    bundlePath = path
+                }
+            }
+
+            // 3. Try at root
+            if bundlePath == nil {
+                let path = "\(bundleRoot)/\(filename).\(ext)"
+                if fileManager.fileExists(atPath: path) {
+                    bundlePath = path
+                }
             }
 
             if let path = bundlePath {
-                map[key] = URL(fileURLWithPath: path).absoluteString
+                let url = URL(fileURLWithPath: path).absoluteString
+                // Store by hash (lowercased for consistency)
+                map[asset.hash.lowercased()] = url
+                // Also store by key for Metro compatibility
+                if let key = asset.key {
+                    map[key] = url
+                }
             }
         }
 
@@ -373,13 +471,16 @@ final class PulseAppLauncher {
     // MARK: - Embedded Manifest
 
     private func loadEmbeddedManifest() -> PulseEmbeddedManifest? {
-        guard let url = Bundle.main.url(forResource: "embedded-manifest", withExtension: "json"),
-              let data = try? Data(contentsOf: url),
-              let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
-            return nil
+        // Try pulse/ subdirectory first, then root
+        let paths = ["pulse/embedded-manifest.json", "embedded-manifest.json"]
+        for path in paths {
+            let url = Bundle.main.bundleURL.appendingPathComponent(path)
+            if let data = try? Data(contentsOf: url),
+               let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] {
+                return PulseEmbeddedManifest(json: json)
+            }
         }
-
-        return PulseEmbeddedManifest(json: json)
+        return nil
     }
 }
 
@@ -420,8 +521,10 @@ struct PulseEmbeddedManifest {
     let assets: [PulseEmbeddedAsset]
 
     init?(json: [String: Any]) {
-        guard let manifest = json["manifest"] as? [String: Any],
-              let updateId = manifest["updateId"] as? String,
+        // Support both formats: wrapped in "manifest" key or directly at root
+        let manifest = (json["manifest"] as? [String: Any]) ?? json
+
+        guard let updateId = manifest["updateId"] as? String,
               let runtimeVersion = manifest["runtimeVersion"] as? String else {
             return nil
         }
@@ -431,6 +534,11 @@ struct PulseEmbeddedManifest {
 
         if let commitTimeMs = manifest["commitTime"] as? Double {
             self.commitTime = Date(timeIntervalSince1970: commitTimeMs / 1000)
+        } else if let createdAt = manifest["createdAt"] as? String {
+            // Parse ISO 8601 date
+            let formatter = ISO8601DateFormatter()
+            formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
+            self.commitTime = formatter.date(from: createdAt) ?? Date()
         } else {
             self.commitTime = Date()
         }
@@ -446,11 +554,22 @@ struct PulseEmbeddedManifest {
             }
         }
 
-        // Parse launch asset
+        // Parse launch asset (either separate or from bundle field)
         if let launchAssetJson = manifest["launchAsset"] as? [String: Any],
            var launchAsset = PulseEmbeddedAsset(json: launchAssetJson) {
             launchAsset.isLaunchAsset = true
             parsedAssets.append(launchAsset)
+        } else if let bundleJson = manifest["bundle"] as? [String: Any] {
+            // Create launch asset from bundle field
+            var bundleAsset = PulseEmbeddedAsset(
+                key: "bundle",
+                hash: (bundleJson["hash"] as? String) ?? "",
+                type: bundleJson["contentType"] as? String,
+                nsBundleDir: nil,
+                nsBundleFilename: nil
+            )
+            bundleAsset.isLaunchAsset = true
+            parsedAssets.append(bundleAsset)
         }
 
         self.assets = parsedAssets
@@ -465,6 +584,14 @@ struct PulseEmbeddedAsset {
     let nsBundleFilename: String?
     var isLaunchAsset: Bool = false
 
+    init(key: String?, hash: String, type: String?, nsBundleDir: String?, nsBundleFilename: String?) {
+        self.key = key
+        self.hash = hash
+        self.type = type
+        self.nsBundleDir = nsBundleDir
+        self.nsBundleFilename = nsBundleFilename
+    }
+
     init?(json: [String: Any]) {
         guard let hash = json["hash"] as? String else {
             return nil
@@ -492,12 +619,17 @@ protocol PulseSelectionPolicy {
 
 struct PulseDefaultSelectionPolicy: PulseSelectionPolicy {
 
-    /// Select the newest ready or embedded update by commit time
+    /// Select the best update to launch
+    /// Priority: 1) Ready updates (newest by commitTime), 2) Embedded updates (fallback)
     func selectUpdateToLaunch(from updates: [PulseUpdate]) -> PulseUpdate? {
-        return updates
-            .filter { $0.status == .ready || $0.status == .embedded }
-            .sorted { $0.commitTime > $1.commitTime }
-            .first
+        // First, try to find the newest ready (downloaded) update
+        let readyUpdates = updates.filter { $0.status == .ready }
+        if let newest = readyUpdates.sorted(by: { $0.commitTime > $1.commitTime }).first {
+            return newest
+        }
+
+        // Fall back to embedded update
+        return updates.first { $0.status == .embedded }
     }
 
     /// Select updates to delete - keeps launched update and one backup

package/ios/PulseUpdates/PulseController.swift

@@ -70,6 +70,11 @@ public final class PulseController {
     // Only valid for the immediate check->fetch sequence, cleared on use or new check
     private var lastCheckManifest: PulseManifestModel?
 
+    // Flag to prevent concurrent fetch operations (with lock for thread safety)
+    private var isFetching = false
+    private var pendingFetchCallbacks: [(Result<PulseFetchResult, Error>) -> Void] = []
+    private let fetchLock = NSLock()
+
     // MARK: - Native Config (from Info.plist, like expo-updates)
 
     /// Load config from Info.plist (called before JS starts)
@@ -146,6 +151,9 @@ public final class PulseController {
     public func initializeWithoutStarting() {
         guard !isStarted else { return }
 
+        // Mark as started to prevent re-initialization during reload
+        isStarted = true
+
         createDirectories()
         initializeDatabase()
         loadEmbeddedManifest()
@@ -296,17 +304,40 @@ public final class PulseController {
         guard let manifest = embeddedManifest else { return [:] }
 
         var assets: [String: String] = [:]
+        let bundleRoot = Bundle.main.bundlePath
+        let fileManager = FileManager.default
 
         for asset in manifest.assets where !asset.isLaunchAsset {
-            guard let filename = asset.nsBundleFilename else {
+            guard let filename = asset.nsBundleFilename, let assetType = asset.type else {
                 continue
             }
 
-            let bundlePath: String?
+            // Get file extension from type (e.g., "image/png" -> "png")
+            let ext = assetType.components(separatedBy: "/").last ?? "png"
+            var bundlePath: String? = nil
+
+            // 1. Try in assets folder with subdirectory path (RN stores assets here)
             if let dir = asset.nsBundleDir, !dir.isEmpty {
-                bundlePath = Bundle.main.path(forResource: filename, ofType: nil, inDirectory: dir)
-            } else {
-                bundlePath = Bundle.main.path(forResource: filename, ofType: nil)
+                let path = "\(bundleRoot)/assets/\(dir)/\(filename).\(ext)"
+                if fileManager.fileExists(atPath: path) {
+                    bundlePath = path
+                }
+            }
+
+            // 2. Try without assets/ prefix
+            if bundlePath == nil, let dir = asset.nsBundleDir, !dir.isEmpty {
+                let path = "\(bundleRoot)/\(dir)/\(filename).\(ext)"
+                if fileManager.fileExists(atPath: path) {
+                    bundlePath = path
+                }
+            }
+
+            // 3. Try at root
+            if bundlePath == nil {
+                let path = "\(bundleRoot)/\(filename).\(ext)"
+                if fileManager.fileExists(atPath: path) {
+                    bundlePath = path
+                }
             }
 
             if let path = bundlePath {
@@ -486,9 +517,25 @@ public final class PulseController {
             config: config,
             currentUpdateId: launchedUpdate?.updateId
         ) { [weak self] (result: Result<PulseCheckResult, Error>) in
+            guard let self = self else {
+                completion(result)
+                return
+            }
+
             // Cache the manifest for subsequent fetchUpdate call
-            if case .success(let checkResult) = result, checkResult.isAvailable {
-                self?.lastCheckManifest = checkResult.manifest
+            if case .success(let checkResult) = result, checkResult.isAvailable, let otaManifest = checkResult.manifest {
+                // Compare commitTime: if embedded is newer, don't show update
+                let embeddedCommitTime = self.embeddedManifest?.commitTime ?? Date.distantPast
+                let otaCommitTime = otaManifest.commitTime ?? Date.distantPast
+
+                if embeddedCommitTime >= otaCommitTime {
+                    pulseLog("checkForUpdate: embedded is newer or same (embedded=\(embeddedCommitTime) >= ota=\(otaCommitTime)), no update needed")
+                    completion(.success(PulseCheckResult(isAvailable: false)))
+                    return
+                }
+
+                self.lastCheckManifest = otaManifest
+                pulseLog("checkForUpdate: cached manifest for fetch (ota=\(otaCommitTime) > embedded=\(embeddedCommitTime))")
             }
             completion(result)
         }
@@ -507,6 +554,17 @@ public final class PulseController {
             return
         }
 
+        // Thread-safe check and set of isFetching flag
+        fetchLock.lock()
+        if isFetching {
+            pendingFetchCallbacks.append(completion)
+            fetchLock.unlock()
+            pulseLog("fetchUpdate: already fetching, queuing callback")
+            return
+        }
+        isFetching = true
+        fetchLock.unlock()
+
         // Use cached manifest from recent checkForUpdate if available
         var manifestToUse = cachedManifest
         if manifestToUse == nil, let cached = lastCheckManifest {
@@ -521,9 +579,28 @@ public final class PulseController {
             config: config,
             database: database,
             directory: directory,
-            cachedManifest: manifestToUse,
-            completion: completion
-        )
+            cachedManifest: manifestToUse
+        ) { [weak self] result in
+            guard let self = self else {
+                completion(result)
+                return
+            }
+
+            // Thread-safe reset of isFetching and get pending callbacks
+            self.fetchLock.lock()
+            self.isFetching = false
+            let callbacks = self.pendingFetchCallbacks
+            self.pendingFetchCallbacks.removeAll()
+            self.fetchLock.unlock()
+
+            // Call original completion
+            completion(result)
+
+            // Call all queued callbacks with the same result
+            for callback in callbacks {
+                callback(result)
+            }
+        }
     }
 
     /// Reload the app with the new update
@@ -586,11 +663,13 @@ public final class PulseController {
 
     private func loadEmbeddedManifest() {
         // Try pulse/ subdirectory first, then root
-        guard let url = Bundle.main.url(forResource: "embedded-manifest", withExtension: "json", subdirectory: "pulse")
-                      ?? Bundle.main.url(forResource: "embedded-manifest", withExtension: "json"),
+        let urlInPulse = Bundle.main.url(forResource: "embedded-manifest", withExtension: "json", subdirectory: "pulse")
+        let urlInRoot = Bundle.main.url(forResource: "embedded-manifest", withExtension: "json")
+
+        guard let url = urlInPulse ?? urlInRoot,
               let data = try? Data(contentsOf: url),
               let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
-            pulseLog("No embedded manifest found")
+            pulseLog("No embedded manifest found or failed to parse")
             return
         }
 
@@ -598,17 +677,50 @@ public final class PulseController {
 
         // Cache embedded asset hashes
         if let manifest = embeddedManifest {
+            var foundCount = 0
+            var notFoundCount = 0
+            let bundleRoot = Bundle.main.bundlePath
+            let fileManager = FileManager.default
+
             for asset in manifest.assets {
-                if let filename = asset.nsBundleFilename {
-                    let bundlePath: String?
+                if let filename = asset.nsBundleFilename, let assetType = asset.type {
+                    // Get file extension from type (e.g., "image/png" -> "png")
+                    let ext = assetType.components(separatedBy: "/").last ?? "png"
+                    var bundlePath: String? = nil
+
+                    // 1. Try in assets folder with subdirectory path (RN stores assets here)
                     if let dir = asset.nsBundleDir, !dir.isEmpty {
-                        bundlePath = Bundle.main.path(forResource: filename, ofType: nil, inDirectory: dir)
-                    } else {
-                        bundlePath = Bundle.main.path(forResource: filename, ofType: nil)
+                        let path = "\(bundleRoot)/assets/\(dir)/\(filename).\(ext)"
+                        if fileManager.fileExists(atPath: path) {
+                            bundlePath = path
+                        }
+                    }
+
+                    // 2. Try without assets/ prefix
+                    if bundlePath == nil, let dir = asset.nsBundleDir, !dir.isEmpty {
+                        let path = "\(bundleRoot)/\(dir)/\(filename).\(ext)"
+                        if fileManager.fileExists(atPath: path) {
+                            bundlePath = path
+                        }
+                    }
+
+                    // 3. Try at root
+                    if bundlePath == nil {
+                        let path = "\(bundleRoot)/\(filename).\(ext)"
+                        if fileManager.fileExists(atPath: path) {
+                            bundlePath = path
+                        }
                     }
 
                     if let path = bundlePath {
                         embeddedAssetHashes[asset.hash.lowercased()] = URL(fileURLWithPath: path)
+                        foundCount += 1
+                    } else {
+                        notFoundCount += 1
+                    }
+                } else {
+                    if !asset.isLaunchAsset {
+                        notFoundCount += 1
                     }
                 }
 
@@ -616,6 +728,7 @@ public final class PulseController {
                     embeddedBundleHash = asset.hash.lowercased()
                 }
             }
+            pulseLog("Assets found in bundle: \(foundCount), not found: \(notFoundCount)")
         }
 
         pulseLog("Loaded embedded manifest: \(embeddedManifest?.updateId ?? "unknown"), embeddedAssetHashes count: \(embeddedAssetHashes.count)")
@@ -708,6 +821,13 @@ public final class PulseController {
                         bundleHash: update.bundleHash,
                         scopeKey: update.scopeKey
                     )
+
+                    // Load manifest from database for metadata (build number, etc.)
+                    if let manifest = update.manifest,
+                       let data = try? JSONSerialization.data(withJSONObject: manifest, options: []),
+                       let jsonString = String(data: data, encoding: .utf8) {
+                        self.launchedManifestJson = jsonString
+                    }
                 }
             }
 
@@ -1133,9 +1253,16 @@ final class PulseRemoteLoader {
                 }
 
                 // Move to final destination
-                try? FileManager.default.createDirectory(at: destination.deletingLastPathComponent(), withIntermediateDirectories: true)
-                try? FileManager.default.removeItem(at: destination)
-                try? FileManager.default.moveItem(at: tempPath, to: destination)
+                do {
+                    try FileManager.default.createDirectory(at: destination.deletingLastPathComponent(), withIntermediateDirectories: true)
+                    if FileManager.default.fileExists(atPath: destination.path) {
+                        try FileManager.default.removeItem(at: destination)
+                    }
+                    try FileManager.default.moveItem(at: tempPath, to: destination)
+                } catch {
+                    completion(.failure(error))
+                    return
+                }
 
                 // Store in database as launch asset
                 storeBundleInDatabase()
@@ -1161,12 +1288,7 @@ final class PulseRemoteLoader {
 
         let group = DispatchGroup()
         var downloadError: Error?
-
         let embeddedHashes = PulseController.shared.embeddedAssetHashes
-        pulseLog("downloadAssets: embeddedAssetHashes count=\(embeddedHashes.count)")
-        if !embeddedHashes.isEmpty {
-            pulseLog("downloadAssets: first few embedded hashes: \(Array(embeddedHashes.keys.prefix(3)).map { String($0.prefix(16)) })")
-        }
 
         for asset in assets {
             group.enter()

package/ios/PulseUpdates/PulseUpdates.swift

@@ -98,7 +98,8 @@ public class PulseUpdates: RCTEventEmitter {
         // Local assets map for expo-asset compatibility
         // Key: asset key from manifest, Value: local file:// URL
         // expo-updates exposes this as localAssets
-        state["localAssets"] = controller.localAssets.isEmpty ? [:] : controller.localAssets
+        let assets = controller.localAssets
+        state["localAssets"] = assets.isEmpty ? [:] : assets
 
         return state
     }

package/lib/commonjs/assetResolver.js

@@ -105,22 +105,9 @@ function resolveLocalAsset(asset) {
   const keysToTry = buildAssetKeys(asset);
   for (const key of keysToTry) {
     if (localAssets[key]) {
-      // Debug: log successful resolution
-      if (__DEV__) {
-        console.log(`[PulseAssetResolver] Resolved ${asset.name}.${asset.type} with key=${key.substring(0, 16)}...`);
-      }
       return localAssets[key];
     }
   }
-
-  // Debug: log failed resolution
-  if (__DEV__) {
-    console.log(`[PulseAssetResolver] MISS for ${asset.name}.${asset.type}`, {
-      triedKeys: keysToTry.map(k => k.substring(0, 16) + '...'),
-      localAssetsCount: Object.keys(localAssets).length,
-      localAssetsSample: Object.keys(localAssets).slice(0, 3).map(k => k.substring(0, 16) + '...')
-    });
-  }
   return null;
 }
 

package/lib/commonjs/assetResolver.js.map

@@ -1 +1 @@
-{"version":3,"names":["localAssets","isPatched","originalDefaultAsset","applyPatch","AssetSourceResolver","require","default","prototype","defaultAsset","Object","keys","length","localUri","resolveLocalAsset","asset","fromSource","e","call","apply","initializeAssetResolver","assets","updateLocalAssets","keysToTry","buildAssetKeys","key","__DEV__","console","log","name","type","substring","triedKeys","map","k","localAssetsCount","localAssetsSample","slice","httpServerLocation","hash","fileHashes","push","values","forEach","h","location","startsWith","scales","scale","scaleSuffix","_default","exports"],"sourceRoot":"../../src","sources":["assetResolver.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["localAssets","isPatched","originalDefaultAsset","applyPatch","AssetSourceResolver","require","default","prototype","defaultAsset","Object","keys","length","localUri","resolveLocalAsset","asset","fromSource","e","call","apply","initializeAssetResolver","assets","updateLocalAssets","keysToTry","buildAssetKeys","key","name","type","httpServerLocation","hash","fileHashes","push","values","forEach","h","location","startsWith","slice","scales","scale","scaleSuffix","_default","exports"],"sourceRoot":"../../src","sources":["assetResolver.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/assetResolver.js

@@ -97,22 +97,9 @@ function resolveLocalAsset(asset) {
   const keysToTry = buildAssetKeys(asset);
   for (const key of keysToTry) {
     if (localAssets[key]) {
-      // Debug: log successful resolution
-      if (__DEV__) {
-        console.log(`[PulseAssetResolver] Resolved ${asset.name}.${asset.type} with key=${key.substring(0, 16)}...`);
-      }
       return localAssets[key];
     }
   }
-
-  // Debug: log failed resolution
-  if (__DEV__) {
-    console.log(`[PulseAssetResolver] MISS for ${asset.name}.${asset.type}`, {
-      triedKeys: keysToTry.map(k => k.substring(0, 16) + '...'),
-      localAssetsCount: Object.keys(localAssets).length,
-      localAssetsSample: Object.keys(localAssets).slice(0, 3).map(k => k.substring(0, 16) + '...')
-    });
-  }
   return null;
 }
 

package/lib/module/assetResolver.js.map

@@ -1 +1 @@
-{"version":3,"names":["localAssets","isPatched","originalDefaultAsset","applyPatch","AssetSourceResolver","require","default","prototype","defaultAsset","Object","keys","length","localUri","resolveLocalAsset","asset","fromSource","e","call","apply","initializeAssetResolver","assets","updateLocalAssets","keysToTry","buildAssetKeys","key","__DEV__","console","log","name","type","substring","triedKeys","map","k","localAssetsCount","localAssetsSample","slice","httpServerLocation","hash","fileHashes","push","values","forEach","h","location","startsWith","scales","scale","scaleSuffix"],"sourceRoot":"../../src","sources":["assetResolver.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["localAssets","isPatched","originalDefaultAsset","applyPatch","AssetSourceResolver","require","default","prototype","defaultAsset","Object","keys","length","localUri","resolveLocalAsset","asset","fromSource","e","call","apply","initializeAssetResolver","assets","updateLocalAssets","keysToTry","buildAssetKeys","key","name","type","httpServerLocation","hash","fileHashes","push","values","forEach","h","location","startsWith","slice","scales","scale","scaleSuffix"],"sourceRoot":"../../src","sources":["assetResolver.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/assetResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assetResolver.d.ts","sourceRoot":"","sources":["../../src/assetResolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AA2DH;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,GAAG,IAAI,CAGnF;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,GAAG,IAAI,CAE7E;;;;;AAsGD,wBAGE"}
+{"version":3,"file":"assetResolver.d.ts","sourceRoot":"","sources":["../../src/assetResolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AA2DH;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,GAAG,IAAI,CAGnF;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,GAAG,IAAI,CAE7E;;;;;AAyFD,wBAGE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pulse-updates",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "OTA updates for React Native - lightweight alternative to expo-updates",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",

package/scripts/generate-embedded-manifest.mjs

@@ -226,6 +226,13 @@ async function main() {
       const isDrawable = ['png', 'jpg', 'jpeg', 'gif', 'webp', 'svg'].includes(type);
       assetInfo.resourcesFolder = isDrawable ? 'drawable' : 'raw';
       assetInfo.resourcesFilename = getAndroidResourceIdentifier(relative, name);
+      // Also set mainBundleDir/mainBundleFilename for Kotlin code compatibility
+      // Assets are copied to pulse/assets/<relative_path> in the APK
+      const relativeDir = path.dirname(relative);
+      assetInfo.mainBundleDir = relativeDir && relativeDir !== '.'
+        ? `pulse/assets/${relativeDir}`
+        : 'pulse/assets';
+      assetInfo.mainBundleFilename = path.basename(relative);
     }
 
     assets.push(assetInfo);

package/src/assetResolver.ts

@@ -101,23 +101,10 @@ function resolveLocalAsset(asset: any): string | null {
 
   for (const key of keysToTry) {
     if (localAssets[key]) {
-      // Debug: log successful resolution
-      if (__DEV__) {
-        console.log(`[PulseAssetResolver] Resolved ${asset.name}.${asset.type} with key=${key.substring(0, 16)}...`);
-      }
       return localAssets[key];
     }
   }
 
-  // Debug: log failed resolution
-  if (__DEV__) {
-    console.log(`[PulseAssetResolver] MISS for ${asset.name}.${asset.type}`, {
-      triedKeys: keysToTry.map(k => k.substring(0, 16) + '...'),
-      localAssetsCount: Object.keys(localAssets).length,
-      localAssetsSample: Object.keys(localAssets).slice(0, 3).map(k => k.substring(0, 16) + '...')
-    });
-  }
-
   return null;
 }