Separate window/sw API checks

Author: zwu52

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

@@ -15,20 +15,10 @@
  * limitations under the License.
  */
 
-export function isSupported(): boolean {
-  if (self && 'ServiceWorkerGlobalScope' in self) {
-    // Running in ServiceWorker context
-    return isSWControllerSupported();
-  } else {
-    // Assume we are in the window context.
-    return isWindowControllerSupported();
-  }
-}
-
 /**
  * Checks to see if the required APIs exist.
  */
-function isWindowControllerSupported(): boolean {
+export function isWindowSupported(): boolean {
   return (
     'indexedDB' in window &&
     indexedDB !== null &&
@@ -45,7 +35,7 @@ function isWindowControllerSupported(): boolean {
 /**
  * Checks to see if the required APIs exist within SW Context.
  */
-function isSWControllerSupported(): boolean {
+export function isSwSupported(): boolean {
   return (
     'indexedDB' in self &&
     indexedDB !== null &&

packages-exp/messaging-exp/src/helpers/register.ts renamed to packages-exp/messaging-exp/src/helpers/registerMessaging.ts

@@ -21,19 +21,13 @@ import {
   ComponentType,
   InstanceFactory
 } from '@firebase/component';
-import { ERROR_FACTORY, ErrorCode } from '../util/errors';
 
 import { MessagingService } from '../messaging-service';
 import { _registerComponent } from '@firebase/app-exp';
-import { isSupported } from './isSupported';
 
 const messagingFactory: InstanceFactory<'messaging-exp'> = (
   container: ComponentContainer
 ) => {
-  if (!isSupported()) {
-    throw ERROR_FACTORY.create(ErrorCode.UNSUPPORTED_BROWSER);
-  }
-
   return new MessagingService(
     container.getProvider('app-exp').getImmediate(),
     container.getProvider('installations-exp-internal').getImmediate(),

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

@@ -15,10 +15,14 @@
  * limitations under the License.
  */
 
-import { FirebaseMessaging } from '@firebase/messaging-types-exp';
-import { registerMessaging } from './helpers/register';
 import '@firebase/installations-exp';
 
+import { ERROR_FACTORY, ErrorCode } from './util/errors';
+
+import { FirebaseMessaging } from '@firebase/messaging-types-exp';
+import { isSwSupported } from './helpers/isSupported';
+import { registerMessaging } from './helpers/registerMessaging';
+
 export { onBackgroundMessage, getMessaging } from './api';
 
 declare module '@firebase/component' {
@@ -27,4 +31,8 @@ declare module '@firebase/component' {
   }
 }
 
+if (!isSwSupported()) {
+  throw ERROR_FACTORY.create(ErrorCode.UNSUPPORTED_BROWSER);
+}
+
 registerMessaging();

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

@@ -15,10 +15,14 @@
  * limitations under the License.
  */
 
-import { FirebaseMessaging } from '@firebase/messaging-types-exp';
-import { registerMessaging } from './helpers/register';
 import '@firebase/installations-exp';
 
+import { ERROR_FACTORY, ErrorCode } from './util/errors';
+
+import { FirebaseMessaging } from '@firebase/messaging-types-exp';
+import { isWindowSupported } from './helpers/isSupported';
+import { registerMessaging } from './helpers/registerMessaging';
+
 export {
   getToken,
   deleteToken,
@@ -34,4 +38,8 @@ declare module '@firebase/component' {
   }
 }
 
+if (!isWindowSupported()) {
+  throw ERROR_FACTORY.create(ErrorCode.UNSUPPORTED_BROWSER);
+}
+
 registerMessaging();