From 30d7f0e94cd81ab05ed7b3b269f26983ea421fbc Mon Sep 17 00:00:00 2001
From: tbxark <tbxark@outlook.com>
Date: Wed, 28 Aug 2024 17:12:12 +0800
Subject: [PATCH 1/8] =?UTF-8?q?chore:=20=E6=B7=BB=E5=8A=A0=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E8=B0=83=E8=AF=95=E7=BD=91=E9=A1=B5=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E6=8C=87=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore         |  1 -
 package.json       |  1 +
 plugins/.gitignore |  1 +
 plugins/index.html |  4 ++--
 vite.config.ts     | 10 +++++++++-
 5 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 plugins/.gitignore

diff --git a/.gitignore b/.gitignore
index e705b29c..ad08e406 100644
--- a/.gitignore
+++ b/.gitignore
@@ -150,6 +150,5 @@ out
 /config.json
 /wrangler.toml
 /wrangler-test.toml
-/plugins/interpolate.js
 /dist/index.cjs
 /dist/index.d.ts
diff --git a/package.json b/package.json
index a8904c74..4b688e6e 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
         "deploy:dist": "wrangler deploy",
         "deploy:build": "npm run build && wrangler deploy",
         "deploy:vercel": "vercel deploy --prod",
+        "deploy:plugin": "BUILD_MODE=plugins-page vite build && wrangler pages deploy plugins",
         "start:dist": "node dist/index.js",
         "start:local": "CONFIG_PATH=./config.json TOML_PATH=./wrangler.toml tsx src/adapter/local/index.ts",
         "start:debug": "wrangler dev --local",
diff --git a/plugins/.gitignore b/plugins/.gitignore
new file mode 100644
index 00000000..3e221292
--- /dev/null
+++ b/plugins/.gitignore
@@ -0,0 +1 @@
+/dist
\ No newline at end of file
diff --git a/plugins/index.html b/plugins/index.html
index d152cfba..5a982058 100644
--- a/plugins/index.html
+++ b/plugins/index.html
@@ -5,7 +5,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>ChatGPT-Telegram-Workers</title>
-  <script type="module" src="interpolate.js"></script>
+  <script type="module" src="dist/interpolate.js"></script>
   <style>
     body {
       font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
@@ -133,7 +133,7 @@ <h2>preview</h2>
 
   <script type="module">
 
-    import { interpolate } from './interpolate.js';
+    import { interpolate } from './dist/interpolate.js';
 
     function updatePreview() {
       const template = document.getElementById('template').value;
diff --git a/vite.config.ts b/vite.config.ts
index e1b11611..c302bccf 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -25,8 +25,15 @@ const plugins: Plugin[] = [
 ];
 
 let entry: string;
+let outDir = 'dist';
+let fileName = 'index';
 let formats: LibraryFormats[] = ['es'];
 switch (BUILD_MODE) {
+    case 'plugins-page':
+        entry = 'src/plugins/interpolate.ts';
+        fileName = 'interpolate';
+        outDir = 'plugins/dist';
+        break;
     case 'local':
         entry = 'src/adapter/local/index.ts';
         plugins.push(createDockerPlugin('dist'));
@@ -53,10 +60,11 @@ export default defineConfig({
         target: 'esnext',
         lib: {
             entry: path.resolve(__dirname, entry),
-            fileName: 'index',
+            fileName,
             formats,
         },
         minify: false,
+        outDir,
     },
     define: {
         ...versionDefine,

From 4382f76979411f6d158a5658c4b086310e3a9fd8 Mon Sep 17 00:00:00 2001
From: tbxark <tbxark@outlook.com>
Date: Wed, 28 Aug 2024 17:22:55 +0800
Subject: [PATCH 2/8] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9pages=E9=83=A8?=
 =?UTF-8?q?=E7=BD=B2=E6=8C=87=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4b688e6e..79141852 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
         "deploy:dist": "wrangler deploy",
         "deploy:build": "npm run build && wrangler deploy",
         "deploy:vercel": "vercel deploy --prod",
-        "deploy:plugin": "BUILD_MODE=plugins-page vite build && wrangler pages deploy plugins",
+        "deploy:plugin": "BUILD_MODE=plugins-page vite build && wrangler pages deploy plugins --project-name=interpolate-test --branch=main",
         "start:dist": "node dist/index.js",
         "start:local": "CONFIG_PATH=./config.json TOML_PATH=./wrangler.toml tsx src/adapter/local/index.ts",
         "start:debug": "wrangler dev --local",

From b0a34752300877fc6beb2bd9c996cb0a1544efdb Mon Sep 17 00:00:00 2001
From: tbxark <tbxark@outlook.com>
Date: Wed, 28 Aug 2024 17:24:40 +0800
Subject: [PATCH 3/8] =?UTF-8?q?doc:=20=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/cn/PLATFORM.md | 2 +-
 doc/en/PLATFORM.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/cn/PLATFORM.md b/doc/cn/PLATFORM.md
index bc2cfce4..036fde53 100644
--- a/doc/cn/PLATFORM.md
+++ b/doc/cn/PLATFORM.md
@@ -7,7 +7,7 @@
 
 ### 2. [Vercel](https://vercel.com/)
 
-详情看[Vercel](VERCEL)。免费，无需域名，无需服务器。需要配置本地开发环境部署，不能通过复制粘贴部署。无存储服务，需要自己配置数据库。可以使用[Redis Cloud](https://redis.com)的免费redis。可以连接github自动部署，但是需要了解vercel的配置。
+详情看[Vercel](VERCEL.md)。免费，无需域名，无需服务器。需要配置本地开发环境部署，不能通过复制粘贴部署。无存储服务，需要自己配置数据库。可以使用[Redis Cloud](https://redis.com)的免费redis。可以连接github自动部署，但是需要了解vercel的配置。
 
 
 ### 3. Local
diff --git a/doc/en/PLATFORM.md b/doc/en/PLATFORM.md
index a6141294..621dbeec 100644
--- a/doc/en/PLATFORM.md
+++ b/doc/en/PLATFORM.md
@@ -8,7 +8,7 @@ The easiest way, the deployment method supported by this project by default, see
 
 ### 2. [Vercel](https://vercel.com/)
 
-See details at [Vercel](../cn/VERCEL). It is free, does not require a domain name or server. Deployment requires configuring the local development environment and cannot be done by copying and pasting. There is no storage service, so you need to configure your own database. You can use the free Redis from [Redis Cloud](https://redis.com). It can connect to GitHub for automatic deployment, but you need to understand Vercel's configuration.
+See details at [Vercel](VERCEL.md). It is free, does not require a domain name or server. Deployment requires configuring the local development environment and cannot be done by copying and pasting. There is no storage service, so you need to configure your own database. You can use the free Redis from [Redis Cloud](https://redis.com). It can connect to GitHub for automatic deployment, but you need to understand Vercel's configuration.
 
 ### 3. Local
 

From 0563da4535042c8b277968f2c5305aae461fcd47 Mon Sep 17 00:00:00 2001
From: tbxark <tbxark@outlook.com>
Date: Wed, 28 Aug 2024 17:55:36 +0800
Subject: [PATCH 4/8] =?UTF-8?q?doc:=20=E6=B7=BB=E5=8A=A0vercel=E4=B8=80?=
 =?UTF-8?q?=E9=94=AE=E9=83=A8=E7=BD=B2=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/cn/VERCEL.md            | 8 ++++++++
 doc/en/VERCEL.md            | 9 +++++++++
 src/adapter/vercel/index.ts | 1 -
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/doc/cn/VERCEL.md b/doc/cn/VERCEL.md
index 1b7f385c..a5d2c4ee 100644
--- a/doc/cn/VERCEL.md
+++ b/doc/cn/VERCEL.md
@@ -2,6 +2,13 @@
 
 `/src/adapter/vercel`中提供了示例代码，可以完成Vercel部署，和基础的功能测试。但是无法保证所有功能都能正常工作。
 
+### 自动部署
+
+[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2FTBXark%2FChatGPT-Telegram-Workers&env=UPSTASH_REDIS_REST_URL,UPSTASH_REDIS_REST_TOKEN,VERCEL_DOMAIN,TELEGRAM_AVAILABLE_TOKENS&project-name=chatgpt-telegram-workers&repository-name=ChatGPT-Telegram-Workers&demo-title=ChatGPT-Telegram-Workers&demo-description=Deploy%20your%20own%20Telegram%20ChatGPT%20bot%20on%20Cloudflare%20Workers%20with%20ease.&demo-url=https%3A%2F%2Fchatgpt-telegram-workers.vercel.app)
+
+
+### 手动部署
+
 ```shell
 yarn global add vercel   # 安装vercel命令行工具
 yarn                     # 安装依赖
@@ -11,4 +18,5 @@ yarn run deploy:vercel   # 部署到vercel
 ```
 
 ### 已知问题
+
 1. redis 连接关闭有问题会导致客户端连接数过多导致无法连接建议使用upstash的redis服务
\ No newline at end of file
diff --git a/doc/en/VERCEL.md b/doc/en/VERCEL.md
index ef37ace6..cf4fda4c 100644
--- a/doc/en/VERCEL.md
+++ b/doc/en/VERCEL.md
@@ -2,6 +2,14 @@
 
 The `/src/adapter/vercel` provides sample code that can complete Vercel deployment and basic functional testing. However, it cannot guarantee that all functions will work properly.
 
+
+### Automatic deployment
+
+[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2FTBXark%2FChatGPT-Telegram-Workers&env=UPSTASH_REDIS_REST_URL,UPSTASH_REDIS_REST_TOKEN,VERCEL_DOMAIN,TELEGRAM_AVAILABLE_TOKENS&project-name=chatgpt-telegram-workers&repository-name=ChatGPT-Telegram-Workers&demo-title=ChatGPT-Telegram-Workers&demo-description=Deploy%20your%20own%20Telegram%20ChatGPT%20bot%20on%20Cloudflare%20Workers%20with%20ease.&demo-url=https%3A%2F%2Fchatgpt-telegram-workers.vercel.app)
+
+
+### Manual deployment
+
 ```shell
 yarn global add vercel   # Install the Vercel command-line tool.
 yarn                     # Install dependencies.
@@ -11,4 +19,5 @@ yarn run deploy:vercel   # Deploy to Vercel.
 ```
 
 ### Known issue.
+
 1. There is a problem with closing Redis connections, which can cause too many client connections and make it impossible to connect. It is recommended to use Upstash's Redis service.
\ No newline at end of file
diff --git a/src/adapter/vercel/index.ts b/src/adapter/vercel/index.ts
index 224fc755..24aa6a0a 100644
--- a/src/adapter/vercel/index.ts
+++ b/src/adapter/vercel/index.ts
@@ -5,7 +5,6 @@ import { ENV } from '../../config/env';
 import { createRouter } from '../../route';
 
 export default async function (request: VercelRequest, response: VercelResponse) {
-    const redis: UpStashRedis | null = null;
     try {
         const {
             UPSTASH_REDIS_REST_URL,

From 1c5e838561ba593e5e22ae789dede42bf0dbad5e Mon Sep 17 00:00:00 2001
From: tbxark <tbxark@outlook.com>
Date: Wed, 28 Aug 2024 21:57:18 +0800
Subject: [PATCH 5/8] =?UTF-8?q?doc:=20fix=20=E6=8F=92=E4=BB=B6=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/README.md    | 2 +-
 plugins/README_CN.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/README.md b/plugins/README.md
index e798e2a5..a7aec275 100644
--- a/plugins/README.md
+++ b/plugins/README.md
@@ -80,7 +80,7 @@ For example, define the following variables in the environment variables:
 
 ```toml
 PLUGIN_COMMAND_dns = "https://raw.githubusercontent.com/TBXark/ChatGPT-Telegram-Workers/dev/plugins/dns.json"
-PLUGIN_COMMAND_DESCRIPTION_dns = "DNS query /dns <type> <domain>"
+PLUGIN_DESCRIPTION_dns = "DNS query /dns <type> <domain>"
 ```
 
 Then enter `/dns A www.baidu.com` in the command line to call the plugin.
diff --git a/plugins/README_CN.md b/plugins/README_CN.md
index 32bd36ec..08185f9b 100644
--- a/plugins/README_CN.md
+++ b/plugins/README_CN.md
@@ -78,7 +78,7 @@ export interface RequestTemplate {
 
 ```toml
 PLUGIN_COMMAND_dns = "https://raw.githubusercontent.com/TBXark/ChatGPT-Telegram-Workers/dev/plugins/dns.json"
-PLUGIN_COMMAND_DESCRIPTION_dns = "DNS查询 /dns <类型> <域名>"
+PLUGIN_DESCRIPTION_dns = "DNS查询 /dns <类型> <域名>"
 ```
 
 然后在命令行中输入`/dns A www.baidu.com`即可调用插件

From c2adeb27531c0ffdf1a54e0a88dd56044434eabb Mon Sep 17 00:00:00 2001
From: tbxark <tbxark@outlook.com>
Date: Wed, 28 Aug 2024 21:57:33 +0800
Subject: [PATCH 6/8] =?UTF-8?q?chore:=20vercel.json=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vercel.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vercel.json b/vercel.json
index 00140ff9..5631a738 100644
--- a/vercel.json
+++ b/vercel.json
@@ -1,4 +1,5 @@
 {
+    "buildCommand": "npm run build:vercel",
     "builds": [
         { "src": "dist/**", "use": "@vercel/node" }
     ],

From 8ea7c0f694331b985728633bb6f5093c8107a7b5 Mon Sep 17 00:00:00 2001
From: tbxark <tbxark@outlook.com>
Date: Thu, 29 Aug 2024 14:09:28 +0800
Subject: [PATCH 7/8] =?UTF-8?q?fix:=20telegram=20=E5=8F=91=E7=94=9F=20form?=
 =?UTF-8?q?=20=20=E8=AF=B7=E6=B1=82=20url=E6=8B=BC=E6=8E=A5=E9=94=99?=
 =?UTF-8?q?=E8=AF=AFBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json              | 2 +-
 src/telegram/api/index.ts | 2 +-
 yarn.lock                 | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 79141852..9ba00f6e 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
         "eslint-plugin-format": "^0.1.2",
         "rollup-plugin-cleanup": "^3.2.1",
         "rollup-plugin-node-externals": "^7.1.3",
-        "telegram-bot-api-types": "^7.9.10",
+        "telegram-bot-api-types": "^7.9.12",
         "tsx": "^4.19.0",
         "typescript": "^5.5.4",
         "vite": "^5.4.2",
diff --git a/src/telegram/api/index.ts b/src/telegram/api/index.ts
index 1bceab67..f011a21d 100644
--- a/src/telegram/api/index.ts
+++ b/src/telegram/api/index.ts
@@ -35,7 +35,7 @@ class APIClientBase {
                 formData.append(key, JSON.stringify(value));
             }
         }
-        return fetch(`${this.baseURL}bot${this.token}/${method}`, {
+        return fetch(`${this.baseURL}/bot${this.token}/${method}`, {
             method: 'POST',
             body: formData,
         });
diff --git a/yarn.lock b/yarn.lock
index 27db4a99..a3e4c5e6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4699,10 +4699,10 @@ tar@^6.0.2, tar@^6.1.11, tar@^6.1.2:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
-telegram-bot-api-types@^7.9.10:
-  version "7.9.10"
-  resolved "https://registry.yarnpkg.com/telegram-bot-api-types/-/telegram-bot-api-types-7.9.10.tgz#e519fa8ffec912cf0567025b83364d7905f74c2a"
-  integrity sha512-T8wwAxclKu5vT1HWKeHiLuotWN2WxBM3gM75zCUAZcEWMXuIuFBU15zq39jkgk6wz179UYKitvCMNsxgyfCE+w==
+telegram-bot-api-types@^7.9.12:
+  version "7.9.12"
+  resolved "https://registry.yarnpkg.com/telegram-bot-api-types/-/telegram-bot-api-types-7.9.12.tgz#0631d9e87d5190c21283415150f7b5f16af33cec"
+  integrity sha512-RM69ix6NdgTIxPFjqI5qO5AEGsMsc623AvsJPWjYHMvcTV9Zvx3/VBYCyTpMoVUSYy8NmQ9zQx0xUJVGAe14Dg==
 
 text-table@^0.2.0:
   version "0.2.0"

From 29df5dec6e0ee7fea22bcd5180352cb74c3e8ba0 Mon Sep 17 00:00:00 2001
From: tbxark <tbxark@outlook.com>
Date: Thu, 29 Aug 2024 14:12:05 +0800
Subject: [PATCH 8/8] build: 1.9.3 telegram send form request bug

---
 dist/buildinfo.json | 2 +-
 dist/index.js       | 6 +++---
 dist/timestamp      | 2 +-
 package.json        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dist/buildinfo.json b/dist/buildinfo.json
index 0ecf6f03..0822b3d6 100644
--- a/dist/buildinfo.json
+++ b/dist/buildinfo.json
@@ -1 +1 @@
-{"sha":"ef4e54b","timestamp":1724829578}
\ No newline at end of file
+{"sha":"8ea7c0f","timestamp":1724911785}
\ No newline at end of file
diff --git a/dist/index.js b/dist/index.js
index cbdcb083..7c64e0e3 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -212,8 +212,8 @@ const ENV_KEY_MAPPER = {
   WORKERS_AI_MODEL: "WORKERS_CHAT_MODEL"
 };
 class Environment extends EnvironmentConfig {
-  BUILD_TIMESTAMP = 1724829578 ;
-  BUILD_VERSION = "ef4e54b" ;
+  BUILD_TIMESTAMP = 1724911785 ;
+  BUILD_VERSION = "8ea7c0f" ;
   I18N = loadI18n();
   PLUGINS_ENV = {};
   USER_CONFIG = createAgentUserConfig();
@@ -1427,7 +1427,7 @@ class APIClientBase {
         formData.append(key, JSON.stringify(value));
       }
     }
-    return fetch(`${this.baseURL}bot${this.token}/${method}`, {
+    return fetch(`${this.baseURL}/bot${this.token}/${method}`, {
       method: "POST",
       body: formData
     });
diff --git a/dist/timestamp b/dist/timestamp
index 2d3f5c29..a4606dea 100644
--- a/dist/timestamp
+++ b/dist/timestamp
@@ -1 +1 @@
-1724829578
\ No newline at end of file
+1724911785
\ No newline at end of file
diff --git a/package.json b/package.json
index 9ba00f6e..87148e50 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "chatgpt-telegram-workers",
     "type": "module",
-    "version": "1.9.2",
+    "version": "1.9.3",
     "description": "The easiest and quickest way to deploy your own ChatGPT Telegram bot is to use a single file and simply copy and paste it. There is no need for any dependencies, local development environment configuration, domain names, or servers.",
     "author": "TBXark",
     "license": "MIT",