@voicenter-team/events-sdk 0.0.18 → 0.0.20

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

@@ -1,6 +1,25 @@
 <template>
     <div>
-        <p v-if="loading">
+        <Transition name="fade">
+            <div v-if="isOnline && showSuccessNotification" class="message message--success" key="success">
+                Connection established!
+            </div>
+        </Transition>
+
+        <Transition name="fade">
+            <p v-if="!isOnline" class="message message--error" key="error">
+                No connection
+                <div class="message-container">
+                    <Transition name="attempt-to-connect" mode="out-in">
+                        <span v-if="attemptToConnect" :key="attemptToConnect" class="message">
+                            Trying to connect to {{ attemptToConnect }}
+                        </span>
+                    </Transition>
+                </div>
+            </p>
+        </Transition>
+
+        <p v-if="loading && isOnline">
             Loading...
         </p>
 
@@ -28,6 +47,9 @@ import {EventTypeData} from '@/types/events'
 import {LoginType} from "@/enum/auth.enum";
 
 /* Data */
+const showSuccessNotification = ref(false)
+const isOnline = ref(true)
+const attemptToConnect = ref<string | undefined>(undefined)
 const token = ref('')
 const loading = ref(false)
 const loggedId = ref(false)
@@ -42,12 +64,24 @@ async function login() {
     loading.value = true
 
     const sdk = new EventsSdkClass({
-      loginUrl: "https://loginapidev.voicenter.co.il/Auth/Login/Voicenter/Monitor",
-      refreshTokenUrl: "https://loginapidev.voicenter.co.il/Auth/RefreshToken",
+      loginUrl: "https://loginapi.voicenter.co.il/monitorAPI/Login",
+      refreshTokenUrl: "https://loginapi.voicenter.co.il/monitorAPI/RefreshIdentityToken",
       loginType: LoginType.TOKEN, // <=== "User" or "Token"
       token: 'QMSVU9dwNYC9Le9VCBqx24AB9TYyWj9Xn5aCPV0GFHIWoShQqfPtnAPmnw24xpJIUSsDDtlac2OPpjx0t3MSkxH3AhiQGHCeGZ8e',
-      getSettingsUrl: "https://loginapidev.voicenter.co.il/Application/GetSettings",
-      isNewStack: true,
+      servers: [
+        {
+          URLID: 1,
+          Priority: 1,
+          Version: "1.3.7",
+          Domain: "monitor5.voicenter.co.il"
+        },
+        {
+          URLID: 2,
+          Priority: 2,
+          Version: "1.3.7",
+          Domain: "monitor6.voicenter.co.il"
+        }
+      ],
     })
 
     await sdk.init()
@@ -137,6 +171,22 @@ async function login() {
         }
     )
 
+    sdk.on(
+        EventsEnum.ONLINE_STATUS_EVENT,
+        ({ data }) => {
+            isOnline.value = data.isSocketConnected
+            attemptToConnect.value = data.attemptToConnect
+
+            if (data.isSocketConnected) {
+                showSuccessNotification.value = true
+
+                setTimeout(() => {
+                    showSuccessNotification.value = false
+                }, 3000)
+            }
+        }
+    )
+
     sdk.on(
         '*',
         (data) => {
@@ -183,3 +233,75 @@ async function login() {
     )
 }
 </script>
+
+<style>
+.fade-enter-active,
+.fade-leave-active {
+    transition: opacity 0.5s ease;
+}
+
+.fade-enter-from,
+.fade-leave-to {
+    opacity: 0;
+}
+
+
+.message-container {
+    position: relative;
+    min-height: 50px; /* Adjust based on your content's typical size */
+}
+
+/* Enhanced transition handling for attempt-to-connect */
+.attempt-to-connect-enter-active, .attempt-to-connect-leave-active {
+    transition: opacity 0.5s, transform 0.5s;
+    position: absolute;
+    width: 100%;
+    top: 0;
+    left: 0;
+}
+
+.attempt-to-connect-enter {
+    opacity: 0;
+    transform: translateY(20px);
+}
+
+.attempt-to-connect-leave-active {
+    opacity: 1;
+}
+
+.attempt-to-connect-leave-to {
+    opacity: 0;
+    transform: translateY(-20px);
+}
+
+.attempt-to-connect-enter-to, .attempt-to-connect-leave {
+    opacity: 1;
+    transform: translateY(0);
+    position: relative;
+}
+</style>
+
+<style lang="scss" scoped>
+.message {
+    border-radius: 24px;
+    font-size: 24px;
+    text-align: center;
+    padding: 8px 0;
+
+    &--error {
+        background-color: #a31c1c;
+        color: white;
+
+        span {
+            font-size: 16px;
+            margin-top: 16px;
+            display: block;
+        }
+    }
+
+    &--success {
+        background-color: #1ca31c;
+        color: white;
+    }
+}
+</style>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voicenter-team/events-sdk",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "description": "",
   "main": "dist/voicenter-events-sdk.cjs.js",
   "jsdelivr": "dist/voicenter-events-sdk.umd.js",

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

@@ -44,6 +44,8 @@ class AuthClass{
         const isLoggedIn = await this.checkLoginStatus(this.storageKey)
 
         if (!isLoggedIn) {
+            StorageClass.clearSessionStorage()
+
             await this.userLoginFunction(payload, this.storageKey, options.loginType)
         }
     }
@@ -118,17 +120,23 @@ class AuthClass{
                 (prev.Priority > current.Priority) ? prev : current
             )
         }
+        if (!this.eventsSdkClass.options.isNewStack && !this.eventsSdkClass.servers.length && loginSessionData.URLList) {
+            this.eventsSdkClass.URLList = loginSessionData.URLList
+        }
         if (this.eventsSdkClass.server) {
             this.eventsSdkClass.socketIoClass.getSocketIoFunction(`v=${this.eventsSdkClass.server.Version}`)
             this.eventsSdkClass.loggerClass.init()
         }
+        if (!this.eventsSdkClass.server && this.eventsSdkClass.URLList.length) {
+            this.eventsSdkClass.socketIoClass.getSocketIoFunction(`v=${loginSessionData.Client}`)
+        }
         if (loginSessionData.IdentityCode) {
             this.token = loginSessionData.IdentityCode
-            this.eventsSdkClass.connect(ServerParameter.DEFAULT, true)
+            this.eventsSdkClass.connect(ServerParameter.MAIN)
         }
         if (loginSessionData.Token) {
             this.token = loginSessionData.Token
-            this.eventsSdkClass.connect(ServerParameter.DEFAULT, true)
+            this.eventsSdkClass.connect(ServerParameter.MAIN)
         }
         if (loginSessionData.RefreshToken && loginSessionData.IdentityCodeExpiry && this.eventsSdkClass.options.loginType === LoginType.USER) {
             this.eventsSdkClass.options.refreshToken = loginSessionData.RefreshToken

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

@@ -26,7 +26,7 @@ export const eventsSdkDefaultOptions: Partial<EventsSdkOptions> = {
         reconnection: true,
         reconnectionDelay: 5000,
         reconnectionAttempts: 10,
-        perMessageDeflate: false,
+        perMessageDeflate: undefined,
         upgrade: false,
         transports: [ 'websocket' ],
         debug: false

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

@@ -5,53 +5,34 @@ import { SocketIoClass } from '@/classes/socket-io/socket-io.class'
 import { EventsSdkOptions, ReconnectOptions, Server, ServerParameter } from '@/classes/events-sdk/events-sdk.types'
 import { SocketTyped } from '@/types/socket'
 import {
-    GenericEventWrapper,
-    EventSpecificCallback,
     EventCallbackListenersMap,
+    EventSpecificCallback,
     EventTypeData,
     EventTypeNames,
+    GenericEventWrapper,
 } from '@/types/events'
 import { EventsEnum } from '@/enum/events.enum'
 import { LoggerClass } from '@/classes/logger/logger.class'
 
 class EventsSdkClass{
-    constructor (options: EventsSdkOptions) {
-        this.options = {
-            ...eventsSdkDefaultOptions,
-            ...options
-        }
-
-        this.server = this.options.fallbackServer
-
-        this.argumentOptions = {
-            ...options
-        }
-    }
-
     private argumentOptions: EventsSdkOptions
-    public readonly options: EventsSdkOptions = {
-        ...eventsSdkDefaultOptions
-    }
+    public readonly options: EventsSdkOptions
     public servers: Server[] = []
+    public URLList: string[] = []
     public server: Server
+    public URL: string | undefined
     public socket: SocketTyped | undefined
+    private mainServer: Server | undefined
+
+    private alreadyAttemptedOtherServers: Array<number | string> = []
 
     public authClass = new AuthClass(this)
     public socketIoClass = new SocketIoClass(this)
     public loggerClass = new LoggerClass(this)
 
-    public reconnectOptions: ReconnectOptions = {
-        retryCount: 1,
-        maxReconnectAttempts: this.options.maxReconnectAttempts,
-        reconnectionDelay: this.options.reconnectionDelay, // 10 seconds. After each re-connection attempt this number will increase (minReconnectionDelay * attempts) => 10, 20, 30, 40 seconds ... up to 5min
-        minReconnectionDelay: this.options.reconnectionDelay, // 10 seconds
-        maxReconnectionDelay: 60000 * 5 // 5 minutes
-    }
+    public reconnectOptions: ReconnectOptions
 
-    public retryConnection = debounce(this.connect.bind(this), this.reconnectOptions.reconnectionDelay, {
-        leading: true,
-        trailing: false
-    })
+    public retryConnection
 
     private listeners: EventCallbackListenersMap = {
         [EventsEnum.ALL_EXTENSION_STATUS]: [],
@@ -67,6 +48,32 @@ class EventsSdkClass{
     }
     private allListeners: Array<(data: GenericEventWrapper) => void> = []
 
+    constructor (options: EventsSdkOptions) {
+        this.options = {
+            ...eventsSdkDefaultOptions,
+            ...options
+        }
+
+        this.reconnectOptions = {
+            retryCount: 1,
+            maxReconnectAttempts: this.options.maxReconnectAttempts,
+            reconnectionDelay: this.options.reconnectionDelay, // 10 seconds. After each re-connection attempt this number will increase (minReconnectionDelay * attempts) => 10, 20, 30, 40 seconds ... up to 5min
+            minReconnectionDelay: this.options.reconnectionDelay, // 10 seconds
+            maxReconnectionDelay: 60000 * 5 // 5 minutes
+        }
+
+        this.server = this.options.fallbackServer
+
+        this.retryConnection = debounce(this.connect.bind(this), this.reconnectOptions.reconnectionDelay, {
+            leading: true,
+            trailing: false
+        })
+
+        this.argumentOptions = {
+            ...options
+        }
+    }
+
     public on<T extends EventTypeNames> (event: T, callback: EventSpecificCallback<T>): void
     public on (event: '*', callback: (data: GenericEventWrapper) => void): void
     public on (event: unknown, callback: unknown) {
@@ -110,23 +117,25 @@ class EventsSdkClass{
         this.allListeners.forEach((callback) => callback(allEventData))
     }
 
-    public connect (server: ServerParameter = ServerParameter.DEFAULT, skipLogin = false) {
-        let serverToConnect: Server | undefined
-
-        if (server === ServerParameter.DEFAULT) {
-            serverToConnect = this.findCurrentServer()
-        }
-
-        if (server === ServerParameter.NEXT) {
-            serverToConnect = this.findNextAvailableServer()
-        }
-
-        if (server === ServerParameter.PREVIOUS) {
-            serverToConnect = this.findMaxPriorityServer()
+    public connect (serverParameter: ServerParameter) {
+        // if (server === ServerParameter.DEFAULT) {
+        //     serverToConnect = this.findCurrentServer()
+        // }
+        //
+        // if (server === ServerParameter.NEXT) {
+        //     serverToConnect = this.findNextAvailableServer()
+        // }
+        //
+        // if (server === ServerParameter.PREVIOUS) {
+        //     serverToConnect = this.findMaxPriorityServer()
+        // }
+
+        if (serverParameter === ServerParameter.MAIN) {
+            this.findMainServer()
         }
 
-        if (!serverToConnect) {
-            this.server = this.findCurrentServer()
+        if (serverParameter === ServerParameter.NEXT) {
+            this.findNextServer()
         }
 
         this.socketIoClass.doReconnect = true
@@ -136,11 +145,6 @@ class EventsSdkClass{
         this.socketIoClass.initSocketEvents()
 
         this.socketIoClass.initKeepAlive()
-
-        // TODO: check if it is needed here
-        if (skipLogin) {
-            return
-        }
     }
 
     public disconnect () {
@@ -152,66 +156,78 @@ class EventsSdkClass{
         this.socketIoClass.clearKeepAliveInterval()
     }
 
-    private findCurrentServer (): Server {
+    private findMainServer () {
         if (this.servers.length) {
-            this.server = this.servers[0]
-        }
-        if (!this.server) {
-            this.server = this.options.fallbackServer
-        }
-        return this.server
-    }
-
-    private findNextAvailableServer (): Server {
-        // this.log(INFO, 'Failover -> Trying to find another server');
-
-        const currentServerPriority = this.server.Priority
-
-        const nextServerPriority = currentServerPriority + 1
-
-        const nextServer = this.servers.find(server => server.Priority === nextServerPriority) || this.findMinPriorityServer()
-
-        this.server = { ...nextServer }
-
-        // this.log(INFO, 'Failover -> Found new server. Connecting to it...', this.server);
-
-        return this.server
-    }
+            this.mainServer = this.servers.reduce((prev, cur) => {
+                return cur.Priority > prev.Priority ? cur : prev
+            })
 
-    private findMaxPriorityServer (): Server {
-        // this.log(INFO, 'Fallback -> Trying to find previous server');
-
-        const maxPriorityServer = this.getServerWithHighestPriority(this.servers)
-
-        if (!this.server) {
-            this.server = maxPriorityServer
-
-            return this.server
-        }
-
-        if (this.server && maxPriorityServer.Domain !== this.server.Domain) {
-            this.server = maxPriorityServer
-
-            // this.log(INFO, 'Fallback -> Trying to find previous server');
-
-            return this.server
+            this.server = this.mainServer
+        } else {
+            if (this.URLList.length) {
+                this.URL = this.URLList[0]
+            }
         }
-
-        return this.server
     }
 
-    private findMinPriorityServer (): Server {
-        const minPriority = Math.min(...this.servers.map(server => server.Priority))
-
-        const server = this.servers.find(server => server.Priority === minPriority)
-
-        if (server) {
-            this.server = server
-
-            return this.server
+    private findNextServer () {
+        if (this.servers.length) {
+            if (this.server.Priority === this.mainServer!.Priority) {
+                let filteredServers = this.servers.filter(
+                    server =>
+                        server.Priority !== this.mainServer!.Priority &&
+                        this.alreadyAttemptedOtherServers.indexOf(server.Priority) + 1 === 0
+                )
+
+                if (!filteredServers.length) {
+                    this.alreadyAttemptedOtherServers = []
+
+                    filteredServers = this.servers.filter(
+                        server =>
+                            server.Priority !== this.mainServer!.Priority &&
+                            this.alreadyAttemptedOtherServers.indexOf(server.Priority) + 1 === 0
+                    )
+                }
+
+                if (filteredServers.length) {
+                    this.server = filteredServers.reduce((prev, cur) => {
+                        return cur.Priority > prev.Priority ? cur : prev
+                    })
+
+                    this.alreadyAttemptedOtherServers.push(this.server.Priority)
+                }
+            } else {
+                this.server = this.mainServer!
+            }
+        } else {
+            if (this.URLList.length) {
+                if (this.URL === this.URLList[0]) {
+                    let filteredServers = this.URLList.filter(
+                        url =>
+                            url !== this.URLList[0] &&
+                            this.alreadyAttemptedOtherServers.indexOf(url) + 1 === 0
+                    )
+
+                    if (!filteredServers.length) {
+                        this.alreadyAttemptedOtherServers = []
+
+                        filteredServers = this.URLList.filter(
+                            url =>
+                                url !== this.URLList[0] &&
+                                this.alreadyAttemptedOtherServers.indexOf(url) + 1 === 0
+                        )
+                    }
+
+                    if (filteredServers.length) {
+                        this.URL = filteredServers[0]
+
+                        this.alreadyAttemptedOtherServers.push(this.URL)
+                    }
+                } else {
+                    this.URL = this.URLList[0]
+                }
+            }
         }
-
-        return this.server
     }
 
     public getServerWithHighestPriority (servers: Server[]): Server {

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

@@ -1,9 +1,17 @@
 import EventsSdkClass from '@/classes/events-sdk/events-sdk.class'
-import { eventsSdkDefaultOptions } from '@/classes/events-sdk/events-sdk-default-options'
+import { LoginType } from '@/enum/auth.enum'
 
 describe('EventsSdkClass', () => {
     it('should be true', () => {
-        const eventsSdkClass = new EventsSdkClass(eventsSdkDefaultOptions)
+        const eventsSdkClass = new EventsSdkClass({
+            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,
+        })
+
         expect(eventsSdkClass.init()).toBe(true)
     })
-})
+})

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

@@ -4,7 +4,7 @@ import { LoginType } from '@/enum/auth.enum'
 
 export interface EventsSdkOptions {
     isNewStack?: boolean,
-    servers: Server[],
+    servers?: Server[],
     loginUrl: string,
     getSettingsUrl?: string
     fallbackServer: Server,
@@ -70,7 +70,6 @@ export interface ReconnectOptions {
 }
 
 export enum ServerParameter {
-    DEFAULT = 'default',
-    NEXT = 'next',
-    PREVIOUS = 'previous'
+    MAIN = 'main',
+    NEXT = 'next'
 }

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

@@ -39,9 +39,9 @@ export class SocketIoClass{
         const server = this.eventsSdkClass.server
 
         try {
-            const domain = server.Domain
+            const domain = server ? server.Domain : this.eventsSdkClass.URL
 
-            const url = `${protocol}://${domain}`
+            const url = server ? `${protocol}://${domain}` : this.eventsSdkClass.URL
 
             // this.eventsSdkClass.loggerClass.log(
             //     LoggerTypeEnum.INFO,
@@ -50,6 +50,14 @@ export class SocketIoClass{
             //     url
             // )
 
+            this.eventsSdkClass.emit(
+                EventsEnum.ONLINE_STATUS_EVENT,
+                {
+                    isSocketConnected: false,
+                    attemptToConnect: url
+                }
+            )
+
             const options: Partial<ManagerOptions & SocketOptions> = {
                 reconnection: false,
                 upgrade: false,
@@ -66,8 +74,10 @@ export class SocketIoClass{
                 }
             }
 
-            if (this.ioFunction) {
+            if (this.ioFunction && url) {
                 this.io = this.ioFunction(url, options)
+            } else {
+                throw new Error('Socket server url no defined')
             }
         } catch (e) {
             // this.log(ERROR, e);
@@ -87,6 +97,12 @@ export class SocketIoClass{
                 .on(EventsEnum.KEEP_ALIVE_RESPONSE, (data) => this.onKeepAliveResponse(data))
                 .on(EventsEnum.CONNECT, () => this.onConnect())
                 .on(EventsEnum.DISCONNECT, () => this.onDisconnect())
+                .on(EventsEnum.CONNECT_ERROR_EVENT, () => {
+                    this.eventsSdkClass.emit(EventsEnum.ONLINE_STATUS_EVENT, { isSocketConnected: false })
+                    setTimeout(() => {
+                        this.eventsSdkClass.connect(ServerParameter.NEXT)
+                    },this.eventsSdkClass.options.reconnectionDelay)
+                })
         }
     }
 
@@ -170,9 +186,7 @@ export class SocketIoClass{
             return
         }
 
-        this.keepReconnectInterval = setInterval(() => {
-            console.log('attempt to connect...')
-            this.eventsSdkClass.connect(ServerParameter.NEXT, true)
-        }, 15000)
+        console.log('attempt to connect...')
+        this.eventsSdkClass.connect(ServerParameter.NEXT)
     }
 }

package/src/enum/events.enum.ts

@@ -7,6 +7,7 @@ export enum EventsEnum {
     ALL_USERS_STATUS = 'AllUsersStatus',
     CONNECT = 'connect',
     DISCONNECT = 'disconnect',
+    CONNECT_ERROR_EVENT = 'connect_error',
     EXTENSION_EVENT = 'ExtensionEvent',
     KEEP_ALIVE = 'keepalive',
     KEEP_ALIVE_RESPONSE = 'keepaliveResponse',

package/src/types/events.d.ts

@@ -98,6 +98,7 @@ export interface KeepAliveResponseEvent extends CommonEventProperties {
 
 export interface OnlineStatusEvent {
     isSocketConnected: boolean
+    attemptToConnect?: string
 }
 
 /**

package/swagger/generated/Swagger.json

@@ -1 +0,0 @@
-{"host":"localhost:3000","info":{"title":"admin-api","contact":{},"version":"0.01","description":"irst Alpha - Hope it will wok for yall :-)","termsOfService":""},"paths":{"/Account/List/":{"post":{"tags":["Account"],"security":[{"AdminAuthentication":["Admin"]}],"responses":{"200":{"schema":{"$ref":"#/definitions/AccountListResponse"},"description":"Status 200"},"400":{"schema":{"$ref":"#/definitions/Error"},"description":"Error Response"}},"parameters":[{"in":"body","name":"RequestBody","schema":{"$ref":"#/definitions/AccountListRequest"},"description":"Searching for Account that meets the query. multiple values are support. multiple selections in same feild will be treated as OR, multiple feilds will be searched with OR between them."}],"x-AuthType":["Admin"],"operationId":"AccountList","x-serviceID":3,"x-methodName":"List","x-serviceName":"Account"}},"/Account/Update/":{"post":{"tags":["Account"],"security":[{"AdminAuthentication":["Admin"]}],"responses":{"200":{"schema":{"$ref":"#/definitions/Response"},"description":"Status 200"},"400":{"schema":{"$ref":"#/definitions/Error"},"description":"Error Response"}},"parameters":[],"x-AuthType":["Admin"],"operationId":"AccountUpdate","x-serviceID":3,"x-methodName":"Update","x-serviceName":"Account"}}},"schemes":["https"],"swagger":"2.0","basePath":"/v1","consumes":["application/json"],"produces":["application/json"],"definitions":{"Error":{"type":"object","required":["Description","Status"],"properties":{"Status":{"type":"integer","example":400,"description":"Code of the Error"},"Description":{"type":"string","example":"Not found","description":"Textual description of the error"},"ReasonPhrase":{"type":"string","example":"ID not valid","description":"Specific reason for the error"}}},"Response":{"type":"object","required":["Description","ReasonPhrase","Status"],"properties":{"Status":{"type":"integer","example":200,"description":"Code of response"},"Description":{"type":"string","example":"OK","description":"Description of response"},"ReasonPhrase":{"type":"string","description":"Data of response"}}},"AccountAdd":{"type":"object","properties":{}},"ProviderAdd":{"type":"object","properties":{}},"ProviderDisable":{"type":"object","properties":{}},"ProvidersAddList":{"type":"object","properties":{}},"ProviderPrefixAdd":{"type":"object","properties":{}},"AccountListRequest":{"type":"object","properties":{}},"AccountListResponse":{"type":"object","properties":{}},"ProviderListResponse":{"type":"object","properties":{}},"ProviderPrefixUpdate":{"type":"object","properties":{}},"ProvidersDisableList":{"type":"object","properties":{}},"ProviderPrefixAddList":{"type":"object","properties":{}},"ProviderPrefixUpdateList":{"type":"object","properties":{}},"ProviderPrefixBulkRequest":{"type":"object","properties":{}},"ProviderPrefixBulkResponse":{"type":"object","properties":{}},"ProviderPrefixListResponse":{"type":"object","properties":{}},"ProviderPrefixUpdateResponse":{"type":"object","properties":{}}},"securityDefinitions":{}}