@onekeyfe/react-native-bundle-update 1.1.42 → 1.1.44

package/android/src/main/java/com/margelo/nitro/reactnativebundleupdate/ReactNativeBundleUpdate.kt

@@ -248,6 +248,101 @@ object BundleUpdateStoreAndroid {
         }
     }
 
+    // Pre-launch pending task processing
+
+    @Volatile
+    private var didProcessPreLaunchTask = false
+
+    /**
+     * Checks MMKV for a pending bundle-switch task and applies it before JS runtime starts.
+     * Only handles the happy path (status=pending, bundle exists, env matches).
+     * All complex logic (retry, download, error handling) remains in JS layer.
+     */
+    fun processPreLaunchPendingTask(context: Context) {
+        if (didProcessPreLaunchTask) return
+        didProcessPreLaunchTask = true
+        try {
+            // 1. Read MMKV
+            MMKV.initialize(context)
+            val mmkv = MMKV.mmkvWithID("onekey-app-setting") ?: return
+            val taskJson = mmkv.decodeString("onekey_pending_install_task") ?: return
+            val taskObj = JSONObject(taskJson)
+
+            // 2. Validate task fields
+            if (taskObj.optString("status") != "pending") return
+            if (taskObj.optString("action") != "switch-bundle") return
+            if (taskObj.optString("type") != "jsbundle-switch") return
+
+            val now = System.currentTimeMillis()
+            if (taskObj.optLong("expiresAt", 0) <= now) return
+            val nextRetryAt = taskObj.optLong("nextRetryAt", 0)
+            if (nextRetryAt > 0 && nextRetryAt > now) return
+
+            // 3. Verify scheduledEnv matches current state
+            val currentAppVersion = getAppVersion(context) ?: return
+            if (taskObj.optString("scheduledEnvAppVersion") != currentAppVersion) return
+
+            val currentBV = getCurrentBundleVersion(context)
+            val currentBundleVersionStr = if (currentBV != null) {
+                val idx = currentBV.lastIndexOf("-")
+                if (idx > 0) currentBV.substring(idx + 1) else getBuiltinBundleVersion(context)
+            } else {
+                getBuiltinBundleVersion(context)
+            }
+            if (taskObj.optString("scheduledEnvBundleVersion") != currentBundleVersionStr) return
+
+            // 4. Extract payload
+            val payload = taskObj.optJSONObject("payload") ?: return
+            val appVersion = payload.optString("appVersion")
+            val bundleVersion = payload.optString("bundleVersion")
+            val signature = payload.optString("signature")
+            if (appVersion.isEmpty() || bundleVersion.isEmpty() || signature.isEmpty()) return
+            if (!isSafeVersionString(appVersion) || !isSafeVersionString(bundleVersion)) return
+
+            // 5. Verify bundle directory and entry file exist
+            val folderName = "$appVersion-$bundleVersion"
+            val bundleDirPath = File(getBundleDir(context), folderName)
+            if (!bundleDirPath.exists()) return
+            val entryFile = File(bundleDirPath, "main.jsbundle.hbc")
+            if (!entryFile.exists()) {
+                OneKeyLog.warn("BundleUpdate", "processPreLaunchPendingTask: bundle dir exists but entry file missing: ${entryFile.absolutePath}")
+                return
+            }
+
+            // 6. Apply (same as installBundle) — use commit() for synchronous writes
+            //    to ensure all prefs are persisted atomically before proceeding.
+            val bundlePrefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
+            val versionPrefs = context.getSharedPreferences(NATIVE_VERSION_PREFS_NAME, Context.MODE_PRIVATE)
+            val currentVersion = bundlePrefs.getString(CURRENT_BUNDLE_VERSION_KEY, "")
+            bundlePrefs.edit()
+                .putString(CURRENT_BUNDLE_VERSION_KEY, folderName)
+                .apply {
+                    if (!currentVersion.isNullOrEmpty()) {
+                        remove(currentVersion) // legacy signature key cleanup
+                    }
+                }
+                .commit()
+            if (!signature.isNullOrEmpty()) {
+                writeSignatureFile(context, folderName, signature)
+            }
+            versionPrefs.edit()
+                .putString("nativeVersion", currentAppVersion)
+                .putString("nativeBuildNumber", getBuildNumber(context))
+                .commit()
+
+            // 7. Update MMKV task status → applied_waiting_verify
+            // Do NOT set runningStartedAt — a falsy value lets JS skip the
+            // 10-minute grace period and verify alignment immediately on boot.
+            taskObj.put("status", "applied_waiting_verify")
+            taskObj.remove("runningStartedAt")
+            mmkv.encode("onekey_pending_install_task", taskObj.toString())
+
+            OneKeyLog.info("BundleUpdate", "processPreLaunchPendingTask: switched to $folderName")
+        } catch (e: Exception) {
+            OneKeyLog.error("BundleUpdate", "processPreLaunchPendingTask failed: ${e.message}")
+        }
+    }
+
     fun calculateSHA256(filePath: String): String? {
         return try {
             val digest = MessageDigest.getInstance("SHA-256")
@@ -536,6 +631,7 @@ object BundleUpdateStoreAndroid {
     }
 
     fun getCurrentBundleMainJSBundle(context: Context): String? {
+        processPreLaunchPendingTask(context)
         return try {
             val currentAppVersion = getAppVersion(context)
             val currentBundleVersion = getCurrentBundleVersion(context) ?: run {

package/ios/ReactNativeBundleUpdate.swift

@@ -202,6 +202,99 @@ public class BundleUpdateStore: NSObject {
         Bundle.main.infoDictionary?["BUNDLE_VERSION"] as? String ?? ""
     }
 
+    // MARK: - Pre-launch pending task processing
+
+    private static var didProcessPreLaunchTask = false
+
+    /// Checks MMKV for a pending bundle-switch task and applies it before JS runtime starts.
+    /// Only handles the happy path (status=pending, bundle exists, env matches).
+    /// All complex logic (retry, download, error handling) remains in JS layer.
+    public static func processPreLaunchPendingTask() {
+        guard !didProcessPreLaunchTask else { return }
+        didProcessPreLaunchTask = true
+
+        do {
+            // 1. Read MMKV (same pattern as isDevSettingsEnabled)
+            MMKV.initialize(rootDir: nil)
+            guard let mmkv = MMKV(mmapID: "onekey-app-setting"),
+                  let taskJson = mmkv.string(forKey: "onekey_pending_install_task"),
+                  let data = taskJson.data(using: .utf8),
+                  let taskDict = try JSONSerialization.jsonObject(with: data) as? [String: Any]
+            else { return }
+
+            // 2. Validate task fields
+            guard taskDict["status"] as? String == "pending",
+                  taskDict["action"] as? String == "switch-bundle",
+                  taskDict["type"] as? String == "jsbundle-switch"
+            else { return }
+
+            let now = Int64(Date().timeIntervalSince1970 * 1000)
+            guard let expiresAtNum = taskDict["expiresAt"] as? NSNumber else { return }
+            let expiresAt = expiresAtNum.int64Value
+            guard expiresAt > now else { return }
+            if let nextRetryAtNum = taskDict["nextRetryAt"] as? NSNumber {
+                if nextRetryAtNum.int64Value > now { return }
+            }
+
+            // 3. Verify scheduledEnv matches current state
+            let currentAppVersion = getCurrentNativeVersion()
+            guard taskDict["scheduledEnvAppVersion"] as? String == currentAppVersion else { return }
+
+            let currentBundleVersionStr: String
+            if let cbv = currentBundleVersion(),
+               let dashRange = cbv.range(of: "-", options: .backwards) {
+                currentBundleVersionStr = String(cbv[dashRange.upperBound...])
+            } else {
+                currentBundleVersionStr = getBuiltinBundleVersion()
+            }
+            guard taskDict["scheduledEnvBundleVersion"] as? String == currentBundleVersionStr else { return }
+
+            // 4. Extract payload
+            guard let payload = taskDict["payload"] as? [String: Any],
+                  let appVersion = payload["appVersion"] as? String,
+                  let bundleVersion = payload["bundleVersion"] as? String,
+                  let signature = payload["signature"] as? String,
+                  !appVersion.isEmpty, !bundleVersion.isEmpty, !signature.isEmpty,
+                  appVersion.isSafeVersionString, bundleVersion.isSafeVersionString
+            else { return }
+
+            // 5. Verify bundle directory and entry file exist
+            let folderName = "\(appVersion)-\(bundleVersion)"
+            let bundleDirPath = (bundleDir() as NSString).appendingPathComponent(folderName)
+            guard FileManager.default.fileExists(atPath: bundleDirPath) else { return }
+            let entryFilePath = (bundleDirPath as NSString).appendingPathComponent("main.jsbundle.hbc")
+            guard FileManager.default.fileExists(atPath: entryFilePath) else {
+                OneKeyLog.warn("BundleUpdate", "processPreLaunchPendingTask: bundle dir exists but entry file missing: \(entryFilePath)")
+                return
+            }
+
+            // 6. Apply: set currentBundleVersion (same as installBundle)
+            let ud = UserDefaults.standard
+            ud.set(folderName, forKey: bundlePrefsKey)
+            if !signature.isEmpty {
+                writeSignatureFile(folderName, signature: signature)
+            }
+            setNativeVersion(currentAppVersion)
+            setNativeBuildNumber(getCurrentNativeBuildNumber())
+            ud.synchronize()
+
+            // 7. Update MMKV task status → applied_waiting_verify
+            // Do NOT set runningStartedAt — a falsy value lets JS skip the
+            // 10-minute grace period and verify alignment immediately on boot.
+            var updatedTask = taskDict
+            updatedTask["status"] = "applied_waiting_verify"
+            updatedTask.removeValue(forKey: "runningStartedAt")
+            let jsonData = try JSONSerialization.data(withJSONObject: updatedTask)
+            if let jsonStr = String(data: jsonData, encoding: .utf8) {
+                mmkv.set(jsonStr, forKey: "onekey_pending_install_task")
+            }
+
+            OneKeyLog.info("BundleUpdate", "processPreLaunchPendingTask: switched to \(folderName)")
+        } catch {
+            OneKeyLog.error("BundleUpdate", "processPreLaunchPendingTask failed: \(error)")
+        }
+    }
+
     public static func getMetadataFilePath(_ currentBundleVersion: String) -> String? {
         let path = (bundleDir() as NSString)
             .appendingPathComponent(currentBundleVersion)
@@ -406,6 +499,7 @@ public class BundleUpdateStore: NSObject {
     }
 
     public static func currentBundleMainJSBundle() -> String? {
+        processPreLaunchPendingTask()
         guard let currentBundleVer = currentBundleVersion() else {
             OneKeyLog.warn("BundleUpdate", "getJsBundlePath: no currentBundleVersion stored")
             return nil

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-bundle-update",
-  "version": "1.1.42",
+  "version": "1.1.44",
   "description": "react-native-bundle-update",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",