fix: 推送展示html标签

Author: ximing

apps/client/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/main/index.ts","./src/preload/index.ts"],"version":"5.9.3"}
+{"root":["./src/main/index.ts","./src/preload/index.ts"],"errors":true,"version":"5.9.3"}

apps/server/src/db/connection.ts

@@ -45,10 +45,8 @@ export function initializeDatabase() {
     queueLimit: 0,
     enableKeepAlive: true,
     keepAliveInitialDelay: 0,
-    // Connection timeout and retry settings
+    // Connection timeout settings
     connectTimeout: 10000, // 10 seconds
-    acquireTimeout: 10000, // 10 seconds
-    timeout: 60000, // 60 seconds for query execution
     // Automatically reconnect on connection loss
     maxIdle: 10, // Maximum idle connections
     idleTimeout: 60000, // Close idle connections after 60 seconds

apps/server/src/services/channels/daily-content.generator.ts

@@ -54,22 +54,11 @@ export class DailyContentGenerator implements ContentGenerator {
         const createdAt = memo.createdAt
           ? new Date(memo.createdAt).toLocaleDateString('zh-CN')
           : '';
-        return `
-        <div style="margin-bottom: 16px; padding: 12px; background: #f5f5f5; border-radius: 8px;">
-          <p style="color: #999; font-size: 12px; margin: 0 0 8px 0;">${createdAt}</p>
-          <p style="margin: 0; font-size: 14px; line-height: 1.6;">${this.escapeHtml(content)}</p>
-        </div>
-      `;
+        return `<div style="margin-bottom: 16px; padding: 12px; background: #f5f5f5; border-radius: 8px;"><p style="color: #999; font-size: 16px; margin: 0 0 8px 0;">${createdAt}</p><p style="margin: 0; font-size: 16px; line-height: 1.6;">${this.escapeHtml(content)}</p></div>`;
       })
       .join('');
 
-    const message = `
-      <div style="font-size: 14px; line-height: 1.6;">
-        ${memoItems}
-      </div>
-    `;
-
-    return { title, msg: message, isHtml: true };
+    return { title, msg: memoItems, isHtml: true };
   }
 
   /**
@@ -112,22 +101,11 @@ export class DailyContentGenerator implements ContentGenerator {
             })
           : '';
 
-        return `
-        <div style="margin-bottom: 12px; padding: 8px; background: #f5f5f5; border-radius: 6px;">
-          <p style="color: #999; font-size: 12px; margin: 0 0 4px 0;">${createdAt}</p>
-          <p style="margin: 0;">${this.escapeHtml(content)}</p>
-        </div>
-      `;
+        return `<div style="margin-bottom: 12px; padding: 8px; background: #f5f5f5; border-radius: 6px;"><p style="color: #999; font-size: 16px; margin: 0 0 4px 0;">${createdAt}</p><p style="margin: 0;">${this.escapeHtml(content)}</p></div>`;
       })
       .join('');
 
-    const message = `
-      <div style="font-size: 14px; line-height: 1.6;">
-        ${memoItems}
-      </div>
-    `;
-
-    return { title, msg: message, isHtml: true };
+    return { title, msg: memoItems, isHtml: true };
   }
 
   /**
@@ -142,6 +120,6 @@ export class DailyContentGenerator implements ContentGenerator {
       "'": '&#x27;',
       '/': '&#x2F;',
     };
-    return text.replaceAll(/[&<>"'\/]/g, (char) => htmlEscapes[char] || char);
+    return text.replaceAll(/[&<>"'/]/g, (char) => htmlEscapes[char] || char);
   }
 }

apps/server/src/services/channels/meow.channel.ts

@@ -1,5 +1,3 @@
-import { Service } from 'typedi';
-
 import { logger } from '../../utils/logger.js';
 
 import type { PushChannel, PushChannelOptions } from './push-channel.interface.js';
@@ -25,17 +23,36 @@ export class MeowChannel implements PushChannel {
   async send(options: PushChannelOptions): Promise<void> {
     try {
       const messageType = this.config.msgType || 'text';
-      const response = await fetch(`${this.apiUrl}/${this.config.nickname}`, {
+
+      // Build URL with query parameters (msgType and htmlHeight go in URL, not body)
+      const url = new URL(`${this.apiUrl}/${this.config.nickname}`);
+      url.searchParams.set('msgType', messageType.toLowerCase());
+
+      // Add htmlHeight parameter when msgType is html
+      if (messageType === 'html' && this.config.htmlHeight) {
+        url.searchParams.set('htmlHeight', this.config.htmlHeight.toString());
+      }
+
+      // Request body only contains title, msg, and optional url
+      const requestBody: {
+        title: string;
+        msg: string;
+        url?: string;
+      } = {
+        title: options.title,
+        msg: options.msg,
+        url: options.url,
+      };
+
+      logger.info(`MeoW request URL: ${url.toString()}`);
+      logger.info(`MeoW request body:`, JSON.stringify(requestBody, undefined, 2));
+
+      const response = await fetch(url.toString(), {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
         },
-        body: JSON.stringify({
-          msgType: messageType.toLocaleLowerCase(),
-          title: options.title,
-          msg: options.msg,
-          url: options.url,
-        }),
+        body: JSON.stringify(requestBody),
       });
 
       if (!response.ok) {

apps/server/src/services/push-rule.service.ts

@@ -201,9 +201,16 @@ export class PushRuleService {
     for (const channelConfig of rule.channels) {
       try {
         const channel = this.channelFactory.getChannel(channelConfig);
+
+        // Format test message based on channel msgType
+        let testMessage = '这是一条测试消息，如果你能看到这条消息，说明推送配置正确！';
+        if (channelConfig.msgType === 'html') {
+          testMessage = '<p style="font-size: 14px; line-height: 1.6;">这是一条测试消息，如果你能看到这条消息，说明推送配置正确！</p>';
+        }
+
         await channel.send({
           title: '测试推送',
-          msg: '这是一条测试消息，如果你能看到这条消息，说明推送配置正确！',
+          msg: testMessage,
         });
         logger.info(`Test push sent for rule ${ruleId} via channel ${channelConfig.type}`);
       } catch (error) {

apps/server/src/services/scheduler.service.ts

@@ -153,10 +153,16 @@ export class SchedulerService {
       try {
         const content = await this.contentGenerator.generate(rule.contentType, rule.uid);
 
+        // If channel is text type and content is HTML, convert to plain text
+        let message = content.msg;
+        if (channelConfig.msgType === 'text' && content.isHtml) {
+          message = this.stripHtml(content.msg);
+        }
+
         const channel = this.channelFactory.getChannel(channelConfig);
         await channel.send({
           title: content.title,
-          msg: content.msg,
+          msg: message,
         });
         logger.info(`Push sent for rule ${rule.id} via channel ${channelConfig.type}`);
       } catch (error) {
@@ -169,6 +175,26 @@ export class SchedulerService {
     }
   }
 
+  /**
+   * Strip HTML tags and convert to plain text
+   */
+  private stripHtml(html: string): string {
+    return html
+      .replaceAll(/<\/div>/gi, '\n')
+      .replaceAll(/<\/p>/gi, '\n')
+      .replaceAll(/<br\s*\/?>/gi, '\n')
+      .replaceAll(/<[^>]+>/g, '')
+      .replaceAll(/&nbsp;/g, ' ')
+      .replaceAll(/&amp;/g, '&')
+      .replaceAll(/&lt;/g, '<')
+      .replaceAll(/&gt;/g, '>')
+      .replaceAll(/&quot;/g, '"')
+      .replaceAll(/&#x27;/g, "'")
+      .replaceAll(/&#x2F;/g, '/')
+      .replaceAll(/\n\s*\n/g, '\n\n')
+      .trim();
+  }
+
   /**
    * 停止所有定时任务
    */

apps/web/src/pages/settings/components/push-rule/push-rules-list.tsx

@@ -1,8 +1,9 @@
-import { useEffect } from 'react';
+import { useEffect, useState } from 'react';
 import { useService, view } from '@rabjs/react';
-import { Bell, Plus, Pencil, Trash2 } from 'lucide-react';
+import { Bell, Plus, Pencil, Trash2, Send } from 'lucide-react';
 import type { PushRuleDto, PushChannelConfigDto } from '@aimo/dto';
 import { PushRuleService } from './push-rule.service';
+import { toast } from '../../../../services/toast.service';
 
 interface PushRulesListProps {
   onAddRule: () => void;
@@ -11,6 +12,7 @@ interface PushRulesListProps {
 
 export const PushRulesList = view(({ onAddRule, onEditRule }: PushRulesListProps) => {
   const pushRuleService = useService(PushRuleService);
+  const [testingRuleId, setTestingRuleId] = useState<string | null>(null);
 
   useEffect(() => {
     pushRuleService.fetchRules();
@@ -25,6 +27,22 @@ export const PushRulesList = view(({ onAddRule, onEditRule }: PushRulesListProps
     await pushRuleService.deleteRule(ruleId);
   };
 
+  const handleTest = async (ruleId: string) => {
+    setTestingRuleId(ruleId);
+    try {
+      const result = await pushRuleService.testPush(ruleId);
+      if (result.success) {
+        toast.success(result.message || '测试消息已发送');
+      } else {
+        toast.error(`发送失败: ${result.message || '未知错误'}`);
+      }
+    } catch (error) {
+      toast.error(`发送失败: ${error instanceof Error ? error.message : '未知错误'}`);
+    } finally {
+      setTestingRuleId(null);
+    }
+  };
+
   if (pushRuleService.loading) {
     return (
       <div className="flex items-center justify-center py-8">
@@ -88,6 +106,14 @@ export const PushRulesList = view(({ onAddRule, onEditRule }: PushRulesListProps
                   </div>
                 </div>
                 <div className="flex items-center gap-2">
+                  <button
+                    onClick={() => handleTest(rule.id)}
+                    disabled={testingRuleId === rule.id}
+                    className="p-2 text-gray-500 hover:text-blue-600 dark:text-gray-400 dark:hover:text-blue-400 hover:bg-gray-100 dark:hover:bg-dark-700 rounded-lg transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
+                    title="测试推送"
+                  >
+                    <Send className={`w-4 h-4 ${testingRuleId === rule.id ? 'animate-pulse' : ''}`} />
+                  </button>
                   <button
                     onClick={() => onEditRule(rule)}
                     className="p-2 text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 hover:bg-gray-100 dark:hover:bg-dark-700 rounded-lg transition-colors"