Move listener registration into the factory

Author: zwu52

common/api-review/messaging-exp.api.md

@@ -67,9 +67,6 @@ export function onBackgroundMessage(messaging: FirebaseMessaging, nextOrObserver
 // @public
 export function onMessage(messaging: FirebaseMessaging, nextOrObserver: NextFn<MessagePayload> | Observer<MessagePayload>): Unsubscribe;
 
-// @internal
-export function _registerListeners(messaging: FirebaseMessaging): void;
-
 export { Unsubscribe }
 
 

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

@@ -23,20 +23,12 @@ import {
   Unsubscribe,
   getModularInstance
 } from '@firebase/util';
-import {
-  onNotificationClick,
-  onPush,
-  onSubChange
-} from './listeners/sw-listeners';
 
 import { MessagingService } from './messaging-service';
-import { Provider } from '@firebase/component';
-import { ServiceWorkerGlobalScope } from './util/sw-types';
 import { deleteToken as _deleteToken } from './api/deleteToken';
 import { getToken as _getToken } from './api/getToken';
 import { onBackgroundMessage as _onBackgroundMessage } from './api/onBackgroundMessage';
 import { onMessage as _onMessage } from './api/onMessage';
-import { messageEventListener } from './listeners/window-listener';
 
 /**
  * Retrieves a Firebase Cloud Messaging instance.
@@ -45,48 +37,8 @@ import { messageEventListener } from './listeners/window-listener';
  *
  * @public
  */
-export function getMessagingInWindow(
-  app: FirebaseApp = getApp()
-): FirebaseMessaging {
-  app = getModularInstance(app);
-  const messagingProvider: Provider<'messaging-exp'> = _getProvider(
-    app,
-    'messaging-exp'
-  );
-  const messaging = messagingProvider.getImmediate();
-
-  navigator.serviceWorker.addEventListener('message', e =>
-    messageEventListener(messaging as MessagingService, e)
-  );
-
-  return messaging;
-}
-
-/**
- * Retrieves a firebase messaging instance.
- *
- * @returns the firebase messaging instance associated with the provided firebase app.
- *
- */
-declare const self: ServiceWorkerGlobalScope;
-export function getMessagingInSw(app: FirebaseApp): FirebaseMessaging {
-  const messagingProvider: Provider<'messaging-exp'> = _getProvider(
-    app,
-    'messaging-exp'
-  );
-  const messaging = messagingProvider.getImmediate();
-
-  self.addEventListener('push', e => {
-    e.waitUntil(onPush(e, messaging as MessagingService));
-  });
-  self.addEventListener('pushsubscriptionchange', e => {
-    e.waitUntil(onSubChange(e, messaging as MessagingService));
-  });
-  self.addEventListener('notificationclick', e => {
-    e.waitUntil(onNotificationClick(e));
-  });
-
-  return messagingProvider.getImmediate();
+export function getMessaging(app: FirebaseApp = getApp()): FirebaseMessaging {
+  return _getProvider(getModularInstance(app), 'messaging-exp').getImmediate();
 }
 
 /**

packages-exp/messaging-exp/src/helpers/register.ts

@@ -52,11 +52,15 @@ const WindowMessagingFactory: InstanceFactory<'messaging-exp'> = (
       throw ERROR_FACTORY.create(ErrorCode.INDEXED_DB_UNSUPPORTED);
     });
 
-  return new MessagingService(
+  const messaging = new MessagingService(
     container.getProvider('app-exp').getImmediate(),
     container.getProvider('installations-exp-internal').getImmediate(),
     container.getProvider('analytics-internal')
   );
+
+  registerListeners(messaging);
+
+  return messaging;
 };
 
 const SwMessagingFactory: InstanceFactory<'messaging-exp'> = (
@@ -76,11 +80,15 @@ const SwMessagingFactory: InstanceFactory<'messaging-exp'> = (
       throw ERROR_FACTORY.create(ErrorCode.INDEXED_DB_UNSUPPORTED);
     });
 
-  return new MessagingService(
+  const messaging = new MessagingService(
     container.getProvider('app-exp').getImmediate(),
     container.getProvider('installations-exp-internal').getImmediate(),
     container.getProvider('analytics-internal')
   );
+
+  registerListeners(messaging);
+
+  return messaging;
 };
 
 export function registerMessagingInWindow(): void {
@@ -96,15 +104,7 @@ export function registerMessagingInSw(): void {
 }
 
 declare const self: ServiceWorkerGlobalScope;
-/**
- * Conditionally registers the listeners. Theses registrations are done in `getMessagingInSw` and
- * `getMessagingInWindow` for the v9 SDK. This method exists for `messaging-compat` because the
- * injected messaging instance to `messaging-compat` isn't created through the `getMessaging`
- * method. Thus the main package of v9 needs to export this method to support `messaging-compat`.
- *
- * @internal
- */
-export function _registerListeners(messaging: FirebaseMessaging): void {
+function registerListeners(messaging: FirebaseMessaging): void {
   if (!!navigator) {
     // in window
     navigator.serviceWorker.addEventListener('message', e =>

packages-exp/messaging-exp/src/index.sw.ts

@@ -20,7 +20,7 @@ import '@firebase/installations-exp';
 import { FirebaseMessaging } from './interfaces/public-types';
 import { registerMessagingInSw } from './helpers/register';
 
-export { onBackgroundMessage, getMessagingInSw as getMessaging } from './api';
+export { onBackgroundMessage, getMessaging } from './api';
 export { isSwSupported as isSupported } from './api/isSupported';
 
 declare module '@firebase/component' {

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

@@ -30,10 +30,9 @@ export {
   getToken,
   deleteToken,
   onMessage,
-  getMessagingInWindow as getMessaging,
+  getMessaging,
   onBackgroundMessage
 } from './api';
-export { _registerListeners } from './helpers/register';
 export { isWindowSupported as isSupported } from './api/isSupported';
 export * from './interfaces/public-types';