Merge pull request #5 from blastorg/support-old-steam-id

support old steam id

Author: fredrikj31

src/entities.ts

@@ -1,8 +1,10 @@
-const basePlayerRe = /"(?<name>.+)<(?<entityId>\d*)><(?<steamId>(?:\[U:[01]:\d+\]|BOT|Console))>(?:<(?<team>[^>]*)>)?"/;
+const basePlayerRe =
+  /"(?<name>.+)<(?<entityId>\d*)><(?<steamId>(?:\[U:[01]:\d+\]|STEAM_[0-5]:[01]:\d+|BOT|Console))>(?:<(?<team>[^>]*)>)?"/;
 const baseEntityRe = /"chicken<(?<entityId>\d+)>"/;
 const baseWorldRe = /World/;
 
-export const entityRe = /".+<\d*><(?:\[U:[01]:\d+\]|BOT|Console)>(?:<[^>]*>)?"|"chicken<\d+>"|World/;
+export const entityRe =
+  /".+<\d*><(?:\[U:[01]:\d+\]|STEAM_[0-5]:[01]:\d+|BOT|Console)>(?:<[^>]*>)?"|"chicken<\d+>"|World/;
 export const vectorRe = /\[?[-.\d]+ [-.\d]+ [-.\d]+\]?/;
 
 export enum Team {
@@ -145,6 +147,19 @@ export const parseEntity = (rawEntity: string): Entity => {
 export const parseVector = (rawVector: string): Vector => rawVector.split(" ").map(Number) as Vector;
 
 export const convertSteamIdTo64Dec = (steamId: string): string => {
+  // old steam id format: STEAM_1:0:12345
+  if (steamId.includes("STEAM")) {
+    const steamIdSplit = steamId.split(":");
+    let commId = parseInt(steamIdSplit[2]) * 2;
+
+    if (steamIdSplit[1] === "1") {
+      commId += 1;
+    }
+    const newCommId = BigInt(commId) + BigInt(76561197960265728);
+    return newCommId.toString();
+  }
+
+  // new steam id format: [U:1:230970467]
   const cleanedSteamId = steamId.replaceAll(/\[|\]/g, "");
   const uSteamIdSplit = cleanedSteamId.split(":");
   const commId = BigInt(uSteamIdSplit[2]) + BigInt(76561197960265728);

tests/steam_id.test.ts

@@ -0,0 +1,37 @@
+import { ok } from "assert";
+import { parse } from "../src";
+import { getEventString } from "./helpers/getEventString";
+import { counterTerroristTeam } from "./helpers/teams";
+
+describe("steam id", () => {
+  const event = {
+    player: {
+      kind: "player",
+      entityId: 93,
+      steamId: "76561198191236195",
+      name: "PlayerName",
+      team: counterTerroristTeam,
+    },
+    how: "world",
+  };
+
+  it("should correctly parse with new steam id", () => {
+    const log = '"PlayerName<93><[U:1:230970467]><CT>" [-1117 2465 -72] committed suicide with "world"';
+    const result = parse(getEventString(log));
+
+    ok(result !== undefined, `Failed parse log: ${log}`);
+
+    expect(result.type).toBe("suicide");
+    expect(result.payload).toMatchObject(event);
+  });
+
+  it("should correctly parse with old steam id", () => {
+    const log = '"PlayerName<93><STEAM_0:1:115485233><CT>" [-1117 2465 -72] committed suicide with "world"';
+    const result = parse(getEventString(log));
+
+    ok(result !== undefined, `Failed parse log: ${log}`);
+
+    expect(result.type).toBe("suicide");
+    expect(result.payload).toMatchObject(event);
+  });
+});