koishi-plugin-adapter-onebot-multi 1.0.2 → 1.0.4

package/lib/index.js

@@ -1460,13 +1460,15 @@ var LoadBalancer = class {
    * 检查群是否应该被管理（根据白名单/黑名单模式）
    */
   shouldManageChannel(channelId) {
+    const normalizedChannelId = String(channelId || "").trim();
+    if (!normalizedChannelId) return false;
     const mode = this.config.channelFilterMode || "blacklist";
     if (mode === "whitelist") {
       const whitelist = this.config.channelWhitelist || [];
-      return whitelist.length === 0 || whitelist.includes(channelId);
+      return whitelist.length === 0 || whitelist.includes(normalizedChannelId);
     } else {
       const blacklist = this.config.channelBlacklist || [];
-      return !blacklist.includes(channelId);
+      return !blacklist.includes(normalizedChannelId);
     }
   }
   /**
@@ -1519,14 +1521,16 @@ var LoadBalancer = class {
     this.listenerDisposers.push(this.ctx.on("guild-added", (session) => {
       if (!this.config.enabled) return;
       if (session.platform !== "onebot") return;
+      const guildId = String(session.guildId || "").trim();
+      if (!guildId) return;
       const botChannelSet = this.botChannels.get(session.selfId) || /* @__PURE__ */ new Set();
-      const isNewChannel = !botChannelSet.has(session.guildId);
-      botChannelSet.add(session.guildId);
+      const isNewChannel = !botChannelSet.has(guildId);
+      botChannelSet.add(guildId);
       this.botChannels.set(session.selfId, botChannelSet);
-      const channelBots = this.allChannels.get(session.guildId) || /* @__PURE__ */ new Set();
+      const channelBots = this.allChannels.get(guildId) || /* @__PURE__ */ new Set();
       channelBots.add(session.selfId);
-      this.allChannels.set(session.guildId, channelBots);
-      this.logger.info(`Bot ${session.selfId} 加入群 ${session.guildId}`);
+      this.allChannels.set(guildId, channelBots);
+      this.logger.info(`Bot ${session.selfId} 加入群 ${guildId}`);
       if (isNewChannel) {
         this.scheduleLoadBalancing(1e4);
       }
@@ -1534,20 +1538,22 @@ var LoadBalancer = class {
     this.listenerDisposers.push(this.ctx.on("guild-removed", (session) => {
       if (!this.config.enabled) return;
       if (session.platform !== "onebot") return;
+      const guildId = String(session.guildId || "").trim();
+      if (!guildId) return;
       const botChannelSet = this.botChannels.get(session.selfId);
       if (botChannelSet) {
-        botChannelSet.delete(session.guildId);
+        botChannelSet.delete(guildId);
       }
-      const channelBots = this.allChannels.get(session.guildId);
+      const channelBots = this.allChannels.get(guildId);
       const hadOtherBots = channelBots && channelBots.size > 1;
       if (channelBots) {
         channelBots.delete(session.selfId);
         if (channelBots.size === 0) {
-          this.allChannels.delete(session.guildId);
-          this.lastAssignees.delete(session.guildId);
+          this.allChannels.delete(guildId);
+          this.lastAssignees.delete(guildId);
         }
       }
-      this.logger.info(`Bot ${session.selfId} 退出群 ${session.guildId}`);
+      this.logger.info(`Bot ${session.selfId} 退出群 ${guildId}`);
       if (hadOtherBots) {
         this.scheduleLoadBalancing(5e3);
       }
@@ -1591,7 +1597,7 @@ var LoadBalancer = class {
         }
         const guilds = await bot.getGuildList();
         const channelIds = new Set(
-          Array.from(guilds.data || []).map((g) => g.id)
+          Array.from(guilds.data || []).map((g) => String(g?.id || "").trim()).filter(Boolean)
         );
         this.botChannels.set(bot.selfId, channelIds);
         for (const channelId of channelIds) {
@@ -1642,7 +1648,7 @@ var LoadBalancer = class {
         return;
       }
       const channels = [];
-      const prioritySet = new Set(this.config.priorityChannels || []);
+      const prioritySet = new Set((this.config.priorityChannels || []).map((id) => String(id).trim()).filter(Boolean));
       for (const [channelId, bots] of this.allChannels.entries()) {
         channels.push({
           channelId,
@@ -1717,8 +1723,13 @@ var LoadBalancer = class {
         }
       }
       if (assignments.length > 0) {
-        for (const { channelId, assignee } of assignments) {
-          this.lastAssignees.set(channelId, assignee);
+        const batchSize = 100;
+        for (let i = 0; i < assignments.length; i += batchSize) {
+          const slice = assignments.slice(i, i + batchSize);
+          await Promise.all(slice.map(async ({ channelId, assignee }) => {
+            await this.ctx.database.setChannel("onebot", channelId, { assignee });
+            this.lastAssignees.set(channelId, assignee);
+          }));
         }
       }
       const botsWithData = onlineBots.filter((id) => {
@@ -1800,7 +1811,7 @@ var LoadBalancer = class {
     if (!this.config.enabled) return true;
     if (session.platform !== "onebot") return true;
     if (session.type !== "message") return true;
-    const channelId = session.guildId || session.channelId;
+    const channelId = String(session.guildId || session.channelId || "").trim();
     if (!channelId) return true;
     if (!this.shouldManageChannel(channelId)) return true;
     const assignee = this.lastAssignees.get(channelId);
@@ -2120,7 +2131,7 @@ var ConfigStore = class {
 var Config = import_koishi9.Schema.object({}).description("配置已迁移到 data/adapter-onebot-multi/config.yaml");
 var name = "adapter-onebot-multi";
 var inject = {
-  required: ["server"],
+  required: ["server", "database"],
   optional: ["console"]
 };
 function apply(ctx, _config) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-adapter-onebot-multi",
   "description": "奶龙bot定制版onebot适配器，支持自动负载均衡与黑白名单，控制台侧边栏管理",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [