breakup main helpers and remove unused functions

fadi-george · fadi-george · commit 8f8cfbd2c6f9 · 2025-10-17T10:07:20.000-07:00
diff --git a/__test__/unit/pushSubscription/nativePermissionChange.test.ts b/__test__/unit/pushSubscription/nativePermissionChange.test.ts
@@ -11,10 +11,10 @@ import { MockServiceWorker } from '__test__/support/mocks/MockServiceWorker';
 import { clearStore, db, getOptionsValue } from 'src/shared/database/client';
 import { setAppState as setDBAppState } from 'src/shared/database/config';
 import type { AppState } from 'src/shared/database/types';
+import { checkAndTriggerNotificationPermissionChanged } from 'src/shared/helpers/main';
 import * as PermissionUtils from 'src/shared/helpers/permissions';
 import Emitter from 'src/shared/libraries/Emitter';
 import { checkAndTriggerSubscriptionChanged } from 'src/shared/listeners';
-import MainHelper from '../../../src/shared/helpers/MainHelper';
 
 vi.mock('src/shared/libraries/Log');
 const triggerNotificationSpy = vi.spyOn(
@@ -50,7 +50,7 @@ describe('Notification Types are set correctly on subscription change', () => {
       });
       await setDbPermission('granted');
 
-      await MainHelper._checkAndTriggerNotificationPermissionChanged();
+      await checkAndTriggerNotificationPermissionChanged();
       expect(triggerNotificationSpy).not.toHaveBeenCalled();
     });
 
@@ -74,7 +74,7 @@ describe('Notification Types are set correctly on subscription change', () => {
         permChangeStringListener,
       );
 
-      await MainHelper._checkAndTriggerNotificationPermissionChanged();
+      await checkAndTriggerNotificationPermissionChanged();
 
       // should update the db
       const dbPermission = await getOptionsValue<NotificationPermission>(
diff --git a/package.json b/package.json
@@ -84,7 +84,7 @@
     },
     {
       "path": "./build/releases/OneSignalSDK.page.es6.js",
-      "limit": "47.08 kB",
+      "limit": "46.601 kB",
       "gzip": true
     },
     {
diff --git a/src/core/CoreModuleDirector.ts b/src/core/CoreModuleDirector.ts
@@ -8,7 +8,7 @@ import {
 } from 'src/shared/subscriptions/constants';
 import type { SubscriptionChannelValue } from 'src/shared/subscriptions/types';
 import { logMethodCall } from 'src/shared/utils/utils';
-import MainHelper from '../shared/helpers/MainHelper';
+import { getCurrentPushToken } from '../shared/helpers/main';
 import { RawPushSubscription } from '../shared/models/RawPushSubscription';
 import CoreModule from './CoreModule';
 import { IdentityModel } from './models/IdentityModel';
@@ -115,7 +115,7 @@ export class CoreModuleDirector {
     SubscriptionModel | undefined
   > {
     logMethodCall('CoreModuleDirector.getPushSubscriptionModelByCurrentToken');
-    const pushToken = await MainHelper._getCurrentPushToken();
+    const pushToken = await getCurrentPushToken();
     if (pushToken) {
       return this._getSubscriptionOfTypeWithToken(
         SubscriptionChannel.Push,
diff --git a/src/core/controllers/CustomEventController.ts b/src/core/controllers/CustomEventController.ts
@@ -1,4 +1,4 @@
-import MainHelper from '../../shared/helpers/MainHelper';
+import { getAppId } from '../../shared/helpers/main';
 import { IdentityModelStore } from '../modelStores/IdentityModelStore';
 import { TrackCustomEventOperation } from '../operations/TrackCustomEventOperation';
 import type {
@@ -22,7 +22,7 @@ export class CustomEventController implements ICustomEventController {
   }
 
   _sendCustomEvent(event: ICustomEvent): void {
-    const appId = MainHelper._getAppId();
+    const appId = getAppId();
     const identityModel = this._identityModelStore.model;
 
     const op = new TrackCustomEventOperation({
diff --git a/src/core/listeners/IdentityModelStoreListener.ts b/src/core/listeners/IdentityModelStoreListener.ts
@@ -1,4 +1,4 @@
-import MainHelper from 'src/shared/helpers/MainHelper';
+import { getAppId } from 'src/shared/helpers/main';
 import { type IdentityModel } from '../models/IdentityModel';
 import { type IdentityModelStore } from '../modelStores/IdentityModelStore';
 import { DeleteAliasOperation } from '../operations/DeleteAliasOperation';
@@ -26,7 +26,7 @@ export class IdentityModelStoreListener extends SingletonModelStoreListener<Iden
     _oldValue: unknown,
     newValue: unknown,
   ): Operation {
-    const appId = MainHelper._getAppId();
+    const appId = getAppId();
     if (newValue != null && typeof newValue === 'string') {
       return new SetAliasOperation(
         appId,
diff --git a/src/core/listeners/PropertiesModelStoreListener.ts b/src/core/listeners/PropertiesModelStoreListener.ts
@@ -1,4 +1,4 @@
-import MainHelper from 'src/shared/helpers/MainHelper';
+import { getAppId } from 'src/shared/helpers/main';
 import { PropertiesModel } from '../models/PropertiesModel';
 import { type PropertiesModelStore } from '../modelStores/PropertiesModelStore';
 import { type Operation } from '../operations/Operation';
@@ -28,7 +28,7 @@ export class PropertiesModelStoreListener extends SingletonModelStoreListener<Pr
     _oldValue: unknown,
     newValue: unknown,
   ): Operation | null {
-    const appId = MainHelper._getAppId();
+    const appId = getAppId();
 
     return new SetPropertyOperation(
       appId,
diff --git a/src/core/listeners/SubscriptionModelStoreListener.ts b/src/core/listeners/SubscriptionModelStoreListener.ts
@@ -1,4 +1,4 @@
-import MainHelper from 'src/shared/helpers/MainHelper';
+import { getAppId } from 'src/shared/helpers/main';
 import { NotificationType } from 'src/shared/subscriptions/constants';
 import type { NotificationTypeValue } from 'src/shared/subscriptions/types';
 import { SubscriptionModel } from '../models/SubscriptionModel';
@@ -29,7 +29,7 @@ export class SubscriptionModelStoreListener extends ModelStoreListener<Subscript
     const { enabled, notification_types } =
       SubscriptionModelStoreListener._getSubscriptionEnabledAndStatus(model);
 
-    const appId = MainHelper._getAppId();
+    const appId = getAppId();
     return new CreateSubscriptionOperation({
       appId,
       onesignalId: this._identityModelStore.model._onesignalId,
@@ -42,7 +42,7 @@ export class SubscriptionModelStoreListener extends ModelStoreListener<Subscript
   }
 
   _getRemoveOperation(model: SubscriptionModel): Operation {
-    const appId = MainHelper._getAppId();
+    const appId = getAppId();
     return new DeleteSubscriptionOperation(
       appId,
       this._identityModelStore.model._onesignalId,
@@ -53,7 +53,7 @@ export class SubscriptionModelStoreListener extends ModelStoreListener<Subscript
   _getUpdateOperation(model: SubscriptionModel): Operation {
     const { enabled, notification_types } =
       SubscriptionModelStoreListener._getSubscriptionEnabledAndStatus(model);
-    const appId = MainHelper._getAppId();
+    const appId = getAppId();
 
     return new UpdateSubscriptionOperation({
       appId,
diff --git a/src/onesignal/OneSignal.test.ts b/src/onesignal/OneSignal.test.ts
@@ -49,7 +49,7 @@ import { db } from 'src/shared/database/client';
 import { setPushToken } from 'src/shared/database/subscription';
 import type { SubscriptionSchema } from 'src/shared/database/types';
 import { registerForPushNotifications } from 'src/shared/helpers/init';
-import MainHelper from 'src/shared/helpers/MainHelper';
+import * as MainHelper from 'src/shared/helpers/main';
 import Log from 'src/shared/libraries/Log';
 import { IDManager } from 'src/shared/managers/IDManager';
 import { SubscriptionManagerPage } from 'src/shared/managers/subscription/page';
@@ -1202,5 +1202,5 @@ const subscribeFcmFromPageSpy = vi.spyOn(
   '_subscribeFcmFromPage',
 );
 
-const showLocalNotificationSpy = vi.spyOn(MainHelper, '_showLocalNotification');
+const showLocalNotificationSpy = vi.spyOn(MainHelper, 'showLocalNotification');
 showLocalNotificationSpy.mockImplementation(async () => {});
diff --git a/src/onesignal/OneSignal.ts b/src/onesignal/OneSignal.ts
@@ -25,6 +25,7 @@ import {
   removeLegacySubscriptionOptions,
   setConsentRequired as setStorageConsentRequired,
 } from 'src/shared/helpers/localStorage';
+import { checkAndTriggerNotificationPermissionChanged } from 'src/shared/helpers/main';
 import {
   _onSubscriptionChanged,
   checkAndTriggerSubscriptionChanged,
@@ -38,7 +39,6 @@ import { CoreModuleDirector } from '../core/CoreModuleDirector';
 import LoginManager from '../page/managers/LoginManager';
 import Context from '../page/models/Context';
 import type { OneSignalDeferredLoadedCallback } from '../page/models/OneSignalDeferredLoadedCallback';
-import MainHelper from '../shared/helpers/MainHelper';
 import Emitter from '../shared/libraries/Emitter';
 import Log from '../shared/libraries/Log';
 import DebugNamespace from './DebugNamesapce';
@@ -188,7 +188,7 @@ export default class OneSignal {
       window.addEventListener('focus', () => {
         // Checks if permission changed every time a user focuses on the page,
         //     since a user has to click out of and back on the page to check permissions
-        MainHelper._checkAndTriggerNotificationPermissionChanged();
+        checkAndTriggerNotificationPermissionChanged();
       });
 
       await initSaveState();
diff --git a/src/onesignal/User.ts b/src/onesignal/User.ts
@@ -9,7 +9,7 @@ import {
   ReservedArgumentError,
   WrongTypeArgumentError,
 } from 'src/shared/errors/common';
-import MainHelper from 'src/shared/helpers/MainHelper';
+import { getAppId } from 'src/shared/helpers/main';
 import { isObject, isValidEmail } from 'src/shared/helpers/validators';
 import Log from 'src/shared/libraries/Log';
 import { IDManager } from 'src/shared/managers/IDManager';
@@ -283,7 +283,7 @@ function addSubscriptionToModels({
 
   // Check if we need to enqueue a login operation for local IDs
   if (IDManager._isLocalId(onesignalId)) {
-    const appId = MainHelper._getAppId();
+    const appId = getAppId();
 
     if (!hasLoginOp(onesignalId)) {
       OneSignal._coreDirector._operationRepo._enqueue(
diff --git a/src/onesignal/UserDirector.ts b/src/onesignal/UserDirector.ts
@@ -4,12 +4,12 @@ import { CreateSubscriptionOperation } from 'src/core/operations/CreateSubscript
 import { LoginUserOperation } from 'src/core/operations/LoginUserOperation';
 import Log from 'src/shared/libraries/Log';
 import { IDManager } from 'src/shared/managers/IDManager';
-import MainHelper from '../shared/helpers/MainHelper';
+import { getAppId } from '../shared/helpers/main';
 
 export default class UserDirector {
   static async _createUserOnServer(): Promise<void> {
     const identityModel = OneSignal._coreDirector._getIdentityModel();
-    const appId = MainHelper._getAppId();
+    const appId = getAppId();
 
     const hasAnySubscription =
       OneSignal._coreDirector._subscriptionModelStore.list().length > 0;
diff --git a/src/page/bell/Bell.ts b/src/page/bell/Bell.ts
@@ -13,7 +13,7 @@ import type {
   BellText,
 } from 'src/shared/prompts/types';
 import { wasPromptOfTypeDismissed } from '../../shared/helpers/DismissHelper';
-import MainHelper from '../../shared/helpers/MainHelper';
+import { getNotificationIcons } from '../../shared/helpers/main';
 import Log from '../../shared/libraries/Log';
 import OneSignalEvent from '../../shared/services/OneSignalEvent';
 import { once } from '../../shared/utils/utils';
@@ -325,7 +325,7 @@ export default class Bell {
             this._badge._hide();
           }
           if (this._dialog._notificationIcons === null) {
-            const icons = await MainHelper._getNotificationIcons();
+            const icons = await getNotificationIcons();
             this._dialog._notificationIcons = icons;
           }
         }
@@ -501,7 +501,7 @@ export default class Bell {
     await (isPushEnabled ? this._launcher._inactivate() : nothing())
       .then(() => {
         if (isPushEnabled && this._dialog._notificationIcons === null) {
-          return MainHelper._getNotificationIcons().then((icons) => {
+          return getNotificationIcons().then((icons) => {
             this._dialog._notificationIcons = icons;
           });
         } else return nothing();
diff --git a/src/page/managers/LoginManager.ts b/src/page/managers/LoginManager.ts
@@ -3,7 +3,7 @@ import { LoginUserOperation } from 'src/core/operations/LoginUserOperation';
 import { TransferSubscriptionOperation } from 'src/core/operations/TransferSubscriptionOperation';
 import { ModelChangeTags } from 'src/core/types/models';
 import { db } from 'src/shared/database/client';
-import MainHelper from 'src/shared/helpers/MainHelper';
+import { getAppId } from 'src/shared/helpers/main';
 import { IDManager } from 'src/shared/managers/IDManager';
 import UserDirector from '../../onesignal/UserDirector';
 import Log from '../../shared/libraries/Log';
@@ -51,7 +51,7 @@ export default class LoginManager {
       ModelChangeTags.HYDRATE,
     );
     const newIdentityOneSignalId = identityModel._onesignalId;
-    const appId = MainHelper._getAppId();
+    const appId = getAppId();
 
     const promises: Promise<void>[] = [
       OneSignal._coreDirector._getPushSubscriptionModel().then((pushOp) => {
diff --git a/src/page/slidedown/Slidedown.ts b/src/page/slidedown/Slidedown.ts
@@ -8,7 +8,7 @@ import {
   removeDomElement,
 } from 'src/shared/helpers/dom';
 import { getValueOrDefault } from 'src/shared/helpers/general';
-import MainHelper from 'src/shared/helpers/MainHelper';
+import { getNotificationIcons } from 'src/shared/helpers/main';
 import type { NotificationIcons } from 'src/shared/notifications/types';
 import {
   DelayedPromptType,
@@ -94,7 +94,7 @@ export default class Slidedown {
   async _create(isInUpdateMode?: boolean): Promise<void> {
     // TODO: dynamically change btns depending on if its first or repeat display of slidedown (subscribe vs update)
     if (this._notificationIcons === null) {
-      const icons = await MainHelper._getNotificationIcons();
+      const icons = await getNotificationIcons();
 
       this._notificationIcons = icons;
 
diff --git a/src/shared/helpers/MainHelper.ts b/src/shared/helpers/MainHelper.ts
diff --git a/src/shared/helpers/init.ts b/src/shared/helpers/init.ts
diff --git a/src/shared/helpers/main.ts b/src/shared/helpers/main.ts
diff --git a/src/shared/listeners.ts b/src/shared/listeners.ts
diff --git a/src/shared/managers/sessionManager/SessionManager.ts b/src/shared/managers/sessionManager/SessionManager.ts

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@`
`84`	`84`	`},`
`85`	`85`	`{`
`86`	`86`	`"path": "./build/releases/OneSignalSDK.page.es6.js",`
`87`		`- "limit": "47.08 kB",`
	`87`	`+ "limit": "46.601 kB",`
`88`	`88`	`"gzip": true`
`89`	`89`	`},`
`90`	`90`	`{`