teeworlds 2.4.1 → 2.4.2

package/index.js

@@ -1,15 +1,20 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Client = void 0;
 var client_1 = require("./lib/client");
 Object.defineProperty(exports, "Client", { enumerable: true, get: function () { return client_1.Client; } });
 __exportStar(require("./lib/MsgPacker"), exports);

package/lib/client.js

@@ -3,10 +3,12 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -411,7 +413,7 @@ var Client = /** @class */ (function (_super) {
                         var client_version = new MsgPacker_1.MsgPacker(0, true, 1);
                         client_version.AddBuffer(Buffer.from("8c00130484613e478787f672b3835bd4", 'hex'));
                         var randomUuid = Buffer.alloc(16);
-                        crypto_1.randomBytes(16).copy(randomUuid);
+                        (0, crypto_1.randomBytes)(16).copy(randomUuid);
                         client_version.AddBuffer(randomUuid);
                         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);
@@ -426,7 +428,7 @@ var Client = /** @class */ (function (_super) {
                     else if (packet.toJSON().data[3] == 0x4) {
                         // disconnected
                         _this.State = States.STATE_OFFLINE;
-                        var reason = (MsgUnpacker_1.unpackString(packet.toJSON().data.slice(4)).result);
+                        var reason = ((0, MsgUnpacker_1.unpackString)(packet.toJSON().data.slice(4)).result);
                         _this.emit("disconnect", reason);
                     }
                     if (packet.toJSON().data[3] !== 0x0) { // keepalive
@@ -547,7 +549,7 @@ var Client = /** @class */ (function (_super) {
                                 if (_this.SnapshotParts == ((1 << NumParts) - 1)) {
                                     var mergedSnaps = Buffer.concat(_this.snaps);
                                     _this.SnapshotParts = 0;
-                                    var snapUnpacked = _this.SnapUnpacker.unpackSnapshot(mergedSnaps.toJSON().data, DeltaTick, GameTick);
+                                    var snapUnpacked = _this.SnapUnpacker.unpackSnapshot(mergedSnaps.toJSON().data, DeltaTick, GameTick, Crc);
                                     _this.emit("snapshot");
                                     _this.AckGameTick = snapUnpacked.recvTick;
                                     if (Math.abs(_this.PredGameTick - _this.AckGameTick) > 10)

package/lib/client.ts

@@ -711,7 +711,7 @@ export class Client extends EventEmitter {
 								let mergedSnaps = Buffer.concat(this.snaps);
 								this.SnapshotParts = 0;
 
-								let snapUnpacked = this.SnapUnpacker.unpackSnapshot(mergedSnaps.toJSON().data, DeltaTick, GameTick);
+								let snapUnpacked = this.SnapUnpacker.unpackSnapshot(mergedSnaps.toJSON().data, DeltaTick, GameTick, Crc);
 								
 								this.emit("snapshot");
 								this.AckGameTick = snapUnpacked.recvTick;

package/lib/snapshot.js

@@ -54,6 +54,7 @@ var Snapshot = /** @class */ (function () {
     function Snapshot() {
         this.deltas = [];
         this.eSnapHolder = [];
+        this.crc_errors = 0;
     }
     Snapshot.prototype.IntsToStr = function (pInts) {
         var pIntz = [];
@@ -291,7 +292,15 @@ var Snapshot = /** @class */ (function () {
         }
         return _item;
     };
-    Snapshot.prototype.unpackSnapshot = function (snap, deltatick, recvTick) {
+    Snapshot.prototype.crc = function (tick) {
+        var checksum = 0;
+        this.eSnapHolder.forEach(function (snap) {
+            if (snap.ack == tick)
+                snap.Snapshot.Data.forEach(function (el) { return checksum += el; });
+        });
+        return checksum & 0xffffffff;
+    };
+    Snapshot.prototype.unpackSnapshot = function (snap, deltatick, recvTick, WantedCrc) {
         var _this = this;
         var unpacker = new MsgUnpacker_1.MsgUnpacker(snap);
         if (deltatick == -1) {
@@ -330,7 +339,6 @@ var Snapshot = /** @class */ (function () {
             var deleted_key = unpacker.unpackInt(); // removed_item_keys
             // let index = this.deltas.map(delta => delta.key).indexOf(deleted_key);
             var index = this_1.deltas.findIndex(function (delta) { return delta.key === deleted_key; });
-            // console.log("deleting ", deleted_key, index)
             if (index > -1)
                 this_1.deltas.splice(index, 1);
             deleted.push(deleted_key);
@@ -349,13 +357,8 @@ var Snapshot = /** @class */ (function () {
         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 });
-        });
         var _loop_2 = function (i) {
             var type_id = unpacker.unpackInt();
             var id = unpacker.unpackInt();
@@ -370,10 +373,7 @@ 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) {
                 // let index = deltaSnaps.map(delta => delta.Snapshot.Key).indexOf(key)
                 var index = deltaSnaps.findIndex(function (delta) { return delta.Snapshot.Key === key; });
@@ -391,7 +391,7 @@ var Snapshot = /** @class */ (function () {
             _loop_2(i);
         }
         var _loop_3 = function (newSnap) {
-            if (this_3.eSnapHolder.findIndex(function (a) { return a.ack == newSnap.ack && a.Snapshot.Key == newSnap.Snapshot.Key; }) === -1) { // ugly copy new snap to eSnapHolder (if it isnt pushed already)
+            if (this_3.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_3.eSnapHolder.push({ Snapshot: { Data: newSnap.Snapshot.Data, Key: newSnap.Snapshot.Key }, ack: recvTick });
             }
             if (deltatick > -1) {
@@ -404,10 +404,24 @@ var Snapshot = /** @class */ (function () {
             this_3.deltas.push({ data: newSnap.Snapshot.Data, key: newSnap.Snapshot.Key, id: newSnap.Snapshot.Key & 0xffff, type_id: ((newSnap.Snapshot.Key >> 16) & 0xffff), parsed: this_3.parseItem(newSnap.Snapshot.Data, ((newSnap.Snapshot.Key >> 16) & 0xffff), ((newSnap.Snapshot.Key) & 0xffff)) });
         };
         var this_3 = this;
-        for (var _i = 0, newSnaps_1 = newSnaps; _i < newSnaps_1.length; _i++) {
-            var newSnap = newSnaps_1[_i];
+        for (var _i = 0, deltaSnaps_1 = deltaSnaps; _i < deltaSnaps_1.length; _i++) {
+            var newSnap = deltaSnaps_1[_i];
             _loop_3(newSnap);
         }
+        if (this.crc(recvTick) !== WantedCrc) {
+            this.crc_errors++;
+            if (this.crc_errors > 5) {
+                recvTick = -1;
+                this.crc_errors = 0;
+                this.eSnapHolder = [];
+                this.deltas = [];
+            }
+            else {
+                recvTick = deltatick;
+            }
+        }
+        else if (this.crc_errors > 0)
+            this.crc_errors--;
         return { items: items, recvTick: recvTick };
     };
     return Snapshot;
@@ -415,14 +429,15 @@ var Snapshot = /** @class */ (function () {
 exports.Snapshot = Snapshot;
 function UndiffItem(oldItem, newItem) {
     var out = newItem;
-    if (JSON.stringify(newItem) === JSON.stringify(oldItem))
-        return 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
+        else {
             out[i] = 0;
+        }
     });
     return out;
 }

package/lib/snapshot.ts

@@ -57,6 +57,7 @@ interface eSnap {
 export class Snapshot {
 	deltas: {'data': number[], 'parsed': Item, 'type_id': number, 'id': number, 'key': number}[] = [];
 	eSnapHolder: eSnap[] = [];
+	crc_errors: number = 0;
 
 	private IntsToStr(pInts: number[]): string {
 		var pIntz: number[] = [];
@@ -297,7 +298,18 @@ export class Snapshot {
 		
 		return _item;
 	}
-	unpackSnapshot(snap: number[], deltatick: number, recvTick: number) { 
+
+	crc(tick: number) {
+		var checksum = 0;
+		this.eSnapHolder.forEach(snap => {
+			if (snap.ack == tick)
+				snap.Snapshot.Data.forEach(el => checksum += el);
+		})
+
+		return checksum & 0xffffffff;
+	}
+
+	unpackSnapshot(snap: number[], deltatick: number, recvTick: number, WantedCrc: number) { 
 		let unpacker = new MsgUnpacker(snap);
 		if (deltatick == -1) {
 			this.eSnapHolder = [];
@@ -309,7 +321,7 @@ export class Snapshot {
 			// empty snap, copy old one into new ack
 			this.eSnapHolder.forEach(snap => {
 				if (snap.ack == deltatick)
-				this.eSnapHolder.push({Snapshot: snap.Snapshot, ack: recvTick});
+					this.eSnapHolder.push({Snapshot: snap.Snapshot, ack: recvTick});
 
 			})
 			return {items: [], recvTick: recvTick};
@@ -337,12 +349,11 @@ export class Snapshot {
 			let 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);
-			// console.log("deleting ", deleted_key, index)
 			if (index > -1)
 				this.deltas.splice(index, 1);
 			deleted.push(deleted_key)
 		}
-		if (deleted.length)
+		if (deleted.length) 
 			this.eSnapHolder = this.eSnapHolder.filter(a => !deleted.includes(a.Snapshot.Key));
 		
 		/*item_delta:
@@ -355,14 +366,8 @@ export class Snapshot {
 		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++) {
@@ -380,10 +385,7 @@ 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)
 				let index = deltaSnaps.findIndex(delta => delta.Snapshot.Key === key);
@@ -402,8 +404,8 @@ export class Snapshot {
 
 
 		}
-		for (let newSnap of newSnaps) {
-			if (this.eSnapHolder.findIndex(a => a.ack == newSnap.ack && a.Snapshot.Key == newSnap.Snapshot.Key) === -1) { // ugly copy new snap to eSnapHolder (if it isnt pushed already)
+		for (let newSnap of deltaSnaps) {
+			if (this.eSnapHolder.findIndex(a => a.ack == recvTick && a.Snapshot.Key == newSnap.Snapshot.Key) === -1) { // 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});
 			}
 			if (deltatick > -1) {
@@ -417,6 +419,19 @@ export class Snapshot {
 			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))});
 		}
 		
+		if (this.crc(recvTick) !== WantedCrc) {
+			this.crc_errors++;
+			if (this.crc_errors > 5) {
+				recvTick = -1;
+				this.crc_errors = 0;
+				this.eSnapHolder = [];
+				this.deltas = [];
+			} else {
+				recvTick = deltatick;
+
+			}
+		} else if (this.crc_errors > 0)
+			this.crc_errors--;
 		
 		return {items, recvTick};
 	}
@@ -424,13 +439,14 @@ export class Snapshot {
 
 function UndiffItem(oldItem: number[], newItem: number[]): number[] {
 	let out: number[] = newItem;
-	if (JSON.stringify(newItem) === JSON.stringify(oldItem))
-		return newItem;
+	// if (JSON.stringify(newItem) === JSON.stringify(oldItem))
+		// return newItem;
 	oldItem.forEach((a, i) => {
 		if (a !== undefined && out[i] !== undefined) {
 			out[i] += a;
-		} else
+		} else {
 			out[i] = 0;
+		}
 	})
 	return out;
 }

package/package.json

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

package/test.js

@@ -0,0 +1,32 @@
+const { Snapshot } = require("./lib/snapshot")
+
+let test_snap1 = [0,18,0,4,18,1744,1072,2,3,4,17,1840,912,1,0,4,16,880,880,0,0,4,15,1840,848,1,0,4,14,912,848,0,0,4,13,880,848,1,0,4,12,848,848,0,0,4,11,880,816,0,0,4,9,1264,656,0,0,4,8,1104,656,0,0,4,7,912,656,0,0,4,6,1712,624,2,2,4,5,1840,432,1,0,4,3,1840,336,1,0,9,0,292,1584,305,0,128,0,0,0,-1,0,0,1584,304,0,0,0,10,0,10,1,0,0,6,0,0,0,0,0,20,0,0,1,11,0,-287183387,-320474125,-1594563099,-2139062272,-2139062144,-2139062144,-2139062272,-1,-454695199,-169020288,-2139062144,-2139062144,-2139062144,-2139062272,0,65408,65408,10,0,1,0,0,0,0]
+let first_crc = 0x5b96263a;
+let test_snap2 = [0,1,0,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,];
+let second_crc = 0x5b96263b;
+let snapunpacker = new Snapshot();
+
+let sum = (nums) => {
+	var sum = 0;
+	nums.forEach(a => {
+		// if (a < 0)
+		sum += a
+	})
+	console.log(sum, master_sum)
+	return sum;
+}
+
+let master_sum = 0;
+
+// test_snap.forEach(a => master_sum += sum(...a));
+// master_sum = sum(...test_snap)
+// test_snap.forEach(a => {master_sum += a; console.log(master_sum)})
+// console.log(snapunpacker.unpackSnapshot(test_snap).items.items);
+
+snapunpacker = new Snapshot();
+console.log(snapunpacker.unpackSnapshot(test_snap1, -1, 1, first_crc));
+console.log(snapunpacker.unpackSnapshot(test_snap2, 1, 2, second_crc));
+// console.log(snapunpacker.eSnapHolder)
+// snapunpacker.eSnapHolder.forEach(a => console.log(a.Snapshot.Data))
+snapunpacker.eSnapHolder.forEach(a => master_sum += sum(a.Snapshot.Data))
+console.log(master_sum & 0xffffffff, 0x5b96263a)