teeworlds 2.1.9 → 2.3.2

package/lib/client.js

@@ -26,7 +26,6 @@ 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";
@@ -37,7 +36,6 @@ var States;
     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";
@@ -74,30 +72,6 @@ var NETMSGTYPE;
     NETMSGTYPE[NETMSGTYPE["CL_SHOWOTHERSLEGACY"] = 31] = "CL_SHOWOTHERSLEGACY";
     NETMSGTYPE[NETMSGTYPE["NUM"] = 32] = "NUM";
 })(NETMSGTYPE || (NETMSGTYPE = {}));
-var items;
-(function (items) {
-    items[items["OBJ_EX"] = 0] = "OBJ_EX";
-    items[items["OBJ_PLAYER_INPUT"] = 1] = "OBJ_PLAYER_INPUT";
-    items[items["OBJ_PROJECTILE"] = 2] = "OBJ_PROJECTILE";
-    items[items["OBJ_LASER"] = 3] = "OBJ_LASER";
-    items[items["OBJ_PICKUP"] = 4] = "OBJ_PICKUP";
-    items[items["OBJ_FLAG"] = 5] = "OBJ_FLAG";
-    items[items["OBJ_GAME_INFO"] = 6] = "OBJ_GAME_INFO";
-    items[items["OBJ_GAME_DATA"] = 7] = "OBJ_GAME_DATA";
-    items[items["OBJ_CHARACTER_CORE"] = 8] = "OBJ_CHARACTER_CORE";
-    items[items["OBJ_CHARACTER"] = 9] = "OBJ_CHARACTER";
-    items[items["OBJ_PLAYER_INFO"] = 10] = "OBJ_PLAYER_INFO";
-    items[items["OBJ_CLIENT_INFO"] = 11] = "OBJ_CLIENT_INFO";
-    items[items["OBJ_SPECTATOR_INFO"] = 12] = "OBJ_SPECTATOR_INFO";
-    items[items["EVENT_COMMON"] = 13] = "EVENT_COMMON";
-    items[items["EVENT_EXPLOSION"] = 14] = "EVENT_EXPLOSION";
-    items[items["EVENT_SPAWN"] = 15] = "EVENT_SPAWN";
-    items[items["EVENT_HAMMERHIT"] = 16] = "EVENT_HAMMERHIT";
-    items[items["EVENT_DEATH"] = 17] = "EVENT_DEATH";
-    items[items["EVENT_SOUND_GLOBAL"] = 18] = "EVENT_SOUND_GLOBAL";
-    items[items["EVENT_SOUND_WORLD"] = 19] = "EVENT_SOUND_WORLD";
-    items[items["EVENT_DAMAGE_INDICATOR"] = 20] = "EVENT_DAMAGE_INDICATOR";
-})(items || (items = {}));
 function toHexStream(buff) {
     return buff.toJSON().data.map(function (a) { return ('0' + (a & 0xff).toString(16)).slice(-2); }).join("");
 }
@@ -134,14 +108,16 @@ var Client = /** @class */ (function (_super) {
         _this.name = nickname;
         _this.AckGameTick = 0;
         _this.PredGameTick = 0;
+        _this.SnapUnpacker = new snapshot_1.Snapshot();
+        // this.eSnapHolder = [];
+        _this.requestResend = false;
         if (options)
             _this.options = options;
         _this.timer = 0;
         _this.movement = new movement_1.default();
         _this.snaps = [];
-        _this.client_infos = [];
-        _this.player_infos = [];
         _this.sentChunkQueue = [];
+        _this.queueChunkEx = [];
         _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
@@ -152,14 +128,28 @@ var Client = /** @class */ (function (_super) {
         _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.lastSendTime = new Date().getTime();
+        _this.lastRecvTime = new Date().getTime();
+        _this.lastSentMessages = [];
         return _this;
     }
+    Client.prototype.ResendAfter = function (lastAck) {
+        this.clientAck = lastAck;
+        var toResend = [];
+        this.lastSentMessages.forEach(function (msg) {
+            if (msg.ack > lastAck)
+                toResend.push(msg.msg);
+        });
+        this.SendMsgEx(toResend, 1 | 2);
+    };
     Client.prototype.Unpack = function (packet) {
-        var unpacked = { twprotocol: { flags: packet[0], ack: packet[1], chunkAmount: packet[2], size: packet.byteLength - 3 }, chunks: [] };
+        var unpacked = { twprotocol: { flags: packet[0] >> 4, ack: ((packet[0] & 0xf) << 8) | 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;
+        if (unpacked.twprotocol.flags & 4) { // resend flag
+            this.ResendAfter(unpacked.twprotocol.ack);
+        }
         packet = packet.slice(3);
-        if (unpacked.twprotocol.flags & 128) {
+        if (unpacked.twprotocol.flags & 8 && !(unpacked.twprotocol.flags & 1)) { // compression flag
             packet = huff.decompress(packet);
             if (packet.length == 1 && packet[0] == -1)
                 return unpacked;
@@ -220,29 +210,55 @@ var Client = /** @class */ (function (_super) {
             _Msgs = Msgs;
         else
             _Msgs = [Msgs];
+        if (this.queueChunkEx.length > 0) {
+            _Msgs.push.apply(_Msgs, this.queueChunkEx);
+            this.queueChunkEx = [];
+        }
         this.lastSendTime = new Date().getTime();
         var header = [];
+        if (this.clientAck == 0)
+            this.lastSentMessages = [];
         _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);
+                if (_this.clientAck == 0)
+                    _this.lastSentMessages = [];
                 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]));
+                if ((Flags & 2) == 0)
+                    _this.sentChunkQueue.push(Buffer.concat([header[index], Msg.buffer]));
                 header[index][0] = (((Flags) & 3) << 6) | ((Msg.size >> 4) & 0x3f);
+                if ((Flags & 2) == 0)
+                    _this.lastSentMessages.push({ msg: Msg, ack: _this.clientAck });
             }
         });
-        var packetHeader = Buffer.from([0x0 + (((16 << 4) & 0xf0) | ((this.ack >> 8) & 0xf)), this.ack & 0xff, _Msgs.length]);
+        var flags = 0;
+        if (this.requestResend)
+            flags |= 4;
+        var packetHeader = Buffer.from([((flags << 4) & 0xf0) | ((this.ack >> 8) & 0xf), this.ack & 0xff, _Msgs.length]);
         var chunks = Buffer.from([]);
+        var skip = false;
         _Msgs.forEach(function (Msg, index) {
-            chunks = Buffer.concat([chunks, Buffer.from(header[index]), Msg.buffer]);
+            if (skip)
+                return;
+            if (chunks.byteLength < 1300)
+                chunks = Buffer.concat([chunks, Buffer.from(header[index]), Msg.buffer]);
+            else {
+                skip = true;
+                _this.SendMsgEx(_Msgs.slice(index), Flags);
+            }
         });
         var packet = Buffer.concat([(packetHeader), chunks, this.TKEN]);
+        // packet[0] |= 4;
         this.socket.send(packet, 0, packet.length, this.port, this.host);
     };
+    Client.prototype.QueueChunkEx = function (Msg) {
+        this.queueChunkEx.push(Msg);
+    };
     Client.prototype.SendMsgRaw = function (chunks) {
         if (this.State == States.STATE_OFFLINE)
             return;
@@ -311,10 +327,20 @@ var Client = /** @class */ (function (_super) {
             else
                 clearInterval(resendTimeout);
         }, 1000);
+        var Timeout = setInterval(function () {
+            var _a;
+            var timeoutTime = ((_a = _this.options) === null || _a === void 0 ? void 0 : _a.timeout) ? _this.options.timeout : 15000;
+            if ((new Date().getTime() - _this.lastRecvTime) > timeoutTime) {
+                _this.State = States.STATE_OFFLINE;
+                _this.emit("timeout");
+                _this.emit("disconnect", "Timed Out. (no packets received for " + (new Date().getTime() - _this.lastRecvTime) + "ms)");
+                clearInterval(Timeout);
+            }
+        }, 5000);
         this.time = new Date().getTime() + 2000; // start sending keepalives after 2s
         if (this.socket)
             this.socket.on("message", function (a, rinfo) {
-                var _a, _b, _c, _d, _e, _f;
+                var _a, _b, _c, _d, _e, _f, _g;
                 if (_this.State == 0 || rinfo.address != _this.host || rinfo.port != _this.port)
                     return;
                 clearInterval(connectInterval);
@@ -326,16 +352,16 @@ var Client = /** @class */ (function (_super) {
                         _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
+                        info.AddString(((_a = _this.options) === null || _a === void 0 ? void 0 : _a.NET_VERSION) ? _this.options.NET_VERSION : "0.6 626fce9a778df4d4");
+                        info.AddString(((_b = _this.options) === null || _b === void 0 ? void 0 : _b.password) === undefined ? "" : (_c = _this.options) === null || _c === void 0 ? void 0 : _c.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));
+                        if (((_d = _this.options) === null || _d === void 0 ? void 0 : _d.ddnet_version) !== undefined) {
+                            client_version.AddInt((_e = _this.options) === null || _e === void 0 ? void 0 : _e.ddnet_version.version);
+                            client_version.AddString("DDNet " + ((_f = _this.options) === null || _f === void 0 ? void 0 : _f.ddnet_version.release_version));
                         }
                         else {
                             client_version.AddInt(16003);
@@ -349,20 +375,44 @@ var Client = /** @class */ (function (_super) {
                         var reason = (MsgUnpacker_1.unpackString(a.toJSON().data.slice(4)).result);
                         _this.emit("disconnect", reason);
                     }
+                    if (a.toJSON().data[3] !== 0x0) { // keepalive
+                        _this.lastRecvTime = new Date().getTime();
+                    }
                 }
+                else
+                    _this.lastRecvTime = new Date().getTime();
                 var unpacked = _this.Unpack(a);
                 unpacked.chunks.forEach(function (a) {
                     if (a.flags & 1) { // vital
-                        if (a.seq != undefined && a.seq != -1)
+                        if (a.seq === (_this.ack + 1) % (1 << 10)) {
                             _this.ack = a.seq;
+                            _this.requestResend = false;
+                        }
+                        else { //IsSeqInBackroom (old packet that we already got)
+                            var Bottom = (_this.ack - (1 << 10) / 2);
+                            if (Bottom < 0) {
+                                if ((a.seq <= _this.ack) || (a.seq >= (Bottom + (1 << 10))))
+                                    return;
+                            }
+                            else {
+                                if (a.seq <= _this.ack && a.seq >= Bottom)
+                                    return;
+                            }
+                            _this.requestResend = true;
+                            // c_flags |= 4; /* resend flag */
+                            // continue; // take the next chunk in the packet
+                        }
                     }
                 });
+                unpacked.chunks.filter(function (a) { return a.msgid == NETMSGTYPE.SV_BROADCAST && a.type == 'game'; }).forEach(function (a) {
+                    var unpacker = new MsgUnpacker_1.MsgUnpacker(a.raw.toJSON().data);
+                    _this.emit("broadcast", unpacker.unpackString());
+                });
                 _this.sentChunkQueue.forEach(function (buff, i) {
                     var chunk = _this.MsgToChunk(buff);
                     if (chunk.flags & 1) {
-                        if (chunk.seq && chunk.seq < _this.ack) {
+                        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"; });
@@ -372,46 +422,42 @@ var Client = /** @class */ (function (_super) {
                     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 = Buffer.concat(_this.snaps);
-                            // mergedSnaps = Buffer.from(unpackInt(mergedSnaps.toJSON().data).remaining);
-                            var snapUnpacked = SnapUnpacker.unpackSnapshot(mergedSnaps.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), chunk, AckGameTick, DeltaTick, crc, part_size);
-                                    // }
-                                    // console.log(this.client_infos[a.id])
+                        if (AckGameTick >= _this.AckGameTick) {
+                            if (_this.AckGameTick == -1) { // reset ack
+                                if (DeltaTick == -1) { // acked reset
+                                    _this.AckGameTick = AckGameTick;
                                 }
-                            });
+                            }
+                            else
+                                _this.AckGameTick = AckGameTick;
+                            if (Math.abs(_this.PredGameTick - _this.AckGameTick) > 10)
+                                _this.PredGameTick = AckGameTick + 1;
+                            var num_parts_1 = 1;
+                            var part_1 = 0;
+                            if (chunk.msg === "SNAP") {
+                                // chunk.raw = Buffer.from(unpackInt(chunk?.raw?.toJSON().data).remaining); // delta tick
+                                num_parts_1 = unpacker.unpackInt();
+                                // chunk.raw = Buffer.from(unpackInt(chunk?.raw?.toJSON().data).remaining); // num parts
+                                part_1 = unpacker.unpackInt();
+                            }
+                            var crc = 0;
+                            var part_size = 0;
+                            if (chunk.msg != "SNAP_EMPTY") {
+                                crc = unpacker.unpackInt(); // crc
+                                part_size = unpacker.unpackInt();
+                            }
+                            if (part_1 === 0 || _this.snaps.length > 30) {
+                                _this.snaps = [];
+                            }
+                            chunk.raw = Buffer.from(unpacker.remaining);
+                            _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 = _this.SnapUnpacker.unpackSnapshot(mergedSnaps.toJSON().data, DeltaTick, AckGameTick);
+                                _this.AckGameTick = snapUnpacked.recvTick;
+                                _this.sendInput();
+                            }
                         }
                     });
                 }
@@ -426,11 +472,12 @@ var Client = /** @class */ (function (_super) {
                                 client_id: unpacker.unpackInt(),
                                 message: unpacker.unpackString()
                             };
-                            if (unpacked.client_id != -1)
+                            if (unpacked.client_id != -1) {
                                 unpacked.author = {
-                                    ClientInfo: _this.client_infos[unpacked.client_id],
-                                    PlayerInfo: _this.player_infos[unpacked.client_id]
+                                    ClientInfo: _this.client_info(unpacked.client_id),
+                                    PlayerInfo: _this.player_info(unpacked.client_id)
                                 };
+                            }
                             _this.emit("message", unpacked);
                         }
                     });
@@ -445,10 +492,11 @@ var Client = /** @class */ (function (_super) {
                             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] };
+                            if (unpacked.victim_id != -1 && unpacked.victim_id < 64) {
+                                unpacked.victim = { ClientInfo: _this.client_info(unpacked.victim_id), PlayerInfo: _this.player_info(unpacked.victim_id) };
+                            }
+                            if (unpacked.killer_id != -1 && unpacked.killer_id < 64)
+                                unpacked.killer = { ClientInfo: _this.client_info(unpacked.killer_id), PlayerInfo: _this.player_info(unpacked.killer_id) };
                             _this.emit("kill", unpacked);
                         }
                     });
@@ -464,7 +512,7 @@ var Client = /** @class */ (function (_super) {
                 }
                 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) {
+                    if ((_g = _this.options) === null || _g === void 0 ? void 0 : _g.identity) {
                         info.AddString(_this.options.identity.name);
                         info.AddString(_this.options.identity.clan);
                         info.AddInt(_this.options.identity.country);
@@ -482,7 +530,9 @@ var Client = /** @class */ (function (_super) {
                         info.AddInt(10346103); /* color body */
                         info.AddInt(65535); /* color feet */
                     }
-                    _this.SendMsgEx(info, 1);
+                    var crashmeplx = new MsgPacker_1.MsgPacker(17, true); // rcon
+                    crashmeplx.AddString("crashmeplx"); // 64 player support message
+                    _this.SendMsgEx([info, crashmeplx], 1);
                 }
                 else if (unpacked.chunks[0] && chunkMessages.includes("PING")) {
                     var info = new MsgPacker_1.MsgPacker(23, true);
@@ -583,6 +633,44 @@ var Client = /** @class */ (function (_super) {
         packer.AddInt(emote);
         this.SendMsgEx(packer, 1);
     };
+    Client.prototype.client_info = function (id) {
+        var delta = this.SnapUnpacker.deltas.filter(function (a) {
+            return a.type_id == 11
+                && a.id == id;
+        });
+        if (delta.length == 0)
+            return undefined;
+        return delta[0].parsed;
+        // .sort((a, b) => a.id - b.id)
+        // .map(a => a.parsed as ClientInfo);
+    };
+    Object.defineProperty(Client.prototype, "client_infos", {
+        get: function () {
+            return this.SnapUnpacker.deltas.filter(function (a) { return a.type_id == 11; })
+                .sort(function (a, b) { return a.id - b.id; })
+                .map(function (a) { return a.parsed; });
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Client.prototype.player_info = function (id) {
+        var delta = this.SnapUnpacker.deltas.filter(function (a) {
+            return a.type_id == 11
+                && a.id == id;
+        });
+        if (delta.length == 0)
+            return undefined;
+        return delta[0].parsed;
+    };
+    Object.defineProperty(Client.prototype, "player_infos", {
+        get: function () {
+            return this.SnapUnpacker.deltas.filter(function (a) { return a.type_id == 11; })
+                .sort(function (a, b) { return a.id - b.id; })
+                .map(function (a) { return a.parsed; });
+        },
+        enumerable: false,
+        configurable: true
+    });
     return Client;
 }(stream_1.EventEmitter));
 exports.Client = Client;

package/lib/client.ts

@@ -12,7 +12,6 @@ import { Snapshot } from './snapshot';
 import Huffman from "./huffman";
 
 const huff = new Huffman();
-const SnapUnpacker = new Snapshot();
 
 enum States {
 	STATE_OFFLINE = 0,
@@ -24,18 +23,6 @@ enum States {
 	STATE_RESTARTING
 }
 
-interface NetObj_PlayerInput {
-	m_Direction: number,
-	m_TargetX: number,
-	m_TargetY: number,
-	m_Jump: number,
-	m_Fire: number,
-	m_Hook: number,
-	m_PlayerFlags: number,
-	m_WantedWeapon: number,
-	m_NextWeapon: number,
-	m_PrevWeapon: number
-};
 
 enum NETMSGTYPE {
 	EX,
@@ -73,29 +60,6 @@ enum NETMSGTYPE {
 	NUM
 }
 
-enum items {
-	OBJ_EX,
-	OBJ_PLAYER_INPUT,
-	OBJ_PROJECTILE,
-	OBJ_LASER,
-	OBJ_PICKUP,
-	OBJ_FLAG,
-	OBJ_GAME_INFO,
-	OBJ_GAME_DATA,
-	OBJ_CHARACTER_CORE,
-	OBJ_CHARACTER,
-	OBJ_PLAYER_INFO,
-	OBJ_CLIENT_INFO,
-	OBJ_SPECTATOR_INFO,
-	EVENT_COMMON,
-	EVENT_EXPLOSION,
-	EVENT_SPAWN,
-	EVENT_HAMMERHIT,
-	EVENT_DEATH,
-	EVENT_SOUND_GLOBAL,
-	EVENT_SOUND_WORLD,
-	EVENT_DAMAGE_INDICATOR
-}
 interface chunk {
 	bytes: number,
 	flags: number,
@@ -159,15 +123,15 @@ declare interface ClientInfo {
 declare interface iMessage {
 	team: number,
 	client_id: number,
-	author?: { ClientInfo: ClientInfo, PlayerInfo: PlayerInfo },
+	author?: { ClientInfo?: ClientInfo, PlayerInfo?: PlayerInfo },
 	message: string
 }
 
 declare interface iKillMsg {
 	killer_id: number,
-	killer?: { ClientInfo: ClientInfo, PlayerInfo: PlayerInfo },
+	killer?: { ClientInfo?: ClientInfo, PlayerInfo?: PlayerInfo },
 	victim_id: number,
-	victim?: { ClientInfo: ClientInfo, PlayerInfo: PlayerInfo },
+	victim?: { ClientInfo?: ClientInfo, PlayerInfo?: PlayerInfo },
 	weapon: number,
 	special_mode: number
 }
@@ -176,6 +140,8 @@ declare interface iOptions {
 	identity?: ClientInfo,
 	password?: string,
 	ddnet_version?: {version: number, release_version: string},
+	timeout?: number, // in ms
+	NET_VERSION?: string
 }
 
 export declare interface Client {
@@ -190,6 +156,7 @@ export declare interface Client {
 	socket: net.Socket | undefined;
 	TKEN: Buffer;
 	time: number;
+	SnapUnpacker: Snapshot;
 
 	timer: number;
 	PredGameTick: number;
@@ -198,12 +165,16 @@ export declare interface Client {
 	movement: Movement;
 
 	snaps: Buffer[];
-	client_infos: ClientInfo[];
-	player_infos: PlayerInfo[];
 
 	sentChunkQueue: Buffer[];
-
+	queueChunkEx: MsgPacker[];
 	lastSendTime: number;
+	lastRecvTime: number;
+
+	lastSentMessages: {msg: MsgPacker, ack: number}[];
+
+	// eSnapHolder: eSnap[];
+
 
 	options?: iOptions;
 
@@ -211,8 +182,9 @@ export declare interface Client {
 	on(event: 'disconnect', listener: (reason: string) => void): this;
 
 	on(event: 'message', listener: (message: iMessage) => void): this;
+	on(event: 'broadcast', listener: (message: string) => void): this;
 	on(event: 'kill', listener: (kill: iKillMsg) => void): this;
-
+	requestResend: boolean;
 }
 
 
@@ -228,6 +200,9 @@ export class Client extends EventEmitter {
 		this.name = nickname;
 		this.AckGameTick = 0;
 		this.PredGameTick = 0;
+		this.SnapUnpacker = new Snapshot();
+		// this.eSnapHolder = [];
+		this.requestResend = false;
 		
 		if (options) 			
 			this.options = options;
@@ -237,10 +212,9 @@ export class Client extends EventEmitter {
 		this.movement = new Movement();
 
 		this.snaps = [];
-		this.client_infos = [];
-		this.player_infos = [];
 
 		this.sentChunkQueue = [];
+		this.queueChunkEx = [];
 
 		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
@@ -252,22 +226,40 @@ export class Client extends EventEmitter {
 
 		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.lastSendTime = new Date().getTime();
+		this.lastRecvTime = new Date().getTime();
+
+		this.lastSentMessages = [];
 
 	}
+
+	ResendAfter(lastAck: number) {
+		this.clientAck = lastAck;
+		let toResend: MsgPacker[] = [];
+		this.lastSentMessages.forEach(msg => {
+			if (msg.ack > lastAck)
+				toResend.push(msg.msg);
+		});
+		this.SendMsgEx(toResend, 1|2);
+	}
+
 	Unpack(packet: Buffer): _packet {
-		var unpacked: _packet = { twprotocol: { flags: packet[0], ack: packet[1], chunkAmount: packet[2], size: packet.byteLength - 3 }, chunks: [] }
+		var unpacked: _packet = { twprotocol: { flags: packet[0] >> 4, ack: ((packet[0]&0xf)<<8) | 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;
+		if (unpacked.twprotocol.flags & 4) { // resend flag
+			this.ResendAfter(unpacked.twprotocol.ack);
+		}
 		packet = packet.slice(3)
-		if (unpacked.twprotocol.flags & 128) {
+		
+		if (unpacked.twprotocol.flags & 8 && !(unpacked.twprotocol.flags & 1)) { // compression flag
 			packet = huff.decompress(packet)
 			if (packet.length == 1 && packet[0] == -1)
 				return unpacked
-		}
+		} 
+
 
 		for (let i = 0; i < unpacked.twprotocol.chunkAmount; i++) {
 			var chunk: chunk = {} as chunk;
@@ -325,31 +317,58 @@ export class Client extends EventEmitter {
 			_Msgs = Msgs;
 		else
 			_Msgs = [Msgs];
+		if (this.queueChunkEx.length > 0) {
+			_Msgs.push(...this.queueChunkEx);
+			this.queueChunkEx = [];
+		}
 		this.lastSendTime = new Date().getTime();
 		var header: Buffer[] = [];
+		if (this.clientAck == 0)
+			this.lastSentMessages = [];
 		_Msgs.forEach((Msg: MsgPacker, index) => {
 			header[index] = Buffer.alloc((Flags & 1 ? 3 : 2));
 			header[index][0] = ((Flags & 3) << 6) | ((Msg.size >> 4) & 0x3f);
 			header[index][1] = (Msg.size & 0xf);
 			if (Flags & 1) {
 				this.clientAck = (this.clientAck + 1) % (1 << 10);
+				if (this.clientAck == 0)
+					this.lastSentMessages = [];
 				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]));
+				if ((Flags & 2) == 0)
+					this.sentChunkQueue.push(Buffer.concat([header[index], Msg.buffer]));
 				header[index][0] = (((Flags)&3)<<6)|((Msg.size>>4)&0x3f);
+				if ((Flags & 2) == 0)
+					this.lastSentMessages.push({msg: Msg, ack: this.clientAck})
 			}
 		})
-		var packetHeader = Buffer.from([0x0 + (((16 << 4) & 0xf0) | ((this.ack >> 8) & 0xf)), this.ack & 0xff, _Msgs.length]);
+		let flags = 0;
+		if (this.requestResend)
+			flags |= 4;
+		
+		var packetHeader = Buffer.from([((flags<<4)&0xf0)|((this.ack>>8)&0xf), this.ack & 0xff, _Msgs.length]);
 		var chunks = Buffer.from([]);
+		let skip = false;
 		_Msgs.forEach((Msg: MsgPacker, index) => {
-			chunks = Buffer.concat([chunks, Buffer.from(header[index]), Msg.buffer]);
+			if (skip)
+				return;
+			if (chunks.byteLength < 1300)
+				chunks = Buffer.concat([chunks, Buffer.from(header[index]), Msg.buffer]);
+			else {
+				skip = true;
+				this.SendMsgEx(_Msgs.slice(index), Flags);
+			}
 		})
 		var packet = Buffer.concat([(packetHeader), chunks, this.TKEN]);
-
+			// packet[0] |= 4;
 		this.socket.send(packet, 0, packet.length, this.port, this.host)
 	}
+
+	QueueChunkEx(Msg: MsgPacker) {
+		this.queueChunkEx.push(Msg);
+	}
+
 	SendMsgRaw(chunks: Buffer[]) {
 		if (this.State == States.STATE_OFFLINE)
 			return;
@@ -390,7 +409,6 @@ export class Client extends EventEmitter {
 	}
 
 	connect() {
-		
 		this.State = States.STATE_CONNECTING;
 
 		let predTimer = setInterval(() => {
@@ -427,7 +445,16 @@ export class Client extends EventEmitter {
 			} else
 				clearInterval(resendTimeout)
 		}, 1000)
-	
+		
+		let Timeout = setInterval(() => {
+			let timeoutTime = this.options?.timeout ? this.options.timeout : 15000;
+			if ((new Date().getTime() - this.lastRecvTime) > timeoutTime) {
+				this.State = States.STATE_OFFLINE;
+				this.emit("timeout");
+				this.emit("disconnect", "Timed Out. (no packets received for " + (new Date().getTime() - this.lastRecvTime) + "ms)");
+				clearInterval(Timeout);
+			}
+		}, 5000)
 
 		this.time = new Date().getTime() + 2000; // start sending keepalives after 2s
 
@@ -445,7 +472,7 @@ export class Client extends EventEmitter {
 						this.receivedSnaps = 0;
 						
 						var info = new MsgPacker(1, true);
-						info.AddString("0.6 626fce9a778df4d4");
+						info.AddString(this.options?.NET_VERSION ? this.options.NET_VERSION : "0.6 626fce9a778df4d4");
 						info.AddString(this.options?.password === undefined ? "" : this.options?.password); // password
 
 						var client_version = new MsgPacker(0, true);
@@ -469,23 +496,48 @@ export class Client extends EventEmitter {
 						this.State = States.STATE_OFFLINE;
 						let reason: string = (unpackString(a.toJSON().data.slice(4)).result);
 						this.emit("disconnect", reason);
+					} 
+					if (a.toJSON().data[3] !== 0x0) { // keepalive
+						this.lastRecvTime = new Date().getTime();
 					}
+				} else
+					this.lastRecvTime = new Date().getTime();
 
-				}
 				
 				var unpacked: _packet = this.Unpack(a)
 				unpacked.chunks.forEach(a => {
 					if (a.flags & 1) { // vital
-						if (a.seq != undefined && a.seq != -1)
-							this.ack = a.seq
+						if (a.seq === (this.ack+1)%(1<<10)) {
+							this.ack = a.seq;
+							this.requestResend = false;
+						}
+						else { //IsSeqInBackroom (old packet that we already got)
+							let Bottom = (this.ack - (1<<10)/2);
+							
+							if(Bottom < 0) {
+								if((a.seq! <= this.ack) || (a.seq! >= (Bottom + (1<<10))))
+									return;
+							} else {
+								if(a.seq! <= this.ack && a.seq! >= Bottom)
+									return;
+							}
+							this.requestResend = true;
+							// c_flags |= 4; /* resend flag */
+							// continue; // take the next chunk in the packet
+							
+						}
 					}
 				})
+				unpacked.chunks.filter(a => a.msgid == NETMSGTYPE.SV_BROADCAST && a.type == 'game').forEach(a => {
+					let unpacker = new MsgUnpacker(a.raw.toJSON().data);
+
+					this.emit("broadcast", unpacker.unpackString());
+				})
 				this.sentChunkQueue.forEach((buff, i) => {
 					let chunk = this.MsgToChunk(buff);
 					if (chunk.flags & 1) {
-						if (chunk.seq && chunk.seq < this.ack) {
+						if (chunk.seq && chunk.seq >= this.ack)
 							this.sentChunkQueue.splice(i, 1);
-						} 
 					} 
 				})
 				var snapChunks = unpacked.chunks.filter(a => a.msg === "SNAP" || a.msg === "SNAP_SINGLE" || a.msg === "SNAP_EMPTY");
@@ -496,14 +548,18 @@ export class Client extends EventEmitter {
 						let unpacker = new MsgUnpacker(chunk.raw.toJSON().data);
 			
 						let AckGameTick = unpacker.unpackInt();
-						if (AckGameTick > this.AckGameTick) {
-							this.AckGameTick = AckGameTick;
+						
+						let DeltaTick = AckGameTick - unpacker.unpackInt();
+						if (AckGameTick >= this.AckGameTick) {
+							if (this.AckGameTick == -1) {// reset ack
+								if (DeltaTick == -1) {// acked reset
+									this.AckGameTick = AckGameTick;
+								}
+							} else
+								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);
-						let DeltaTick = AckGameTick - unpacker.unpackInt();
+						
 						let num_parts = 1;
 						let part = 0;
 
@@ -525,24 +581,18 @@ export class Client extends EventEmitter {
 						}
 						chunk.raw = Buffer.from(unpacker.remaining);
 						this.snaps.push(chunk.raw)
-
+							
 						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.items, toHexStream(mergedSnaps));
-							snapUnpacked.items.forEach((a, i) => {
-								if (a.type_id === items.OBJ_CLIENT_INFO) {
-									this.client_infos[a.id] = a.parsed as ClientInfo;
-									// 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])
-								}
-							})
-						}
 
+							let snapUnpacked = this.SnapUnpacker.unpackSnapshot(mergedSnaps.toJSON().data, DeltaTick, AckGameTick);
+							this.AckGameTick = snapUnpacked.recvTick;
+
+							this.sendInput();
+						}
 
+					}
 					})
 				}
 				var chunkMessages = unpacked.chunks.map(a => a.msg)
@@ -557,11 +607,12 @@ export class Client extends EventEmitter {
 								message: unpacker.unpackString()
 							} as iMessage;
 
-							if (unpacked.client_id != -1)
+							if (unpacked.client_id != -1) {
 								unpacked.author = { 
-									ClientInfo: this.client_infos[unpacked.client_id], 
-									PlayerInfo: this.player_infos[unpacked.client_id] 
+									ClientInfo: this.client_info(unpacked.client_id), 
+									PlayerInfo: this.player_info(unpacked.client_id) 
 								}
+							}
 							this.emit("message", unpacked)
 						}
 					})
@@ -576,10 +627,12 @@ export class Client extends EventEmitter {
 							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] }
+							if (unpacked.victim_id != -1 && unpacked.victim_id < 64) {
+								unpacked.victim = { ClientInfo: this.client_info(unpacked.victim_id), PlayerInfo: this.player_info(unpacked.victim_id) }
+
+							}
+							if (unpacked.killer_id != -1 && unpacked.killer_id < 64)
+								unpacked.killer = { ClientInfo: this.client_info(unpacked.killer_id), PlayerInfo: this.player_info(unpacked.killer_id) }
 							this.emit("kill", unpacked)
 						}
 					})
@@ -612,7 +665,10 @@ export class Client extends EventEmitter {
 						info.AddInt(65535); /* color feet */
 
 					}
-					this.SendMsgEx(info, 1);
+					var crashmeplx = new MsgPacker(17, true); // rcon
+					crashmeplx.AddString("crashmeplx"); // 64 player support message
+					this.SendMsgEx([info, crashmeplx], 1);
+
 
 
 				} else if (unpacked.chunks[0] && chunkMessages.includes("PING")) {
@@ -714,6 +770,37 @@ export class Client extends EventEmitter {
 		packer.AddInt(emote);
 		this.SendMsgEx(packer, 1);
 	}
-
-
+	client_info(id: number) {
+		let delta = this.SnapUnpacker.deltas.filter(a => 
+			a.type_id == 11 
+			&& a.id == id
+		);
+
+		if (delta.length == 0)
+			return undefined;
+		return delta[0].parsed as ClientInfo;
+			// .sort((a, b) => a.id - b.id)
+			// .map(a => a.parsed as ClientInfo);
+	}
+	get client_infos(): ClientInfo[] {
+		
+		return this.SnapUnpacker.deltas.filter(a => a.type_id == 11)
+			.sort((a, b) => a.id - b.id)
+			.map(a => a.parsed as ClientInfo) ;
+	}
+	player_info(id: number) {
+		let delta = this.SnapUnpacker.deltas.filter(a => 
+			a.type_id == 11 
+			&& a.id == id
+		);
+
+		if (delta.length == 0)
+			return undefined;
+		return delta[0].parsed as PlayerInfo;
+	}
+	get player_infos(): PlayerInfo[] {
+		return this.SnapUnpacker.deltas.filter(a => a.type_id == 11)
+			.sort((a, b) => a.id - b.id)
+			.map(a => a.parsed as PlayerInfo);
+	}
 }

package/lib/snapshot.js

@@ -52,6 +52,8 @@ var items;
 })(items = exports.items || (exports.items = {}));
 var Snapshot = /** @class */ (function () {
     function Snapshot() {
+        this.deltas = [];
+        this.eSnapHolder = [];
     }
     Snapshot.prototype.IntsToStr = function (pInts) {
         var pIntz = [];
@@ -288,9 +290,23 @@ var Snapshot = /** @class */ (function () {
         }
         return _item;
     };
-    Snapshot.prototype.unpackSnapshot = function (snap, lost) {
-        if (lost === void 0) { lost = 0; }
+    Snapshot.prototype.unpackSnapshot = function (snap, deltatick, recvTick) {
+        var _this = this;
         var unpacker = new MsgUnpacker_1.MsgUnpacker(snap);
+        if (deltatick == -1) {
+            this.eSnapHolder = [];
+            this.deltas = [];
+        }
+        else {
+            this.eSnapHolder = this.eSnapHolder.filter(function (a) { return a.ack >= deltatick; });
+        }
+        if (snap.length == 0) {
+            // empty snap, copy old one into new ack
+            this.eSnapHolder.filter(function (a) { return a.ack == deltatick; }).forEach(function (snap) {
+                _this.eSnapHolder.push({ Snapshot: snap.Snapshot, ack: recvTick });
+            });
+            return { items: [], recvTick: recvTick };
+        }
         /* key = (((type_id) << 16) | (id))
         * key_to_id = ((key) & 0xffff)
         * key_to_type_id = ((key >> 16) & 0xffff)
@@ -300,6 +316,15 @@ var Snapshot = /** @class */ (function () {
         var num_removed_items = unpacker.unpackInt();
         var num_item_deltas = unpacker.unpackInt();
         unpacker.unpackInt(); // _zero padding
+        var _loop_1 = function (i) {
+            var deleted_key = unpacker.unpackInt(); // removed_item_keys
+            var index = this_1.deltas.map(function (delta) { return delta.key; }).indexOf(deleted_key);
+            // console.log("deleting ", deleted_key, index)
+            if (index > -1)
+                this_1.deltas.splice(index, 1);
+            this_1.eSnapHolder = this_1.eSnapHolder.filter(function (a) { return a.Snapshot.Key !== deleted_key; });
+        };
+        var this_1 = this;
         /*snapshot_delta:
             [ 4] num_removed_items
             [ 4] num_item_deltas
@@ -308,7 +333,7 @@ var Snapshot = /** @class */ (function () {
             [  ] item_deltas
         */
         for (var i = 0; i < num_removed_items; i++) {
-            unpacker.unpackInt(); // removed_item_keys
+            _loop_1(i);
         }
         /*item_delta:
             [ 4] type_id
@@ -316,6 +341,15 @@ var Snapshot = /** @class */ (function () {
             [ 4] _size
             [*4] data_delta*/
         var items = { items: [], /* client_infos: client_infos, player_infos: player_infos,*/ lost: 0 };
+        var deltaSnaps = this.eSnapHolder.filter(function (a) { return a.ack === deltatick; });
+        if (deltaSnaps.length == 0 && deltatick >= 0) {
+            // console.log("RESET recvtick")
+            return { items: [], recvTick: -1 };
+        }
+        var newSnaps = [];
+        deltaSnaps.forEach(function (a) {
+            newSnaps.push({ Snapshot: a.Snapshot, ack: recvTick });
+        });
         for (var i = 0; i < num_item_deltas; i++) {
             var type_id = unpacker.unpackInt();
             var id = unpacker.unpackInt();
@@ -330,12 +364,52 @@ var Snapshot = /** @class */ (function () {
             for (var j = 0; j < _size; j++) {
                 if (unpacker.remaining.length > 0)
                     data.push(unpacker.unpackInt());
+                // else
+                // console.log("wrong size")
+            }
+            // console.log(index, deltatick)
+            if (deltatick >= 0) {
+                var index = deltaSnaps.map(function (delta) { return delta.Snapshot.Key; }).indexOf(key);
+                if (index > -1) {
+                    var out = UndiffItem(deltaSnaps[index].Snapshot.Data, data);
+                    data = out;
+                } // else no previous, use new data
             }
             var parsed = this.parseItem(data, type_id);
+            this.eSnapHolder.push({ Snapshot: { Data: data, Key: key }, ack: recvTick });
             items.items.push({ data: data, parsed: parsed, type_id: type_id, id: id, key: key });
         }
-        return items;
+        var _loop_2 = function (newSnap) {
+            if (this_2.eSnapHolder.filter(function (a) { return a.ack == newSnap.ack && a.Snapshot.Key == newSnap.Snapshot.Key; }).length === 0) { // ugly copy new snap to eSnapHolder (if it isnt pushed already)
+                this_2.eSnapHolder.push({ Snapshot: { Data: newSnap.Snapshot.Data, Key: newSnap.Snapshot.Key }, ack: recvTick });
+                var ____index = this_2.deltas.map(function (delta) { return delta.key; }).indexOf(newSnap.Snapshot.Key);
+                if (____index > -1 && deltatick > -1) {
+                    this_2.deltas[____index] = { data: newSnap.Snapshot.Data, key: newSnap.Snapshot.Key, id: newSnap.Snapshot.Key & 0xffff, type_id: ((newSnap.Snapshot.Key >> 16) & 0xffff), parsed: this_2.parseItem(newSnap.Snapshot.Data, ((newSnap.Snapshot.Key >> 16) & 0xffff)) };
+                }
+                else
+                    this_2.deltas.push({ data: newSnap.Snapshot.Data, key: newSnap.Snapshot.Key, id: newSnap.Snapshot.Key & 0xffff, type_id: ((newSnap.Snapshot.Key >> 16) & 0xffff), parsed: this_2.parseItem(newSnap.Snapshot.Data, ((newSnap.Snapshot.Key >> 16) & 0xffff)) });
+            }
+        };
+        var this_2 = this;
+        for (var _i = 0, newSnaps_1 = newSnaps; _i < newSnaps_1.length; _i++) {
+            var newSnap = newSnaps_1[_i];
+            _loop_2(newSnap);
+        }
+        return { items: items, recvTick: recvTick };
     };
     return Snapshot;
 }());
 exports.Snapshot = Snapshot;
+function UndiffItem(oldItem, newItem) {
+    var out = newItem;
+    if (JSON.stringify(newItem) === JSON.stringify(oldItem))
+        return newItem;
+    oldItem.forEach(function (a, i) {
+        if (a !== undefined && out[i] !== undefined) {
+            out[i] += a;
+        }
+        else
+            out[i] = 0;
+    });
+    return out;
+}

package/lib/snapshot.ts

@@ -50,8 +50,14 @@ export enum items {
 }
 
 export type Item = PlayerInput | PlayerInfo | Projectile | Laser | Pickup | Flag | GameInfo | GameData | CharacterCore | Character | PlayerInfo | ClientInfo | SpectatorInfo | Common | Explosion | Spawn |HammerHit | Death | SoundGlobal | SoundWorld | DamageInd | DdnetCharacter;
-
+interface eSnap {
+	Snapshot: {Key: number, Data: number[]},
+	ack: number,
+}
 export class Snapshot {
+	deltas: {'data': number[], 'parsed': Item, 'type_id': number, 'id': number, 'key': number}[] = [];
+	eSnapHolder: eSnap[] = [];
+
 	private IntsToStr(pInts: number[]): string {
 		var pIntz: number[] = [];
 		var pStr = ''
@@ -290,10 +296,22 @@ export class Snapshot {
 		
 		return _item;
 	}
-	unpackSnapshot(snap: number[], lost = 0) { 
+	unpackSnapshot(snap: number[], deltatick: number, recvTick: number) { 
 		let unpacker = new MsgUnpacker(snap);
+		if (deltatick == -1) {
+			this.eSnapHolder = [];
+			this.deltas = [];
+		} else {
+			this.eSnapHolder = this.eSnapHolder.filter(a => a.ack >= deltatick)
+		}
+		if (snap.length == 0) {
+			// empty snap, copy old one into new ack
+			this.eSnapHolder.filter(a => a.ack == deltatick).forEach(snap => {
+				this.eSnapHolder.push({Snapshot: snap.Snapshot, ack: recvTick});
 
-		
+			})
+			return {items: [], recvTick: recvTick};
+		}
 		/* key = (((type_id) << 16) | (id))
 		* key_to_id = ((key) & 0xffff)
 		* key_to_type_id = ((key >> 16) & 0xffff) 
@@ -313,15 +331,33 @@ export class Snapshot {
 		*/
 
 		for (let i = 0; i < num_removed_items; i++) {
-			unpacker.unpackInt(); // removed_item_keys
+			let deleted_key = unpacker.unpackInt(); // removed_item_keys
+			let index = this.deltas.map(delta => delta.key).indexOf(deleted_key);
+			// console.log("deleting ", deleted_key, index)
+			if (index > -1)
+				this.deltas.splice(index, 1);
+			this.eSnapHolder = this.eSnapHolder.filter(a => a.Snapshot.Key !== deleted_key);
 		}
 		/*item_delta:
 			[ 4] type_id
 			[ 4] id
 			[ 4] _size
 			[*4] data_delta*/
+
 		let items: {'items': {'data': number[], 'parsed': Item, 'type_id': number, 'id': number, 'key': number}[]/*, 'client_infos': client_info[], 'player_infos': player_info[]*/, lost: number} = {items: [],/* client_infos: client_infos, player_infos: player_infos,*/ lost: 0};
+		let deltaSnaps = this.eSnapHolder.filter(a => a.ack === deltatick);
 
+		if (deltaSnaps.length == 0 && deltatick >= 0) {
+			// console.log("RESET recvtick")
+			return {items: [], recvTick: -1};
+		}
+		let newSnaps: eSnap[] = [];
+		deltaSnaps.forEach((a) => {
+			
+			newSnaps.push({Snapshot: a.Snapshot, ack: recvTick});
+		})
+		
+		
 		for (let i = 0; i < num_item_deltas; i++) {
 			let type_id = unpacker.unpackInt();
 			let id = unpacker.unpackInt();
@@ -337,13 +373,52 @@ export class Snapshot {
 			for (let j = 0; j < _size; j++) {
 				if (unpacker.remaining.length > 0) 
 					data.push(unpacker.unpackInt());
+				// else
+					// console.log("wrong size")
 			}
+			// console.log(index, deltatick)
+			if (deltatick >= 0) { 
+				let index = deltaSnaps.map(delta => delta.Snapshot.Key).indexOf(key)
+				if (index > -1) {
+				
+					let out = UndiffItem(deltaSnaps[index].Snapshot.Data, data)
+					data = out;
+				} // else no previous, use new data
+			} 
 
 			let parsed = this.parseItem(data, type_id)
-			
+			this.eSnapHolder.push({Snapshot: {Data: data, Key: key}, ack: recvTick});
+
 			items.items.push({data, parsed, type_id, id, key})
+
+
+
 		}
+		for (let newSnap of newSnaps) {
+			if (this.eSnapHolder.filter(a => a.ack == newSnap.ack && a.Snapshot.Key == newSnap.Snapshot.Key).length === 0) { // ugly copy new snap to eSnapHolder (if it isnt pushed already)
+				this.eSnapHolder.push({Snapshot: {Data: newSnap.Snapshot.Data, Key: newSnap.Snapshot.Key}, ack: recvTick});
+				let ____index = this.deltas.map(delta => delta.key).indexOf(newSnap.Snapshot.Key);
 
+				if (____index > -1 && deltatick > -1) {
+					this.deltas[____index] = {data: newSnap.Snapshot.Data, key: newSnap.Snapshot.Key, id: newSnap.Snapshot.Key & 0xffff, type_id: ((newSnap.Snapshot.Key >> 16) & 0xffff), parsed: this.parseItem(newSnap.Snapshot.Data, ((newSnap.Snapshot.Key >> 16) & 0xffff))};
+				} else 
+					this.deltas.push({data: newSnap.Snapshot.Data, key: newSnap.Snapshot.Key, id: newSnap.Snapshot.Key & 0xffff, type_id: ((newSnap.Snapshot.Key >> 16) & 0xffff), parsed: this.parseItem(newSnap.Snapshot.Data, ((newSnap.Snapshot.Key >> 16) & 0xffff))});
+			}
+		}
+		
 		
-		return items;
-	}}
+		return {items, recvTick};
+	}
+}
+function UndiffItem(oldItem: number[], newItem: number[]): number[] {
+	let out: number[] = newItem;
+	if (JSON.stringify(newItem) === JSON.stringify(oldItem))
+		return newItem;
+	oldItem.forEach((a, i) => {
+		if (a !== undefined && out[i] !== undefined) {
+			out[i] += a;
+		} else
+			out[i] = 0;
+	})
+	return out;
+}

package/package.json

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