@react-native-firebase/app 26.3.3 → 26.4.0

package/lib/internal/nativeModuleWeb.ts

@@ -1,12 +1,13 @@
-/* eslint-disable no-console */
 import RNFBAppModule from './web/RNFBAppModule';
 import { APP_NATIVE_MODULE } from './constants';
+import { createNativeModuleDebugProxy } from './nativeModuleDebug';
 
 // Register before exporting getters — RNFBNativeEventEmitter instantiates during circular imports.
 const nativeModuleRegistry: Record<string, Record<string, unknown>> = {
   RNFBAppModule: RNFBAppModule as unknown as Record<string, unknown>,
   [APP_NATIVE_MODULE]: RNFBAppModule as unknown as Record<string, unknown>,
 };
+const memoizedDebugProxies = new Map<string, Record<string, unknown>>();
 
 export function getReactNativeModule(moduleName: string): Record<string, unknown> | undefined {
   const nativeModule = nativeModuleRegistry[moduleName];
@@ -17,45 +18,13 @@ export function getReactNativeModule(moduleName: string): Record<string, unknown
   if (!globalThis.RNFBDebug) {
     return nativeModule;
   }
-  return new Proxy(nativeModule, {
-    ownKeys(target) {
-      const keys: string[] = [];
-      for (const key in target) {
-        keys.push(key);
-      }
-      return keys;
-    },
-    get: (_, name) => {
-      const prop = nativeModule[name as string];
-      if (typeof prop !== 'function') return prop;
-      return (...args: unknown[]) => {
-        console.debug(
-          `[RNFB->Native][🔵] ${moduleName}.${String(name)} -> ${JSON.stringify(args)}`,
-        );
-        const result: unknown = (prop as (...args: unknown[]) => unknown)(...args);
-        if (result && typeof result === 'object' && 'then' in result) {
-          return (result as Promise<unknown>).then(
-            (res: unknown) => {
-              console.debug(
-                `[RNFB<-Native][🟢] ${moduleName}.${String(name)} <- ${JSON.stringify(res)}`,
-              );
-              return res;
-            },
-            (err: unknown) => {
-              console.debug(
-                `[RNFB<-Native][🔴] ${moduleName}.${String(name)} <- ${JSON.stringify(err)}`,
-              );
-              throw err;
-            },
-          );
-        }
-        console.debug(
-          `[RNFB<-Native][🟢] ${moduleName}.${String(name)} <- ${JSON.stringify(result)}`,
-        );
-        return result;
-      };
-    },
-  });
+
+  let debugProxy = memoizedDebugProxies.get(moduleName);
+  if (!debugProxy) {
+    debugProxy = createNativeModuleDebugProxy(moduleName, nativeModule);
+    memoizedDebugProxies.set(moduleName, debugProxy);
+  }
+  return debugProxy;
 }
 
 export function setReactNativeModule(
@@ -63,4 +32,5 @@ export function setReactNativeModule(
   nativeModule: Record<string, unknown>,
 ): void {
   nativeModuleRegistry[moduleName] = nativeModule;
+  memoizedDebugProxies.delete(moduleName);
 }

package/lib/internal/registry/app.ts

@@ -27,7 +27,7 @@ type FirebaseAppConfig = ReactNativeFirebase.FirebaseAppConfig;
 type FirebaseAppOptions = ReactNativeFirebase.FirebaseAppOptions;
 type ReactNativeAsyncStorage = ReactNativeFirebase.ReactNativeAsyncStorage;
 
-const APP_REGISTRY: Record<string, FirebaseApp> = {};
+const APP_REGISTRY: Record<string, FirebaseApp> = Object.create(null);
 let onAppCreateFn: ((app: FirebaseApp) => void) | null = null;
 const onAppDestroyCallbacks: Array<(app: FirebaseApp) => void> = [];
 let initializedNativeApps = false;

package/lib/internal/registry/modular.ts

@@ -31,7 +31,7 @@ type ModularModuleClass<T extends FirebaseModule> = new (
 ) => T;
 
 // app.name -> instanceKey -> module instance
-const MODULAR_INSTANCES: Record<string, Record<string, FirebaseModule>> = {};
+const MODULAR_INSTANCES: Record<string, Record<string, FirebaseModule>> = Object.create(null);
 
 let destroyHookRegistered = false;
 function ensureDestroyHook(): void {
@@ -82,7 +82,7 @@ export function getOrCreateModularInstance<T extends FirebaseModule>(
   const key = customUrlOrRegion ? `${customUrlOrRegion}:${namespace}` : namespace;
 
   if (!MODULAR_INSTANCES[_app.name]) {
-    MODULAR_INSTANCES[_app.name] = {};
+    MODULAR_INSTANCES[_app.name] = Object.create(null);
   }
 
   if (!MODULAR_INSTANCES[_app.name]![key]) {

package/lib/internal/registry/nativeModule.ts

@@ -80,9 +80,9 @@ function createRoutingCompositeProxy(
   hosts: Array<{ module: Record<string, unknown> | undefined; argToPrepend: unknown[] }>,
   isTurboModule: boolean,
 ): WrappedNativeModule {
-  const routingMap: Record<string, RouteEntry> = {};
-  const memoizedMethods: Record<string, (...args: unknown[]) => unknown> = {};
-  const memoizedConstants: Record<string, unknown> = {};
+  const routingMap: Record<string, RouteEntry> = Object.create(null);
+  const memoizedMethods: Record<string, (...args: unknown[]) => unknown> = Object.create(null);
+  const memoizedConstants: Record<string, unknown> = Object.create(null);
 
   for (const { module, argToPrepend } of hosts) {
     if (!module) {

package/lib/internal/web/RNFBAppModule.ts

@@ -48,22 +48,22 @@ interface InitializeAppResult {
 let jsReady = false;
 let jsListenerCount = 0;
 let queuedEvents: QueuedEvent[] = [];
-let jsListeners: EventListeners = {};
+let jsListeners: EventListeners = Object.create(null);
 
 // For compatibility we have a fake preferences storage,
 // it does not persist across app restarts.
-let fakePreferencesStorage: PreferencesStorage = {};
+let fakePreferencesStorage: PreferencesStorage = Object.create(null);
 
 function eventsGetListenersMap(): ListenersMap {
   return {
     listeners: jsListenerCount,
     queued: queuedEvents.length,
-    events: jsListeners,
+    events: Object.assign(Object.create(null), jsListeners),
   };
 }
 
 function eventsSendEvent(eventName: string, eventBody: any): void {
-  if (!jsReady || !jsListeners.hasOwnProperty(eventName)) {
+  if (!jsReady || !Object.prototype.hasOwnProperty.call(jsListeners, eventName)) {
     const event: QueuedEvent = {
       eventName,
       eventBody,
@@ -174,7 +174,7 @@ export default {
    *
    * @returns The meta data
    */
-  metaGetAll(): Record<string, never> {
+  async metaGetAll(): Promise<Record<string, never>> {
     return {};
   },
 
@@ -184,7 +184,7 @@ export default {
    *
    * @returns The JSON data for the firebase.json file.
    */
-  jsonGetAll(): Record<string, never> {
+  async jsonGetAll(): Promise<Record<string, never>> {
     return {};
   },
 
@@ -206,7 +206,7 @@ export default {
    * @param key - The key of the preference.
    * @param value - The value to set.
    */
-  preferencesSetString(key: string, value: string): void {
+  async preferencesSetString(key: string, value: string): Promise<void> {
     fakePreferencesStorage[key] = value;
   },
 
@@ -216,16 +216,16 @@ export default {
    *
    * @returns The preferences.
    */
-  preferencesGetAll(): PreferencesStorage {
-    return Object.assign({}, fakePreferencesStorage);
+  async preferencesGetAll(): Promise<PreferencesStorage> {
+    return Object.assign(Object.create(null), fakePreferencesStorage);
   },
 
   /**
    * Clears all preferences.
    * Unsupported on web.
    */
-  preferencesClearAll(): void {
-    fakePreferencesStorage = {};
+  async preferencesClearAll(): Promise<void> {
+    fakePreferencesStorage = Object.create(null);
   },
 
   /**
@@ -269,7 +269,7 @@ export default {
    *
    * @returns The listeners for the event.
    */
-  eventsGetListeners(): ListenersMap {
+  async eventsGetListeners(): Promise<ListenersMap> {
     return eventsGetListenersMap();
   },
 
@@ -280,8 +280,9 @@ export default {
    * @param eventBody - The body of the event to send.
    * @returns void
    */
-  eventsPing(eventName: string, eventBody: any): void {
+  async eventsPing(eventName: string, eventBody: any): Promise<any> {
     eventsSendEvent(eventName, eventBody);
+    return eventBody;
   },
 
   /**
@@ -291,7 +292,7 @@ export default {
    */
   eventsAddListener(eventName: string): void {
     jsListenerCount++;
-    if (!jsListeners.hasOwnProperty(eventName)) {
+    if (!Object.prototype.hasOwnProperty.call(jsListeners, eventName)) {
       jsListeners[eventName] = 1;
     } else {
       if (jsListeners[eventName] !== undefined) {
@@ -312,7 +313,7 @@ export default {
    * @param all - Optional. Whether to remove all listeners for the event.
    */
   eventsRemoveListener(eventName: string, all?: boolean): void {
-    if (jsListeners.hasOwnProperty(eventName)) {
+    if (Object.prototype.hasOwnProperty.call(jsListeners, eventName)) {
       const count = jsListeners[eventName];
       if (count !== undefined) {
         if (count <= 1 || all) {

package/lib/internal/web/memidb/lib/FakeEventTarget.js

@@ -66,7 +66,9 @@ class FakeEventTarget {
         listener.type === type && listener.callback === callback && listener.capture === capture
       );
     });
-    this.listeners.splice(i, 1);
+    if (i >= 0) {
+      this.listeners.splice(i, 1);
+    }
   }
 
   // http://www.w3.org/TR/dom/#dispatching-events

package/lib/version.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/app",
-  "version": "26.3.3",
+  "version": "26.4.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "A well tested, feature rich Firebase implementation for React Native, supporting iOS & Android. Individual module support for Admob, Analytics, Auth, Crash Reporting, Cloud Firestore, Database, Dynamic Links, Functions, Messaging (FCM), Remote Config, Storage and more.",
   "main": "./dist/module/index.js",
@@ -32,6 +32,7 @@
     "compile": "bob build",
     "prepare": "npm run build && npm run build:plugin && npm run compile"
   },
+  "homepage": "https://rnfirebase.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/invertase/react-native-firebase",
@@ -184,5 +185,5 @@
       }
     }
   },
-  "gitHead": "04b90008385bf69be74f3a333d0dfea43ba32e64"
+  "gitHead": "06701af5fdc19bae9f379567eadb29dfe81953c0"
 }

package/plugin/build/ios/appDelegate.js

@@ -10,6 +10,22 @@ exports.modifyAppDelegateAsync = modifyAppDelegateAsync;
 const config_plugins_1 = require("@expo/config-plugins");
 const generateCode_1 = require("@expo/config-plugins/build/utils/generateCode");
 const fs_1 = __importDefault(require("fs"));
+function addImport(contents, importLine, existingImportMatcher, preferredAnchorMatcher, anyImportMatcher) {
+    if (existingImportMatcher.test(contents)) {
+        return contents;
+    }
+    const newline = contents.includes('\r\n') ? '\r\n' : '\n';
+    const preferredAnchor = preferredAnchorMatcher.exec(contents);
+    if (preferredAnchor?.index !== undefined) {
+        const insertionPoint = preferredAnchor.index + preferredAnchor[0].length;
+        return `${contents.slice(0, insertionPoint)}${newline}${importLine}${contents.slice(insertionPoint)}`;
+    }
+    const firstImport = anyImportMatcher.exec(contents);
+    if (firstImport?.index !== undefined) {
+        return `${contents.slice(0, firstImport.index)}${importLine}${newline}${contents.slice(firstImport.index)}`;
+    }
+    return `${importLine}${newline}${contents}`;
+}
 function modifyObjcAppDelegate(contents) {
     const methodInvocationBlock = `[FIRApp configure];`;
     // https://regex101.com/r/mPgaq6/1
@@ -18,10 +34,7 @@ function modifyObjcAppDelegate(contents) {
     // if the above regex fails, we can use this one as a fallback:
     const fallbackInvocationLineMatcher = /-\s*\(BOOL\)\s*application:\s*\(UIApplication\s*\*\s*\)\s*\w+\s+didFinishLaunchingWithOptions:/g;
     // Add import
-    if (!contents.includes('#import <Firebase/Firebase.h>')) {
-        contents = contents.replace(/#import "AppDelegate.h"/g, `#import "AppDelegate.h"
-#import <Firebase/Firebase.h>`);
-    }
+    contents = addImport(contents, '#import <Firebase/Firebase.h>', /^[ \t]*#import\s+<Firebase\/Firebase\.h>[ \t]*$/m, /^[ \t]*#import\s+"AppDelegate\.h"[ \t]*$/m, /^[ \t]*#import\b[^\r\n]*$/m);
     // To avoid potential issues with existing changes from older plugin versions
     if (contents.includes(methodInvocationBlock)) {
         return contents;
@@ -63,10 +76,7 @@ function modifySwiftAppDelegate(contents) {
     const methodInvocationBlock = `FirebaseApp.configure()`;
     const methodInvocationLineMatcher = /(?:self\.moduleName\s*=\s*"([^"]*)")|(?:factory\.startReactNative\()/;
     // Add import
-    if (!contents.includes('import FirebaseCore')) {
-        contents = contents.replace(/import Expo/g, `import Expo
-import FirebaseCore`);
-    }
+    contents = addImport(contents, 'import FirebaseCore', /^[ \t]*import\s+FirebaseCore[ \t]*$/m, /^[ \t]*import\s+Expo[ \t]*$/m, /^[ \t]*import\b[^\r\n]*$/m);
     // To avoid potential issues with existing changes from older plugin versions
     if (contents.includes(methodInvocationBlock)) {
         return contents;

package/plugin/src/ios/appDelegate.ts

@@ -3,6 +3,36 @@ import { AppDelegateProjectFile } from '@expo/config-plugins/build/ios/Paths';
 import { mergeContents } from '@expo/config-plugins/build/utils/generateCode';
 import fs from 'fs';
 
+function addImport(
+  contents: string,
+  importLine: string,
+  existingImportMatcher: RegExp,
+  preferredAnchorMatcher: RegExp,
+  anyImportMatcher: RegExp,
+): string {
+  if (existingImportMatcher.test(contents)) {
+    return contents;
+  }
+
+  const newline = contents.includes('\r\n') ? '\r\n' : '\n';
+  const preferredAnchor = preferredAnchorMatcher.exec(contents);
+  if (preferredAnchor?.index !== undefined) {
+    const insertionPoint = preferredAnchor.index + preferredAnchor[0].length;
+    return `${contents.slice(0, insertionPoint)}${newline}${importLine}${contents.slice(
+      insertionPoint,
+    )}`;
+  }
+
+  const firstImport = anyImportMatcher.exec(contents);
+  if (firstImport?.index !== undefined) {
+    return `${contents.slice(0, firstImport.index)}${importLine}${newline}${contents.slice(
+      firstImport.index,
+    )}`;
+  }
+
+  return `${importLine}${newline}${contents}`;
+}
+
 export function modifyObjcAppDelegate(contents: string): string {
   const methodInvocationBlock = `[FIRApp configure];`;
   // https://regex101.com/r/mPgaq6/1
@@ -15,13 +45,13 @@ export function modifyObjcAppDelegate(contents: string): string {
     /-\s*\(BOOL\)\s*application:\s*\(UIApplication\s*\*\s*\)\s*\w+\s+didFinishLaunchingWithOptions:/g;
 
   // Add import
-  if (!contents.includes('#import <Firebase/Firebase.h>')) {
-    contents = contents.replace(
-      /#import "AppDelegate.h"/g,
-      `#import "AppDelegate.h"
-#import <Firebase/Firebase.h>`,
-    );
-  }
+  contents = addImport(
+    contents,
+    '#import <Firebase/Firebase.h>',
+    /^[ \t]*#import\s+<Firebase\/Firebase\.h>[ \t]*$/m,
+    /^[ \t]*#import\s+"AppDelegate\.h"[ \t]*$/m,
+    /^[ \t]*#import\b[^\r\n]*$/m,
+  );
 
   // To avoid potential issues with existing changes from older plugin versions
   if (contents.includes(methodInvocationBlock)) {
@@ -74,13 +104,13 @@ export function modifySwiftAppDelegate(contents: string): string {
     /(?:self\.moduleName\s*=\s*"([^"]*)")|(?:factory\.startReactNative\()/;
 
   // Add import
-  if (!contents.includes('import FirebaseCore')) {
-    contents = contents.replace(
-      /import Expo/g,
-      `import Expo
-import FirebaseCore`,
-    );
-  }
+  contents = addImport(
+    contents,
+    'import FirebaseCore',
+    /^[ \t]*import\s+FirebaseCore[ \t]*$/m,
+    /^[ \t]*import\s+Expo[ \t]*$/m,
+    /^[ \t]*import\b[^\r\n]*$/m,
+  );
 
   // To avoid potential issues with existing changes from older plugin versions
   if (contents.includes(methodInvocationBlock)) {