@react-native-firebase/storage 26.4.0 → 27.0.0

package/ios/RNFBStorageUnitTests/RNFBStorageUnitTests.xcodeproj/project.pbxproj

@@ -11,6 +11,17 @@
 		E7000000000000000000000B /* RNFBStorageTaskRegistry.m in Sources */ = {isa = PBXBuildFile; fileRef = E70000000000000000000018 /* RNFBStorageTaskRegistry.m */; };
 		E7000000000000000000000C /* RNFBStorageTaskRegistryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E70000000000000000000009 /* RNFBStorageTaskRegistryTests.m */; };
 		E70000000000000000000015 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E70000000000000000000014 /* XCTest.framework */; };
+		E70000000000000000000019 /* RNFBHandleMapStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7000000000000000000001C /* RNFBHandleMapStorage.swift */; };
+		E7000000000000000000001D /* RNFBStorageTaskRegistryStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7000000000000000000001E /* RNFBStorageTaskRegistryStorage.swift */; };
+		E7000000000000000000001F /* RNFBStorageTaskRegistryStorageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E70000000000000000000020 /* RNFBStorageTaskRegistryStorageTests.swift */; };
+		E70000000000000000000021 /* RNFBStorageTaskStatusMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = E70000000000000000000022 /* RNFBStorageTaskStatusMapper.swift */; };
+		E70000000000000000000023 /* RNFBStorageTaskStatusMapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E70000000000000000000024 /* RNFBStorageTaskStatusMapperTests.swift */; };
+		E70000000000000000000025 /* RNFBStorageTaskStatusMapperFacadeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E70000000000000000000026 /* RNFBStorageTaskStatusMapperFacadeTests.m */; };
+		E70000000000000000000027 /* RNFBStorageErrorCodeMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = E70000000000000000000028 /* RNFBStorageErrorCodeMapper.swift */; };
+		E70000000000000000000029 /* RNFBStorageErrorCodeMapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7000000000000000000002A /* RNFBStorageErrorCodeMapperTests.swift */; };
+		E7000000000000000000002B /* RNFBStorageErrorCodeMapperFacadeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7000000000000000000002C /* RNFBStorageErrorCodeMapperFacadeTests.m */; };
+		E7000000000000000000002D /* RNFBStorageErrorSnapshotDictBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7000000000000000000002E /* RNFBStorageErrorSnapshotDictBuilder.swift */; };
+		E7000000000000000000002F /* RNFBStorageErrorSnapshotDictBuilderFacadeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E70000000000000000000030 /* RNFBStorageErrorSnapshotDictBuilderFacadeTests.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -21,6 +32,17 @@
 		E70000000000000000000016 /* RNFBStorageTaskRegistry.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RNFBStorageTaskRegistry.h; path = ../RNFBStorage/RNFBStorageTaskRegistry.h; sourceTree = SOURCE_ROOT; };
 		E70000000000000000000018 /* RNFBStorageTaskRegistry.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RNFBStorageTaskRegistry.m; path = ../RNFBStorage/RNFBStorageTaskRegistry.m; sourceTree = SOURCE_ROOT; };
 		E70000000000000000000014 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/MacOSX.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
+		E7000000000000000000001C /* RNFBHandleMapStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RNFBHandleMapStorage.swift; path = ../../../app/ios/RNFBApp/RNFBHandleMapStorage.swift; sourceTree = SOURCE_ROOT; };
+		E7000000000000000000001E /* RNFBStorageTaskRegistryStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RNFBStorageTaskRegistryStorage.swift; path = ../RNFBStorage/RNFBStorageTaskRegistryStorage.swift; sourceTree = SOURCE_ROOT; };
+		E70000000000000000000020 /* RNFBStorageTaskRegistryStorageTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RNFBStorageTaskRegistryStorageTests.swift; sourceTree = "<group>"; };
+		E70000000000000000000022 /* RNFBStorageTaskStatusMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RNFBStorageTaskStatusMapper.swift; path = ../RNFBStorage/RNFBStorageTaskStatusMapper.swift; sourceTree = SOURCE_ROOT; };
+		E70000000000000000000024 /* RNFBStorageTaskStatusMapperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RNFBStorageTaskStatusMapperTests.swift; sourceTree = "<group>"; };
+		E70000000000000000000026 /* RNFBStorageTaskStatusMapperFacadeTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBStorageTaskStatusMapperFacadeTests.m; sourceTree = "<group>"; };
+		E70000000000000000000028 /* RNFBStorageErrorCodeMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RNFBStorageErrorCodeMapper.swift; path = ../RNFBStorage/RNFBStorageErrorCodeMapper.swift; sourceTree = SOURCE_ROOT; };
+		E7000000000000000000002A /* RNFBStorageErrorCodeMapperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RNFBStorageErrorCodeMapperTests.swift; sourceTree = "<group>"; };
+		E7000000000000000000002C /* RNFBStorageErrorCodeMapperFacadeTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBStorageErrorCodeMapperFacadeTests.m; sourceTree = "<group>"; };
+		E7000000000000000000002E /* RNFBStorageErrorSnapshotDictBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RNFBStorageErrorSnapshotDictBuilder.swift; path = ../RNFBStorage/RNFBStorageErrorSnapshotDictBuilder.swift; sourceTree = SOURCE_ROOT; };
+		E70000000000000000000030 /* RNFBStorageErrorSnapshotDictBuilderFacadeTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBStorageErrorSnapshotDictBuilderFacadeTests.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -56,9 +78,20 @@
 			children = (
 				E70000000000000000000007 /* RNFBHandleMap.h */,
 				E70000000000000000000008 /* RNFBHandleMap.m */,
+				E7000000000000000000001C /* RNFBHandleMapStorage.swift */,
 				E70000000000000000000016 /* RNFBStorageTaskRegistry.h */,
 				E70000000000000000000018 /* RNFBStorageTaskRegistry.m */,
+				E7000000000000000000001E /* RNFBStorageTaskRegistryStorage.swift */,
 				E70000000000000000000009 /* RNFBStorageTaskRegistryTests.m */,
+				E70000000000000000000020 /* RNFBStorageTaskRegistryStorageTests.swift */,
+				E70000000000000000000022 /* RNFBStorageTaskStatusMapper.swift */,
+				E70000000000000000000024 /* RNFBStorageTaskStatusMapperTests.swift */,
+				E70000000000000000000026 /* RNFBStorageTaskStatusMapperFacadeTests.m */,
+				E70000000000000000000028 /* RNFBStorageErrorCodeMapper.swift */,
+				E7000000000000000000002A /* RNFBStorageErrorCodeMapperTests.swift */,
+				E7000000000000000000002C /* RNFBStorageErrorCodeMapperFacadeTests.m */,
+				E7000000000000000000002E /* RNFBStorageErrorSnapshotDictBuilder.swift */,
+				E70000000000000000000030 /* RNFBStorageErrorSnapshotDictBuilderFacadeTests.m */,
 			);
 			name = Sources;
 			sourceTree = "<group>";
@@ -121,8 +154,19 @@
 			buildActionMask = 2147483647;
 			files = (
 				E7000000000000000000000A /* RNFBHandleMap.m in Sources */,
+				E70000000000000000000019 /* RNFBHandleMapStorage.swift in Sources */,
+				E7000000000000000000001D /* RNFBStorageTaskRegistryStorage.swift in Sources */,
 				E7000000000000000000000B /* RNFBStorageTaskRegistry.m in Sources */,
 				E7000000000000000000000C /* RNFBStorageTaskRegistryTests.m in Sources */,
+				E7000000000000000000001F /* RNFBStorageTaskRegistryStorageTests.swift in Sources */,
+				E70000000000000000000021 /* RNFBStorageTaskStatusMapper.swift in Sources */,
+				E70000000000000000000023 /* RNFBStorageTaskStatusMapperTests.swift in Sources */,
+				E70000000000000000000025 /* RNFBStorageTaskStatusMapperFacadeTests.m in Sources */,
+				E70000000000000000000027 /* RNFBStorageErrorCodeMapper.swift in Sources */,
+				E70000000000000000000029 /* RNFBStorageErrorCodeMapperTests.swift in Sources */,
+				E7000000000000000000002B /* RNFBStorageErrorCodeMapperFacadeTests.m in Sources */,
+				E7000000000000000000002D /* RNFBStorageErrorSnapshotDictBuilder.swift in Sources */,
+				E7000000000000000000002F /* RNFBStorageErrorSnapshotDictBuilderFacadeTests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -171,6 +215,7 @@
 				CODE_SIGNING_REQUIRED = NO;
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
+				DEFINES_MODULE = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../../../app/ios",
@@ -194,6 +239,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SUPPORTED_PLATFORMS = macosx;
+				SWIFT_OBJC_INTERFACE_HEADER_NAME = "RNFBHandleMapStorage-Swift.inc";
+				SWIFT_VERSION = 5.10;
 			};
 			name = Debug;
 		};
@@ -205,6 +252,7 @@
 				CODE_SIGNING_REQUIRED = NO;
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
+				DEFINES_MODULE = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../../../app/ios",
@@ -221,6 +269,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SUPPORTED_PLATFORMS = macosx;
+				SWIFT_OBJC_INTERFACE_HEADER_NAME = "RNFBHandleMapStorage-Swift.inc";
+				SWIFT_VERSION = 5.10;
 			};
 			name = Release;
 		};

package/lib/index.ts

@@ -20,6 +20,7 @@ import type { FirebaseApp } from '@react-native-firebase/app';
 import {
   FirebaseModule,
   getOrCreateModularInstance,
+  setReactNativeModule,
 } from '@react-native-firebase/app/dist/module/internal';
 import type { ModuleConfig } from '@react-native-firebase/app/dist/module/internal';
 import type { ReactNativeFirebase } from '@react-native-firebase/app';
@@ -27,7 +28,6 @@ import Reference from './StorageReference';
 import { getGsUrlParts, getHttpUrlParts, handleStorageEvent } from './utils';
 import { version } from './version';
 import fallBackModule from './web/RNFBStorageModule';
-import { setReactNativeModule } from '@react-native-firebase/app/dist/module/internal/nativeModule';
 import './types/internal';
 import type {
   EmulatorMockTokenOptions,

package/lib/types/internal.ts

@@ -15,7 +15,10 @@
  *
  */
 
-import type { ModuleConfig } from '@react-native-firebase/app/dist/module/types/internal';
+import type {
+  ModuleConfig,
+  ReactNativeFirebaseEventEmitter,
+} from '@react-native-firebase/app/dist/module/types/internal';
 import type {
   FirebaseStorage,
   StorageReference,
@@ -28,8 +31,6 @@ import type {
   ListResult,
   ListOptions,
 } from './storage';
-import type EventEmitter from 'react-native/Libraries/vendor/emitter/EventEmitter';
-
 /**
  * Internal Storage type with access to private properties.
  * Used internally by StorageReference and other internal classes.
@@ -37,7 +38,7 @@ import type EventEmitter from 'react-native/Libraries/vendor/emitter/EventEmitte
 export type StorageInternal = FirebaseStorage & {
   native: NativeRNFBTurboStorage;
   _customUrlOrRegion: string | null;
-  emitter: EventEmitter;
+  emitter: ReactNativeFirebaseEventEmitter;
   eventNameForApp: (...args: Array<string | number>) => string;
   _config: ModuleConfig;
   /**

package/lib/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '26.4.0';
+export const version = '27.0.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/storage",
-  "version": "26.4.0",
+  "version": "27.0.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": "./dist/module/index.js",
@@ -49,14 +49,14 @@
     "download"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "26.4.0"
+    "@react-native-firebase/app": "27.0.0"
   },
   "publishConfig": {
     "access": "public",
     "provenance": true
   },
   "devDependencies": {
-    "@react-native-firebase/app": "26.4.0",
+    "@react-native-firebase/app": "27.0.0",
     "react-native-builder-bob": "^0.41.0"
   },
   "exports": {
@@ -89,5 +89,5 @@
     "node_modules/",
     "dist/"
   ],
-  "gitHead": "06701af5fdc19bae9f379567eadb29dfe81953c0"
+  "gitHead": "0c7e942bca361f1765abaf233bf447d795718eff"
 }

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

@@ -1,93 +0,0 @@
-package io.invertase.firebase.storage;
-
-/*
- * Copyright (c) 2016-present Invertase Limited & Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this library except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import io.invertase.firebase.common.RNFBHandleCollisionException;
-import io.invertase.firebase.common.RNFBHandleMap;
-import java.util.List;
-import java.util.function.Predicate;
-
-/**
- * Pending upload/download task map. Unique {@link #put}; callers {@link #take} or {@link
- * #takeAllAndCancel} then cancel outside the HandleMap lock.
- */
-final class RNFBStorageTaskRegistry {
-  private final RNFBHandleMap<Integer, StoragePendingHandle> map = new RNFBHandleMap<>();
-
-  void put(int taskId, StoragePendingHandle handle) throws RNFBHandleCollisionException {
-    map.put(taskId, handle);
-  }
-
-  /**
-   * Unique put. On collision, {@code cancel()} the incoming handle and leave the existing mapping.
-   *
-   * @return true if stored
-   */
-  boolean putOrDiscard(int taskId, StoragePendingHandle handle) {
-    if (map.putIfAbsent(taskId, handle)) {
-      return true;
-    }
-    if (handle != null) {
-      handle.cancel();
-    }
-    return false;
-  }
-
-  StoragePendingHandle get(int taskId) {
-    return map.get(taskId);
-  }
-
-  StoragePendingHandle take(int taskId) {
-    return map.take(taskId);
-  }
-
-  StoragePendingHandle takeIf(int taskId, Predicate<StoragePendingHandle> shouldTake) {
-    return map.takeIf(taskId, shouldTake);
-  }
-
-  /**
-   * Cancel outside the HandleMap lock; remove the mapping only when cancel succeeds. Returns {@code
-   * false} when no mapping existed or cancel failed. Trailing unregister is identity-gated so a
-   * replacement put after {@code cancel()} (e.g. production {@code destroyTask}) is not stolen.
-   *
-   * <p>Shape: get → cancel → identity takeIf on success (keep mapping when cancel returns false).
-   * iOS registry mirrors get → cancel → identity takeIf, but FIRStorage cancel is void so there is
-   * no keep-on-false path — see {@code RNFBStorageTaskRegistry.takeAndCancel:} / helper {@code
-   * setTaskStatus}.
-   */
-  boolean takeAndCancel(int taskId) {
-    StoragePendingHandle handle = map.get(taskId);
-    if (handle == null) {
-      return false;
-    }
-    boolean cancelled = handle.cancel();
-    if (cancelled) {
-      map.takeIf(taskId, h -> h == handle);
-    }
-    return cancelled;
-  }
-
-  void takeAllAndCancel() {
-    List<StoragePendingHandle> remaining = map.takeAll();
-    for (StoragePendingHandle handle : remaining) {
-      if (handle != null) {
-        handle.cancel();
-      }
-    }
-  }
-}