Implement interop API for Analytics, Perf, RC and FCM

packages-exp/analytics-exp/src/api.ts

@@ -30,7 +30,8 @@ import {
   isIndexedDBAvailable,
   validateIndexedDBOpenable,
   areCookiesEnabled,
-  isBrowserExtension
+  isBrowserExtension,
+  getModularInstance
 } from '@firebase/util';
 import { ANALYTICS_TYPE } from './constants';
 import {
@@ -63,6 +64,7 @@ declare module '@firebase/component' {
  * @param app - The FirebaseApp to use.
  */
 export function getAnalytics(app: FirebaseApp): Analytics {
+  app = getModularInstance(app);
   // Dependencies
   const analyticsProvider: Provider<'analytics-exp'> = _getProvider(
     app,
@@ -115,6 +117,7 @@ export function setCurrentScreen(
   screenName: string,
   options?: AnalyticsCallOptions
 ): void {
+  analyticsInstance = getModularInstance(analyticsInstance);
   internalSetCurrentScreen(
     wrappedGtagFunction,
     initializationPromisesMap[analyticsInstance.app.options.appId!],
@@ -136,6 +139,7 @@ export function setUserId(
   id: string,
   options?: AnalyticsCallOptions
 ): void {
+  analyticsInstance = getModularInstance(analyticsInstance);
   internalSetUserId(
     wrappedGtagFunction,
     initializationPromisesMap[analyticsInstance.app.options.appId!],
@@ -154,6 +158,7 @@ export function setUserProperties(
   properties: CustomParams,
   options?: AnalyticsCallOptions
 ): void {
+  analyticsInstance = getModularInstance(analyticsInstance);
   internalSetUserProperties(
     wrappedGtagFunction,
     initializationPromisesMap[analyticsInstance.app.options.appId!],
@@ -175,6 +180,7 @@ export function setAnalyticsCollectionEnabled(
   analyticsInstance: Analytics,
   enabled: boolean
 ): void {
+  analyticsInstance = getModularInstance(analyticsInstance);
   internalSetAnalyticsCollectionEnabled(
     initializationPromisesMap[analyticsInstance.app.options.appId!],
     enabled
@@ -663,6 +669,7 @@ export function logEvent(
   eventParams?: EventParams,
   options?: AnalyticsCallOptions
 ): void {
+  analyticsInstance = getModularInstance(analyticsInstance);
   internalLogEvent(
     wrappedGtagFunction,
     initializationPromisesMap[analyticsInstance.app.options.appId!],

packages-exp/messaging-exp/src/api.ts

@@ -30,6 +30,7 @@ import { _getProvider, FirebaseApp } from '@firebase/app-exp';
 import { getToken as _getToken } from './api/getToken';
 import { onBackgroundMessage as _onBackgroundMessage } from './api/onBackgroundMessage';
 import { onMessage as _onMessage } from './api/onMessage';
+import { getModularInstance } from '@firebase/util';
 
 /**
  * Retrieves a firebase messaging instance.
@@ -39,6 +40,7 @@ import { onMessage as _onMessage } from './api/onMessage';
  * @public
  */
 export function getMessaging(app: FirebaseApp): FirebaseMessaging {
+  app = getModularInstance(app);
   const messagingProvider: Provider<'messaging-exp'> = _getProvider(
     app,
     'messaging-exp'
@@ -79,6 +81,7 @@ export async function getToken(
   messaging: FirebaseMessaging,
   options?: { vapidKey?: string; swReg?: ServiceWorkerRegistration }
 ): Promise<string> {
+  messaging = getModularInstance(messaging);
   return _getToken(messaging as MessagingService, options);
 }
 
@@ -93,6 +96,7 @@ export async function getToken(
  * @public
  */
 export function deleteToken(messaging: FirebaseMessaging): Promise<boolean> {
+  messaging = getModularInstance(messaging);
   return _deleteToken(messaging as MessagingService);
 }
 
@@ -113,6 +117,7 @@ export function onMessage(
   messaging: FirebaseMessaging,
   nextOrObserver: NextFn<MessagePayload> | Observer<MessagePayload>
 ): Unsubscribe {
+  messaging = getModularInstance(messaging);
   return _onMessage(messaging as MessagingService, nextOrObserver);
 }
 
@@ -133,5 +138,6 @@ export function onBackgroundMessage(
   messaging: FirebaseMessaging,
   nextOrObserver: NextFn<MessagePayload> | Observer<MessagePayload>
 ): Unsubscribe {
+  messaging = getModularInstance(messaging);
   return _onBackgroundMessage(messaging as MessagingService, nextOrObserver);
 }

packages-exp/performance-exp/src/index.ts

@@ -38,6 +38,7 @@ import {
 import { name, version } from '../package.json';
 import { Trace } from './resources/trace';
 import '@firebase/installations-exp';
+import { getModularInstance } from '@firebase/util';
 
 const DEFAULT_ENTRY_NAME = '[DEFAULT]';
 
@@ -47,6 +48,7 @@ const DEFAULT_ENTRY_NAME = '[DEFAULT]';
  * @public
  */
 export function getPerformance(app: FirebaseApp): FirebasePerformance {
+  app = getModularInstance(app);
   const provider = _getProvider(app, 'performance-exp');
   const perfInstance = provider.getImmediate() as PerformanceController;
   return perfInstance;
@@ -62,6 +64,7 @@ export function initializePerformance(
   app: FirebaseApp,
   settings?: PerformanceSettings
 ): FirebasePerformance {
+  app = getModularInstance(app);
   const provider = _getProvider(app, 'performance-exp');
 
   // throw if an instance was already created.
@@ -86,6 +89,7 @@ export function trace(
   performance: FirebasePerformance,
   name: string
 ): PerformanceTrace {
+  performance = getModularInstance(performance);
   return new Trace(performance as PerformanceController, name);
 }
 

packages-exp/remote-config-exp/src/api.ts

@@ -27,6 +27,7 @@ import { ErrorCode, hasErrorCode } from './errors';
 import { RemoteConfig as RemoteConfigImpl } from './remote_config';
 import { Value as ValueImpl } from './value';
 import { LogLevel as FirebaseLogLevel } from '@firebase/logger';
+import { getModularInstance } from '@firebase/util';
 
 /**
  *
@@ -36,6 +37,7 @@ import { LogLevel as FirebaseLogLevel } from '@firebase/logger';
  * @public
  */
 export function getRemoteConfig(app: FirebaseApp): RemoteConfig {
+  app = getModularInstance(app);
   const rcProvider = _getProvider(app, RC_COMPONENT_NAME);
   return rcProvider.getImmediate();
 }
@@ -49,7 +51,7 @@ export function getRemoteConfig(app: FirebaseApp): RemoteConfig {
  * @public
  */
 export async function activate(remoteConfig: RemoteConfig): Promise<boolean> {
-  const rc = remoteConfig as RemoteConfigImpl;
+  const rc = getModularInstance(remoteConfig) as RemoteConfigImpl;
   const [lastSuccessfulFetchResponse, activeConfigEtag] = await Promise.all([
     rc._storage.getLastSuccessfulFetchResponse(),
     rc._storage.getActiveConfigEtag()
@@ -79,7 +81,7 @@ export async function activate(remoteConfig: RemoteConfig): Promise<boolean> {
  * @public
  */
 export function ensureInitialized(remoteConfig: RemoteConfig): Promise<void> {
-  const rc = remoteConfig as RemoteConfigImpl;
+  const rc = getModularInstance(remoteConfig) as RemoteConfigImpl;
   if (!rc._initializePromise) {
     rc._initializePromise = rc._storageCache.loadFromStorage().then(() => {
       rc._isInitializationComplete = true;
@@ -94,7 +96,7 @@ export function ensureInitialized(remoteConfig: RemoteConfig): Promise<void> {
  * @public
  */
 export async function fetchConfig(remoteConfig: RemoteConfig): Promise<void> {
-  const rc = remoteConfig as RemoteConfigImpl;
+  const rc = getModularInstance(remoteConfig) as RemoteConfigImpl;
   // Aborts the request after the given timeout, causing the fetch call to
   // reject with an AbortError.
   //
@@ -138,7 +140,7 @@ export async function fetchConfig(remoteConfig: RemoteConfig): Promise<void> {
  * @public
  */
 export function getAll(remoteConfig: RemoteConfig): Record<string, Value> {
-  const rc = remoteConfig as RemoteConfigImpl;
+  const rc = getModularInstance(remoteConfig) as RemoteConfigImpl;
   return getAllKeys(
     rc._storageCache.getActiveConfig(),
     rc.defaultConfig
@@ -160,7 +162,7 @@ export function getAll(remoteConfig: RemoteConfig): Record<string, Value> {
  * @public
  */
 export function getBoolean(remoteConfig: RemoteConfig, key: string): boolean {
-  return getValue(remoteConfig, key).asBoolean();
+  return getValue(getModularInstance(remoteConfig), key).asBoolean();
 }
 
 /**
@@ -176,7 +178,7 @@ export function getBoolean(remoteConfig: RemoteConfig, key: string): boolean {
  * @public
  */
 export function getNumber(remoteConfig: RemoteConfig, key: string): number {
-  return getValue(remoteConfig, key).asNumber();
+  return getValue(getModularInstance(remoteConfig), key).asNumber();
 }
 
 /**
@@ -191,7 +193,7 @@ export function getNumber(remoteConfig: RemoteConfig, key: string): number {
  * @public
  */
 export function getString(remoteConfig: RemoteConfig, key: string): string {
-  return getValue(remoteConfig, key).asString();
+  return getValue(getModularInstance(remoteConfig), key).asString();
 }
 
 /**
@@ -205,7 +207,7 @@ export function getString(remoteConfig: RemoteConfig, key: string): string {
  * @public
  */
 export function getValue(remoteConfig: RemoteConfig, key: string): Value {
-  const rc = remoteConfig as RemoteConfigImpl;
+  const rc = getModularInstance(remoteConfig) as RemoteConfigImpl;
   if (!rc._isInitializationComplete) {
     rc._logger.debug(
       `A value was requested for key "${key}" before SDK initialization completed.` +
@@ -237,7 +239,7 @@ export function setLogLevel(
   remoteConfig: RemoteConfig,
   logLevel: RemoteConfigLogLevel
 ): void {
-  const rc = remoteConfig as RemoteConfigImpl;
+  const rc = getModularInstance(remoteConfig) as RemoteConfigImpl;
   switch (logLevel) {
     case 'debug':
       rc._logger.logLevel = FirebaseLogLevel.DEBUG;

packages-exp/remote-config-exp/src/api2.ts

@@ -17,6 +17,7 @@
 
 import { RemoteConfig } from './public_types';
 import { activate, fetchConfig } from './api';
+import { getModularInstance } from '@firebase/util';
 
 // This API is put in a separate file, so we can stub fetchConfig and activate in tests.
 // It's not possible to stub standalone functions from the same module.
@@ -34,6 +35,7 @@ import { activate, fetchConfig } from './api';
 export async function fetchAndActivate(
   remoteConfig: RemoteConfig
 ): Promise<boolean> {
+  remoteConfig = getModularInstance(remoteConfig);
   await fetchConfig(remoteConfig);
   return activate(remoteConfig);
 }