teeworlds 2.1.7 → 2.1.8

package/lib/MsgPacker.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MsgPacker = void 0;
 var MsgPacker = /** @class */ (function () {
     function MsgPacker(msg, sys) {
-        this.result = Buffer.from([2 * msg + (sys ? 1 : 0)]); // booleans turn into int automatically. 
+        this.result = Buffer.from([2 * msg + (sys ? 1 : 0)]);
         this.sys = sys;
     }
     MsgPacker.prototype.AddString = function (str) {
@@ -33,7 +33,6 @@ var MsgPacker = /** @class */ (function () {
         }
         else
             result.push(pDst);
-        // ... i'll just stop trying to understand.
         this.result = Buffer.concat([this.result, Buffer.from(result)]);
     };
     Object.defineProperty(MsgPacker.prototype, "size", {
@@ -53,5 +52,3 @@ var MsgPacker = /** @class */ (function () {
     return MsgPacker;
 }());
 exports.MsgPacker = MsgPacker;
-// module.exports = MsgPacker;
-// export = MsgPacker;

package/lib/MsgPacker.ts

@@ -2,7 +2,7 @@ export class MsgPacker {
 	result: Buffer;
 	sys: boolean;
 	constructor(msg: number, sys: boolean) {
-		this.result = Buffer.from([2*msg + (sys ? 1 : 0)]) // booleans turn into int automatically. 
+		this.result = Buffer.from([2*msg + (sys ? 1 : 0)]);
 		this.sys = sys;
 	}
 	AddString(str: string) {
@@ -32,8 +32,6 @@ export class MsgPacker {
 		} else
 			result.push(pDst)
 
-			// ... i'll just stop trying to understand.
-		
 		this.result = Buffer.concat([this.result, Buffer.from(result)]) 
 	}
 	get size() {
@@ -43,5 +41,3 @@ export class MsgPacker {
 		return this.result
 	}
 }
-// module.exports = MsgPacker;
-// export = MsgPacker;

package/lib/MsgUnpacker.js

@@ -4,7 +4,6 @@ exports.MsgUnpacker = exports.unpackString = exports.unpackInt = void 0;
 var decoder = new TextDecoder('utf-8');
 function unpackInt(pSrc) {
     var result = 0;
-    // var len = 1;
     var iter = pSrc[Symbol.iterator]();
     var src = iter.next();
     src = src.value;
@@ -15,7 +14,6 @@ function unpackInt(pSrc) {
             break;
         src = iter.next();
         src = src.value;
-        // len++;
         result |= ((src & 127)) << (6 + 7 * i);
     }
     result ^= -sign;
@@ -53,4 +51,3 @@ var MsgUnpacker = /** @class */ (function () {
     return MsgUnpacker;
 }());
 exports.MsgUnpacker = MsgUnpacker;
-// export = {MsgUnpacker, unpackInt, unpackString}

package/lib/MsgUnpacker.ts

@@ -1,7 +1,6 @@
 const decoder = new TextDecoder('utf-8');
 export function unpackInt(pSrc: number[]): {result: number, remaining: number[]} {
 	var result = 0;
-	// var len = 1;
 	
 	var iter = pSrc[Symbol.iterator]()
 	var src: any = iter.next()
@@ -16,7 +15,6 @@ export function unpackInt(pSrc: number[]): {result: number, remaining: number[]}
 		src = iter.next()
 
 		src = src.value;
-		// len++;
 		result |= ((src & 0b0111_1111)) << (6+7*i)
 		
 	}
@@ -55,6 +53,3 @@ export class MsgUnpacker {
 		return unpacked.result;
 	}
 }
-
-
-// export = {MsgUnpacker, unpackInt, unpackString}

package/lib/client.js

@@ -164,10 +164,9 @@ var Client = /** @class */ (function (_super) {
             if (packet.length == 1 && packet[0] == -1)
                 return unpacked;
         }
-        // return unpacked;
         for (var i = 0; i < unpacked.twprotocol.chunkAmount; i++) {
             var 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;
             if (chunk.flags & 1) {
@@ -183,11 +182,10 @@ var Client = /** @class */ (function (_super) {
             Object.values(messageUUIDs).forEach(function (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;
@@ -211,31 +209,10 @@ var Client = /** @class */ (function (_super) {
         */
         });
     };
-    // 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);
-    // }
     Client.prototype.SendMsgEx = function (Msgs, Flags) {
         var _this = this;
         if (this.State == States.STATE_OFFLINE)
-            return; //throw new Error("Client is not connected");
+            return;
         if (!this.socket)
             return;
         var _Msgs;
@@ -268,7 +245,7 @@ var Client = /** @class */ (function (_super) {
     };
     Client.prototype.SendMsgRaw = function (chunks) {
         if (this.State == States.STATE_OFFLINE)
-            return console.log(chunks, "client not connected"); //throw new Error("Client is not connected");
+            return;
         if (!this.socket)
             return;
         this.lastSendTime = new Date().getTime();
@@ -278,7 +255,6 @@ var Client = /** @class */ (function (_super) {
     };
     Client.prototype.MsgToChunk = function (packet) {
         var 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;
@@ -291,13 +267,10 @@ var Client = /** @class */ (function (_super) {
         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(function (a, i) {
             if (a.compare(packet.slice(0, 16)) === 0) {
                 chunk.extended_msgid = a;
-                // chunk.type = 'sys';
                 chunk.msg = Object.keys(messageUUIDs)[i];
             }
         });
@@ -310,7 +283,6 @@ var Client = /** @class */ (function (_super) {
             if (_this.State == States.STATE_ONLINE) {
                 if (_this.AckGameTick > 0)
                     _this.PredGameTick++;
-                // console.log(this.PredGameTick, this.AckGameTick)
             }
             else if (_this.State == States.STATE_OFFLINE)
                 clearInterval(predTimer);
@@ -323,30 +295,21 @@ var Client = /** @class */ (function (_super) {
                 clearInterval(connectInterval);
         }, 500);
         var inputInterval = setInterval(function () {
-            // if (new Date().getTime() - this.time >= 1000) {
             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);
         var resendTimeout = setInterval(function () {
-            // this.sentChunkQueue.forEach((chunk) => {
-            // if (this.State == 0) // disconnected
-            // return;
             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, _this.State);
                 }
             }
             else
                 clearInterval(resendTimeout);
-            // })
         }, 1000);
         this.time = new Date().getTime() + 2000; // start sending keepalives after 2s
         if (this.socket)
@@ -384,7 +347,6 @@ var Client = /** @class */ (function (_super) {
                         // disconnected
                         _this.State = States.STATE_OFFLINE;
                         var reason = (MsgUnpacker_1.unpackString(a.toJSON().data.slice(4)).result);
-                        // this.State = -1;
                         _this.emit("disconnect", reason);
                     }
                 }
@@ -393,8 +355,6 @@ var Client = /** @class */ (function (_super) {
                     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(function (buff, i) {
@@ -402,61 +362,55 @@ var Client = /** @class */ (function (_super) {
                     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(function (a) { return a.msg === "SNAP" || a.msg === "SNAP_SINGLE" || a.msg === "SNAP_EMPTY"; });
-                // console.log(unpacked.chunks.length, unpacked)
                 if (snapChunks.length > 0) {
-                    var part_1 = 0;
-                    var num_parts_1 = 1;
+                    var part = 0;
+                    var num_parts = 1;
                     snapChunks.forEach(function (chunk) {
-                        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-                        var AckGameTick = (MsgUnpacker_1.unpackInt(chunk.raw.toJSON().data).result);
-                        // setImmediate(() => {
-                        // console.log(AckGameTick, this.AckGameTick, chunk.msg)
+                        var unpacker = new MsgUnpacker_1.MsgUnpacker(chunk.raw.toJSON().data);
+                        var 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(MsgUnpacker_1.unpackInt((_a = chunk === null || chunk === void 0 ? void 0 : chunk.raw) === null || _a === void 0 ? void 0 : _a.toJSON().data).remaining);
-                        var DeltaTick = MsgUnpacker_1.unpackInt((_b = chunk === null || chunk === void 0 ? void 0 : chunk.raw) === null || _b === void 0 ? void 0 : _b.toJSON().data).result;
+                        // chunk.raw = Buffer.from(unpackInt(chunk?.raw?.toJSON().data).remaining);
+                        var DeltaTick = AckGameTick - unpacker.unpackInt();
+                        var num_parts = 1;
+                        var part = 0;
                         if (chunk.msg === "SNAP") {
-                            chunk.raw = Buffer.from(MsgUnpacker_1.unpackInt((_c = chunk === null || chunk === void 0 ? void 0 : chunk.raw) === null || _c === void 0 ? void 0 : _c.toJSON().data).remaining); // delta tick
-                            num_parts_1 = (MsgUnpacker_1.unpackInt((_d = chunk === null || chunk === void 0 ? void 0 : chunk.raw) === null || _d === void 0 ? void 0 : _d.toJSON().data).result);
-                            chunk.raw = Buffer.from(MsgUnpacker_1.unpackInt((_e = chunk === null || chunk === void 0 ? void 0 : chunk.raw) === null || _e === void 0 ? void 0 : _e.toJSON().data).remaining); // num parts
-                            part_1 = (MsgUnpacker_1.unpackInt((_f = chunk === null || chunk === void 0 ? void 0 : chunk.raw) === null || _f === void 0 ? void 0 : _f.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();
+                        }
+                        var crc = 0;
+                        var part_size = 0;
+                        if (chunk.msg != "SNAP_EMPTY") {
+                            crc = unpacker.unpackInt(); // crc
+                            part_size = unpacker.unpackInt();
                         }
-                        chunk.raw = Buffer.from(MsgUnpacker_1.unpackInt((_g = chunk === null || chunk === void 0 ? void 0 : chunk.raw) === null || _g === void 0 ? void 0 : _g.toJSON().data).remaining); // part
-                        if (chunk.msg != "SNAP_EMPTY")
-                            chunk.raw = Buffer.from(MsgUnpacker_1.unpackInt((_h = chunk === null || chunk === void 0 ? void 0 : chunk.raw) === null || _h === void 0 ? void 0 : _h.toJSON().data).remaining); // crc
-                        chunk.raw = Buffer.from(MsgUnpacker_1.unpackInt((_j = chunk === null || chunk === void 0 ? void 0 : chunk.raw) === null || _j === void 0 ? void 0 : _j.toJSON().data).remaining); // crc
-                        if (part_1 === 0 || _this.snaps.length > 30) {
+                        if (part === 0 || _this.snaps.length > 30) {
                             _this.snaps = [];
                         }
-                        chunk.raw = Buffer.from(MsgUnpacker_1.unpackInt((_k = chunk === null || chunk === void 0 ? void 0 : chunk.raw) === null || _k === void 0 ? void 0 : _k.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 - 1) === part_1 && _this.snaps.length === num_parts_1) {
+                        if ((num_parts - 1) === part && _this.snaps.length === num_parts) {
                             var mergedSnaps_1 = Buffer.concat(_this.snaps);
+                            // mergedSnaps = Buffer.from(unpackInt(mergedSnaps.toJSON().data).remaining);
                             var snapUnpacked = SnapUnpacker.unpackSnapshot(mergedSnaps_1.toJSON().data, 1);
-                            // console.log(snapUnpacked)
+                            // console.log(snapUnpacked.items, toHexStream(mergedSnaps));
                             snapUnpacked.items.forEach(function (a, i) {
                                 if (a.type_id === items.OBJ_CLIENT_INFO) {
-                                    // console.log(a.parsed, i)
                                     _this.client_infos[a.id] = a.parsed;
-                                    if (a.parsed.name.includes("������")) {
-                                        console.log(_this.PredGameTick, _this.AckGameTick, mergedSnaps_1.toJSON().data.toString());
+                                    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_1), chunk, AckGameTick, DeltaTick, crc, part_size);
                                     }
-                                    console.log(_this.client_infos[a.id].name, _this.client_infos[a.id].clan, [a.id]);
+                                    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;
-                                // }
                             });
                         }
                     });
@@ -466,15 +420,17 @@ var Client = /** @class */ (function (_super) {
                     var chat = unpacked.chunks.filter(function (a) { return a.msg == "SV_CHAT"; });
                     chat.forEach(function (a) {
                         if (a.msg == "SV_CHAT") {
-                            var unpacked = {};
-                            unpacked.team = MsgUnpacker_1.unpackInt(a.raw.toJSON().data).result;
-                            var remaining = MsgUnpacker_1.unpackInt(a.raw.toJSON().data).remaining;
-                            unpacked.client_id = MsgUnpacker_1.unpackInt(remaining).result;
-                            remaining = MsgUnpacker_1.unpackInt(remaining).remaining;
-                            unpacked.message = MsgUnpacker_1.unpackString(remaining).result;
+                            var unpacker = new MsgUnpacker_1.MsgUnpacker(a.raw.toJSON().data);
+                            var unpacked = {
+                                team: unpacker.unpackInt(),
+                                client_id: unpacker.unpackInt(),
+                                message: unpacker.unpackString()
+                            };
                             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);
                         }
                     });
@@ -493,7 +449,6 @@ var Client = /** @class */ (function (_super) {
                                 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);
                         }
                     });
@@ -540,51 +495,6 @@ var Client = /** @class */ (function (_super) {
                             _this.emit('connected');
                         _this.State = States.STATE_ONLINE;
                     }
-                    var chunks = unpacked.chunks.filter(function (a) { return a.msg == "SNAP" || a.msg == "SNAP_SINGLE" || a.msg == "SNAP_EMPTY"; });
-                    if (chunks.length > 0) {
-                        var part_2 = 0;
-                        var num_parts_2 = 1;
-                        chunks.forEach(function (chunk) {
-                            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-                            var AckGameTick = (MsgUnpacker_1.unpackInt(chunk.raw.toJSON().data).result);
-                            chunk.raw = Buffer.from(MsgUnpacker_1.unpackInt((_a = chunk === null || chunk === void 0 ? void 0 : chunk.raw) === null || _a === void 0 ? void 0 : _a.toJSON().data).remaining);
-                            var DeltaTick = MsgUnpacker_1.unpackInt((_b = chunk === null || chunk === void 0 ? void 0 : chunk.raw) === null || _b === void 0 ? void 0 : _b.toJSON().data).result;
-                            if (chunk.msg == "SNAP") {
-                                chunk.raw = Buffer.from(MsgUnpacker_1.unpackInt((_c = chunk === null || chunk === void 0 ? void 0 : chunk.raw) === null || _c === void 0 ? void 0 : _c.toJSON().data).remaining); // delta tick
-                                num_parts_2 = (MsgUnpacker_1.unpackInt((_d = chunk === null || chunk === void 0 ? void 0 : chunk.raw) === null || _d === void 0 ? void 0 : _d.toJSON().data).result);
-                                chunk.raw = Buffer.from(MsgUnpacker_1.unpackInt((_e = chunk === null || chunk === void 0 ? void 0 : chunk.raw) === null || _e === void 0 ? void 0 : _e.toJSON().data).remaining); // num parts
-                                part_2 = (MsgUnpacker_1.unpackInt((_f = chunk === null || chunk === void 0 ? void 0 : chunk.raw) === null || _f === void 0 ? void 0 : _f.toJSON().data).result);
-                            }
-                            chunk.raw = Buffer.from(MsgUnpacker_1.unpackInt((_g = chunk === null || chunk === void 0 ? void 0 : chunk.raw) === null || _g === void 0 ? void 0 : _g.toJSON().data).remaining); // part
-                            if (chunk.msg != "SNAP_EMPTY")
-                                chunk.raw = Buffer.from(MsgUnpacker_1.unpackInt((_h = chunk === null || chunk === void 0 ? void 0 : chunk.raw) === null || _h === void 0 ? void 0 : _h.toJSON().data).remaining); // crc
-                            chunk.raw = Buffer.from(MsgUnpacker_1.unpackInt((_j = chunk === null || chunk === void 0 ? void 0 : chunk.raw) === null || _j === void 0 ? void 0 : _j.toJSON().data).remaining); // crc
-                            if (part_2 == 0 || _this.snaps.length > 30) {
-                                _this.snaps = [];
-                            }
-                            _this.snaps.push(chunk.raw);
-                            if ((num_parts_2 - 1) == part_2 && _this.snaps.length == num_parts_2) {
-                                var mergedSnaps = Buffer.concat(_this.snaps);
-                                var snapUnpacked = SnapUnpacker.unpackSnapshot(mergedSnaps.toJSON().data, 1);
-                                snapUnpacked.items.forEach(function (a, i) {
-                                    if (a.type_id == items.OBJ_CLIENT_INFO) {
-                                        _this.client_infos[a.id] = a.parsed;
-                                        // 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;
-                                    }
-                                    else if (a.type_id == items.OBJ_EX || a.type_id > 0x4000) {
-                                        if (a.data.length == 5 && (a.parsed.freeze_end > 0 || a.parsed.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();
@@ -600,9 +510,6 @@ var Client = /** @class */ (function (_super) {
         inputMsg.AddInt(this.AckGameTick);
         inputMsg.AddInt(this.PredGameTick);
         inputMsg.AddInt(40);
-        // let playerflags = 2;
-        // playerflags |= 8; // scoreboard
-        // playerflags |= 16; // aimline
         var input_data = [
             input.m_Direction,
             input.m_TargetX,
@@ -615,7 +522,6 @@ var Client = /** @class */ (function (_super) {
             input.m_NextWeapon,
             input.m_PrevWeapon
         ];
-        // console.log(this.player_infos, this.client_infos)
         input_data.forEach(function (a) {
             inputMsg.AddInt(a);
         });
@@ -680,5 +586,3 @@ var Client = /** @class */ (function (_super) {
     return Client;
 }(stream_1.EventEmitter));
 exports.Client = Client;
-// export = Client;
-// module.exports = Client;

package/lib/client.ts

@@ -3,7 +3,7 @@ import { randomBytes } from "crypto";
 import net from 'dgram';
 import { EventEmitter } from 'stream';
 
-import { unpackInt, unpackString, MsgUnpacker } from "./MsgUnpacker";
+import { unpackString, MsgUnpacker } from "./MsgUnpacker";
 
 import Movement from './movement';
 
@@ -268,10 +268,10 @@ export 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;
 
@@ -287,12 +287,11 @@ export 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
@@ -315,33 +314,10 @@ export 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);
-
-	// }
+
 	SendMsgEx(Msgs: MsgPacker[] | MsgPacker, Flags: number) {
 		if (this.State == States.STATE_OFFLINE)
-			return; //throw new Error("Client is not connected");
+			return; 
 		if (!this.socket)
 			return;
 		let _Msgs: MsgPacker[];
@@ -376,7 +352,7 @@ export class Client extends EventEmitter {
 	}
 	SendMsgRaw(chunks: Buffer[]) {
 		if (this.State == States.STATE_OFFLINE)
-			return console.log(chunks, "client not connected"); //throw new Error("Client is not connected");
+			return;
 		if (!this.socket)
 			return;
 
@@ -391,7 +367,6 @@ export 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;
@@ -404,13 +379,10 @@ export 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];
 			}
 		})
@@ -425,7 +397,6 @@ export class Client extends EventEmitter {
 			if (this.State == States.STATE_ONLINE) {
 				if (this.AckGameTick > 0)
 					this.PredGameTick++;
-				// console.log(this.PredGameTick, this.AckGameTick)
 			} else if (this.State == States.STATE_OFFLINE) 
 				clearInterval(predTimer);
 			
@@ -440,30 +411,21 @@ export class Client extends EventEmitter {
 		}, 500);
 
 		let inputInterval = setInterval(() => {
-			// if (new Date().getTime() - this.time >= 1000) {
 			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 != States.STATE_OFFLINE) {
 				if (((new Date().getTime()) - this.lastSendTime) > 900 && this.sentChunkQueue.length > 0) {
 					this.SendMsgRaw([this.sentChunkQueue[0]]);
-					console.log(this.sentChunkQueue, this.State);
 				}
 			} else
 				clearInterval(resendTimeout)
-			// })
 		}, 1000)
 	
 
@@ -506,7 +468,6 @@ export class Client extends EventEmitter {
 						// disconnected
 						this.State = States.STATE_OFFLINE;
 						let reason: string = (unpackString(a.toJSON().data.slice(4)).result);
-						// this.State = -1;
 						this.emit("disconnect", reason);
 					}
 
@@ -517,8 +478,6 @@ export 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) => {
@@ -526,63 +485,60 @@ export 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())
+									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].name, this.client_infos[a.id].clan, [a.id])
+									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;
-								// }
 							})
 						}
 
@@ -594,15 +550,18 @@ export 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)
 						}
 					})
@@ -621,7 +580,6 @@ export 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)
 						}
 					})
@@ -669,52 +627,6 @@ export 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();
@@ -731,9 +643,6 @@ export 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 = [
 
@@ -748,7 +657,6 @@ export 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);
 		});
@@ -809,6 +717,3 @@ export class Client extends EventEmitter {
 
 
 }
-
-// export = Client;
-// module.exports = Client;

package/lib/snapshot.js

@@ -69,7 +69,7 @@ var Snapshot = /** @class */ (function () {
         }
         pIntz.splice(-1, 1);
         pStr = decoder.decode(new Uint8Array(pIntz));
-        pStr = pStr.replace(/\x00|\u0000/g, ""); //.replace(/ﾀ/g, "")
+        pStr = pStr.replace(/\0.*/g, ''); // Remove content from first null char to end.
         return pStr;
     };
     Snapshot.prototype.parseItem = function (data, Type) {
@@ -290,18 +290,13 @@ var Snapshot = /** @class */ (function () {
     };
     Snapshot.prototype.unpackSnapshot = function (snap, lost) {
         if (lost === void 0) { lost = 0; }
-        // var size = unpackInt(snap).result;
         var unpacker = new MsgUnpacker_1.MsgUnpacker(snap);
-        // snap = unpackInt(snap).remaining; // size
         /* key = (((type_id) << 16) | (id))
         * key_to_id = ((key) & 0xffff)
         * key_to_type_id = ((key >> 16) & 0xffff)
         * https://github.com/heinrich5991/libtw2/blob/master/snapshot/src/
         * https://github.com/heinrich5991/libtw2/blob/master/doc/snapshot.md
         */
-        // snap = unpackInt(snap).remaining;
-        // console.log(unpackInt(snap).result, "tick?") // key?
-        // snap = unpackInt(snap).remaining;
         var num_removed_items = unpacker.unpackInt();
         var num_item_deltas = unpacker.unpackInt();
         unpacker.unpackInt(); // _zero padding
@@ -336,10 +331,7 @@ var Snapshot = /** @class */ (function () {
                 if (unpacker.remaining.length > 0)
                     data.push(unpacker.unpackInt());
             }
-            // console.log(type_id, id, _size, data);
             var parsed = this.parseItem(data, type_id);
-            // console.log(data)
-            // console.log('')
             items.items.push({ data: data, parsed: parsed, type_id: type_id, id: id, key: key });
         }
         return items;
@@ -347,5 +339,3 @@ var Snapshot = /** @class */ (function () {
     return Snapshot;
 }());
 exports.Snapshot = Snapshot;
-// module.exports = MsgPacker;
-// export {Snapshot};

package/lib/snapshot.ts

@@ -67,7 +67,8 @@ export class Snapshot {
 		}
 		pIntz.splice(-1, 1)
 		pStr = decoder.decode(new Uint8Array(pIntz));
-		pStr = pStr.replace(/\x00|\u0000/g, "");//.replace(/ﾀ/g, "")
+
+    	pStr = pStr.replace(/\0.*/g, ''); // Remove content from first null char to end.
 		return pStr;
 	}
 	private parseItem(data: number[], Type: number): Item {
@@ -290,10 +291,8 @@ export class Snapshot {
 		return _item;
 	}
 	unpackSnapshot(snap: number[], lost = 0) { 
-		// var size = unpackInt(snap).result;
 		let unpacker = new MsgUnpacker(snap);
 
-		// snap = unpackInt(snap).remaining; // size
 		
 		/* key = (((type_id) << 16) | (id))
 		* key_to_id = ((key) & 0xffff)
@@ -302,9 +301,6 @@ export class Snapshot {
 		* https://github.com/heinrich5991/libtw2/blob/master/doc/snapshot.md
 		*/ 
 	
-		// snap = unpackInt(snap).remaining;
-		// console.log(unpackInt(snap).result, "tick?") // key?
-		// snap = unpackInt(snap).remaining;
 		let num_removed_items = unpacker.unpackInt();
 		let num_item_deltas = unpacker.unpackInt();
 		unpacker.unpackInt(); // _zero padding
@@ -342,16 +338,12 @@ export class Snapshot {
 				if (unpacker.remaining.length > 0) 
 					data.push(unpacker.unpackInt());
 			}
-			// console.log(type_id, id, _size, data);
+
 			let parsed = this.parseItem(data, type_id)
 			
-			// console.log(data)
-			// console.log('')
 			items.items.push({data, parsed, type_id, id, key})
 		}
 
 		
 		return items;
 	}}
-// module.exports = MsgPacker;
-// export {Snapshot};

package/package.json

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