@react-native-firebase/storage 16.0.0 → 16.1.0

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [16.1.0](https://github.com/invertase/react-native-firebase/compare/v16.0.0...v16.1.0) (2022-10-20)
+
+### Bug Fixes
+
+- **storage, emulator:** avoid calling useEmulator multiple times ([276630d](https://github.com/invertase/react-native-firebase/commit/276630d4690cb6c3b2b632ec9dd0808ca8013eba)), closes [#5860](https://github.com/invertase/react-native-firebase/issues/5860)
+
 ## [16.0.0](https://github.com/invertase/react-native-firebase/compare/v15.7.1...v16.0.0) (2022-10-19)
 
 **Note:** Version bump only for package @react-native-firebase/storage

package/android/src/main/java/io/invertase/firebase/storage/ReactNativeFirebaseStorageModule.java

@@ -44,6 +44,8 @@ import java.util.Objects;
 public class ReactNativeFirebaseStorageModule extends ReactNativeFirebaseModule {
   private static final String TAG = "Storage";
 
+  private static HashMap<String, String> emulatorConfigs = new HashMap<>();
+
   ReactNativeFirebaseStorageModule(ReactApplicationContext reactContext) {
     super(reactContext, TAG);
   }
@@ -54,7 +56,9 @@ public class ReactNativeFirebaseStorageModule extends ReactNativeFirebaseModule
     super.onCatalystInstanceDestroy();
   }
 
-  /** @link https://firebase.google.com/docs/reference/js/firebase.storage.Reference#delete */
+  /**
+   * @link https://firebase.google.com/docs/reference/js/firebase.storage.Reference#delete
+   */
   @ReactMethod
   public void delete(String appName, String url, final Promise promise) {
     try {
@@ -97,7 +101,9 @@ public class ReactNativeFirebaseStorageModule extends ReactNativeFirebaseModule
     }
   }
 
-  /** @link https://firebase.google.com/docs/reference/js/firebase.storage.Reference#getMetadata */
+  /**
+   * @link https://firebase.google.com/docs/reference/js/firebase.storage.Reference#getMetadata
+   */
   @ReactMethod
   public void getMetadata(String appName, String url, Promise promise) {
     try {
@@ -118,7 +124,9 @@ public class ReactNativeFirebaseStorageModule extends ReactNativeFirebaseModule
     }
   }
 
-  /** @link https://firebase.google.com/docs/reference/js/firebase.storage.Reference#list */
+  /**
+   * @link https://firebase.google.com/docs/reference/js/firebase.storage.Reference#list
+   */
   @ReactMethod
   public void list(String appName, String url, ReadableMap listOptions, Promise promise) {
     try {
@@ -148,7 +156,9 @@ public class ReactNativeFirebaseStorageModule extends ReactNativeFirebaseModule
     }
   }
 
-  /** @link https://firebase.google.com/docs/reference/js/firebase.storage.Reference#listAll */
+  /**
+   * @link https://firebase.google.com/docs/reference/js/firebase.storage.Reference#listAll
+   */
   @ReactMethod
   public void listAll(String appName, String url, Promise promise) {
     try {
@@ -267,16 +277,23 @@ public class ReactNativeFirebaseStorageModule extends ReactNativeFirebaseModule
     promise.resolve(null);
   }
 
-  /** @link https://firebase.google.com/docs/reference/js/firebase.storage.Storage#useEmulator */
+  /**
+   * @link https://firebase.google.com/docs/reference/js/firebase.storage.Storage#useEmulator
+   */
   @ReactMethod
   public void useEmulator(String appName, String host, int port, Promise promise) {
     FirebaseApp firebaseApp = FirebaseApp.getInstance(appName);
     FirebaseStorage firebaseStorage = FirebaseStorage.getInstance(firebaseApp);
-    firebaseStorage.useEmulator(host, port);
+    if (emulatorConfigs.get(appName) == null) {
+      firebaseStorage.useEmulator(host, port);
+      emulatorConfigs.put(appName, "true");
+    }
     promise.resolve(null);
   }
 
-  /** @link https://firebase.google.com/docs/reference/js/firebase.storage.Reference#writeToFile */
+  /**
+   * @link https://firebase.google.com/docs/reference/js/firebase.storage.Reference#writeToFile
+   */
   @ReactMethod
   public void writeToFile(
       String appName, String url, String localFilePath, int taskId, Promise promise) {
@@ -300,7 +317,9 @@ public class ReactNativeFirebaseStorageModule extends ReactNativeFirebaseModule
     }
   }
 
-  /** @link https://firebase.google.com/docs/reference/js/firebase.storage.Reference#putString */
+  /**
+   * @link https://firebase.google.com/docs/reference/js/firebase.storage.Reference#putString
+   */
   @ReactMethod
   public void putString(
       String appName,
@@ -321,7 +340,9 @@ public class ReactNativeFirebaseStorageModule extends ReactNativeFirebaseModule
     }
   }
 
-  /** @link https://firebase.google.com/docs/reference/js/firebase.storage.Reference#putFile */
+  /**
+   * @link https://firebase.google.com/docs/reference/js/firebase.storage.Reference#putFile
+   */
   @ReactMethod
   public void putFile(
       String appName,

package/ios/RNFBStorage/RNFBStorageModule.m

@@ -35,7 +35,7 @@ static NSMutableDictionary *PENDING_TASKS;
 // The iOS SDK has a short memory on settings, store these globally and set them in each time
 static NSString *emulatorHost = nil;
 static NSInteger emulatorPort = 0;
-static bool useEmulatorCalled = false;
+static NSMutableDictionary *emulatorConfigs;
 static NSTimeInterval maxDownloadRetryTime = 600;
 static NSTimeInterval maxUploadRetryTime = 600;
 static NSTimeInterval maxOperationRetryTime = 120;
@@ -56,6 +56,7 @@ RCT_EXPORT_MODULE();
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
     PENDING_TASKS = [[NSMutableDictionary alloc] init];
+    emulatorConfigs = [[NSMutableDictionary alloc] init];
   });
 
   return self;
@@ -506,12 +507,10 @@ RCT_EXPORT_METHOD(useEmulator
                   : (NSInteger)port) {
   emulatorHost = host;
   emulatorPort = port;
-  if (useEmulatorCalled == true) {
-    return;
+  if (!emulatorConfigs[firebaseApp.name]) {
+    [[FIRStorage storageForApp:firebaseApp] useEmulatorWithHost:host port:port];
+    emulatorConfigs[firebaseApp.name] = @YES;
   }
-
-  [[FIRStorage storageForApp:firebaseApp] useEmulatorWithHost:host port:port];
-  useEmulatorCalled = true;
 }
 
 /**
@@ -669,10 +668,11 @@ RCT_EXPORT_METHOD(setTaskStatus
   storage = [FIRStorage storageForApp:firebaseApp URL:bucket];
 
   NSLog(@"Setting emulator - host %@ port %ld", emulatorHost, (long)emulatorPort);
-  if (![emulatorHost isEqual:[NSNull null]] && emulatorHost != nil && useEmulatorCalled == false) {
+  if (![emulatorHost isEqual:[NSNull null]] && emulatorHost != nil &&
+      !emulatorConfigs[firebaseApp.name]) {
     @try {
       [storage useEmulatorWithHost:emulatorHost port:emulatorPort];
-      useEmulatorCalled = true;
+      emulatorConfigs[firebaseApp.name] = @YES;
     } @catch (NSException *e) {
       NSLog(@"WARNING: Unable to set the Firebase Storage emulator settings. These must be set "
             @"before any usages of Firebase Storage. If you see this log after a hot "

package/lib/version.js

@@ -1,2 +1,2 @@
 // Generated by genversion.
-module.exports = '16.0.0';
+module.exports = '16.1.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/storage",
-  "version": "16.0.0",
+  "version": "16.1.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - React Native Firebase provides native integration with Cloud Storage, providing support to upload and download files directly from your device and from your Firebase Cloud Storage bucket.",
   "main": "lib/index.js",
@@ -29,10 +29,10 @@
     "download"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "16.0.0"
+    "@react-native-firebase/app": "16.1.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fe2bebee106dc178b0835f7097c2d05b30223b2f"
+  "gitHead": "f2d1363b89fb046388f8336b08852c1ea0c285f2"
 }