Merge pull request #11 from kubune/main

Version 59 update

Author: PeterHackz

Crypto/PepperCrypto.js

@@ -4,7 +4,7 @@ crypto = require("crypto");
 
 module.exports = class {
     constructor() {
-        this.server_public_key = fromHexString("F7C80C59E42D4165A32D5D440A6939D54D18BB7F1B2335E85650673C27AA974F");
+        this.server_public_key = fromHexString("5C344B84451436796B735CB62EE38DF813A31798D21294F8C05E0F2B4CA4C047");
         this.client_secret_key = new Uint8Array(crypto.randomBytes(32));
         this.client_public_key = new Uint8Array(32);
         Nacl.lowlevel.crypto_scalarmult_base(this.client_public_key, this.client_secret_key);

DataStream/ByteStream.js

@@ -1,32 +1,57 @@
+const zlib = require('zlib');
+
 module.exports = class {
     constructor(obj) {
         this.payload = new Uint8Array(obj);
         this.offset = 0;
     }
+
     set(obj) {
         this.payload = new Uint8Array(obj);
     }
+
     write(a1) {
         this.payload[this.offset++] = a1;
     }
-    read() {
-        return this.payload[this.offset++];
-    }
+
     writeUInt(a1) {
         this.write(a1 & 0xFF);
     }
+
     writeByte(a1) {
         this.write(a1);
     }
+
     writeBoolean(a1) {
-        this.write(a1 ? 1: 0);
+        this.write(a1 ? 1 : 0);
     }
+
     writeInt(a1) {
         this.write((a1 >> 24) & 0xFF);
         this.write((a1 >> 16) & 0xFF);
         this.write((a1 >> 8) & 0xFF);
         this.write(a1 & 0xFF);
     }
+
+    writeIntLittleEndian(value) {
+        this.write(value & 0xFF);
+        this.write((value >> 8) & 0xFF);
+        this.write((value >> 16) & 0xFF);
+        this.write((value >> 24) & 0xFF);
+    }
+
+    writeCompressedString(data) {
+        const compressedText = zlib.deflateSync(Buffer.from(data));
+        const totalLength = compressedText.length + 4;
+        this.writeInt(totalLength);
+        this.writeIntLittleEndian(data.length);
+        const newPayload = new Uint8Array(this.payload.length + compressedText.length);
+        newPayload.set(this.payload.slice(0, this.offset));
+        newPayload.set(compressedText, this.offset);
+        this.payload = newPayload;
+        this.offset += compressedText.length;
+    }
+
     writeString(a1) {
         if (!a1) return this.writeInt(-1);
         let b = new Uint8Array(Buffer.from(a1));
@@ -35,12 +60,13 @@ module.exports = class {
             this.write(b[strOffset]);
         }
     }
+
     writeVInt(a1) {
-        let v1 = (((a1 >> 25) & 0x40) | (a1 & 0x3F)), 
-        v2 = ((a1 ^ (a1 >> 31)) >> 6), v3
-       
+        let v1 = (((a1 >> 25) & 0x40) | (a1 & 0x3F)),
+            v2 = ((a1 ^ (a1 >> 31)) >> 6), v3;
+
         a1 >>= 6;
-        if (v2 == 0) {
+        if (v2 === 0) {
             this.writeByte(v1);
         } else {
             this.writeByte(v1 | 0x80);
@@ -51,7 +77,7 @@ module.exports = class {
             }
             this.writeByte((a1 & 0x7F) | v3);
             a1 >>= 7;
-            while (v2 != 0) {
+            while (v2 !== 0) {
                 v2 >>= 7;
                 v3 = 0;
                 if (v2 > 0) {
@@ -62,46 +88,53 @@ module.exports = class {
             }
         }
     }
+
     writeDataReference(a1, a2) {
         this.writeVInt(a1);
-        if (a1 == 0) return;
+        if (a1 === 0) return;
         this.writeVInt(a2);
     }
+
     readDataReference() {
         let a1 = this.readVInt();
-        return [a1, a1 == 0 ? 0 : this.readVInt()];
+        return [a1, a1 === 0 ? 0 : this.readVInt()];
     }
+
     readInt() {
         return (this.read() << 24 | this.read() << 16 | this.read() << 8 | this.read());
     }
+
     readByte() {
         return this.read();
     }
+
     readBytes(size) {
         let result = new Uint8Array(size);
         for (let index = 0; index < size; index++) {
             result[index] = this.readByte();
         }
         return result;
     }
+
     readBoolean() {
         return Boolean(this.read());
     }
+
     readString() {
         let len = this.readInt();
-        if (len <= 0 || len == 4294967295) {
+        if (len <= 0 || len === 4294967295) {
             return "";
         }
         return Buffer.from(this.readBytes(len)).toString();
     }
+
     readVInt() {
-        // this method is discovered by nameless#1347
         let result = 0,
-        shift = 0, b, seventh, msb, n;
+            shift = 0, b, seventh, msb, n;
 
         while (true) {
             b = this.read();
-            if (shift == 0) {
+            if (shift === 0) {
                 seventh = (b & 0x40) >> 6;
                 msb = (b & 0x80) >> 7;
                 n = b << 1;
@@ -116,7 +149,8 @@ module.exports = class {
         }
         return (result >> 1) ^ (-(result & 1));
     }
+
     getBytes() {
         return this.payload.slice(0, this.offset);
     }
-}
+};

Messaging/Messages/Client/ClientHelloMessage.js

@@ -6,12 +6,12 @@ module.exports = class {
     }
     encode() {
         this.ByteStream.writeInt(2); // protocol version
-        this.ByteStream.writeInt(47); // crypto version
+        this.ByteStream.writeInt(48); // crypto version
         this.ByteStream.writeInt(settings.major); // major version
         this.ByteStream.writeInt(settings.build); // build version
         this.ByteStream.writeInt(settings.minor); // minor version
         this.ByteStream.writeString(settings.hash); // master hash
-        this.ByteStream.writeInt(0);
-        this.ByteStream.writeInt(0);
+        this.ByteStream.writeInt(2);
+        this.ByteStream.writeInt(2);
     }
 }

Messaging/Messages/Client/LoginMessage.js

@@ -35,7 +35,7 @@ module.exports = class {
         this.ByteStream.writeString();
         this.ByteStream.writeString();
 
-        this.ByteStream.writeString();
+        this.ByteStream.writeString(); // Supercell ID Session Token, must be compressed with zlib
 
         this.ByteStream.writeBoolean(false);
         this.ByteStream.writeString();

README.md

@@ -1,5 +1,5 @@
 # BrawlStars-Client
-client for brawl stars v58 prod server
+Client for brawl stars prod server
 
 # NOTE
 This content is not affiliated with, endorsed,sponsored, or specifically approved by supercell and supercell is not responsible for it.
@@ -29,7 +29,7 @@ program will gonna use default values 🙃
 this project was made by [S.B#0056](https://github.com/HaccerCat) and [risporce#6552](https://github.com/risporce)
 
 # contributors
-[@kubune](https://github.com/kubune) - updated client to game version v58
+[@kubune](https://github.com/kubune) - updated client to game version v58 and v59
 
 [@RyfterWasTaken](https://github.com/RyfterWasTaken) - updated hash and minor versions for v58
 

settings.json

@@ -1,6 +1,6 @@
 {
-    "hash": "ad243357c65ef991993a73261437c2b0f6aa0d4d",
-    "major": 58,
-    "minor": 329,
+    "hash": "86460ad83cb5e3a4ff8474eddb936d23008dfc1f",
+    "major": 59,
+    "minor": 212,
     "build": 1
 }