koishi-plugin-blacklist-online 0.1.3 → 0.1.5

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 furryaxw
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/lib/core.d.ts

@@ -2,7 +2,7 @@ import { Context, Session } from 'koishi';
 import { PluginConfig } from './types';
 export declare const sleep: (ms: number) => Promise<unknown>;
 export declare function isUserAdmin(session: Session, config: PluginConfig, userId: string): Promise<boolean>;
-export declare function syncBlacklist(ctx: Context, config: PluginConfig): Promise<void>;
+export declare function syncBlacklist(ctx: Context, config: PluginConfig): Promise<boolean>;
 export declare function queueRequest(ctx: Context, type: 'ADD' | 'REMOVE' | 'CANCEL', payload: any): Promise<any>;
 export declare function processOfflineQueue(ctx: Context, config: PluginConfig): Promise<void>;
 export declare function checkAndHandleUser(ctx: Context, config: PluginConfig, session: Session, user_id: string): Promise<boolean>;
@@ -13,3 +13,4 @@ guildId: string): Promise<{
     total: number;
     error?: string;
 }>;
+export declare function scanAllGuilds(ctx: Context, config: PluginConfig): Promise<void>;

package/lib/core.js

@@ -8,6 +8,7 @@ exports.processOfflineQueue = processOfflineQueue;
 exports.checkAndHandleUser = checkAndHandleUser;
 exports.parseUserId = parseUserId;
 exports.scanGuild = scanGuild;
+exports.scanAllGuilds = scanAllGuilds;
 const koishi_1 = require("koishi");
 const node_crypto_1 = require("node:crypto");
 const logger = new koishi_1.Logger('blacklist-online');
@@ -50,36 +51,44 @@ async function syncBlacklist(ctx, config) {
             timeout: 10000
         });
         const { strategy, newRevision, data } = response;
+        let hasNewEntries = false; // 标记是否有新增
         if (strategy === 'up-to-date') {
             logger.debug('✅ 黑名单已是最新');
-            return;
+            return false;
         }
         if (strategy === 'full_replace') {
-            logger.info(`📥 全量同步 -> ${newRevision} (条数: ${data.length})`);
+            logger.info(`执行全量同步，条数: ${data.length}`);
+            // 1. 先清空本地表，确保环境干净
             await ctx.database.remove('blacklist_users', {});
+            // 2. 批量写入。由于我们定义了 primary: 'user_id'，这里即便有重复也会直接覆盖
             if (data.length > 0) {
-                // 修复：使用 upsert 明确告知数据库如果主键冲突则更新
-                // 注意：Koishi 的 upsert 在处理大量数据时，建议分批以保证稳定性
-                const batchSize = 50;
+                // 分批处理，防止 SQLite 单次 SQL 语句过长
+                const batchSize = 100;
                 for (let i = 0; i < data.length; i += batchSize) {
                     const batch = data.slice(i, i + batchSize);
-                    // 这里的字段名必须与后端返回的 snake_case 保持完全一致
                     await ctx.database.upsert('blacklist_users', batch);
                 }
+                hasNewEntries = true; // 全量更新通常视为有变化，触发一次扫描比较安全
             }
         }
         else if (strategy === 'incremental') {
             logger.info(`📥 增量同步 -> ${newRevision}`);
-            if (data.upserts?.length)
+            if (data.upserts?.length) {
                 await ctx.database.upsert('blacklist_users', data.upserts);
-            if (data.deletes?.length)
+                hasNewEntries = true; // 有新增或更新，标记为 true
+            }
+            // 删除操作不触发扫描
+            if (data.deletes?.length) {
                 await ctx.database.remove('blacklist_users', { user_id: data.deletes });
+            }
         }
         await ctx.database.upsert('blacklist_meta', [{ key: 'sync_revision', value: newRevision }]);
         logger.info('✅ 同步完成');
+        return hasNewEntries;
     }
     catch (error) {
         logger.warn(`❌ 同步失败: ${error.message || error}`);
+        return false;
     }
 }
 // --- 3. 队列入队 ---
@@ -190,8 +199,14 @@ async function checkAndHandleUser(ctx, config, session, user_id) {
             .replace('{userId}', user_id)
             .replace('{reason}', reason)
             .replace('{guild}', session.guildId);
-        // 引用回复
-        await session.send(session.messageId ? (0, koishi_1.h)('quote', { id: session.messageId }) + msg : msg);
+        // 发送消息
+        try {
+            // 扫描时 session 是伪造的，没有 messageId，直接 send 即可
+            await session.send(session.messageId ? (0, koishi_1.h)('quote', { id: session.messageId }) + msg : msg);
+        }
+        catch (e) {
+            logger.warn(`[群: ${session.guildId}] 发送通知失败: ${e}`);
+        }
     }
     // 执行踢出
     let kicked = false;
@@ -208,7 +223,10 @@ async function checkAndHandleUser(ctx, config, session, user_id) {
                     await (0, exports.sleep)(config.retryDelay);
                 else {
                     const failMsg = config.kickFailMessage.replace('{user}', displayName).replace('{reason}', String(e));
-                    await session.send(failMsg);
+                    try {
+                        await session.send(failMsg);
+                    }
+                    catch { }
                 }
             }
         }
@@ -262,7 +280,8 @@ guildId) {
         const fakeSession = bot.session({
             type: 'message',
             guildId,
-            user: { id: bot.selfId }, // 模拟机器人自己
+            channelId: guildId,
+            user: { id: bot.selfId },
         });
         let handled = 0;
         const BATCH_SIZE = 5;
@@ -284,3 +303,26 @@ guildId) {
         return { handled: 0, total: 0, error: String(error) };
     }
 }
+async function scanAllGuilds(ctx, config) {
+    logger.info('🚀 检测到黑名单更新，触发自动全局扫描...');
+    let totalHandled = 0;
+    let processedGuilds = 0;
+    for (const bot of ctx.bots) {
+        try {
+            const guilds = await bot.getGuildList();
+            for (const guild of guilds.data) {
+                // 调用现有的单群扫描逻辑
+                const result = await scanGuild(ctx, config, bot, guild.id);
+                if (result.handled > 0) {
+                    logger.info(`[自动扫描] 群 ${guild.id}: 处理 ${result.handled} 人`);
+                    totalHandled += result.handled;
+                }
+                processedGuilds++;
+            }
+        }
+        catch (e) {
+            logger.warn(`Bot ${bot.selfId} 自动扫描出错: ${e}`);
+        }
+    }
+    logger.info(`✅ 自动扫描完成。扫描群组: ${processedGuilds}, 处理人数: ${totalHandled}`);
+}

package/lib/index.d.ts

@@ -2,6 +2,6 @@ import { Context, Schema } from 'koishi';
 import { PluginConfig } from './types';
 export declare const name = "blacklist-online";
 export declare const inject: string[];
-export declare const usage = "\n## \u529F\u80FD\u8BF4\u660E\n\u4E00\u4E2A\u5F3A\u5927\u7684\u3001\u57FA\u4E8E\u6570\u636E\u5E93\u7684\u7FA4\u7EC4\u9ED1\u540D\u5355\u7BA1\u7406\u63D2\u4EF6\u3002\n- **\u53D7\u4FDD\u62A4\u540D\u5355**: \u914D\u7F6E\u4E2D\u7684\u7528\u6237\u65E0\u6CD5\u88AB\u62C9\u9ED1\u3002\n- **\u5206\u7FA4\u7BA1\u7406**: \u53EF\u4E3A\u6BCF\u4E2A\u7FA4\u72EC\u7ACB\u8BBE\u7F6E\u9ED1\u540D\u5355\u5904\u7406\u6A21\u5F0F\u3002\n- **\u5165\u7FA4\u626B\u63CF**: \u53EF\u914D\u7F6E\u673A\u5668\u4EBA\u5728\u52A0\u5165\u65B0\u7FA4\u7EC4\u65F6\uFF0C\u81EA\u52A8\u626B\u63CF\u7FA4\u5185\u73B0\u6709\u6210\u5458\u3002\n- **\u81EA\u52A8\u62D2\u7EDD**: \u81EA\u52A8\u62D2\u7EDD\u6570\u636E\u5E93\u9ED1\u540D\u5355\u7528\u6237\u7684\u52A0\u7FA4\u7533\u8BF7\u3002\n- **\u624B\u52A8\u626B\u63CF**: \u63D0\u4F9B\u6307\u4EE4\u624B\u52A8\u626B\u63CF\u5F53\u524D\u6216\u5168\u90E8\u7FA4\u7EC4\u3002\n- **\u6743\u9650\u63A7\u5236**: \u6240\u6709\u6307\u4EE4\u5747\u6709\u6743\u9650\u7B49\u7EA7\u63A7\u5236\u3002\n";
+export declare const usage = "\n## \u529F\u80FD\u8BF4\u660E\n\u4E00\u4E2A\u5F3A\u5927\u7684\u3001\u57FA\u4E8E\u6570\u636E\u5E93\u7684\u7FA4\u7EC4\u9ED1\u540D\u5355\u7BA1\u7406\u63D2\u4EF6\u3002\n\n- **\u4E91\u7AEF\u540C\u6B65 & \u81EA\u52A8\u5DE1\u822A**: \u5B9E\u65F6\u540C\u6B65\u4E91\u7AEF\u9ED1\u540D\u5355\u3002**\u5F53\u68C0\u6D4B\u5230\u65B0\u589E\u9ED1\u540D\u5355\u7528\u6237\u65F6\uFF0C\u4F1A\u81EA\u52A8\u89E6\u53D1\u5168\u5C40\u626B\u63CF**\uFF0C\u53CA\u65F6\u6E05\u7406\u6240\u6709\u7FA4\u5185\u7684\u6F5C\u5728\u5A01\u80C1\u3002\n- **\u516C\u5F00\u5904\u5211**: \u65E0\u8BBA\u662F\u81EA\u52A8\u626B\u63CF\u8FD8\u662F\u624B\u52A8\u626B\u63CF\uFF0C\u53D1\u73B0\u9ED1\u540D\u5355\u7528\u6237\u65F6\u5747\u4F1A\u5728\u7FA4\u5185\u53D1\u9001\u5305\u542B\u539F\u56E0\u7684\u901A\u544A\uFF08\u53D6\u51B3\u4E8E\u7FA4\u6A21\u5F0F\u8BBE\u7F6E\uFF09\u3002\n- **\u53D7\u4FDD\u62A4\u540D\u5355**: \u914D\u7F6E\u4E2D\u7684\u7528\u6237\uFF08\u5982\u7FA4\u4E3B\u3001\u7279\u5B9A\u7BA1\u7406\u5458\uFF09\u62E5\u6709\u8C41\u514D\u6743\uFF0C\u65E0\u6CD5\u88AB\u62C9\u9ED1\u3002\n- **\u5206\u7FA4\u7BA1\u7406**: \u53EF\u4E3A\u6BCF\u4E2A\u7FA4\u72EC\u7ACB\u8BBE\u7F6E\u5904\u7406\u6A21\u5F0F\uFF08\u4EC5\u901A\u77E5 / \u4EC5\u8E22\u51FA / \u901A\u77E5\u5E76\u8E22\u51FA / \u5173\u95ED\uFF09\u3002\n- **\u5165\u7FA4\u68C0\u6D4B**: \u65B0\u6210\u5458\u8FDB\u7FA4\u6216\u7533\u8BF7\u52A0\u7FA4\u65F6\uFF0C\u81EA\u52A8\u68C0\u6D4B\u5E76\u62E6\u622A\u9ED1\u540D\u5355\u7528\u6237\u3002\n- **\u624B\u52A8\u626B\u63CF**: \u63D0\u4F9B\u6307\u4EE4\u624B\u52A8\u626B\u63CF\u5F53\u524D\u6216\u5168\u90E8\u7FA4\u7EC4\u3002\n- **\u6743\u9650\u63A7\u5236**: \u4E25\u683C\u7684\u6307\u4EE4\u6743\u9650\u5206\u7EA7\u7BA1\u7406\u3002\n";
 export declare const Config: Schema<PluginConfig>;
 export declare function apply(ctx: Context, config: PluginConfig): void;

package/lib/index.js

@@ -3,19 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Config = exports.usage = exports.inject = exports.name = void 0;
 exports.apply = apply;
 const koishi_1 = require("koishi");
-const node_crypto_1 = require("node:crypto"); // 【修复】使用原生 crypto
+const node_crypto_1 = require("node:crypto");
 const core_1 = require("./core");
 exports.name = 'blacklist-online';
 exports.inject = ['database', 'http'];
 exports.usage = `
 ## 功能说明
 一个强大的、基于数据库的群组黑名单管理插件。
-- **受保护名单**: 配置中的用户无法被拉黑。
-- **分群管理**: 可为每个群独立设置黑名单处理模式。
-- **入群扫描**: 可配置机器人在加入新群组时，自动扫描群内现有成员。
-- **自动拒绝**: 自动拒绝数据库黑名单用户的加群申请。
+
+- **云端同步 & 自动巡航**: 实时同步云端黑名单。**当检测到新增黑名单用户时，会自动触发全局扫描**，及时清理所有群内的潜在威胁。
+- **公开处刑**: 无论是自动扫描还是手动扫描，发现黑名单用户时均会在群内发送包含原因的通告（取决于群模式设置）。
+- **受保护名单**: 配置中的用户（如群主、特定管理员）拥有豁免权，无法被拉黑。
+- **分群管理**: 可为每个群独立设置处理模式（仅通知 / 仅踢出 / 通知并踢出 / 关闭）。
+- **入群检测**: 新成员进群或申请加群时，自动检测并拦截黑名单用户。
 - **手动扫描**: 提供指令手动扫描当前或全部群组。
-- **权限控制**: 所有指令均有权限等级控制。
+- **权限控制**: 严格的指令权限分级管理。
 `;
 // --- Schema 定义 ---
 exports.Config = koishi_1.Schema.intersect([
@@ -79,13 +81,23 @@ function apply(ctx, config) {
             logger.info(`📱 当前实例 UUID: ${entries[0].value}`);
         }
         // 启动时立即同步一次
-        (0, core_1.syncBlacklist)(ctx, config);
+        const hasUpdates = await (0, core_1.syncBlacklist)(ctx, config);
         // 启动时处理积压队列
         (0, core_1.processOfflineQueue)(ctx, config);
+        // 如果启动同步有更新，触发全群扫描
+        if (hasUpdates) {
+            (0, core_1.scanAllGuilds)(ctx, config);
+        }
     });
     // 3. 定时任务
-    ctx.setInterval(() => (0, core_1.syncBlacklist)(ctx, config), 5 * koishi_1.Time.minute); // 每5分同步
-    ctx.setInterval(() => (0, core_1.processOfflineQueue)(ctx, config), koishi_1.Time.minute); // 每1分处理队列
+    ctx.setInterval(async () => {
+        // 每次定时同步，如果有更新，就触发扫描
+        const hasUpdates = await (0, core_1.syncBlacklist)(ctx, config);
+        if (hasUpdates) {
+            await (0, core_1.scanAllGuilds)(ctx, config);
+        }
+    }, 5 * koishi_1.Time.minute); // 每5分同步
+    ctx.setInterval(() => (0, core_1.processOfflineQueue)(ctx, config), koishi_1.Time.minute); // 每分钟同步
     // 4. 事件监听
     // 监听加群申请 (自动拒绝)
     ctx.on('guild-member-request', async (session) => {
@@ -131,12 +143,12 @@ function apply(ctx, config) {
             return '❌ 该用户在本地白名单中，无法拉黑。';
         const requestId = (0, node_crypto_1.randomUUID)();
         const payload = {
-            requestId: requestId,
+            request_id: requestId,
             type: 'ADD',
-            applicantId: session.userId,
-            targetUserId: userId,
+            applicant_id: session.userId,
+            target_user_id: userId,
             reason,
-            guildId: session.guildId,
+            guild_id: session.guildId,
             timestamp: Date.now()
         };
         try {
@@ -161,10 +173,10 @@ function apply(ctx, config) {
         const userId = (0, core_1.parseUserId)(user);
         const requestId = (0, node_crypto_1.randomUUID)();
         const payload = {
-            requestId: requestId,
+            request_id: requestId,
             type: 'REMOVE',
-            applicantId: session.userId,
-            targetUserId: userId,
+            applicant_id: session.userId,
+            target_user_id: userId,
             reason,
             timestamp: Date.now()
         };
@@ -185,9 +197,9 @@ function apply(ctx, config) {
         if (!uuid)
             return '请输入要撤回的申请 UUID。';
         const payload = {
-            requestId: (0, node_crypto_1.randomUUID)(),
-            targetRequestId: uuid,
-            applicantId: session?.userId,
+            request_id: (0, node_crypto_1.randomUUID)(),
+            target_request_id: uuid,
+            applicant_id: session?.userId,
             timestamp: Date.now()
         };
         try {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-blacklist-online",
   "description": "自用插件",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [