demostf/demo.js
1
0
Fork 0
mirror of https://github.com/demostf/demo.js synced 2026-06-03 16:44:12 +02:00
Code Issues Releases Wiki Activity

more usermessages and stricter parser generator

Browse source
This commit is contained in:
Robin Appelman 2017-09-03 15:40:07 +02:00
commit b744efe0a4
7 changed files with 206 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/Data/Packet.ts
View file

@ -6,6 +6,11 @@ import {ServerClass} from './ServerClass';
import {StringTable, StringTableEntry} from './StringTable';
import {Vector} from './Vector';
import {GameEvent, GameEventType} from './GameEventTypes';
import {
BreakModelPumpkinPacket, ResetHUDPacket, TextMessagePacket, TrainPacket, UnknownUserMessagePacket,
UserMessagePacket, UserMessageType,
UserMessageTypeMap, VoiceSubtitlePacket, SayText2Packet
} from './UserMessage';
export interface BasePacket {
}
@ -105,27 +110,6 @@ export interface TempEntitiesPacket extends BasePacket {
entities: PacketEntity[];
}
export interface SayText2Packet extends BasePacket {
packetType: 'sayText2';
client: number;
raw: number;
kind: 'TF_Chat_All' | 'TF_Chat_Team' | 'TF_Chat_AllDead';
from: string;
text: string;
}
export interface TextMessagePacket extends BasePacket {
packetType: 'textMsg';
destType: number;
text: string;
}
export interface UnknownUserMessagePacket extends BasePacket {
packetType: 'unknownUserMessage';
type: number;
data: BitStream;
}
export interface VoiceInitPacket extends BasePacket {
packetType: 'voiceInit';
codec: string;
@ -225,19 +209,17 @@ export interface FixAnglePacket extends BasePacket {
z: number;
}
export interface PreFetchPacket {
export interface PreFetchPacket extends BasePacket {
packetType: 'preFetch';
index: number;
}
export interface GetCvarValuePacket {
export interface GetCvarValuePacket extends BasePacket {
packetType: 'getCvarValue';
cookie: number;
value: string;
}
export type UserMessagePacket = SayText2Packet | TextMessagePacket | UnknownUserMessagePacket;
export type Packet = BSPDecalPacket |
StringTablePacket |
CreateStringTablePacket |
@ -273,7 +255,7 @@ export type Packet = BSPDecalPacket |
export type PacketType = Packet['packetType'];
export type PacketMapType = {
bSPDecal: BSPDecalPacket;
bspDecal: BSPDecalPacket;
stringTable: StringTablePacket;
createStringTable: CreateStringTablePacket;
updateStringTable: UpdateStringTablePacket;
@ -304,7 +286,7 @@ export type PacketMapType = {
fixAngle: FixAnglePacket;
preFetch: PreFetchPacket;
getCvarValue: GetCvarValuePacket;
}
} & UserMessageTypeMap;
export enum PacketTypeId {
file = 2,

141
src/Data/UserMessage.ts Normal file
View file

@ -0,0 +1,141 @@
import {BasePacket} from './Packet';
import {BitStream} from 'bit-buffer';
export enum UserMessageType {
Geiger = 0,
Train = 1,
HudText = 2,
SayText = 3,
SayText2 = 4,
TextMsg = 5,
ResetHUD = 6,
GameTitle = 7,
ItemPickup = 8,
ShowMenu = 9,
Shake = 10,
Fade = 11,
VGUIMenu = 12,
Rumble = 13,
CloseCaption = 14,
SendAudio = 15,
VoiceMask = 16,
RequestState = 17,
Damage = 18,
HintText = 19,
KeyHintText = 20,
HudMsg = 21,
AmmoDenied = 22,
AchievementEvent = 23,
UpdateRadar = 24,
VoiceSubtitle = 25,
HudNotify = 26,
HudNotifyCustom = 27,
PlayerStatsUpdate = 28,
PlayerIgnited = 29,
PlayerIgnitedInv = 30,
HudArenaNotify = 31,
UpdateAchievement = 32,
TrainingMsg = 33,
TrainingObjective = 34,
DamageDodged = 35,
PlayerJarated = 36,
PlayerExtinguished = 37,
PlayerJaratedFade = 38,
PlayerShieldBlocked = 39,
BreakModel = 40,
CheapBreakModel = 41,
BreakModel_Pumpkin = 42,
BreakModelRocketDud = 43,
CallVoteFailed = 44,
VoteStart = 45,
VotePass = 46,
VoteFailed = 47,
VoteSetup = 48,
PlayerBonusPoints = 49,
SpawnFlyingBird = 50,
PlayerGodRayEffect = 51,
SPHapWeapEvent = 52,
HapDmg = 53,
HapPunch = 54,
HapSetDrag = 55,
HapSet = 56,
HapMeleeContact = 57,
}
export interface BaseDataUserPacket {
data: number;
}
export interface SayText2Packet extends BasePacket {
packetType: 'sayText2';
client: number;
raw: number;
kind: 'TF_Chat_All' | 'TF_Chat_Team' | 'TF_Chat_AllDead';
from: string;
text: string;
}
export interface TextMessagePacket extends BasePacket {
packetType: 'textMsg';
destType: number;
text: string;
}
export interface ResetHUDPacket extends BaseDataUserPacket {
packetType: 'resetHUD';
}
export interface TrainPacket extends BaseDataUserPacket {
packetType: 'train';
}
export interface VoiceSubtitlePacket extends BasePacket {
packetType: 'voiceSubtitle';
client: number;
menu: number;
item: number;
}
export interface UnknownUserMessageBasePacket extends BasePacket {
data: BitStream;
type: number;
}
export interface BreakModelPumpkinPacket extends UnknownUserMessageBasePacket {
packetType: 'breakModelPumpkin';
}
export interface GenericUnknownUserMessagePacket extends UnknownUserMessageBasePacket {
packetType: 'unknownUserMessage';
}
export type UnknownUserMessagePacket = GenericUnknownUserMessagePacket |
BreakModelPumpkinPacket;
export type UserMessagePacket = SayText2Packet
| TextMessagePacket
| ResetHUDPacket
| UnknownUserMessagePacket
| TrainPacket
| VoiceSubtitlePacket
| BreakModelPumpkinPacket;
export type UserMessageTypeMap = {
sayText2: SayText2Packet;
textMsg: TextMessagePacket;
unknownUserMessage: GenericUnknownUserMessagePacket;
train: TrainPacket;
voiceSubtitle: VoiceSubtitlePacket;
breakModelPumpkin: BreakModelPumpkinPacket;
resetHUD: ResetHUDPacket;
}
export const UserMessagePacketTypeMap: Map<UserMessagePacket['packetType'], UserMessageType> = new Map<UserMessagePacket['packetType'], UserMessageType>([
['unknownUserMessage', 0],
['sayText2', UserMessageType.SayText2],
['textMsg', UserMessageType.TextMsg],
['train', UserMessageType.Train],
['voiceSubtitle', UserMessageType.VoiceSubtitle],
['breakModelPumpkin', UserMessageType.BreakModel_Pumpkin],
['resetHUD', UserMessageType.ResetHUD]
]);

2
src/PacketHandler/SayText2.ts
View file

@ -1,5 +1,5 @@
import {Match} from '../Data/Match';
import {SayText2Packet} from '../Data/Packet';
import {SayText2Packet} from '../Data/UserMessage';
export function handleSayText2(packet: SayText2Packet, match: Match) {
match.chat.push({

2
src/Parser/Message/Packet.ts
View file

@ -18,7 +18,7 @@ import {Parser} from './Parser';
import {Packet as IPacket, PacketTypeId} from '../../Data/Packet';
export class Packet extends Parser {
private static parsers: Map<PacketTypeId, PacketHandler<IPacket>> = new Map([
private static parsers: Map<PacketTypeId, PacketHandler<IPacket>> = new Map<PacketTypeId, PacketHandler<IPacket>>([
[PacketTypeId.file,
make('file', 'transferId{32}fileName{s}requested{b}')],
[PacketTypeId.netTick,

10
src/Parser/Packet/ParserGenerator.ts
View file

@ -1,13 +1,13 @@
import {Packet, PacketType} from '../../Data/Packet';
import {Packet, PacketMapType, PacketType} from '../../Data/Packet';
import {Encoder, PacketHandler, Parser} from './Parser';
import {BitStream} from 'bit-buffer';
export function make<P extends Packet>(name: PacketType, definition: string): PacketHandler<P> {
export function make<T extends PacketType>(name: T, definition: string): PacketHandler<PacketMapType[T]> {
const parts = definition.split('}');
const items = parts.map((part) => {
return part.split('{');
}).filter(part => part[0]);
const parser: Parser<P> = (stream: BitStream) => {
const parser: Parser<PacketMapType[T]> = (stream: BitStream) => {
const result = {
packetType: name,
};
@ -21,9 +21,9 @@ export function make<P extends Packet>(name: PacketType, definition: string): Pa
} catch (e) {
throw new Error('Failed reading pattern ' + definition + '. ' + e);
}
return result as P;
return result as PacketMapType[T];
};
const encoder: Encoder<P> = (packet: P, stream: BitStream) => {
const encoder: Encoder<PacketMapType[T]> = (packet: PacketMapType[T], stream: BitStream) => {
for (const group of items) {
writeItem(stream, group[1], packet, packet[group[0]]);
}

120
src/Parser/Packet/UserMessage.ts
View file

@ -1,83 +1,59 @@
import {BitStream} from 'bit-buffer';
import {UserMessagePacket} from '../../Data/Packet';
import {ParseSayText2} from '../UserMessage/SayText2';
import {EncodeSayText2, ParseSayText2} from '../UserMessage/SayText2';
import {make} from './ParserGenerator';
import {voidEncoder} from './Parser';
import {PacketHandler} from './Parser';
import {
UserMessageType,
UserMessagePacket,
UnknownUserMessagePacket,
UnknownUserMessageBasePacket,
UserMessageTypeMap,
UserMessagePacketTypeMap
} from '../../Data/UserMessage';
enum UserMessageType {
Geiger = 0,
Train = 1,
HudText = 2,
SayText = 3,
SayText2 = 4,
TextMsg = 5,
ResetHUD = 6,
GameTitle = 7,
ItemPickup = 8,
ShowMenu = 9,
Shake = 10,
Fade = 11,
VGUIMenu = 12,
Rumble = 13,
CloseCaption = 14,
SendAudio = 15,
VoiceMask = 16,
RequestState = 17,
Damage = 18,
HintText = 19,
KeyHintText = 20,
HudMsg = 21,
AmmoDenied = 22,
AchievementEvent = 23,
UpdateRadar = 24,
VoiceSubtitle = 25,
HudNotify = 26,
HudNotifyCustom = 27,
PlayerStatsUpdate = 28,
PlayerIgnited = 29,
PlayerIgnitedInv = 30,
HudArenaNotify = 31,
UpdateAchievement = 32,
TrainingMsg = 33,
TrainingObjective = 34,
DamageDodged = 35,
PlayerJarated = 36,
PlayerExtinguished = 37,
PlayerJaratedFade = 38,
PlayerShieldBlocked = 39,
BreakModel = 40,
CheapBreakModel = 41,
BreakModel_Pumpkin = 42,
BreakModelRocketDud = 43,
CallVoteFailed = 44,
VoteStart = 45,
VotePass = 46,
VoteFailed = 47,
VoteSetup = 48,
PlayerBonusPoints = 49,
SpawnFlyingBird = 50,
PlayerGodRayEffect = 51,
SPHapWeapEvent = 52,
HapDmg = 53,
HapPunch = 54,
HapSetDrag = 55,
HapSet = 56,
HapMeleeContact = 57,
function unknownPacketHandler<T extends UnknownUserMessagePacket['packetType']>(packetType: T): PacketHandler<UserMessageTypeMap[T]> {
return {
parser: (data: BitStream) => {
return {
packetType,
type: UserMessagePacketTypeMap.get(packetType),
data
} as UserMessageTypeMap[T];
},
encoder: (packet: UnknownUserMessageBasePacket, data: BitStream) => {
packet.data.index = 0;
data.writeUint8(packet.type);
data.writeBits(packet.data.length, 11);
data.writeBitStream(packet.data);
packet.data.index = 0;
}
};
}
const userMessageParsers = {
4: {parser: ParseSayText2, voidEncoder},
5: make('textMsg', 'destType{8}text{s}'),
};
const userMessageParsers: Map<UserMessageType, PacketHandler<UserMessagePacket>> = new Map<UserMessageType, PacketHandler<UserMessagePacket>>([
[UserMessageType.SayText2, {parser: ParseSayText2, encoder: EncodeSayText2}],
[UserMessageType.TextMsg, make('textMsg', 'destType{8}text{s}')],
[UserMessageType.ResetHUD, make('resetHUD', 'data{8}')],
[UserMessageType.Train, make('train', 'data{8}')],
[UserMessageType.VoiceSubtitle, make('voiceSubtitle', 'client{8}menu{8}item{8}')],
[UserMessageType.BreakModel_Pumpkin, unknownPacketHandler('breakModelPumpkin')]
]);
export function ParseUserMessage(stream: BitStream): UserMessagePacket { // 23: user message
const type = stream.readBits(8);
const type = stream.readUint8();
const length = stream.readBits(11);
const messageData = stream.readBitStream(length);
return userMessageParsers[type] ? userMessageParsers[type].parser(messageData) : {
packetType: 'unknownUserMessage',
type,
data: messageData,
};
const handler = userMessageParsers.get(type);
if (!handler) {
// throw new Error(`packet ${UserMessageType[type]} length:${length} data: ${messageData.readASCIIString()}`);
return {
packetType: 'unknownUserMessage',
type,
data: messageData,
};
} else {
return handler.parser(messageData);
}
}

2
src/Parser/UserMessage/SayText2.ts
View file

@ -1,5 +1,5 @@
import {BitStream} from 'bit-buffer';
import {SayText2Packet} from '../../Data/Packet';
import {SayText2Packet} from '../../Data/UserMessage';
export function ParseSayText2(stream: BitStream): SayText2Packet { // 4: ParseSayText2
const client = stream.readUint8();