break up subscription helper

Author: fadi-george

package.json

@@ -84,7 +84,7 @@
     },
     {
       "path": "./build/releases/OneSignalSDK.page.es6.js",
-      "limit": "47.59 kB",
+      "limit": "47.565 kB",
       "gzip": true
     },
     {

src/core/CoreModuleDirector.ts

@@ -1,13 +1,13 @@
 import FuturePushSubscriptionRecord from 'src/page/userModel/FuturePushSubscriptionRecord';
 import { getPushToken } from 'src/shared/database/subscription';
+import { isPushSubscriptionType } from 'src/shared/helpers/subscription';
 import { IDManager } from 'src/shared/managers/IDManager';
 import {
   SubscriptionChannel,
   SubscriptionType,
 } from 'src/shared/subscriptions/constants';
 import type { SubscriptionChannelValue } from 'src/shared/subscriptions/types';
 import { logMethodCall } from 'src/shared/utils/utils';
-import SubscriptionHelper from '../../src/shared/helpers/SubscriptionHelper';
 import MainHelper from '../shared/helpers/MainHelper';
 import { RawPushSubscription } from '../shared/models/RawPushSubscription';
 import CoreModule from './CoreModule';
@@ -108,9 +108,7 @@ export class CoreModuleDirector {
   public _getAllPushSubscriptionModels(): SubscriptionModel[] {
     logMethodCall('CoreModuleDirector.getAllPushSubscriptionModels');
     const subscriptions = this._core._subscriptionModelStore.list();
-    return subscriptions.filter((s) =>
-      SubscriptionHelper.isPushSubscriptionType(s.type),
-    );
+    return subscriptions.filter((s) => isPushSubscriptionType(s.type));
   }
 
   async _getPushSubscriptionModelByCurrentToken(): Promise<

src/core/executors/RefreshUserOperationExecutor.ts

@@ -2,7 +2,7 @@ import {
   getResponseStatusType,
   ResponseStatusType,
 } from 'src/shared/helpers/NetworkUtils';
-import SubscriptionHelper from 'src/shared/helpers/SubscriptionHelper';
+import { isPushSubscriptionType } from 'src/shared/helpers/subscription';
 import Log from 'src/shared/libraries/Log';
 import { NotificationType } from 'src/shared/subscriptions/constants';
 import { IdentityConstants, OPERATION_NAME } from '../constants';
@@ -114,7 +114,7 @@ export class RefreshUserOperationExecutor implements IOperationExecutor {
 
         // We only add a non-push subscriptions. For push, the device is the source of truth
         // so we don't want to cache these subscriptions from the backend.
-        if (!SubscriptionHelper.isPushSubscriptionType(model.type)) {
+        if (!isPushSubscriptionType(model.type)) {
           subscriptionModels.push(model);
         }
       }

src/core/modelStores/SubscriptionModelStore.ts

@@ -4,7 +4,7 @@ import {
   type ModelChangeTagValue,
 } from 'src/core/types/models';
 import type { IDBStoreName } from 'src/shared/database/types';
-import SubscriptionHelper from 'src/shared/helpers/SubscriptionHelper';
+import { isPushSubscriptionType } from 'src/shared/helpers/subscription';
 import { SubscriptionModel } from '../models/SubscriptionModel';
 
 // Implements logic similar to Android SDK's SubscriptionModelStore
@@ -31,7 +31,7 @@ export class SubscriptionModelStore extends SimpleModelStore<SubscriptionModel>
 
     // When hydrating, preserve properties from existing PUSH subscription
     for (const model of models) {
-      if (SubscriptionHelper.isPushSubscriptionType(model.type)) {
+      if (isPushSubscriptionType(model.type)) {
         const existingPushModel = this.get(model._modelId);
         if (existingPushModel) {
           model.sdk = existingPushModel.sdk;

src/shared/helpers/SubscriptionHelper.ts

@@ -14,7 +14,7 @@ import { once } from '../utils/utils';
 import MainHelper from './MainHelper';
 import { incrementPageViewCount } from './pageview';
 import { triggerNotificationPermissionChanged } from './permissions';
-import SubscriptionHelper from './SubscriptionHelper';
+import { registerForPush } from './subscription';
 
 export async function internalInit() {
   Log._debug('Called internalInit()');
@@ -96,7 +96,7 @@ async function sessionInit(): Promise<void> {
 }
 
 export async function registerForPushNotifications(): Promise<boolean> {
-  return !!(await SubscriptionHelper.registerForPush());
+  return !!(await registerForPush());
 }
 
 /**
@@ -383,7 +383,7 @@ async function handleAutoResubscribe(isOptedOut: boolean) {
         OneSignal._context._appConfig.safariWebId,
       );
     if (currentPermission == 'granted') {
-      await SubscriptionHelper.registerForPush();
+      await registerForPush();
     }
   }
 }

src/shared/helpers/init.ts

@@ -0,0 +1,46 @@
+import { SubscriptionType } from 'src/shared/subscriptions/constants';
+import type { SubscriptionTypeValue } from 'src/shared/subscriptions/types';
+import Log from '../libraries/Log';
+import { checkAndTriggerSubscriptionChanged } from '../listeners';
+import { Subscription } from '../models/Subscription';
+import { SubscriptionStrategyKind } from '../models/SubscriptionStrategyKind';
+import { IS_SERVICE_WORKER } from '../utils/EnvVariables';
+import { incrementPageViewCount } from './pageview';
+import { triggerNotificationPermissionChanged } from './permissions';
+
+export async function registerForPush(): Promise<Subscription | null> {
+  const context = OneSignal._context;
+  let subscription: Subscription | null = null;
+
+  if (IS_SERVICE_WORKER) throw new Error('Unsupported environment');
+  try {
+    const rawSubscription = await context._subscriptionManager._subscribe(
+      SubscriptionStrategyKind.ResubscribeExisting,
+    );
+    subscription =
+      await context._subscriptionManager._registerSubscription(rawSubscription);
+
+    incrementPageViewCount();
+
+    await triggerNotificationPermissionChanged();
+    await checkAndTriggerSubscriptionChanged();
+  } catch (e) {
+    Log._error(e);
+  }
+  return subscription;
+}
+
+/**
+ * Helper that checks if a given SubscriptionType is a push subscription.
+ */
+export function isPushSubscriptionType(type: SubscriptionTypeValue): boolean {
+  switch (type) {
+    case SubscriptionType.ChromePush:
+    case SubscriptionType.SafariPush:
+    case SubscriptionType.SafariLegacyPush:
+    case SubscriptionType.FirefoxPush:
+      return true;
+    default:
+      return false;
+  }
+}