teeworlds 2.0.0 → 2.0.3

package/README.md

@@ -3,7 +3,7 @@ Library to connect a bot to a Teeworlds server.
 
 # Usage
 Example file:
-```const test = require('@swarfey/teeworlds');
+```const test = require('teeworlds');
 let client = new test.Client("127.0.0.1", 8303, "test");
 
 client.connect();
@@ -75,7 +75,7 @@ client.on("kill", info => {
 })
 
 process.on("SIGINT", () => {
-	client.disconnect(); // disconnect on ctrl + c
+	client.Disconnect(); // disconnect on ctrl + c
 })
 process.stdin.on("data", data => {
 	client.Say(data.toString()); // write input in chat

package/lib/client.js

@@ -51,6 +51,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var crypto_1 = require("crypto");
 var dgram_1 = __importDefault(require("dgram"));
 var stream_1 = require("stream");
 var child_process_1 = require("child_process");
@@ -241,11 +242,13 @@ var Client = /** @class */ (function (_super) {
         var _this = this;
         if (ExtraMsg === void 0) { ExtraMsg = ""; }
         return new Promise(function (resolve, reject) {
-            var latestBuf = Buffer.from([0x10 + (((16 << 4) & 0xf0) | ((_this.ack >> 8) & 0xf)), _this.ack & 0xff, 0x00, msg]);
-            latestBuf = Buffer.concat([latestBuf, Buffer.from(ExtraMsg), _this.TKEN]); // move header (latestBuf), optional extraMsg & TKEN into 1 buffer
-            _this.socket.send(latestBuf, 0, latestBuf.length, _this.port, _this.host, function (err, bytes) {
-                resolve(bytes);
-            });
+            if (_this.socket) {
+                var latestBuf = Buffer.from([0x10 + (((16 << 4) & 0xf0) | ((_this.ack >> 8) & 0xf)), _this.ack & 0xff, 0x00, msg]);
+                latestBuf = Buffer.concat([latestBuf, Buffer.from(ExtraMsg), _this.TKEN]); // move header (latestBuf), optional extraMsg & TKEN into 1 buffer
+                _this.socket.send(latestBuf, 0, latestBuf.length, _this.port, _this.host, function (err, bytes) {
+                    resolve(bytes);
+                });
+            }
             setTimeout(function () { resolve("failed, rip"); }, 2000);
             /* 	after 2 seconds it was probably not able to send,
                 so when sending a quit message the user doesnt
@@ -256,6 +259,8 @@ var Client = /** @class */ (function (_super) {
     Client.prototype.SendMsgEx = function (Msg, Flags) {
         if (this.State == -1)
             throw new Error("Client is not connected");
+        if (!this.socket)
+            return;
         var header = [];
         header[0] = ((Flags & 3) << 6) | ((Msg.size >> 4) & 0x3f);
         header[1] = (Msg.size & 0xf);
@@ -266,15 +271,45 @@ var Client = /** @class */ (function (_super) {
         }
         var latestBuf = Buffer.from([0x0 + (((16 << 4) & 0xf0) | ((this.ack >> 8) & 0xf)), this.ack & 0xff, 0x1, header[0], header[1], this.clientAck]);
         var latestBuf = Buffer.concat([latestBuf, Msg.buffer, this.TKEN]);
-        this.socket.send(latestBuf, 0, latestBuf.length, this.port, this.host, function (err, bytes) {
+        this.socket.send(latestBuf, 0, latestBuf.length, this.port, this.host);
+    };
+    Client.prototype.SendMsgExWithChunks = function (Msgs, Flags) {
+        var _this = this;
+        if (this.State == -1)
+            throw new Error("Client is not connected");
+        if (!this.socket)
+            return;
+        var header = [];
+        Msgs.forEach(function (Msg, index) {
+            header[index] = new Array(2);
+            header[index][0] = ((Flags & 3) << 6) | ((Msg.size >> 4) & 0x3f);
+            header[index][1] = (Msg.size & 0xf);
+            if (Flags & 1) {
+                _this.clientAck = (_this.clientAck + 1) % (1 << 10);
+                header[index][1] |= (_this.clientAck >> 2) & 0xf0;
+                header[index][2] = _this.clientAck & 0xff;
+            }
         });
+        var packetHeader = Buffer.from([0x0 + (((16 << 4) & 0xf0) | ((this.ack >> 8) & 0xf)), this.ack & 0xff, Msgs.length]);
+        var chunks = Buffer.from([]);
+        Msgs.forEach(function (Msg, index) {
+            chunks = Buffer.concat([chunks, Buffer.from(header[index]), Msg.buffer]);
+        });
+        var packet = Buffer.concat([(packetHeader), chunks, this.TKEN]);
+        this.socket.send(packet, 0, packet.length, this.port, this.host);
     };
     Client.prototype.connect = function () {
         var _this = this;
         this.SendControlMsg(1, "TKEN");
+        var connectInterval = setInterval(function () {
+            if (_this.State == 0)
+                _this.SendControlMsg(1, "TKEN");
+            else
+                clearInterval(connectInterval);
+        }, 500);
         this.time = new Date().getTime() + 2000; // start sending keepalives after 2s
         this.socket.on("message", function (a) { return __awaiter(_this, void 0, void 0, function () {
-            var unpacked, chunkMessages, chat, chat, packer, reason, Msg, Msg, packer, packer, chunks, part_1, num_parts_1;
+            var unpacked, chunkMessages, chat, chat, info, client_version, randomUuid, reason, Msg, Msg, info, info, chunks, part_1, num_parts_1;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -330,13 +365,21 @@ var Client = /** @class */ (function (_super) {
                         }
                         if (a.toJSON().data[0] == 0x10) {
                             if (a.toString().includes("TKEN") || arrStartsWith(a.toJSON().data, [0x10, 0x0, 0x0, 0x0])) {
+                                clearInterval(connectInterval);
                                 this.TKEN = Buffer.from(a.toJSON().data.slice(a.toJSON().data.length - 4, a.toJSON().data.length));
                                 this.SendControlMsg(3);
                                 this.State = 2; // loading state
-                                packer = new MsgPacker_1.default(1, true);
-                                packer.AddString("0.6 626fce9a778df4d4");
-                                packer.AddString(""); // password
-                                this.SendMsgEx(packer, 1);
+                                info = new MsgPacker_1.default(1, true);
+                                info.AddString("0.6 626fce9a778df4d4");
+                                info.AddString(""); // password
+                                client_version = new MsgPacker_1.default(0, true);
+                                client_version.AddBuffer(Buffer.from("8c00130484613e478787f672b3835bd4", 'hex'));
+                                randomUuid = new Uint8Array(16);
+                                crypto_1.randomBytes(16).copy(randomUuid);
+                                client_version.AddBuffer(Buffer.from(randomUuid));
+                                client_version.AddInt(15091);
+                                client_version.AddString("DDNet 15.9.1");
+                                this.SendMsgExWithChunks([client_version, info], 1);
                             }
                             else if (a.toJSON().data[3] == 0x4) {
                                 // disconnected
@@ -355,15 +398,15 @@ var Client = /** @class */ (function (_super) {
                             this.SendMsgEx(Msg, 1);
                         }
                         else if ((unpacked.chunks[0] && chunkMessages.includes("CON_READY") || unpacked.chunks[0] && chunkMessages.includes("SV_MOTD"))) {
-                            packer = new MsgPacker_1.default(20, false);
-                            packer.AddString(this.name); /* name */
-                            packer.AddString(""); /* clan */
-                            packer.AddInt(-1); /* country */
-                            packer.AddString("greyfox"); /* skin */
-                            packer.AddInt(1); /* use custom color */
-                            packer.AddInt(10346103); /* color body */
-                            packer.AddInt(65535); /* color feet */
-                            this.SendMsgEx(packer, 1);
+                            info = new MsgPacker_1.default(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 */
+                            this.SendMsgEx(info, 1);
                         }
                         else if (unpacked.chunks[0] && chunkMessages.includes("SV_READY_TO_ENTER")) {
                             if (this.State != 3) {
@@ -372,8 +415,8 @@ var Client = /** @class */ (function (_super) {
                             this.State = 3;
                         }
                         else if (unpacked.chunks[0] && chunkMessages.includes("PING")) {
-                            packer = new MsgPacker_1.default(23, true);
-                            this.SendMsgEx(packer, 1);
+                            info = new MsgPacker_1.default(23, true);
+                            this.SendMsgEx(info, 1);
                         }
                         if (chunkMessages.includes("SNAP") || chunkMessages.includes("SNAP_EMPTY") || chunkMessages.includes("SNAP_SINGLE")) {
                             this.receivedSnaps++; /* wait for 2 ss before seeing self as connected */
@@ -439,9 +482,12 @@ var Client = /** @class */ (function (_super) {
     };
     Client.prototype.Disconnect = function () {
         var _this = this;
-        this.SendControlMsg(4).then(function () {
-            _this.State = -1;
-            _this.socket.disconnect();
+        return new Promise(function (resolve) {
+            _this.SendControlMsg(4).then(function () {
+                resolve(true);
+                _this.socket.close();
+                _this.State = -1;
+            });
         });
     };
     Client.prototype.Say = function (message, team) {

package/lib/client.ts

@@ -1,3 +1,5 @@
+import { randomBytes } from "crypto";
+
 import net from 'dgram';
 import fs from 'fs';
 import { EventEmitter } from 'stream';
@@ -69,7 +71,7 @@ enum items {
 }
 interface chunk {
 	bytes: number,
-	flags: number, 
+	flags: number,
 	sequence?: number,
 	seq?: number,
 	type: 'sys' | 'game',
@@ -96,7 +98,7 @@ async function decompress(buff: Buffer): Promise<Buffer> {
 
 			resolve(Buffer.from([]));
 		}, 750)
-		
+
 	})
 }
 interface _packet {
@@ -105,7 +107,7 @@ interface _packet {
 }
 
 var messageTypes = [
-	["none, starts at 1", "SV_MOTD", "SV_BROADCAST", "SV_CHAT", "SV_KILL_MSG", "SV_SOUND_GLOBAL", "SV_TUNE_PARAMS", "SV_EXTRA_PROJECTILE", "SV_READY_TO_ENTER", "SV_WEAPON_PICKUP", "SV_EMOTICON", "SV_VOTE_CLEAR_OPTIONS", "SV_VOTE_OPTION_LIST_ADD", "SV_VOTE_OPTION_ADD", "SV_VOTE_OPTION_REMOVE", "SV_VOTE_SET", "SV_VOTE_STATUS", "CL_SAY", "CL_SET_TEAM", "CL_SET_SPECTATOR_MODE", "CL_START_INFO", "CL_CHANGE_INFO", "CL_KILL", "CL_EMOTICON", "CL_VOTE", "CL_CALL_VOTE", "CL_IS_DDNET", "SV_DDRACE_TIME", "SV_RECORD", "UNUSED", "SV_TEAMS_STATE", "CL_SHOW_OTHERS_LEGACY"], 
+	["none, starts at 1", "SV_MOTD", "SV_BROADCAST", "SV_CHAT", "SV_KILL_MSG", "SV_SOUND_GLOBAL", "SV_TUNE_PARAMS", "SV_EXTRA_PROJECTILE", "SV_READY_TO_ENTER", "SV_WEAPON_PICKUP", "SV_EMOTICON", "SV_VOTE_CLEAR_OPTIONS", "SV_VOTE_OPTION_LIST_ADD", "SV_VOTE_OPTION_ADD", "SV_VOTE_OPTION_REMOVE", "SV_VOTE_SET", "SV_VOTE_STATUS", "CL_SAY", "CL_SET_TEAM", "CL_SET_SPECTATOR_MODE", "CL_START_INFO", "CL_CHANGE_INFO", "CL_KILL", "CL_EMOTICON", "CL_VOTE", "CL_CALL_VOTE", "CL_IS_DDNET", "SV_DDRACE_TIME", "SV_RECORD", "UNUSED", "SV_TEAMS_STATE", "CL_SHOW_OTHERS_LEGACY"],
 	["none, starts at 1", "INFO", "MAP_CHANGE", "MAP_DATA", "CON_READY", "SNAP", "SNAP_EMPTY", "SNAP_SINGLE", "INPUT_TIMING", "RCON_AUTH_STATUS", "RCON_LINE", "READY", "ENTER_GAME", "INPUT", "RCON_CMD", "RCON_AUTH", "REQUEST_MAP_DATA", "PING", "PING_REPLY", "RCON_CMD_ADD", "RCON_CMD_REMOVE"]
 ]
 
@@ -119,28 +121,28 @@ var messageUUIDs = {
 	"CAPABILITIES": Buffer.from([0xf6, 0x21, 0xa5, 0xa1, 0xf5, 0x85, 0x37, 0x75, 0x8e, 0x73, 0x41, 0xbe, 0xee, 0x79, 0xf2, 0xb2]),
 }
 
-function arrStartsWith(arr: number[], arrStart: number[], start=0) {
+function arrStartsWith(arr: number[], arrStart: number[], start = 0) {
 	arr.splice(0, start)
-    for (let i = 0; i < arrStart.length; i++) {
+	for (let i = 0; i < arrStart.length; i++) {
 		if (arr[i] == arrStart[i])
-		continue;
-        else return false;
-    }
-    return true;
+			continue;
+		else return false;
+	}
+	return true;
 }
 interface iMessage {
-	team: number, 
+	team: number,
 	client_id: number,
-	author?: {ClientInfo: ClientInfo, PlayerInfo: PlayerInfo}, 
+	author?: { ClientInfo: ClientInfo, PlayerInfo: PlayerInfo },
 	message: string
 }
 
 interface iKillMsg {
-	killer_id: number, 
-	killer?: {ClientInfo: ClientInfo, PlayerInfo: PlayerInfo}, 
-	victim_id: number, 
-	victim?: {ClientInfo: ClientInfo, PlayerInfo: PlayerInfo}, 
-	weapon: number, 
+	killer_id: number,
+	killer?: { ClientInfo: ClientInfo, PlayerInfo: PlayerInfo },
+	victim_id: number,
+	victim?: { ClientInfo: ClientInfo, PlayerInfo: PlayerInfo },
+	weapon: number,
 	special_mode: number
 }
 
@@ -162,12 +164,12 @@ declare interface Client {
 	client_infos: ClientInfo[];
 	player_infos: PlayerInfo[];
 
-	
+
 	on(event: 'connected'): this;
 	on(event: 'disconnect', reason: string): this;
 
-	on(event: 'message', message: iMessage, client_info: ClientInfo, player_info: PlayerInfo): this;
-	on(event: 'kill', kill: {killer_id: number, victim_id: number, weapon: number, special_mode: number}, client_info: ClientInfo, player_info: PlayerInfo): this;
+	on(event: 'message', message: iMessage): this;
+	on(event: 'kill', kill: iKillMsg): this;
 
 }
 class Client extends EventEmitter {
@@ -189,23 +191,23 @@ class Client extends EventEmitter {
 		this.clientAck = 0; // ack of messages the client has sent
 		this.receivedSnaps = 0; /* wait for 2 snaps before seeing self as connected */
 		this.lastMsg = "";
-		this._port = Math.floor(Math.random()*65535)
+		this._port = Math.floor(Math.random() * 65535)
 		this.socket = net.createSocket("udp4")
 		this.socket.bind();
 
 		this.TKEN = Buffer.from([255, 255, 255, 255])
-		this.time = new Date().getTime()+2000; // time (used for keepalives, start to send keepalives after 2 seconds)
+		this.time = new Date().getTime() + 2000; // time (used for keepalives, start to send keepalives after 2 seconds)
 		this.State = 0;
 	}
 	async Unpack(packet: Buffer): Promise<_packet> {
-		var unpacked: _packet = {twprotocol: {flags: packet[0], ack: packet[1], chunkAmount: packet[2], size: packet.byteLength-3}, chunks: []}
-		
-		
-		if (packet.indexOf(Buffer.from([0xff,0xff,0xff,0xff])) == 0 && !(unpacked.twprotocol.flags & 8) || unpacked.twprotocol.flags == 255) // flags == 255 is connectionless (used for sending usernames)
+		var unpacked: _packet = { twprotocol: { flags: packet[0], ack: packet[1], chunkAmount: packet[2], size: packet.byteLength - 3 }, chunks: [] }
+
+
+		if (packet.indexOf(Buffer.from([0xff, 0xff, 0xff, 0xff])) == 0 && !(unpacked.twprotocol.flags & 8) || unpacked.twprotocol.flags == 255) // flags == 255 is connectionless (used for sending usernames)
 			return unpacked;
 		packet = packet.slice(3)
 		if (unpacked.twprotocol.flags & 128) {
-			packet = await decompress(packet)	
+			packet = await decompress(packet)
 			if (packet.length == 1 && packet[0] == -1)
 				return unpacked
 		}
@@ -215,15 +217,15 @@ class Client extends EventEmitter {
 			chunk.bytes = ((packet[0] & 0x3f) << 4) | (packet[1] & ((1 << 4) - 1)); // idk what this shit is but it works
 			chunk.flags = (packet[0] >> 6) & 3;
 			chunk.sequence = -1;
-			
+
 			if (chunk.flags & 1) {
-				chunk.seq = ((packet[1]&0xf0)<<2) | packet[2];
+				chunk.seq = ((packet[1] & 0xf0) << 2) | packet[2];
 				packet = packet.slice(3) // remove flags & size
 			} else
 				packet = packet.slice(2)
 			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];
+			chunk.msgid = (packet[0] - (packet[0] & 1)) / 2;
+			chunk.msg = messageTypes[packet[0] & 1][chunk.msgid];
 			chunk.raw = packet.slice(1, chunk.bytes)
 			Object.values(messageUUIDs).forEach((a, i) => {
 				if (a.compare(packet.slice(0, 16)) == 0) {
@@ -232,209 +234,260 @@ class Client extends EventEmitter {
 					chunk.msg = Object.keys(messageUUIDs)[i];
 				}
 			})
-			
+
 			packet = packet.slice(chunk.bytes) // +1 cuz it adds an extra \x00 for easier parsing i guess
 			unpacked.chunks.push(chunk)
 		}
 		return unpacked
-		}
+	}
 	SendControlMsg(msg: number, ExtraMsg: string = "") {
 		return new Promise((resolve, reject) => {
-			
-			var latestBuf = Buffer.from([0x10+(((16<<4)&0xf0)|((this.ack>>8)&0xf)), this.ack&0xff, 0x00, msg])
-			latestBuf = Buffer.concat([latestBuf, Buffer.from(ExtraMsg), this.TKEN]) // move header (latestBuf), optional extraMsg & TKEN into 1 buffer
+			if (this.socket) {
+				var latestBuf = Buffer.from([0x10 + (((16 << 4) & 0xf0) | ((this.ack >> 8) & 0xf)), this.ack & 0xff, 0x00, msg])
+				latestBuf = Buffer.concat([latestBuf, Buffer.from(ExtraMsg), this.TKEN]) // move header (latestBuf), optional extraMsg & TKEN into 1 buffer
 				this.socket.send(latestBuf, 0, latestBuf.length, this.port, this.host, (err, bytes) => {
 					resolve(bytes)
 				})
-			setTimeout(() => { resolve("failed, rip") }, 2000) 
+
+			}
+			setTimeout(() => { resolve("failed, rip") }, 2000)
 			/* 	after 2 seconds it was probably not able to send, 
 				so when sending a quit message the user doesnt
 				stay stuck not being able to ctrl + c
 		*/
-	})
+		})
 	}
 	SendMsgEx(Msg: MsgPacker, Flags: number) {
 		if (this.State == -1)
 			throw new Error("Client is not connected");
-		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;
-		} 	
-		var latestBuf = Buffer.from([0x0+(((16<<4)&0xf0)|((this.ack>>8)&0xf)), this.ack&0xff, 0x1, header[0], header[1], this.clientAck]);
+		if (!this.socket)
+			return;
+		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;
+		}
+		var latestBuf = Buffer.from([0x0 + (((16 << 4) & 0xf0) | ((this.ack >> 8) & 0xf)), this.ack & 0xff, 0x1, header[0], header[1], this.clientAck]);
 		var latestBuf = Buffer.concat([latestBuf, Msg.buffer, this.TKEN]);
-			this.socket.send(latestBuf, 0, latestBuf.length, this.port, this.host, (err, bytes) => {
-			})
+
+		this.socket.send(latestBuf, 0, latestBuf.length, this.port, this.host)
+	}
+	SendMsgExWithChunks(Msgs: MsgPacker[], Flags: number) {
+		if (this.State == -1)
+			throw new Error("Client is not connected");
+		if (!this.socket)
+			return;
+		var header: any[][] = [];
+
+		Msgs.forEach((Msg: MsgPacker, index) => {
+			header[index] = new Array(2);
+			header[index][0] = ((Flags & 3) << 6) | ((Msg.size >> 4) & 0x3f);
+			header[index][1] = (Msg.size & 0xf);
+			if (Flags & 1) {
+				this.clientAck = (this.clientAck + 1) % (1 << 10);
+				header[index][1] |= (this.clientAck >> 2) & 0xf0;
+				header[index][2] = this.clientAck & 0xff;
+			}
+		})
+		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) => {
+			chunks = Buffer.concat([chunks, Buffer.from(header[index]), Msg.buffer]);
+		})
+		var packet = Buffer.concat([(packetHeader), chunks, this.TKEN]);
+
+		this.socket.send(packet, 0, packet.length, this.port, this.host)
 	}
 	connect() {
 		this.SendControlMsg(1, "TKEN")
+		let connectInterval = setInterval(() => {
+			if (this.State == 0)
+				this.SendControlMsg(1, "TKEN")
+			else
+				clearInterval(connectInterval)
+		}, 500)
 		this.time = new Date().getTime() + 2000; // start sending keepalives after 2s
-	this.socket.on("message", async (a) => {
-		var unpacked: _packet = await this.Unpack(a)
-		if (unpacked.twprotocol.flags != 128 && unpacked.twprotocol.ack) {
-			unpacked.chunks.forEach(a => {
-				if (a.msg && !a.msg.startsWith("SNAP")) {
-					if (a.seq != undefined && a.seq != -1)
-						this.ack = a.seq
-					
-				}
-			})
-		}
-		var chunkMessages = unpacked.chunks.map(a => a.msg)
-		if (chunkMessages.includes("SV_CHAT")) {
-			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 = MsgUnpacker.unpackInt(a.raw.toJSON().data).result;
-					var remaining: number[] = MsgUnpacker.unpackInt(a.raw.toJSON().data).remaining;
-					unpacked.client_id = MsgUnpacker.unpackInt(remaining).result;
-					remaining = MsgUnpacker.unpackInt(remaining).remaining;
-					unpacked.message = MsgUnpacker.unpackString(remaining).result;
-					if (unpacked.client_id != -1) 
-						unpacked.author = {ClientInfo: this.client_infos[unpacked.client_id], PlayerInfo: this.player_infos[unpacked.client_id]}
-					// console.log(unpacked)
-					this.emit("message", unpacked)
-				}
-			})
-		}
-		if (chunkMessages.includes("SV_KILL_MSG")) {
-			var chat = unpacked.chunks.filter(a => a.msg == "SV_KILL_MSG");
-			chat.forEach(a => {
-				if (a.msg == "SV_KILL_MSG") {
-					var unpacked: iKillMsg = {} as iKillMsg;
-					unpacked.killer_id = MsgUnpacker.unpackInt(a.raw.toJSON().data).result;
-					var remaining: number[] = MsgUnpacker.unpackInt(a.raw.toJSON().data).remaining;
-					unpacked.victim_id = MsgUnpacker.unpackInt(remaining).result;
-					remaining = MsgUnpacker.unpackInt(remaining).remaining;
-					unpacked.weapon = MsgUnpacker.unpackInt(remaining).result;
-					remaining = MsgUnpacker.unpackInt(remaining).remaining;
-					unpacked.special_mode = MsgUnpacker.unpackInt(remaining).result;
-					if (unpacked.victim_id != -1) 
-						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)
+		this.socket.on("message", async (a) => {
+			var unpacked: _packet = await this.Unpack(a)
+			if (unpacked.twprotocol.flags != 128 && unpacked.twprotocol.ack) {
+				unpacked.chunks.forEach(a => {
+					if (a.msg && !a.msg.startsWith("SNAP")) {
+						if (a.seq != undefined && a.seq != -1)
+							this.ack = a.seq
+
+					}
+				})
+			}
+			var chunkMessages = unpacked.chunks.map(a => a.msg)
+			if (chunkMessages.includes("SV_CHAT")) {
+				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 = MsgUnpacker.unpackInt(a.raw.toJSON().data).result;
+						var remaining: number[] = MsgUnpacker.unpackInt(a.raw.toJSON().data).remaining;
+						unpacked.client_id = MsgUnpacker.unpackInt(remaining).result;
+						remaining = MsgUnpacker.unpackInt(remaining).remaining;
+						unpacked.message = MsgUnpacker.unpackString(remaining).result;
+						if (unpacked.client_id != -1)
+							unpacked.author = { ClientInfo: this.client_infos[unpacked.client_id], PlayerInfo: this.player_infos[unpacked.client_id] }
+						// console.log(unpacked)
+						this.emit("message", unpacked)
+					}
+				})
+			}
+			if (chunkMessages.includes("SV_KILL_MSG")) {
+				var chat = unpacked.chunks.filter(a => a.msg == "SV_KILL_MSG");
+				chat.forEach(a => {
+					if (a.msg == "SV_KILL_MSG") {
+						var unpacked: iKillMsg = {} as iKillMsg;
+						unpacked.killer_id = MsgUnpacker.unpackInt(a.raw.toJSON().data).result;
+						var remaining: number[] = MsgUnpacker.unpackInt(a.raw.toJSON().data).remaining;
+						unpacked.victim_id = MsgUnpacker.unpackInt(remaining).result;
+						remaining = MsgUnpacker.unpackInt(remaining).remaining;
+						unpacked.weapon = MsgUnpacker.unpackInt(remaining).result;
+						remaining = MsgUnpacker.unpackInt(remaining).remaining;
+						unpacked.special_mode = MsgUnpacker.unpackInt(remaining).result;
+						if (unpacked.victim_id != -1)
+							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)
+					}
+				})
+			}
+			if (a.toJSON().data[0] == 0x10) {
+				if (a.toString().includes("TKEN") || arrStartsWith(a.toJSON().data, [0x10, 0x0, 0x0, 0x0])) {
+					clearInterval(connectInterval);
+					this.TKEN = Buffer.from(a.toJSON().data.slice(a.toJSON().data.length - 4, a.toJSON().data.length))
+					this.SendControlMsg(3);
+					this.State = 2; // loading state
+					var info = new MsgPacker(1, true);
+					info.AddString("0.6 626fce9a778df4d4");
+					info.AddString(""); // password
+
+					var client_version = new MsgPacker(0, true);
+					client_version.AddBuffer(Buffer.from("8c00130484613e478787f672b3835bd4", 'hex'));
+					let randomUuid = new Uint8Array(16);
+
+					randomBytes(16).copy(randomUuid);
+
+					client_version.AddBuffer(Buffer.from(randomUuid));
+					client_version.AddInt(15091);
+					client_version.AddString("DDNet 15.9.1");
+
+					this.SendMsgExWithChunks([client_version, info], 1)
+				} else if (a.toJSON().data[3] == 0x4) {
+					// disconnected
+					this.State = 0;
+					let reason: string = (MsgUnpacker.unpackString(a.toJSON().data.slice(4)).result);
+					this.State = -1;
+					this.emit("disconnect", reason);
 				}
-			})
-		}
-		if (a.toJSON().data[0] == 0x10) {
-			if (a.toString().includes("TKEN") || arrStartsWith(a.toJSON().data, [0x10, 0x0, 0x0, 0x0])) {
-			   this.TKEN = Buffer.from(a.toJSON().data.slice(a.toJSON().data.length-4, a.toJSON().data.length))
-			   this.SendControlMsg(3);
-			   this.State = 2; // loading state
-			   var packer = new MsgPacker(1, true);
-			   packer.AddString("0.6 626fce9a778df4d4");
-			   packer.AddString(""); // password
-			   this.SendMsgEx(packer, 1)
-		   } else if (a.toJSON().data[3] == 0x4) {
-			   // disconnected
-			   this.State = 0;
-			   let reason: string = (MsgUnpacker.unpackString(a.toJSON().data.slice(4)).result);
-			   this.State = -1;
-			   this.emit("disconnect", reason);
-		   }
 
-		}
-		if (unpacked.chunks[0] && chunkMessages.includes("SV_READY_TO_ENTER")) {
-			var Msg = new MsgPacker(15, true); /* entergame */
-			this.SendMsgEx(Msg, 1);
-		} else if ((unpacked.chunks[0] && chunkMessages.includes("CAPABILITIES") || unpacked.chunks[0] && chunkMessages.includes("MAP_CHANGE"))) {
-			// send ready
-			var Msg = new MsgPacker(14, true); /* ready */
-			this.SendMsgEx(Msg, 1);
-		} else if ((unpacked.chunks[0] && chunkMessages.includes("CON_READY") || unpacked.chunks[0] && chunkMessages.includes("SV_MOTD"))) {
-			var packer = new MsgPacker(20, false);
-			packer.AddString(this.name); /* name */
-			packer.AddString(""); /* clan */
-			packer.AddInt(-1); /* country */
-			packer.AddString("greyfox"); /* skin */
-			packer.AddInt(1); /* use custom color */
-			packer.AddInt(10346103); /* color body */
-			packer.AddInt(65535); /* color feet */
-			this.SendMsgEx(packer, 1);
-
-			
-		} else if (unpacked.chunks[0] && chunkMessages.includes("SV_READY_TO_ENTER")) {
-			
-			if (this.State != 3) {
-				this.emit('connected');
 			}
-			this.State = 3
-		} else if (unpacked.chunks[0] && chunkMessages.includes("PING")) {
-			var packer = new MsgPacker(23, true);
-			this.SendMsgEx(packer, 1)
-		} 
-		if (chunkMessages.includes("SNAP") || chunkMessages.includes("SNAP_EMPTY") || chunkMessages.includes("SNAP_SINGLE")) {
-			this.receivedSnaps++; /* wait for 2 ss before seeing self as connected */
-			if (this.receivedSnaps >= 2) {
-				if (this.State != 3)
-					this.emit('connected')
+			if (unpacked.chunks[0] && chunkMessages.includes("SV_READY_TO_ENTER")) {
+				var Msg = new MsgPacker(15, true); /* entergame */
+				this.SendMsgEx(Msg, 1);
+			} else if ((unpacked.chunks[0] && chunkMessages.includes("CAPABILITIES") || unpacked.chunks[0] && chunkMessages.includes("MAP_CHANGE"))) {
+				// send ready
+				var Msg = new MsgPacker(14, true); /* ready */
+				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 */
+				this.SendMsgEx(info, 1);
+
+
+			} else if (unpacked.chunks[0] && chunkMessages.includes("SV_READY_TO_ENTER")) {
+
+				if (this.State != 3) {
+					this.emit('connected');
+				}
 				this.State = 3
+			} else if (unpacked.chunks[0] && chunkMessages.includes("PING")) {
+				var info = new MsgPacker(23, true);
+				this.SendMsgEx(info, 1)
 			}
+			if (chunkMessages.includes("SNAP") || chunkMessages.includes("SNAP_EMPTY") || chunkMessages.includes("SNAP_SINGLE")) {
+				this.receivedSnaps++; /* wait for 2 ss before seeing self as connected */
+				if (this.receivedSnaps >= 2) {
+					if (this.State != 3)
+						this.emit('connected')
+					this.State = 3
+				}
 
-			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 = (MsgUnpacker.unpackInt(chunk.raw.toJSON().data).result);
-					chunk.raw = Buffer.from(MsgUnpacker.unpackInt(chunk?.raw?.toJSON().data).remaining); 
-					let DeltaTick = MsgUnpacker.unpackInt(chunk?.raw?.toJSON().data).result
-					if (chunk.msg == "SNAP") {
-						chunk.raw = Buffer.from(MsgUnpacker.unpackInt(chunk?.raw?.toJSON().data).remaining); // delta tick
-						num_parts = (MsgUnpacker.unpackInt(chunk?.raw?.toJSON().data).result)
-						chunk.raw = Buffer.from(MsgUnpacker.unpackInt(chunk?.raw?.toJSON().data).remaining); // num parts
-						part = (MsgUnpacker.unpackInt(chunk?.raw?.toJSON().data).result)
-					}
-					chunk.raw = Buffer.from(MsgUnpacker.unpackInt(chunk?.raw?.toJSON().data).remaining); // part
-					if (chunk.msg != "SNAP_EMPTY")
+				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 = (MsgUnpacker.unpackInt(chunk.raw.toJSON().data).result);
+						chunk.raw = Buffer.from(MsgUnpacker.unpackInt(chunk?.raw?.toJSON().data).remaining);
+						let DeltaTick = MsgUnpacker.unpackInt(chunk?.raw?.toJSON().data).result
+						if (chunk.msg == "SNAP") {
+							chunk.raw = Buffer.from(MsgUnpacker.unpackInt(chunk?.raw?.toJSON().data).remaining); // delta tick
+							num_parts = (MsgUnpacker.unpackInt(chunk?.raw?.toJSON().data).result)
+							chunk.raw = Buffer.from(MsgUnpacker.unpackInt(chunk?.raw?.toJSON().data).remaining); // num parts
+							part = (MsgUnpacker.unpackInt(chunk?.raw?.toJSON().data).result)
+						}
+						chunk.raw = Buffer.from(MsgUnpacker.unpackInt(chunk?.raw?.toJSON().data).remaining); // part
+						if (chunk.msg != "SNAP_EMPTY")
+							chunk.raw = Buffer.from(MsgUnpacker.unpackInt(chunk?.raw?.toJSON().data).remaining); // crc
 						chunk.raw = Buffer.from(MsgUnpacker.unpackInt(chunk?.raw?.toJSON().data).remaining); // crc
-					chunk.raw = Buffer.from(MsgUnpacker.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 (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.time = new Date().getTime();
-			this.SendControlMsg(0);
-		}
-	})
+			}
+			if (new Date().getTime() - this.time >= 1000) {
+				this.time = new Date().getTime();
+				this.SendControlMsg(0);
+			}
+		})
 	}
 
 	Disconnect() {
-		this.SendControlMsg(4).then(() => {
-			this.State = -1;
-			this.socket.disconnect();
+		return new Promise((resolve) => {
+			this.SendControlMsg(4).then(() => {
+				resolve(true);
+				this.socket.close();
+				this.State = -1;
+			})
 		})
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "teeworlds",
-	"version": "2.0.0",
+	"version": "2.0.3",
 	"description": "Library for (ingame) teeworlds bots.",
 	"license": "MIT",
 	"main": "index.js",