teeworlds 2.1.5 → 2.1.9

package/lib/client.ts

@@ -1,15 +1,13 @@
 import { randomBytes } from "crypto";
 
 import net from 'dgram';
-import fs, { stat } from 'fs';
 import { EventEmitter } from 'stream';
-import { spawn } from 'child_process';
 
-import { unpackInt, unpackString, MsgUnpacker } from "./MsgUnpacker";
+import { unpackString, MsgUnpacker } from "./MsgUnpacker";
 
 import Movement from './movement';
 
-import MsgPacker from './MsgPacker';
+import { MsgPacker } from './MsgPacker';
 import { Snapshot } from './snapshot';
 import Huffman from "./huffman";
 
@@ -174,7 +172,13 @@ declare interface iKillMsg {
 	special_mode: number
 }
 
-declare interface Client {
+declare interface iOptions {
+	identity?: ClientInfo,
+	password?: string,
+	ddnet_version?: {version: number, release_version: string},
+}
+
+export declare interface Client {
 	host: string;
 	port: number;
 	name: string;
@@ -201,6 +205,7 @@ declare interface Client {
 
 	lastSendTime: number;
 
+	options?: iOptions;
 
 	on(event: 'connected', listener: () => void): this;
 	on(event: 'disconnect', listener: (reason: string) => void): this;
@@ -209,17 +214,23 @@ declare interface Client {
 	on(event: 'kill', listener: (kill: iKillMsg) => void): this;
 
 }
-class Client extends EventEmitter {
 
 
 
-	constructor(ip: string, port: number, nickname: string) {
+export class Client extends EventEmitter {
+
+
+
+	constructor(ip: string, port: number, nickname: string, options?: iOptions) {
 		super();
 		this.host = ip;
 		this.port = port;
 		this.name = nickname;
 		this.AckGameTick = 0;
 		this.PredGameTick = 0;
+		
+		if (options) 			
+			this.options = options;
 
 		this.timer = 0;
 
@@ -257,10 +268,10 @@ class Client extends EventEmitter {
 			if (packet.length == 1 && packet[0] == -1)
 				return unpacked
 		}
-		// return unpacked;
+
 		for (let i = 0; i < unpacked.twprotocol.chunkAmount; i++) {
 			var chunk: chunk = {} as chunk;
-			chunk.bytes = ((packet[0] & 0x3f) << 4) | (packet[1] & ((1 << 4) - 1)); // idk what this shit is but it works
+			chunk.bytes = ((packet[0] & 0x3f) << 4) | (packet[1] & ((1 << 4) - 1));
 			chunk.flags = (packet[0] >> 6) & 3;
 			chunk.sequence = -1;
 
@@ -276,12 +287,11 @@ class Client extends EventEmitter {
 			Object.values(messageUUIDs).forEach((a, i) => {
 				if (a.compare(packet.slice(0, 16)) == 0) {
 					chunk.extended_msgid = a;
-					// chunk.type = 'sys';
 					chunk.msg = Object.keys(messageUUIDs)[i];
 				}
 			})
 
-			packet = packet.slice(chunk.bytes) // +1 cuz it adds an extra \x00 for easier parsing i guess
+			packet = packet.slice(chunk.bytes) 
 			unpacked.chunks.push(chunk)
 		}
 		return unpacked
@@ -304,39 +314,20 @@ class Client extends EventEmitter {
 		*/
 		})
 	}
-	SendMsgEx(Msg: MsgPacker, Flags: number) {
-		if (this.State == States.STATE_OFFLINE)
-			throw new Error("Client is not connected");
-		if (!this.socket)
-			return;
-		this.lastSendTime = new Date().getTime();
-		var header = []
-		header[0] = ((Flags & 3) << 6) | ((Msg.size >> 4) & 0x3f);
-		header[1] = (Msg.size & 0xf);
-		if (Flags & 1) {
-			this.clientAck = (this.clientAck + 1) % (1 << 10);
-			header[1] |= (this.clientAck >> 2) & 0xf0;
-			header[2] = this.clientAck & 0xff;
-
-			this.sentChunkQueue.push(Buffer.concat([Buffer.from(header), Msg.buffer]));
-		}
-
-		let latestBuf = Buffer.from([0x0 + (((16 << 4) & 0xf0) | ((this.ack >> 8) & 0xf)), this.ack & 0xff, 0x1, header[0], header[1]]);
-		if (Flags & 1)
-			latestBuf = Buffer.concat([latestBuf, Buffer.from([this.clientAck])]);
-		latestBuf = Buffer.concat([latestBuf, Msg.buffer, this.TKEN]);
-		this.socket.send(latestBuf, 0, latestBuf.length, this.port, this.host);
 
-	}
-	SendMsgExWithChunks(Msgs: MsgPacker[], Flags: number) {
+	SendMsgEx(Msgs: MsgPacker[] | MsgPacker, Flags: number) {
 		if (this.State == States.STATE_OFFLINE)
-			throw new Error("Client is not connected");
+			return; 
 		if (!this.socket)
 			return;
+		let _Msgs: MsgPacker[];
+		if (Msgs instanceof Array)
+			_Msgs = Msgs;
+		else
+			_Msgs = [Msgs];
 		this.lastSendTime = new Date().getTime();
 		var header: Buffer[] = [];
-
-		Msgs.forEach((Msg: MsgPacker, index) => {
+		_Msgs.forEach((Msg: MsgPacker, index) => {
 			header[index] = Buffer.alloc((Flags & 1 ? 3 : 2));
 			header[index][0] = ((Flags & 3) << 6) | ((Msg.size >> 4) & 0x3f);
 			header[index][1] = (Msg.size & 0xf);
@@ -344,19 +335,15 @@ class Client extends EventEmitter {
 				this.clientAck = (this.clientAck + 1) % (1 << 10);
 				header[index][1] |= (this.clientAck >> 2) & 0xf0;
 				header[index][2] = this.clientAck & 0xff;
-
 				header[index][0] = (((Flags | 2)&3)<<6)|((Msg.size>>4)&0x3f); // 2 is resend flag (ugly hack for queue)
 				
 				this.sentChunkQueue.push(Buffer.concat([header[index], Msg.buffer]));
-
 				header[index][0] = (((Flags)&3)<<6)|((Msg.size>>4)&0x3f);
-
-
 			}
 		})
-		var packetHeader = Buffer.from([0x0 + (((16 << 4) & 0xf0) | ((this.ack >> 8) & 0xf)), this.ack & 0xff, Msgs.length]);
+		var packetHeader = Buffer.from([0x0 + (((16 << 4) & 0xf0) | ((this.ack >> 8) & 0xf)), this.ack & 0xff, _Msgs.length]);
 		var chunks = Buffer.from([]);
-		Msgs.forEach((Msg: MsgPacker, index) => {
+		_Msgs.forEach((Msg: MsgPacker, index) => {
 			chunks = Buffer.concat([chunks, Buffer.from(header[index]), Msg.buffer]);
 		})
 		var packet = Buffer.concat([(packetHeader), chunks, this.TKEN]);
@@ -365,7 +352,7 @@ class Client extends EventEmitter {
 	}
 	SendMsgRaw(chunks: Buffer[]) {
 		if (this.State == States.STATE_OFFLINE)
-			throw new Error("Client is not connected");
+			return;
 		if (!this.socket)
 			return;
 
@@ -380,7 +367,6 @@ class Client extends EventEmitter {
 
 	MsgToChunk(packet: Buffer) {
 		var chunk: chunk = {} as chunk;
-		// let packet = Msg.buffer;
 		chunk.bytes = ((packet[0] & 0x3f) << 4) | (packet[1] & ((1 << 4) - 1));
 		chunk.flags = (packet[0] >> 6) & 3;
 		chunk.sequence = -1;
@@ -393,13 +379,10 @@ class Client extends EventEmitter {
 		chunk.type = packet[0] & 1 ? "sys" : "game"; // & 1 = binary, ****_***1. e.g 0001_0111 sys, 0001_0110 game
 		chunk.msgid = (packet[0]-(packet[0]&1))/2;
 		chunk.msg = messageTypes[packet[0]&1][chunk.msgid];
-		// if (chunk.msg == undefined)
-			// console.log(packet)
 		chunk.raw = packet.slice(1, chunk.bytes)
 		Object.values(messageUUIDs).forEach((a, i) => {
 			if (a.compare(packet.slice(0, 16)) === 0) {
 				chunk.extended_msgid = a;
-				// chunk.type = 'sys';
 				chunk.msg = Object.keys(messageUUIDs)[i];
 			}
 		})
@@ -411,10 +394,12 @@ class Client extends EventEmitter {
 		this.State = States.STATE_CONNECTING;
 
 		let predTimer = setInterval(() => {
-			if (this.State == States.STATE_ONLINE && this.AckGameTick > 0) {
-				this.PredGameTick++;
-				// console.log(this.PredGameTick, this.AckGameTick)
-			}
+			if (this.State == States.STATE_ONLINE) {
+				if (this.AckGameTick > 0)
+					this.PredGameTick++;
+			} else if (this.State == States.STATE_OFFLINE) 
+				clearInterval(predTimer);
+			
 		}, 20);
 
 		this.SendControlMsg(1, "TKEN")
@@ -425,35 +410,31 @@ class Client extends EventEmitter {
 				clearInterval(connectInterval)
 		}, 500);
 
-		setInterval(() => {
-			// if (new Date().getTime() - this.time >= 1000) {
+		let inputInterval = setInterval(() => {
+			if (this.State == States.STATE_OFFLINE)
+				clearInterval(inputInterval)
 			if (this.State != States.STATE_ONLINE)
 				return;
 			this.time = new Date().getTime();
-			// this.SendControlMsg(0);
-			// console.log("sending with " + this.AckGameTick)
 			this.sendInput();
-			// }
 		}, 500)
 
 		let resendTimeout = setInterval(() => {
-			// this.sentChunkQueue.forEach((chunk) => {
-			// if (this.State == 0) // disconnected
-				// return;
-			if (this.State != 0) {
-				if (((new Date().getTime()) - this.lastSendTime) > 900) {
+			if (this.State != States.STATE_OFFLINE) {
+				if (((new Date().getTime()) - this.lastSendTime) > 900 && this.sentChunkQueue.length > 0) {
 					this.SendMsgRaw([this.sentChunkQueue[0]]);
-					console.log(this.sentChunkQueue);
 				}
-			}
-			// })
+			} else
+				clearInterval(resendTimeout)
 		}, 1000)
 	
 
 		this.time = new Date().getTime() + 2000; // start sending keepalives after 2s
 
 		if (this.socket)
-			this.socket.on("message", (a) => {
+			this.socket.on("message", (a, rinfo) => {
+				if (this.State == 0 || rinfo.address != this.host || rinfo.port != this.port)
+					return;
 				clearInterval(connectInterval)
 				if (a.toJSON().data[0] == 0x10) {
 					if (a.toString().includes("TKEN") || a.toJSON().data[3] == 0x2) {
@@ -461,9 +442,11 @@ class Client extends EventEmitter {
 						this.TKEN = Buffer.from(a.toJSON().data.slice(a.toJSON().data.length - 4, a.toJSON().data.length))
 						this.SendControlMsg(3);
 						this.State = States.STATE_LOADING; // loading state
+						this.receivedSnaps = 0;
+						
 						var info = new MsgPacker(1, true);
 						info.AddString("0.6 626fce9a778df4d4");
-						info.AddString(""); // password
+						info.AddString(this.options?.password === undefined ? "" : this.options?.password); // password
 
 						var client_version = new MsgPacker(0, true);
 						client_version.AddBuffer(Buffer.from("8c00130484613e478787f672b3835bd4", 'hex'));
@@ -472,15 +455,19 @@ class Client extends EventEmitter {
 						randomBytes(16).copy(randomUuid);
 
 						client_version.AddBuffer(randomUuid);
-						client_version.AddInt(16003);
-						client_version.AddString("DDNet 16.0.3");
+						if (this.options?.ddnet_version !== undefined) {
+							client_version.AddInt(this.options?.ddnet_version.version);
+							client_version.AddString("DDNet " + this.options?.ddnet_version.release_version);
+						} else {
+							client_version.AddInt(16003);
+							client_version.AddString("DDNet 16.0.3");
+						}
 		
-						this.SendMsgExWithChunks([client_version, info], 1)
+						this.SendMsgEx([client_version, info], 1)
 					} else if (a.toJSON().data[3] == 0x4) {
 						// disconnected
 						this.State = States.STATE_OFFLINE;
 						let reason: string = (unpackString(a.toJSON().data.slice(4)).result);
-						// this.State = -1;
 						this.emit("disconnect", reason);
 					}
 
@@ -491,8 +478,6 @@ class Client extends EventEmitter {
 					if (a.flags & 1) { // vital
 						if (a.seq != undefined && a.seq != -1)
 							this.ack = a.seq
-						else
-							console.log("no seq", a)
 					}
 				})
 				this.sentChunkQueue.forEach((buff, i) => {
@@ -500,63 +485,60 @@ class Client extends EventEmitter {
 					if (chunk.flags & 1) {
 						if (chunk.seq && chunk.seq < this.ack) {
 							this.sentChunkQueue.splice(i, 1);
-							// this.ack = (this.ack + 1) % (1 << 10);
 						} 
 					} 
 				})
 				var snapChunks = unpacked.chunks.filter(a => a.msg === "SNAP" || a.msg === "SNAP_SINGLE" || a.msg === "SNAP_EMPTY");
-				// console.log(unpacked.chunks.length, unpacked)
 				if (snapChunks.length > 0) {
 					let part = 0;
 					let num_parts = 1;
 					snapChunks.forEach(chunk => {
-						let AckGameTick = (unpackInt(chunk.raw.toJSON().data).result);
-						// setImmediate(() => {
-						// console.log(AckGameTick, this.AckGameTick, chunk.msg)
+						let unpacker = new MsgUnpacker(chunk.raw.toJSON().data);
+			
+						let AckGameTick = unpacker.unpackInt();
 						if (AckGameTick > this.AckGameTick) {
 							this.AckGameTick = AckGameTick;
 							if (Math.abs(this.PredGameTick - this.AckGameTick) > 10)
 								this.PredGameTick = AckGameTick + 1;
-							// console.log(this.AckGameTick)
 						}
-						// })
 
-						chunk.raw = Buffer.from(unpackInt(chunk?.raw?.toJSON().data).remaining);
-						let DeltaTick = unpackInt(chunk?.raw?.toJSON().data).result
+						// chunk.raw = Buffer.from(unpackInt(chunk?.raw?.toJSON().data).remaining);
+						let DeltaTick = AckGameTick - unpacker.unpackInt();
+						let num_parts = 1;
+						let part = 0;
+
 						if (chunk.msg === "SNAP") {
-							chunk.raw = Buffer.from(unpackInt(chunk?.raw?.toJSON().data).remaining); // delta tick
-							num_parts = (unpackInt(chunk?.raw?.toJSON().data).result)
-							chunk.raw = Buffer.from(unpackInt(chunk?.raw?.toJSON().data).remaining); // num parts
-							part = (unpackInt(chunk?.raw?.toJSON().data).result)
+							// chunk.raw = Buffer.from(unpackInt(chunk?.raw?.toJSON().data).remaining); // delta tick
+							num_parts = unpacker.unpackInt();
+							// chunk.raw = Buffer.from(unpackInt(chunk?.raw?.toJSON().data).remaining); // num parts
+							part = unpacker.unpackInt();
+						}
+						
+						let crc = 0;
+						let part_size = 0;
+						if (chunk.msg != "SNAP_EMPTY") {
+							crc = unpacker.unpackInt(); // crc
+							part_size = unpacker.unpackInt();
 						}
-						chunk.raw = Buffer.from(unpackInt(chunk?.raw?.toJSON().data).remaining); // part
-						if (chunk.msg != "SNAP_EMPTY")
-							chunk.raw = Buffer.from(unpackInt(chunk?.raw?.toJSON().data).remaining); // crc
-						chunk.raw = Buffer.from(unpackInt(chunk?.raw?.toJSON().data).remaining); // crc
 						if (part === 0 || this.snaps.length > 30) {
 							this.snaps = [];
 						}
-						chunk.raw = Buffer.from(unpackInt(chunk?.raw?.toJSON().data).remaining); // crc
+						chunk.raw = Buffer.from(unpacker.remaining);
 						this.snaps.push(chunk.raw)
-						// console.log(this.PredGameTick - this.AckGameTick, this.PredGameTick, this.AckGameTick)
 
 						if ((num_parts - 1) === part && this.snaps.length === num_parts) {
 							let mergedSnaps = Buffer.concat(this.snaps);
+							// mergedSnaps = Buffer.from(unpackInt(mergedSnaps.toJSON().data).remaining);
 							let snapUnpacked = SnapUnpacker.unpackSnapshot(mergedSnaps.toJSON().data, 1)
-							// console.log(snapUnpacked)
-
+							// console.log(snapUnpacked.items, toHexStream(mergedSnaps));
 							snapUnpacked.items.forEach((a, i) => {
 								if (a.type_id === items.OBJ_CLIENT_INFO) {
-									// console.log(a.parsed, i)
 									this.client_infos[a.id] = a.parsed as ClientInfo;
-									if ((a.parsed as ClientInfo).name.includes("������")) {
-										console.log(this.PredGameTick, this.AckGameTick, mergedSnaps.toJSON().data.toString())
-									}
-									console.log(this.client_infos[a.id].name, this.client_infos[a.id].clan, [a.id])
+									// if (this.client_infos[a.id].name.includes("�") || this.client_infos[a.id].clan.includes("�")) {
+										// console.log("bad name", this.client_infos[a.id], toHexStream(mergedSnaps), chunk, AckGameTick, DeltaTick, crc, part_size);
+									// }
+									// console.log(this.client_infos[a.id])
 								}
-								//   else if (a.type_id === items.OBJ_PLAYER_INFO) {
-								// this.player_infos[a.id] = a.parsed as PlayerInfo;
-								// }
 							})
 						}
 
@@ -568,15 +550,18 @@ class Client extends EventEmitter {
 					var chat = unpacked.chunks.filter(a => a.msg == "SV_CHAT");
 					chat.forEach(a => {
 						if (a.msg == "SV_CHAT") {
-							var unpacked: iMessage = {} as iMessage;
-							unpacked.team = unpackInt(a.raw.toJSON().data).result;
-							var remaining: number[] = unpackInt(a.raw.toJSON().data).remaining;
-							unpacked.client_id = unpackInt(remaining).result;
-							remaining = unpackInt(remaining).remaining;
-							unpacked.message = unpackString(remaining).result;
+							let unpacker = new MsgUnpacker(a.raw.toJSON().data);
+							var unpacked: iMessage = {
+								team: unpacker.unpackInt(),
+								client_id: unpacker.unpackInt(),
+								message: unpacker.unpackString()
+							} as iMessage;
+
 							if (unpacked.client_id != -1)
-								unpacked.author = { ClientInfo: this.client_infos[unpacked.client_id], PlayerInfo: this.player_infos[unpacked.client_id] }
-							// console.log(unpacked)
+								unpacked.author = { 
+									ClientInfo: this.client_infos[unpacked.client_id], 
+									PlayerInfo: this.player_infos[unpacked.client_id] 
+								}
 							this.emit("message", unpacked)
 						}
 					})
@@ -595,7 +580,6 @@ class Client extends EventEmitter {
 								unpacked.victim = { ClientInfo: this.client_infos[unpacked.victim_id], PlayerInfo: this.player_infos[unpacked.victim_id] }
 							if (unpacked.killer_id != -1)
 								unpacked.killer = { ClientInfo: this.client_infos[unpacked.killer_id], PlayerInfo: this.player_infos[unpacked.killer_id] }
-							// console.log(unpacked)
 							this.emit("kill", unpacked)
 						}
 					})
@@ -610,13 +594,24 @@ class Client extends EventEmitter {
 					this.SendMsgEx(Msg, 1);
 				} else if ((unpacked.chunks[0] && chunkMessages.includes("CON_READY") || unpacked.chunks[0] && chunkMessages.includes("SV_MOTD"))) {
 					var info = new MsgPacker(20, false);
-					info.AddString(this.name); /* name */
-					info.AddString(""); /* clan */
-					info.AddInt(-1); /* country */
-					info.AddString("greyfox"); /* skin */
-					info.AddInt(1); /* use custom color */
-					info.AddInt(10346103); /* color body */
-					info.AddInt(65535); /* color feet */
+					if (this.options?.identity) {
+						info.AddString(this.options.identity.name); 
+						info.AddString(this.options.identity.clan); 
+						info.AddInt(this.options.identity.country); 
+						info.AddString(this.options.identity.skin); 
+						info.AddInt(this.options.identity.use_custom_color);
+						info.AddInt(this.options.identity.color_body); 
+						info.AddInt(this.options.identity.color_feet); 
+					} else {
+						info.AddString(this.name); /* name */
+						info.AddString(""); /* clan */
+						info.AddInt(-1); /* country */
+						info.AddString("greyfox"); /* skin */
+						info.AddInt(1); /* use custom color */
+						info.AddInt(10346103); /* color body */
+						info.AddInt(65535); /* color feet */
+
+					}
 					this.SendMsgEx(info, 1);
 
 
@@ -632,52 +627,6 @@ class Client extends EventEmitter {
 						this.State = States.STATE_ONLINE;
 					}
 
-					var chunks = unpacked.chunks.filter(a => a.msg == "SNAP" || a.msg == "SNAP_SINGLE" || a.msg == "SNAP_EMPTY");
-					if (chunks.length > 0) {
-						let part = 0;
-						let num_parts = 1;
-						chunks.forEach(chunk => {
-							let AckGameTick = (unpackInt(chunk.raw.toJSON().data).result);
-							chunk.raw = Buffer.from(unpackInt(chunk?.raw?.toJSON().data).remaining);
-							let DeltaTick = unpackInt(chunk?.raw?.toJSON().data).result
-							if (chunk.msg == "SNAP") {
-								chunk.raw = Buffer.from(unpackInt(chunk?.raw?.toJSON().data).remaining); // delta tick
-								num_parts = (unpackInt(chunk?.raw?.toJSON().data).result)
-								chunk.raw = Buffer.from(unpackInt(chunk?.raw?.toJSON().data).remaining); // num parts
-								part = (unpackInt(chunk?.raw?.toJSON().data).result)
-							}
-							chunk.raw = Buffer.from(unpackInt(chunk?.raw?.toJSON().data).remaining); // part
-							if (chunk.msg != "SNAP_EMPTY")
-								chunk.raw = Buffer.from(unpackInt(chunk?.raw?.toJSON().data).remaining); // crc
-							chunk.raw = Buffer.from(unpackInt(chunk?.raw?.toJSON().data).remaining); // crc
-							if (part == 0 || this.snaps.length > 30) {
-								this.snaps = [];
-							}
-							this.snaps.push(chunk.raw)
-
-							if ((num_parts - 1) == part && this.snaps.length == num_parts) {
-								let mergedSnaps = Buffer.concat(this.snaps);
-								let snapUnpacked = SnapUnpacker.unpackSnapshot(mergedSnaps.toJSON().data, 1)
-
-								snapUnpacked.items.forEach((a, i) => {
-									if (a.type_id == items.OBJ_CLIENT_INFO) {
-										this.client_infos[a.id] = a.parsed as ClientInfo;
-										// console.log(a.parsed, i)
-										// console.log(this.client_infos[a.id])
-									} else if (a.type_id == items.OBJ_PLAYER_INFO) {
-										this.player_infos[i] = a.parsed as PlayerInfo;
-									} else if (a.type_id == items.OBJ_EX || a.type_id > 0x4000) {
-										if (a.data.length == 5 && ((a.parsed as DdnetCharacter).freeze_end > 0 || (a.parsed as DdnetCharacter).freeze_end == -1)) {
-											// var packer = new MsgPacker(22, false)
-											// this.SendMsgEx(packer, 1)
-										}
-									}
-								})
-							}
-
-						})
-					}
-
 				}
 				if (new Date().getTime() - this.time >= 1000 && this.State == States.STATE_ONLINE) {
 					this.time = new Date().getTime();
@@ -694,9 +643,6 @@ class Client extends EventEmitter {
 		inputMsg.AddInt(this.AckGameTick);
 		inputMsg.AddInt(this.PredGameTick);
 		inputMsg.AddInt(40);
-		// let playerflags = 2;
-		// playerflags |= 8; // scoreboard
-		// playerflags |= 16; // aimline
 
 		let input_data = [
 
@@ -711,7 +657,6 @@ class Client extends EventEmitter {
 			input.m_NextWeapon,
 			input.m_PrevWeapon
 		]
-		// console.log(this.player_infos, this.client_infos)
 		input_data.forEach(a => {
 			inputMsg.AddInt(a);
 		});
@@ -772,5 +717,3 @@ class Client extends EventEmitter {
 
 
 }
-export = Client;
-// module.exports = Client;