repositories
/
e-mobility-charging-stations-simulator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build(deps-dev): apply updates
[e-mobility-charging-stations-simulator.git]
/
ui
/
web
/
src
/
composables
/
UIClient.ts
diff --git
a/ui/web/src/composables/UIClient.ts
b/ui/web/src/composables/UIClient.ts
index 8a86d1504624819305e38049d38bb3d321f74ae2..9522c59213c666a526d48927447024f3e8fc065a 100644
(file)
--- a/
ui/web/src/composables/UIClient.ts
+++ b/
ui/web/src/composables/UIClient.ts
@@
-1,5
+1,5
@@
import { useToast } from 'vue-toast-notification'
import { useToast } from 'vue-toast-notification'
-import { randomUUID } from './Utils'
+
import {
ApplicationProtocol,
AuthenticationType,
import {
ApplicationProtocol,
AuthenticationType,
@@
-12,6
+12,8
@@
import {
type UIServerConfigurationSection
} from '@/types'
type UIServerConfigurationSection
} from '@/types'
+import { randomUUID, validateUUID } from './Utils'
+
type ResponseHandler = {
procedureName: ProcedureName
resolve: (value: ResponsePayload | PromiseLike<ResponsePayload>) => void
type ResponseHandler = {
procedureName: ProcedureName
resolve: (value: ResponsePayload | PromiseLike<ResponsePayload>) => void
@@
-22,15
+24,24
@@
export class UIClient {
private static instance: UIClient | null = null
private ws?: WebSocket
private static instance: UIClient | null = null
private ws?: WebSocket
- private responseHandlers: Map<string, ResponseHandler>
+ private responseHandlers: Map<
+ `${string}-${string}-${string}-${string}-${string}`,
+ ResponseHandler
+ >
private constructor(private uiServerConfiguration: UIServerConfigurationSection) {
this.openWS()
private constructor(private uiServerConfiguration: UIServerConfigurationSection) {
this.openWS()
- this.responseHandlers = new Map<string, ResponseHandler>()
+ this.responseHandlers = new Map<
+ `${string}-${string}-${string}-${string}-${string}`,
+ ResponseHandler
+ >()
}
}
- public static getInstance(uiServerConfiguration: UIServerConfigurationSection): UIClient {
+ public static getInstance(uiServerConfiguration
?
: UIServerConfigurationSection): UIClient {
if (UIClient.instance === null) {
if (UIClient.instance === null) {
+ if (uiServerConfiguration == null) {
+ throw new Error('Cannot initialize UIClient if no configuration is provided')
+ }
UIClient.instance = new UIClient(uiServerConfiguration)
}
return UIClient.instance
UIClient.instance = new UIClient(uiServerConfiguration)
}
return UIClient.instance
@@
-225,15
+236,30
@@
export class UIClient {
}
private responseHandler(messageEvent: MessageEvent<string>): void {
}
private responseHandler(messageEvent: MessageEvent<string>): void {
- const response = JSON.parse(messageEvent.data) as ProtocolResponse
+ let response: ProtocolResponse
+ try {
+ response = JSON.parse(messageEvent.data)
+ } catch (error) {
+ useToast().error('Invalid response JSON format')
+ console.error('Invalid response JSON format', error)
+ return
+ }
- if (Array.isArray(response) === false) {
- throw new Error(`Response not an array: ${JSON.stringify(response, undefined, 2)}`)
+ if (!Array.isArray(response)) {
+ useToast().error('Response not an array')
+ console.error('Response not an array:', response)
+ return
}
const [uuid, responsePayload] = response
}
const [uuid, responsePayload] = response
- if (this.responseHandlers.has(uuid) === true) {
+ if (!validateUUID(uuid)) {
+ useToast().error('Response UUID field is invalid')
+ console.error('Response UUID field is invalid:', response)
+ return
+ }
+
+ if (this.responseHandlers.has(uuid)) {
const { procedureName, resolve, reject } = this.responseHandlers.get(uuid)!
switch (responsePayload.status) {
case ResponseStatus.SUCCESS:
const { procedureName, resolve, reject } = this.responseHandlers.get(uuid)!
switch (responsePayload.status) {
case ResponseStatus.SUCCESS: