Merge pull request #29 from zpaeng/main

bestruirui · web-flow · commit aa6273a93f0f · 2025-11-14T23:36:38.000+08:00
创建tg通知
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -28,6 +28,10 @@ jobs:
       WEBHOOK_URL: ${{ vars.WEBHOOK_URL }}
       WEBHOOK_TYPE: ${{ vars.WEBHOOK_TYPE }}
       WEBHOOK_TEMPLATE: ${{ vars.WEBHOOK_TEMPLATE }}
+      TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
+      TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}
+      TELEGRAM_TEMPLATE: ${{ vars.TELEGRAM_TEMPLATE }}
+      TELEGRAM_TYPE: ${{ vars.TELEGRAM_TYPE }}
       
     steps:
       - name: 检出代码仓库 - Checkout repository
diff --git a/cloudflare-env.d.ts b/cloudflare-env.d.ts
@@ -12,6 +12,10 @@ declare namespace Cloudflare {
 		WEBHOOK_URL: "";
 		WEBHOOK_TYPE: "";
 		WEBHOOK_TEMPLATE: "";
+		TELEGRAM_BOT_TOKEN: string;
+		TELEGRAM_CHAT_ID: string;
+		TELEGRAM_TEMPLATE: string;
+		TELEGRAM_TYPE: string;
 		JWT_MIN_TTL: "300";
 		JWT_MAX_TTL: "6000";
 		USERNAME: string;
diff --git a/docs/deploy.md b/docs/deploy.md
@@ -56,9 +56,18 @@
 | `AUTO_DEL_TIME`         |  ❌  | 自动删除过期邮件时间,单位秒                            |
 | `JWT_MIN_TTL`           |  ❌  | JWT 最小 TTL,默认300s                                 |
 | `JWT_MAX_TTL`           |  ❌  | JWT 最大 TTL,默认6000s                                |
+| `TELEGRAM_TEMPLATE`     |  ❌  | Telegram 消息模板                                     |
+| `TELEGRAM_TYPE`         |  ❌  | Telegram 发送的邮件类型                               |
 
 ![](images/github_2.png)
 
+6. 如需使用Telegram Bot通知，还需添加以下 Secrets：
+
+| Secret 名称             | 必需 | 用途                                                  |
+| ----------------------- | :--: | ----------------------------------------------------- |
+| `TELEGRAM_BOT_TOKEN`    |  ❌  | Telegram Bot Token                                    |
+| `TELEGRAM_CHAT_ID`      |  ❌  | Telegram Chat ID                                      |
+
 
 
 **运行工作流**
@@ -153,4 +162,29 @@ WEBHOOK_TYPE=auth_code,auth_link,service_link,subscription_link,other_link
 注意 WebHook 模板 需要转义,下方是一个示例
 ```
 {\"text\":{\"content\":\"{{fromName}}  {{emailResult}}\"},\"msgtype\":\"text\",}
+```
+
+## Telegram Bot 通知
+
+`TELEGRAM_BOT_TOKEN` Telegram Bot Token
+
+`TELEGRAM_CHAT_ID` Telegram Chat ID
+
+`TELEGRAM_TYPE` Telegram 发送的邮件类型
+
+多种类型使用英文逗号分隔,示例
+
+```
+TELEGRAM_TYPE=auth_code,auth_link,service_link,subscription_link,other_link
+```
+
+`TELEGRAM_TEMPLATE` Telegram 消息模板
+
+模板支持的变量与WebHook相同，支持HTML格式，示例：
+```
+<b>新邮件通知</b>
+发件人: {fromName}
+标题: {title}
+类型: {emailType}
+结果: {emailResult}
 ```
diff --git a/docs/deploy_en.md b/docs/deploy_en.md
@@ -56,9 +56,18 @@ Copy to GitHub Secrets as `D1_DATABASE_ID`
 | `AUTO_DEL_TIME`         |    ❌    | Time for automatic deletion of expired emails, in seconds                            |
 | `JWT_MIN_TTL`           |    ❌    | JWT minimum TTL, defaults to 300s                                 |
 | `JWT_MAX_TTL`           |    ❌    | JWT maximum TTL, defaults to 6000s                                |
+| `TELEGRAM_TEMPLATE`     |    ❌    | Telegram message template                                          |
+| `TELEGRAM_TYPE`         |    ❌    | Email types for Telegram delivery                                 |
 
 ![](images/github_2.png)
 
+6. If you want to use Telegram Bot notifications, also add the following Secrets:
+
+| Secret Name             | Required | Purpose                                                  |
+| ----------------------- | :------: | ----------------------------------------------------- |
+| `TELEGRAM_BOT_TOKEN`    |    ❌    | Telegram Bot Token                                    |
+| `TELEGRAM_CHAT_ID`      |    ❌    | Telegram Chat ID                                      |
+
 **Run Workflow**
 1. Then manually run the workflow on the Actions page
 2. For future updates, just click the Sync Upstream button
@@ -152,4 +161,29 @@ Template supported variables
 Note: WebHook template needs to be escaped, here's an example
 ```
 {\"text\":{\"content\":\"{{fromName}}  {{emailResult}}\"},\"msgtype\":\"text\",}
+```
+
+## Telegram Bot Notification
+
+`TELEGRAM_BOT_TOKEN` Telegram Bot Token
+
+`TELEGRAM_CHAT_ID` Telegram Chat ID
+
+`TELEGRAM_TYPE` Email types for Telegram delivery
+
+Multiple types are separated by English commas, example
+
+```
+TELEGRAM_TYPE=auth_code,auth_link,service_link,subscription_link,other_link
+```
+
+`TELEGRAM_TEMPLATE` Telegram message template
+
+Template supports the same variables as WebHook and supports HTML format, example:
+```
+<b>New Email Notification</b>
+From: {fromName}
+Subject: {title}
+Type: {emailType}
+Result: {emailResult}
 ```
diff --git a/scripts/gen-config.js b/scripts/gen-config.js
@@ -20,6 +20,10 @@ const envVars = {
     WEBHOOK_URL: process.env.WEBHOOK_URL,
     WEBHOOK_TYPE: process.env.WEBHOOK_TYPE,
     WEBHOOK_TEMPLATE: process.env.WEBHOOK_TEMPLATE,
+    TELEGRAM_BOT_TOKEN: process.env.TELEGRAM_BOT_TOKEN,
+    TELEGRAM_CHAT_ID: process.env.TELEGRAM_CHAT_ID,
+    TELEGRAM_TEMPLATE: process.env.TELEGRAM_TEMPLATE,
+    TELEGRAM_TYPE: process.env.TELEGRAM_TYPE,
 };
 
 const configPath = path.join(__dirname, '..', 'wrangler.jsonc');
@@ -29,7 +33,7 @@ const configContent = fs.readFileSync(configPath, 'utf-8');
 const config = JSON.parse(configContent);
 
 if (config.vars) {
-    ['ENABLE_AI_EXTRACT', 'EXTRACT_MODEL', 'JWT_MIN_TTL', 'JWT_MAX_TTL', 'ENABLE_AUTO_DEL', 'AUTO_DEL_TYPE', 'AUTO_DEL_TIME', 'WEBHOOK_URL', 'WEBHOOK_TYPE', 'WEBHOOK_TEMPLATE']
+    ['ENABLE_AI_EXTRACT', 'EXTRACT_MODEL', 'JWT_MIN_TTL', 'JWT_MAX_TTL', 'ENABLE_AUTO_DEL', 'AUTO_DEL_TYPE', 'AUTO_DEL_TIME', 'WEBHOOK_URL', 'WEBHOOK_TYPE', 'WEBHOOK_TEMPLATE', 'TELEGRAM_BOT_TOKEN', 'TELEGRAM_CHAT_ID', 'TELEGRAM_TEMPLATE', 'TELEGRAM_TYPE']
         .forEach(key => {
             if (envVars[key]) config.vars[key] = envVars[key];
         });
diff --git a/src/lib/email/store.ts b/src/lib/email/store.ts
@@ -1,6 +1,7 @@
 import emailDB from "@/lib/db/email";
 import extract from "./extract";
 import sendWebhook from '@/lib/webhook/webhook'
+import sendTelegramMessage from '@/lib/telegram/telegram'
 import PostalMime from "postal-mime";
 import * as cheerio from 'cheerio';
 import type { Email, NewEmail } from "@/types";
@@ -77,6 +78,15 @@ export default async function storeEmail(
         if (env.WEBHOOK_URL && env.WEBHOOK_TEMPLATE && env.WEBHOOK_TYPE.split(',').includes(emailData.emailType)) {
             await sendWebhook(replaceTemplateAdvanced(env.WEBHOOK_TEMPLATE, res), env.WEBHOOK_URL);
         }
+
+        // 发送到Telegram Bot
+        if (env.TELEGRAM_BOT_TOKEN && env.TELEGRAM_CHAT_ID && env.TELEGRAM_TEMPLATE && env.TELEGRAM_TYPE && env.TELEGRAM_TYPE.split(',').includes(emailData.emailType)) {
+            await sendTelegramMessage(
+                replaceTemplateAdvanced(env.TELEGRAM_TEMPLATE, res),
+                env.TELEGRAM_BOT_TOKEN,
+                env.TELEGRAM_CHAT_ID
+            );
+        }
         console.log("Email stored successfully:", {
             id: res.id,
             messageId: emailData.messageId,
diff --git a/src/lib/telegram/telegram.ts b/src/lib/telegram/telegram.ts
@@ -0,0 +1,51 @@
+export interface TelegramMessage {
+    chat_id: string;
+    text: string;
+    parse_mode?: 'HTML' | 'Markdown' | 'MarkdownV2';
+}
+
+export default async function sendTelegramMessage(
+    message: string, 
+    botToken: string, 
+    chatId: string
+): Promise<void> {
+    if (!botToken || !chatId) {
+        console.error('Telegram error: Bot token and chat ID are required');
+        return;
+    }
+
+    const telegramApiUrl = `https://api.telegram.org/bot${botToken}/sendMessage`;
+    
+    const payload: TelegramMessage = {
+        chat_id: chatId,
+        text: message,
+        parse_mode: 'HTML'
+    };
+
+    try {
+        const controller = new AbortController();
+        const timeoutId = setTimeout(() => controller.abort(), 10000);
+        
+        const response = await fetch(telegramApiUrl, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify(payload),
+            signal: controller.signal
+        });
+
+        clearTimeout(timeoutId);
+
+        if (!response.ok) {
+            const errorText = await response.text();
+            console.error('Telegram API error:', response.status, errorText);
+            return;
+        }
+
+        const result = await response.json() as { message_id?: number };
+        console.log('Telegram message sent successfully:', result.message_id);
+    } catch (error) {
+        console.error('Telegram error:', error);
+    }
+}
diff --git a/wrangler.jsonc b/wrangler.jsonc
@@ -28,6 +28,10 @@
 		"WEBHOOK_URL": "",
 		"WEBHOOK_TYPE": "",
 		"WEBHOOK_TEMPLATE": "",
+		"TELEGRAM_BOT_TOKEN": "",
+		"TELEGRAM_CHAT_ID": "",
+		"TELEGRAM_TEMPLATE": "",
+		"TELEGRAM_TYPE": "",
 		"JWT_MIN_TTL": "300",
 		"JWT_MAX_TTL": "6000"
 	},
