teeworlds 2.1.3 → 2.1.8

package/lib/client.js

@@ -12,54 +12,32 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Client = void 0;
 var crypto_1 = require("crypto");
 var dgram_1 = __importDefault(require("dgram"));
 var stream_1 = require("stream");
 var MsgUnpacker_1 = require("./MsgUnpacker");
-var MsgPacker_1 = __importDefault(require("./MsgPacker"));
+var movement_1 = __importDefault(require("./movement"));
+var MsgPacker_1 = require("./MsgPacker");
 var snapshot_1 = require("./snapshot");
 var huffman_1 = __importDefault(require("./huffman"));
 var huff = new huffman_1.default();
 var SnapUnpacker = new snapshot_1.Snapshot();
+var States;
+(function (States) {
+    States[States["STATE_OFFLINE"] = 0] = "STATE_OFFLINE";
+    States[States["STATE_CONNECTING"] = 1] = "STATE_CONNECTING";
+    States[States["STATE_LOADING"] = 2] = "STATE_LOADING";
+    States[States["STATE_ONLINE"] = 3] = "STATE_ONLINE";
+    States[States["STATE_DEMOPLAYBACK"] = 4] = "STATE_DEMOPLAYBACK";
+    States[States["STATE_QUITTING"] = 5] = "STATE_QUITTING";
+    States[States["STATE_RESTARTING"] = 6] = "STATE_RESTARTING";
+})(States || (States = {}));
+;
 var NETMSGTYPE;
 (function (NETMSGTYPE) {
     NETMSGTYPE[NETMSGTYPE["EX"] = 0] = "EX";
@@ -149,73 +127,73 @@ function arrStartsWith(arr, arrStart, start) {
 }
 var Client = /** @class */ (function (_super) {
     __extends(Client, _super);
-    function Client(ip, port, nickname) {
+    function Client(ip, port, nickname, options) {
         var _this = _super.call(this) || this;
         _this.host = ip;
         _this.port = port;
         _this.name = nickname;
+        _this.AckGameTick = 0;
+        _this.PredGameTick = 0;
+        if (options)
+            _this.options = options;
+        _this.timer = 0;
+        _this.movement = new movement_1.default();
         _this.snaps = [];
         _this.client_infos = [];
         _this.player_infos = [];
-        _this.State = 0; // 0 = offline; 1 = STATE_CONNECTING = 1, STATE_LOADING = 2, STATE_ONLINE = 3
+        _this.sentChunkQueue = [];
+        _this.State = States.STATE_OFFLINE; // 0 = offline; 1 = STATE_CONNECTING = 1, STATE_LOADING = 2, STATE_ONLINE = 3
         _this.ack = 0; // ack of messages the client has received
         _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.socket = dgram_1.default.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.State = 0;
+        _this.lastSendTime = new Date().getTime();
         return _this;
     }
     Client.prototype.Unpack = function (packet) {
-        return __awaiter(this, void 0, void 0, function () {
-            var unpacked, i, chunk;
-            return __generator(this, function (_a) {
-                unpacked = { 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 [2 /*return*/, unpacked];
-                packet = packet.slice(3);
-                if (unpacked.twprotocol.flags & 128) {
-                    packet = huff.decompress(packet);
-                    if (packet.length == 1 && packet[0] == -1)
-                        return [2 /*return*/, unpacked];
-                }
-                // return unpacked;
-                for (i = 0; i < unpacked.twprotocol.chunkAmount; i++) {
-                    chunk = {};
-                    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];
-                        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.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];
-                        }
-                    });
-                    packet = packet.slice(chunk.bytes); // +1 cuz it adds an extra \x00 for easier parsing i guess
-                    unpacked.chunks.push(chunk);
+        var unpacked = { 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 = huff.decompress(packet);
+            if (packet.length == 1 && packet[0] == -1)
+                return unpacked;
+        }
+        for (var i = 0; i < unpacked.twprotocol.chunkAmount; i++) {
+            var chunk = {};
+            chunk.bytes = ((packet[0] & 0x3f) << 4) | (packet[1] & ((1 << 4) - 1));
+            chunk.flags = (packet[0] >> 6) & 3;
+            chunk.sequence = -1;
+            if (chunk.flags & 1) {
+                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.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.msg = Object.keys(messageUUIDs)[i];
                 }
-                return [2 /*return*/, unpacked];
             });
-        });
+            packet = packet.slice(chunk.bytes);
+            unpacked.chunks.push(chunk);
+        }
+        return unpacked;
     };
     Client.prototype.SendControlMsg = function (msg, ExtraMsg) {
         var _this = this;
         if (ExtraMsg === void 0) { ExtraMsg = ""; }
+        this.lastSendTime = new Date().getTime();
         return new Promise(function (resolve, reject) {
             if (_this.socket) {
                 var latestBuf = Buffer.from([0x10 + (((16 << 4) & 0xf0) | ((_this.ack >> 8) & 0xf)), _this.ack & 0xff, 0x00, msg]);
@@ -231,229 +209,331 @@ 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);
-        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);
-    };
-    Client.prototype.SendMsgExWithChunks = function (Msgs, Flags) {
+    Client.prototype.SendMsgEx = function (Msgs, Flags) {
         var _this = this;
-        if (this.State == -1)
-            throw new Error("Client is not connected");
+        if (this.State == States.STATE_OFFLINE)
+            return;
         if (!this.socket)
             return;
+        var _Msgs;
+        if (Msgs instanceof Array)
+            _Msgs = Msgs;
+        else
+            _Msgs = [Msgs];
+        this.lastSendTime = new Date().getTime();
         var header = [];
-        Msgs.forEach(function (Msg, index) {
-            header[index] = new Array(2);
+        _Msgs.forEach(function (Msg, 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);
             if (Flags & 1) {
                 _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(function (Msg, index) {
+        _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.SendMsgRaw = function (chunks) {
+        if (this.State == States.STATE_OFFLINE)
+            return;
+        if (!this.socket)
+            return;
+        this.lastSendTime = new Date().getTime();
+        var packetHeader = Buffer.from([0x0 + (((16 << 4) & 0xf0) | ((this.ack >> 8) & 0xf)), this.ack & 0xff, chunks.length]);
+        var packet = Buffer.concat([(packetHeader), Buffer.concat(chunks), this.TKEN]);
+        this.socket.send(packet, 0, packet.length, this.port, this.host);
+    };
+    Client.prototype.MsgToChunk = function (packet) {
+        var chunk = {};
+        chunk.bytes = ((packet[0] & 0x3f) << 4) | (packet[1] & ((1 << 4) - 1));
+        chunk.flags = (packet[0] >> 6) & 3;
+        chunk.sequence = -1;
+        if (chunk.flags & 1) {
+            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.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.msg = Object.keys(messageUUIDs)[i];
+            }
+        });
+        return chunk;
+    };
     Client.prototype.connect = function () {
         var _this = this;
+        this.State = States.STATE_CONNECTING;
+        var predTimer = setInterval(function () {
+            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");
         var connectInterval = setInterval(function () {
-            if (_this.State == 0)
+            if (_this.State == States.STATE_CONNECTING)
                 _this.SendControlMsg(1, "TKEN");
             else
                 clearInterval(connectInterval);
         }, 500);
+        var inputInterval = setInterval(function () {
+            if (_this.State == States.STATE_OFFLINE)
+                clearInterval(inputInterval);
+            if (_this.State != States.STATE_ONLINE)
+                return;
+            _this.time = new Date().getTime();
+            _this.sendInput();
+        }, 500);
+        var resendTimeout = setInterval(function () {
+            if (_this.State != States.STATE_OFFLINE) {
+                if (((new Date().getTime()) - _this.lastSendTime) > 900 && _this.sentChunkQueue.length > 0) {
+                    _this.SendMsgRaw([_this.sentChunkQueue[0]]);
+                }
+            }
+            else
+                clearInterval(resendTimeout);
+        }, 1000);
         this.time = new Date().getTime() + 2000; // start sending keepalives after 2s
         if (this.socket)
-            this.socket.on("message", function (a) { return __awaiter(_this, void 0, void 0, function () {
-                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) {
-                        case 0: return [4 /*yield*/, this.Unpack(a)];
-                        case 1:
-                            unpacked = _a.sent();
-                            if (unpacked.twprotocol.flags != 128 && unpacked.twprotocol.ack) {
-                                unpacked.chunks.forEach(function (a) {
-                                    if (a.msg && !a.msg.startsWith("SNAP")) {
-                                        if (a.seq != undefined && a.seq != -1)
-                                            _this.ack = a.seq;
-                                    }
-                                });
-                            }
-                            chunkMessages = unpacked.chunks.map(function (a) { return a.msg; });
-                            if (chunkMessages.includes("SV_CHAT")) {
-                                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;
-                                        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")) {
-                                chat = unpacked.chunks.filter(function (a) { return a.msg == "SV_KILL_MSG"; });
-                                chat.forEach(function (a) {
-                                    if (a.msg == "SV_KILL_MSG") {
-                                        var unpacked = {};
-                                        var unpacker = new MsgUnpacker_1.MsgUnpacker(a.raw.toJSON().data);
-                                        unpacked.killer_id = unpacker.unpackInt();
-                                        unpacked.victim_id = unpacker.unpackInt();
-                                        unpacked.weapon = unpacker.unpackInt();
-                                        unpacked.special_mode = unpacker.unpackInt();
-                                        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", function (a, rinfo) {
+                var _a, _b, _c, _d, _e, _f;
+                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) {
+                        clearInterval(connectInterval);
+                        _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.MsgPacker(1, true);
+                        info.AddString("0.6 626fce9a778df4d4");
+                        info.AddString(((_a = _this.options) === null || _a === void 0 ? void 0 : _a.password) === undefined ? "" : (_b = _this.options) === null || _b === void 0 ? void 0 : _b.password); // password
+                        var client_version = new MsgPacker_1.MsgPacker(0, true);
+                        client_version.AddBuffer(Buffer.from("8c00130484613e478787f672b3835bd4", 'hex'));
+                        var randomUuid = Buffer.alloc(16);
+                        crypto_1.randomBytes(16).copy(randomUuid);
+                        client_version.AddBuffer(randomUuid);
+                        if (((_c = _this.options) === null || _c === void 0 ? void 0 : _c.ddnet_version) !== undefined) {
+                            client_version.AddInt((_d = _this.options) === null || _d === void 0 ? void 0 : _d.ddnet_version.version);
+                            client_version.AddString("DDNet " + ((_e = _this.options) === null || _e === void 0 ? void 0 : _e.ddnet_version.release_version));
+                        }
+                        else {
+                            client_version.AddInt(16003);
+                            client_version.AddString("DDNet 16.0.3");
+                        }
+                        _this.SendMsgEx([client_version, info], 1);
+                    }
+                    else if (a.toJSON().data[3] == 0x4) {
+                        // disconnected
+                        _this.State = States.STATE_OFFLINE;
+                        var reason = (MsgUnpacker_1.unpackString(a.toJSON().data.slice(4)).result);
+                        _this.emit("disconnect", reason);
+                    }
+                }
+                var unpacked = _this.Unpack(a);
+                unpacked.chunks.forEach(function (a) {
+                    if (a.flags & 1) { // vital
+                        if (a.seq != undefined && a.seq != -1)
+                            _this.ack = a.seq;
+                    }
+                });
+                _this.sentChunkQueue.forEach(function (buff, i) {
+                    var chunk = _this.MsgToChunk(buff);
+                    if (chunk.flags & 1) {
+                        if (chunk.seq && chunk.seq < _this.ack) {
+                            _this.sentChunkQueue.splice(i, 1);
+                        }
+                    }
+                });
+                var snapChunks = unpacked.chunks.filter(function (a) { return a.msg === "SNAP" || a.msg === "SNAP_SINGLE" || a.msg === "SNAP_EMPTY"; });
+                if (snapChunks.length > 0) {
+                    var part = 0;
+                    var num_parts = 1;
+                    snapChunks.forEach(function (chunk) {
+                        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;
+                        }
+                        // 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(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();
+                        }
+                        if (part === 0 || _this.snaps.length > 30) {
+                            _this.snaps = [];
+                        }
+                        chunk.raw = Buffer.from(unpacker.remaining);
+                        _this.snaps.push(chunk.raw);
+                        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.items, toHexStream(mergedSnaps));
+                            snapUnpacked.items.forEach(function (a, i) {
+                                if (a.type_id === items.OBJ_CLIENT_INFO) {
+                                    _this.client_infos[a.id] = a.parsed;
+                                    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);
                                     }
-                                });
-                            }
-                            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
-                                    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
-                                    this.State = 0;
-                                    reason = (MsgUnpacker_1.unpackString(a.toJSON().data.slice(4)).result);
-                                    this.State = -1;
-                                    this.emit("disconnect", reason);
-                                }
-                            }
-                            if (unpacked.chunks[0] && chunkMessages.includes("SV_READY_TO_ENTER")) {
-                                Msg = new MsgPacker_1.default(15, true);
-                                this.SendMsgEx(Msg, 1);
-                            }
-                            else if ((unpacked.chunks[0] && chunkMessages.includes("CAPABILITIES") || unpacked.chunks[0] && chunkMessages.includes("MAP_CHANGE"))) {
-                                Msg = new MsgPacker_1.default(14, true);
-                                this.SendMsgEx(Msg, 1);
-                            }
-                            else if ((unpacked.chunks[0] && chunkMessages.includes("CON_READY") || unpacked.chunks[0] && chunkMessages.includes("SV_MOTD"))) {
-                                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) {
-                                    this.emit('connected');
+                                    console.log(_this.client_infos[a.id]);
                                 }
-                                this.State = 3;
-                            }
-                            else if (unpacked.chunks[0] && chunkMessages.includes("PING")) {
-                                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 */
-                                if (this.receivedSnaps >= 2) {
-                                    if (this.State != 3)
-                                        this.emit('connected');
-                                    this.State = 3;
-                                }
-                                chunks = unpacked.chunks.filter(function (a) { return a.msg == "SNAP" || a.msg == "SNAP_SINGLE" || a.msg == "SNAP_EMPTY"; });
-                                if (chunks.length > 0) {
-                                    part_1 = 0;
-                                    num_parts_1 = 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_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(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) {
-                                            _this.snaps = [];
-                                        }
-                                        _this.snaps.push(chunk.raw);
-                                        if ((num_parts_1 - 1) == part_1 && _this.snaps.length == num_parts_1) {
-                                            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.time = new Date().getTime();
-                                this.SendControlMsg(0);
-                            }
-                            return [2 /*return*/];
+                            });
+                        }
+                    });
+                }
+                var chunkMessages = unpacked.chunks.map(function (a) { return a.msg; });
+                if (chunkMessages.includes("SV_CHAT")) {
+                    var chat = unpacked.chunks.filter(function (a) { return a.msg == "SV_CHAT"; });
+                    chat.forEach(function (a) {
+                        if (a.msg == "SV_CHAT") {
+                            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]
+                                };
+                            _this.emit("message", unpacked);
+                        }
+                    });
+                }
+                if (chunkMessages.includes("SV_KILL_MSG")) {
+                    var chat = unpacked.chunks.filter(function (a) { return a.msg == "SV_KILL_MSG"; });
+                    chat.forEach(function (a) {
+                        if (a.msg == "SV_KILL_MSG") {
+                            var unpacked = {};
+                            var unpacker = new MsgUnpacker_1.MsgUnpacker(a.raw.toJSON().data);
+                            unpacked.killer_id = unpacker.unpackInt();
+                            unpacked.victim_id = unpacker.unpackInt();
+                            unpacked.weapon = unpacker.unpackInt();
+                            unpacked.special_mode = unpacker.unpackInt();
+                            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] };
+                            _this.emit("kill", unpacked);
+                        }
+                    });
+                }
+                if (unpacked.chunks[0] && chunkMessages.includes("SV_READY_TO_ENTER")) {
+                    var Msg = new MsgPacker_1.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_1.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_1.MsgPacker(20, false);
+                    if ((_f = _this.options) === null || _f === void 0 ? void 0 : _f.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);
+                }
+                else if (unpacked.chunks[0] && chunkMessages.includes("PING")) {
+                    var info = new MsgPacker_1.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 != States.STATE_ONLINE)
+                            _this.emit('connected');
+                        _this.State = States.STATE_ONLINE;
+                    }
+                }
+                if (new Date().getTime() - _this.time >= 1000 && _this.State == States.STATE_ONLINE) {
+                    _this.time = new Date().getTime();
+                    _this.SendControlMsg(0);
+                }
+            });
     };
+    Client.prototype.sendInput = function (input) {
+        if (input === void 0) { input = this.movement.input; }
+        if (this.State != States.STATE_ONLINE)
+            return;
+        var inputMsg = new MsgPacker_1.MsgPacker(16, true);
+        inputMsg.AddInt(this.AckGameTick);
+        inputMsg.AddInt(this.PredGameTick);
+        inputMsg.AddInt(40);
+        var input_data = [
+            input.m_Direction,
+            input.m_TargetX,
+            input.m_TargetY,
+            input.m_Jump,
+            input.m_Fire,
+            input.m_Hook,
+            input.m_PlayerFlags,
+            input.m_WantedWeapon,
+            input.m_NextWeapon,
+            input.m_PrevWeapon
+        ];
+        input_data.forEach(function (a) {
+            inputMsg.AddInt(a);
+        });
+        this.SendMsgEx(inputMsg, 0);
+    };
+    Object.defineProperty(Client.prototype, "input", {
+        get: function () {
+            return this.movement.input;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Client.prototype.Disconnect = function () {
         var _this = this;
         return new Promise(function (resolve) {
@@ -462,24 +542,24 @@ var Client = /** @class */ (function (_super) {
                 if (_this.socket)
                     _this.socket.close();
                 _this.socket = undefined;
-                _this.State = -1;
+                _this.State = States.STATE_OFFLINE;
             });
         });
     };
     Client.prototype.Say = function (message, team) {
         if (team === void 0) { team = false; }
-        var packer = new MsgPacker_1.default(NETMSGTYPE.CL_SAY, false);
+        var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_SAY, false);
         packer.AddInt(team ? 1 : 0); // team
         packer.AddString(message);
         this.SendMsgEx(packer, 1);
     };
     Client.prototype.Vote = function (vote) {
-        var packer = new MsgPacker_1.default(NETMSGTYPE.CL_VOTE, false);
+        var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_VOTE, false);
         packer.AddInt(vote ? 1 : 0);
         this.SendMsgEx(packer, 1);
     };
     Client.prototype.ChangePlayerInfo = function (playerInfo) {
-        var packer = new MsgPacker_1.default(NETMSGTYPE.CL_CHANGEINFO, false);
+        var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_CHANGEINFO, false);
         packer.AddString(playerInfo.name); //m_pName);
         packer.AddString(playerInfo.clan); //m_pClan);
         packer.AddInt(playerInfo.country); //m_Country);
@@ -490,20 +570,19 @@ var Client = /** @class */ (function (_super) {
         this.SendMsgEx(packer, 1);
     };
     Client.prototype.Kill = function () {
-        var packer = new MsgPacker_1.default(NETMSGTYPE.CL_KILL, false);
+        var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_KILL, false);
         this.SendMsgEx(packer, 1);
     };
     Client.prototype.ChangeTeam = function (team) {
-        var packer = new MsgPacker_1.default(NETMSGTYPE.CL_SETTEAM, false);
+        var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_SETTEAM, false);
         packer.AddInt(team);
         this.SendMsgEx(packer, 1);
     };
     Client.prototype.Emote = function (emote) {
-        var packer = new MsgPacker_1.default(NETMSGTYPE.CL_EMOTICON, false);
+        var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_EMOTICON, false);
         packer.AddInt(emote);
         this.SendMsgEx(packer, 1);
     };
     return Client;
 }(stream_1.EventEmitter));
-module.exports = Client;
-// module.exports = Client;
+exports.Client = Client;