expo-updates 0.10.10 → 0.10.14

package/CHANGELOG.md

@@ -10,6 +10,30 @@
 
 ### 💡 Others
 
+## 0.10.14 — 2021-11-09
+
+### 🐛 Bug fixes
+
+- Retain embedded asset fields when merging existing asset entities on Android. ([#15123](https://github.com/expo/expo/pull/15123) by [@esamelson](https://github.com/esamelson))
+
+## 0.10.13 — 2021-11-05
+
+### 🐛 Bug fixes
+
+- Fix issue with assets that are duplicated in the local SQLite db being reaped when they are still in use. ([#15049](https://github.com/expo/expo/pull/15049) by [@esamelson](https://github.com/esamelson))
+
+## 0.10.12 — 2021-11-04
+
+### 🐛 Bug fixes
+
+- Workaround for bridge being initialized twice on startup. ([#15019](https://github.com/expo/expo/pull/15019) by [@kudo](https://github.com/kudo))
+
+## 0.10.11 — 2021-11-02
+
+### 🐛 Bug fixes
+
+- Fix handling of unexpectedly missing assets on iOS. ([#15008](https://github.com/expo/expo/pull/15008) by [@esamelson](https://github.com/esamelson))
+
 ## 0.10.10 — 2021-11-02
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven'
 
 group = 'host.exp.exponent'
-version = '0.10.10'
+version = '0.10.14'
 
 apply from: "../scripts/create-manifest-android.gradle"
 
@@ -59,7 +59,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 30)
     versionCode 31
-    versionName '0.10.10'
+    versionName '0.10.14'
     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/db/dao/AssetDao.java

@@ -41,6 +41,12 @@ public abstract class AssetDao {
           " WHERE updates.keep);")
   public abstract void _unmarkUsedAssetsFromDeletion();
 
+  @Query("UPDATE assets SET marked_for_deletion = 0 WHERE relative_path IN (" +
+                  " SELECT relative_path" +
+                  " FROM assets" +
+                  " WHERE marked_for_deletion = 0);")
+  public abstract void _unmarkDuplicateUsedAssetsFromDeletion();
+
   @Query("SELECT * FROM assets WHERE marked_for_deletion = 1;")
   public abstract List<AssetEntity> _loadAssetsMarkedForDeletion();
 
@@ -97,6 +103,12 @@ public abstract class AssetDao {
     }
     // we need to keep track of whether the calling class expects this asset to be the launch asset
     existingEntity.isLaunchAsset = newEntity.isLaunchAsset;
+    // some fields on the asset entity are not stored in the database but might still be used by application code
+    existingEntity.embeddedAssetFilename = newEntity.embeddedAssetFilename;
+    existingEntity.resourcesFilename = newEntity.resourcesFilename;
+    existingEntity.resourcesFolder = newEntity.resourcesFolder;
+    existingEntity.scale = newEntity.scale;
+    existingEntity.scales = newEntity.scales;
   }
 
   @Transaction
@@ -121,6 +133,8 @@ public abstract class AssetDao {
     // this is safe since this is a transaction and will be rolled back upon failure
     _markAllAssetsForDeletion();
     _unmarkUsedAssetsFromDeletion();
+    // check for duplicate rows representing a single file on disk
+    _unmarkDuplicateUsedAssetsFromDeletion();
 
     List<AssetEntity> deletedAssets = _loadAssetsMarkedForDeletion();
     _deleteAssetsMarkedForDeletion();

package/android/src/main/java/expo/modules/updates/loader/EmbeddedLoader.java

@@ -161,6 +161,8 @@ public class EmbeddedLoader {
 
       AssetEntity matchingDbEntry = mDatabase.assetDao().loadAssetWithKey(asset.key);
       if (matchingDbEntry != null) {
+        // merge all fields not stored in the database onto matchingDbEntry,
+        // in case we need them later on in this class
         mDatabase.assetDao().mergeAndUpdateAsset(matchingDbEntry, asset);
         asset = matchingDbEntry;
       }

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

@@ -183,6 +183,8 @@ public class RemoteLoader {
     for (AssetEntity assetEntity : assetList) {
       AssetEntity matchingDbEntry = mDatabase.assetDao().loadAssetWithKey(assetEntity.key);
       if (matchingDbEntry != null) {
+        // merge all fields not stored in the database onto matchingDbEntry,
+        // in case we need them later on in this class
         mDatabase.assetDao().mergeAndUpdateAsset(matchingDbEntry, assetEntity);
         assetEntity = matchingDbEntry;
       }

package/ios/EXUpdates/AppLauncher/EXUpdatesAppLauncherNoDatabase.m

@@ -3,6 +3,7 @@
 #import <EXUpdates/EXUpdatesAsset.h>
 #import <EXUpdates/EXUpdatesAppLauncherNoDatabase.h>
 #import <EXUpdates/EXUpdatesEmbeddedAppLoader.h>
+#import <EXUpdates/EXUpdatesUtils.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -30,7 +31,7 @@ static NSString * const EXUpdatesErrorLogFile = @"expo-error.log";
 
       NSMutableDictionary *assetFilesMap = [NSMutableDictionary new];
       for (EXUpdatesAsset *asset in _launchedUpdate.assets) {
-        NSURL *localUrl = [[NSBundle mainBundle] URLForResource:asset.mainBundleFilename withExtension:asset.type];
+        NSURL *localUrl = [EXUpdatesUtils urlForBundledAsset:asset];
         if (localUrl && asset.key) {
           assetFilesMap[asset.key] = localUrl.absoluteString;
         }

package/ios/EXUpdates/AppLauncher/EXUpdatesAppLauncherWithDatabase.m

@@ -260,12 +260,14 @@ static NSString * const EXUpdatesAppLauncherErrorDomain = @"AppLauncher";
     }
 
     if (matchingAsset && matchingAsset.mainBundleFilename) {
-      NSString *bundlePath = [[NSBundle mainBundle] pathForResource:matchingAsset.mainBundleFilename ofType:matchingAsset.type];
-      if (bundlePath == nil) {
-        completion(NO, nil);
-        return;
-      }
       dispatch_async([EXUpdatesFileDownloader assetFilesQueue], ^{
+        NSString *bundlePath = [EXUpdatesUtils pathForBundledAsset:matchingAsset];
+        if (bundlePath == nil) {
+          dispatch_async(self->_launcherQueue, ^{
+            completion(NO, [NSError errorWithDomain:EXUpdatesAppLauncherErrorDomain code:1013 userInfo:@{NSLocalizedDescriptionKey: @"Asset bundlePath was unexpectedly nil"}]);
+          });
+          return;
+        }
         NSError *error;
         BOOL success = [NSFileManager.defaultManager copyItemAtPath:bundlePath toPath:[assetLocalUrl path] error:&error];
         dispatch_async(self->_launcherQueue, ^{
@@ -275,7 +277,7 @@ static NSString * const EXUpdatesAppLauncherErrorDomain = @"AppLauncher";
       return;
     }
   }
-  
+
   completion(NO, nil);
 }
 

package/ios/EXUpdates/AppLoader/EXUpdatesAppLoader.m

@@ -176,6 +176,9 @@ static NSString * const EXUpdatesAppLoaderErrorDomain = @"EXUpdatesAppLoader";
           [self downloadAsset:asset];
         } else {
           NSError *mergeError;
+          // merge fields from existing database entry into our current asset object
+          // retaining the original object since it's used in self->_assetsToLoad
+          // (this is different from on Android, where we keep the database-sourced object instead)
           [self->_database mergeAsset:asset withExistingEntry:matchingDbEntry error:&mergeError];
           if (mergeError) {
             NSLog(@"Failed to merge asset with existing database entry: %@", mergeError.localizedDescription);

package/ios/EXUpdates/AppLoader/EXUpdatesEmbeddedAppLoader.m

@@ -2,6 +2,7 @@
 
 #import <EXUpdates/EXUpdatesFileDownloader.h>
 #import <EXUpdates/EXUpdatesEmbeddedAppLoader.h>
+#import <EXUpdates/EXUpdatesUtils.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -101,9 +102,7 @@ static NSString * const EXUpdatesEmbeddedAppLoaderErrorDomain = @"EXUpdatesEmbed
       });
     } else {
       NSAssert(asset.mainBundleFilename, @"embedded asset mainBundleFilename must be nonnull");
-      NSString *bundlePath = asset.mainBundleDir
-        ? [[NSBundle mainBundle] pathForResource:asset.mainBundleFilename ofType:asset.type inDirectory:asset.mainBundleDir]
-        : [[NSBundle mainBundle] pathForResource:asset.mainBundleFilename ofType:asset.type];
+      NSString *bundlePath = [EXUpdatesUtils pathForBundledAsset:asset];
       NSAssert(bundlePath, @"NSBundle must contain the expected assets");
 
       if (!bundlePath) {

package/ios/EXUpdates/Database/EXUpdatesDatabase.m

@@ -275,6 +275,17 @@ static NSString * const EXUpdatesDatabaseServerDefinedHeadersKey = @"serverDefin
     return nil;
   }
 
+  // check for duplicate rows representing a single file on disk
+  NSString * const update3Sql = @"UPDATE assets SET marked_for_deletion = 0 WHERE relative_path IN (\
+  SELECT relative_path\
+  FROM assets\
+  WHERE marked_for_deletion = 0\
+  );";
+  if ([self _executeSql:update3Sql withArgs:nil error:error] == nil) {
+    sqlite3_exec(_db, "ROLLBACK;", NULL, NULL, NULL);
+    return nil;
+  }
+
   NSString * const selectSql = @"SELECT * FROM assets WHERE marked_for_deletion = 1;";
   NSArray<NSDictionary *> *rows = [self _executeSql:selectSql withArgs:nil error:error];
   if (!rows) {

package/ios/EXUpdates/EXUpdatesAppDelegate.m

@@ -53,9 +53,14 @@ EX_REGISTER_SINGLETON_MODULE(EXUpdatesAppDelegate)
     // we just skip in this case.
     return NO;
   }
+  UIWindow *window = application.delegate.window;
+  if ([window.rootViewController.view isKindOfClass:[RCTRootView class]]) {
+    RCTRootView *rootView = (RCTRootView *)window.rootViewController.view;
+    [rootView.bridge invalidate];
+  }
   self.launchOptions = launchOptions;
   controller.delegate = self;
-  [controller startAndShowLaunchScreen:application.delegate.window];
+  [controller startAndShowLaunchScreen:window];
   return YES;
 }
 

package/ios/EXUpdates/EXUpdatesUtils.h

@@ -2,6 +2,7 @@
 
 #import <React/RCTBridge.h>
 
+#import <EXUpdates/EXUpdatesAsset.h>
 #import <EXUpdates/EXUpdatesConfig.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -14,6 +15,8 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)sendEventToBridge:(nullable RCTBridge *)bridge withType:(NSString *)eventType body:(NSDictionary *)body;
 + (BOOL)shouldCheckForUpdateWithConfig:(EXUpdatesConfig *)config;
 + (NSString *)getRuntimeVersionWithConfig:(EXUpdatesConfig *)config;
++ (NSURL *)urlForBundledAsset:(EXUpdatesAsset *)asset;
++ (NSString *)pathForBundledAsset:(EXUpdatesAsset *)asset;
 
 @end
 

package/ios/EXUpdates/EXUpdatesUtils.m

@@ -104,6 +104,20 @@ static NSString * const EXUpdatesUtilsErrorDomain = @"EXUpdatesUtils";
   return config.runtimeVersion ?: config.sdkVersion ?: @"1";
 }
 
++ (NSURL *)urlForBundledAsset:(EXUpdatesAsset *)asset
+{
+  return asset.mainBundleDir
+    ? [[NSBundle mainBundle] URLForResource:asset.mainBundleFilename withExtension:asset.type subdirectory:asset.mainBundleDir]
+    : [[NSBundle mainBundle] URLForResource:asset.mainBundleFilename withExtension:asset.type];
+}
+
++ (NSString *)pathForBundledAsset:(EXUpdatesAsset *)asset
+{
+  return asset.mainBundleDir
+    ? [[NSBundle mainBundle] pathForResource:asset.mainBundleFilename ofType:asset.type inDirectory:asset.mainBundleDir]
+    : [[NSBundle mainBundle] pathForResource:asset.mainBundleFilename ofType:asset.type];
+}
+
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/Tests/EXUpdatesDatabaseTests.m

@@ -2,6 +2,8 @@
 
 #import <XCTest/XCTest.h>
 
+#import <EXManifests/EXManifestsNewManifest.h>
+#import <EXUpdates/EXUpdatesAsset.h>
 #import <EXUpdates/EXUpdatesConfig.h>
 #import <EXUpdates/EXUpdatesDatabase+Tests.h>
 #import <EXUpdates/EXUpdatesNewUpdate.h>
@@ -172,4 +174,85 @@
   XCTAssertEqualObjects(expected, actual);
 }
 
+- (void)testDeleteUnusedAssets_DuplicateFilenames
+{
+  EXManifestsNewManifest *manifest1 = [[EXManifestsNewManifest alloc] initWithRawManifestJSON:@{
+    @"runtimeVersion": @"1",
+    @"id": @"0eef8214-4833-4089-9dff-b4138a14f196",
+    @"createdAt": @"2020-11-11T00:17:54.797Z",
+    @"launchAsset": @{@"url": @"https://url.to/bundle1.js", @"contentType": @"application/javascript"}
+  }];
+  EXManifestsNewManifest *manifest2 = [[EXManifestsNewManifest alloc] initWithRawManifestJSON:@{
+    @"runtimeVersion": @"1",
+    @"id": @"0eef8214-4833-4089-9dff-b4138a14f197",
+    @"createdAt": @"2020-11-11T00:17:55.797Z",
+    @"launchAsset": @{@"url": @"https://url.to/bundle2.js", @"contentType": @"application/javascript"}
+  }];
+
+  EXUpdatesAsset *asset1 = [self createMockAssetWithKey:@"key1"];
+  EXUpdatesAsset *asset2 = [self createMockAssetWithKey:@"key2"];
+  EXUpdatesAsset *asset3 = [self createMockAssetWithKey:@"key3"];
+
+  // simulate two assets with different keys that share a file on disk
+  // this can happen if we, for example, change the format of asset keys that we serve
+  asset2.filename = @"same-filename.png";
+  asset3.filename = @"same-filename.png";
+
+  EXUpdatesUpdate *update1 = [EXUpdatesNewUpdate updateWithNewManifest:manifest1 response:nil config:_config database:_db];
+  EXUpdatesUpdate *update2 = [EXUpdatesNewUpdate updateWithNewManifest:manifest2 response:nil config:_config database:_db];
+
+  dispatch_sync(_db.databaseQueue, ^{
+    NSError *update1Error;
+    [_db addUpdate:update1 error:&update1Error];
+    NSError *update2Error;
+    [_db addUpdate:update2 error:&update2Error];
+    NSError *updateAsset1Error;
+    [_db addNewAssets:@[asset1, asset2] toUpdateWithId:update1.updateId error:&updateAsset1Error];
+    NSError *updateAsset2Error;
+    [_db addNewAssets:@[asset3] toUpdateWithId:update2.updateId error:&updateAsset2Error];
+    if (update1Error || update2Error || updateAsset1Error || updateAsset2Error) {
+      XCTFail(@"%@ %@ %@ %@", update1Error.localizedDescription, update2Error.localizedDescription, updateAsset1Error.localizedDescription, updateAsset2Error.localizedDescription);
+      return;
+    }
+
+    // simulate update1 being reaped, update2 being kept
+    NSError *deleteUpdateError;
+    [_db deleteUpdates:@[update1] error:&deleteUpdateError];
+    if (deleteUpdateError) {
+      XCTFail(@"%@", deleteUpdateError.localizedDescription);
+      return;
+    }
+
+    NSArray<EXUpdatesAsset *> *assets = [_db allAssetsWithError:nil];
+    XCTAssertEqual(3, assets.count); // two bundles and asset1 and asset2
+
+    NSError *deleteAssetsError;
+    NSArray<EXUpdatesAsset *> *deletedAssets = [_db deleteUnusedAssetsWithError:&deleteAssetsError];
+    if (deleteAssetsError) {
+      XCTFail(@"%@", deleteAssetsError.localizedDescription);
+      return;
+    }
+
+    // asset1 should have been deleted, but asset2 should have been kept
+    // since it shared a filename with asset3, which is still in use
+    XCTAssertEqual(1, deletedAssets.count);
+    for (EXUpdatesAsset *deletedAsset in deletedAssets) {
+      XCTAssertEqualObjects(@"key1", deletedAsset.key);
+    }
+
+    XCTAssertNil([_db assetWithKey:@"key1" error:nil]);
+    XCTAssertNotNil([_db assetWithKey:@"key2" error:nil]);
+    XCTAssertNotNil([_db assetWithKey:@"key3" error:nil]);
+  });
+}
+
+- (EXUpdatesAsset *)createMockAssetWithKey:(NSString *)key
+{
+  EXUpdatesAsset *asset = [[EXUpdatesAsset alloc] initWithKey:key type:@"png"];
+  asset.downloadTime = [NSDate date];
+  asset.contentHash = key;
+  asset.filename = [NSString stringWithFormat:@"%@.png", key];
+  return asset;
+}
+
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "0.10.10",
+  "version": "0.10.14",
   "description": "Fetches and manages remotely-hosted assets and updates to your app's JS bundle.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -50,5 +50,5 @@
     "fs-extra": "^9.1.0",
     "memfs": "^3.2.0"
   },
-  "gitHead": "712122d3d4079e4d419d3a5fedf39cc011051ab6"
+  "gitHead": "8a45d6d743b91f608f0548d2ab02a3cef7434dcf"
 }