add player server report
This commit is contained in:
@@ -2,6 +2,7 @@ import { Router } from 'express'
|
|||||||
import serverWeapons from './serverWeapons'
|
import serverWeapons from './serverWeapons'
|
||||||
import playerWeapons from './playerWeapons'
|
import playerWeapons from './playerWeapons'
|
||||||
import serverPlayers from './serverPlayers'
|
import serverPlayers from './serverPlayers'
|
||||||
|
import player from './player'
|
||||||
const router = Router()
|
const router = Router()
|
||||||
//timeout middleware ?
|
//timeout middleware ?
|
||||||
router.get('/*', (req, res, next) => {
|
router.get('/*', (req, res, next) => {
|
||||||
@@ -18,7 +19,8 @@ router.get('/players/:playerId', (req, res, next) => {})
|
|||||||
router.get('/servers/', (req, res, next) => {})
|
router.get('/servers/', (req, res, next) => {})
|
||||||
router.get('/servers/:serverId/', (req, res, next) => {})
|
router.get('/servers/:serverId/', (req, res, next) => {})
|
||||||
router.get('/servers/:serverId/players', serverPlayers)
|
router.get('/servers/:serverId/players', serverPlayers)
|
||||||
router.get('/servers/:serverId/player/:playerId', playerWeapons)
|
router.get('/servers/:serverId/players/:playerId', player)
|
||||||
|
router.get('/servers/:serverId/players/:playerId/weapons', playerWeapons)
|
||||||
router.use('/servers/:serverId/weapons', serverWeapons)
|
router.use('/servers/:serverId/weapons', serverWeapons)
|
||||||
|
|
||||||
export default router
|
export default router
|
||||||
|
|||||||
@@ -0,0 +1,104 @@
|
|||||||
|
import { RequestHandler } from 'express'
|
||||||
|
import { param } from 'express-validator'
|
||||||
|
import { validateErrors } from '../common'
|
||||||
|
import cache from '../cache/redis'
|
||||||
|
import { sql } from 'kysely'
|
||||||
|
import db from '../db/db'
|
||||||
|
|
||||||
|
const { count, max, min, avg } = db.fn
|
||||||
|
|
||||||
|
const middlewares: RequestHandler[] = [
|
||||||
|
param(['serverId', 'playerId']).exists().toInt().isInt(),
|
||||||
|
validateErrors,
|
||||||
|
async (req, res) => {
|
||||||
|
const server = Number(req.params.serverId)
|
||||||
|
const player = Number(req.params.playerId)
|
||||||
|
await processPlayerReport(server, player)
|
||||||
|
const data = await getPlayerReport(server, player)
|
||||||
|
res.status(200).send(data)
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
||||||
|
async function getPlayerReport(server: number, player: number) {
|
||||||
|
const data = await cache.HGETALL(`servers:${server}:players:${player}`)
|
||||||
|
delete data.last_entry
|
||||||
|
return data
|
||||||
|
}
|
||||||
|
|
||||||
|
async function processPlayerReport(server: number, player: number) {
|
||||||
|
let last_entry =
|
||||||
|
Number(
|
||||||
|
await cache.HGET(`servers:${server}:players:${player}`, 'last_entry')
|
||||||
|
) || 0
|
||||||
|
const newData = await db
|
||||||
|
.with('killdata', () =>
|
||||||
|
db
|
||||||
|
.selectFrom('kill')
|
||||||
|
.select([
|
||||||
|
count('kill.id').as('num_kills'),
|
||||||
|
'kill.attacker_id',
|
||||||
|
max('unix_time').as('last_seen'),
|
||||||
|
min('unix_time').as('first_seen'),
|
||||||
|
max('distance').as('max_kill_distance'),
|
||||||
|
avg('distance').as('avg_kill_distance')
|
||||||
|
])
|
||||||
|
.where('attacker_id', '=', player.toString())
|
||||||
|
.where('kill.id', '>', last_entry)
|
||||||
|
.where('kill.server', '=', server)
|
||||||
|
.whereRef('attacker_id', '!=', 'victim_id')
|
||||||
|
.groupBy('attacker_id')
|
||||||
|
)
|
||||||
|
.with('deathdata', () =>
|
||||||
|
db
|
||||||
|
.selectFrom('kill')
|
||||||
|
.select([
|
||||||
|
count('kill.id').as('num_deaths'),
|
||||||
|
'kill.victim_id',
|
||||||
|
max('unix_time').as('last_seen'),
|
||||||
|
min('unix_time').as('first_seen')
|
||||||
|
])
|
||||||
|
.where('victim_id', '=', player.toString())
|
||||||
|
.where('kill.id', '>', last_entry)
|
||||||
|
.where('kill.server', '=', server)
|
||||||
|
.groupBy('victim_id')
|
||||||
|
)
|
||||||
|
.selectFrom('killdata')
|
||||||
|
.select([
|
||||||
|
sql<number>`coalesce(killdata.num_kills, 0)`.as('kills'),
|
||||||
|
sql<number>`coalesce(deathdata.num_deaths, 0)`.as('deaths'),
|
||||||
|
sql<number>`greatest(killdata.last_seen,deathdata.last_seen)`.as(
|
||||||
|
'last_seen'
|
||||||
|
),
|
||||||
|
sql<number>`least(killdata.first_seen,deathdata.first_seen)`.as(
|
||||||
|
'first_seen'
|
||||||
|
),
|
||||||
|
'killdata.max_kill_distance',
|
||||||
|
'killdata.avg_kill_distance',
|
||||||
|
db
|
||||||
|
.selectFrom('kill')
|
||||||
|
.select(max('kill.id').as('last_entry'))
|
||||||
|
.as('last_entry')
|
||||||
|
])
|
||||||
|
.fullJoin('deathdata', 'deathdata.victim_id', 'killdata.attacker_id')
|
||||||
|
.orderBy('kills', 'desc')
|
||||||
|
.execute()
|
||||||
|
//if no new kills
|
||||||
|
console.log(newData)
|
||||||
|
if (newData.length == 0) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const promises: Promise<number>[] = []
|
||||||
|
Object.entries(newData[0]).forEach(([key, value]) => {
|
||||||
|
promises.push(
|
||||||
|
cache.HSET(
|
||||||
|
`servers:${server}:players:${player}`,
|
||||||
|
key.toString(),
|
||||||
|
value.toString()
|
||||||
|
)
|
||||||
|
)
|
||||||
|
})
|
||||||
|
await Promise.all(promises)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default middlewares
|
||||||
Reference in New Issue
Block a user