More Size Reduction via _ Prefix

__test__/support/helpers/setup.ts

@@ -137,7 +137,7 @@ export const setupSubscriptionModel = async (
  */
 export const setupLoadStylesheet = async () => {
   vi.spyOn(
-    OneSignal.context.dynamicResourceLoader,
+    OneSignal.context._dynamicResourceLoader,
     'loadSdkStylesheet',
   ).mockResolvedValue(ResourceLoadState.Loaded);
 };

__test__/unit/push/registerForPush.test.ts

@@ -31,7 +31,7 @@ describe('Register for push', () => {
     expect(spy).not.toHaveBeenCalled();
     OneSignalEvent.trigger(OneSignal.EVENTS.SDK_INITIALIZED);
     await promise;
-    expect(Log.error).toHaveBeenCalled();
+    expect(Log._error).toHaveBeenCalled();
     expect(OneSignal.initialized).toBe(true);
     expect(spy).toHaveBeenCalledTimes(1);
   });
@@ -42,7 +42,7 @@ describe('Register for push', () => {
     (global as any).OneSignal._initCalled = false;
 
     await InitHelper.registerForPushNotifications();
-    expect(Log.error).toHaveBeenCalled();
+    expect(Log._error).toHaveBeenCalled();
     expect(spy).toHaveBeenCalledTimes(1);
   });
 });

__test__/unit/pushSubscription/nativePermissionChange.test.ts

@@ -10,10 +10,10 @@ import { createPushSub } from '__test__/support/environment/TestEnvironmentHelpe
 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 * as PermissionUtils from 'src/shared/helpers/permissions';
 import Emitter from 'src/shared/libraries/Emitter';
 import { checkAndTriggerSubscriptionChanged } from 'src/shared/listeners';
-import { AppState } from 'src/shared/models/AppState';
 import MainHelper from '../../../src/shared/helpers/MainHelper';
 
 vi.mock('src/shared/libraries/Log');

package.json

@@ -84,12 +84,12 @@
     },
     {
       "path": "./build/releases/OneSignalSDK.page.es6.js",
-      "limit": "52.153 kB",
+      "limit": "51.8 kB",
       "gzip": true
     },
     {
       "path": "./build/releases/OneSignalSDK.sw.js",
-      "limit": "14.564 kB",
+      "limit": "13.96 kB",
       "gzip": true
     },
     {

src/core/CoreModuleDirector.ts

@@ -62,7 +62,7 @@ export class CoreModuleDirector {
     });
     const model = new SubscriptionModel();
     model.initializeFromJson(
-      new FuturePushSubscriptionRecord(rawPushSubscription).serialize(),
+      new FuturePushSubscriptionRecord(rawPushSubscription)._serialize(),
     );
     model.id = IDManager._createLocalId();
 

src/core/executors/CustomEventOperationExecutor.ts

@@ -34,7 +34,7 @@ export class CustomEventsOperationExecutor implements IOperationExecutor {
   }
 
   async execute(operations: Operation[]): Promise<ExecutionResponse> {
-    Log.debug(
+    Log._debug(
       `CustomEventsOperationExecutor(operations: ${JSON.stringify(
         operations,
       )})`,

src/core/executors/IdentityOperationExecutor.ts

@@ -40,7 +40,7 @@ export class IdentityOperationExecutor implements IOperationExecutor {
   }
 
   async execute(operations: Operation[]): Promise<ExecutionResponse> {
-    Log.debug(
+    Log._debug(
       `IdentityOperationExecutor(operations: ${JSON.stringify(operations)})`,
     );
 

src/core/executors/LoginUserOperationExecutor.ts

@@ -62,7 +62,7 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
   }
 
   async execute(operations: Operation[]): Promise<ExecutionResponse> {
-    Log.debug(
+    Log._debug(
       `LoginUserOperationExecutor(operation: ${JSON.stringify(operations)})`,
     );
     const startingOp = operations[0];
@@ -124,11 +124,11 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
       }
 
       case ExecutionResult.FAIL_CONFLICT:
-        Log.debug(`Handling 409 for externalId: ${loginUserOp.externalId}`);
+        Log._debug(`Handling 409 for externalId: ${loginUserOp.externalId}`);
         return this.createUser(loginUserOp, operations);
 
       case ExecutionResult.FAIL_NORETRY:
-        Log.error(
+        Log._error(
           `Recovering from SetAlias failure for externalId: ${loginUserOp.externalId}`,
         );
         return this.createUser(loginUserOp, operations);

src/core/executors/RefreshUserOperationExecutor.ts

@@ -52,7 +52,7 @@ export class RefreshUserOperationExecutor implements IOperationExecutor {
   }
 
   async execute(operations: Operation[]): Promise<ExecutionResponse> {
-    Log.debug(
+    Log._debug(
       `RefreshUserOperationExecutor(operation: ${JSON.stringify(operations)})`,
     );
 

src/core/executors/SubscriptionOperationExecutor.ts

@@ -53,7 +53,7 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
   }
 
   async execute(operations: Operation[]): Promise<ExecutionResponse> {
-    Log.debug(`SubscriptionOperationExecutor(operations: ${operations})`);
+    Log._debug(`SubscriptionOperationExecutor(operations: ${operations})`);
 
     const startingOp = operations[0];
     if (startingOp instanceof CreateSubscriptionOperation)

src/core/executors/UpdateUserOperationExecutor.ts

@@ -73,7 +73,7 @@ export class UpdateUserOperationExecutor implements IOperationExecutor {
   }
 
   async execute(operations: Operation[]): Promise<ExecutionResponse> {
-    Log.debug(`UpdateUserOperationExecutor(operation: ${operations})`);
+    Log._debug(`UpdateUserOperationExecutor(operation: ${operations})`);
 
     const { appId, onesignalId, propertiesObject, refreshDeviceMetadata } =
       this.processOperations(operations);

src/core/modelRepo/OperationModelStore.ts

@@ -27,7 +27,7 @@ export class OperationModelStore extends ModelStore<Operation> {
 
   create(jsonObject?: { name?: string } | null): Operation | null {
     if (jsonObject === null) {
-      Log.error('null jsonObject sent to OperationModelStore.create');
+      Log._error('null jsonObject sent to OperationModelStore.create');
       return null;
     }
 
@@ -96,15 +96,15 @@ export class OperationModelStore extends ModelStore<Operation> {
   } {
     const operationName = object?.name;
     if (!operationName) {
-      Log.error("jsonObject must have 'name' attribute");
+      Log._error("jsonObject must have 'name' attribute");
       return false;
     }
 
     const excluded = new Set<string>([OPERATION_NAME.LOGIN_USER]);
 
     // Must have onesignalId if it is not one of the excluded operations above
     if (!object.onesignalId && !excluded.has(operationName)) {
-      Log.error(
+      Log._error(
         `${operationName} jsonObject must have 'onesignalId' attribute`,
       );
       return false;

src/core/operationRepo/OperationRepo.test.ts

@@ -21,7 +21,7 @@ import {
 import { NewRecordsState } from './NewRecordsState';
 import { OperationQueueItem, OperationRepo } from './OperationRepo';
 
-vi.spyOn(Log, 'error').mockImplementation((msg) => {
+vi.spyOn(Log, '_error').mockImplementation((msg) => {
   if (typeof msg === 'string' && msg.includes('Operation execution failed'))
     return '';
   return msg;

src/core/operationRepo/OperationRepo.ts

@@ -83,7 +83,7 @@
   }
 
   public _containsInstanceOf<T extends Operation>(
     type: new (...args: any[]) => T,
   ): boolean {
     return this.queue.some((item) => item.operation instanceof type);
   }
@@ -96,11 +96,11 @@
   public _pause(): void {
     clearInterval(this._timerID);
     this._timerID = undefined;
-    Log.debug('OperationRepo: Paused');
+    Log._debug('OperationRepo: Paused');
   }
 
   public enqueue(operation: Operation): void {
-    Log.debug(`OperationRepo.enqueue(operation: ${operation})`);
+    Log._debug(`OperationRepo.enqueue(operation: ${operation})`);
 
     this._internalEnqueue(
       new OperationQueueItem({
@@ -112,7 +112,7 @@
   }
 
   public async enqueueAndWait(operation: Operation): Promise<void> {
-    Log.debug(`OperationRepo.enqueueAndWaitoperation: ${operation})`);
+    Log._debug(`OperationRepo.enqueueAndWaitoperation: ${operation})`);
 
     await new Promise((resolve) => {
       this._internalEnqueue(
@@ -135,7 +135,7 @@
       (item) => item.operation.modelId === queueItem.operation.modelId,
     );
     if (hasExisting) {
-      Log.debug(
+      Log._debug(
         `OperationRepo: internalEnqueue - operation.modelId: ${queueItem.operation.modelId} already exists in the queue.`,
       );
       return;
@@ -157,7 +157,7 @@
     let runningOps = false;
 
     this._timerID = setInterval(async () => {
-      if (runningOps) return Log.debug('Operations in progress');
+      if (runningOps) return Log._debug('Operations in progress');
 
       const ops = this._getNextOps(this._executeBucket);
 
@@ -186,7 +186,7 @@
       const response = await executor.execute(operations);
       const idTranslations = response.idTranslations;
 
-      Log.debug(`OperationRepo: execute response = ${response.result}`);
+      Log._debug(`OperationRepo: execute response = ${response.result}`);
 
       // Handle ID translations
       if (idTranslations) {
@@ -213,7 +213,7 @@
         case ExecutionResult.FAIL_UNAUTHORIZED:
         case ExecutionResult.FAIL_NORETRY:
         case ExecutionResult.FAIL_CONFLICT:
-          Log.error(`Operation execution failed without retry: ${operations}`);
+          Log._error(`Operation execution failed without retry: ${operations}`);
           ops.forEach((op) => {
             this._operationModelStore.remove(op.operation.modelId);
           });
@@ -232,7 +232,7 @@
           break;
 
         case ExecutionResult.FAIL_RETRY:
-          Log.error(`Operation execution failed, retrying: ${operations}`);
+          Log._error(`Operation execution failed, retrying: ${operations}`);
           // Add back all operations to front of queue
           ops.toReversed().forEach((op) => {
             removeOpFromDB(op.operation);
@@ -245,7 +245,7 @@
           break;
 
         case ExecutionResult.FAIL_PAUSE_OPREPO:
-          Log.error(
+          Log._error(
             `Operation execution failed with eventual retry, pausing the operation repo: ${operations}`,
           );
           this._pause();
@@ -277,7 +277,7 @@
         await delay(OP_REPO_POST_CREATE_DELAY);
       }
     } catch (e) {
-      Log.error(`Error attempting to execute operation: ${ops}`, e);
+      Log._error(`Error attempting to execute operation: ${ops}`, e);
 
       // On failure remove operations from store
       ops.forEach((op) => {
@@ -291,14 +291,14 @@
     retries: number,
     retryAfterSeconds?: number,
   ): Promise<void> {
-    Log.debug(`retryAfterSeconds: ${retryAfterSeconds}`);
+    Log._debug(`retryAfterSeconds: ${retryAfterSeconds}`);
     const retryAfterSecondsMs = (retryAfterSeconds || 0) * 1000;
     const delayForOnRetries = retries * OP_REPO_DEFAULT_FAIL_RETRY_BACKOFF;
     const delayFor = Math.max(delayForOnRetries, retryAfterSecondsMs);
 
     if (delayFor < 1) return;
 
-    Log.error(`Operations being delay for: ${delayFor} ms`);
+    Log._error(`Operations being delay for: ${delayFor} ms`);
     await delay(delayFor);
   }
 

src/entries/pageSdkInit.test.ts

@@ -42,7 +42,7 @@ describe('pageSdkInit', () => {
   });
 
   test('can process deferred items long after page init', async () => {
-    vi.spyOn(Log, 'error').mockImplementation(() => '');
+    vi.spyOn(Log, '_error').mockImplementation(() => '');
     await import('./pageSdkInit');
     const initSpy = vi.spyOn(window.OneSignal, 'init');
 

src/entries/pageSdkInit.ts

@@ -21,19 +21,19 @@ async function processOneSignalDeferredArray(
       await OneSignal.push(item);
     } catch (e) {
       // Catch and log error here so other elements still run
-      Log.error(e);
+      Log._error(e);
     }
   }
 }
 
 function onesignalSdkInit() {
   incrementSdkLoadCount();
   if (getSdkLoadCount() > 1) {
-    Log.warn(
+    Log._warn(
       `OneSignal: The web push SDK is included more than once. For optimal performance, please include our ` +
         `SDK only once on your page.`,
     );
-    Log.debug(
+    Log._debug(
       `OneSignal: Exiting from SDK initialization to prevent double-initialization errors. ` +
         `Occurred ${getSdkLoadCount()} times.`,
     );

src/entries/pageSdkInit2.test.ts

@@ -58,7 +58,7 @@ describe('pageSdkInit 2', () => {
       response: emailSubModel,
     });
 
-    const errorSpy = vi.spyOn(Log, 'error').mockImplementation(() => '');
+    const errorSpy = vi.spyOn(Log, '_error').mockImplementation(() => '');
 
     // wait for init so it can initialize user namespace otherwise it won't be available for addEmail
     window.OneSignalDeferred = [];

src/entries/worker.ts

@@ -4,4 +4,5 @@
 import { OneSignalServiceWorker } from '../sw/serviceWorker/ServiceWorker';
 
 // Expose this class to the global scope
-(self as any).OneSignal = OneSignalServiceWorker;
+declare const self: ServiceWorkerGlobalScope;
+self.OneSignalWorker = OneSignalServiceWorker;

src/global.d.ts

@@ -42,7 +42,7 @@ declare global {
   interface WorkerGlobalScope {
     OneSignal: _OneSignal;
     OneSignalWorker: typeof import('./sw/serviceWorker/ServiceWorker').OneSignalServiceWorker;
-    workerMessenger: import('./sw/serviceWorker/WorkerMessengerSW').WorkerMessengerSW;
+    _workerMessenger: import('./sw/serviceWorker/WorkerMessengerSW').WorkerMessengerSW;
     shouldLog: boolean;
   }
 }

src/onesignal/DebugNamesapce.ts

@@ -6,6 +6,6 @@ export default class DebugNamespace {
    * @param logLevel - string
    */
   setLogLevel(logLevel: string) {
-    Log.setLevel(logLevel);
+    Log._setLevel(logLevel);
   }
 }

src/onesignal/NotificationsNamespace.test.ts

@@ -46,7 +46,7 @@ test('should set the default title', async () => {
   );
 });
 
-const warnSpy = vi.spyOn(Log, 'warn');
+const warnSpy = vi.spyOn(Log, '_warn');
 describe('Consent Required', () => {
   beforeEach(() => {
     OneSignal.setConsentRequired(true);

src/onesignal/OneSignal.test.ts

@@ -1189,9 +1189,9 @@
   writable: true,
 });
 
-vi.spyOn(Log, 'error').mockImplementation(() => '');
-const debugSpy = vi.spyOn(Log, 'debug');
-const warnSpy = vi.spyOn(Log, 'warn');
+vi.spyOn(Log, '_error').mockImplementation(() => '');
+const debugSpy = vi.spyOn(Log, '_debug');
+const warnSpy = vi.spyOn(Log, '_warn');
 
 const getPropertiesItem = async () => (await db.getAll('properties'))[0];
 
@@ -1201,4 +1201,4 @@
 );
 
 const showLocalNotificationSpy = vi.spyOn(MainHelper, 'showLocalNotification');
 showLocalNotificationSpy.mockImplementation(async () => {});