koishi-plugin-wordpress-notifier 2.9.1 → 2.9.3

package/lib/push.js

@@ -7,6 +7,7 @@ const crypto_1 = require("crypto");
 class PushService {
     constructor(ctx, config, storageService) {
         this.ctx = ctx;
+        this.atAllFrequencyMap = new Map(); // 记录每个群组的@全体成员时间
         this.config = config;
         this.storageService = storageService;
     }
@@ -19,7 +20,6 @@ class PushService {
         let retries = 0;
         while (retries <= maxRetries) {
             try {
-                // 发送前添加基础延迟，避免触发频率限制
                 if (retries > 0) {
                     await new Promise(resolve => setTimeout(resolve, 1000));
                 }
@@ -33,8 +33,7 @@ class PushService {
                     this.ctx.logger.error('Failed to send message after all retries:', error);
                     return false;
                 }
-                // 指数退避策略，增加基础延迟
-                const delay = Math.pow(2, retries) * 1500; // 增加到 1.5 秒基础延迟
+                const delay = Math.pow(2, retries) * 1500;
                 this.ctx.logger.info(`Waiting ${delay}ms before next retry`);
                 await new Promise(resolve => setTimeout(resolve, delay));
             }
@@ -44,47 +43,29 @@ class PushService {
     // 分段发送消息
     async sendMessageInParts(bot, targetId, message) {
         try {
-            // 消息分段阈值（根据实际适配器调整）
             const MAX_MESSAGE_LENGTH = 2000;
             if (message.length <= MAX_MESSAGE_LENGTH) {
-                // 消息长度在限制内，直接发送（带重试）
                 return await this.sendMessageWithRetry(bot, targetId, message);
             }
-            // 消息过长，需要分段
             const parts = [];
-            let currentPart = '';
-            let currentLength = 0;
-            // 按字符数分割消息，避免单段过长
-            for (let i = 0; i < message.length; i++) {
-                const char = message[i];
-                currentPart += char;
-                currentLength++;
-                // 当达到长度限制且遇到空格或标点时分割
-                if (currentLength >= MAX_MESSAGE_LENGTH - 50) { // 预留一些空间
-                    // 寻找最近的空格或标点符号
-                    let splitIndex = currentPart.length - 1;
-                    while (splitIndex > 0 && !/[\s，。！？；：,.!?;:]/.test(currentPart[splitIndex])) {
-                        splitIndex--;
-                    }
-                    if (splitIndex > 0) {
-                        // 从分割点断开
-                        parts.push(currentPart.substring(0, splitIndex + 1));
-                        currentPart = currentPart.substring(splitIndex + 1);
-                        currentLength = currentPart.length;
-                    }
-                    else {
-                        // 没有找到合适的分割点，强制分割
-                        parts.push(currentPart);
-                        currentPart = '';
-                        currentLength = 0;
+            let currentPosition = 0;
+            while (currentPosition < message.length) {
+                let endPosition = currentPosition + MAX_MESSAGE_LENGTH;
+                if (endPosition < message.length) {
+                    const searchStart = Math.max(currentPosition, endPosition - 200);
+                    let i = endPosition;
+                    while (i >= searchStart) {
+                        if (/[\s，。！？；：,.!?;:]/.test(message[i])) {
+                            endPosition = i + 1;
+                            break;
+                        }
+                        i--;
                     }
                 }
+                const part = message.substring(currentPosition, endPosition);
+                parts.push(part);
+                currentPosition = endPosition;
             }
-            // 添加最后一部分
-            if (currentPart) {
-                parts.push(currentPart);
-            }
-            // 发送所有部分
             let allSuccess = true;
             for (let i = 0; i < parts.length; i++) {
                 const partMessage = parts.length > 1
@@ -94,7 +75,6 @@ class PushService {
                 if (!success) {
                     allSuccess = false;
                 }
-                // 避免发送过快导致被限制
                 if (i < parts.length - 1) {
                     await new Promise(resolve => setTimeout(resolve, 1000));
                 }
@@ -107,67 +87,52 @@ class PushService {
         }
     }
     // 获取可用的机器人实例
-    getAvailableBot() {
+    getAvailableBot(targetId) {
         return this.ctx.bots[0] || null;
     }
-    // 验证群聊 ID 有效性
-    async validateGroupId(groupId) {
-        if (!groupId || typeof groupId !== 'string') {
-            this.ctx.logger.error('Invalid group ID format');
+    // 检查是否允许@全体成员
+    async isAtAllAllowed(groupId) {
+        if (!this.config.allowAtAll) {
             return false;
         }
-        // 支持多平台 ID 格式
-        // QQ: 纯数字字符串
-        // Telegram: 带-前缀的数字字符串
-        // Discord: 数字字符串
-        // 其他平台: 允许字母、数字、-、_ 组合
-        if (!/^[a-zA-Z0-9_-]+$/.test(groupId)) {
-            this.ctx.logger.error('Invalid group ID format, only letters, numbers, hyphens and underscores are allowed');
+        const now = Date.now();
+        const lastAtTime = this.atAllFrequencyMap.get(groupId);
+        if (lastAtTime && (now - lastAtTime) < 60 * 60 * 1000) {
+            this.ctx.logger.warn(`At-all mention frequency limit reached for group ${groupId}`);
             return false;
         }
-        // 可以添加更多验证逻辑，比如检查机器人是否在该群聊中
-        // ...
+        this.atAllFrequencyMap.set(groupId, now);
         return true;
     }
-    // 验证用户 ID 有效性
-    async validateUserId(userId) {
-        if (!userId || typeof userId !== 'string') {
-            this.ctx.logger.error('Invalid user ID format');
-            return false;
-        }
-        // 支持多平台 ID 格式
-        // QQ: 纯数字字符串
-        // Telegram: 带-前缀的数字字符串
-        // Discord: 数字字符串
-        // 其他平台: 允许字母、数字、-、_ 组合
-        if (!/^[a-zA-Z0-9_-]+$/.test(userId)) {
-            this.ctx.logger.error('Invalid user ID format, only letters, numbers, hyphens and underscores are allowed');
-            return false;
-        }
-        return true;
+    // 获取@全体成员消息段
+    getAtAllMessage(bot) {
+        return (0, koishi_1.h)('at', { type: 'all' });
     }
     // 推送新文章
     async pushNewArticle(article, groupId, enableAtAll = false) {
         try {
-            // 验证群聊 ID 有效性
-            if (!await this.validateGroupId(groupId)) {
+            if (!this.isPushTimeAllowed()) {
+                this.ctx.logger.info('Current time is not in allowed push time range');
                 return false;
             }
-            // 检查群聊推送配置
             const pushConfig = await this.storageService.getPushConfig(groupId);
             if (!pushConfig?.enabled) {
                 this.ctx.logger.info(`Push is disabled for group ${groupId}, skipping`);
                 return false;
             }
-            const bot = this.getAvailableBot();
+            const bot = this.getAvailableBot(groupId);
             if (!bot) {
                 this.ctx.logger.error('No available bot for pushing messages');
                 return false;
             }
-            // 发送文本消息
-            const textMessage = this.getNewArticleTemplate(article);
-            const finalMessage = enableAtAll && this.config.allowAtAll ? `@全体成员\n${textMessage}` : textMessage;
-            return await this.sendMessageInParts(bot, groupId, finalMessage);
+            const canAtAll = enableAtAll && await this.isAtAllAllowed(groupId);
+            const message = this.getPlatformCompatibleMessage(article, bot, false, canAtAll);
+            if (typeof message === 'string') {
+                return await this.sendMessageInParts(bot, groupId, message);
+            }
+            else {
+                return await this.sendMessageWithRetry(bot, groupId, message);
+            }
         }
         catch (error) {
             this.ctx.logger.error(`Failed to push new article to group ${groupId}:`, error);
@@ -177,24 +142,27 @@ class PushService {
     // 推送文章更新
     async pushArticleUpdate(article, groupId) {
         try {
-            // 验证群聊 ID 有效性
-            if (!await this.validateGroupId(groupId)) {
+            if (!this.isPushTimeAllowed()) {
+                this.ctx.logger.info('Current time is not in allowed push time range');
                 return false;
             }
-            // 检查群聊推送配置
             const pushConfig = await this.storageService.getPushConfig(groupId);
             if (!pushConfig?.enabled || !pushConfig?.enableUpdatePush) {
                 this.ctx.logger.info(`Update push is disabled for group ${groupId}, skipping`);
                 return false;
             }
-            const bot = this.getAvailableBot();
+            const bot = this.getAvailableBot(groupId);
             if (!bot) {
                 this.ctx.logger.error('No available bot for pushing messages');
                 return false;
             }
-            // 发送文本消息
-            const textMessage = this.getArticleUpdateTemplate(article);
-            return await this.sendMessageInParts(bot, groupId, textMessage);
+            const message = this.getPlatformCompatibleMessage(article, bot, true, false);
+            if (typeof message === 'string') {
+                return await this.sendMessageInParts(bot, groupId, message);
+            }
+            else {
+                return await this.sendMessageWithRetry(bot, groupId, message);
+            }
         }
         catch (error) {
             this.ctx.logger.error(`Failed to push article update to group ${groupId}:`, error);
@@ -204,24 +172,27 @@ class PushService {
     // 推送新用户注册
     async pushUserRegister(user, groupId) {
         try {
-            // 验证群聊 ID 有效性
-            if (!await this.validateGroupId(groupId)) {
+            if (!this.isPushTimeAllowed()) {
+                this.ctx.logger.info('Current time is not in allowed push time range');
                 return false;
             }
-            // 检查群聊推送配置
             const pushConfig = await this.storageService.getPushConfig(groupId);
             if (!pushConfig?.enabled) {
                 this.ctx.logger.info(`Push is disabled for group ${groupId}, skipping`);
                 return false;
             }
-            const bot = this.getAvailableBot();
+            const bot = this.getAvailableBot(groupId);
             if (!bot) {
                 this.ctx.logger.error('No available bot for pushing messages');
                 return false;
             }
-            // 发送文本消息
-            const textMessage = this.getUserRegisterTemplate(user);
-            return await this.sendMessageInParts(bot, groupId, textMessage);
+            const message = this.getPlatformCompatibleUserRegisterMessage(user, bot);
+            if (typeof message === 'string') {
+                return await this.sendMessageInParts(bot, groupId, message);
+            }
+            else {
+                return await this.sendMessageWithRetry(bot, groupId, message);
+            }
         }
         catch (error) {
             this.ctx.logger.error(`Failed to push user register to group ${groupId}:`, error);
@@ -231,22 +202,20 @@ class PushService {
     // 私聊推送
     async pushToUser(article, userId) {
         try {
-            // 验证用户 ID 有效性
-            if (!await this.validateUserId(userId)) {
+            if (!this.isPushTimeAllowed()) {
+                this.ctx.logger.info('Current time is not in allowed push time range');
                 return false;
             }
-            // 检查用户订阅状态
             const isSubscribed = await this.storageService.isUserSubscribed(userId, 'private');
             if (!isSubscribed) {
                 this.ctx.logger.info(`User ${userId} is not subscribed, skipping`);
                 return false;
             }
-            const bot = this.getAvailableBot();
+            const bot = this.getAvailableBot(userId);
             if (!bot) {
                 this.ctx.logger.error('No available bot for pushing messages');
                 return false;
             }
-            // 发送文本消息
             const textMessage = this.getNewArticleTemplate(article);
             return await this.sendMessageInParts(bot, userId, textMessage);
         }
@@ -255,145 +224,29 @@ class PushService {
             return false;
         }
     }
-    // 创建文章卡片
-    createArticleCard(article, isUpdate = false) {
-        const title = article.title?.rendered || '无标题';
-        const author = article.author_name || '未知作者';
-        const date = isUpdate ? new Date(article.modified).toLocaleString('zh-CN') : new Date(article.date).toLocaleString('zh-CN');
-        const excerpt = this.getExcerpt(article);
-        const link = article.link || this.config.wordpressUrl;
-        const type = isUpdate ? '更新' : '发布';
-        // 使用腾讯官方 ARK 卡片格式
-        try {
-            // 官方 ARK 卡片格式（使用模板 23：链接+文本列表模板）
-            return (0, koishi_1.h)('ark', {
-                template_id: 23,
-                kv: [
-                    {
-                        key: '#DESC#',
-                        value: isUpdate ? '文章更新通知' : '新文章推送'
-                    },
-                    {
-                        key: '#PROMPT#',
-                        value: 'WordPress 推送'
-                    },
-                    {
-                        key: '#TITLE#',
-                        value: title
-                    },
-                    {
-                        key: '#META_URL#',
-                        value: link
-                    },
-                    {
-                        key: '#META_LIST#',
-                        obj: [
-                            {
-                                obj_kv: [
-                                    {
-                                        key: '作者',
-                                        value: author
-                                    },
-                                    {
-                                        key: '时间',
-                                        value: date
-                                    }
-                                ]
-                            },
-                            {
-                                obj_kv: [
-                                    {
-                                        key: '摘要',
-                                        value: excerpt
-                                    }
-                                ]
-                            }
-                        ]
-                    }
-                ]
-            });
-        }
-        catch (arkError) {
-            this.ctx.logger.warn('ARK card failed, falling back to text format:', arkError);
-            // 降级到文本消息
-            return isUpdate ? this.getArticleUpdateTemplate(article) : this.getNewArticleTemplate(article);
-        }
-    }
-    // 检查平台是否支持卡片消息
-    isCardMessageSupported(bot) {
-        // 检查机器人平台是否为 QQ（支持 ARK 卡片）
-        return bot.platform === 'qq';
-    }
-    // 获取平台兼容的消息
+    // 获取平台兼容的消息（默认使用文本消息）
     getPlatformCompatibleMessage(article, bot, isUpdate = false, enableAtAll = false) {
-        // 检查平台是否支持卡片消息
-        if (this.isCardMessageSupported(bot)) {
-            // QQ 平台使用卡片消息
-            return this.createArticleCard(article, isUpdate);
+        try {
+            const textMessage = isUpdate ? this.getArticleUpdateTemplate(article) : this.getNewArticleTemplate(article);
+            if (enableAtAll) {
+                const atAllMessage = this.getAtAllMessage(bot);
+                return [atAllMessage, textMessage];
+            }
+            return textMessage;
         }
-        else {
-            // 其他平台使用文本消息
-            const template = isUpdate ? this.getArticleUpdateTemplate(article) : this.getNewArticleTemplate(article);
-            return enableAtAll && this.config.allowAtAll ? `@全体成员\n${template}` : template;
+        catch (error) {
+            this.ctx.logger.warn('Message creation failed:', error);
+            const textMessage = isUpdate ? this.getArticleUpdateTemplate(article) : this.getNewArticleTemplate(article);
+            return textMessage;
         }
     }
-    // 创建用户注册卡片
-    createUserRegisterCard(user) {
-        const username = user.name || '未知用户';
-        const registerDate = new Date(user.registered_date || new Date()).toLocaleString('zh-CN');
-        // 使用腾讯官方 ARK 卡片格式
+    // 获取平台兼容的用户注册消息（默认使用文本消息）
+    getPlatformCompatibleUserRegisterMessage(user, bot) {
         try {
-            // 官方 ARK 卡片格式（使用模板 23：链接+文本列表模板）
-            return (0, koishi_1.h)('ark', {
-                template_id: 23,
-                kv: [
-                    {
-                        key: '#DESC#',
-                        value: '新用户注册通知'
-                    },
-                    {
-                        key: '#PROMPT#',
-                        value: 'WordPress 推送'
-                    },
-                    {
-                        key: '#TITLE#',
-                        value: `新用户注册：${username}`
-                    },
-                    {
-                        key: '#META_URL#',
-                        value: this.config.wordpressUrl
-                    },
-                    {
-                        key: '#META_LIST#',
-                        obj: [
-                            {
-                                obj_kv: [
-                                    {
-                                        key: '用户名',
-                                        value: username
-                                    },
-                                    {
-                                        key: '注册时间',
-                                        value: registerDate
-                                    }
-                                ]
-                            },
-                            {
-                                obj_kv: [
-                                    {
-                                        key: '通知',
-                                        value: '欢迎加入我们的社区！'
-                                    }
-                                ]
-                            }
-                        ]
-                    }
-                ]
-            });
+            return this.getUserRegisterTemplate(user);
         }
-        catch (arkError) {
-            this.ctx.logger.warn('ARK card failed, falling back to text format:', arkError);
-            // 降级到文本消息
+        catch (error) {
+            this.ctx.logger.warn('User register message creation failed:', error);
             return this.getUserRegisterTemplate(user);
         }
     }
@@ -401,7 +254,7 @@ class PushService {
     getNewArticleTemplate(article) {
         const title = article.title?.rendered || '无标题';
         const author = article.author_name || '未知作者';
-        const publishDate = new Date(article.date).toLocaleString('zh-CN');
+        const publishDate = new Date(article.date || new Date()).toLocaleString('zh-CN');
         const excerpt = this.getExcerpt(article);
         const link = article.link || this.config.wordpressUrl;
         return `📰 新文章推送
@@ -420,7 +273,7 @@ class PushService {
     // 文章更新推送模板
     getArticleUpdateTemplate(article) {
         const title = article.title?.rendered || '无标题';
-        const modifiedDate = new Date(article.modified).toLocaleString('zh-CN');
+        const modifiedDate = new Date(article.modified || article.date || new Date()).toLocaleString('zh-CN');
         const excerpt = this.getExcerpt(article);
         const link = article.link || this.config.wordpressUrl;
         return `🔄 文章更新通知
@@ -446,11 +299,9 @@ class PushService {
     // 获取文章摘要
     getExcerpt(article) {
         if (article.excerpt?.rendered) {
-            // 移除 HTML 标签
             return article.excerpt.rendered.replace(/<[^>]+>/g, '').trim();
         }
         else if (article.content?.rendered) {
-            // 从内容中提取摘要
             const content = article.content.rendered.replace(/<[^>]+>/g, '').trim();
             return content.length > 200 ? content.substring(0, 200) + '...' : content;
         }
@@ -460,23 +311,17 @@ class PushService {
     async batchPush(articles, groupIds, enableAtAll = false, messageType = 'text') {
         let success = 0;
         let failed = 0;
-        // 并发推送，添加并发限制
-        const pushPromises = [];
-        const MAX_CONCURRENT = 5; // 最大并发数，避免 API 限流
-        // 生成所有推送任务
+        const MAX_CONCURRENT = 3;
         const allTasks = [];
         for (const article of articles) {
             for (const groupId of groupIds) {
-                allTasks.push({ article, groupId, enableAtAll, messageType });
+                allTasks.push({ article, groupId, enableAtAll });
             }
         }
-        // 分批执行推送任务
         for (let i = 0; i < allTasks.length; i += MAX_CONCURRENT) {
             const batchTasks = allTasks.slice(i, i + MAX_CONCURRENT);
             const batchPromises = batchTasks.map(task => this.pushNewArticle(task.article, task.groupId, task.enableAtAll));
-            // 等待当前批次完成
             const batchResults = await Promise.allSettled(batchPromises);
-            // 统计当前批次结果
             batchResults.forEach(result => {
                 if (result.status === 'fulfilled' && result.value) {
                     success++;
@@ -485,9 +330,9 @@ class PushService {
                     failed++;
                 }
             });
-            // 批次之间添加延迟，避免 API 限流
             if (i + MAX_CONCURRENT < allTasks.length) {
-                await new Promise(resolve => setTimeout(resolve, 1000));
+                const delay = Math.max(1500, batchTasks.length * 500);
+                await new Promise(resolve => setTimeout(resolve, delay));
             }
         }
         return { success, failed };
@@ -495,7 +340,6 @@ class PushService {
     // 检查推送时间是否在允许范围内
     isPushTimeAllowed() {
         const hour = new Date().getHours();
-        // 默认允许推送时间：9:00-22:00
         return hour >= 9 && hour <= 22;
     }
 }

package/lib/schedule.d.ts

@@ -13,11 +13,17 @@ export declare class ScheduleService {
     private failureCount;
     private readonly FAILURE_THRESHOLD;
     private adminUserId;
+    private isRunning;
+    private isDisposed;
+    private readonly MAX_CONCURRENT_PUSHES;
     constructor(ctx: Context, config: Config, wordpressService: WordPressService, storageService: StorageService, pushService: PushService);
+    private validateAdminUserId;
     private initSchedule;
     startSchedule(): void;
     stopSchedule(): void;
     private sendFailureAlert;
+    private isPushTimeAllowed;
+    private executeWithConcurrencyLimit;
     checkAndPushArticles(): Promise<void>;
     checkNewUsers(): Promise<void>;
     triggerCheck(): Promise<void>;