feat: ability to disable modules

Newmcpe · Newmcpe · commit 9cf9b2956476 · 2024-07-23T21:15:46.000+08:00
fix: launch in docker
chore: added README in english language
fix: default requirement fields if doesn't exists
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,4 @@ private/
 *.log
 *.tsbuildinfo
 .env
-config.json
+cfg
diff --git a/README.en.md b/README.en.md
@@ -0,0 +1,56 @@
+[<img src="https://img.shields.io/badge/Telegram-%40Me-orange">](https://t.me/Newmcpe)
+
+# fuflomuskempire
+
+Bot for automatically leveling up an account in Musk Empire
+
+## Modules
+
+| Модуль                                                                   | Статус |
+|--------------------------------------------------------------------------|:------:|
+| Auto-clicker                                                             |   ⌛    |
+| Purchase of the most cost-effective upgrades	                            |   ✅    |
+| Automatic collection of offline income (no need to log in every 3 hours) |   ✅    |
+| Automatic battles in PvP mode                                            |   ✅    |
+
+## Functionality
+
+| Функция                             | Статус |
+|-------------------------------------|:------:|
+| Включение и отключение модулей бота |   ✅    |
+| Настройка задержек                  |   ⌛    |
+
+## Launch
+
+Requirements:
+
+- [Node.js](https://nodejs.org/)
+- [pnpm](https://pnpm.io/)
+- [Docker](https://www.docker.com/)
+- Create a Telegram app [here](https://my.telegram.org/)
+
+### Without Docker
+
+```bash
+pnpm install
+copy .env-example .env # Specify the API_ID and API_HASH of your Telegram app
+pnpm start
+```
+
+### С Docker
+
+Add to environment variables
+```
+CONFIG_PATH=cfg/
+```
+
+Create a cfg folder inside the project and move your config, created during the launch without Docker, there. This action is necessary due to a bug in one of the libraries.
+
+Then run docker-compose
+```bash
+docker compose up -d
+```
+
+## Acknowledgment
+
+✨ If you liked the bot and want to support the author, you can do so by registering via the author's [referral link](https://t.me/muskempire_bot/game?startapp=hero277588744). Thank you :3 ❤️
diff --git a/README.md b/README.md
@@ -1,3 +1,7 @@
+[<img src="https://img.shields.io/badge/Telegram-%40Me-orange">](https://t.me/Newmcpe)
+[<img src="https://img.shields.io/badge/Language-English-red?style=flat">](https://github.com/Newmcpe/fuflomuskempire/blob/master/README.en.md)
+
+
 # fuflomuskempire
 
 Бот, автоматически прокачивающий аккаунт в Musk Empire
@@ -9,20 +13,49 @@
 | Автокликер                                                           |   ⌛    |
 | Покупка наиболее выгодных улучшений                                  |   ✅    |
 | Автоматический сбор оффлайн-дохода (не нужно заходить каждые 3 часа) |   ✅    |
+| Автоматические сражения в PvP-режиме                                 |   ✅    |
+
+## Функционал
+
+| Функция                             | Статус |
+|-------------------------------------|:------:|
+| Включение и отключение модулей бота |   ✅    |
+| Настройка задержек                  |   ⌛    |
 
 ## Запуск
 
 Требования:
 
 - [Node.js](https://nodejs.org/)
 - [pnpm](https://pnpm.io/)
+- [Docker](https://www.docker.com/)
 - Создать Telegram-приложение [здесь](https://my.telegram.org/)
 
+### Без Docker
+
 ```bash
 pnpm install
 copy .env-example .env # Укажите API_ID и API_HASH своего приложения в Telegram
 pnpm start
 ```
 
+### С Docker
+
+Добавьте в переменные среды
+
+```
+CONFIG_PATH=cfg/
+```
+
+Создайте внутри проекта папку cfg и переместите туда свой конфиг, созданный при запуске без Docker. Такое действие необходимо из-за бага одной из библиотек.
+
+Далее запустите docker-compose
+
+```bash
+docker compose up -d
+```
+
 ## Благодарность
-✨ Если вам понравился бот и вы хотите поддержать автора, вы можете сделать это зарегистрировавшись по [реферальной ссылке](https://t.me/muskempire_bot/game?startapp=hero277588744) автора. Спасибо :3 ❤️
+
+✨ Если вам понравился бот и вы хотите поддержать автора, вы можете сделать это зарегистрировавшись
+по [реферальной ссылке](https://t.me/muskempire_bot/game?startapp=hero277588744) автора. Спасибо :3 ❤️
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -8,7 +8,4 @@ services:
       - .env
     volumes:
       - ./bot-data:/app/bot-data
-      - ./.config.json.tmp:/app/.config.json.tmp
-      - type: bind
-        source: ./config.json
-        target: /app/config.json
+      - ./cfg:/app/cfg
diff --git a/src/index.ts b/src/index.ts
@@ -1,14 +1,42 @@
 import enquirer from 'enquirer';
 import { JSONFileSyncPreset } from 'lowdb/node';
 import { setupNewAccount } from './onboarding.js';
-import { Config, defaultConfig } from './util/config-schema.js';
+import {
+    Config,
+    defaultConfig,
+    defaultMuskEmpireAccount,
+    MuskEmpireAccount,
+} from './util/config-schema.js';
 import { startHeartbeat } from 'modules/heartbeat.js';
 import axios from 'axios';
 import * as process from 'node:process';
-export const storage = JSONFileSyncPreset<Config>('config.json', defaultConfig);
+
+export const storage = JSONFileSyncPreset<Config>(
+    process.env.CONFIG_PATH + 'config.json',
+    defaultConfig
+);
+// storage.update((data) => {
+//     Object.entries(data.accounts).forEach(([key, account]) => {
+//         Object.keys(defaultMuskEmpireAccount).forEach((defaultKey) => {
+//             const keyOfAccount = defaultKey as keyof MuskEmpireAccount;
+//
+//             // Check if the current key is undefined in the account
+//             if (account[keyOfAccount] === undefined) {
+//                 // If undefined, assign the value from defaultMuskEmpireAccounts
+//                 account[keyOfAccount] = defaultMuskEmpireAccount[
+//                     keyOfAccount
+//                 ] as any;
+//             }
+//         });
+//         // Update the account in storage
+//         data.accounts[key] = account;
+//     });
+// });
+
 if (!storage.data.accounts) {
     await setupNewAccount(true);
 }
+
 axios.interceptors.response.use(
     function (response) {
         // Any status code that lie within the range of 2xx cause this function to trigger
@@ -47,6 +75,7 @@ const menuResponse = !!process.env.ACTION
 
 switch (menuResponse.action) {
     case 'run':
+        console.log('запуск бота');
         await startHeartbeat();
         break;
     case 'add':
diff --git a/src/modules/heartbeat.ts b/src/modules/heartbeat.ts
@@ -10,6 +10,12 @@ import { combater } from './combater.js';
 
 const log = Logger.create('[HEARTBEAT]');
 
+const modules = {
+    upgrader: upgrader,
+    'offline-bonus-claimer': offlineBonusClaimer,
+    combater: combater,
+};
+
 export async function startHeartbeat() {
     for (const account of Object.values(storage.data.accounts)) {
         const authData = await getMuskEmpireApiKey(account.clientName);
@@ -20,9 +26,10 @@ export async function startHeartbeat() {
 
 async function accountHeartbeat(account: MuskEmpireAccount, apiKey: string) {
     try {
-        await offlineBonusClaimer(account, apiKey);
-        await upgrader(account, apiKey);
-        await combater(account, apiKey);
+        for (const module of account.modules) {
+            const key = module as keyof typeof modules;
+            await modules[key](account, apiKey);
+        }
     } catch (e) {
         log.error(
             Logger.color(account.clientName, Color.Cyan),
diff --git a/src/modules/upgrader.ts b/src/modules/upgrader.ts
@@ -29,7 +29,13 @@ export const upgrader = async (account: MuskEmpireAccount, apiKey: string) => {
             const requirement =
                 upgrade.levels.find(
                     (requirement) => requirement.level >= nextLevel
-                ) || upgrade.levels[upgrade.levels.length - 1];
+                ) || upgrade.levels.length > 0
+                    ? upgrade.levels[upgrade.levels.length - 1]
+                    : {
+                          requiredHeroLevel: 0,
+                          requiredFriends: 0,
+                          requiredSkills: {},
+                      };
 
             try {
                 return (
@@ -44,7 +50,6 @@ export const upgrader = async (account: MuskEmpireAccount, apiKey: string) => {
                 );
             } catch (e) {
                 console.log(e, upgrade);
-                process.exit(1);
             }
         })
         .reduce(
diff --git a/src/onboarding.ts b/src/onboarding.ts
@@ -3,7 +3,7 @@ import { BaseTelegramClientOptions, TelegramClient } from '@mtcute/node';
 import { API_HASH, API_ID } from './env.js';
 import { v4 as uuidv4 } from 'uuid';
 import { DC_MAPPING_PROD } from '@mtcute/convert';
-import { defaultHamsterAccount, Proxy } from './util/config-schema.js';
+import { defaultMuskEmpireAccount, Proxy } from './util/config-schema.js';
 import { toInputUser } from '@mtcute/node/utils.js';
 import { storage } from './index.js';
 import { authByTelegramWebApp } from './api/muskempire/musk-empire-api.js';
@@ -151,7 +151,7 @@ async function saveAccount(clientName: string) {
         data.accounts = {
             ...data.accounts,
             [clientName]: {
-                ...defaultHamsterAccount,
+                ...defaultMuskEmpireAccount,
                 clientName,
             },
         };
diff --git a/src/util/config-schema.ts b/src/util/config-schema.ts
@@ -12,6 +12,7 @@ export type Proxy = {
 export type MuskEmpireAccount = {
     clientName: string;
     currentCooldowns: Cooldowns;
+    modules: string[];
 };
 
 export type Cooldowns = {
@@ -24,11 +25,12 @@ export const defaultConfig: Config = {
     accounts: {},
 };
 
-export const defaultHamsterAccount = {
+export const defaultMuskEmpireAccount = {
     clientName: '',
     currentCooldowns: {
         noUpgradesUntil: 0,
         noOfflineBonusUntil: 0,
         noPvpUntil: 0,
     },
+    modules: ['upgrader', 'offline-bonus-claimer', 'combater'],
 };
