Merge tag '1.1.8' into develop

v1.1.8-beta 1.1.8

Author: zill

README.md

@@ -21,14 +21,13 @@ 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) Download [Latest Version](https://github.com/javadib/v2-xbot/releases/latest/download/dist.zip)
-2) Extract `dist.zip` and open `index.js` with suitable editor.
-3) Edit `bot section` with your variables (search `config.js` in file):
-   - Replace `YOUR_BOT_NAME` with your bot name (Optional).
-   - Replace `11111111` with your Telegram Admin ID.
-   - Replace `@YOUR_SUPPORT_USERNAME` with your support Telegram username (Remember put `@` at the first).
-   - Replace `YOUR_BOT_TOKEN` with your Telegram bot token.
-4) Replace whole codes with default cloudflare worker code.
+1) Got to worker settings, variable 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`.
 5) Save and deploy worker and send a `GET ` request to `/registerWebhook` path to register webhook of your bot. make sure you see `ok` in response.
 #
 ![1](./docs/images/register-result.png)
@@ -40,13 +39,6 @@ v2-xBot is multi panel, serverless (cloudflare worker) bot to order management &
 
 
 
-# Custom Edition
-Under Development ...
-#
-
-
-
-
 
 #
 

src/config.js

@@ -7,7 +7,7 @@ const config = {
     },
     bot: {
         name: "V2xBot",
-        adminId: adminId,
+        adminId: Number(adminId),
         tlgSupport: tlgSupport,
         token: botToken,
         webHook: '/endpoint',

src/index.js

@@ -23,7 +23,8 @@ const WEBHOOK = Config.bot.webHook
 const SECRET = Config.bot.secret;
 
 const TlgBot = new Telegram(Config.bot.token);
-const env = typeof env !== 'undefined' && env ? env : "development";
+const env = typeof env !== 'undefined' && env ? env : "production";
+const enableLog = typeof enableLog !== 'undefined' ? enableLog : false;
 const Logger = !enableLog || env === 'production' ? console : TlgBot;
 
 
@@ -76,7 +77,7 @@ addEventListener('fetch', async event => {
         case WEBHOOK:
             event.respondWith(handleWebhook(event))
             break;
-        case '/registerWebhook':
+        case '/webhook':
             event.respondWith(registerWebhook(event, url, WEBHOOK, SECRET))
             break;
         case '/unRegisterWebhook':
@@ -139,7 +140,7 @@ async function onUpdate(update) {
 }
 
 async function check(event) {
-    let vars = `YOUR VARIABLES:
+    let vars = `CHECKING YOUR VARIABLES...
 
 adminId: ${typeof adminId !== 'undefined' && adminId ? '✅ OK' : '❌ NOT OK'},
 tlgSupport: ${typeof tlgSupport !== 'undefined' && tlgSupport ? '✅ OK' : '❌ NOT OK'},
@@ -158,6 +159,7 @@ async function registerWebhook(event, requestUrl, suffix, secret) {
     // https://core.telegram.org/bots/api#setwebhook
     const webhookUrl = `${requestUrl.protocol}//${requestUrl.hostname}${suffix}`
     const r = await (await fetch(TlgBot.apiUrl('setWebhook', {url: webhookUrl, secret_token: secret}))).json()
+
     return new Response('ok' in r && r.ok ? 'Ok' : JSON.stringify(r, null, 2))
 }
 
@@ -167,6 +169,7 @@ async function registerWebhook(event, requestUrl, suffix, secret) {
  */
 async function unRegisterWebhook(event) {
     const r = await (await fetch(TlgBot.apiUrl('setWebhook', {url: ''}))).json()
+
     return new Response('ok' in r && r.ok ? 'Ok' : JSON.stringify(r, null, 2))
 }