@onekeyfe/react-native-bundle-update 3.0.95 → 3.0.96

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

@@ -0,0 +1,22 @@
+package com.margelo.nitro.reactnativebundleupdate
+
+internal object BundleStorageSchemaPolicy {
+    const val METADATA_KEY = "storageSchemaVersion"
+    const val SUPPORTED_VERSION = "mmkv-v1"
+    const val LEDGER_PREFS_NAME = "onekey_native_storage_migration"
+    private val ledgerKeys = listOf("app-storage-v1", "jotai-storage-v1")
+
+    fun isCompatible(
+        declaredVersion: String?,
+        readMigrationLedger: (String) -> String?,
+    ): Boolean {
+        if (!declaredVersion.isNullOrEmpty()) {
+            return declaredVersion == SUPPORTED_VERSION
+        }
+
+        // Old apps do not write this ledger and may keep using unmarked bundles.
+        // Any non-empty state (including an interrupted migration or reset)
+        // forbids returning to the retained AsyncStorage database.
+        return ledgerKeys.none { key -> !readMigrationLedger(key).isNullOrEmpty() }
+    }
+}

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

@@ -428,7 +428,8 @@ object BundleUpdateStoreAndroid {
         return key == METADATA_REQUIRES_BACKGROUND_BUNDLE_KEY ||
             key == METADATA_BACKGROUND_PROTOCOL_VERSION_KEY ||
             key == METADATA_REQUIRES_COMMON_BUNDLE_KEY ||
-            key == METADATA_BUNDLE_FORMAT_KEY
+            key == METADATA_BUNDLE_FORMAT_KEY ||
+            key == BundleStorageSchemaPolicy.METADATA_KEY
     }
 
     private fun getFileMetadataEntries(metadata: Map<String, String>): Map<String, String> {
@@ -458,6 +459,17 @@ object BundleUpdateStoreAndroid {
         return metadata[METADATA_BACKGROUND_PROTOCOL_VERSION_KEY] ?: ""
     }
 
+    private fun validateStorageSchemaCompatibility(context: Context, metadata: Map<String, String>): Boolean {
+        val compatible = BundleStorageSchemaPolicy.isCompatible(metadata[BundleStorageSchemaPolicy.METADATA_KEY]) { key ->
+            context.getSharedPreferences(BundleStorageSchemaPolicy.LEDGER_PREFS_NAME, Context.MODE_PRIVATE)
+                .getString(key, null)
+        }
+        if (!compatible) {
+            OneKeyLog.error("BundleUpdate", "Bundle storage schema is incompatible with the native migration state")
+        }
+        return compatible
+    }
+
     fun readMetadataFileSha256(signature: String?): String? {
         if (signature.isNullOrEmpty()) return null
 
@@ -635,6 +647,17 @@ object BundleUpdateStoreAndroid {
         }
     }
 
+    fun validateBundlePairCompatibility(
+        context: Context,
+        bundleDir: String,
+        metadata: Map<String, String>,
+    ): Boolean {
+        return validateStorageSchemaCompatibility(context, metadata) &&
+            validateBundlePairCompatibility(bundleDir, metadata)
+    }
+
+    // Retain the original layout-validator signature for existing native callers.
+    // Startup and extracted-bundle validation use the context overload.
     fun validateBundlePairCompatibility(bundleDir: String, metadata: Map<String, String>): Boolean {
         val mainBundleFile = File(bundleDir, MAIN_JS_BUNDLE_FILE_NAME)
         if (!mainBundleFile.exists()) {
@@ -706,6 +729,12 @@ object BundleUpdateStoreAndroid {
             // startup.
             cachedValidatedBundleInfo?.let { cached ->
                 if (cached.currentBundleVersion == currentBundleVersion) {
+                    // Migration state can change while the native bundle cache survives
+                    // a JS runtime reload. Recheck the ledger without repeating hashes.
+                    if (!validateStorageSchemaCompatibility(context, cached.metadata)) {
+                        invalidateValidatedBundleInfoCache()
+                        return null
+                    }
                     return cached
                 }
             }
@@ -774,7 +803,7 @@ object BundleUpdateStoreAndroid {
                 return null
             }
 
-            if (!validateBundlePairCompatibility(bundleDir, metadata)) {
+            if (!validateBundlePairCompatibility(context, bundleDir, metadata)) {
                 return null
             }
 
@@ -1727,7 +1756,7 @@ class ReactNativeBundleUpdate : HybridReactNativeBundleUpdateSpec() {
                     BundleUpdateStoreAndroid.deleteDir(destinationDir)
                     throw Exception("Extracted files verification against metadata failed")
                 }
-                if (!BundleUpdateStoreAndroid.validateBundlePairCompatibility(destination, metadata)) {
+                if (!BundleUpdateStoreAndroid.validateBundlePairCompatibility(context, destination, metadata)) {
                     OneKeyLog.error("BundleUpdate", "verifyBundleASC: bundle pair compatibility check failed")
                     BundleUpdateStoreAndroid.deleteDir(destinationDir)
                     throw Exception("Bundle pair compatibility check failed")
@@ -2308,7 +2337,7 @@ n2DMz6gqk326W6SFynYtvuiXo7wG4Cmn3SuIU8xfv9rJqunpZGYchMd7nZektmEJ
                 OneKeyLog.error("BundleUpdate", "verifyExtractedBundle: file integrity check failed")
                 throw Exception("File integrity check failed")
             }
-            if (!BundleUpdateStoreAndroid.validateBundlePairCompatibility(bundlePath.absolutePath, metadata)) {
+            if (!BundleUpdateStoreAndroid.validateBundlePairCompatibility(context, bundlePath.absolutePath, metadata)) {
                 OneKeyLog.error("BundleUpdate", "verifyExtractedBundle: bundle pair compatibility check failed")
                 throw Exception("Bundle pair compatibility check failed")
             }

package/ios/BundleStorageSchemaPolicy.swift

@@ -0,0 +1,22 @@
+enum BundleStorageSchemaPolicy {
+    static let metadataKey = "storageSchemaVersion"
+    static let supportedVersion = "mmkv-v1"
+    static let ledgerPrefix = "onekey_native_storage_migration_"
+    private static let ledgerKeys = ["app-storage-v1", "jotai-storage-v1"]
+
+    static func isCompatible(
+        declaredVersion: String?,
+        readMigrationLedger: (String) -> String?
+    ) -> Bool {
+        if let declaredVersion, !declaredVersion.isEmpty {
+            return declaredVersion == supportedVersion
+        }
+
+        // Old apps do not write this ledger and may keep using unmarked bundles.
+        // Any non-empty state (including an interrupted migration or reset)
+        // forbids returning to the retained AsyncStorage database.
+        return !ledgerKeys.contains { key in
+            !(readMigrationLedger(ledgerPrefix + key) ?? "").isEmpty
+        }
+    }
+}

package/ios/ReactNativeBundleUpdate.swift

@@ -439,7 +439,8 @@ public class BundleUpdateStore: NSObject {
         key == metadataRequiresBackgroundBundleKey ||
         key == metadataBackgroundProtocolVersionKey ||
         key == metadataRequiresCommonBundleKey ||
-        key == metadataBundleFormatKey
+        key == metadataBundleFormatKey ||
+        key == BundleStorageSchemaPolicy.metadataKey
     }
 
     private static func metadataStringValue(
@@ -474,6 +475,17 @@ public class BundleUpdateStore: NSObject {
         return false
     }
 
+    private static func validateStorageSchemaCompatibility(_ metadata: [String: Any]) -> Bool {
+        let declaredVersion = metadataStringValue(metadata, key: BundleStorageSchemaPolicy.metadataKey)
+        let compatible = BundleStorageSchemaPolicy.isCompatible(declaredVersion: declaredVersion) { key in
+            UserDefaults.standard.string(forKey: key)
+        }
+        if !compatible {
+            OneKeyLog.error("BundleUpdate", "Bundle storage schema is incompatible with the native migration state")
+        }
+        return compatible
+    }
+
     private static func fileMetadataEntries(
         from metadata: [String: Any],
     ) -> [String: String] {
@@ -567,6 +579,9 @@ public class BundleUpdateStore: NSObject {
         bundleDirPath: String,
         metadata: [String: Any],
     ) -> Bool {
+        if !validateStorageSchemaCompatibility(metadata) {
+            return false
+        }
         let mainBundlePath = (bundleDirPath as NSString)
             .appendingPathComponent(mainBundleEntryFileName)
         guard FileManager.default.fileExists(atPath: mainBundlePath) else {
@@ -647,6 +662,12 @@ public class BundleUpdateStore: NSObject {
         cachedValidatedBundleInfoLock.lock()
         if let cached = cachedValidatedBundleInfo, cached.currentBundleVersion == currentBundleVer {
             cachedValidatedBundleInfoLock.unlock()
+            // Migration state can change while the native bundle cache survives
+            // a JS runtime reload. Recheck the ledger without repeating hashes.
+            if !validateStorageSchemaCompatibility(cached.metadata) {
+                invalidateValidatedBundleInfoCache()
+                return nil
+            }
             return cached
         }
         cachedValidatedBundleInfoLock.unlock()

package/package.json

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