teeworlds 2.4.4 → 2.4.7

package/lib/snapshot.js

@@ -1,31 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Snapshot = exports.items = void 0;
+var UUIDManager_1 = require("./UUIDManager");
 var MsgUnpacker_1 = require("./MsgUnpacker");
 var decoder = new TextDecoder('utf-8');
-// export const itemAppendix: {"type_id": number, "size": number, "name": string}[] = [
-// 	{"type_id": 0, "size": 0, "name": "obj_ex"},
-// 	{"type_id": 1, "size": 10, "name": "obj_player_input"},
-// 	{"type_id": 2, "size": 6, "name": "obj_projectile"},
-// 	{"type_id": 3, "size": 5, "name": "obj_laser"},
-// 	{"type_id": 4, "size": 4, "name": "obj_pickup"},
-// 	{"type_id": 5, "size": 3, "name": "obj_flag"},
-// 	{"type_id": 6, "size": 8, "name": "obj_game_info"},
-// 	{"type_id": 7, "size": 4, "name": "obj_game_data"},
-// 	{"type_id": 8, "size": 15, "name": "obj_character_core"},
-// 	{"type_id": 9, "size": 22, "name": "obj_character"},
-// 	{"type_id": 10, "size": 5, "name": "obj_player_info"},
-// 	{"type_id": 11, "size": 17, "name": "obj_client_info"},
-// 	{"type_id": 12, "size": 3, "name": "obj_spectator_info"},
-// 	{"type_id": 13, "size": 2, "name": "event_common"},
-// 	{"type_id": 14, "size": 2, "name": "event_explosion"},
-// 	{"type_id": 15, "size": 2, "name": "event_spawn"},
-// 	{"type_id": 16, "size": 2, "name": "event_hammerhit"},
-// 	{"type_id": 17, "size": 3, "name": "event_death"},
-// 	{"type_id": 18, "size": 3, "name": "event_sound_global"},
-// 	{"type_id": 19, "size": 3, "name": "event_sound_world"},
-// 	{"type_id": 20, "size": 3, "name": "event_damage_indicator"}
-// ]
+var ___itemAppendix = [
+    { "type_id": 0, "size": 0, "name": "obj_ex" },
+    { "type_id": 1, "size": 10, "name": "obj_player_input" },
+    { "type_id": 2, "size": 6, "name": "obj_projectile" },
+    { "type_id": 3, "size": 5, "name": "obj_laser" },
+    { "type_id": 4, "size": 4, "name": "obj_pickup" },
+    { "type_id": 5, "size": 3, "name": "obj_flag" },
+    { "type_id": 6, "size": 8, "name": "obj_game_info" },
+    { "type_id": 7, "size": 4, "name": "obj_game_data" },
+    { "type_id": 8, "size": 15, "name": "obj_character_core" },
+    { "type_id": 9, "size": 22, "name": "obj_character" },
+    { "type_id": 10, "size": 5, "name": "obj_player_info" },
+    { "type_id": 11, "size": 17, "name": "obj_client_info" },
+    { "type_id": 12, "size": 3, "name": "obj_spectator_info" },
+    { "type_id": 13, "size": 2, "name": "common" },
+    { "type_id": 14, "size": 2, "name": "explosion" },
+    { "type_id": 15, "size": 2, "name": "spawn" },
+    { "type_id": 16, "size": 2, "name": "hammerhit" },
+    { "type_id": 17, "size": 3, "name": "death" },
+    { "type_id": 18, "size": 3, "name": "sound_global" },
+    { "type_id": 19, "size": 3, "name": "sound_world" },
+    { "type_id": 20, "size": 3, "name": "damage_indicator" } // event_damage_indicator
+];
 var itemAppendix = [
     0,
     10,
@@ -73,11 +74,22 @@ var items;
     items[items["EVENT_SOUND_WORLD"] = 19] = "EVENT_SOUND_WORLD";
     items[items["EVENT_DAMAGE_INDICATOR"] = 20] = "EVENT_DAMAGE_INDICATOR";
 })(items = exports.items || (exports.items = {}));
+// https://github.com/ddnet/ddnet/blob/571b0b36de83d18f2524ee371fc3223d04b94135/datasrc/network.py#L236
+var supported_uuids = [
+    "my-own-object@heinrich5991.de",
+    "character@netobj.ddnet.tw",
+    "player@netobj.ddnet.tw",
+    "gameinfo@netobj.ddnet.tw",
+    "projectile@netobj.ddnet.tw",
+    "laser@netobj.ddnet.tw",
+];
 var Snapshot = /** @class */ (function () {
-    function Snapshot() {
+    function Snapshot(_client) {
         this.deltas = [];
         this.eSnapHolder = [];
         this.crc_errors = 0;
+        this.uuid_manager = new UUIDManager_1.UUIDManager(32767, true); // snapshot max_type
+        this.client = _client;
     }
     Snapshot.prototype.IntsToStr = function (pInts) {
         var pIntz = [];
@@ -99,7 +111,68 @@ var Snapshot = /** @class */ (function () {
         return pStr;
     };
     Snapshot.prototype.parseItem = function (data, Type, id) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         var _item = {};
+        if (Type >= 0x4000) { // offset uuid type
+            if (((_a = this.uuid_manager.LookupType(Type)) === null || _a === void 0 ? void 0 : _a.name) == "my-own-object@heinrich5991.de") {
+                _item = {
+                    m_Test: data[0]
+                };
+            }
+            else if (((_b = this.uuid_manager.LookupType(Type)) === null || _b === void 0 ? void 0 : _b.name) == "character@netobj.ddnet.tw") {
+                _item = {
+                    m_Flags: data[0],
+                    m_FreezeEnd: data[1],
+                    m_Jumps: data[2],
+                    m_TeleCheckpoint: data[3],
+                    m_StrongWeakID: data[4],
+                    // # New data fields for jump display, freeze bar and ninja bar
+                    // # Default values indicate that these values should not be used
+                    m_JumpedTotal: (_c = data[5]) !== null && _c !== void 0 ? _c : null,
+                    m_NinjaActivationTick: (_d = data[6]) !== null && _d !== void 0 ? _d : null,
+                    m_FreezeStart: (_e = data[7]) !== null && _e !== void 0 ? _e : null,
+                    // # New data fields for improved target accuracy
+                    m_TargetX: (_f = data[8]) !== null && _f !== void 0 ? _f : null,
+                    m_TargetY: (_g = data[9]) !== null && _g !== void 0 ? _g : null,
+                    id: id
+                };
+            }
+            else if (((_h = this.uuid_manager.LookupType(Type)) === null || _h === void 0 ? void 0 : _h.name) == "player@netobj.ddnet.tw") {
+                _item = {
+                    m_Flags: data[0],
+                    m_AuthLevel: data[1],
+                    id: id
+                };
+            }
+            else if (((_j = this.uuid_manager.LookupType(Type)) === null || _j === void 0 ? void 0 : _j.name) == "gameinfo@netobj.ddnet.tw") {
+                _item = {
+                    m_Flags: data[0],
+                    m_Version: data[1],
+                    m_Flags2: data[2]
+                };
+            }
+            else if (((_k = this.uuid_manager.LookupType(Type)) === null || _k === void 0 ? void 0 : _k.name) == "projectile@netobj.ddnet.tw") {
+                _item = {
+                    m_X: data[0],
+                    m_Y: data[1],
+                    m_Angle: data[2],
+                    m_Data: data[3],
+                    m_Type: data[3],
+                    m_StartTick: data[3]
+                };
+            }
+            else if (((_l = this.uuid_manager.LookupType(Type)) === null || _l === void 0 ? void 0 : _l.name) == "laser@netobj.ddnet.tw") {
+                _item = {
+                    m_ToX: data[0],
+                    m_ToY: data[1],
+                    m_FromX: data[2],
+                    m_FromY: data[3],
+                    m_Owner: data[3],
+                    m_Type: data[3]
+                };
+            }
+            return _item;
+        }
         switch (Type) {
             case items.OBJ_EX:
                 break;
@@ -216,6 +289,7 @@ var Snapshot = /** @class */ (function () {
                     weapon: data[19],
                     emote: data[20],
                     attack_tick: data[21],
+                    client_id: id
                 };
                 break;
             case items.OBJ_PLAYER_INFO:
@@ -341,10 +415,6 @@ var Snapshot = /** @class */ (function () {
                     deltaSnaps.push(a);
                 return a.ack >= deltatick;
             });
-            // if (deltatick != -1 && this.eSnapHolder.length == 0) {
-            // console.log("no deltatick stored")
-            // return {items: [], recvTick: -1}
-            // }
         }
         if (snap.length == 0) {
             // empty snap, copy old one into new ack
@@ -362,6 +432,7 @@ var Snapshot = /** @class */ (function () {
         * https://github.com/heinrich5991/libtw2/blob/master/snapshot/src/
         * https://github.com/heinrich5991/libtw2/blob/master/doc/snapshot.md
         */
+        var _events = [];
         var num_removed_items = unpacker.unpackInt();
         var num_item_deltas = unpacker.unpackInt();
         unpacker.unpackInt(); // _zero padding
@@ -375,11 +446,6 @@ var Snapshot = /** @class */ (function () {
         var deleted = [];
         for (var i = 0; i < num_removed_items; i++) {
             var deleted_key = unpacker.unpackInt(); // removed_item_keys
-            // let index = this.deltas.map(delta => delta.key).indexOf(deleted_key);
-            // let index = this.deltas.findIndex(delta => delta.key === deleted_key);
-            // if (index > -1)
-            // this.deltas.splice(index, 1);
-            // console.log(deleted_key)
             deleted.push(deleted_key);
         }
         /*item_delta:
@@ -419,25 +485,53 @@ var Snapshot = /** @class */ (function () {
                 } // else no previous, use new data
             }
             var parsed = void 0;
-            if (!changed) {
-                var oldDelta = oldDeltas.find(function (delta) { return delta.key == key; });
-                if (oldDelta !== undefined && compareArrays(data, oldDelta.data)) {
-                    parsed = oldDelta.parsed;
+            if (type_id !== 0) {
+                if (!changed) {
+                    var oldDelta = oldDeltas.find(function (delta) { return delta.key == key; });
+                    if (oldDelta !== undefined && compareArrays(data, oldDelta.data)) {
+                        parsed = oldDelta.parsed;
+                    }
+                    else
+                        parsed = this_1.parseItem(data, type_id, id);
                 }
                 else
                     parsed = this_1.parseItem(data, type_id, id);
+                this_1.eSnapHolder.push({ Snapshot: { Data: data, Key: key }, ack: recvTick });
+                this_1.deltas.push({
+                    data: data,
+                    key: key,
+                    id: id,
+                    type_id: type_id,
+                    parsed: parsed
+                });
+                if (type_id >= items.EVENT_COMMON && type_id <= items.EVENT_DAMAGE_INDICATOR) {
+                    // this.client.SnapshotUnpacker.
+                    _events.push({ type_id: type_id, parsed: parsed });
+                    // this.client.SnapshotUnpacker.emit(___itemAppendix[type_id].name, parsed);
+                }
+            }
+            else {
+                this_1.eSnapHolder.push({ Snapshot: { Data: data, Key: key }, ack: recvTick });
+                this_1.deltas.push({
+                    data: data,
+                    key: key,
+                    id: id,
+                    type_id: type_id,
+                    parsed: {}
+                });
+                var test_1 = function (int) { return [(int >> 24) & 0xff, (int >> 16) & 0xff, (int >> 8) & 0xff, (int) & 0xff]; };
+                var test2 = function (ints) { return ints.map(function (a) { return test_1(a); }).flat(); };
+                var targetUUID_1 = Buffer.from(test2(data));
+                if (!this_1.uuid_manager.LookupType(id)) {
+                    supported_uuids.forEach(function (a, i) {
+                        var uuid = (0, UUIDManager_1.createTwMD5Hash)(a);
+                        if (targetUUID_1.compare(uuid) == 0) {
+                            _this.uuid_manager.RegisterName(a, id);
+                            supported_uuids.splice(i, 1);
+                        }
+                    });
+                }
             }
-            else
-                parsed = this_1.parseItem(data, type_id, id);
-            this_1.eSnapHolder.push({ Snapshot: { Data: data, Key: key }, ack: recvTick });
-            // items.items.push({data, type_id, id, key})
-            this_1.deltas.push({
-                data: data,
-                key: key,
-                id: id,
-                type_id: type_id,
-                parsed: parsed
-            });
         };
         var this_1 = this;
         for (var i = 0; i < num_item_deltas; i++) {
@@ -449,20 +543,6 @@ var Snapshot = /** @class */ (function () {
             }
             if (this_2.eSnapHolder.findIndex(function (a) { return a.ack == recvTick && a.Snapshot.Key == newSnap.Snapshot.Key; }) === -1) { // 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 });
-                // this.deltas.push({})
-                // if (deltatick > -1) {
-                // 	let ____index = this.deltas.findIndex(delta => delta.key == newSnap.Snapshot.Key)
-                // 	if (____index > -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), ((newSnap.Snapshot.Key) & 0xffff))
-                // 		};
-                // 		continue;
-                // 	} 
-                // // }
                 var oldDelta = oldDeltas.find(function (delta) { return delta.key == newSnap.Snapshot.Key; });
                 if (oldDelta !== undefined && compareArrays(newSnap.Snapshot.Data, oldDelta.data)) {
                     this_2.deltas.push(oldDelta);
@@ -479,36 +559,14 @@ var Snapshot = /** @class */ (function () {
             }
         };
         var this_2 = this;
-        // if (deleted.length) {
-        // let _beforeLength = this.eSnapHolder.length;
-        // this.eSnapHolder = this.eSnapHolder.filter(snap => !deleted.includes(snap.Snapshot.Key));
-        // let _beforeLength = this.eSnapHolder.length;
-        // if ((_beforeLength - this.eSnapHolder.length) !== num_removed_items) {
-        // console.log("remove!", (_beforeLength - this.eSnapHolder.length) == num_removed_items, (_beforeLength - this.eSnapHolder.length), num_removed_items, WantedCrc)
-        // }
-        // }
         for (var _i = 0, deltaSnaps_1 = deltaSnaps; _i < deltaSnaps_1.length; _i++) {
             var newSnap = deltaSnaps_1[_i];
             _loop_2(newSnap);
         }
-        // if (items.items.length != num_item_deltas)
-        // console.log("length", items.items.length, num_item_deltas, items.items.length - num_item_deltas, WantedCrc)
-        /* this.deltas = [];
-        for (let newSnap of this.eSnapHolder) {
-            if (newSnap.ack == recvTick)
-                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), ((newSnap.Snapshot.Key) & 0xffff))
-                });
-            }*/
         var _crc = this.crc();
         if (_crc !== WantedCrc) {
             this.deltas = oldDeltas;
             this.crc_errors++;
-            console.log("crc error", _crc, WantedCrc, this.crc_errors);
             if (this.crc_errors > 5) {
                 recvTick = -1;
                 this.crc_errors = 0;
@@ -521,11 +579,7 @@ var Snapshot = /** @class */ (function () {
         }
         else if (this.crc_errors > 0)
             this.crc_errors--;
-        // let filterLength = this.eSnapHolder.filter(a => a.ack == recvTick).length
-        // if (this.deltas.length !== filterLength) {
-        // this.deltas = this.deltas.filter(a => !deleted.includes(a.key))
-        // console.log(this.deltas.length, filterLength, this.deltas.length - filterLength, num_item_deltas )
-        // }
+        _events.forEach(function (a) { return _this.client.SnapshotUnpacker.emit(___itemAppendix[a.type_id].name, a.parsed); });
         return { items: this.deltas, recvTick: recvTick };
     };
     return Snapshot;
@@ -549,7 +603,6 @@ function UndiffItem(oldItem, newItem) {
             out[i] += a;
         }
         else {
-            console.log("UNDEFINED UNDEFINED UNDEFINED");
             out[i] = 0;
         }
     });