koishi-plugin-cs2-server-query 2.6.5 → 2.6.7

package/lib/index.js

@@ -154,6 +154,45 @@ function apply(ctx, config) {
     saveMapStats();
   }
   __name(cleanupOldEntries, "cleanupOldEntries");
+  function resolveGroupNameByCommand(rawCommand) {
+    if (commandMappings[rawCommand]) return commandMappings[rawCommand];
+    const lowerCommand = rawCommand.toLowerCase();
+    const matched = Object.entries(commandMappings).find(
+      ([cmd]) => cmd.toLowerCase() === lowerCommand
+    );
+    return matched ? matched[1] : null;
+  }
+  __name(resolveGroupNameByCommand, "resolveGroupNameByCommand");
+  function buildWeeklyZEMapReport(groupName) {
+    const groupStats = mapStats[groupName];
+    if (!groupStats) {
+      return `社区 "${groupName}" 最近7天暂无地图统计数据。`;
+    }
+    const now = Date.now();
+    const sevenDaysAgo = now - 7 * 24 * 60 * 60 * 1e3;
+    const topMaps = Object.entries(groupStats).filter(([mapName]) => /^ze/i.test(mapName)).map(([mapName, timestamps]) => ({
+      mapName,
+      count: timestamps.filter((ts) => ts >= sevenDaysAgo).length
+    })).filter((item) => item.count > 0).sort((a, b) => b.count - a.count || a.mapName.localeCompare(b.mapName)).slice(0, 10);
+    if (!topMaps.length) {
+      return `社区 "${groupName}" 最近7天暂无 ze 开头地图记录。`;
+    }
+    const totalCount = topMaps.reduce((sum, item) => sum + item.count, 0);
+    const dateRange = `${new Date(sevenDaysAgo).toLocaleDateString("zh-CN")} - ${new Date(now).toLocaleDateString("zh-CN")}`;
+    return [
+      `${groupName} 地图周报（ZEmap Top10）`,
+      `统计周期：${dateRange}`,
+      "",
+      ...topMaps.map((item, index) => {
+        const translation = mapTranslations[item.mapName]?.translation;
+        const translated = translation ? ` (${translation})` : "";
+        return `${index + 1}. ${item.mapName}${translated} - ${item.count} 次`;
+      }),
+      "",
+      `Top10 合计出现次数：${totalCount} 次`
+    ].join("\n");
+  }
+  __name(buildWeeklyZEMapReport, "buildWeeklyZEMapReport");
   ctx.setInterval(() => {
     cleanupOldEntries();
   }, 24 * 60 * 60 * 1e3);
@@ -197,8 +236,22 @@ function apply(ctx, config) {
   async function generateServerImage(group, mapTranslations2) {
     const browser = await import_puppeteer.default.launch({ args: ["--no-sandbox", "--disable-setuid-sandbox"] });
     const page = await browser.newPage();
-    const totalPlayers = group.servers.reduce((sum, server) => sum + (server.status === "在线" ? server.players : 0), 0);
-    const totalMaxPlayers = group.servers.reduce((sum, server) => sum + (server.status === "在线" ? server.maxPlayers : 0), 0);
+    const totalPlayers = group.servers.reduce((sum, server) => {
+      if (server.status !== "在线") return sum;
+      let players = server.players;
+      if (server.name.includes("PVE") || server.name.includes("pve")) {
+        players = Math.min(players, 32);
+      }
+      return sum + players;
+    }, 0);
+    const totalMaxPlayers = group.servers.reduce((sum, server) => {
+      if (server.status !== "在线") return sum;
+      let maxPlayers = server.maxPlayers;
+      if (server.name.includes("PVE") || server.name.includes("pve")) {
+        maxPlayers = Math.min(maxPlayers, 32);
+      }
+      return sum + maxPlayers;
+    }, 0);
     const onlineServers = group.servers.filter((server) => server.status === "在线").length;
     const baseHeight = 150;
     const rowHeight = 50;
@@ -307,6 +360,12 @@ function apply(ctx, config) {
       const translation = mapTranslations2[server.map];
       const difficulty = translation?.difficulty;
       const difficultyColor = difficulty ? difficultyColors[difficulty] : "#000000";
+      let displayPlayers = server.players;
+      let displayMaxPlayers = server.maxPlayers;
+      if (server.name.includes("PVE") || server.name.includes("pve")) {
+        displayPlayers = Math.min(displayPlayers, 32);
+        displayMaxPlayers = Math.min(displayMaxPlayers, 32);
+      }
       const mapDuration = server.status === "在线" ? Math.floor((Date.now() - server.mapChangeTime) / 6e4) : 0;
       const recentCount = (mapStats[group.name]?.[server.map] || []).filter(
         (ts) => Date.now() - ts <= 7 * 24 * 60 * 60 * 1e3
@@ -325,11 +384,11 @@ function apply(ctx, config) {
       </td>
       <td style="color: ${(() => {
         if (server.status !== "在线") return "#888";
-        const ratio = server.players / server.maxPlayers;
+        const ratio = displayPlayers / displayMaxPlayers;
         if (ratio <= 0.5) return "#33cc00";
         if (ratio <= 0.8) return "#ffcc00";
         return "#ff4444";
-      })()}">${server.status === "在线" ? `${server.players}/${server.maxPlayers}` : "-"}</td>
+      })()}">${server.status === "在线" ? `${displayPlayers}/${displayMaxPlayers}` : "-"}</td>
       <td>${server.status === "在线" ? `${mapDuration}分钟` : "-"}</td>
       <td class="status-${server.status === "在线" ? "online" : "offline"}">${server.status}</td>
       <td><code>${server.ip}</code></td>
@@ -353,6 +412,12 @@ function apply(ctx, config) {
   }
   __name(generateServerImage, "generateServerImage");
   async function generatePushImage(server, mapTranslations2) {
+    let displayPlayers = server.players;
+    let displayMaxPlayers = server.maxPlayers;
+    if (server.name.includes("PVE") || server.name.includes("pve")) {
+      displayPlayers = Math.min(server.players, 32);
+      displayMaxPlayers = Math.min(server.maxPlayers, 32);
+    }
     const browser = await import_puppeteer.default.launch({ args: ["--no-sandbox", "--disable-setuid-sandbox"] });
     const page = await browser.newPage();
     const html = `
@@ -404,12 +469,12 @@ function apply(ctx, config) {
           <p>地图: <span class="map-name">${server.map}</span> (${mapTranslations2[server.map]?.translation || "无翻译"})</p>
           <p>当前人数: 
             <span class="player-count" style="color: ${(() => {
-      const ratio = server.players / server.maxPlayers;
+      const ratio = displayPlayers / displayMaxPlayers;
       if (ratio <= 0.5) return "#33cc00";
       if (ratio <= 0.9) return "#ffcc00";
       return "#ff4444";
     })()}">
-              ${server.players}/${server.maxPlayers}
+              ${displayPlayers}/${displayMaxPlayers}
             </span>
           </p>
         </div>
@@ -509,6 +574,13 @@ function apply(ctx, config) {
   __name(handleOfflineServers, "handleOfflineServers");
   ctx.middleware(async (session, next) => {
     const content = session.content.trim();
+    const weeklyReportMatch = content.match(/^(.+?)周报$/);
+    if (weeklyReportMatch) {
+      const reportCommand = weeklyReportMatch[1].trim();
+      const groupName2 = resolveGroupNameByCommand(reportCommand);
+      if (!groupName2) return next();
+      return buildWeeklyZEMapReport(groupName2);
+    }
     const commandMatch = content.match(/^(.+?)(\s+(\d+))?$/);
     if (!commandMatch) return next();
     const command = commandMatch[1];
@@ -675,6 +747,12 @@ connect ${server.ip}`;
     if (Object.keys(commandMappings).length === 0) return "未找到任何指令映射。";
     return `指令映射列表：${Object.entries(commandMappings).map(([command, groupName]) => `${command} -> ${groupName}`).join(", ")}`;
   });
+  ctx.command("cs2周报 <groupCommand>", "查看指定社区最近7天 ze 地图出现次数 Top10（例：cs2周报 exg）").action((_, groupCommand) => {
+    if (!groupCommand) return "请提供社区指令，例如：cs2周报 exg";
+    const groupName = resolveGroupNameByCommand(groupCommand.trim());
+    if (!groupName) return `未找到指令 "${groupCommand}" 对应的社区。`;
+    return buildWeeklyZEMapReport(groupName);
+  });
   function fuzzyMatchMap(input) {
     const lowerInput = input.toLowerCase();
     const maps = Object.keys(mapTranslations);
@@ -1184,7 +1262,14 @@ ${mapList}
           server.status = "离线";
         }
       }
-      const totalPlayers = group.servers.reduce((sum, server) => sum + (server.status === "在线" ? server.players : 0), 0);
+      const totalPlayers = group.servers.reduce((sum, server) => {
+        if (server.status !== "在线") return sum;
+        let players = server.players;
+        if (server.name.includes("PVE") || server.name.includes("pve")) {
+          players = Math.min(players, 32);
+        }
+        return sum + players;
+      }, 0);
       if (!communityStats[group.name]) {
         communityStats[group.name] = [];
       }
@@ -1198,7 +1283,13 @@ ${mapList}
       const zeServers = group.servers.filter(
         (server) => server.status === "在线" && (server.name.includes("僵尸逃跑") || server.name.includes("ZE") || server.name.includes("Zombie") || server.name.includes("ZOMBIE"))
       );
-      const zeTotalPlayers = zeServers.reduce((sum, server) => sum + server.players, 0);
+      const zeTotalPlayers = zeServers.reduce((sum, server) => {
+        let players = server.players;
+        if (server.name.includes("PVE") || server.name.includes("pve")) {
+          players = Math.min(players, 32);
+        }
+        return sum + players;
+      }, 0);
       if (zeServers.length > 0) {
         if (!zeStats[group.name]) {
           zeStats[group.name] = [];

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "koishi-plugin-cs2-server-query",
-  "private": false,
   "description": "自用,不推荐下载",
-  "version": "2.6.5",
+  "version": "2.6.7",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [