fix: TS errors

src/API.ts

@@ -21,7 +21,7 @@ import {
 import platformChecker from './modules/PlatformChecker';
 
 import {keyValue} from './storage';
-import Logger, {logAndThrowError} from './logger';
+import { Logger, logAndThrowError } from "./logger";
 import doApiXHR from './modules/api/apiCall';
 import Params from './modules/data/Params';
 

src/createDoApiFetch.ts

@@ -1,10 +1,10 @@
-import Logger, {logAndRejectError} from './logger';
+import { Logger, logAndRejectError } from "./logger";
 import {getPushwooshUrl} from "./functions";
 
-export default function createDoApiFetch(applicationCode: string, pushwooshApiUrl?: string) {
+export default function createDoApiFetch(applicationCode: string, pushwooshApiUrl: string) {
   return function doApiFetch(methodName: string, request: any) {
     return new Promise((resolve, reject) => {
-      getPushwooshUrl(applicationCode, pushwooshApiUrl).then(pushwooshUrl => {
+      getPushwooshUrl(pushwooshApiUrl).then((pushwooshUrl: string) => {
         try {
           const url = `${pushwooshUrl}${methodName}`;
           const params = {request};

src/createDoApiXHR.ts

@@ -1,12 +1,12 @@
-import Logger, {logAndRejectError} from './logger';
+import { Logger, logAndRejectError } from "./logger";
 import {keyValue} from "./storage";
 import {KEY_API_BASE_URL} from "./constants";
 import {getPushwooshUrl} from "./functions";
 
-export default function createDoApiXHR(applicationCode: string, pushwooshApiUrl?: string) {
+export default function createDoApiXHR(applicationCode: string, pushwooshApiUrl: string) {
   return function doApiXHR(methodName: string, request: any) {
     return new Promise((resolve, reject) => {
-      getPushwooshUrl(applicationCode, pushwooshApiUrl).then(pushwooshUrl => {
+      getPushwooshUrl(pushwooshApiUrl).then((pushwooshUrl:string) => {
         try {
           const url = `${pushwooshUrl}${methodName}`;
           const params = {request};

src/drivers/safari.ts

@@ -47,24 +47,27 @@ class SafariDriver implements IPWDriver {
       // emit event when permission dialog show
       this.params.eventEmitter.emit(EVENT_ON_SHOW_NOTIFICATION_PERMISSION_DIALOG);
       this.eventBus.emit(TEvents.SHOW_NOTIFICATION_PERMISSION_DIALOG);
+      let id = '';
+      this.getAPIParams().then(({hwid}) => id = hwid);
 
       safari.pushNotification.requestPermission(
-        'https://cp.pushwoosh.com/json/1.3/safari',  // get push package url
+        "https://cp.pushwoosh.com/json/1.3/safari", // get push package url
         webSitePushID,
-        {application: applicationCode},
+        { application: applicationCode, hwid:id },
         ({ permission }) => {
           // emit event when permission dialog hide with permission state
-          this.params.eventEmitter.emit(EVENT_ON_HIDE_NOTIFICATION_PERMISSION_DIALOG, permission);
+          this.params.eventEmitter.emit(
+            EVENT_ON_HIDE_NOTIFICATION_PERMISSION_DIALOG,
+            permission
+          );
           this.eventBus.emit(TEvents.HIDE_NOTIFICATION_PERMISSION_DIALOG);
 
-
           if (permission === PERMISSION_GRANTED) {
             eventEmitter.emit(EVENT_ON_PERMISSION_GRANTED);
             resolve(true);
-          }
-          else {
+          } else {
             eventEmitter.emit(EVENT_ON_PERMISSION_DENIED);
-            reject('Safari permission denied');
+            reject("Safari permission denied");
           }
         }
       );

src/drivers/worker.ts

@@ -42,7 +42,7 @@ import {
   PERMISSION_PROMPT
 } from '../constants';
 import {keyValue} from '../storage';
-import Logger from '../logger';
+import {Logger} from '../logger';
 import Params from '../modules/data/Params';
 import {EventBus, TEvents} from '../modules/EventBus/EventBus';
 

src/modules/ApiClient/apiCall.ts

@@ -1,4 +1,4 @@
-import Logger, {logAndRejectError} from '../../logger';
+import { Logger, logAndRejectError } from "../../logger";
 import Params from '../data/Params';
 import {
   sendFatalLogToRemoteServer

src/modules/api/apiCall.ts

@@ -1,4 +1,4 @@
-import Logger, {logAndRejectError} from '../../logger';
+import { Logger, logAndRejectError } from "../../logger";
 import {keyValue} from '../../storage';
 import {KEY_API_BASE_URL} from '../../constants';
 import Params from '../data/Params';

src/subscribe_widget/index.ts

@@ -5,24 +5,20 @@ import {
   PERMISSION_DENIED,
   PERMISSION_PROMPT,
 
-  BROWSER_TYPE_CHROME,
-  BROWSER_TYPE_FF,
-  BROWSER_TYPE_SAFARI,
-
   EVENT_SHOW_SUBSCRIBE_BUTTON,
   EVENT_CLICK_SUBSCRIBE_BUTTON,
 
   KEY_SHOW_SUBSCRIBE_WIDGET,
   KEY_CLICK_SUBSCRIBE_WIDGET
 } from '../constants';
-import {getBrowserType, isOperaBrowser} from '../functions';
 
 import {
   SUBSCRIBE_WIDGET_DEFAULT_CONFIG,
   WIDGET_CONTAINER_ID
 } from './constants';
 import Positioning from './positioning';
 import bellSVG from './bell';
+import { PlatformChecker } from 'modules/PlatformChecker';
 
 
 class SubscribeWidget {
@@ -32,14 +28,12 @@ class SubscribeWidget {
   style: HTMLElement;
   pw: Pushwoosh;
   config: TBellConfig;
+  platformChecker: PlatformChecker;
 
   constructor(pw: Pushwoosh) {
     // Set Pushwoosh object
     this.pw = pw;
-    if (!this.pw.shouldInit()) {
-      console.warn('Browser does not support push notifications');
-      return;
-    }
+    this.platformChecker = new PlatformChecker();
 
     // Bindings
     this.clickBell = this.clickBell.bind(this);
@@ -217,35 +211,28 @@ class SubscribeWidget {
    */
   helpImageSourceFactory(): Array<string> {
     let preferenceSource, unlockSource;
-
-    if (isOperaBrowser()) {
-      preferenceSource = 'https://cdn.pushwoosh.com/webpush/img/opera.jpg';
-      unlockSource = 'https://cdn.pushwoosh.com/webpush/img/opera_unlock.jpg';
-      return [preferenceSource, unlockSource]
-    }
-
-    switch (getBrowserType()) {
-      case BROWSER_TYPE_CHROME:
-        if (navigator.userAgent.match(/Android/i)) {
-          preferenceSource = 'https://cdn.pushwoosh.com/webpush/img/mobile_chrome.jpg';
-          unlockSource = 'https://cdn.pushwoosh.com/webpush/img/mobile_chrome_unlock.jpg';
-        }
-        else {
-          preferenceSource = 'https://cdn.pushwoosh.com/webpush/img/chrome.jpg';
-          unlockSource = 'https://cdn.pushwoosh.com/webpush/img/chrome_unlock.jpg';
-        }
-        break;
-      case BROWSER_TYPE_FF:
-        preferenceSource = 'https://cdn.pushwoosh.com/webpush/img/FF.jpg';
-        unlockSource = 'https://cdn.pushwoosh.com/webpush/img/FF_unlock.jpg';
-        break;
-      case BROWSER_TYPE_SAFARI:
-        preferenceSource = 'https://cdn.pushwoosh.com/webpush/img/safari.jpg';
-        unlockSource = 'https://cdn.pushwoosh.com/webpush/img/safari_unlock.jpg';
-        break;
-      default:
-        preferenceSource = 'https://cdn.pushwoosh.com/webpush/img/chrome.jpg';
-        unlockSource = 'https://cdn.pushwoosh.com/webpush/img/chrome_unlock.jpg';
+
+    if (this.platformChecker.isOperaBrowser()) {
+      preferenceSource = "https://cdn.pushwoosh.com/webpush/img/opera.jpg";
+      unlockSource = "https://cdn.pushwoosh.com/webpush/img/opera_unlock.jpg";
+      return [preferenceSource, unlockSource];
+    } else if (this.platformChecker.isSafariBrowser()) {
+      preferenceSource = "https://cdn.pushwoosh.com/webpush/img/safari.jpg";
+      unlockSource = "https://cdn.pushwoosh.com/webpush/img/safari_unlock.jpg";
+    } else if (this.platformChecker.isFirefoxBrowser()) {
+      preferenceSource = "https://cdn.pushwoosh.com/webpush/img/FF.jpg";
+      unlockSource = "https://cdn.pushwoosh.com/webpush/img/FF_unlock.jpg";
+    } else {
+      if (navigator.userAgent.match(/Android/i)) {
+        preferenceSource =
+          "https://cdn.pushwoosh.com/webpush/img/mobile_chrome.jpg";
+        unlockSource =
+          "https://cdn.pushwoosh.com/webpush/img/mobile_chrome_unlock.jpg";
+      } else {
+        preferenceSource = "https://cdn.pushwoosh.com/webpush/img/chrome.jpg";
+        unlockSource =
+          "https://cdn.pushwoosh.com/webpush/img/chrome_unlock.jpg";
+      }
     }
     return [preferenceSource, unlockSource]
   }
@@ -348,15 +335,7 @@ class SubscribeWidget {
    * @returns {Promise<void>}
    */
   async triggerPwEvent(event: string, widget: string) {
-    if (this.pw.api === undefined) {
-      return;
-    }
-
-    const {applicationCode} = await this.pw.getParams();
-    this.pw.api.triggerEvent({
-      event_id: event,
-      application: applicationCode
-    }, widget);
+    return;
   }
 }