more rename of properties

Author: fadi-george

package.json

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

src/onesignal/User.ts

@@ -269,7 +269,7 @@ export default class User {
     // login operation / non-local onesignalId is needed to send custom events
     const onesignalId = OneSignal._coreDirector._getIdentityModel().onesignalId;
     if (IDManager._isLocalId(onesignalId) && !hasLoginOp(onesignalId)) {
-      Log.error('User must be logged in first.');
+      Log._error('User must be logged in first.');
       return;
     }
 

src/shared/api/OneSignalApiBase.ts

@@ -64,7 +64,7 @@ export class OneSignalApiBase {
     data: any,
     headers: APIHeaders | undefined,
   ): Promise<OneSignalApiBaseResponse<T>> {
-    if (!this.requestHasAppId(action, data)) {
+    if (!this._requestHasAppId(action, data)) {
       return Promise.reject(AppIDMissingError);
     }
 
@@ -126,7 +126,7 @@ export class OneSignalApiBase {
 
   // OneSignal's backend requires that all request have a
   // have a app_id in the UUID format in the request
-  private static requestHasAppId(
+  private static _requestHasAppId(
     url: string,
     body?: Record<string, unknown>,
   ): boolean {

src/shared/libraries/workerMessenger/base.ts

@@ -4,18 +4,16 @@ import type {
   WorkerMessengerReplyBufferRecord,
 } from './types';
 
-declare let self: ServiceWorkerGlobalScope;
-
 export class WorkerMessengerReplyBuffer {
-  private replies: {
+  private _replies: {
     [index: string]: WorkerMessengerReplyBufferRecord[] | null;
   };
 
   constructor() {
-    this.replies = {};
+    this._replies = {};
   }
 
-  public addListener(
+  public _addListener(
     command: WorkerMessengerCommandValue,
     callback: (param: unknown) => void,
     onceListenerOnly: boolean,
@@ -25,30 +23,30 @@ export class WorkerMessengerReplyBuffer {
       onceListenerOnly,
     };
 
-    const replies = this.replies[command.toString()];
+    const replies = this._replies[command.toString()];
     if (replies) replies.push(record);
-    else this.replies[command.toString()] = [record];
+    else this._replies[command.toString()] = [record];
   }
 
-  public findListenersForMessage(
+  public _findListenersForMessage(
     command: WorkerMessengerCommandValue,
   ): WorkerMessengerReplyBufferRecord[] {
-    return this.replies[command.toString()] || [];
+    return this._replies[command.toString()] || [];
   }
 
-  public deleteListenerRecords(command: WorkerMessengerCommandValue) {
-    this.replies[command.toString()] = null;
+  public _deleteListenerRecords(command: WorkerMessengerCommandValue) {
+    this._replies[command.toString()] = null;
   }
 
-  public deleteAllListenerRecords() {
-    this.replies = {};
+  public _deleteAllListenerRecords() {
+    this._replies = {};
   }
 
-  public deleteListenerRecord(
+  public _deleteListenerRecord(
     command: WorkerMessengerCommandValue,
     targetRecord: object,
   ) {
-    const listenersForCommand = this.replies[command.toString()];
+    const listenersForCommand = this._replies[command.toString()];
     if (listenersForCommand == null) return;
 
     for (
@@ -92,7 +90,7 @@ export class WorkerMessengerBase<
     command: WorkerMessengerCommandValue,
     callback: (WorkerMessengerPayload: any) => void,
   ): void {
-    this._replies.addListener(command, callback, false);
+    this._replies._addListener(command, callback, false);
   }
 
   /*
@@ -105,7 +103,7 @@ export class WorkerMessengerBase<
     command: WorkerMessengerCommandValue,
     callback: (WorkerMessengerPayload: any) => void,
   ): void {
-    this._replies.addListener(command, callback, true);
+    this._replies._addListener(command, callback, true);
   }
 
   /**
@@ -114,9 +112,9 @@ export class WorkerMessengerBase<
    */
   _off(command?: WorkerMessengerCommandValue): void {
     if (command) {
-      this._replies.deleteListenerRecords(command);
+      this._replies._deleteListenerRecords(command);
     } else {
-      this._replies.deleteAllListenerRecords();
+      this._replies._deleteAllListenerRecords();
     }
   }
 }

src/shared/libraries/workerMessenger/page.ts

@@ -48,7 +48,9 @@ export class WorkerMessengerPage extends WorkerMessengerBase<ContextInterface> {
       return;
     }
 
-    const listenerRecords = this._replies.findListenersForMessage(data.command);
+    const listenerRecords = this._replies._findListenersForMessage(
+      data.command,
+    );
     const listenersToRemove = [];
     const listenersToCall = [];
 
@@ -62,7 +64,7 @@ export class WorkerMessengerPage extends WorkerMessengerBase<ContextInterface> {
     }
     for (let i = listenersToRemove.length - 1; i >= 0; i--) {
       const listenerRecord = listenersToRemove[i];
-      this._replies.deleteListenerRecord(data.command, listenerRecord);
+      this._replies._deleteListenerRecord(data.command, listenerRecord);
     }
     for (const listenerRecord of listenersToCall) {
       listenerRecord.callback.apply(null, [data.payload]);

src/shared/libraries/workerMessenger/sw.ts

@@ -36,7 +36,9 @@ export class WorkerMessengerSW extends WorkerMessengerBase<ContextSW> {
       return;
     }
 
-    const listenerRecords = this._replies.findListenersForMessage(data.command);
+    const listenerRecords = this._replies._findListenersForMessage(
+      data.command,
+    );
     const listenersToRemove = [];
     const listenersToCall = [];
 
@@ -53,7 +55,7 @@ export class WorkerMessengerSW extends WorkerMessengerBase<ContextSW> {
     }
     for (let i = listenersToRemove.length - 1; i >= 0; i--) {
       const listenerRecord = listenersToRemove[i];
-      this._replies.deleteListenerRecord(data.command, listenerRecord);
+      this._replies._deleteListenerRecord(data.command, listenerRecord);
     }
     for (const listenerRecord of listenersToCall) {
       listenerRecord.callback.apply(null, [data.payload]);

src/shared/managers/subscription/base.ts

@@ -79,12 +79,12 @@ export class SubscriptionManagerBase<
     }
 
     if (await this._isAlreadyRegisteredWithOneSignal()) {
-      if ('_updateManager' in this._context) {
+      if (!IS_SERVICE_WORKER && '_updateManager' in this._context) {
         await this._context._updateManager.sendPushDeviceRecordUpdate();
       }
 
       // NOTE: We only have sessionManager in the page context, should sw upsert do anything?
-    } else if ('_sessionManager' in this._context) {
+    } else if (!IS_SERVICE_WORKER && '_sessionManager' in this._context) {
       this._context._sessionManager.upsertSession(SessionOrigin.UserCreate);
     }