clashofclans.js 2.0.0 → 2.0.1-dev.0dd451f

package/CHANGELOG.md

@@ -2,16 +2,33 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## 2.0.1 (2021-11-27)
+
+### Bug Fixes
+
+-   IP retrieval method and Event Loop ([#70](https://github.com/clashperk/clashofclans.js/issues/70)) ([82b84ba](https://github.com/clashperk/clashofclans.js/commit/82b84ba5d96505c43b75e53aa07f547ef0b77778))
+
 ## 2.0.0 (2021-11-26)
 
 This new version is a complete TypeScript rewrite to convert everything from plain (literal JSON) objects to class (constructor) objects and support a lot more features.
 
 ### Features
 
--   API Date Parser and Request Retries ([#26](https://github.com/clashperk/clashofclans.js/issues/26)) ([94585f3](https://github.com/clashperk/clashofclans.js/commit/94585f3a84a7175b2d07872f9eb9e42372b95e12))
--   EventManager and Custom Events ([#37](https://github.com/clashperk/clashofclans.js/issues/37)) ([5027ae6](https://github.com/clashperk/clashofclans.js/commit/5027ae663a8e07175e17384c7e5706f4a1a7afb4))
+-   HTTP Request Request Retries ([#26](https://github.com/clashperk/clashofclans.js/issues/26)) ([94585f3](https://github.com/clashperk/clashofclans.js/commit/94585f3a84a7175b2d07872f9eb9e42372b95e12))
+-   Event Manager and Custom Events ([#37](https://github.com/clashperk/clashofclans.js/issues/37)) ([5027ae6](https://github.com/clashperk/clashofclans.js/commit/5027ae663a8e07175e17384c7e5706f4a1a7afb4))
 -   Email Password Login ([#31](https://github.com/clashperk/clashofclans.js/issues/31)) ([4153cd3](https://github.com/clashperk/clashofclans.js/commit/4153cd37ea0e1c71550b9e892105b84d5a407e23))
--   QueueThrottler and BatchThrottler ([#34](https://github.com/clashperk/clashofclans.js/issues/34)) ([3a8f051](https://github.com/clashperk/clashofclans.js/commit/3a8f051552e93b98f89bc7d524acdecddf242718))
+-   Queue Throttler and Batch Throttler ([#34](https://github.com/clashperk/clashofclans.js/issues/34)) ([3a8f051](https://github.com/clashperk/clashofclans.js/commit/3a8f051552e93b98f89bc7d524acdecddf242718))
 -   Override Request Options ([#36](https://github.com/clashperk/clashofclans.js/issues/36)) ([42d7fdd](https://github.com/clashperk/clashofclans.js/commit/42d7fdd36262cc46f23b731f8cffb9daea19d3b0))
 -   Internal Caching Options ([#53](https://github.com/clashperk/clashofclans.js/issues/53)) ([984451d](https://github.com/clashperk/clashofclans.js/commit/30ea3240c11866008d0dae514468c0fdbb34ffd0))
--   Raw Data for Player Units ([#65](https://github.com/clashperk/clashofclans.js/pull/65)) ([aa1696](https://github.com/clashperk/clashofclans.js/commit/aa1696243d96d4fed0250b4282c60522a6482343))
+-   Additional Properties for Player Units ([#65](https://github.com/clashperk/clashofclans.js/pull/65)) ([aa1696](https://github.com/clashperk/clashofclans.js/commit/aa1696243d96d4fed0250b4282c60522a6482343))
+
+### Links
+
+-   Documentation
+    https://clashofclans.js.org/docs
+
+-   Guide
+    https://clashofclans.js.org/guide
+
+-   Updating to v2.0.0
+    https://clashofclans.js.org/docs/updating-to-v2

package/dist/client/EventManager.js

@@ -163,7 +163,7 @@ class EventManager {
         const end = Util_1.Util.getSeasonEndTime().getTime() - Date.now();
         // Why this? setTimeout can be up to 24.8 days or 2147483647ms [(2^31 - 1) Max 32bit Integer]
         if (end > 24 * 60 * 60 * 1000) {
-            setTimeout(this.seasonEndHandler.bind(this), 60 * 60 * 1000).unref();
+            setTimeout(this.seasonEndHandler.bind(this), 60 * 60 * 1000);
         }
         else if (end > 0) {
             setTimeout(() => {
@@ -176,21 +176,21 @@ class EventManager {
         for (const tag of this._clanTags)
             await this.runClanUpdate(tag);
         this.client.emit(Constants_1.EVENTS.CLAN_LOOP_END);
-        setTimeout(this.clanUpdateHandler.bind(this), 10000).unref();
+        setTimeout(this.clanUpdateHandler.bind(this), 10000);
     }
     async playerUpdateHandler() {
         this.client.emit(Constants_1.EVENTS.PLAYER_LOOP_START);
         for (const tag of this._playerTags)
             await this.runPlayerUpdate(tag);
         this.client.emit(Constants_1.EVENTS.PLAYER_LOOP_END);
-        setTimeout(this.playerUpdateHandler.bind(this), 10000).unref();
+        setTimeout(this.playerUpdateHandler.bind(this), 10000);
     }
     async warUpdateHandler() {
         this.client.emit(Constants_1.EVENTS.WAR_LOOP_START);
         for (const tag of this._warTags)
             await this.runWarUpdate(tag);
         this.client.emit(Constants_1.EVENTS.WAR_LOOP_END);
-        setTimeout(this.warUpdateHandler.bind(this), 10000).unref();
+        setTimeout(this.warUpdateHandler.bind(this), 10000);
     }
     async runClanUpdate(tag) {
         if (this._inMaintenance)

package/dist/rest/RequestHandler.js

@@ -21,6 +21,7 @@ const HTTPError_1 = require("./HTTPError");
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const https_1 = __importDefault(require("https"));
 const keyv_1 = __importDefault(require("keyv"));
+const IP_REGEX = /\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}/g;
 const agent = new https_1.default.Agent({ keepAlive: true });
 /** Represents a Request Handler. */
 class RequestHandler {
@@ -110,7 +111,7 @@ class RequestHandler {
             if (res?.status === 403) {
                 const index = this.keys.indexOf(key);
                 this.keys.splice(index, 1);
-                console.warn(`[WARN] Pre-defined key #${index + 1} is no longer valid. Removed from the key list.`);
+                process.emitWarning(`Pre-defined key #${index + 1} is no longer valid. Removed from the key list.`);
             }
         }
     }
@@ -121,19 +122,23 @@ class RequestHandler {
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify({ email: this.email, password: this.password })
         });
-        if (res.ok) {
-            return this.getKeys(res.headers.get('set-cookie'));
-        }
-        throw new ReferenceError('Invalid email or password.');
+        const data = await res.json();
+        if (!res.ok)
+            throw new Error(`Invalid email or password. ${JSON.stringify(data)}`);
+        const ip = await this.getIp(data.temporaryAPIToken);
+        if (!ip)
+            throw new Error('Failed to get the IP address.');
+        return this.getKeys(res.headers.get('set-cookie'), ip);
     }
-    async getKeys(cookie) {
-        const ip = await this.getIp();
+    async getKeys(cookie, ip) {
         const res = await (0, node_fetch_1.default)(`${Constants_1.DEV_SITE_API_BASE_URL}/apikey/list`, {
             method: 'POST',
             timeout: 10000,
             headers: { 'Content-Type': 'application/json', cookie }
         });
         const data = await res.json();
+        if (!res.ok)
+            throw new Error(`Failed to retrieve the API Keys. ${JSON.stringify(data)}`);
         // Get all available keys from the developer site.
         const keys = (data.keys ?? []);
         // Revoke keys for specified key name but not matching current IP address.
@@ -157,7 +162,7 @@ class RequestHandler {
             keys.push(key);
         }
         if (this.keys.length < this.keyCount && keys.length === 10) {
-            console.warn(`[WARN] ${this.keyCount} key(s) were requested but failed to create ${this.keyCount - this.keys.length} more key(s).`);
+            process.emitWarning(`${this.keyCount} key(s) were requested but failed to create ${this.keyCount - this.keys.length} more key(s).`);
         }
         if (!this.keys.length) {
             throw new Error([
@@ -188,10 +193,20 @@ class RequestHandler {
             })
         });
         const data = await res.json();
+        if (!res.ok)
+            throw new Error(`Failed to create API Key. ${JSON.stringify(data)}`);
         return data.key;
     }
-    async getIp() {
-        return (0, node_fetch_1.default)('https://api.ipify.org/', { timeout: 10000 }).then((res) => res.text());
+    async getIp(token) {
+        try {
+            const decoded = JSON.parse(Buffer.from(token.split('.')[1], 'base64').toString());
+            const props = decoded.limits.find((limit) => limit.hasOwnProperty('cidrs'));
+            return props.cidrs[0].match(IP_REGEX)[0];
+        }
+        catch {
+            const body = await (0, node_fetch_1.default)('https://api.ipify.org', { timeout: 10000 }).then((res) => res.text());
+            return body.match(IP_REGEX)?.[0] ?? null;
+        }
     }
 }
 exports.RequestHandler = RequestHandler;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "clashofclans.js",
-	"version": "2.0.0",
+	"version": "2.0.1-dev.0dd451f",
 	"description": "JavaScript library for interacting with the Clash of Clans API",
 	"author": "SUVAJIT <suvajit.me@gmail.com>",
 	"license": "MIT",