refactor: inline variables and reformat promises
This commit is contained in:
parent
ac7cb243af
commit
d2b78ea93d
1 changed files with 5 additions and 4 deletions
|
|
@ -72,9 +72,6 @@ function poll (req, res, next) {
|
||||||
const pi = plugins(settings, deviceId)
|
const pi = plugins(settings, deviceId)
|
||||||
const hasLightning = checkHasLightning(settings)
|
const hasLightning = checkHasLightning(settings)
|
||||||
|
|
||||||
const triggersAutomationPromise = configManager.getTriggersAutomation(settings.config)
|
|
||||||
const triggersPromise = buildTriggers(configManager.getTriggers(settings.config))
|
|
||||||
|
|
||||||
const operatorInfo = configManager.getOperatorInfo(settings.config)
|
const operatorInfo = configManager.getOperatorInfo(settings.config)
|
||||||
const machineInfo = { deviceId: req.deviceId, deviceName: req.deviceName }
|
const machineInfo = { deviceId: req.deviceId, deviceName: req.deviceName }
|
||||||
const cashOutConfig = configManager.getCashOut(deviceId, settings.config)
|
const cashOutConfig = configManager.getCashOut(deviceId, settings.config)
|
||||||
|
|
@ -84,7 +81,11 @@ function poll (req, res, next) {
|
||||||
|
|
||||||
state.pids = _.update(operatorId, _.set(deviceId, { pid, ts: Date.now() }), state.pids)
|
state.pids = _.update(operatorId, _.set(deviceId, { pid, ts: Date.now() }), state.pids)
|
||||||
|
|
||||||
return Promise.all([pi.pollQueries(deviceTime, req.query, machineVersion, machineModel), triggersPromise, triggersAutomationPromise])
|
return Promise.all([
|
||||||
|
pi.pollQueries(deviceTime, req.query, machineVersion, machineModel),
|
||||||
|
buildTriggers(configManager.getTriggers(settings.config)),
|
||||||
|
configManager.getTriggersAutomation(settings.config)
|
||||||
|
])
|
||||||
.then(([results, triggers, triggersAutomation]) => {
|
.then(([results, triggers, triggersAutomation]) => {
|
||||||
const reboot = pid && state.reboots?.[operatorId]?.[deviceId] === pid
|
const reboot = pid && state.reboots?.[operatorId]?.[deviceId] === pid
|
||||||
const shutdown = pid && state.shutdowns?.[operatorId]?.[deviceId] === pid
|
const shutdown = pid && state.shutdowns?.[operatorId]?.[deviceId] === pid
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue