koishi-plugin-ets2-tools-tmp 2.3.4 → 2.4.0

package/lib/command/tmpActivityService.js

@@ -117,6 +117,14 @@ class ActivityService {
             }, `发送定时器 #${index + 1}: ${timeStr}`);
         });
 
+        this.cfg.admin.autoClockCheckTimes.forEach((timeStr, index) => {
+            const [hours, minutes] = timeStr.split(":").map(Number);
+            this.setupTimer(hours, minutes, async () => {
+                this.logger.timing(`执行自动打卡检查任务 #${index + 1} (${timeStr})`);
+                await this.checkAutoClockStatus();
+            }, `自动打卡检查定时器 #${index + 1}: ${timeStr}`);
+        });
+
         if (this.cfg.noActivity?.enable) {
             const [noActivityHours, noActivityMinutes] = this.cfg.noActivity.time.split(":").map(Number);
             this.setupTimer(noActivityHours, noActivityMinutes, () => {
@@ -212,7 +220,7 @@ class ActivityService {
             this.todayActivities = [];
 
             const protocol = this.cfg.api.useHttps ? "https://" : "http://";
-            const fullUrl = `${protocol}${this.cfg.api.url}/api/activity/info/list?token=${this.cfg.api.token}&page=1&limit=50&themeName=`;
+            const fullUrl = `${protocol}${this.cfg.api.url}/api/activity/info/list?token=${this.cfg.api.token}&page=1&limit=100&themeName=`;
             this.logger.api(`请求车队平台API: ${fullUrl.replace(this.cfg.api.token, "***")}`);
 
             const startTime = Date.now();
@@ -560,19 +568,18 @@ class ActivityService {
     }
 
     async sendToGroup(groupId, message, groupType) {
-        const availableBots = this.ctx.bots.filter((bot) => {
-            const unsupportedPlatforms = ["mail", "telegram", "discord", "qq", "wechat-official"];
-            return !unsupportedPlatforms.includes(bot.platform);
+        const onebotBots = this.ctx.bots.filter((bot) => {
+            return bot.platform === "onebot";
         });
 
-        if (availableBots.length === 0) {
-            throw new Error(`没有可用的聊天平台适配器（当前不支持邮件/电报/Discord/QQ/微信公众号）`);
+        if (onebotBots.length === 0) {
+            throw new Error(`请启用onebot适配器以发送${groupType}消息`);
         }
 
         let lastError = null;
-        this.logger.debug(`尝试通过 ${availableBots.length} 个适配器发送消息到${groupType} ${groupId}`);
+        this.logger.debug(`尝试通过 ${onebotBots.length} 个onebot适配器发送消息到${groupType} ${groupId}`);
 
-        for (const bot of availableBots) {
+        for (const bot of onebotBots) {
             try {
                 await bot.sendMessage(groupId, message);
                 this.logger.debug(`已通过 ${bot.platform} 适配器发送消息到${groupType} ${groupId}`);
@@ -583,7 +590,101 @@ class ActivityService {
             }
         }
 
-        throw lastError || new Error(`所有适配器都无法发送消息到${groupType} ${groupId}`);
+        throw lastError || new Error(`所有onebot适配器都无法发送消息到${groupType} ${groupId}`);
+    }
+
+    async checkAutoClockStatus() {
+        await this.updateActivityData();
+
+        if (this.todayActivities.length === 0) {
+            this.logger.debug("今日没有活动，跳过自动打卡检查");
+            return;
+        }
+
+        this.logger.debug(`开始检查 ${this.todayActivities.length} 个活动的自动打卡状态`);
+
+        const platformVersion = (this.cfg.mainSettings?.platformVersion || "v1").toLowerCase();
+
+        for (const activity of this.todayActivities) {
+            try {
+                let autoClockEnabled = false;
+
+                if (platformVersion === "v1") {
+                    autoClockEnabled = await this.checkV1AutoClock(activity);
+                } else if (platformVersion === "v2") {
+                    autoClockEnabled = await this.checkV2AutoClock(activity);
+                }
+
+                const message = autoClockEnabled 
+                    ? `今日活动自动打卡已设置`
+                    : `请注意，今日活动打卡未设置。\n 活动名称： ${activity.themeName || '未知活动'}`;
+
+                this.logger.message(`自动打卡检查: "${activity.themeName || '未知活动'}" - ${autoClockEnabled ? "已设置" : "未设置"}`);
+
+                for (const groupId of this.cfg.admin.groups) {
+                    try {
+                        await this.sendToGroup(groupId, message, "管理群组");
+                        this.logger.message(`已发送自动打卡检查到管理群组 ${groupId}: ${activity.themeName || '未知活动'}`);
+                    } catch (error) {
+                        this.logger.error(`发送自动打卡检查到管理群组 ${groupId} 失败:`, error.message);
+                    }
+                }
+            } catch (error) {
+                this.logger.error(`检查活动 "${activity.themeName || '未知活动'}" 自动打卡状态失败:`, error.message);
+            }
+        }
+    }
+
+    async checkV1AutoClock(activity) {
+        try {
+            const protocol = this.cfg.api.useHttps ? "https://" : "http://";
+            const fullUrl = `${protocol}${this.cfg.api.url}/api/activity/info/info/${activity.id}?token=${this.cfg.api.token}`;
+            this.logger.api(`请求V1活动详情API: ${fullUrl.replace(this.cfg.api.token, "***")}`);
+
+            const response = await this.ctx.http.get(fullUrl, { timeout: 10000 });
+            this.logger.api(`V1活动详情API响应:`, response);
+
+            if (response.code === 0 && response.data) {
+                const enableAutoClock = response.data.enableAutoClock;
+                this.logger.debug(`活动 "${activity.themeName}" V1自动打卡状态: ${enableAutoClock}`);
+                return enableAutoClock === 1;
+            } else {
+                this.logger.error(`V1活动详情API返回错误: ${response.msg || '未知错误'} (代码: ${response.code || '无'})`);
+                return false;
+            }
+        } catch (error) {
+            this.logger.error(`检查V1活动 "${activity.themeName}" 自动打卡状态失败:`, error.message);
+            return false;
+        }
+    }
+
+    async checkV2AutoClock(activity) {
+        try {
+            const protocol = this.cfg.api.useHttps ? "https://" : "http://";
+            const fullUrl = `${protocol}${this.cfg.api.url}/activity/list?token=${this.cfg.api.token}`;
+            this.logger.api(`请求V2活动列表API: ${fullUrl.replace(this.cfg.api.token, "***")}`);
+
+            const response = await this.ctx.http.get(fullUrl, { timeout: 10000 });
+            this.logger.api(`V2活动列表API响应:`, response);
+
+            if (response.code === 200 && response.data?.rows) {
+                const activityDetail = response.data.rows.find(row => row.id === activity.id);
+                if (activityDetail) {
+                    const autoCheckInEnable = activityDetail.autoCheckInEnable;
+                    this.logger.debug(`活动 "${activity.themeName}" V2自动打卡状态: ${autoCheckInEnable}`);
+                    return autoCheckInEnable === 1;
+                } else {
+                    this.logger.warn(`在V2活动列表中未找到活动ID: ${activity.id}`);
+                    return false;
+                }
+            } else {
+                this.logger.error(`V2活动列表API返回错误: ${response.msg || '未知错误'} (代码: ${response.code || '无'})`);
+                return false;
+            }
+        } catch (error) {
+            this.logger.error(`检查V2活动 "${activity.themeName}" 自动打卡状态失败:`, error.message);
+            return false;
+        }
     }
 
     cleanup() {

package/lib/index.js

@@ -130,6 +130,7 @@ exports.Config = koishi_1.Schema.intersect([
             admin: koishi_1.Schema.object({
                 checkTimes: koishi_1.Schema.array(koishi_1.Schema.string()).role("table").description("活动检查时间（HH:mm格式）").default(["08:00", "12:00", "14:00", "20:00"]),
                 sendTimes: koishi_1.Schema.array(koishi_1.Schema.string()).role("table").description("信息发送时间（HH:mm格式）").default(["08:05", "12:05", "14:05", "20:05"]),
+                autoClockCheckTimes: koishi_1.Schema.array(koishi_1.Schema.string()).role("table").description("自动打卡检查时间（HH:mm格式）").default(["09:00"]),
                 groups: koishi_1.Schema.array(koishi_1.Schema.string()).role("table").description("管理群组ID列表").default([])
             }).description("管理群配置"),
             dataSource: koishi_1.Schema.object({
@@ -352,7 +353,8 @@ function apply(ctx, cfg) {
         const activityConfig = {
             ...cfg.tmpActivityService,
             debugMode: cfg.debugMode,
-            debug: cfg.tmpActivityService.debug
+            debug: cfg.tmpActivityService.debug,
+            mainSettings: cfg.mainSettings?.settings || {}
         };
         const activityService = new ActivityService(ctx, activityConfig);
         activityService.start();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ets2-tools-tmp",
   "description": "欧卡2 TruckersMP信息查询、车队平台查询及活动提醒",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "contributors": [
     "opwop <slhp1013@qq.com>",
     "bot_actions <168329908@qq.com>"