@voicenter-team/events-sdk 0.0.14 → 0.0.18

package/docs/src/.vuepress/components/Demo.vue

@@ -23,13 +23,12 @@
 <script lang="ts" setup>
 import {reactive, ref} from 'vue'
 import EventsSdkClass from '@/index'
-import {eventsSdkDefaultOptions} from '@/classes/events-sdk/events-sdk-default-options'
 import {EventsEnum} from '@/enum/events.enum'
 import {EventTypeData} from '@/types/events'
 import {LoginType} from "@/enum/auth.enum";
 
 /* Data */
-const token = ref('lJVBSEk084tzLaFpIWTReBw54trHD2Jlt8hThhX6OAxJ5IjyCC740znrXXgIzj1QtM67n2NOEGNn4SjrPJxuvkxbFb4tWHjS3cyh')
+const token = ref('')
 const loading = ref(false)
 const loggedId = ref(false)
 const events = reactive<{ [K in EventsEnum]?: Array<EventTypeData<K>> }>({})
@@ -43,17 +42,12 @@ async function login() {
     loading.value = true
 
     const sdk = new EventsSdkClass({
-        "token": "lJVBSEk084tzLaFpIWTReBw54trHD2Jlt8hThhX6OAxJ5IjyCC740znrXXgIzj1QtM67n2NOEGNn4SjrPJxuvkxbFb4tWHjS3cyh",
-        "serverFetchStrategy": "remote",
-        "url": "https://monitor2.comms24x7.com/monitorAPI/getMonitorUrls",
-        "loginUrl": "https://loginapi.comms24x7.com/monitorAPI/Login",
-        "refreshTokenUrl": "https://loginapi.comms24x7.com/monitorAPI/RefreshIdentityToken",
-        "servers": [{
-            "URLID": 1,
-            "Priority": 5,
-            "Version": "1.3.7",
-            "Domain": "monitor1.comms24x7.com"
-        }, {"URLID": 2, "Priority": 4, "Version": "1.3.7", "Domain": "monitor2.comms24x7.com"}]
+      loginUrl: "https://loginapidev.voicenter.co.il/Auth/Login/Voicenter/Monitor",
+      refreshTokenUrl: "https://loginapidev.voicenter.co.il/Auth/RefreshToken",
+      loginType: LoginType.TOKEN, // <=== "User" or "Token"
+      token: 'QMSVU9dwNYC9Le9VCBqx24AB9TYyWj9Xn5aCPV0GFHIWoShQqfPtnAPmnw24xpJIUSsDDtlac2OPpjx0t3MSkxH3AhiQGHCeGZ8e',
+      getSettingsUrl: "https://loginapidev.voicenter.co.il/Application/GetSettings",
+      isNewStack: true,
     })
 
     await sdk.init()
@@ -185,7 +179,7 @@ async function login() {
                 alert('Login failed')
             }
         },
-        5000
+        15000
     )
 }
 </script>

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@voicenter-team/events-sdk",
-  "version": "0.0.14",
+  "version": "0.0.18",
   "description": "",
   "main": "dist/voicenter-events-sdk.cjs.js",
   "jsdelivr": "dist/voicenter-events-sdk.umd.js",
   "module": "dist/voicenter-events-sdk.es.js",
   "unpkg": "dist/voicenter-events-sdk.umd.js",
-  "types": "dist/index.d.ts",
+  "types": "dist/voicenter-events-sdk.d.ts",
   "type": "module",
   "scripts": {
     "build": "vite build",
@@ -28,8 +28,8 @@
   "devDependencies": {
     "@types/chrome": "0.0.259",
     "@types/jest": "29.5.11",
-    "@types/js-md5": "^0.7.2",
     "@types/lodash": "^4.14.200",
+    "@types/md5": "^2.3.5",
     "@types/node": "20.11.13",
     "@typescript-eslint/eslint-plugin": "6.20.0",
     "@typescript-eslint/parser": "6.20.0",
@@ -48,7 +48,8 @@
     "vite-plugin-dts": "3.7.2"
   },
   "dependencies": {
-    "js-md5": "0.8.3",
-    "lodash": "^4.17.21"
+    "@voicenter-team/socketio-storage-logger": "^1.0.1",
+    "lodash": "^4.17.21",
+    "md5": "^2.3.0"
   }
 }

package/src/classes/auth/auth.class.ts

@@ -1,4 +1,4 @@
-import md5 from 'js-md5'
+import md5 from 'md5'
 
 import EventsSdkClass from '@/classes/events-sdk/events-sdk.class'
 import { EventsSdkOptions, ServerParameter } from '@/classes/events-sdk/events-sdk.types'
@@ -11,7 +11,6 @@ import {
     Settings
 } from '@/types/auth'
 import { LoginType } from '@/enum/auth.enum'
-import { getSettingsUrl } from '@/classes/auth/auth.urls'
 import { StorageClass } from '@/classes/storage/storage.class'
 
 class AuthClass{
@@ -34,7 +33,7 @@ class AuthClass{
             password: options.password
         }
 
-        this.storageKey = md5(JSON.stringify(payload))
+        this.storageKey = md5(JSON.stringify(options))
 
         if (this.lastLoginTimestamp && this.lastLoginTimestamp + this.delay > new Date().getTime()) {
             return
@@ -54,7 +53,7 @@ class AuthClass{
     }
 
     private async checkLoginStatus (key: string): Promise<boolean> {
-        const loginSessionData = await StorageClass.getSessionStorageDataByKey(key)
+        const loginSessionData = await StorageClass.getSessionStorageDataByKey<LoginSessionData>(key)
 
         if (loginSessionData) {
             this.onLoginResponse(loginSessionData)
@@ -121,6 +120,7 @@ class AuthClass{
         }
         if (this.eventsSdkClass.server) {
             this.eventsSdkClass.socketIoClass.getSocketIoFunction(`v=${this.eventsSdkClass.server.Version}`)
+            this.eventsSdkClass.loggerClass.init()
         }
         if (loginSessionData.IdentityCode) {
             this.token = loginSessionData.IdentityCode
@@ -135,7 +135,7 @@ class AuthClass{
             this.eventsSdkClass.options.tokenExpiry = loginSessionData.IdentityCodeExpiry
             this.handleTokenExpiry()
         }
-        if (loginSessionData.RefreshToken && loginSessionData.TokenExpiry) {
+        if (loginSessionData.RefreshToken && loginSessionData.TokenExpiry && this.eventsSdkClass.options.loginType === LoginType.USER) {
             this.eventsSdkClass.options.refreshToken = loginSessionData.RefreshToken
             this.eventsSdkClass.options.tokenExpiry = loginSessionData.TokenExpiry
             this.handleTokenExpiry()
@@ -216,17 +216,17 @@ class AuthClass{
                 })
             }
         } else {
-            if (token) {
+            if (this.eventsSdkClass.options.loginType === LoginType.TOKEN) {
                 body = JSON.stringify({ token })
 
-                url = `${url}/Token`
+                url = `${url}/${LoginType.TOKEN}`
             } else {
                 body = JSON.stringify({
                     email,
                     pin: password
                 })
 
-                url = `${url}/User`
+                url = `${url}/${LoginType.USER}`
             }
         }
 
@@ -247,13 +247,17 @@ class AuthClass{
     }
 
     private async getSettings (token: string): Promise<Settings> {
-        const res = await fetch(getSettingsUrl, {
-            headers: {
-                Authorization: `Bearer ${token}`
-            }
-        })
+        if (this.eventsSdkClass.options.getSettingsUrl) {
+            const res = await fetch(this.eventsSdkClass.options.getSettingsUrl, {
+                headers: {
+                    Authorization: `Bearer ${token}`
+                }
+            })
 
-        return res.json()
+            return res.json()
+        } else {
+            throw new Error('getSettingsUrl config parameter not provided')
+        }
     }
 
     private async refreshToken<T> (refreshTokenUrl: string, oldRefreshToken: string): Promise<ExternalLoginResponse<T>> {

package/src/classes/events-sdk/events-sdk-default-options.ts

@@ -1,29 +1,7 @@
 import { EventsSdkOptions } from '@/classes/events-sdk/events-sdk.types'
-import { LoginType } from '@/enum/auth.enum'
 
-export const eventsSdkDefaultOptions: EventsSdkOptions = {
+export const eventsSdkDefaultOptions: Partial<EventsSdkOptions> = {
     isNewStack: false,
-    servers: [ {
-        URLID: 1,
-        Priority: 5,
-        Version: '1.3.7',
-        Domain: 'monitor1.comms24x7.com' 
-    },{
-        URLID: 2,
-        Priority: 4,
-        Version: '1.3.7',
-        Domain: 'monitor2.comms24x7.com' 
-    } ],
-    loginUrl: 'https://loginapi.comms24x7.com/monitorAPI/Login',
-    refreshTokenUrl: 'https://loginapi.comms24x7.com/monitorAPI/RefreshIdentityToken',
-    fallbackServer: {
-        Domain: 'monitor5.voicenter.co.il',
-        Priority: 0,
-        Version: '1.3.7',
-        URLID: 1
-    },
-    token: '',
-    loginType: LoginType.TOKEN,
     forceNew: true,
     reconnectionDelay: 10000,
     reconnectionDelayMax: 10000,
@@ -36,9 +14,8 @@ export const eventsSdkDefaultOptions: EventsSdkOptions = {
     upgrade: false,
     serverFetchStrategy: 'static',
     serverType: 0,
-    useLogger: false,
-    loggerSocketConnection: '',
-    loggerServer: 'http://127.0.0.1:3000/',
+    useLogger: true,
+    loggerServer: 'http://socketlog.voicenter.co',
     loggerConfig: {
         logToConsole: true,
         overloadGlobalConsole: false,
@@ -54,7 +31,4 @@ export const eventsSdkDefaultOptions: EventsSdkOptions = {
         transports: [ 'websocket' ],
         debug: false
     },
-    username: 'username',
-    password: '92455783085',
-    email: 'sasha.za@starkey.co.il',
 }

package/src/classes/events-sdk/events-sdk.class.ts

@@ -12,6 +12,7 @@ import {
     EventTypeNames,
 } from '@/types/events'
 import { EventsEnum } from '@/enum/events.enum'
+import { LoggerClass } from '@/classes/logger/logger.class'
 
 class EventsSdkClass{
     constructor (options: EventsSdkOptions) {
@@ -37,6 +38,7 @@ class EventsSdkClass{
 
     public authClass = new AuthClass(this)
     public socketIoClass = new SocketIoClass(this)
+    public loggerClass = new LoggerClass(this)
 
     public reconnectOptions: ReconnectOptions = {
         retryCount: 1,

package/src/classes/events-sdk/events-sdk.types.ts

@@ -1,9 +1,12 @@
+import { Socket } from 'socket.io-client'
+import { AsyncStorageLoggerConfig } from '@voicenter-team/socketio-storage-logger/build/interfaces/AsyncStorageLoggerConfig'
 import { LoginType } from '@/enum/auth.enum'
 
 export interface EventsSdkOptions {
     isNewStack?: boolean,
     servers: Server[],
     loginUrl: string,
+    getSettingsUrl?: string
     fallbackServer: Server,
     refreshTokenUrl: string,
     refreshToken?: string,
@@ -23,9 +26,9 @@ export interface EventsSdkOptions {
     serverFetchStrategy?: string,
     serverType?: number,
     useLogger?: boolean,
-    loggerSocketConnection?: string,
-    loggerServer?: string,
-    loggerConfig?: LoggerConfig,
+    loggerSocketConnection?: Socket,
+    loggerServer: string,
+    loggerConfig: Partial<AsyncStorageLoggerConfig>,
     loggerConnectOptions?: LoggerConnectOptions,
     email: string,
     password: string,
@@ -50,7 +53,9 @@ export interface LoggerConnectOptions {
     reconnection?: boolean,
     reconnectionDelay?: number,
     reconnectionAttempts?: number,
-    perMessageDeflate?: boolean,
+    perMessageDeflate?: {
+        threshold: number
+    },
     upgrade?: boolean,
     transports?: string[],
     debug?: boolean

package/src/classes/logger/logger.class.ts

@@ -0,0 +1,71 @@
+import { Socket } from 'socket.io-client'
+import { AsyncStorageLogger } from '@voicenter-team/socketio-storage-logger/build/AsyncStorageLogger'
+// import {
+//     AsyncStorageLoggerConfig
+// } from '@voicenter-team/socketio-storage-logger/build/interfaces/AsyncStorageLoggerConfig'
+import EventsSdkClass from '@/classes/events-sdk/events-sdk.class'
+import { LoggerTypeEnum } from '@/enum/logger.enum'
+import { EventsEnum } from '@/enum/events.enum'
+// import { StorageClass } from '@/classes/storage/storage.class'
+
+export class LoggerClass{
+    constructor (private readonly eventsSdkClass: EventsSdkClass) {
+        this.eventsSdkClass = eventsSdkClass
+    }
+
+    public io: Socket | undefined
+    private storageLogger: AsyncStorageLogger | undefined
+
+    public init () {
+        if (!this.eventsSdkClass.options.useLogger) {
+            return
+        }
+
+        if (this.eventsSdkClass.options.loggerSocketConnection) {
+            this.io = this.eventsSdkClass.options.loggerSocketConnection
+        } else {
+            if (this.eventsSdkClass.socketIoClass.ioFunction) {
+                this.io = this.eventsSdkClass.socketIoClass.ioFunction(
+                    this.eventsSdkClass.options.loggerServer,
+                    this.eventsSdkClass.options.loggerConnectOptions
+                )
+            }
+        }
+
+        if (this.io) {
+            // this.storageLogger = new AsyncStorageLogger({
+            //     ...this.eventsSdkClass.options.loggerConfig as AsyncStorageLoggerConfig,
+            //     socketConnection: this.io,
+            //     getItem: async (key: string) => {
+            //         const result = await StorageClass.getSessionStorageDataByKey(key, false)
+            //
+            //         if (result === undefined) {
+            //             return null
+            //         }
+            //
+            //         return result
+            //     },
+            //     setItem (key: string, value: string) {
+            //         return StorageClass.updateSessionStorageKey(key, value)
+            //     }
+            // })
+        }
+    }
+
+    public log (type: LoggerTypeEnum, event: EventsEnum, ...data: unknown[]) {
+        const result = [ event, ...data ]
+        if (this.storageLogger) {
+            if (type === LoggerTypeEnum.INFO) {
+                this.storageLogger.log(result)
+            } else if (type === LoggerTypeEnum.ERROR) {
+                this.storageLogger.error(result)
+            }
+        } else {
+            if (type === LoggerTypeEnum.INFO) {
+                console.log(result)
+            } else if (type === LoggerTypeEnum.ERROR) {
+                console.error(result)
+            }
+        }
+    }
+}

package/src/classes/socket-io/socket-io.class.ts

@@ -6,6 +6,7 @@ import { ServerParameter } from '@/classes/events-sdk/events-sdk.types'
 import { EventsEnum } from '@/enum/events.enum'
 import { KeepAliveResponseEvent } from '@/types/events'
 import { StorageClass } from '@/classes/storage/storage.class'
+// import { LoggerTypeEnum } from '@/enum/logger.enum'
 
 export class SocketIoClass{
     constructor (private readonly eventsSdkClass: EventsSdkClass) {
@@ -42,7 +43,12 @@ export class SocketIoClass{
 
             const url = `${protocol}://${domain}`
 
-            // this.log(INFO, 'Connecting to..', url);
+            // this.eventsSdkClass.loggerClass.log(
+            //     LoggerTypeEnum.INFO,
+            //     EventsEnum.CONNECT,
+            //     'Connecting to..',
+            //     url
+            // )
 
             const options: Partial<ManagerOptions & SocketOptions> = {
                 reconnection: false,

package/src/classes/storage/storage.class.ts

@@ -1,12 +1,16 @@
-import { LoginSessionData } from '@/types/auth'
-
 export class StorageClass{
-    public static async getSessionStorageDataByKey (key: string): Promise<LoginSessionData | undefined> {
+    public static getSessionStorageDataByKey <T extends object> (key: string, doParse?: true): Promise<T | undefined>
+    public static getSessionStorageDataByKey (key: string, doParse?: false): Promise<string | undefined>
+    public static async getSessionStorageDataByKey (key: string, doParse = true) {
         if (typeof chrome !== 'undefined' && typeof chrome.storage !== 'undefined') {
             const loginSessionKey = await chrome.storage.session.get(key)
 
             if (loginSessionKey[key]) {
-                return JSON.parse(loginSessionKey[key])
+                if (doParse) {
+                    return JSON.parse(loginSessionKey[key])
+                } else {
+                    return loginSessionKey[key]
+                }
             }
         }
 
@@ -14,12 +18,16 @@ export class StorageClass{
             const loginSessionKey = window.sessionStorage.getItem(key)
 
             if (loginSessionKey) {
-                return JSON.parse(loginSessionKey)
+                if (doParse) {
+                    return JSON.parse(loginSessionKey)
+                } else {
+                    return loginSessionKey
+                }
             }
         }
     }
 
-    public static async updateSessionStorageKey (key: string, storageData: Partial<LoginSessionData>) {
+    public static async updateSessionStorageKey <T> (key: string, storageData: Partial<T>) {
         if (typeof chrome !== 'undefined' && typeof chrome.storage !== 'undefined') {
             await chrome.storage.session.set({
                 [key]: JSON.stringify(storageData)
@@ -40,4 +48,4 @@ export class StorageClass{
             window.sessionStorage.clear()
         }
     }
-}
+}

package/src/enum/logger.enum.ts

@@ -0,0 +1,5 @@
+export enum LoggerTypeEnum {
+    INFO = 'INFO',
+    WARN = 'WARN',
+    ERROR = 'ERROR'
+}

package/src/types/events.d.ts

@@ -1,10 +1,4 @@
-import {
-    EventNameEnum,
-    EventsEnum,
-    ExtensionEventReasonEnum,
-    ExtensionHangupCauseEnum,
-    QueueEventReasonEnum
-} from '@/enum/events.enum'
+import { EventNameEnum, EventsEnum, ExtensionEventReasonEnum, ExtensionHangupCauseEnum, QueueEventReasonEnum } from '@/enum/events.enum'
 import { Queue, Extension, Dialer, User } from '@/types/events.common'
 
 /**

package/src/types/socket.d.ts

@@ -1,5 +1,5 @@
 import { Socket } from 'socket.io-client'
 import { EventCallbackRegistry } from '@/types/events'
-import { EventsEnum } from 'enum/events.enum'
+import { EventsEnum } from '@/enum/events.enum'
 
 export type SocketTyped = Socket<EventCallbackRegistry, Record<EventsEnum, any>>

package/src/classes/auth/auth.urls.ts

@@ -1,8 +0,0 @@
-const getSettingsUrl = 'https://loginapidev.voicenter.co.il/Application/GetSettings'
-const refreshTokenUrl = 'https://loginapidev.voicenter.co.il/Auth/RefreshToken'
-
-
-export {
-    getSettingsUrl,
-    refreshTokenUrl
-}