Env renaming, vk bot initing.

Author: dmitriiprusakov

.eslintrc

@@ -48,7 +48,10 @@
     "rules": {
         "indent": [
             "error",
-            "tab"
+            "tab",
+            {
+                "SwitchCase": 1
+            }
         ],
         "linebreak-style": [
             "error",

src/adapters/bot/telegram/index.ts

@@ -6,7 +6,7 @@ import { Logger } from "winston";
 
 import initListeners from "./listeners";
 
-const BOT_TOKEN = process.env.BOT_TOKEN;
+const TELEGRAM_BOT_TOKEN = process.env.TELEGRAM_BOT_TOKEN;
 
 interface InitTelegramBot {
 	logger?: Logger,
@@ -17,7 +17,7 @@ interface InitTelegramBot {
 }
 
 const initTelegramBot = ({ logger, cache, messagesCache, repository = null, externals }: InitTelegramBot) => {
-	const bot = new TelegramBotApi(BOT_TOKEN, { polling: true });
+	const bot = new TelegramBotApi(TELEGRAM_BOT_TOKEN, { polling: true });
 
 	bot.setMyCommands([
 		{ command: "/start", description: "Начать" },

src/adapters/bot/telegram/listeners/callback-query/payment.ts

@@ -7,7 +7,7 @@ import { Logger } from "winston";
 
 import { payments } from "./payments-config";
 
-const YOOMONEY_TOKEN = process.env.YOOMONEY_TOKEN;
+const YOOMONEY_TELEGRAM_BOT_TOKEN = process.env.YOOMONEY_TELEGRAM_BOT_TOKEN;
 
 interface PaymentQueryParams {
 	bot: TelegramBot,
@@ -68,7 +68,7 @@ export const paymentQueryHandler = async ({ bot, query, cache, messagesCache, lo
 				selectedPayment.title,
 				selectedPayment.description,
 				JSON.stringify(selectedPayment.payload),
-				YOOMONEY_TOKEN,
+				YOOMONEY_TELEGRAM_BOT_TOKEN,
 				"RUB",
 				// @ts-ignore
 				selectedPayment.prices,

src/app.ts

@@ -5,13 +5,15 @@ import express from "express";
 import http from "http";
 
 import { initTelegramBot } from "./adapters/bot/telegram";
+import { initVkontakteBot } from "./adapters/bot/vkontakte";
 import { initExternalServices } from "./adapters/externals";
 import { FirestoreRepository } from "./adapters/repository";
 import initLogger from "./logger";
 import initRoutes from "./ports/http";
 import { Cache, MessagesCache } from "./types";
 
 const PORT = process.env.PORT || 8080;
+const BOT_TO_RUN = process.env.BOT_TO_RUN;
 const ASTRIA_IS_FAST_BRANCH = process.env.ASTRIA_IS_FAST_BRANCH;
 
 const app = express();
@@ -28,18 +30,28 @@ async function main() {
 	const server = http.createServer(app);
 
 	server.listen(PORT, () => {
-		logger.log({
-			level: "info",
-			message: `We are live on ${PORT}, ASTRIA_IS_FAST_BRANCH = ${!!ASTRIA_IS_FAST_BRANCH}`,
-		});
-
 		const repository = new FirestoreRepository({ logger });
 
 		const externals = initExternalServices();
 
-		const bot = initTelegramBot({ logger, cache, messagesCache, repository, externals });
+		switch (BOT_TO_RUN) {
+			case "telegram":
+				const telegramBot = initTelegramBot({ logger, cache, messagesCache, repository, externals });
+
+				initRoutes({ app, bot: telegramBot, logger });
+				break;
+			case "vkontakte":
+				const vkontakteBot = initVkontakteBot({ logger, cache, messagesCache, repository, externals });
 
-		initRoutes({ app, bot, logger });
+				break;
+			default:
+				throw new Error("NO VALID BOT_TO_RUN ENV PROVIDED!");
+		}
+
+		logger.log({
+			level: "info",
+			message: `We are live on ${PORT}, BOT_TO_RUN = ${BOT_TO_RUN}, ASTRIA_IS_FAST_BRANCH = ${!!ASTRIA_IS_FAST_BRANCH}`,
+		});
 	});
 }
 

src/common/i18n/index.ts

@@ -6,7 +6,7 @@ import path from "path";
 i18next
 	.use(FsBackend)
 	.init({
-		debug: process.env.DEBUG_I18NEXT === "true",
+		debug: !!process.env.DEBUG_I18NEXT,
 
 		initImmediate: false,
 

src/logger/index.ts

@@ -17,7 +17,7 @@ const initLogger = () => {
 		],
 	});
 
-	if (process.env.LOGGER_MODE === "test") {
+	if (!!process.env.LOGGER_TO_CONSOLE) {
 		logger.add(new transports.Console({
 			format: format.simple(),
 		}));