Modifications to battle logs summary and telegram notification

.env-example

@@ -1,14 +1,24 @@
 QUEST_PRIORITY=true
 MINUTES_BATTLES_INTERVAL=30
 ERC_THRESHOLD=80
+POWER_THRESHOLD=1000
+SWITCH_THRESHOLD=50
 CLAIM_SEASON_REWARD=false
 CLAIM_QUEST_REWARD=true
 HEADLESS=true
 KEEP_BROWSER_OPEN=true
+CHROME_NO_SANDBOX=true
 LOGIN_VIA_EMAIL=false
+GET_DATA_FOR_LOCAL=true
+AUTO_SWITCH=false
 EMAIL=account1@email.com,account2@email.com,account3@email.com
 ACCUSERNAME=username1,username2,username3
 PASSWORD=password1,password2,password3
+PRIORITY_CARD=
 USE_API=true
-API_URL=http://splinterlandsapi.pcjones.de:8080/
-USE_CLASSIC_BOT_PRIVATE_API=false
+API_URL=http://splinterlandsapi2.pcjones.de:8080/
+API_URL_FALLBACK=http://splinterlandsapi.pcjones.de:8080/ 
+USE_CLASSIC_BOT_PRIVATE_API=false
+TELEGRAM_NOTIF=false
+TELEGRAM_TOKEN=
+TELEGRAM_CHATID=

README.md

@@ -1,7 +1,7 @@
-# Ultimate Splinterlands Bot by PC Jones
+# Ultimate Splinterlands Bot V1 (Modified version)
 A fast, free, multi-account splinderlands bot
 
-Based on https://github.com/alfficcadenti/splinterlands-bot
+Based on https://github.com/PCJones/ultimate-splinterlands-bot
 
 ## Preamble 
 Right now the code is a mess - I just hacked something together so I can release this asap. I'm planning on updating the code soon. 
@@ -17,12 +17,17 @@ Feel free to give suggestions for features/code refurbishing via github or on di
 - The bot no longer refreshes the page all the time (which often got you blocked from splinterlands for a few minutes)
 - The bot clicks away popups
 - The bot waits if there is a loading circle from splinterlands
-- Minimum Energy Capture Rate - the bot will pause automatically if the energy capture rate is below a specified percentage
+- Disabled requesting the free API because it is always overloaded and slows down the bot (I've supplied a very large history file)
 - Option to disable automatic quest reward chest opening
 - Support for the private API of the original bot
-- **Coming Soon**: Individual wait time for each account (right now it will battle with all accounts and wait after that) (aka **Multithreading**)
-- **Coming Soon**: 
-- **Coming Soon**: Statistics on how each account is performing
+- Minimum Energy Capture Rate - the bot will pause automatically if the energy capture rate is below a specified percentage
+- New battle log summary after all battles
+- New DEC log after battle. 
+- Receive Battle log summary notification via Telegram 
+- **Updated Feature**: Accurate battle summary 
+- **Updated Feature**: Power Threshold and claimed reward log 
+- **Updated Feature**: Auto gather the battle history for local back.(In case supported API is down)
+- **Coming Soon**: Telegram notification if bot had an error/stop running. Call to function on telegram. (virgaux)
 - Any suggestions?
 
 # Support / Community
@@ -34,10 +39,10 @@ https://discord.gg/hwSr7KNGs9)
 
 ## How to install
 - Download and install [NodeJs](https://nodejs.org/it/download/)
-- Download the [bot](https://github.com/PCJones/ultimate-splinterlands-bot/archive/refs/heads/master.zip) (extract if its .zip)
+- Download the [bot](https://github.com/virgaux/ultimate-splinterlands-bot/archive/refs/heads/master.zip) (extract if its .zip)
 - Create .env file (see .env-example)
 - On windows: Execute `install.bat` in bot folder
-- On MacOS/Linux: open terminal in bot folder and execute command `npm install`
+- On MacOS/Linux: open terminal in bot folder and execute command `npm install` 
 
 ## How to start the bot
 - On windows: Execute `start.bat` in bot folder
@@ -51,7 +56,11 @@ Configuration with default values:
 
 - `MINUTES_BATTLES_INTERVAL=30` Sleep time before the bot will fight with all accounts again. Subtract 2-3 minutes per account
 
-- `ERC_THRESHOLD=80` If your energy capture rate goes below this the bot will stop fighting with this account until it's above again. Set to 0 to disable
+- `ERC_THRESHOLD=80` If your energy capture rate goes below this the bot will stop fighting with this account until it's above again. Set to 0 to disable 
+
+- `ERC_REGEN=true` Disable/Enable ERC regeneration function.
+
+- `ERC_REGEN_LIMIT=100` If your energy capture rate is not yet above this, the bot will not fight with this account until it's reach the pre-set parameter.
 
 - `CLAIM_SEASON_REWARD=false` Disable/Enable season reward claiming
 
@@ -75,15 +84,25 @@ Configuration with default values:
 
 - `USE_CLASSIC_BOT_PRIVATE_API=false` Set to false unless you have the private API from the original bot
 
+- `TELEGRAM_NOTIF=false` Disable/Enable to receive telegram notification for battle result. 
+
+- `TELEGRAM_TOKEN=` API TOKEN from telegram which will send you the notification. This is private key. DO NOT GIVE IT TO ANYONE. [how to get telegram token](https://www.siteguarding.com/en/how-to-get-telegram-bot-api-token)
+
+- `TELEGRAM_CHATID` telegram chat id for notify, get the id: https://t.me/get_id_bot
+
 # Donations
 
 In case you want to donate to me for updating this bot, I would be very happy! Please also consider donating to the original bot creator.
 
-- DEC into the game to the player **pcjones** 
+- DEC into the game to the player **pcjones** or **virgaux**
 - Bitcoin 3KU85k1HFTqCC4geQz3XUFk84R6uekuzD8
 - Ethereum 0xcFE8c78F07e0190EBdD9077cF9d9E3A8DCED8d91 
 - WAX to account **lshru.wam** (please copy the name)
 - Text me on Discord or Telegram for anything other
+- or 
+- DEC into the game to the player **virgaux**
+- Metamask wallet address: 0x6b11890566077AAC2B7fA7511d484f50Ec1335f6 
+- Hive wallet address: @virgaux
 
 # FAQ
 **Can I have some accounts that login via email and some via username?**
@@ -106,3 +125,8 @@ PASSWORD=password1,password2,POST_KEY3
 
 1. Backup newHistory.json in case something goes wrong
 2. Run `node combine.js` in the data folder to add the data from history.json to the newHistory.json file
+
+**Why I can't see the Telegram notification after setting it up?**
+
+1. Look for the name of your bot in Telegram. 
+2. Type `/start` to receive notifcation once battle summary result is available. 

USBpc-Version.json

@@ -0,0 +1,8 @@
+{
+        "Version": 11.25, 
+        "Fixes": "fixed ongoing login error.", 
+        "Update":"LostVoid Private API ready. Added code for API fallback.", 
+        "New_feature": "Paid Version is on development with more feature. Message Virgaux for details.",
+        "Instuction" : "No need to npm install again. Just git pull or replace the updated files"
+
+}

USBpc-Version.txt

@@ -0,0 +1 @@
+11.25

api.js

@@ -1,32 +1,49 @@
-const fetch = require('node-fetch');
+const fetch = require('cross-fetch');
 const fs = require('fs');
+const readline = require('readline');
+const chalk = require('chalk');
 
 async function tempLog(log) {
 	fs.appendFile('log.txt', log + '\n', function (err) {
 		//console.log('LogError', log);
 	});
 }
+function sleep(ms) {
+    return new Promise((resolve) => {
+        setTimeout(resolve, ms);
+    });
+}
 
-async function getPossibleTeams(matchDetails) {
-	try {
-		const response = await fetch(process.env.API_URL + 'get_team/', {
-			method: 'post',
-			body: JSON.stringify(matchDetails),
-			headers: {'Content-Type': 'application/json'}
-		});
-
-		var dataRaw = await response.text();
-
+async function response (matchDetails,api){
+	const response = await fetch(api + 'get_team/', {
+		method: 'post',
+		body: JSON.stringify(matchDetails),
+		headers: {'Content-Type': 'application/json'}
+	});
+	return response.text()
+}
+
+async function getPossibleTeams(matchDetails,api) {
+	try {		
+		let dataRaw = await response(matchDetails,api);
 		if (process.env.DEBUG === 'true') {
 			tempLog('--------------------------------------------------------');
 			tempLog(JSON.stringify(matchDetails));	
 			tempLog('response:');
 			tempLog(dataRaw);
 			tempLog('--------------------------------------------------------');
 		}
-
-		const data = JSON.parse(dataRaw);
-
+		let apiResponseCounter = 0;
+    	while (JSON.stringify(dataRaw).includes('hash')) {
+        	readline.cursorTo(process.stdout, 0); 
+            console.log(chalk.yellow(' Waiting 30 seconds for API to calculate team...'));
+            await sleep(30000);
+            dataRaw =  await response(matchDetails,api);
+            if (++apiResponseCounter >= 4) break;
+            }
+
+		const data = JSON.parse(dataRaw);		
+
 		return data;
 	} catch(e) {
         console.log('API Error', e);

auto-gather.js

@@ -0,0 +1,153 @@
+require('dotenv').config()
+const fetch = require("async-get-json");
+const fs = require('fs');
+const misc = require('./misc');
+const chalk = require('chalk');
+const readline = require('readline');
+
+
+
+
+
+const distinct = (value, index, self) => {
+    return self.indexOf(value) === index;
+}
+function uniqueListByKey(arr, key) {
+  return [...new Map(arr.map(item => [item[key], item])).values()]
+}
+
+function sleep(ms) {
+  return new Promise((resolve) => {
+      setTimeout(resolve, ms);
+  });
+}
+  async function getBattleHistory(player = '', data = {}) {
+    await sleep(5000);
+    const battleHistory = await fetch(`http://game-api.splinterlands.io/battle/history?player=` + player)
+    .then(b=>b.battles)
+    .catch(async ()=> {
+      readline.cursorTo(process.stdout, 0);
+      console.log('Fetch error. using API.spliterlands.')
+      await fetch(`http://api.splinterlands.io/battle/history?player=` + player)
+      .then(b=>b.battles)
+      .catch(async ()=> {
+        readline.cursorTo(process.stdout, 0);
+          console.log('Fetch error. using steemmonstes API.')
+          await fetch(`http://api.steemmonsters.io/battle/history?player=` + player)
+          .then(b=>b.battles)
+          .catch(async ()=> {
+            readline.cursorTo(process.stdout, 0);
+              console.log('Fetch error. using API2.')
+              await fetch(`http://api2.splinterlands.com/battle/history?player=` + player)
+              .then(b=>b.battles)
+          .catch(async () => {
+            readline.cursorTo(process.stdout, 0);
+            console.log('There has been a problem with your fetch operation:', error);
+            return [];
+          })   
+        })  
+      })  
+    });
+    return await battleHistory;
+  }
+
+
+const extractGeneralInfo = (x) => {
+    return {
+        mana_cap: x.mana_cap ? x.mana_cap : '',
+        ruleset: x.ruleset ? x.ruleset : '',
+    }
+}
+
+const extractMonster = (team) => {
+    const monster1 = team.monsters[0];
+    const monster2 = team.monsters[1];
+    const monster3 = team.monsters[2];
+    const monster4 = team.monsters[3];
+    const monster5 = team.monsters[4];
+    const monster6 = team.monsters[5];
+
+    return {
+        summoner_id: team.summoner.card_detail_id,
+        monster_1_id: monster1 ? monster1.card_detail_id : '',
+        monster_2_id: monster2 ? monster2.card_detail_id : '',
+        monster_3_id: monster3 ? monster3.card_detail_id : '',
+        monster_4_id: monster4 ? monster4.card_detail_id : '',
+        monster_5_id: monster5 ? monster5.card_detail_id : '',
+        monster_6_id: monster6 ? monster6.card_detail_id : '',
+    }
+}
+
+let battlesList = [];
+let promises = [];
+
+const battles = async (player) =>  await getBattleHistory(player)
+  .then(u => u.map(x => { 
+    return [x.player_1, x.player_2] 
+  }).reduce((acc, val) => acc.concat(val), []).filter(distinct))
+  .then(ul => ul.map(user => {
+    promises.push(
+      getBattleHistory(user)
+      .then(battles => battles.map(
+        battle => {
+          const details = JSON.parse(battle.details);
+          if (details.type != 'Surrender') {
+            if (battle.winner && battle.winner == battle.player_1) {
+              const monstersDetails = extractMonster(details.team1)
+              const info = extractGeneralInfo(battle)
+              return {
+                ...monstersDetails,
+                ...info,
+                battle_queue_id: battle.battle_queue_id_1,
+                //winner: battle.player_1,
+                //verdict: (winner && winner == battle.player_1)?'w':(winner == 'DRAW')? 'd' :'l',
+              }
+            } else if (battle.winner && battle.winner == battle.player_2) {
+              const monstersDetails = extractMonster(details.team2)
+              const info = extractGeneralInfo(battle)
+              return {
+                ...monstersDetails,
+                ...info,
+                battle_queue_id: battle.battle_queue_id_2,
+                //winner: battle.player_2,
+                //verdict: (winner && winner == battle.player_2)?'w':(winner == 'DRAW')? 'd' :'l',
+              }
+            }
+          }
+        })
+      )
+      .then(x => battlesList = [...battlesList, ...x])
+    )
+  }))
+  .then(() => { return Promise.all(promises) })
+  .then(() => { return new Promise((res,rej) => {
+    //twirlTimer();
+    readline.cursorTo(process.stdout, 0);
+	  console.log('Reading local battle history');
+     fs.readFile(`./data/newHistory.json`, 'utf8', (err, data) => {
+      if (err) {
+        readline.cursorTo(process.stdout, 0);
+        misc.writeToLog(`Error reading file from disk: ${err}`); rej(err)
+      } else {
+        battlesList = data ? [...battlesList, ...JSON.parse(data)] : battlesList;
+      }
+      battlesList = uniqueListByKey(battlesList.filter(x => x != undefined),"battle_queue_id")
+      readline.cursorTo(process.stdout, 0);
+      misc.writeToLog('Adding data to battle history....');
+      readline.cursorTo(process.stdout, 0);
+      misc.writeToLog(chalk.yellow(battlesList.length))
+      fs.writeFile(`data/newHistory.json`, JSON.stringify(battlesList), function (err) {
+        if (err) {
+          misc.writeToLog(err,'a'); rej(err);
+        }
+        readline.cursorTo(process.stdout, 0);
+        misc.writeToLog(chalk.green('Success adding data.....')); 
+        battlesList = [],
+        promises = []; 
+      });
+      res(battlesList)
+    });
+  }) })
+
+
+exports.battlesList = battles;

autogather-manual/.env-example

@@ -0,0 +1,10 @@
+MINUTES_GATHER_INTERVAL=10
+#account name shouldn't have any spaces. ex: username1,username2
+ACCOUNT=
+#max size is 499999KB
+SIZE_LIMIT=
+#file name should end with .json ex: data.json
+FILE_NAME= 
+
+
+