Separate window/sw context check

Deprecating #4446 in favor of this PR

Author: zwu52

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

@@ -23,6 +23,7 @@ import { MessagingService } from './messaging-service';
 import { Provider } from '@firebase/component';
 import { deleteToken as _deleteToken } from './api/deleteToken';
 import { getToken as _getToken } from './api/getToken';
+import { isSupported as _isSupported } from './api/isSupported';
 import { onBackgroundMessage as _onBackgroundMessage } from './api/onBackgroundMessage';
 import { onMessage as _onMessage } from './api/onMessage';
 import { getModularInstance } from '@firebase/util';
@@ -136,3 +137,10 @@ export function onBackgroundMessage(
   messaging = getModularInstance(messaging);
   return _onBackgroundMessage(messaging as MessagingService, nextOrObserver);
 }
+
+/**
+ * Checks if the current browser is supported.
+ */
+export async function isSupported(): Promise<boolean> {
+  return _isSupported();
+}

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

@@ -27,38 +27,50 @@ import { isSwSupported, isWindowSupported } from '../api/isSupported';
 import { MessagingService } from '../messaging-service';
 import { _registerComponent } from '@firebase/app-exp';
 
-const messagingFactory: InstanceFactory<'messaging-exp'> = (
+const WindowMessagingFactory: InstanceFactory<'messaging-exp'> = (
   container: ComponentContainer
 ) => {
+  // Top-level 'await' requires 'module' option set to 'esnext' or 'system', and 'target' option
+  // set to 'es2017' or higher. For compatibility, use async expression here.
+  void (async () => {
+    if (!(await isWindowSupported())) {
+      throw ERROR_FACTORY.create(ErrorCode.UNSUPPORTED_BROWSER);
+    }
+  })();
+
   return new MessagingService(
     container.getProvider('app-exp').getImmediate(),
     container.getProvider('installations-exp-internal').getImmediate(),
     container.getProvider('analytics-internal')
   );
 };
 
-export function registerWindowMessaging(): void {
+const SwMessagingFactory: InstanceFactory<'messaging-exp'> = (
+  container: ComponentContainer
+) => {
   // Top-level 'await' requires 'module' option set to 'esnext' or 'system', and 'target' option
   // set to 'es2017' or higher. For compatibility, use async expression here.
   void (async () => {
-    if (!(await isWindowSupported())) {
+    if (!(await isSwSupported())) {
       throw ERROR_FACTORY.create(ErrorCode.UNSUPPORTED_BROWSER);
     }
   })();
 
+  return new MessagingService(
+    container.getProvider('app-exp').getImmediate(),
+    container.getProvider('installations-exp-internal').getImmediate(),
+    container.getProvider('analytics-internal')
+  );
+};
+
+export function registerWindowMessaging(): void {
   _registerComponent(
-    new Component('messaging-exp', messagingFactory, ComponentType.PUBLIC)
+    new Component('messaging-exp', WindowMessagingFactory, ComponentType.PUBLIC)
   );
 }
 
 export function registerSwMessaging(): void {
-  void (async () => {
-    if (!(await isSwSupported())) {
-      throw ERROR_FACTORY.create(ErrorCode.UNSUPPORTED_BROWSER);
-    }
-  })();
-
   _registerComponent(
-    new Component('messaging-exp', messagingFactory, ComponentType.PUBLIC)
+    new Component('messaging-exp', SwMessagingFactory, ComponentType.PUBLIC)
   );
 }