WIP: probing secondary storage app hang

Author: mikehardy

packages/storage/e2e/StorageReference.e2e.js

@@ -17,7 +17,7 @@
 
 const { PATH, seed, WRITE_ONLY_NAME } = require('./helpers');
 
-describe('storage() -> StorageReference', function () {
+describe.only('storage() -> StorageReference', function () {
   before(async function () {
     await seed(PATH);
   });
@@ -142,8 +142,7 @@ describe('storage() -> StorageReference', function () {
   describe('getDownloadURL', function () {
     it('should return a download url for a file', async function () {
       // This is frequently flaky in CI - but works sometimes. Skipping only in CI for now.
-      // Disabled for iOS pending: https://github.com/firebase/firebase-ios-sdk/pull/10370
-      if (!isCI && device.getPlatform() !== 'ios') {
+      if (!isCI) {
         const storageReference = firebase.storage().ref(`${PATH}/list/file1.txt`);
         const downloadUrl = await storageReference.getDownloadURL();
         downloadUrl.should.be.a.String();
@@ -678,4 +677,24 @@ describe('storage() -> StorageReference', function () {
       });
     });
   });
+
+  describe('put secondaryApp', function () {
+    it('allows valid metadata properties for upload', async function () {
+      const storageReference = firebase
+        .storage(firebase.app('secondaryFromNative'))
+        // .storage()
+        .ref(`${PATH}/metadataTest.jpeg`);
+      await storageReference.put(new jet.context.window.ArrayBuffer(), {
+        contentType: 'image/jpg',
+        md5hash: '123412341234',
+        cacheControl: 'true',
+        contentDisposition: 'disposed',
+        contentEncoding: 'application/octet-stream',
+        contentLanguage: 'de',
+        customMetadata: {
+          customMetadata1: 'metadata1value',
+        },
+      });
+    });
+  });
 });

packages/storage/ios/RNFBStorage/RNFBStorageModule.m

@@ -478,19 +478,25 @@ - (void)invalidate {
                   : (nonnull NSNumber *)taskId
                   : (RCTPromiseResolveBlock)resolve
                   : (RCTPromiseRejectBlock)reject) {
+  DLog(@"STORAGELOG getting reference");
   FIRStorageReference *storageReference = [self getReferenceFromUrl:url app:firebaseApp];
+  DLog(@"STORAGELOG getting metadata");
   FIRStorageMetadata *storageMetadata =
       [RNFBStorageCommon buildMetadataFromMap:metadata
                              existingMetadata:nil
                                          path:[storageReference fullPath]];
 
+  DLog(@"STORAGELOG getting uploadtask");
   __block FIRStorageUploadTask *uploadTask;
+  DLog(@"STORAGELOG doing upload task call block");
   RCTUnsafeExecuteOnMainQueueSync(^{
+  DLog(@"STORAGELOG putData");
     uploadTask = [storageReference putData:[RNFBStorageCommon NSDataFromUploadString:string
                                                                               format:format]
                                   metadata:storageMetadata];
   });
 
+  DLog(@"STORAGELOG adding upload task observer");
   [self addUploadTaskObservers:uploadTask
                 appDisplayName:[[[storageReference storage] app] name]
                         taskId:taskId
@@ -558,9 +564,11 @@ - (void)addUploadTaskObservers:(FIRStorageUploadTask *)uploadTask
   PENDING_TASKS[taskId] = uploadTask;
 
   // upload started or resumed
+  DLog(@"STORAGELOG adding observer resume");
   [uploadTask
       observeStatus:FIRStorageTaskStatusResume
             handler:^(FIRStorageTaskSnapshot *snapshot) {
+              DLog(@"STORAGELOG task resume");
               NSDictionary *eventBody = [RNFBStorageCommon getUploadTaskAsDictionary:snapshot];
               NSDictionary *event =
                   [RNFBStorageCommon getStorageEventDictionary:eventBody
@@ -571,9 +579,11 @@ - (void)addUploadTaskObservers:(FIRStorageUploadTask *)uploadTask
             }];
 
   // upload paused
+  DLog(@"STORAGELOG adding observer pause");
   [uploadTask
       observeStatus:FIRStorageTaskStatusPause
             handler:^(FIRStorageTaskSnapshot *snapshot) {
+              DLog(@"STORAGELOG task pause");
               NSDictionary *eventBody = [RNFBStorageCommon getUploadTaskAsDictionary:snapshot];
               NSDictionary *event =
                   [RNFBStorageCommon getStorageEventDictionary:eventBody
@@ -584,9 +594,11 @@ - (void)addUploadTaskObservers:(FIRStorageUploadTask *)uploadTask
             }];
 
   // upload reported progress
+  DLog(@"STORAGELOG adding observer progress");
   [uploadTask
       observeStatus:FIRStorageTaskStatusProgress
             handler:^(FIRStorageTaskSnapshot *snapshot) {
+              DLog(@"STORAGELOG task progress");
               NSDictionary *eventBody = [RNFBStorageCommon getUploadTaskAsDictionary:snapshot];
               NSDictionary *event =
                   [RNFBStorageCommon getStorageEventDictionary:eventBody
@@ -597,8 +609,10 @@ - (void)addUploadTaskObservers:(FIRStorageUploadTask *)uploadTask
             }];
 
   // upload completed successfully
+  DLog(@"STORAGELOG adding observer success");
   [uploadTask observeStatus:FIRStorageTaskStatusSuccess
                     handler:^(FIRStorageTaskSnapshot *snapshot) {
+              DLog(@"STORAGELOG task succeeded");
                       [PENDING_TASKS removeObjectForKey:taskId];
 
                       NSDictionary *eventBody =
@@ -624,9 +638,11 @@ - (void)addUploadTaskObservers:(FIRStorageUploadTask *)uploadTask
                       resolve(eventBody);
                     }];
 
-  [uploadTask
+   DLog(@"STORAGELOG adding observer failure");
+ [uploadTask
       observeStatus:FIRStorageTaskStatusFailure
             handler:^(FIRStorageTaskSnapshot *snapshot) {
+              DLog(@"STORAGELOG task failed");
               [PENDING_TASKS removeObjectForKey:taskId];
 
               // state_changed

tests/e2e/.mocharc.js

@@ -5,7 +5,7 @@ module.exports = {
   timeout: 720000,
   reporter: 'spec',
   slow: 2000,
-  retries: 4,
+  retries: 1,
   bail: true,
   exit: true,
   recursive: true,

tests/ios/Podfile.lock

@@ -1159,74 +1159,74 @@ PODS:
     - React-jsi (= 0.67.3)
     - React-logger (= 0.67.3)
     - React-perflogger (= 0.67.3)
-  - RNFBAnalytics (16.3.1):
+  - RNFBAnalytics (16.4.3):
     - Firebase/Analytics (= 10.1.0)
     - GoogleAppMeasurementOnDeviceConversion (= 10.1.0)
     - React-Core
     - RNFBApp
-  - RNFBApp (16.3.1):
+  - RNFBApp (16.4.3):
     - Firebase/CoreOnly (= 10.1.0)
     - React-Core
-  - RNFBAppCheck (16.3.1):
+  - RNFBAppCheck (16.4.3):
     - Firebase/AppCheck (= 10.1.0)
     - React-Core
     - RNFBApp
-  - RNFBAppDistribution (16.3.1):
+  - RNFBAppDistribution (16.4.3):
     - Firebase/AppDistribution (= 10.1.0)
     - React-Core
     - RNFBApp
-  - RNFBAuth (16.3.1):
+  - RNFBAuth (16.4.3):
     - Firebase/Auth (= 10.1.0)
     - React-Core
     - RNFBApp
-  - RNFBCrashlytics (16.3.1):
+  - RNFBCrashlytics (16.4.3):
     - Firebase/Crashlytics (= 10.1.0)
     - FirebaseCoreExtension (= 10.1.0)
     - React-Core
     - RNFBApp
-  - RNFBDatabase (16.3.1):
+  - RNFBDatabase (16.4.3):
     - Firebase/Database (= 10.1.0)
     - React-Core
     - RNFBApp
-  - RNFBDynamicLinks (16.3.1):
+  - RNFBDynamicLinks (16.4.3):
     - Firebase/DynamicLinks (= 10.1.0)
     - GoogleUtilities/AppDelegateSwizzler
     - React-Core
     - RNFBApp
-  - RNFBFirestore (16.3.1):
+  - RNFBFirestore (16.4.3):
     - Firebase/Firestore (= 10.1.0)
     - nanopb (< 2.30910.0, >= 2.30908.0)
     - React-Core
     - RNFBApp
-  - RNFBFunctions (16.3.1):
+  - RNFBFunctions (16.4.3):
     - Firebase/Functions (= 10.1.0)
     - React-Core
     - RNFBApp
-  - RNFBInAppMessaging (16.3.1):
+  - RNFBInAppMessaging (16.4.3):
     - Firebase/InAppMessaging (= 10.1.0)
     - React-Core
     - RNFBApp
-  - RNFBInstallations (16.3.1):
+  - RNFBInstallations (16.4.3):
     - Firebase/Installations (= 10.1.0)
     - React-Core
     - RNFBApp
-  - RNFBMessaging (16.3.1):
+  - RNFBMessaging (16.4.3):
     - Firebase/Messaging (= 10.1.0)
     - FirebaseCoreExtension (= 10.1.0)
     - React-Core
     - RNFBApp
-  - RNFBML (16.3.1):
+  - RNFBML (16.4.3):
     - React-Core
     - RNFBApp
-  - RNFBPerf (16.3.1):
+  - RNFBPerf (16.4.3):
     - Firebase/Performance (= 10.1.0)
     - React-Core
     - RNFBApp
-  - RNFBRemoteConfig (16.3.1):
+  - RNFBRemoteConfig (16.4.3):
     - Firebase/RemoteConfig (= 10.1.0)
     - React-Core
     - RNFBApp
-  - RNFBStorage (16.3.1):
+  - RNFBStorage (16.4.3):
     - Firebase/Storage (= 10.1.0)
     - React-Core
     - RNFBApp
@@ -1492,23 +1492,23 @@ SPEC CHECKSUMS:
   React-RCTVibration: d0361f15ea978958fab7ffb6960f475b5063d83f
   React-runtimeexecutor: af1946623656f9c5fd64ca6f36f3863516193446
   ReactCommon: 650e33cde4fb7d36781cd3143f5276da0abb2f96
-  RNFBAnalytics: 81429fa6c0569a16e91b9487c9a6ba56891ff72e
-  RNFBApp: 2eea718168efc2cc8c5993e4c51e9866baf55a9a
-  RNFBAppCheck: b562fad8b9435f5f4684927192d137885f900c97
-  RNFBAppDistribution: 423e27bc2828173123223349d8f007644ec49241
-  RNFBAuth: 4e27174df8c594d50c488115502b758875d30526
-  RNFBCrashlytics: db0d61b451a4bde94112f787381dc8e8bf596564
-  RNFBDatabase: 0043c006603b3b7d410d6b7da2371e1fea959d74
-  RNFBDynamicLinks: 7d95f1f6ae2abacb1e21cdce1ec242ba9f8bcd9b
-  RNFBFirestore: 35da9fdec881979d4155a161fd06e03a090b1d50
-  RNFBFunctions: ffbbeb361f88f3d54c38ab0ba0aac635f3d63968
-  RNFBInAppMessaging: 9208fd27e8a8317e00bfe14e2e980595d6adf3da
-  RNFBInstallations: 02a06897fc9ddd5e46c82cd7f48d8aaaf9cbfece
-  RNFBMessaging: 76445c5866517441c093b69b8d226170b52d4998
-  RNFBML: d9df4674c937c6727c1192221d83407d28ae91dc
-  RNFBPerf: 0a123624fa773a9f409076835ea8fa4b93b5209a
-  RNFBRemoteConfig: 9c39b75591748abdb5e5402b1020069ad5d47975
-  RNFBStorage: 4f956068208db65fda654562fe626810efbd144b
+  RNFBAnalytics: 1dbd03940c32e4da616a0f135baa633ae8be976d
+  RNFBApp: e2157f61e4769b53641df8948c534580630cb50a
+  RNFBAppCheck: 727f9be6729606b211391eface962737af5745c5
+  RNFBAppDistribution: 0b7f55adbfd5e238ae96d900abedfd3e2d765e11
+  RNFBAuth: 7d2d8b68ef2dbeed0844532e9b65df09af627bf9
+  RNFBCrashlytics: e0869743b4f57b0353605363a0a41fbff2500594
+  RNFBDatabase: d2f84c61c5899f64039151eda934d3cd94e99c2b
+  RNFBDynamicLinks: 5dbccab1f947e2a8a4d1c523f7b390501bedfc7b
+  RNFBFirestore: 10e53da935827fee199db750dbc3c5129c50a620
+  RNFBFunctions: a8b26554e652453a6c9d5cb8e399c9e4d6896030
+  RNFBInAppMessaging: 2206b4dc0a38da9f8caf14556e27b4b49bc6b93b
+  RNFBInstallations: af375a09ca33f051e06a36a77c058f6ebaa23521
+  RNFBMessaging: 00da9a5a7136caa61a7b75d87e1dd83864251136
+  RNFBML: e5e3faa3873f5abe724e237ccace8e4f93b72d2f
+  RNFBPerf: 17ab696f1fd684979d69aafbae216b792a168b47
+  RNFBRemoteConfig: ba95ab9f0034dae20b588ce625902a6fd3898319
+  RNFBStorage: 8addb089a67f88833e34f8ef8dde13a0a64c0050
   Yoga: 90dcd029e45d8a7c1ff059e8b3c6612ff409061a
 
 PODFILE CHECKSUM: cdac7095831bb39f8d76539f83a3580addb30d8b