Skip to content

Improve kill log parsing and delay combat log retrieval #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
demassimo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve kill log parsing and delay combat log retrieval #240

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions backend/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,6 +1084,8 @@ async function handleKillFeedLine(serverId, line) {
try {
const serverRow = await getMonitoredServerRow(key);
if (serverRow) {
// Give the server time to populate the combat log before requesting it.
await new Promise((resolve) => setTimeout(resolve, 10000));
const reply = await sendRconCommand(serverRow, `combatlog ${parsed.victimSteamId}`, {
silent: true,
timeoutMs: 15000
Expand Down Expand Up @@ -3045,9 +3047,11 @@ function parseKillLogLine(line) {
const killerInfo = extractNameAndClan(match.groups.killerPart);
const rest = match.groups.rest || '';

const weaponMatch = rest.match(/using\s+(.+?)(?:\s+from\s+|\s+at\s+\(|$)/i);
const distanceMatch = rest.match(/from\s+(-?\d+(?:\.\d+)?)\s*m/i);
const positionMatch = rest.match(/\(\s*(-?\d+(?:\.\d+)?)\s*,\s*(-?\d+(?:\.\d+)?)\s*,\s*(-?\d+(?:\.\d+)?)\s*\)/);
const weaponMatch = rest.match(/\b(?:using|with)\s+(?<weapon>.+?)(?=(?:\s+from\b|\s+at\b|$))/i);
const distanceMatch = rest.match(/\bfrom\s+(-?\d+(?:\.\d+)?)\s*m\b/i);
const positionMatch =
rest.match(/\bat\s*\(\s*(-?\d+(?:\.\d+)?)\s*,\s*(-?\d+(?:\.\d+)?)\s*,\s*(-?\d+(?:\.\d+)?)\s*\)/i) ||
rest.match(/\(\s*(-?\d+(?:\.\d+)?)\s*,\s*(-?\d+(?:\.\d+)?)\s*,\s*(-?\d+(?:\.\d+)?)\s*\)/);

const distance = distanceMatch ? Number(distanceMatch[1]) : null;
const posX = positionMatch ? Number(positionMatch[1]) : null;
Expand All @@ -3064,7 +3068,17 @@ function parseKillLogLine(line) {
victimSteamId: match.groups.victimId,
victimName: victimInfo.name,
victimClan: victimInfo.clan,
weapon: weaponMatch ? weaponMatch[1].trim() : null,
weapon: (() => {
if (weaponMatch?.groups?.weapon) {
const value = weaponMatch.groups.weapon.trim();
return value || null;
}
if (Array.isArray(weaponMatch) && weaponMatch[1]) {
const value = weaponMatch[1].trim();
return value || null;
}
return null;
})(),
distance: Number.isFinite(distance) ? distance : null,
position: Number.isFinite(posX) && Number.isFinite(posY) && Number.isFinite(posZ)
? { x: posX, y: posY, z: posZ }
Expand Down