some minor refactoring to prepare for re-encoding

src/Data/Packet.ts

@@ -107,6 +107,7 @@ export interface TextMessagePacket {
 export interface UnknownUserMessagePacket {
 	packetType: 'unknownUserMessage';
 	type: number;
+	data: BitStream;
 }
 
 export interface VoiceInitPacket {

src/Parser/Message/Packet.ts

@@ -1,22 +1,22 @@
 import * as ParserGenerator from '../Packet/ParserGenerator';
 
-import {BSPDecal} from '../Packet/BSPDecal';
+import {ParseBSPDecal} from '../Packet/BSPDecal';
-import {ClassInfo} from '../Packet/ClassInfo';
+import {ParseClassInfo} from '../Packet/ClassInfo';
-import {CmdKeyValues} from '../Packet/CmdKeyValues';
+import {ParseCmdKeyValues} from '../Packet/CmdKeyValues';
-import {CreateStringTable} from '../Packet/CreateStringTable';
+import {ParseCreateStringTable} from '../Packet/CreateStringTable';
-import {EntityMessage} from '../Packet/EntityMessage';
+import {ParseEntityMessage} from '../Packet/EntityMessage';
-import {GameEvent} from '../Packet/GameEvent';
+import {ParseGameEvent} from '../Packet/GameEvent';
-import {GameEventList} from '../Packet/GameEventList';
+import {ParseGameEventList} from '../Packet/GameEventList';
-import {Menu} from '../Packet/Menu';
+import {ParseMenu} from '../Packet/Menu';
-import {PacketEntities} from '../Packet/PacketEntities';
+import {ParsePacketEntities} from '../Packet/PacketEntities';
 import {PacketParserMap} from '../Packet/Parser';
-import {ParseSounds} from '../Packet/ParseSounds';
+import {ParseParseSounds} from '../Packet/ParseSounds';
-import {SetConVar} from '../Packet/SetConVar';
+import {ParseSetConVar} from '../Packet/SetConVar';
-import {TempEntities} from '../Packet/TempEntities';
+import {ParseTempEntities} from '../Packet/TempEntities';
-import {UpdateStringTable} from '../Packet/UpdateStringTable';
+import {ParseUpdateStringTable} from '../Packet/UpdateStringTable';
-import {UserMessage} from '../Packet/UserMessage';
+import {ParseUserMessage} from '../Packet/UserMessage';
-import {VoiceData} from '../Packet/VoiceData';
+import {ParseVoiceData} from '../Packet/VoiceData';
-import {VoiceInit} from '../Packet/VoiceInit';
+import {ParseVoiceInit} from '../Packet/VoiceInit';
 import {Parser} from './Parser';
 
 import {GameEventDefinitionMap} from '../../Data/GameEvent';
@@ -33,33 +33,33 @@ export class Packet extends Parser {
 		2:  ParserGenerator.make('file', 'transferId{32}fileName{s}requested{b}'),
 		3:  ParserGenerator.make('netTick', 'tick{32}frameTime{16}stdDev{16}'),
 		4:  ParserGenerator.make('stringCmd', 'command{s}'),
-		5:  SetConVar,
+		5:  ParseSetConVar,
 		6:  ParserGenerator.make('sigOnState', 'state{8}count{32}'),
 		7:  ParserGenerator.make('print', 'value{s}'),
 		8:  ParserGenerator.make('serverInfo',
 			'version{16}serverCount{32}stv{b}dedicated{b}maxCrc{32}maxClasses{16}' +
 			'mapHash{128}playerCount{8}maxPlayerCount{8}intervalPerTick{f32}platform{s1}' +
 			'game{s}map{s}skybox{s}serverName{s}replay{b}'),
-		10: ClassInfo,
+		10: ParseClassInfo,
 		11: ParserGenerator.make('setPause', 'paused{b}'),
-		12: CreateStringTable,
+		12: ParseCreateStringTable,
-		13: UpdateStringTable,
+		13: ParseUpdateStringTable,
-		14: VoiceInit,
+		14: ParseVoiceInit,
-		15: VoiceData,
+		15: ParseVoiceData,
-		17: ParseSounds,
+		17: ParseParseSounds,
 		18: ParserGenerator.make('setView', 'index{11}'),
 		19: ParserGenerator.make('fixAngle', 'relative{b}x{16}y{16}z{16}'),
-		21: BSPDecal,
+		21: ParseBSPDecal,
-		23: UserMessage,
+		23: ParseUserMessage,
-		24: EntityMessage,
+		24: ParseEntityMessage,
-		25: GameEvent,
+		25: ParseGameEvent,
-		26: PacketEntities,
+		26: ParsePacketEntities,
-		27: TempEntities,
+		27: ParseTempEntities,
 		28: ParserGenerator.make('preFetch', 'index{14}'),
-		29: Menu,
+		29: ParseMenu,
-		30: GameEventList,
+		30: ParseGameEventList,
 		31: ParserGenerator.make('getCvarValue', 'cookie{32}value{s}'),
-		32: CmdKeyValues,
+		32: ParseCmdKeyValues,
 	};
 
 	public parse() {

src/Parser/Packet/BSPDecal.ts

@@ -22,9 +22,9 @@ function getCoord(stream) {
 }
 
 function getVecCoord(stream): Vector {
-	const hasX = !!stream.readBits(1);
+	const hasX = stream.readBoolean();
-	const hasY = !!stream.readBits(1);
+	const hasY = stream.readBoolean();
-	const hasZ = !!stream.readBits(1);
+	const hasZ = stream.readBoolean();
 	return {
 		x: hasX ? getCoord(stream) : 0,
 		y: hasY ? getCoord(stream) : 0,
@@ -32,7 +32,7 @@ function getVecCoord(stream): Vector {
 	};
 }
 
-export function BSPDecal(stream: BitStream): BSPDecalPacket { // 21: BSPDecal
+export function ParseBSPDecal(stream: BitStream): BSPDecalPacket { // 21: ParseBSPDecal
 	let modelIndex = 0;
 	let entIndex = 0;
 	const position = getVecCoord(stream);

src/Parser/Packet/ClassInfo.ts

@@ -2,7 +2,7 @@ import {BitStream} from 'bit-buffer';
 import {ClassInfoPacket} from '../../Data/Packet';
 import {logBase2} from '../../Math';
 
-export function ClassInfo(stream: BitStream): ClassInfoPacket { // 10: classInfo
+export function ParseClassInfo(stream: BitStream): ClassInfoPacket { // 10: classInfo
 	const count       = stream.readBits(16);
 	const create       = stream.readBoolean();
 	const entries: any[] = [];

src/Parser/Packet/CmdKeyValues.ts

@@ -1,10 +1,10 @@
 import {BitStream} from 'bit-buffer';
 import {CmdKeyValuesPacket} from '../../Data/Packet';
 
-export function CmdKeyValues(stream: BitStream): CmdKeyValuesPacket {
+export function ParseCmdKeyValues(stream: BitStream): CmdKeyValuesPacket {
-	// 'length{32}data{$length}'
 	const length = stream.readUint32();
 	const data   = stream.readBitStream(length);
+	// 'length{32}data{$length}'
 	return {
 		packetType: 'cmdKeyValues',
 		length,

src/Parser/Packet/CreateStringTable.ts

@@ -8,7 +8,7 @@ import {Match} from '../../Data/Match';
 import {StringTable} from '../../Data/StringTable';
 import {parseStringTable} from '../StringTableParser';
 
-export function CreateStringTable(stream: BitStream, match: Match): StringTablePacket { // 12: createStringTable
+export function ParseCreateStringTable(stream: BitStream, match: Match): StringTablePacket { // 12: createStringTable
 	const tableName   = stream.readASCIIString();
 	const maxEntries  = stream.readUint16();
 	const encodeBits  = logBase2(maxEntries);

src/Parser/Packet/EntityMessage.ts

@@ -6,6 +6,9 @@ import {EntityMessagePacket} from '../../Data/Packet';
 
 const baseParser = make('entityMessage', 'index{11}classId{9}length{11}data{$length}');
 
-export function EntityMessage(stream: BitStream, match: Match): EntityMessagePacket { // 24: entityMessage
+export function ParseEntityMessage(stream: BitStream, match: Match): EntityMessagePacket { // 24: entityMessage
-	return baseParser(stream) as EntityMessagePacket; // todo parse data further?
+	const basePacketData: EntityMessagePacket = baseParser(stream) as EntityMessagePacket;
+	// entity messages seem pretty unimportant, they are unreliable messages and from testing only the "clear decals"
+	// message seems to be used in practice, probably safe to just leave as is
+	return basePacketData; // todo parse data further?
 }

src/Parser/Packet/GameEvent.ts

@@ -45,7 +45,7 @@ function getGameEventValue(stream: BitStream, entry: GameEventEntry): GameEventV
 	}
 }
 
-export function GameEvent(stream: BitStream, match: Match): GameEventPacket { // 25: game event
+export function ParseGameEvent(stream: BitStream, match: Match): GameEventPacket { // 25: game event
 	const length = stream.readBits(11);
 	const end = stream.index + length;
 	const eventId = stream.readBits(9);

src/Parser/Packet/GameEventList.ts

@@ -3,7 +3,7 @@ import {GameEventDefinitionMap, GameEventEntry} from '../../Data/GameEvent';
 import {Match} from '../../Data/Match';
 import {GameEventListPacket} from '../../Data/Packet';
 
-export function GameEventList(stream: BitStream, match: Match): GameEventListPacket { // 30: gameEventList
+export function ParseGameEventList(stream: BitStream, match: Match): GameEventListPacket { // 30: gameEventList
 	// list of game events and parameters
 	const numEvents                         = stream.readBits(9);
 	const length                            = stream.readBits(20);

src/Parser/Packet/Menu.ts

@@ -1,7 +1,7 @@
 import {BitStream} from 'bit-buffer';
 import {MenuPacket} from '../../Data/Packet';
 
-export function Menu(stream: BitStream): MenuPacket {
+export function ParseMenu(stream: BitStream): MenuPacket {
 	const type   = stream.readUint16();
 	const length = stream.readUint16();
 	const data   = stream.readBitStream(length * 8); // length is in bytes

src/Parser/Packet/PacketEntities.ts

@@ -58,7 +58,7 @@ function getPacketEntityForExisting(entityId: number, match: Match, pvs: PVS) {
 	return new PacketEntity(serverClass, entityId, pvs);
 }
 
-export function PacketEntities(stream: BitStream, match: Match, skip: boolean = false): PacketEntitiesPacket { // 26: packetEntities
+export function ParsePacketEntities(stream: BitStream, match: Match, skip: boolean = false): PacketEntitiesPacket { // 26: packetEntities
 	// https://github.com/skadistats/smoke/blob/master/smoke/replay/handler/svc_packetentities.pyx
 	// https://github.com/StatsHelix/demoinfo/blob/3d28ea917c3d44d987b98bb8f976f1a3fcc19821/DemoInfo/DP/Handler/PacketEntitesHandler.cs
 	// https://github.com/StatsHelix/demoinfo/blob/3d28ea917c3d44d987b98bb8f976f1a3fcc19821/DemoInfo/DP/Entity.cs

src/Parser/Packet/ParseSounds.ts

@@ -1,7 +1,7 @@
 import {BitStream} from 'bit-buffer';
 import {ParseSoundsPacket} from '../../Data/Packet';
 
-export function ParseSounds(stream: BitStream): ParseSoundsPacket { // 17: parseSounds
+export function ParseParseSounds(stream: BitStream): ParseSoundsPacket { // 17: parseSounds
 	const reliable = stream.readBoolean();
 	const num = (reliable) ? 1 : stream.readUint8();
 	const length = (reliable) ? stream.readUint8() : stream.readUint16();

src/Parser/Packet/SetConVar.ts

@@ -1,7 +1,7 @@
 import {BitStream} from 'bit-buffer';
 import {SetConVarPacket} from '../../Data/Packet';
 
-export function SetConVar(stream: BitStream): SetConVarPacket { // 5: setconvar
+export function ParseSetConVar(stream: BitStream): SetConVarPacket { // 5: setconvar
 	const count                       = stream.readBits(8);
 	const vars: {[key: string]: string} = {};
 	for (let i = 0; i < count; i++) {

src/Parser/Packet/TempEntities.ts

@@ -4,7 +4,7 @@ import {TempEntitiesPacket} from '../../Data/Packet';
 import {PacketEntity, PVS} from '../../Data/PacketEntity';
 import {applyEntityUpdate} from '../EntityDecoder';
 
-export function TempEntities(stream: BitStream, match: Match, skip: boolean = false): TempEntitiesPacket { // 10: classInfo
+export function ParseTempEntities(stream: BitStream, match: Match, skip: boolean = false): TempEntitiesPacket { // 10: classInfo
 	const entityCount = stream.readBits(8);
 	const length      = readVarInt(stream);
 	const end         = stream.index + length;

src/Parser/Packet/UpdateStringTable.ts

@@ -3,7 +3,7 @@ import {Match} from '../../Data/Match';
 import {StringTablePacket} from '../../Data/Packet';
 import {parseStringTable} from '../StringTableParser';
 
-export function UpdateStringTable(stream: BitStream, match: Match): StringTablePacket { // 12: updateStringTable
+export function ParseUpdateStringTable(stream: BitStream, match: Match): StringTablePacket { // 12: updateStringTable
 	const tableId = stream.readBits(5);
 
 	const multipleChanged = stream.readBoolean();

src/Parser/Packet/UserMessage.ts

@@ -4,64 +4,64 @@ import {SayText2} from '../UserMessage/SayText2';
 import {make} from './ParserGenerator';
 
 enum UserMessageType {
-	Geiger              = 0,
+	Geiger = 0,
-	Train               = 1,
+	Train = 1,
-	HudText             = 2,
+	HudText = 2,
-	SayText             = 3,
+	SayText = 3,
-	SayText2            = 4,
+	SayText2 = 4,
-	TextMsg             = 5,
+	TextMsg = 5,
-	ResetHUD            = 6,
+	ResetHUD = 6,
-	GameTitle           = 7,
+	GameTitle = 7,
-	ItemPickup          = 8,
+	ItemPickup = 8,
-	ShowMenu            = 9,
+	ShowMenu = 9,
-	Shake               = 10,
+	Shake = 10,
-	Fade                = 11,
+	Fade = 11,
-	VGUIMenu            = 12,
+	VGUIMenu = 12,
-	Rumble              = 13,
+	Rumble = 13,
-	CloseCaption        = 14,
+	CloseCaption = 14,
-	SendAudio           = 15,
+	SendAudio = 15,
-	VoiceMask           = 16,
+	VoiceMask = 16,
-	RequestState        = 17,
+	RequestState = 17,
-	Damage              = 18,
+	Damage = 18,
-	HintText            = 19,
+	HintText = 19,
-	KeyHintText         = 20,
+	KeyHintText = 20,
-	HudMsg              = 21,
+	HudMsg = 21,
-	AmmoDenied          = 22,
+	AmmoDenied = 22,
-	AchievementEvent    = 23,
+	AchievementEvent = 23,
-	UpdateRadar         = 24,
+	UpdateRadar = 24,
-	VoiceSubtitle       = 25,
+	VoiceSubtitle = 25,
-	HudNotify           = 26,
+	HudNotify = 26,
-	HudNotifyCustom     = 27,
+	HudNotifyCustom = 27,
-	PlayerStatsUpdate   = 28,
+	PlayerStatsUpdate = 28,
-	PlayerIgnited       = 29,
+	PlayerIgnited = 29,
-	PlayerIgnitedInv    = 30,
+	PlayerIgnitedInv = 30,
-	HudArenaNotify      = 31,
+	HudArenaNotify = 31,
-	UpdateAchievement   = 32,
+	UpdateAchievement = 32,
-	TrainingMsg         = 33,
+	TrainingMsg = 33,
-	TrainingObjective   = 34,
+	TrainingObjective = 34,
-	DamageDodged        = 35,
+	DamageDodged = 35,
-	PlayerJarated       = 36,
+	PlayerJarated = 36,
-	PlayerExtinguished  = 37,
+	PlayerExtinguished = 37,
-	PlayerJaratedFade   = 38,
+	PlayerJaratedFade = 38,
 	PlayerShieldBlocked = 39,
-	BreakModel          = 40,
+	BreakModel = 40,
-	CheapBreakModel     = 41,
+	CheapBreakModel = 41,
-	BreakModel_Pumpkin  = 42,
+	BreakModel_Pumpkin = 42,
 	BreakModelRocketDud = 43,
-	CallVoteFailed      = 44,
+	CallVoteFailed = 44,
-	VoteStart           = 45,
+	VoteStart = 45,
-	VotePass            = 46,
+	VotePass = 46,
-	VoteFailed          = 47,
+	VoteFailed = 47,
-	VoteSetup           = 48,
+	VoteSetup = 48,
-	PlayerBonusPoints   = 49,
+	PlayerBonusPoints = 49,
-	SpawnFlyingBird     = 50,
+	SpawnFlyingBird = 50,
-	PlayerGodRayEffect  = 51,
+	PlayerGodRayEffect = 51,
-	SPHapWeapEvent      = 52,
+	SPHapWeapEvent = 52,
-	HapDmg              = 53,
+	HapDmg = 53,
-	HapPunch            = 54,
+	HapPunch = 54,
-	HapSetDrag          = 55,
+	HapSetDrag = 55,
-	HapSet              = 56,
+	HapSet = 56,
-	HapMeleeContact     = 57,
+	HapMeleeContact = 57,
 }
 
 const userMessageParsers = {
@@ -69,19 +69,14 @@ const userMessageParsers = {
 	5: make('textMsg', 'destType{8}text{s}'),
 };
 
-export function UserMessage(stream: BitStream): UserMessagePacket { // 23: user message
+export function ParseUserMessage(stream: BitStream): UserMessagePacket { // 23: user message
-	const type   = stream.readBits(8);
+	const type = stream.readBits(8);
 	const length = stream.readBits(11);
-	const pos    = stream.index;
+	const messageData = stream.readBitStream(length);
-	let result;
+
-	if (userMessageParsers[type]) {
+	return userMessageParsers[type] ? userMessageParsers[type](messageData) : {
-		result = userMessageParsers[type](stream);
+		packetType: 'unknownUserMessage',
-	} else {
+		type,
-		result = {
+		data: messageData,
-			packetType: 'unknownUserMessage',
+	};
-			type,
-		};
-	}
-	stream.index = pos + length;
-	return result;
 }

src/Parser/Packet/VoiceData.ts

@@ -1,7 +1,7 @@
 import {BitStream} from 'bit-buffer';
 import {VoiceDataPacket} from '../../Data/Packet';
 
-export function VoiceData(stream: BitStream): VoiceDataPacket {
+export function ParseVoiceData(stream: BitStream): VoiceDataPacket {
 	// 'client{8}proximity{8}length{16}_{$length}'
 	const client    = stream.readUint8();
 	const proximity = stream.readUint8();

src/Parser/Packet/VoiceInit.ts

@@ -1,7 +1,7 @@
 import {BitStream} from 'bit-buffer';
 import {VoiceInitPacket} from '../../Data/Packet';
 
-export function VoiceInit(stream: BitStream): VoiceInitPacket {
+export function ParseVoiceInit(stream: BitStream): VoiceInitPacket {
 	const codec     = stream.readASCIIString();
 	const quality   = stream.readUint8();
 	// no clue, from 2017-2-14 update