teeworlds 2.0.5 → 2.0.6

package/README.md

@@ -1,10 +1,13 @@
 # tw-chatonly
 Library to connect a bot to a Teeworlds server.
 
+https://www.npmjs.com/package/teeworlds
+
+
 # Usage
 Example file:
-```const test = require('teeworlds');
-let client = new test.Client("127.0.0.1", 8303, "test");
+```const teeworlds = require('teeworlds');
+let client = new teeworlds.Client("127.0.0.1", 8303, "teest");
 
 client.connect();
 

package/lib/huffman.ts

@@ -1,6 +1,3 @@
-// from Ryozuki, found on ddnet discord ( 11.10.2018 )
-// from typing import List
-// from sys import argv
 let FREQ_TABLE = [
     1 << 30, 4545, 2657, 431, 1950, 919, 444, 482, 2244, 617, 838, 542, 715, 1814, 304, 240, 754, 212, 647, 186,
     283, 131, 146, 166, 543, 164, 167, 136, 179, 859, 363, 113, 157, 154, 204, 108, 137, 180, 202, 176,
@@ -31,44 +28,12 @@ interface HuffmanNode {
 	symbol: number;
 }
 
-// class HuffmanNode {
-// 	bits: number;
-// 	numbits: number;
-// 	left: number;
-// 	right: number;
-// 	symbol: number;
-// 	constructor(/*bits: number, numbits: number, left: number, right: number, symbol: number*/) {
-// 		this.bits = -1;
-// 		this.numbits = -1;
-// 		this.left = -1;
-// 		this.right = -1;
-// 		this.symbol = -1;
-// 	}
-
-// 	equal(node: HuffmanNode) {
-// 		return this.bits == node.bits && this.numbits == node.numbits && this.left == node.left && this.right == node.right && this.symbol == node.symbol;
-// 	}
-	
-// }
 
 interface HuffmanConstructNode {
 	node_id: number;
 	frequency: number;
 }
 
-// class HuffmanConstructNode {
-// 	node_id: number;
-// 	frequency: number;
-// 	constructor(node_id: number, frequency: number) {
-// 		this.node_id = node_id;
-// 		this.frequency = frequency;
-// 	}
-// }
-// class HuffmanConstructNode:
-//     def __init__(self):
-//         self.node_id: int = None
-//         self.frequency: int = None
-
 class Huffman {
 	nodes: HuffmanNode[];
 	decode_lut: number[];
@@ -76,7 +41,6 @@ class Huffman {
 	start_node_index: number;
 
 	constructor(frequencies = FREQ_TABLE) {
-		// this.frequencies = frequencies;
 		this.nodes = new Array<HuffmanNode>(HUFFMAN_MAX_NODES);
 		for (let i = 0; i < HUFFMAN_MAX_NODES; i++) {
 			this.nodes[i] = {} as HuffmanNode;
@@ -87,7 +51,6 @@ class Huffman {
 
 		this.construct_tree(frequencies);
 
-		let xx = 0;
 		
 		for (let i = 0; i < HUFFMAN_LUTSIZE; i++) {
 			let bits = i;
@@ -207,35 +170,6 @@ class Huffman {
 		}
 		output.push(bits);
 		return Buffer.from(output);
-		
-		/*        output = bytearray()
-        bits = 0
-        bitcount = 0
-
-        if size is None:
-            size = len(inp_buffer)
-
-        for x in inp_buffer[start_index:size:]:
-            bits |= self.nodes[x].bits << bitcount
-            bitcount += self.nodes[x].numbits
-
-            while bitcount >= 8:
-                output.append(bits & 0xff)
-                bits >>= 8
-                bitcount -= 8
-
-        bits |= self.nodes[HUFFMAN_EOF_SYMBOL].bits << bitcount
-        bitcount += self.nodes[HUFFMAN_EOF_SYMBOL].numbits
-
-        while bitcount >= 8:
-            output.append(bits & 0xff)
-            bits >>= 8
-            bitcount -= 8
-
-        # write out last bits
-        output.append(bits)
-        return output
-*/
 	}
 	decompress(inp_buffer: Buffer, size = 0): Buffer {
 
@@ -259,7 +193,6 @@ class Huffman {
 			}
 			if (node_i == -1)
 				node_i = this.decode_lut[bits & HUFFMAN_LUTMASK];
-			// console.log(node_i, bits & HUFFMAN_LUTMASK, this.decode_lut)
 			if (this.nodes[node_i].numbits) {
 				bits >>= this.nodes[node_i].numbits;
 				bitcount -= this.nodes[node_i].numbits;
@@ -289,54 +222,7 @@ class Huffman {
 		return Buffer.from(output);
 		}
 
-		/*bits = 0
-        bitcount = 0
-        eof = self.nodes[HUFFMAN_EOF_SYMBOL]
-        output = bytearray()
-
-        if size is None:
-            size = len(inp_buffer)
-
-        src_index = 0
-        while True:
-            node_i = None
-            if bitcount >= HUFFMAN_LUTBITS:
-                node_i = self.decode_lut[bits & HUFFMAN_LUTMASK]
-
-            while bitcount < 24 and src_index != size:
-                bits |= inp_buffer[src_index] << bitcount
-                src_index += 1
-                bitcount += 8
-
-            if node_i is None:
-                node_i = self.decode_lut[bits & HUFFMAN_LUTMASK]
-            if self.nodes[node_i].numbits:
-                bits >>= self.nodes[node_i].numbits
-                bitcount -= self.nodes[node_i].numbits
-            else:
-                bits >>= HUFFMAN_LUTBITS
-                bitcount -= HUFFMAN_LUTBITS
-
-                while True:
-                    if bits & 1:
-                        node_i = self.nodes[node_i].right
-                    else:
-                        node_i = self.nodes[node_i].left
-
-                    bitcount -= 1
-                    bits >>= 1
-
-                    if self.nodes[node_i].numbits:
-                        break
-
-                    if bitcount === 0:
-                        raise ValueError("No more bits, decoding error")
-
-            if self.nodes[node_i] === eof:
-                break
-            output.append(self.nodes[node_i].symbol)
-
-        return output */
+		
 	}
 
 export = Huffman;

package/lib/snapshot.ts

@@ -336,11 +336,15 @@ class Snapshot {
 
 			var data: number[] = []
 			for (let i = 0; i < _size; i++) {
-				snap = MsgUnpacker.unpackInt(snap).remaining;
-				data.push(MsgUnpacker.unpackInt(snap).result);
 				if (snap.length == 0) {
 					items.lost++;
 				}
+				if (snap[0]) {
+					snap = MsgUnpacker.unpackInt(snap).remaining;
+					data.push(MsgUnpacker.unpackInt(snap).result);
+				} else
+					break;
+
 			}
 			if (type_id > 0x4000 || type_id == 0) {
 				if (_size == 5 && id == 0)  {

package/package.json

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

package/lib/MsgPacker.js

@@ -1,53 +0,0 @@
-"use strict";
-var MsgPacker = /** @class */ (function () {
-    function MsgPacker(msg, sys) {
-        this.result = Buffer.from([2 * msg + (sys ? 1 : 0)]); // booleans turn into int automatically. 
-        this.sys = sys;
-    }
-    MsgPacker.prototype.AddString = function (str) {
-        this.result = Buffer.concat([this.result, Buffer.from(str), Buffer.from([0x00])]);
-    };
-    MsgPacker.prototype.AddBuffer = function (buffer) {
-        this.result = Buffer.concat([this.result, buffer]);
-    };
-    MsgPacker.prototype.AddInt = function (i) {
-        var result = [];
-        var pDst = (i >> 25) & 0x40;
-        var i = i ^ (i >> 31);
-        pDst |= i & 0x3f;
-        i >>= 6;
-        if (i) {
-            pDst |= 0x80;
-            result.push(pDst);
-            while (true) {
-                pDst++;
-                pDst = i & (0x7f);
-                i >>= 7;
-                pDst |= (Number(i != 0)) << 7;
-                result.push(pDst);
-                if (!i)
-                    break;
-            }
-        }
-        else
-            result.push(pDst);
-        // ... i'll just stop trying to understand.
-        this.result = Buffer.concat([this.result, Buffer.from(result)]);
-    };
-    Object.defineProperty(MsgPacker.prototype, "size", {
-        get: function () {
-            return this.result.byteLength;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(MsgPacker.prototype, "buffer", {
-        get: function () {
-            return this.result;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    return MsgPacker;
-}());
-module.exports = MsgPacker;

package/lib/MsgUnpacker.js

@@ -1,37 +0,0 @@
-"use strict";
-var decoder = new TextDecoder('utf-8');
-function unpackInt(pSrc) {
-    var result = 0;
-    var len = 1;
-    var iter = pSrc[Symbol.iterator]();
-    var src = iter.next();
-    // if (src.done)
-    // console.warn("Unexpected end", src)
-    src = src.value;
-    var sign = ((src >> 6) & 1);
-    result |= (src & 63);
-    for (var i = 0; i < 4; i++) {
-        if ((src & 128) == 0)
-            break;
-        src = iter.next();
-        // console.log(src & 0b1000_0000)
-        // if (src.done)
-        // console.warn("Unexpected end", src);
-        src = src.value;
-        len += 1;
-        if (i == 3 && (src & 240) != 0)
-            console.warn("NonZeroIntPadding");
-        result |= ((src & 127)) << (6 + 7 * i);
-    }
-    if (len > 1 && src == 0) {
-        console.warn("OverlongIntEncoding");
-    }
-    result ^= -sign;
-    return { result: result, remaining: Array.from(iter) };
-}
-function unpackString(pSrc) {
-    var result = pSrc.slice(0, pSrc.indexOf(0));
-    pSrc = pSrc.slice(pSrc.indexOf(0), pSrc.length);
-    return { result: decoder.decode(new Uint8Array(result)), remaining: pSrc };
-}
-module.exports = { unpackInt: unpackInt, unpackString: unpackString };