expo-updates 0.24.11 → 0.24.13

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 0.24.13 — 2024-05-25
+
+### 🐛 Bug fixes
+
+- Android: Fix hard crash due to missing asset edge row. ([#28264](https://github.com/expo/expo/pull/28264) by [@douglowder](https://github.com/douglowder))
+
+## 0.24.12 — 2024-03-13
+
+### 💡 Others
+
+- [iOS] Moved expo-dev-client + expo-updates interop setup out from `application:willFinishLaunchingWithOptions:`. ([#27477](https://github.com/expo/expo/pull/27477) by [@kudo](https://github.com/kudo))
+
 ## 0.24.11 — 2024-02-16
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.24.11'
+version = '0.24.13'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 if (expoModulesCorePlugin.exists()) {
@@ -122,7 +122,7 @@ android {
   namespace "expo.modules.updates"
   defaultConfig {
     versionCode 31
-    versionName '0.24.11'
+    versionName '0.24.13'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

package/android/src/main/java/expo/modules/updates/db/dao/AssetDao.kt

@@ -37,6 +37,14 @@ abstract class AssetDao {
   )
   abstract fun _unmarkUsedAssetsFromDeletion()
 
+  @Query(
+    "UPDATE assets SET marked_for_deletion = 0 WHERE id IN (" +
+      " SELECT launch_asset_id" +
+      " FROM updates" +
+      " WHERE updates.keep);"
+  )
+  abstract fun _unmarkUsedLaunchAssetsFromDeletion()
+
   @Query(
     "UPDATE assets SET marked_for_deletion = 0 WHERE relative_path IN (" +
       " SELECT relative_path" +
@@ -145,6 +153,7 @@ abstract class AssetDao {
     // this is safe since this is a transaction and will be rolled back upon failure
     _markAllAssetsForDeletion()
     _unmarkUsedAssetsFromDeletion()
+    _unmarkUsedLaunchAssetsFromDeletion()
     // check for duplicate rows representing a single file on disk
     _unmarkDuplicateUsedAssetsFromDeletion()
     val deletedAssets = _loadAssetsMarkedForDeletion()

package/android/src/main/java/expo/modules/updates/db/dao/UpdateDao.kt

@@ -25,8 +25,8 @@ abstract class UpdateDao {
   @Query("SELECT * FROM updates WHERE id = :id;")
   abstract fun _loadUpdatesWithId(id: UUID): List<UpdateEntity>
 
-  @Query("SELECT assets.* FROM assets INNER JOIN updates ON updates.launch_asset_id = assets.id WHERE updates.id = :id;")
-  abstract fun _loadLaunchAsset(id: UUID): AssetEntity
+  @Query("SELECT assets.* FROM assets INNER JOIN updates ON updates.launch_asset_id = assets.id WHERE updates.id = :updateId;")
+  abstract fun _loadLaunchAssetForUpdate(updateId: UUID): AssetEntity?
 
   @Query("UPDATE updates SET keep = 1 WHERE id = :id;")
   abstract fun _keepUpdate(id: UUID)
@@ -64,10 +64,10 @@ abstract class UpdateDao {
     return if (updateEntities.isNotEmpty()) updateEntities[0] else null
   }
 
-  fun loadLaunchAsset(id: UUID): AssetEntity {
-    val assetEntity = _loadLaunchAsset(id)
-    assetEntity.isLaunchAsset = true
-    return assetEntity
+  fun loadLaunchAssetForUpdate(updateId: UUID): AssetEntity? {
+    return _loadLaunchAssetForUpdate(updateId)?.apply {
+      isLaunchAsset = true
+    }
   }
 
   @Insert

package/android/src/main/java/expo/modules/updates/db/entity/UpdateEntity.kt

@@ -59,4 +59,6 @@ class UpdateEntity(
 
   @ColumnInfo(name = "failed_launch_count", defaultValue = "0")
   var failedLaunchCount = 0
+
+  fun debugInfo(): String = JSONObject(mapOf("id" to id.toString(), "status" to status.name)).toString()
 }

package/android/src/main/java/expo/modules/updates/launcher/DatabaseLauncher.kt

@@ -71,7 +71,7 @@ class DatabaseLauncher(
 
     launchedUpdate = getLaunchableUpdate(database, context)
     if (launchedUpdate == null) {
-      this.callback!!.onFailure(Exception("No launchable update was found. If this is a bare workflow app, make sure you have configured expo-updates correctly in android/app/build.gradle."))
+      this.callback!!.onFailure(Exception("No launchable update was found. If this is a generic app, ensure expo-updates is configured correctly."))
       return
     }
 
@@ -83,9 +83,14 @@ class DatabaseLauncher(
 
     // verify that we have all assets on disk
     // according to the database, we should, but something could have gone wrong on disk
-    val launchAsset = database.updateDao().loadLaunchAsset(launchedUpdate!!.id)
+    val launchAsset = database.updateDao().loadLaunchAssetForUpdate(launchedUpdate!!.id)
+    if (launchAsset == null) {
+      this.callback!!.onFailure(Exception("Launch asset not found for update; this should never happen. Debug info: ${launchedUpdate!!.debugInfo()}"))
+      return
+    }
+
     if (launchAsset.relativePath == null) {
-      throw AssertionError("Launch Asset relativePath should not be null")
+      this.callback!!.onFailure(Exception("Launch asset relative path should not be null. Debug info: ${launchedUpdate!!.debugInfo()}"))
     }
 
     val launchAssetFile = ensureAssetExists(launchAsset, database, context)
@@ -113,7 +118,7 @@ class DatabaseLauncher(
 
     if (assetsToDownload == 0) {
       if (this.launchAssetFile == null) {
-        this.callback!!.onFailure(Exception("mLaunchAssetFile was immediately null; this should never happen"))
+        this.callback!!.onFailure(Exception("Launch asset file was null with no assets to download reported; this should never happen. Debug info: ${launchedUpdate!!.debugInfo()}"))
       } else {
         this.callback!!.onSuccess()
       }

package/android/src/main/java/expo/modules/updates/selectionpolicy/ReaperSelectionPolicyFilterAware.kt

@@ -1,6 +1,7 @@
 package expo.modules.updates.selectionpolicy
 
 import expo.modules.updates.db.entity.UpdateEntity
+import expo.modules.updates.db.enums.UpdateStatus
 import org.json.JSONObject
 
 /**
@@ -50,6 +51,8 @@ class ReaperSelectionPolicyFilterAware : ReaperSelectionPolicy {
     } else if (nextNewestUpdate != null) {
       updatesToDelete.remove(nextNewestUpdate)
     }
-    return updatesToDelete
+
+    // don't delete embedded update
+    return updatesToDelete.filter { it.status != UpdateStatus.EMBEDDED }
   }
 }

package/expo-module.config.json

@@ -2,7 +2,6 @@
   "platforms": ["apple", "android"],
   "apple": {
     "modules": ["UpdatesModule"],
-    "appDelegateSubscribers": ["ExpoUpdatesAppDelegateSubscriber"],
     "reactDelegateHandlers": ["ExpoUpdatesReactDelegateHandler"]
   },
   "android": {

package/ios/EXUpdates/ReactDelegateHandler/ExpoUpdatesReactDelegateHandler.swift

@@ -1,6 +1,7 @@
 // Copyright 2018-present 650 Industries. All rights reserved.
 
 import ExpoModulesCore
+import EXUpdatesInterface
 
 /**
  * Manages and controls the auto-setup behavior of expo-updates in applicable environments.
@@ -44,6 +45,13 @@ public final class ExpoUpdatesReactDelegateHandler: ExpoReactDelegateHandler, Ap
   }()
 
   public override func createBridge(reactDelegate: ExpoReactDelegate, bridgeDelegate: RCTBridgeDelegate, launchOptions: [AnyHashable: Any]?) -> RCTBridge? {
+    if EXAppDefines.APP_DEBUG && !UpdatesUtils.isNativeDebuggingEnabled() {
+      // In development builds with expo-dev-client, completes the auto-setup for development
+      // builds with the expo-updates integration by passing a reference to DevLauncherController
+      // over to the registry, which expo-dev-client can access.
+      UpdatesControllerRegistry.sharedInstance.controller = AppController.initializeAsDevLauncherWithoutStarting()
+      return nil
+    }
     if !shouldEnableAutoSetup {
       return nil
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "0.24.11",
+  "version": "0.24.13",
   "description": "Fetches and manages remotely-hosted assets and updates to your app's JS bundle.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@expo/code-signing-certificates": "0.0.5",
     "@expo/config": "~8.5.0",
-    "@expo/config-plugins": "~7.8.0",
+    "@expo/config-plugins": "~7.9.0",
     "arg": "4.1.0",
     "chalk": "^4.1.2",
     "expo-eas-client": "~0.11.0",
@@ -65,5 +65,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "6ceeb37fe2ccd9b290f9d717d9792c68487118b1"
+  "gitHead": "58a91cebca537b685603ca67bc51b6617b3dca80"
 }

package/ios/EXUpdates/ReactDelegateHandler/ExpoUpdatesAppDelegateSubscriber.swift

@@ -1,18 +0,0 @@
-// Copyright 2022-present 650 Industries. All rights reserved.
-
-import ExpoModulesCore
-import EXUpdatesInterface
-
-/**
- * Used only in development builds with expo-dev-client; completes the auto-setup for development
- * builds with the expo-updates integration by passing a reference to DevLauncherController
- * over to the registry, which expo-dev-client can access.
- */
-public final class ExpoUpdatesAppDelegateSubscriber: ExpoAppDelegateSubscriber {
-  public func application(_ application: UIApplication, willFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
-    if EXAppDefines.APP_DEBUG && !UpdatesUtils.isNativeDebuggingEnabled() {
-      UpdatesControllerRegistry.sharedInstance.controller = AppController.initializeAsDevLauncherWithoutStarting()
-    }
-    return true
-  }
-}