tons of cursor-shit cleaning, finished implementing cnxId in observer
This commit is contained in:
@@ -11,7 +11,7 @@ export const dispatchMessage = createDispatchMessage({
|
||||
actionRules(redisCnx) {
|
||||
const maestro = redisCnx.config.maestro ?? {}
|
||||
return({
|
||||
channels: [maestro.maestroActionsChannel].filter(Boolean),
|
||||
channels: [maestro.ActionsChannel].filter(Boolean),
|
||||
})
|
||||
},
|
||||
})
|
||||
|
||||
@@ -3,20 +3,20 @@ import { isValidUuid } from '../../simRepository.js'
|
||||
|
||||
export const actions = {
|
||||
|
||||
async action_STARTSIMULATION(action, payload, reqid, sender, roles) {
|
||||
async action_STARTSIMULATION(action, payload, reqid, sender, cnxId, roles) {
|
||||
if(!isValidUuid(sender)) {
|
||||
replyToAction(this, { action, reqid, sender, success: false, err: 'Missing or invalid sender (user UUID)' })
|
||||
replyToAction(this, { action, reqid, sender, cnxId, success: false, err: 'Missing or invalid sender (user UUID)' })
|
||||
return
|
||||
}
|
||||
|
||||
if(!payload?.simulationUuid) {
|
||||
replyToAction(this, { action, reqid, sender, success: false, err: 'Missing simulationUuid' })
|
||||
replyToAction(this, { action, reqid, sender, cnxId, success: false, err: 'Missing simulationUuid' })
|
||||
return
|
||||
}
|
||||
|
||||
const result = await this.maestroSrv.startSimulation(sender, payload)
|
||||
if(!result.ok) {
|
||||
replyToAction(this, { action, reqid, sender, success: false, err: result.err })
|
||||
replyToAction(this, { action, reqid, sender, cnxId, success: false, err: result.err })
|
||||
return
|
||||
}
|
||||
|
||||
@@ -24,6 +24,7 @@ export const actions = {
|
||||
action,
|
||||
reqid,
|
||||
sender,
|
||||
cnxId,
|
||||
success: true,
|
||||
payload: {
|
||||
simulationId: result.simulationId,
|
||||
@@ -36,20 +37,20 @@ export const actions = {
|
||||
})
|
||||
},
|
||||
|
||||
async action_PAUSESIMULATION(action, payload, reqid, sender, roles) {
|
||||
async action_PAUSESIMULATION(action, payload, reqid, sender, cnxId, roles) {
|
||||
if(!isValidUuid(sender)) {
|
||||
replyToAction(this, { action, reqid, sender, success: false, err: 'Missing or invalid sender (user UUID)' })
|
||||
replyToAction(this, { action, reqid, sender, cnxId, success: false, err: 'Missing or invalid sender (user UUID)' })
|
||||
return
|
||||
}
|
||||
|
||||
if(!payload?.simulationUuid) {
|
||||
replyToAction(this, { action, reqid, sender, success: false, err: 'Missing simulationUuid' })
|
||||
replyToAction(this, { action, reqid, sender, cnxId, success: false, err: 'Missing simulationUuid' })
|
||||
return
|
||||
}
|
||||
|
||||
const result = await this.maestroSrv.pauseSimulation(sender, payload)
|
||||
if(!result.ok) {
|
||||
replyToAction(this, { action, reqid, sender, success: false, err: result.err })
|
||||
replyToAction(this, { action, reqid, sender, cnxId, success: false, err: result.err })
|
||||
return
|
||||
}
|
||||
|
||||
@@ -57,6 +58,7 @@ export const actions = {
|
||||
action,
|
||||
reqid,
|
||||
sender,
|
||||
cnxId,
|
||||
success: true,
|
||||
payload: {
|
||||
simulationId: result.simulationId,
|
||||
@@ -65,20 +67,20 @@ export const actions = {
|
||||
})
|
||||
},
|
||||
|
||||
async action_STOPSIMULATION(action, payload, reqid, sender, roles) {
|
||||
async action_STOPSIMULATION(action, payload, reqid, sender, cnxId, roles) {
|
||||
if(!isValidUuid(sender)) {
|
||||
replyToAction(this, { action, reqid, sender, success: false, err: 'Missing or invalid sender (user UUID)' })
|
||||
replyToAction(this, { action, reqid, sender, cnxId, success: false, err: 'Missing or invalid sender (user UUID)' })
|
||||
return
|
||||
}
|
||||
|
||||
if(!payload?.simulationUuid) {
|
||||
replyToAction(this, { action, reqid, sender, success: false, err: 'Missing simulationUuid' })
|
||||
replyToAction(this, { action, reqid, sender, cnxId, success: false, err: 'Missing simulationUuid' })
|
||||
return
|
||||
}
|
||||
|
||||
const result = await this.maestroSrv.stopSimulation(sender, payload)
|
||||
if(!result.ok) {
|
||||
replyToAction(this, { action, reqid, sender, success: false, err: result.err })
|
||||
replyToAction(this, { action, reqid, sender, cnxId, success: false, err: result.err })
|
||||
return
|
||||
}
|
||||
|
||||
@@ -86,20 +88,21 @@ export const actions = {
|
||||
action,
|
||||
reqid,
|
||||
sender,
|
||||
cnxId,
|
||||
success: true,
|
||||
payload: { simulationId: result.simulationId },
|
||||
})
|
||||
},
|
||||
|
||||
async action_GETSIMULATIONSSTATUS(action, payload, reqid, sender, roles) {
|
||||
async action_GETSIMULATIONSSTATUS(action, payload, reqid, sender, cnxId, roles) {
|
||||
if(!isValidUuid(sender)) {
|
||||
replyToAction(this, { action, reqid, sender, success: false, err: 'Missing or invalid sender (user UUID)' })
|
||||
replyToAction(this, { action, reqid, sender, cnxId, success: false, err: 'Missing or invalid sender (user UUID)' })
|
||||
return
|
||||
}
|
||||
|
||||
const result = await this.maestroSrv.getSimulationsStatus(sender)
|
||||
if(!result.ok) {
|
||||
replyToAction(this, { action, reqid, sender, success: false, err: result.err })
|
||||
replyToAction(this, { action, reqid, sender, cnxId, success: false, err: result.err })
|
||||
return
|
||||
}
|
||||
|
||||
@@ -107,6 +110,7 @@ export const actions = {
|
||||
action,
|
||||
reqid,
|
||||
sender,
|
||||
cnxId,
|
||||
success: true,
|
||||
payload: result.simulations,
|
||||
})
|
||||
|
||||
@@ -2,16 +2,17 @@ import { replyToAction } from '../../../bus/publishActionReply.js'
|
||||
|
||||
export const actions = {
|
||||
|
||||
async action_RELOADCONFIG(action, payload, reqid, sender, roles) {
|
||||
async action_RELOADCONFIG(action, payload, reqid, sender, cnxId, roles) {
|
||||
this.reloadAccessRights()
|
||||
replyToAction(this, { action, reqid, sender, success: true })
|
||||
replyToAction(this, { action, reqid, sender, cnxId, success: true })
|
||||
},
|
||||
|
||||
async action_GETCONFIG(action, payload, reqid, sender, roles) {
|
||||
async action_GETCONFIG(action, payload, reqid, sender, cnxId, roles) {
|
||||
replyToAction(this, {
|
||||
action,
|
||||
reqid,
|
||||
sender,
|
||||
cnxId,
|
||||
success: true,
|
||||
payload: this.getAccessRights(),
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user