Update from GitHub Actions

functions/utils/mail.ts

@@ -1,32 +1,60 @@
-import PostalMime from 'postal-mime';
+/**
+ * 去除HTML标签，保留纯文本内容
+ * @param html HTML字符串
+ * @returns 纯文本字符串
+ */
+function stripHtmlTags(html: string): string {
+  if (!html) return '';
+
+  // 去除HTML标签
+  let text = html.replace(/<[^>]*>/g, '');
+
+  // 解码HTML实体
+  text = text
+    .replace(/&nbsp;/g, ' ')
+    .replace(/&amp;/g, '&')
+    .replace(/&lt;/g, '<')
+    .replace(/&gt;/g, '>')
+    .replace(/&quot;/g, '"')
+    .replace(/&#39;/g, "'")
+    .replace(/&apos;/g, "'");
+
+  // 清理多余的空白字符
+  text = text
+    .replace(/\s+/g, ' ')  // 多个空格合并为一个
+    .replace(/\n\s*\n/g, '\n')  // 多个换行合并
+    .trim();  // 去除首尾空白
+
+  return text;
+}
 
 export async function get_access_token(tokenInfo: any, client_id: string, clientSecret: string) {
-    // 检查token是否过期（提前5分钟刷新）
-    const now = Date.now();
-    const expiryTime = tokenInfo.timestamp + (tokenInfo.expires_in * 1000);
-    const shouldRefresh = now >= (expiryTime - 300000); // 5分钟 = 300000毫秒
-    if (!shouldRefresh) {
-        return tokenInfo.access_token;
-    }
-    const response = await fetch('https://login.microsoftonline.com/common/oauth2/v2.0/token', {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/x-www-form-urlencoded'
-        },
-        body: new URLSearchParams({
-            'client_id': client_id,
-            'client_secret': clientSecret,
-            'grant_type': 'refresh_token',
-            'refresh_token': tokenInfo.refresh_token
-        })
-    });
-
-    if (!response.ok) {
-        const errorText = await response.text();
-        throw new Error(`HTTP error! status: ${response.status}, response: ${errorText}`);
-    }
-    const data = await response.json() as any;
-    return data.access_token;
+  // 检查token是否过期（提前5分钟刷新）
+  const now = Date.now();
+  const expiryTime = tokenInfo.timestamp + (tokenInfo.expires_in * 1000);
+  const shouldRefresh = now >= (expiryTime - 300000); // 5分钟 = 300000毫秒
+  if (!shouldRefresh) {
+    return tokenInfo.access_token;
+  }
+  const response = await fetch('https://login.microsoftonline.com/common/oauth2/v2.0/token', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    },
+    body: new URLSearchParams({
+      'client_id': client_id,
+      'client_secret': clientSecret,
+      'grant_type': 'refresh_token',
+      'refresh_token': tokenInfo.refresh_token
+    })
+  });
+
+  if (!response.ok) {
+    const errorText = await response.text();
+    throw new Error(`HTTP error! status: ${response.status}, response: ${errorText}`);
+  }
+  const data = await response.json() as any;
+  return data.access_token;
 }
 
 //https://learn.microsoft.com/zh-cn/graph/api/resources/mail-api-overview?view=graph-rest-1.0
@@ -64,9 +92,9 @@ interface ParsedEmail {
 }
 
 async function parseEmail(email: any): Promise<ParsedEmail> {
-  const parser = new PostalMime();
+
   let content = '';
-  
+
   try {
     if (email.body.content) {
       content = email.body.content;
@@ -74,8 +102,8 @@ async function parseEmail(email: any): Promise<ParsedEmail> {
       const response = await fetch(email.body.contentUrl);
       content = await response.text();
     }
-    
-    const parsed = await parser.parse(content);
+
+    //const parsed = await parser.parse(content);
 
     // 从HTML内容中提取元数据
     const htmlContent = email.body.content || '';
@@ -83,7 +111,11 @@ async function parseEmail(email: any): Promise<ParsedEmail> {
     const browserMatch = htmlContent.match(/Browser:\s*([^<\r\n]+)/);
     const ipMatch = htmlContent.match(/IP address:\s*([^<\r\n]+)/);
     const locationMatch = htmlContent.match(/Country\/region:\s*([^<\r\n]+)/);
-    
+
+    // 处理邮件文本内容，去除HTML标签
+    const rawText = email.body.content || email.bodyPreview || '';
+    const text = stripHtmlTags(rawText);
+
     return {
       id: email.id,
       subject: email.subject,
@@ -95,8 +127,8 @@ async function parseEmail(email: any): Promise<ParsedEmail> {
         sent: email.sentDateTime,
         modified: email.lastModifiedDateTime
       },
-      text: parsed.text || email.bodyPreview || '',
-      html: parsed.html || email.body.content || '',
+      text: text,
+      html: email.body.content || '',
       importance: email.importance,
       isRead: email.isRead,
       isDraft: email.isDraft,
@@ -125,7 +157,7 @@ async function parseEmail(email: any): Promise<ParsedEmail> {
         sent: email.sentDateTime,
         modified: email.lastModifiedDateTime
       },
-      text: email.bodyPreview || '',
+      text: stripHtmlTags(email.body.content || ''),
       html: email.body.content || '',
       importance: email.importance,
       isRead: email.isRead,
@@ -141,109 +173,109 @@ async function parseEmail(email: any): Promise<ParsedEmail> {
 }
 
 export async function getEmails(accessToken: string, limit = 50): Promise<ParsedEmail[]> {
-    const endpoint = 'https://graph.microsoft.com/v1.0/me/messages';
-    const response = await fetch(`${endpoint}?$top=${limit}`, {
-      method: 'GET',
-      headers: {
-        'Authorization': `Bearer ${accessToken}`,
-        'Content-Type': 'application/json'
-      }
-    });
-    
-    const data = await response.json() as any;
-    
-    if (!response.ok) {
-      throw new Error(`获取邮件失败: ${data.error?.message}`);
+  const endpoint = 'https://graph.microsoft.com/v1.0/me/messages';
+  const response = await fetch(`${endpoint}?$top=${limit}`, {
+    method: 'GET',
+    headers: {
+      'Authorization': `Bearer ${accessToken}`,
+      'Content-Type': 'application/json'
     }
-    const emails = data.value;
-    const parsedEmails = await Promise.all(emails.map(parseEmail));
-    return parsedEmails;
+  });
+
+  const data = await response.json() as any;
+
+  if (!response.ok) {
+    throw new Error(`获取邮件失败: ${data.error?.message}`);
   }
-  
-  /**
-   * 删除单个邮件
-   */
-  export async function deleteEmail(accessToken: string, emailId: string): Promise<void> {
-    const endpoint = `https://graph.microsoft.com/v1.0/me/messages/${emailId}`;
-    
-    const response = await fetch(endpoint, {
-      method: 'DELETE',
-      headers: {
-        'Authorization': `Bearer ${accessToken}`
-      }
-    });
-    
-    if (!response.ok) {
-      const errorData = await response.json() as any;
-      throw new Error(`删除邮件失败: ${errorData.error?.message}`);
+  const emails = data.value;
+  const parsedEmails = await Promise.all(emails.map(parseEmail));
+  return parsedEmails;
+}
+
+/**
+ * 删除单个邮件
+ */
+export async function deleteEmail(accessToken: string, emailId: string): Promise<void> {
+  const endpoint = `https://graph.microsoft.com/v1.0/me/messages/${emailId}`;
+
+  const response = await fetch(endpoint, {
+    method: 'DELETE',
+    headers: {
+      'Authorization': `Bearer ${accessToken}`
     }
+  });
+
+  if (!response.ok) {
+    const errorData = await response.json() as any;
+    throw new Error(`删除邮件失败: ${errorData.error?.message}`);
   }
-  
-  /**
-   * 清空邮箱 (批量删除邮件)
-   */
-  export async function emptyMailbox(accessToken: string, batchSize = 50): Promise<void> {
-    let hasMoreEmails = true;
-    let totalDeleted = 0;
-    
-    while (hasMoreEmails) {
-      // 获取一批邮件
-      const emails = await getEmails(accessToken, batchSize);
-      
-      if (emails.length === 0) {
-        hasMoreEmails = false;
-        break;
-      }
-      
-      // 删除该批次的每封邮件
-      const deletePromises = emails.map(email => deleteEmail(accessToken, email.id));
-      await Promise.all(deletePromises);
-      
-      totalDeleted += emails.length;
-      console.log(`已删除 ${emails.length} 封邮件，累计: ${totalDeleted}`);
+}
+
+/**
+ * 清空邮箱 (批量删除邮件)
+ */
+export async function emptyMailbox(accessToken: string, batchSize = 50): Promise<void> {
+  let hasMoreEmails = true;
+  let totalDeleted = 0;
+
+  while (hasMoreEmails) {
+    // 获取一批邮件
+    const emails = await getEmails(accessToken, batchSize);
+
+    if (emails.length === 0) {
+      hasMoreEmails = false;
+      break;
     }
-    
-    console.log('邮箱已清空');
+
+    // 删除该批次的每封邮件
+    const deletePromises = emails.map(email => deleteEmail(accessToken, email.id));
+    await Promise.all(deletePromises);
+
+    totalDeleted += emails.length;
+    console.log(`已删除 ${emails.length} 封邮件，累计: ${totalDeleted}`);
   }
-  
-  /**
-   * 发送邮件
-   */
-  export async function sendEmail(
-    accessToken: string, 
-    to: string[], 
-    subject: string, 
-    body: string, 
-    isHtml = false
-  ): Promise<void> {
-    const endpoint = 'https://graph.microsoft.com/v1.0/me/sendMail';
-    
-    const emailData = {
-      message: {
-        subject,
-        body: {
-          contentType: isHtml ? 'HTML' : 'Text',
-          content: body
-        },
-        toRecipients: to.map(recipient => ({
-          emailAddress: {
-            address: recipient
-          }
-        }))
-      }
-    };
-    
-    const response = await fetch(endpoint, {
-      method: 'POST',
-      headers: {
-        'Authorization': `Bearer ${accessToken}`,
-        'Content-Type': 'application/json'
+
+  console.log('邮箱已清空');
+}
+
+/**
+ * 发送邮件
+ */
+export async function sendEmail(
+  accessToken: string,
+  to: string[],
+  subject: string,
+  body: string,
+  isHtml = false
+): Promise<void> {
+  const endpoint = 'https://graph.microsoft.com/v1.0/me/sendMail';
+
+  const emailData = {
+    message: {
+      subject,
+      body: {
+        contentType: isHtml ? 'HTML' : 'Text',
+        content: body
       },
-      body: JSON.stringify(emailData)
-    });
-    
-    if (!response.ok) {
-      const errorData = await response.json() as any;
-      throw new Error(`发送邮件失败: ${errorData.error?.message}`);
+      toRecipients: to.map(recipient => ({
+        emailAddress: {
+          address: recipient
+        }
+      }))
     }
-  }
+  };
+
+  const response = await fetch(endpoint, {
+    method: 'POST',
+    headers: {
+      'Authorization': `Bearer ${accessToken}`,
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify(emailData)
+  });
+
+  if (!response.ok) {
+    const errorData = await response.json() as any;
+    throw new Error(`发送邮件失败: ${errorData.error?.message}`);
+  }
+}

package.json

@@ -20,7 +20,6 @@
 		"monaco-editor": "^0.52.2",
 		"pinia": "^3.0.1",
 		"playwright": "^1.51.0",
-		"postal-mime": "^2.4.3",
 		"tailwindcss": "^4.0.14",
 		"tdesign-vue-next": "^1.11.4",
 		"unstorage": "^1.15.0",

src/views/MailView.vue

@@ -7,7 +7,7 @@ const loading = ref(false);
 const pagination = ref({
     current: 1,
     total: 0,
-    pageSize: 18
+    pageSize: 15
 });
 
 const allData = ref<Account[]>([]);