koishi-plugin-imx 2.2.2 → 2.2.3

package/lib/index.d.ts

@@ -9,12 +9,16 @@ export interface Config {
             secret?: string;
             path?: string;
             watchChannels?: string[];
+            broadcastToAll?: boolean;
+            excludeChannels?: string[];
         };
         greeting?: {
             enabled?: boolean;
             channels?: string[];
             morningTime?: string;
             eveningTime?: string;
+            broadcastToAll?: boolean;
+            excludeChannels?: string[];
         };
         commands?: {
             enabled?: boolean;
@@ -35,6 +39,8 @@ export interface Config {
             roomId?: string;
             watchChannels?: string[];
             checkInterval?: number;
+            broadcastToAll?: boolean;
+            excludeChannels?: string[];
         };
         userAgent?: string;
     };
@@ -44,6 +50,8 @@ export interface Config {
             secret?: string;
             path?: string;
             watchChannels?: string[];
+            broadcastToAll?: boolean;
+            excludeChannels?: string[];
         };
     };
     shared?: {

package/lib/index.js

@@ -50,12 +50,16 @@ exports.Config = koishi_1.Schema.object({
             secret: koishi_1.Schema.string().description('MX Space Webhook Secret').role('secret'),
             path: koishi_1.Schema.string().description('Webhook 路径').default('/mx-space/webhook'),
             watchChannels: koishi_1.Schema.array(koishi_1.Schema.string()).description('监听的频道ID列表').default([]),
+            broadcastToAll: koishi_1.Schema.boolean().description('是否广播到所有联系人').default(false),
+            excludeChannels: koishi_1.Schema.array(koishi_1.Schema.string()).description('排除的频道ID列表（当启用广播到所有联系人时）').default([]),
         }).description('Webhook 配置'),
         greeting: koishi_1.Schema.object({
             enabled: koishi_1.Schema.boolean().description('启用问候功能').default(true),
             channels: koishi_1.Schema.array(koishi_1.Schema.string()).description('问候消息发送的频道').default([]),
             morningTime: koishi_1.Schema.string().description('早安时间 (cron格式)').default('0 0 6 * * *'),
             eveningTime: koishi_1.Schema.string().description('晚安时间 (cron格式)').default('0 0 22 * * *'),
+            broadcastToAll: koishi_1.Schema.boolean().description('是否广播问候消息到所有联系人').default(false),
+            excludeChannels: koishi_1.Schema.array(koishi_1.Schema.string()).description('排除的频道ID列表（当启用广播到所有联系人时）').default([]),
         }).description('问候功能配置'),
         commands: koishi_1.Schema.object({
             enabled: koishi_1.Schema.boolean().description('启用命令功能').default(true),
@@ -76,6 +80,8 @@ exports.Config = koishi_1.Schema.object({
             roomId: koishi_1.Schema.string().description('B站直播间房间号'),
             watchChannels: koishi_1.Schema.array(koishi_1.Schema.string()).description('监听的频道ID列表').default([]),
             checkInterval: koishi_1.Schema.number().description('检查间隔（分钟）').default(1).min(1).max(10),
+            broadcastToAll: koishi_1.Schema.boolean().description('是否广播到所有联系人').default(false),
+            excludeChannels: koishi_1.Schema.array(koishi_1.Schema.string()).description('排除的频道ID列表（当启用广播到所有联系人时）').default([]),
         }).description('直播间监控配置'),
         userAgent: koishi_1.Schema.string().description('User-Agent').default('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36'),
     }).description('Bilibili 配置'),
@@ -85,6 +91,8 @@ exports.Config = koishi_1.Schema.object({
             secret: koishi_1.Schema.string().description('GitHub Webhook Secret').role('secret'),
             path: koishi_1.Schema.string().description('Webhook 路径').default('/github/webhook'),
             watchChannels: koishi_1.Schema.array(koishi_1.Schema.string()).description('监听的频道ID列表').default([]),
+            broadcastToAll: koishi_1.Schema.boolean().description('是否广播到所有联系人').default(false),
+            excludeChannels: koishi_1.Schema.array(koishi_1.Schema.string()).description('排除的频道ID列表（当启用广播到所有联系人时）').default([]),
         }).description('GitHub Webhook 配置'),
     }).description('GitHub 配置'),
     shared: koishi_1.Schema.object({

package/lib/modules/bilibili.d.ts

@@ -5,6 +5,8 @@ export interface Config {
     roomIds?: number[];
     watchChannels?: string[];
     checkInterval?: number;
+    broadcastToAll?: boolean;
+    excludeChannels?: string[];
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/modules/bilibili.js

@@ -8,12 +8,15 @@ exports.apply = apply;
 const koishi_1 = require("koishi");
 const axios_1 = __importDefault(require("axios"));
 const axios_error_1 = require("../utils/axios-error");
+const broadcast_1 = require("../utils/broadcast");
 exports.name = 'bilibili';
 exports.Config = koishi_1.Schema.object({
     enabled: koishi_1.Schema.boolean().description('启用 Bilibili 直播监控').default(false),
     roomIds: koishi_1.Schema.array(koishi_1.Schema.number()).description('监控的直播间ID列表').default([]),
     watchChannels: koishi_1.Schema.array(koishi_1.Schema.string()).description('推送通知的频道ID列表').default([]),
     checkInterval: koishi_1.Schema.number().description('检查间隔（分钟）').default(5).min(1).max(60),
+    broadcastToAll: koishi_1.Schema.boolean().description('是否广播到所有联系人').default(false),
+    excludeChannels: koishi_1.Schema.array(koishi_1.Schema.string()).description('排除的频道ID列表（当启用广播到所有联系人时）').default([]),
 });
 const liveStatusCache = new Map();
 function apply(ctx, config) {
@@ -64,7 +67,11 @@ async function checkLiveStatus(ctx, config, logger) {
             const roomInfo = await (0, axios_error_1.axiosRequestWithLog)(logger, () => getRoomInfo(roomId), `获取房间 ${roomId} 信息`);
             if (roomInfo) {
                 const message = formatLiveMessage(roomInfo);
-                await sendToChannels(ctx, config.watchChannels, message, logger);
+                await (0, broadcast_1.sendMessage)(ctx, message, {
+                    watchChannels: config.watchChannels,
+                    broadcastToAll: config.broadcastToAll,
+                    excludeChannels: config.excludeChannels,
+                }, logger);
             }
         }
         liveStatusCache.set(roomId, isLive);
@@ -86,14 +93,3 @@ function formatLiveMessage(roomInfo) {
         `🔗 https://live.bilibili.com/${roomInfo.room_id}`,
     ].join('\n');
 }
-async function sendToChannels(ctx, channels, message, logger) {
-    for (const channelId of channels) {
-        try {
-            await ctx.broadcast([channelId], message);
-        }
-        catch (error) {
-            const simplified = (0, axios_error_1.simplifyAxiosError)(error, `发送消息到频道 ${channelId}`);
-            logger.warn(simplified.message);
-        }
-    }
-}

package/lib/modules/mx-space.d.ts

@@ -8,12 +8,16 @@ export interface Config {
         secret?: string;
         path?: string;
         watchChannels?: string[];
+        broadcastToAll?: boolean;
+        excludeChannels?: string[];
     };
     greeting?: {
         enabled?: boolean;
         channels?: string[];
         morningTime?: string;
         eveningTime?: string;
+        broadcastToAll?: boolean;
+        excludeChannels?: string[];
     };
     commands?: {
         enabled?: boolean;

package/lib/modules/mx-space.js

@@ -49,6 +49,7 @@ const mx_api_1 = require("../utils/mx-api");
 const mx_url_builder_1 = require("../utils/mx-url-builder");
 const mx_event_handler_1 = require("../utils/mx-event-handler");
 const axios_error_1 = require("../utils/axios-error");
+const broadcast_1 = require("../utils/broadcast");
 dayjs_1.default.extend(relativeTime_1.default);
 exports.name = 'mx-space';
 exports.inject = ['server'];
@@ -59,12 +60,16 @@ exports.Config = koishi_1.Schema.object({
         secret: koishi_1.Schema.string().description('MX Space Webhook Secret').role('secret'),
         path: koishi_1.Schema.string().description('Webhook 路径').default('/mx-space/webhook'),
         watchChannels: koishi_1.Schema.array(koishi_1.Schema.string()).description('监听的频道ID列表').default([]),
+        broadcastToAll: koishi_1.Schema.boolean().description('是否广播到所有联系人').default(false),
+        excludeChannels: koishi_1.Schema.array(koishi_1.Schema.string()).description('排除的频道ID列表（当启用广播到所有联系人时）').default([]),
     }).description('Webhook 配置'),
     greeting: koishi_1.Schema.object({
         enabled: koishi_1.Schema.boolean().description('启用问候功能').default(true),
         channels: koishi_1.Schema.array(koishi_1.Schema.string()).description('问候消息发送的频道').default([]),
         morningTime: koishi_1.Schema.string().description('早安时间 (cron格式)').default('0 0 6 * * *'),
         eveningTime: koishi_1.Schema.string().description('晚安时间 (cron格式)').default('0 0 22 * * *'),
+        broadcastToAll: koishi_1.Schema.boolean().description('是否广播问候消息到所有联系人').default(false),
+        excludeChannels: koishi_1.Schema.array(koishi_1.Schema.string()).description('排除的频道ID列表（当启用广播到所有联系人时）').default([]),
     }).description('问候功能配置'),
     commands: koishi_1.Schema.object({
         enabled: koishi_1.Schema.boolean().description('启用命令功能').default(true),
@@ -302,7 +307,11 @@ function setupGreeting(ctx, config, logger) {
             ];
             const greeting = (0, lodash_1.sample)(greetings) || greetings[0];
             const message = `🌅 早上好！${greeting}\n\n${hitokoto || ''}`;
-            await sendToChannels(ctx, config.greeting.channels || [], message, logger);
+            await (0, broadcast_1.sendMessage)(ctx, message, {
+                watchChannels: config.greeting.channels || [],
+                broadcastToAll: config.greeting.broadcastToAll || false,
+                excludeChannels: config.greeting.excludeChannels || [],
+            }, logger);
         }
         catch (error) {
             const simplified = (0, axios_error_1.simplifyAxiosError)(error, '发送早安消息');
@@ -322,7 +331,11 @@ function setupGreeting(ctx, config, logger) {
             ];
             const greeting = (0, lodash_1.sample)(greetings) || greetings[0];
             const message = `🌙 ${greeting}\n\n${hitokoto || ''}`;
-            await sendToChannels(ctx, config.greeting.channels || [], message, logger);
+            await (0, broadcast_1.sendMessage)(ctx, message, {
+                watchChannels: config.greeting.channels || [],
+                broadcastToAll: config.greeting.broadcastToAll || false,
+                excludeChannels: config.greeting.excludeChannels || [],
+            }, logger);
         }
         catch (error) {
             const simplified = (0, axios_error_1.simplifyAxiosError)(error, '发送晚安消息');
@@ -477,19 +490,3 @@ function setupCommands(ctx, config, logger) {
     });
     logger.info('MX Space 命令已注册');
 }
-async function sendToChannels(ctx, channels, message, logger) {
-    if (!channels.length)
-        return;
-    const tasks = channels.map(async (channelId) => {
-        try {
-            const bot = ctx.bots.find(bot => bot.selfId);
-            if (bot) {
-                await bot.sendMessage(channelId, message);
-            }
-        }
-        catch (error) {
-            logger.error(`发送消息到频道 ${channelId} 失败:`, error);
-        }
-    });
-    await Promise.allSettled(tasks);
-}

package/lib/utils/broadcast.d.ts

@@ -0,0 +1,22 @@
+import { Context, h } from 'koishi';
+export interface BroadcastOptions {
+    watchChannels?: string[];
+    broadcastToAll?: boolean;
+    excludeChannels?: string[];
+}
+/**
+ * 广播消息到所有联系人
+ * @param ctx Koishi 上下文
+ * @param message 要发送的消息
+ * @param excludeChannels 排除的频道ID列表
+ * @param logger 日志记录器
+ */
+export declare function broadcastToAllContacts(ctx: Context, message: string | h[], excludeChannels: string[] | undefined, logger: any): Promise<void>;
+/**
+ * 根据配置发送消息到指定频道或广播到所有联系人
+ * @param ctx Koishi 上下文
+ * @param message 要发送的消息
+ * @param options 广播选项
+ * @param logger 日志记录器
+ */
+export declare function sendMessage(ctx: Context, message: string | h[], options: BroadcastOptions, logger: any): Promise<void>;

package/lib/utils/broadcast.js

@@ -0,0 +1,110 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.broadcastToAllContacts = broadcastToAllContacts;
+exports.sendMessage = sendMessage;
+/**
+ * 广播消息到所有联系人
+ * @param ctx Koishi 上下文
+ * @param message 要发送的消息
+ * @param excludeChannels 排除的频道ID列表
+ * @param logger 日志记录器
+ */
+async function broadcastToAllContacts(ctx, message, excludeChannels = [], logger) {
+    try {
+        let totalSent = 0;
+        let totalFailed = 0;
+        // 获取所有活跃的机器人实例
+        for (const bot of ctx.bots) {
+            if (!bot.online)
+                continue;
+            try {
+                // 获取群组列表
+                const guilds = await bot.getGuildList();
+                for (const guild of guilds.data) {
+                    if (excludeChannels.includes(guild.id))
+                        continue;
+                    try {
+                        // 获取群组的频道列表
+                        const channels = await bot.getChannelList(guild.id);
+                        for (const channel of channels.data) {
+                            if (excludeChannels.includes(channel.id))
+                                continue;
+                            try {
+                                await bot.sendMessage(channel.id, message);
+                                totalSent++;
+                                logger.debug(`成功发送消息到群组频道 ${guild.name}#${channel.name} (${channel.id})`);
+                            }
+                            catch (error) {
+                                totalFailed++;
+                                logger.debug(`发送消息到群组频道 ${channel.id} 失败:`, error);
+                            }
+                        }
+                    }
+                    catch (error) {
+                        logger.debug(`获取群组 ${guild.id} 的频道列表失败:`, error);
+                    }
+                }
+                // 获取好友列表（私聊）
+                try {
+                    const friends = await bot.getFriendList();
+                    for (const friend of friends.data) {
+                        if (excludeChannels.includes(friend.id))
+                            continue;
+                        try {
+                            await bot.sendPrivateMessage(friend.id, message);
+                            totalSent++;
+                            logger.debug(`成功发送私聊消息到 ${friend.nickname || friend.id}`);
+                        }
+                        catch (error) {
+                            totalFailed++;
+                            logger.debug(`发送私聊消息到 ${friend.id} 失败:`, error);
+                        }
+                    }
+                }
+                catch (error) {
+                    logger.debug('获取好友列表失败 (可能平台不支持):', error);
+                }
+            }
+            catch (error) {
+                logger.warn(`机器人 ${bot.platform}:${bot.selfId} 广播失败:`, error);
+            }
+        }
+        logger.info(`广播消息完成: 成功 ${totalSent} 个，失败 ${totalFailed} 个`);
+    }
+    catch (error) {
+        logger.error('广播消息时发生错误:', error);
+    }
+}
+/**
+ * 根据配置发送消息到指定频道或广播到所有联系人
+ * @param ctx Koishi 上下文
+ * @param message 要发送的消息
+ * @param options 广播选项
+ * @param logger 日志记录器
+ */
+async function sendMessage(ctx, message, options, logger) {
+    const { watchChannels = [], broadcastToAll = false, excludeChannels = [] } = options;
+    if (broadcastToAll) {
+        // 广播到所有联系人
+        await broadcastToAllContacts(ctx, message, excludeChannels, logger);
+    }
+    else if (watchChannels.length > 0) {
+        // 发送到指定频道
+        const tasks = watchChannels.map(async (channelId) => {
+            try {
+                const bot = ctx.bots.find(bot => bot.selfId);
+                if (bot) {
+                    await bot.sendMessage(channelId, message);
+                    logger.debug(`成功发送消息到频道 ${channelId}`);
+                }
+            }
+            catch (error) {
+                logger.error(`发送消息到频道 ${channelId} 失败:`, error);
+            }
+        });
+        await Promise.allSettled(tasks);
+    }
+    else {
+        logger.warn('没有配置监听频道且未启用广播到所有联系人，跳过消息发送');
+    }
+}

package/lib/utils/mx-event-handler.js

@@ -11,6 +11,7 @@ const remove_markdown_1 = __importDefault(require("remove-markdown"));
 const api_client_1 = require("@mx-space/api-client");
 const mx_api_1 = require("./mx-api");
 const mx_url_builder_1 = require("./mx-url-builder");
+const broadcast_1 = require("./broadcast");
 // MX Space 事件类型
 var BusinessEvents;
 (function (BusinessEvents) {
@@ -28,23 +29,18 @@ async function handleMxSpaceEvent(ctx, config, type, payload, logger) {
         const aggregateData = await (0, mx_api_1.getMxSpaceAggregateData)(ctx, config);
         const owner = aggregateData.user;
         const watchChannels = config.webhook?.watchChannels || [];
-        if (!watchChannels.length) {
-            logger.warn('没有配置监听频道，跳过事件处理');
+        const broadcastToAll = config.webhook?.broadcastToAll || false;
+        const excludeChannels = config.webhook?.excludeChannels || [];
+        if (!broadcastToAll && !watchChannels.length) {
+            logger.warn('没有配置监听频道且未启用广播到所有联系人，跳过事件处理');
             return;
         }
         const sendToChannels = async (message) => {
-            const tasks = watchChannels.map(async (channelId) => {
-                try {
-                    const bot = ctx.bots.find(bot => bot.selfId);
-                    if (bot) {
-                        await bot.sendMessage(channelId, message);
-                    }
-                }
-                catch (error) {
-                    logger.error(`发送消息到频道 ${channelId} 失败:`, error);
-                }
-            });
-            await Promise.allSettled(tasks);
+            await (0, broadcast_1.sendMessage)(ctx, message, {
+                watchChannels,
+                broadcastToAll,
+                excludeChannels,
+            }, logger);
         };
         switch (type) {
             case BusinessEvents.POST_CREATE:

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-imx",
   "description": "Mix-Space Bot for Koishi - 集成多种功能的聊天机器人插件",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [