teeworlds 2.3.7 → 2.3.8

package/lib/MsgUnpacker.js

@@ -4,20 +4,22 @@ exports.MsgUnpacker = exports.unpackString = exports.unpackInt = void 0;
 var decoder = new TextDecoder('utf-8');
 function unpackInt(pSrc) {
     var result = 0;
-    var iter = pSrc[Symbol.iterator]();
-    var src = iter.next();
-    src = src.value;
-    var sign = ((src >> 6) & 1);
-    result |= (src & 63);
+    // var iter = pSrc[Symbol.iterator]()
+    // var src: any = iter.next()
+    // src = src.value
+    var srcIndex = 0;
+    var sign = ((pSrc[srcIndex] >> 6) & 1);
+    result |= (pSrc[srcIndex] & 63);
     for (var i = 0; i < 4; i++) {
-        if ((src & 128) === 0)
+        if ((pSrc[srcIndex] & 128) === 0)
             break;
-        src = iter.next();
-        src = src.value;
-        result |= ((src & 127)) << (6 + 7 * i);
+        // src = iter.next()
+        // src = src.value;
+        srcIndex++;
+        result |= ((pSrc[srcIndex] & 127)) << (6 + 7 * i);
     }
     result ^= -sign;
-    return { result: result, remaining: Array.from(iter) };
+    return { result: result, remaining: pSrc.slice(srcIndex + 1) };
 }
 exports.unpackInt = unpackInt;
 function unpackString(pSrc) {

package/lib/MsgUnpacker.ts

@@ -2,25 +2,27 @@ const decoder = new TextDecoder('utf-8');
 export function unpackInt(pSrc: number[]): {result: number, remaining: number[]} {
 	var result = 0;
 	
-	var iter = pSrc[Symbol.iterator]()
-	var src: any = iter.next()
-	src = src.value
-	var sign = ((src >> 6) & 1)
+	// var iter = pSrc[Symbol.iterator]()
+	// var src: any = iter.next()
+	// src = src.value
+	let srcIndex = 0;
+	var sign = ((pSrc[srcIndex] >> 6) & 1)
 	
-	result |= (src & 0b0011_1111)
+	result |= (pSrc[srcIndex] & 0b0011_1111)
 	for (let i = 0; i < 4; i++) {
 		
-		if ((src & 0b1000_0000) === 0)
+		if ((pSrc[srcIndex] & 0b1000_0000) === 0)
 			break;
-		src = iter.next()
+		// src = iter.next()
 
-		src = src.value;
-		result |= ((src & 0b0111_1111)) << (6+7*i)
+		// src = src.value;
+		srcIndex++;
+		result |= ((pSrc[srcIndex] & 0b0111_1111)) << (6+7*i)
 		
 	}
 	result ^= -sign;
 	
-	return {result, remaining: Array.from(iter)};
+	return {result, remaining: pSrc.slice(srcIndex+1)};
 }
 export function unpackString(pSrc: number[]): {result: string, remaining: number[]} {
 	var result = pSrc.slice(0, pSrc.indexOf(0))

package/lib/client.js

@@ -298,6 +298,7 @@ var Client = /** @class */ (function (_super) {
     };
     Client.prototype.connect = function () {
         var _this = this;
+        var _a;
         this.State = States.STATE_CONNECTING;
         var predTimer = setInterval(function () {
             if (_this.State == States.STATE_ONLINE) {
@@ -314,14 +315,16 @@ var Client = /** @class */ (function (_super) {
             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);
+        if (!((_a = this.options) === null || _a === void 0 ? void 0 : _a.lightweight)) {
+            var inputInterval_1 = setInterval(function () {
+                if (_this.State == States.STATE_OFFLINE)
+                    clearInterval(inputInterval_1);
+                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) {
@@ -344,7 +347,7 @@ var Client = /** @class */ (function (_super) {
         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, _g;
+                var _a, _b, _c, _d, _e, _f, _g, _h;
                 if (_this.State == 0 || rinfo.address != _this.host || rinfo.port != _this.port)
                     return;
                 clearInterval(connectInterval);
@@ -418,7 +421,9 @@ var Client = /** @class */ (function (_super) {
                             _this.sentChunkQueue.splice(i, 1);
                     }
                 });
-                var snapChunks = unpacked.chunks.filter(function (a) { return a.msg === "SNAP" || a.msg === "SNAP_SINGLE" || a.msg === "SNAP_EMPTY"; });
+                var snapChunks = [];
+                if (((_g = _this.options) === null || _g === void 0 ? void 0 : _g.lightweight) !== true)
+                    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;
@@ -517,7 +522,7 @@ var Client = /** @class */ (function (_super) {
                 }
                 else if ((unpacked.chunks[0] && chunkMessages.includes("CON_READY"))) {
                     var info = new MsgPacker_1.MsgPacker(20, false, 1);
-                    if ((_g = _this.options) === null || _g === void 0 ? void 0 : _g.identity) {
+                    if ((_h = _this.options) === null || _h === void 0 ? void 0 : _h.identity) {
                         info.AddString(_this.options.identity.name);
                         info.AddString(_this.options.identity.clan);
                         info.AddInt(_this.options.identity.country);
@@ -602,18 +607,27 @@ var Client = /** @class */ (function (_super) {
         });
     };
     Client.prototype.Say = function (message, team) {
+        var _a;
         if (team === void 0) { team = false; }
         var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_SAY, false, 1);
         packer.AddInt(team ? 1 : 0); // team
         packer.AddString(message);
-        this.QueueChunkEx(packer);
+        if (!((_a = this.options) === null || _a === void 0 ? void 0 : _a.lightweight))
+            this.QueueChunkEx(packer);
+        else
+            this.SendMsgEx(packer);
     };
     Client.prototype.Vote = function (vote) {
+        var _a;
         var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_VOTE, false, 1);
         packer.AddInt(vote ? 1 : -1);
-        this.QueueChunkEx(packer);
+        if (!((_a = this.options) === null || _a === void 0 ? void 0 : _a.lightweight))
+            this.QueueChunkEx(packer);
+        else
+            this.SendMsgEx(packer);
     };
     Client.prototype.ChangePlayerInfo = function (playerInfo) {
+        var _a;
         var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_CHANGEINFO, false, 1);
         packer.AddString(playerInfo.name); //m_pName);
         packer.AddString(playerInfo.clan); //m_pClan);
@@ -622,21 +636,36 @@ var Client = /** @class */ (function (_super) {
         packer.AddInt(playerInfo.use_custom_color ? 1 : 0); //m_UseCustomColor);
         packer.AddInt(playerInfo.color_body); //m_ColorBody);
         packer.AddInt(playerInfo.color_feet); //m_ColorFeet);
-        this.QueueChunkEx(packer);
+        if (!((_a = this.options) === null || _a === void 0 ? void 0 : _a.lightweight))
+            this.QueueChunkEx(packer);
+        else
+            this.SendMsgEx(packer);
     };
     Client.prototype.Kill = function () {
+        var _a;
         var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_KILL, false, 1);
-        this.QueueChunkEx(packer);
+        if (!((_a = this.options) === null || _a === void 0 ? void 0 : _a.lightweight))
+            this.QueueChunkEx(packer);
+        else
+            this.SendMsgEx(packer);
     };
     Client.prototype.ChangeTeam = function (team) {
+        var _a;
         var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_SETTEAM, false, 1);
         packer.AddInt(team);
-        this.QueueChunkEx(packer);
+        if (!((_a = this.options) === null || _a === void 0 ? void 0 : _a.lightweight))
+            this.QueueChunkEx(packer);
+        else
+            this.SendMsgEx(packer);
     };
     Client.prototype.Emote = function (emote) {
+        var _a;
         var packer = new MsgPacker_1.MsgPacker(NETMSGTYPE.CL_EMOTICON, false, 1);
         packer.AddInt(emote);
-        this.QueueChunkEx(packer);
+        if (!((_a = this.options) === null || _a === void 0 ? void 0 : _a.lightweight))
+            this.QueueChunkEx(packer);
+        else
+            this.SendMsgEx(packer);
     };
     Client.prototype.client_info = function (id) {
         var delta = this.SnapUnpacker.deltas.filter(function (a) {

package/lib/client.ts

@@ -141,7 +141,8 @@ declare interface iOptions {
 	password?: string,
 	ddnet_version?: {version: number, release_version: string},
 	timeout?: number, // in ms
-	NET_VERSION?: string
+	NET_VERSION?: string,
+	lightweight?: boolean // experimental, only sends keepalive's (sendinput has to be called manually)
 }
 
 export declare interface Client {
@@ -434,15 +435,16 @@ export class Client extends EventEmitter {
 			else
 				clearInterval(connectInterval)
 		}, 500);
-
-		let inputInterval = setInterval(() => {
-			if (this.State == States.STATE_OFFLINE)
-				clearInterval(inputInterval)
-			if (this.State != States.STATE_ONLINE)
-				return;
-			this.time = new Date().getTime();
-			this.sendInput();
-		}, 500)
+		if (!this.options?.lightweight) {
+			let inputInterval = setInterval(() => {
+				if (this.State == States.STATE_OFFLINE)
+					clearInterval(inputInterval)
+				if (this.State != States.STATE_ONLINE)
+					return;
+				this.time = new Date().getTime();
+				this.sendInput();
+			}, 500)
+		}
 
 		let resendTimeout = setInterval(() => {
 			if (this.State != States.STATE_OFFLINE) {
@@ -549,7 +551,9 @@ export class Client extends EventEmitter {
 							this.sentChunkQueue.splice(i, 1);
 					} 
 				})
-				var snapChunks = unpacked.chunks.filter(a => a.msg === "SNAP" || a.msg === "SNAP_SINGLE" || a.msg === "SNAP_EMPTY");
+				let snapChunks: chunk[] = [];
+				if (this.options?.lightweight !== true) 
+					snapChunks = unpacked.chunks.filter(a => a.msg === "SNAP" || a.msg === "SNAP_SINGLE" || a.msg === "SNAP_EMPTY");
 				if (snapChunks.length > 0) {
 					let part = 0;
 					let num_parts = 1;
@@ -749,12 +753,18 @@ export class Client extends EventEmitter {
 		var packer = new MsgPacker(NETMSGTYPE.CL_SAY, false, 1);
 		packer.AddInt(team ? 1 : 0); // team
 		packer.AddString(message);
-		this.QueueChunkEx(packer);
+		if (!this.options?.lightweight)
+			this.QueueChunkEx(packer);
+		else
+			this.SendMsgEx(packer);
 	}
 	Vote(vote: boolean) {
 		var packer = new MsgPacker(NETMSGTYPE.CL_VOTE, false, 1);
 		packer.AddInt(vote ? 1 : -1);
-		this.QueueChunkEx(packer);
+		if (!this.options?.lightweight)
+			this.QueueChunkEx(packer);
+		else
+			this.SendMsgEx(packer);
 	}
 	ChangePlayerInfo(playerInfo: ClientInfo) {
 		var packer = new MsgPacker(NETMSGTYPE.CL_CHANGEINFO, false, 1);
@@ -765,21 +775,33 @@ export class Client extends EventEmitter {
 		packer.AddInt(playerInfo.use_custom_color ? 1 : 0); //m_UseCustomColor);
 		packer.AddInt(playerInfo.color_body); //m_ColorBody);
 		packer.AddInt(playerInfo.color_feet); //m_ColorFeet);
-		this.QueueChunkEx(packer);
+		if (!this.options?.lightweight)
+			this.QueueChunkEx(packer);
+		else
+			this.SendMsgEx(packer);
 	}
 	Kill() {
 		var packer = new MsgPacker(NETMSGTYPE.CL_KILL, false, 1);
-		this.QueueChunkEx(packer);
+		if (!this.options?.lightweight)
+			this.QueueChunkEx(packer);
+		else
+			this.SendMsgEx(packer);
 	}
 	ChangeTeam(team: number) {
 		var packer = new MsgPacker(NETMSGTYPE.CL_SETTEAM, false, 1);
 		packer.AddInt(team);
-		this.QueueChunkEx(packer);
+		if (!this.options?.lightweight)
+			this.QueueChunkEx(packer);
+		else
+			this.SendMsgEx(packer);
 	}
 	Emote(emote: number) {
 		var packer = new MsgPacker(NETMSGTYPE.CL_EMOTICON, false, 1);
 		packer.AddInt(emote);
-		this.QueueChunkEx(packer);
+		if (!this.options?.lightweight)
+			this.QueueChunkEx(packer);
+		else
+			this.SendMsgEx(packer);
 	}
 	client_info(id: number) {
 		let delta = this.SnapUnpacker.deltas.filter(a => 

package/package.json

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