lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1885 from siiky/fix/lam-1450/machines-unresponsive

Browse source 
LAM-1450 fix: machines unresponsive
This commit is contained in:
Rafael Taranto 2025-06-17 09:14:55 +01:00 • committed by GitHub
commit c3688f975a
1 changed files with 13 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

40
packages/server/lib/machine-loader.js
View file

@ -714,45 +714,31 @@ const enqueueRecordPing = ping => {
pendingRecordPings.set(ping.deviceId, ping) pendingRecordPings.set(ping.deviceId, ping)
} }
// from @sindresorhus/is-empty-iterable
const isEmptyIterable = iter => {
for (const _ of iter) return false
return true
}
const batchRecordPendingPings = () => { const batchRecordPendingPings = () => {
let pings = pendingRecordPings.values() const pings = pendingRecordPings.values()
pendingRecordPings = new Map() pendingRecordPings = new Map()
if (isEmptyIterable(pings)) return Promise.resolve()
const prepareChunk = (t, chunk) => return db.task(async t => {
chunk for (const { deviceId, last_online, version, model } of pings) {
.flatMap(({ deviceId, last_online, version, model }) => [ await t
t.none( .none(
`INSERT INTO machine_pings (device_id, device_time) `INSERT INTO machine_pings (device_id, device_time)
VALUES ($1, $2) VALUES ($1, $2)
ON CONFLICT (device_id) DO ON CONFLICT (device_id) DO
UPDATE SET device_time = $2, UPDATE SET device_time = $2,
updated = now()`, updated = now()`,
[deviceId, last_online], [deviceId, last_online],
), )
t.none( .catch(err => logger.error(err))
await t
.none(
pgp.helpers.update({ last_online, version, model }, null, 'devices') + pgp.helpers.update({ last_online, version, model }, null, 'devices') +
'WHERE device_id = ${deviceId}', 'WHERE device_id = ${deviceId}',
{ deviceId }, { deviceId },
), )
]) .catch(err => logger.error(err))
.toArray() }
})
const MaxBatchSize = 500
return db
.task(async t => {
while (!isEmptyIterable(pings)) {
const chunk = pings.take(MaxBatchSize)
await t.batch(prepareChunk(t, chunk)).catch(err => logger.error(err))
}
})
.catch(err => logger.error(err))
} }
module.exports = { module.exports = {