expo-updates 0.12.0 → 0.13.0

package/CHANGELOG.md

@@ -10,6 +10,17 @@
 
 ### 💡 Others
 
+## 0.13.0 — 2022-04-21
+
+### 🐛 Bug fixes
+
+- Fix asset hash validation. ([#17152](https://github.com/expo/expo/pull/17152) by [@wschurman](https://github.com/wschurman))
+
+### 💡 Others
+
+- Add current and embedded update headers to manifest requests. ([#17033](https://github.com/expo/expo/pull/17033) by [@esamelson](https://github.com/esamelson))
+- Fix return value in AppDelegateSubscriber (used with expo-dev-client). ([#17111](https://github.com/expo/expo/pull/17111) by [@esamelson](https://github.com/esamelson))
+
 ## 0.12.0 — 2022-04-18
 
 ### 🛠 Breaking changes

package/android/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.12.0'
+version = '0.13.0'
 
 apply from: "../scripts/create-manifest-android.gradle"
 
@@ -77,7 +77,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 31
-    versionName '0.12.0'
+    versionName '0.13.0'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     // uncomment below to export the database schema when making changes

package/android/src/main/java/expo/modules/updates/UpdatesController.kt

@@ -307,7 +307,7 @@ class UpdatesController private constructor(
         }
         remoteLoadStatus = ErrorRecoveryDelegate.RemoteLoadStatus.NEW_UPDATE_LOADING
         val database = getDatabase()
-        val remoteLoader = RemoteLoader(context, updatesConfiguration, database, fileDownloader, updatesDirectory)
+        val remoteLoader = RemoteLoader(context, updatesConfiguration, database, fileDownloader, updatesDirectory, launchedUpdate)
         remoteLoader.start(object : Loader.LoaderCallback {
           override fun onFailure(e: Exception) {
             setRemoteLoadStatus(ErrorRecoveryDelegate.RemoteLoadStatus.IDLE)

package/android/src/main/java/expo/modules/updates/UpdatesDevLauncherController.kt

@@ -52,7 +52,8 @@ class UpdatesDevLauncherController : UpdatesInterface {
       updatesConfiguration,
       databaseHolder.database,
       controller.fileDownloader,
-      controller.updatesDirectory
+      controller.updatesDirectory,
+      null
     )
     loader.start(object : Loader.LoaderCallback {
       override fun onFailure(e: Exception) {

package/android/src/main/java/expo/modules/updates/UpdatesInterface.kt

@@ -23,6 +23,7 @@ interface UpdatesInterface {
   val isEmergencyLaunch: Boolean
   val isUsingEmbeddedAssets: Boolean
   fun canRelaunch(): Boolean
+  val embeddedUpdate: UpdateEntity?
   val launchedUpdate: UpdateEntity?
   val localAssetFiles: Map<AssetEntity, String>?
 

package/android/src/main/java/expo/modules/updates/UpdatesModule.kt

@@ -12,10 +12,10 @@ import expo.modules.core.interfaces.ExpoMethod
 import expo.modules.updates.db.entity.AssetEntity
 import expo.modules.updates.db.entity.UpdateEntity
 import expo.modules.updates.launcher.Launcher.LauncherCallback
+import expo.modules.updates.loader.FileDownloader
 import expo.modules.updates.loader.FileDownloader.ManifestDownloadCallback
 import expo.modules.updates.loader.Loader
 import expo.modules.updates.loader.RemoteLoader
-import expo.modules.updates.manifest.ManifestMetadata
 import expo.modules.updates.manifest.UpdateManifest
 
 // these unused imports must stay because of versioning
@@ -127,8 +127,11 @@ class UpdatesModule(
         return
       }
       val databaseHolder = updatesServiceLocal.databaseHolder
-      val extraHeaders = ManifestMetadata.getServerDefinedHeaders(
-        databaseHolder.database, updatesServiceLocal.configuration
+      val extraHeaders = FileDownloader.getExtraHeaders(
+        databaseHolder.database,
+        updatesServiceLocal.configuration,
+        updatesServiceLocal.launchedUpdate,
+        updatesServiceLocal.embeddedUpdate
       )
       databaseHolder.releaseDatabase()
       updatesServiceLocal.fileDownloader.downloadManifest(
@@ -194,7 +197,8 @@ class UpdatesModule(
           updatesServiceLocal.configuration,
           databaseHolder.database,
           updatesServiceLocal.fileDownloader,
-          updatesServiceLocal.directory
+          updatesServiceLocal.directory,
+          updatesServiceLocal.launchedUpdate
         )
           .start(
             object : Loader.LoaderCallback {

package/android/src/main/java/expo/modules/updates/UpdatesService.kt

@@ -14,6 +14,8 @@ import java.io.File
 /* ktlint-disable no-unused-imports */
 import expo.modules.updates.UpdatesConfiguration
 import expo.modules.updates.UpdatesController
+import expo.modules.updates.manifest.EmbeddedManifest
+
 /* ktlint-enable no-unused-imports */
 
 open class UpdatesService(protected var context: Context) : InternalModule, UpdatesInterface {
@@ -40,6 +42,8 @@ open class UpdatesService(protected var context: Context) : InternalModule, Upda
     return configuration.isEnabled && launchedUpdate != null
   }
 
+  override val embeddedUpdate: UpdateEntity?
+    get() = EmbeddedManifest.get(context, configuration)?.updateEntity
   override val launchedUpdate: UpdateEntity?
     get() = UpdatesController.instance.launchedUpdate
   override val localAssetFiles: Map<AssetEntity, String>?

package/android/src/main/java/expo/modules/updates/loader/FileDownloader.kt

@@ -7,9 +7,6 @@ import expo.modules.updates.UpdatesConfiguration
 import expo.modules.updates.UpdatesUtils
 import expo.modules.updates.db.entity.AssetEntity
 import expo.modules.updates.launcher.NoDatabaseLauncher
-import expo.modules.updates.manifest.ManifestFactory
-import expo.modules.updates.manifest.ManifestHeaderData
-import expo.modules.updates.manifest.UpdateManifest
 import expo.modules.updates.selectionpolicy.SelectionPolicies
 import okhttp3.*
 import org.json.JSONArray
@@ -27,6 +24,9 @@ import expo.modules.easclient.EASClientID
 import okhttp3.Headers.Companion.toHeaders
 import expo.modules.jsonutils.getNullable
 import expo.modules.updates.codesigning.ValidationResult
+import expo.modules.updates.db.UpdatesDatabase
+import expo.modules.updates.db.entity.UpdateEntity
+import expo.modules.updates.manifest.*
 import java.security.cert.CertificateException
 
 open class FileDownloader(private val client: OkHttpClient) {
@@ -331,7 +331,7 @@ open class FileDownloader(private val client: OkHttpClient) {
             override fun onSuccess(file: File, hash: ByteArray) {
               // base64url - https://datatracker.ietf.org/doc/html/rfc4648#section-5
               val hashBase64String = Base64.encodeToString(hash, Base64.URL_SAFE or Base64.NO_PADDING or Base64.NO_WRAP)
-              val expectedAssetHash = asset.expectedHash?.toLowerCase(Locale.ROOT)
+              val expectedAssetHash = asset.expectedHash
               if (expectedAssetHash != null && expectedAssetHash != hashBase64String) {
                 callback.onFailure(Exception("Asset hash invalid: ${asset.key}; expectedHash: $expectedAssetHash; actualHash: $hashBase64String"), asset)
                 return
@@ -568,5 +568,24 @@ open class FileDownloader(private val client: OkHttpClient) {
     private fun getCacheDirectory(context: Context): File {
       return File(context.cacheDir, "okhttp")
     }
+
+    fun getExtraHeaders(
+      database: UpdatesDatabase,
+      configuration: UpdatesConfiguration,
+      launchedUpdate: UpdateEntity?,
+      embeddedUpdate: UpdateEntity?
+    ): JSONObject {
+      val extraHeaders =
+        ManifestMetadata.getServerDefinedHeaders(database, configuration) ?: JSONObject()
+
+      launchedUpdate?.let {
+        extraHeaders.put("Expo-Current-Update-ID", it.id.toString().lowercase())
+      }
+      embeddedUpdate?.let {
+        extraHeaders.put("Expo-Embedded-Update-ID", it.id.toString().lowercase())
+      }
+
+      return extraHeaders
+    }
   }
 }

package/android/src/main/java/expo/modules/updates/loader/LoaderTask.kt

@@ -274,7 +274,7 @@ class LoaderTask(
   private fun launchRemoteUpdateInBackground(context: Context, remoteUpdateCallback: Callback) {
     AsyncTask.execute {
       val database = databaseHolder.database
-      RemoteLoader(context, configuration, database, fileDownloader, directory)
+      RemoteLoader(context, configuration, database, fileDownloader, directory, candidateLauncher?.launchedUpdate)
         .start(object : LoaderCallback {
           override fun onFailure(e: Exception) {
             databaseHolder.releaseDatabase()

package/android/src/main/java/expo/modules/updates/loader/RemoteLoader.kt

@@ -4,9 +4,9 @@ import android.content.Context
 import expo.modules.updates.UpdatesConfiguration
 import expo.modules.updates.db.UpdatesDatabase
 import expo.modules.updates.db.entity.AssetEntity
+import expo.modules.updates.db.entity.UpdateEntity
 import expo.modules.updates.loader.FileDownloader.AssetDownloadCallback
 import expo.modules.updates.loader.FileDownloader.ManifestDownloadCallback
-import expo.modules.updates.manifest.ManifestMetadata
 import java.io.File
 
 /**
@@ -22,15 +22,17 @@ class RemoteLoader internal constructor(
   database: UpdatesDatabase,
   private val mFileDownloader: FileDownloader,
   updatesDirectory: File?,
-  loaderFiles: LoaderFiles
+  private val launchedUpdate: UpdateEntity?,
+  private val loaderFiles: LoaderFiles
 ) : Loader(context, configuration, database, updatesDirectory, loaderFiles) {
   constructor(
     context: Context,
     configuration: UpdatesConfiguration,
     database: UpdatesDatabase,
     fileDownloader: FileDownloader,
-    updatesDirectory: File?
-  ) : this(context, configuration, database, fileDownloader, updatesDirectory, LoaderFiles())
+    updatesDirectory: File?,
+    launchedUpdate: UpdateEntity?
+  ) : this(context, configuration, database, fileDownloader, updatesDirectory, launchedUpdate, LoaderFiles())
 
   override fun loadManifest(
     context: Context,
@@ -38,7 +40,8 @@ class RemoteLoader internal constructor(
     configuration: UpdatesConfiguration,
     callback: ManifestDownloadCallback
   ) {
-    val extraHeaders = ManifestMetadata.getServerDefinedHeaders(database, configuration)
+    val embeddedUpdate = loaderFiles.readEmbeddedManifest(context, configuration)?.updateEntity
+    val extraHeaders = FileDownloader.getExtraHeaders(database, configuration, launchedUpdate, embeddedUpdate)
     mFileDownloader.downloadManifest(configuration, extraHeaders, context, callback)
   }
 

package/ios/EXUpdates/AppLauncher/EXUpdatesAppLauncherWithDatabase.m

@@ -295,10 +295,10 @@ static NSString * const EXUpdatesAppLauncherErrorDomain = @"AppLauncher";
                             successBlock:^(NSData *data, NSURLResponse *response) {
       dispatch_async(self->_launcherQueue, ^{
         NSString *hashBase64String = [EXUpdatesUtils base64UrlEncodedSHA256WithData:data];
-        if (asset.expectedHash && ![asset.expectedHash.lowercaseString isEqualToString:hashBase64String.lowercaseString]) {
+        if (asset.expectedHash && ![asset.expectedHash isEqualToString:hashBase64String]) {
           completion([NSError errorWithDomain:EXUpdatesAppLauncherErrorDomain
                                          code:1016
-                                     userInfo:@{NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Asset hash invalid: %@; expectedHash: %@; actualHash: %@", asset.key, asset.expectedHash.lowercaseString, hashBase64String.lowercaseString]}],
+                                     userInfo:@{NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Asset hash invalid: %@; expectedHash: %@; actualHash: %@", asset.key, asset.expectedHash, hashBase64String]}],
                      asset,
                      assetLocalUrl);
           return;

package/ios/EXUpdates/AppLoader/EXUpdatesAppLoader+Private.h

@@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) EXUpdatesConfig *config;
 @property (nonatomic, strong) EXUpdatesDatabase *database;
 @property (nonatomic, strong) NSURL *directory;
+@property (nonatomic, strong, nullable) EXUpdatesUpdate *launchedUpdate;
 @property (nonatomic, strong) EXUpdatesUpdate *updateManifest;
 @property (nonatomic, copy) EXUpdatesAppLoaderManifestBlock manifestBlock;
 @property (nonatomic, copy) EXUpdatesAppLoaderAssetBlock assetBlock;

package/ios/EXUpdates/AppLoader/EXUpdatesAppLoader.h

@@ -17,6 +17,7 @@ typedef void (^EXUpdatesAppLoaderErrorBlock)(NSError *error);
 - (instancetype)initWithConfig:(EXUpdatesConfig *)config
                       database:(EXUpdatesDatabase *)database
                      directory:(NSURL *)directory
+                launchedUpdate:(nullable EXUpdatesUpdate *)launchedUpdate
                completionQueue:(dispatch_queue_t)completionQueue;
 
 /**

package/ios/EXUpdates/AppLoader/EXUpdatesAppLoader.m

@@ -28,6 +28,7 @@ static NSString * const EXUpdatesAppLoaderErrorDomain = @"EXUpdatesAppLoader";
 - (instancetype)initWithConfig:(EXUpdatesConfig *)config
                       database:(EXUpdatesDatabase *)database
                      directory:(NSURL *)directory
+                launchedUpdate:(nullable EXUpdatesUpdate *)launchedUpdate
                completionQueue:(dispatch_queue_t)completionQueue
 {
   if (self = [super init]) {
@@ -39,6 +40,7 @@ static NSString * const EXUpdatesAppLoaderErrorDomain = @"EXUpdatesAppLoader";
     _config = config;
     _database = database;
     _directory = directory;
+    _launchedUpdate = launchedUpdate;
     _completionQueue = completionQueue;
   }
   return self;

package/ios/EXUpdates/AppLoader/EXUpdatesAppLoaderTask.m

@@ -210,7 +210,9 @@ static NSString * const EXUpdatesAppLoaderTaskErrorDomain = @"EXUpdatesAppLoader
             [self->_selectionPolicy shouldLoadNewUpdate:[EXUpdatesEmbeddedAppLoader embeddedManifestWithConfig:self->_config database:self->_database]
                                      withLaunchedUpdate:launchableUpdate
                                                 filters:manifestFilters]) {
-          self->_embeddedAppLoader = [[EXUpdatesEmbeddedAppLoader alloc] initWithConfig:self->_config database:self->_database directory:self->_directory completionQueue:self->_loaderTaskQueue];
+          // launchedUpdate is nil because we don't yet have one, and it doesn't matter as we won't
+          // be sending an HTTP request from EXUpdatesEmbeddedAppLoader
+          self->_embeddedAppLoader = [[EXUpdatesEmbeddedAppLoader alloc] initWithConfig:self->_config database:self->_database directory:self->_directory launchedUpdate:nil completionQueue:self->_loaderTaskQueue];
           [self->_embeddedAppLoader loadUpdateFromEmbeddedManifestWithCallback:^BOOL(EXUpdatesUpdate * _Nonnull update) {
             // we already checked using selection policy, so we don't need to check again
             return YES;
@@ -238,7 +240,7 @@ static NSString * const EXUpdatesAppLoaderTaskErrorDomain = @"EXUpdatesAppLoader
 
 - (void)_loadRemoteUpdateWithCompletion:(void (^)(NSError * _Nullable error, EXUpdatesUpdate * _Nullable update))completion
 {
-  _remoteAppLoader = [[EXUpdatesRemoteAppLoader alloc] initWithConfig:_config database:_database directory:_directory completionQueue:_loaderTaskQueue];
+  _remoteAppLoader = [[EXUpdatesRemoteAppLoader alloc] initWithConfig:_config database:_database directory:_directory launchedUpdate:_candidateLauncher.launchedUpdate completionQueue:_loaderTaskQueue];
   [_remoteAppLoader loadUpdateFromUrl:_config.updateUrl onManifest:^BOOL(EXUpdatesUpdate * _Nonnull update) {
     if ([self->_selectionPolicy shouldLoadNewUpdate:update withLaunchedUpdate:self->_candidateLauncher.launchedUpdate filters:update.manifestFilters]) {
       self->_isUpToDate = NO;

package/ios/EXUpdates/AppLoader/EXUpdatesFileDownloader.h

@@ -1,6 +1,7 @@
 //  Copyright © 2019 650 Industries. All rights reserved.
 
 #import <EXUpdates/EXUpdatesConfig.h>
+#import <EXUpdates/EXUpdatesDatabase.h>
 #import <EXUpdates/EXUpdatesUpdate.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -34,6 +35,15 @@ typedef void (^EXUpdatesFileDownloaderErrorBlock)(NSError *error);
 
 + (dispatch_queue_t)assetFilesQueue;
 
+/**
+ * Get extra (stateful) headers to pass into `downloadManifestFromURL:`
+ * Must be called on the database queue
+ */
++ (NSDictionary *)extraHeadersWithDatabase:(EXUpdatesDatabase *)database
+                                    config:(EXUpdatesConfig *)config
+                            launchedUpdate:(nullable EXUpdatesUpdate *)launchedUpdate
+                            embeddedUpdate:(nullable EXUpdatesUpdate *)embeddedUpdate;
+
 /**
  * For test purposes; shouldn't be needed in application code
  */

package/ios/EXUpdates/AppLoader/EXUpdatesFileDownloader.m

@@ -670,6 +670,27 @@ certificateChainFromManifestResponse:(nullable NSString *)certificateChainFromMa
   }
 }
 
++ (NSDictionary *)extraHeadersWithDatabase:(EXUpdatesDatabase *)database
+                                    config:(EXUpdatesConfig *)config
+                            launchedUpdate:(nullable EXUpdatesUpdate *)launchedUpdate
+                            embeddedUpdate:(nullable EXUpdatesUpdate *)embeddedUpdate
+{
+  NSError *headersError;
+  NSMutableDictionary *extraHeaders = [database serverDefinedHeadersWithScopeKey:config.scopeKey error:&headersError].mutableCopy ?: [NSMutableDictionary new];
+  if (headersError) {
+    NSLog(@"Error selecting serverDefinedHeaders from database: %@", headersError.localizedDescription);
+  }
+
+  if (launchedUpdate) {
+    extraHeaders[@"Expo-Current-Update-ID"] = launchedUpdate.updateId.UUIDString.lowercaseString;
+  }
+  if (embeddedUpdate) {
+    extraHeaders[@"Expo-Embedded-Update-ID"] = embeddedUpdate.updateId.UUIDString.lowercaseString;
+  }
+
+  return extraHeaders.copy;
+}
+
 #pragma mark - NSURLSessionTaskDelegate
 
 - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task willPerformHTTPRedirection:(NSHTTPURLResponse *)response newRequest:(NSURLRequest *)request completionHandler:(void (^)(NSURLRequest *))completionHandler

package/ios/EXUpdates/AppLoader/EXUpdatesRemoteAppLoader.m

@@ -2,7 +2,9 @@
 
 #import <EXUpdates/EXUpdatesRemoteAppLoader.h>
 #import <EXUpdates/EXUpdatesCrypto.h>
+#import <EXUpdates/EXUpdatesEmbeddedAppLoader.h>
 #import <EXUpdates/EXUpdatesFileDownloader.h>
+#import <EXUpdates/EXUpdatesUtils.h>
 #import <ExpoModulesCore/EXUtilities.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -22,9 +24,10 @@ static NSString * const EXUpdatesRemoteAppLoaderErrorDomain = @"EXUpdatesRemoteA
 - (instancetype)initWithConfig:(EXUpdatesConfig *)config
                       database:(EXUpdatesDatabase *)database
                      directory:(NSURL *)directory
+                launchedUpdate:(nullable EXUpdatesUpdate *)launchedUpdate
                completionQueue:(dispatch_queue_t)completionQueue
 {
-  if (self = [super initWithConfig:config database:database directory:directory completionQueue:completionQueue]) {
+  if (self = [super initWithConfig:config database:database directory:directory launchedUpdate:launchedUpdate completionQueue:completionQueue]) {
     _downloader = [[EXUpdatesFileDownloader alloc] initWithUpdatesConfig:self.config];
     _completionQueue = completionQueue;
   }
@@ -65,11 +68,11 @@ static NSString * const EXUpdatesRemoteAppLoaderErrorDomain = @"EXUpdatesRemoteA
   };
 
   dispatch_async(self.database.databaseQueue, ^{
-    NSError *headersError;
-    NSDictionary *extraHeaders = [self.database serverDefinedHeadersWithScopeKey:self.config.scopeKey error:&headersError];
-    if (headersError) {
-      NSLog(@"Error selecting serverDefinedHeaders from database: %@", headersError.localizedDescription);
-    }
+    EXUpdatesUpdate *embeddedUpdate = [EXUpdatesEmbeddedAppLoader embeddedManifestWithConfig:self.config database:self.database];
+    NSDictionary *extraHeaders = [EXUpdatesFileDownloader extraHeadersWithDatabase:self.database
+                                                                            config:self.config
+                                                                    launchedUpdate:self.launchedUpdate
+                                                                    embeddedUpdate:embeddedUpdate];
     [self->_downloader downloadManifestFromURL:url withDatabase:self.database extraHeaders:extraHeaders successBlock:^(EXUpdatesUpdate *update) {
       self->_remoteUpdate = update;
       [self startLoadingFromManifest:update];
@@ -102,7 +105,15 @@ static NSString * const EXUpdatesRemoteAppLoaderErrorDomain = @"EXUpdatesRemoteA
                                 extraHeaders:asset.extraRequestHeaders ?: @{}
                                 successBlock:^(NSData *data, NSURLResponse *response) {
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-          [self handleAssetDownloadWithData:data response:response asset:asset];
+          NSString *hashBase64String = [EXUpdatesUtils base64UrlEncodedSHA256WithData:data];
+          if (asset.expectedHash && ![asset.expectedHash isEqualToString:hashBase64String]) {
+            NSError *error = [NSError errorWithDomain:EXUpdatesRemoteAppLoaderErrorDomain
+                                                 code:1016
+                                             userInfo:@{NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Asset hash invalid: %@; expectedHash: %@; actualHash: %@", asset.key, asset.expectedHash, hashBase64String]}];
+            [self handleAssetDownloadWithError:error asset:asset];
+          } else {
+            [self handleAssetDownloadWithData:data response:response asset:asset];
+          }
         });
       }
                                   errorBlock:^(NSError *error) {

package/ios/EXUpdates/EXUpdatesAppController.m

@@ -367,7 +367,7 @@ static NSString * const EXUpdatesErrorEventName = @"error";
   }
 
   _remoteLoadStatus = EXUpdatesRemoteLoadStatusLoading;
-  EXUpdatesAppLoader *remoteAppLoader = [[EXUpdatesRemoteAppLoader alloc] initWithConfig:_config database:_database directory:_updatesDirectory completionQueue:_controllerQueue];
+  EXUpdatesAppLoader *remoteAppLoader = [[EXUpdatesRemoteAppLoader alloc] initWithConfig:_config database:_database directory:_updatesDirectory launchedUpdate:self.launchedUpdate completionQueue:_controllerQueue];
   [remoteAppLoader loadUpdateFromUrl:_config.updateUrl onManifest:^BOOL(EXUpdatesUpdate *update) {
     return [self->_selectionPolicy shouldLoadNewUpdate:update withLaunchedUpdate:self.launchedUpdate filters:update.manifestFilters];
   } asset:^(EXUpdatesAsset *asset, NSUInteger successfulAssetCount, NSUInteger failedAssetCount, NSUInteger totalAssetCount) {

package/ios/EXUpdates/EXUpdatesDevLauncherController.m

@@ -95,7 +95,7 @@ typedef NS_ENUM(NSInteger, EXUpdatesDevLauncherErrorCode) {
   [self _setDevelopmentSelectionPolicy];
   [controller setConfigurationInternal:updatesConfiguration];
 
-  EXUpdatesRemoteAppLoader *loader = [[EXUpdatesRemoteAppLoader alloc] initWithConfig:updatesConfiguration database:controller.database directory:controller.updatesDirectory completionQueue:controller.controllerQueue];
+  EXUpdatesRemoteAppLoader *loader = [[EXUpdatesRemoteAppLoader alloc] initWithConfig:updatesConfiguration database:controller.database directory:controller.updatesDirectory launchedUpdate:nil completionQueue:controller.controllerQueue];
   [loader loadUpdateFromUrl:updatesConfiguration.updateUrl onManifest:^BOOL(EXUpdatesUpdate * _Nonnull update) {
     return manifestBlock(update.manifest.rawManifestJSON);
   } asset:^(EXUpdatesAsset * _Nonnull asset, NSUInteger successfulAssetCount, NSUInteger failedAssetCount, NSUInteger totalAssetCount) {

package/ios/EXUpdates/EXUpdatesModule.m

@@ -104,11 +104,10 @@ EX_EXPORT_METHOD_AS(checkForUpdateAsync,
 
   __block NSDictionary *extraHeaders;
   dispatch_sync(_updatesService.database.databaseQueue, ^{
-    NSError *error;
-    extraHeaders = [self->_updatesService.database serverDefinedHeadersWithScopeKey:self->_updatesService.config.scopeKey error:&error];
-    if (error) {
-      NSLog(@"Error selecting serverDefinedHeaders from database: %@", error.localizedDescription);
-    }
+    extraHeaders = [EXUpdatesFileDownloader extraHeadersWithDatabase:self->_updatesService.database
+                                                              config:self->_updatesService.config
+                                                      launchedUpdate:self->_updatesService.launchedUpdate
+                                                      embeddedUpdate:self->_updatesService.embeddedUpdate];
   });
 
   EXUpdatesFileDownloader *fileDownloader = [[EXUpdatesFileDownloader alloc] initWithUpdatesConfig:_updatesService.config];
@@ -146,7 +145,7 @@ EX_EXPORT_METHOD_AS(fetchUpdateAsync,
     return;
   }
 
-  EXUpdatesRemoteAppLoader *remoteAppLoader = [[EXUpdatesRemoteAppLoader alloc] initWithConfig:_updatesService.config database:_updatesService.database directory:_updatesService.directory completionQueue:self.methodQueue];
+  EXUpdatesRemoteAppLoader *remoteAppLoader = [[EXUpdatesRemoteAppLoader alloc] initWithConfig:_updatesService.config database:_updatesService.database directory:_updatesService.directory launchedUpdate:_updatesService.launchedUpdate completionQueue:self.methodQueue];
   [remoteAppLoader loadUpdateFromUrl:_updatesService.config.updateUrl onManifest:^BOOL(EXUpdatesUpdate * _Nonnull update) {
     return [self->_updatesService.selectionPolicy shouldLoadNewUpdate:update withLaunchedUpdate:self->_updatesService.launchedUpdate filters:update.manifestFilters];
   } asset:^(EXUpdatesAsset *asset, NSUInteger successfulAssetCount, NSUInteger failedAssetCount, NSUInteger totalAssetCount) {

package/ios/EXUpdates/EXUpdatesService.h

@@ -17,6 +17,7 @@ typedef void (^EXUpdatesAppRelaunchCompletionBlock)(BOOL success);
 @property (nonatomic, readonly) EXUpdatesSelectionPolicy *selectionPolicy;
 @property (nonatomic, readonly) NSURL *directory;
 
+@property (nullable, nonatomic, readonly, strong) EXUpdatesUpdate *embeddedUpdate;
 @property (nullable, nonatomic, readonly, strong) EXUpdatesUpdate *launchedUpdate;
 @property (nullable, nonatomic, readonly, strong) NSDictionary *assetFilesMap;
 @property (nonatomic, readonly, assign) BOOL isUsingEmbeddedAssets;

package/ios/EXUpdates/EXUpdatesService.m

@@ -1,6 +1,7 @@
 // Copyright 2020-present 650 Industries. All rights reserved.
 
 #import <EXUpdates/EXUpdatesAppController.h>
+#import <EXUpdates/EXUpdatesEmbeddedAppLoader.h>
 #import <EXUpdates/EXUpdatesService.h>
 #import <ExpoModulesCore/EXUtilities.h>
 
@@ -35,6 +36,11 @@ EX_REGISTER_MODULE();
   return EXUpdatesAppController.sharedInstance.updatesDirectory;
 }
 
+- (nullable EXUpdatesUpdate *)embeddedUpdate
+{
+  return [EXUpdatesEmbeddedAppLoader embeddedManifestWithConfig:self.config database:self.database];
+}
+
 - (nullable EXUpdatesUpdate *)launchedUpdate
 {
   return EXUpdatesAppController.sharedInstance.launchedUpdate;

package/ios/EXUpdates/ReactDelegateHandler/ExpoUpdatesAppDelegateSubscriber.swift

@@ -8,6 +8,6 @@ public class ExpoUpdatesAppDelegateSubscriber: ExpoAppDelegateSubscriber {
     if EXAppDefines.APP_DEBUG {
       EXUpdatesControllerRegistry.sharedInstance().controller = EXUpdatesDevLauncherController.sharedInstance()
     }
-    return false
+    return true
   }
 }

package/ios/Tests/EXUpdatesFileDownloaderTests.m

@@ -4,6 +4,7 @@
 
 #import <EXUpdates/EXUpdatesConfig.h>
 #import <EXUpdates/EXUpdatesFileDownloader.h>
+#import <EXUpdates/EXUpdatesUpdate.h>
 
 @interface EXUpdatesFileDownloaderTests : XCTestCase
 
@@ -79,6 +80,52 @@
   XCTAssertEqualObjects(@"custom", [actual valueForHTTPHeaderField:@"expo-updates-environment"]);
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnonnull"
+- (void)testGetExtraHeaders
+{
+  NSString *launchedUpdateUUIDString = @"7c1d2bd0-f88b-454d-998c-7fa92a924dbf";
+  EXUpdatesUpdate *launchedUpdate = [EXUpdatesUpdate updateWithId:[[NSUUID alloc] initWithUUIDString:launchedUpdateUUIDString]
+                                                         scopeKey:@"test"
+                                                       commitTime:[NSDate date]
+                                                   runtimeVersion:@"1.0"
+                                                         manifest:nil
+                                                           status:0
+                                                             keep:YES
+                                                           config:nil
+                                                         database:nil];
+  NSString *embeddedUpdateUUIDString = @"9433b1ed-4006-46b8-8aa7-fdc7eeb203fd";
+  EXUpdatesUpdate *embeddedUpdate = [EXUpdatesUpdate updateWithId:[[NSUUID alloc] initWithUUIDString:embeddedUpdateUUIDString]
+                                                         scopeKey:@"test"
+                                                       commitTime:[NSDate date]
+                                                   runtimeVersion:@"1.0"
+                                                         manifest:nil
+                                                           status:0
+                                                             keep:YES
+                                                           config:nil
+                                                         database:nil];
+  NSDictionary *extraHeaders = [EXUpdatesFileDownloader extraHeadersWithDatabase:nil
+                                                                          config:nil
+                                                                  launchedUpdate:launchedUpdate
+                                                                  embeddedUpdate:embeddedUpdate];
+  XCTAssertEqualObjects(launchedUpdateUUIDString, extraHeaders[@"Expo-Current-Update-ID"]);
+  XCTAssertEqualObjects(embeddedUpdateUUIDString, extraHeaders[@"Expo-Embedded-Update-ID"]);
+}
+#pragma clang diagnostic pop
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnonnull"
+- (void)testGetExtraHeaders_NoLaunchedOrEmbeddedUpdate
+{
+  NSDictionary *extraHeaders = [EXUpdatesFileDownloader extraHeadersWithDatabase:nil
+                                                                          config:nil
+                                                                  launchedUpdate:nil
+                                                                  embeddedUpdate:nil];
+  XCTAssertNil(extraHeaders[@"Expo-Current-Update-ID"]);
+  XCTAssertNil(extraHeaders[@"Expo-Embedded-Update-ID"]);
+}
+#pragma clang diagnostic pop
+
 - (void)testAssetExtraHeaders_OverrideOrder
 {
   EXUpdatesConfig *config = [EXUpdatesConfig configWithDictionary:@{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "Fetches and manages remotely-hosted assets and updates to your app's JS bundle.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -64,5 +64,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "22dce752354bb429c84851bc4389abe47a766b1f"
+  "gitHead": "0f796e10a2b2f258c40f9d56aa141c372cd63fc1"
 }