Merge pull request #2 from frkn-dev/site-integration

Site integration

Author: the2pizza

package-lock.json

@@ -27,6 +27,7 @@
     "axios": "^1.10.0",
     "dotenv": "^16.5.0",
     "express": "^5.1.0",
+    "js-sha3": "0.9.3",
     "qr-image": "^3.2.0",
     "qrcode": "^1.5.4",
     "telegraf": "^4.16.3"

package.json

@@ -1,7 +1,7 @@
 import * as dotenv from "dotenv";
 import express from "express";
 import { Telegraf, TelegramError } from "telegraf";
-import { statHandler } from "./handlers";
+import { awaitingMnemonic, siteHandler, statHandler } from "./handlers";
 import { handleInboundCallback } from "./handlers/callback/inbound";
 import { handleProtoCallback } from "./handlers/callback/proto";
 import { handleSubscriptionCallback } from "./handlers/callback/sub";
@@ -16,7 +16,7 @@ import { scoreHandler } from "./handlers/score";
 import { startHandler } from "./handlers/start";
 import { subHandler } from "./handlers/sub";
 import { BotState } from "./state";
-import QRCode from "qrcode";
+import { connectWithMnemonic } from "./site";
 
 dotenv.config();
 
@@ -31,7 +31,7 @@ const missingVars = requiredEnvVars.filter((varName) => !process.env[varName]);
 
 if (missingVars.length > 0) {
   throw new Error(
-    `Missing required environment variables: ${missingVars.join(", ")}`,
+    `Missing required environment variables: ${missingVars.join(", ")}`
   );
 }
 
@@ -51,7 +51,7 @@ const botState = new BotState(
   API_AUTH_TOKEN,
   GOOGLE_SCRIPT_URL,
   TOKEN,
-  ADMIN_CHAT_ID,
+  ADMIN_CHAT_ID
 );
 
 const app = express();
@@ -114,6 +114,7 @@ process.on("SIGTERM", () => gracefulShutdown("SIGTERM"));
   bot.command("connect", (ctx) => connectHandler(ctx, botState));
   bot.command("sub", (ctx) => subHandler(ctx, botState));
   bot.command("stat", (ctx) => statHandler(ctx, botState));
+  bot.command("site", (ctx) => siteHandler(ctx, botState));
   bot.command("delete", (ctx) => deleteHandler(ctx, botState));
   bot.command("stop", (ctx) => deleteHandler(ctx, botState));
   bot.command("status", (ctx) => scoreHandler(ctx, botState));
@@ -122,6 +123,7 @@ process.on("SIGTERM", () => gracefulShutdown("SIGTERM"));
 
   // Text message handler
   bot.on("text", async (ctx) => {
+    const userId = ctx.from.id;
     const message = ctx.message.text;
 
     // Handle feedback messages first
@@ -130,6 +132,35 @@ process.on("SIGTERM", () => gracefulShutdown("SIGTERM"));
       return;
     }
 
+    // Handle site command
+    if (awaitingMnemonic[userId]) {
+      awaitingMnemonic[userId] = false; // reset
+
+      const words = message.trim().split(/\s+/);
+      if (words.length !== 12) {
+        return ctx.reply(
+          "Фраза должна содержать 12 слов. Попробуйте ещё раз командой /site"
+        );
+      }
+
+      try {
+        const data = await connectWithMnemonic(message.trim());
+        if (typeof data === "string") {
+          await ctx.reply(data);
+        } else {
+          await ctx.reply(
+            `Ваша ссылка: <code>${data.subscription_url}</code>`,
+            { parse_mode: "HTML" }
+          );
+        }
+      } catch (err) {
+        console.error("Ошибка в siteHandler:", err);
+        await ctx.reply("Ошибка при обработке фразы.");
+      } finally {
+        return;
+      }
+    }
+
     // Handle unknown commands
     if (message.startsWith("/")) {
       await ctx.reply(
@@ -139,8 +170,9 @@ process.on("SIGTERM", () => gracefulShutdown("SIGTERM"));
           "• /sub - Управление подпиской\n" +
           "• /status - Проверить статус\n" +
           "• /stat - Статистика\n" +
+          "• /site - Если оплачивали подписку на сайте\n" +
           "• /support - Поддержка и обратная связь\n" +
-          "• /delete - Удалить аккаунт",
+          "• /delete - Удалить аккаунт"
       );
     }
   });
@@ -218,7 +250,7 @@ process.on("SIGTERM", () => gracefulShutdown("SIGTERM"));
       `  Domain: ${DOMAIN}\n` +
       `  Port: ${PORT}\n` +
       `  Webhook path: ${WEBHOOK_PATH}\n` +
-      `  Environment: ${process.env.NODE_ENV || "development"}`,
+      `  Environment: ${process.env.NODE_ENV || "development"}`
   );
 })().catch((err) => {
   console.error("[STARTUP] Fatal error during startup:", err);

src/bot.ts

@@ -1,4 +1,5 @@
 export * from "./connect";
 export * from "./start";
+export * from "./site";
 export * from "./stat";
 export * from "./sub";

src/handlers/index.ts

@@ -0,0 +1,21 @@
+import { Context } from "telegraf";
+import { BotState } from "../state";
+
+export const awaitingMnemonic: Record<number, boolean> = {};
+
+export const siteHandler = async (ctx: Context, botState: BotState) => {
+  const user = ctx.from;
+
+  if (!user) {
+    return ctx.reply("/start для начала");
+  }
+
+  const userEntry = await botState.findUserByTelegramId(user.id);
+
+  if (!userEntry || userEntry.is_deleted) {
+    return ctx.reply("Для начала /start");
+  }
+
+  awaitingMnemonic[ctx.from.id] = true;
+  return ctx.reply("Введите вашу мнемоническую фразу (12 слов):");
+};

src/handlers/site.ts

@@ -28,6 +28,7 @@ export const startHandler = async (ctx: Context, botState: BotState) => {
     "🔗 /connect \\- Получить VPN\\-ключ",
     "📈 /status \\- Проверить статус серверов/нагрузка",
     "💎 /sub \\- Подписочная ссылка",
+    "🌐 /site \\- Если оплачивали подписку на сайте",
     "🆘 /support \\- Помощь и поддержка",
     "💬 /feedback \\- Оставить отзыв",
   ].join("\n");

src/handlers/start.ts

@@ -0,0 +1,38 @@
+import axios from "axios";
+import { sha3_512 } from "js-sha3";
+import { ActiveConnection, LoginResponse } from "./types";
+
+const SITE_URL = process.env.SITE_URL || "https://frkn.org";
+
+export async function connectWithMnemonic(
+  mnemonic: string
+): Promise<string | ActiveConnection> {
+  const passwordHash = sha3_512(mnemonic);
+
+  try {
+    const loginResp = await axios.post<LoginResponse>(
+      SITE_URL + "/api/login",
+      { password: passwordHash },
+      { headers: { "Content-Type": "application/json" } }
+    );
+
+    if (loginResp.data.status === "error") {
+      return loginResp.data.message;
+    }
+
+    const connectResp = await axios.get<ActiveConnection>(
+      SITE_URL + "/api/connect",
+      {
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: loginResp.data.token,
+        },
+      }
+    );
+
+    return connectResp.data as ActiveConnection;
+  } catch (error) {
+    console.error("connectWithMnemonic failed:", error);
+    return "Failed to connect to server. Please try again later.";
+  }
+}

src/site/index.ts

@@ -0,0 +1,31 @@
+interface ErrorResponse {
+  status: "error";
+  message: string;
+  cause?: {
+    name: string;
+    code?: string;
+    issues?: [];
+  };
+}
+
+interface SuccessResponse {
+  status: "success";
+  token: string;
+}
+
+export type LoginResponse = ErrorResponse | SuccessResponse;
+
+export type ActiveConnection = {
+  status: "active" | "inactive";
+  subscription_url: string;
+  ss_links: {
+    country: string;
+    link: string;
+  }[];
+  used_traffic: number;
+  limit: number | null;
+  limit_reset_strategy: string;
+  created_at: string;
+  expire: string | null;
+  online_at: string | null;
+};