Merge branch 'release/1.1.9.2'

Author: zill

README.md

@@ -23,14 +23,17 @@ v2-xBot is multi panel, serverless (cloudflare worker) bot to order management &
 
 # Get Started
 0) Create a cloudflare worker, KV namespace & bind to `db` variable
-1) Got to worker `settings`, `variables` section, and add following variables:
+1) Go to worker `settings`, `variables` section, and add following variables:
     - `adminId` : your Telegram Admin ID (get from [MyIdInfoBot](https://t.me/Myidinfobot)).
     - `botToken` : your Telegram bot token.
     - `tlgSupport` : your support Telegram username (Remember put `@` at the first).
 3) Download [Latest Version](https://github.com/javadib/v2-xbot/releases/latest/download/dist.zip)
 4) Extract `dist.zip` and replace whole `index.js` codes with default cloudflare worker code.
 4) Open `YOUR_WORKER.worker.dev/check` to check all variables are `✅ OK`.
+4) Open `YOUR_WORKER.worker.dev/seed` to save initial data.
+5) To enable Auto-Backup, first set values in bot management section, then Go to worker, `Triggers` tab, `Cron Triggers` section, and add cron trigger.
 5) Save and deploy worker and send a `GET ` request to `/webhook` path to register webhook of your bot. make sure you see `ok` in response.
+
 #
 ![1](./docs/images/register-result.png)
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "v2-xbot",
   "description": "A multi panel, serverless (cloudflare worker) bot to order management & VPN Accounting",
-  "version": "1.1.9.0",
+  "version": "1.1.9.2",
   "author": "javadib",
   "repository": "https://github.com/javadib/v2-xbot.git",
   "scripts": {

src/index.js

@@ -33,6 +33,17 @@ const Logger = !enableLog || env === 'production' ? console : TlgBot;
 // const Logger = TlgBot;
 
 
+Object.prototype.requiredProps = function (required = []) {
+    let data = this;
+    let missingProps = required.filter(p => !data.hasOwnProperty(p));
+
+    let error = missingProps.length >= 1 ?
+        {ok: false, error: {message: "this props is required.", required: missingProps}} : undefined;
+
+    return error;
+}
+
+
 Object.prototype.transform = function (text) {
     let keys = Object.keys(this);
 
@@ -65,6 +76,16 @@ Array.prototype.ToTlgButtons = async function ({idKey, textKey}, prevCmd, addBac
 }
 
 
+addEventListener("scheduled", async (event) => {
+    try {
+        event.waitUntil(doBackup(event));
+    } catch (e) {
+        let text = e?.stack || e?.message || JSON.stringify(e);
+        return await TlgBot.sendToAdmin(text, [])
+    }
+});
+
+
 /**
  * Wait for requests to the worker
  */
@@ -590,6 +611,27 @@ async function sendInvoice2(message, session, nextCmd) {
     ], {method: 'editMessageText', messageId: message.message_id})
 }
 
+async function doBackup(event, opt = {}) {
+    // console.log(`doBackup exec: ${new Date().toISOString()}`);
+
+    let backup = (await app.getBackupInfo({Logger: TlgBot})) || {};
+    // await TlgBot.sendToAdmin(`backup: ${JSON.stringify(backup)}`, [])
+
+    let requiredProps = backup.requiredProps(["chatId", "serverUrl"]);
+    if (requiredProps) {
+        return await TlgBot.sendToAdmin(app.keys.serverBackup.messages.notSet, [])
+    }
+
+    // await TlgBot.sendToAdmin(`backup.url: ${backup.serverUrl}`, []);
+
+    let res = await new Hiddify().takeBackup({serverUrl: backup.serverUrl}, {Logger});
+    let resText = await res.text();
+    // console.log(`takeBackup res: ${resText}`);
+
+    let fileName = `${new URL(backup.serverUrl).hostname}.json`;
+    return await TlgBot.sendDocument(backup.chatId, new Blob(Array.from(resText)), fileName)
+}
+
 async function setExtendAccount(message, order, opt = {}) {
     let chatId = message.chat_id || message.chat.id;
     let invoiceSess = {

src/models/admin.js

@@ -11,6 +11,7 @@ module.exports = {
             [{text: Command.list.manageServer.textIcon(), callback_data: Command.list.manageServer.id}],
             [{text: Command.list.managePayment.textIcon(), callback_data: Command.list.managePayment.id}],
             [{text: Command.list.changeWelcome.textIcon(), callback_data: Command.list.changeWelcome.id}],
+            [{text: Command.list.backupText.textIcon(), callback_data: Command.list.backupText.id}],
         ]
     },
 

src/models/app.js

@@ -1,15 +1,29 @@
 'use strict';
 
+import {BaseModel} from "./base-model";
+import {log} from "util";
+
 const Config = require('../config');
 
-class app {
+class app extends BaseModel {
     _db;
     dbKey = "app"
     keys = {
         seedCaliApp: {id: "seedCaliApp", default: false},
+        serverBackup: {
+            id: "serverBackup",
+            messages: {
+                notSet: `تنیظمات بکاپ گیری بدرستی انجام نشده. 
+لطفا در قسمت مدیریت آنها را اعمال کنید یا
+ برای غیر فعال کردن بکاپ خودکار، در تنظیمات کلودفلر، بخش Cron Triggers را پاک کنید`
+            }
+
+        },
     }
 
     constructor(db) {
+        super();
+
         this._db = db;
     }
 
@@ -43,6 +57,19 @@ class app {
     async saveCustomWelcome({db, input, message, usrSession, isAdmin}) {
         await this._db.update(this.dbKey, {[this.customWelcome]: input})
     }
+
+    async getBackupInfo(options = {}) {
+        let app = JSON.parse(await this._db.get(this.dbKey)) || {};
+        let data = app[this.keys.serverBackup.id] || {};
+
+        return data;
+    }
+
+    async setBackupInfo({db, input, message, usrSession, isAdmin}) {
+        let data = await this.parseInput(input);
+
+        await this._db.update(this.dbKey, {[this.keys.serverBackup.id]: data})
+    }
 }
 
 module.exports = app;

src/models/base-model.js

@@ -0,0 +1,31 @@
+"use strict";
+
+export class BaseModel {
+    constructor() {
+    }
+
+    toInput(obj, options = {}) {
+        let {separator = ':'} = options;
+        return Object.keys(obj).reduce((pv, cv, i) => {
+            pv += `${cv} ${separator} ${obj[cv]}\n`;
+
+            return pv;
+        }, '')
+    }
+
+    async parseInput(input, options = {}) {
+        let {separator = ':'} = options;
+
+        let result = input.split('\n').reduce((pv, cv, i) => {
+            let split = cv.split(separator);
+
+            if (split.length < 2) return pv;
+
+            pv[split[0].trim()] = split.slice(1).join(separator).trim();
+
+            return pv;
+        }, {})
+
+        return result;
+    }
+}

src/models/command.js

@@ -217,6 +217,54 @@ const Cmd = {
             "buttons": ["manage"]
         },
 
+        "backupText": {
+            "prevId": "manage",
+            "id": "backupText",
+            "title": "تنظیمات بکاپ",
+            "icon": `🚨`,
+            textIcon() {
+                return `${this.icon} ${this.title}`
+            },
+
+            "asButton": true,
+            "body": `🚨
+
+برای تهیه بکاپ، طبق الگوی زیر مشخصات سرور رو ثبت کنید:
+serverUrl: ${"آدرس سرور".replaceAll(" ", "_")} 
+chatId: ${"آیدی کانال/گروه/شخص".replaceAll(" ", "_")} 
+`,
+            "successText": ``,
+            "helpText": `
+توجه کنید فقط مقدار بعد از : رو تغییر بدید`,
+            "preFunc": "",
+            "nextId": "setBackupInfo",
+            "savedInSession": true,
+            "buttons": []
+        },
+        "setBackupInfo": {
+            "prevId": "manage",
+            "id": "setBackupInfo",
+            // "title": "ساخت پلن جدید",
+            // "icon": `📦 ➕`,
+            // textIcon() {
+            //     return `${this.icon} ${this.title}`
+            // },
+            "asButton": false,
+            "body": `✅ تنظیمات بکاپ با موفقیت ثبت شد.`,
+            "successText": ``,
+            "helpText": ``,
+            "preFunc": "app;setBackupInfo",
+            preFuncData() {
+                let [model, func] = this.preFunc.split(';');
+
+                return {model, func}
+            },
+            "nextId": "",
+            "savedInSession": true,
+            "resultInNew": true,
+            "buttons": ["manage"]
+        },
+
 
 
         "manage": {
@@ -235,7 +283,7 @@ const Cmd = {
             "helpText": ``,
             "preFunc": '',
             "nextId": "",
-            "buttons": ["managePlan", "manageServer", "managePayment", "manageClientApp", "changeWelcome"]
+            "buttons": ["managePlan", "manageServer", "managePayment", "manageClientApp", "changeWelcome", "backupText"]
         },
         "managePlan": {
             "prevId": "manage",

src/modules/hiddify.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const { v4: uuidv4 } = require('uuid');
+const {v4: uuidv4} = require('uuid');
 
 
 const wFetch = require("./wfetch");
@@ -28,8 +28,11 @@ module.exports = class Hiddify {
         return new wFetch().request(url, 'POST', raw, {"Content-Type": "application/json"});
     }
 
-    async extendAccount(messasage, order, plan, server, uid, options = {}) {
-        let data  = {
+    async extendAccount(message, order, plan, server, uid, options = {}) {
+        let url = new URL(`/hiddify/extend`, this.baseUrl);
+
+        //TODO: fixme
+        let data = {
             "baseUrl": server.url,
             "uuid": uuidv4(),
             "name": order.accountName,
@@ -51,4 +54,15 @@ module.exports = class Hiddify {
 
         return new wFetch().request(url, 'POST', data, {"Content-Type": "application/json"});
     }
+
+    async takeBackup(data, options = {}) {
+        let url = new URL("/hiddify/backup", this.baseUrl);
+
+        let raw = {
+            "baseUrl": data.serverUrl,
+        }
+
+        return new wFetch().request(url, 'POST', raw, {"Content-Type": "application/json"});
+    }
+
 }

src/modules/telegram.js

@@ -5,7 +5,7 @@ const Config = require('../config');
 module.exports = class Telegram {
     _token;
 
-    static instance =  new Telegram(Config.bot.token);
+    static instance = new Telegram(Config.bot.token);
 
     constructor(token) {
         this._token = token;
@@ -42,6 +42,24 @@ module.exports = class Telegram {
         }))).json()
     }
 
+    async sendDocument(chatId, file, fileName, caption, options = {}) {
+        let formData = new FormData();
+        formData.append("chat_id", chatId);
+        formData.append("document", file, fileName);
+
+        if (caption) {
+            formData.append("caption", caption);
+        }
+
+        let requestOptions = {
+            method: 'POST',
+            body: formData,
+            redirect: 'follow'
+        };
+
+        return await fetch(this.apiUrl('sendDocument'), requestOptions)
+    }
+
     /**
      * Send a message with a single button
      * `button` must be an button-object like `{ text: 'Button', callback_data: 'data'}`

wrangler-sample.toml

@@ -0,0 +1,10 @@
+name = "v2-xbot"
+compatibility_date = "2023-01-01"
+node_compat = true
+vars = { env = "staging", enableLog = "false", botToken = "YOUR_BOT_TOKEN", adminId = "YOUR_ADMIN_ID", tlgSupport = "@YOUR_SUUPORT_ID" }
+kv_namespaces = [
+    { binding = "db", id = "YOUR_KV_ID" },
+]
+[triggers]
+crons = ["0 */1 * * *"] # Auto-Backup cron job
+