koishi-plugin-aka-60s-api 0.2.2 → 0.2.3

package/lib/index.js

@@ -70,6 +70,21 @@ function apply(ctx, config) {
   let moyuScheduleTimeout = null;
   let goldScheduleTimeout = null;
   let fuelScheduleTimeout = null;
+  const sentToday = {
+    news: "",
+    aiNews: "",
+    moyu: "",
+    gold: "",
+    fuel: ""
+  };
+  function getTodayString() {
+    const now = /* @__PURE__ */ new Date();
+    const year = now.getFullYear();
+    const month = `${now.getMonth() + 1}`.padStart(2, "0");
+    const day = `${now.getDate()}`.padStart(2, "0");
+    return `${year}-${month}-${day}`;
+  }
+  __name(getTodayString, "getTodayString");
   async function resolveGroupScheduleChannels(whitelist, tag) {
     try {
       if (!whitelist.length) {
@@ -540,6 +555,14 @@ ${newsItem.link}`).join("\n\n");
     return target.getTime() - now.getTime();
   }
   __name(getMsUntilNextTime, "getMsUntilNextTime");
+  function isTimePassedToday(timeStr) {
+    const [hours, minutes] = timeStr.split(":").map(Number);
+    const now = /* @__PURE__ */ new Date();
+    const target = /* @__PURE__ */ new Date();
+    target.setHours(hours, minutes, 0, 0);
+    return target <= now;
+  }
+  __name(isTimePassedToday, "isTimePassedToday");
   function setupSchedule() {
     if (!config.enableSchedule) {
       logInfo("60s API: 定时发送新闻功能已禁用");
@@ -550,15 +573,33 @@ ${newsItem.link}`).join("\n\n");
       scheduleTimeout = null;
     }
     try {
+      const today = getTodayString();
+      if (sentToday.news === today) {
+        logInfo("60s API: 今日新闻已发送过，设置为明天任务", { today });
+        const msUntilNext2 = getMsUntilNextTime(config.scheduleTime) + 24 * 60 * 60 * 1e3;
+        scheduleTimeout = setTimeout(() => {
+          sentToday.news = "";
+          setupSchedule();
+        }, msUntilNext2);
+        return;
+      }
       const msUntilNext = getMsUntilNextTime(config.scheduleTime);
       logInfo("60s API: 新闻定时任务已设置", {
         scheduleTime: config.scheduleTime,
         msUntilNext,
         nextRun: new Date(Date.now() + msUntilNext).toLocaleString(),
-        whitelist: config.scheduleWhitelist
+        whitelist: config.scheduleWhitelist,
+        today,
+        alreadySent: sentToday.news === today
       });
       scheduleTimeout = setTimeout(async () => {
+        if (sentToday.news === getTodayString()) {
+          logInfo("60s API: 今日新闻已在本次任务等待期间发送，跳过");
+          setupSchedule();
+          return;
+        }
         await sendNewsToChannels();
+        sentToday.news = getTodayString();
         setupSchedule();
       }, msUntilNext);
     } catch (error) {
@@ -576,6 +617,16 @@ ${newsItem.link}`).join("\n\n");
       aiNewsScheduleTimeout = null;
     }
     try {
+      const today = getTodayString();
+      if (sentToday.aiNews === today) {
+        logInfo("60s API: 今日AI快报已发送过，设置为明天任务", { today });
+        const msUntilNext2 = getMsUntilNextTime(config.aiNewsScheduleTime) + 24 * 60 * 60 * 1e3;
+        aiNewsScheduleTimeout = setTimeout(() => {
+          sentToday.aiNews = "";
+          setupAiNewsSchedule();
+        }, msUntilNext2);
+        return;
+      }
       const msUntilNext = getMsUntilNextTime(config.aiNewsScheduleTime);
       logInfo("60s API: AI快报定时任务已设置", {
         scheduleTime: config.aiNewsScheduleTime,
@@ -584,7 +635,13 @@ ${newsItem.link}`).join("\n\n");
         whitelist: config.scheduleWhitelist
       });
       aiNewsScheduleTimeout = setTimeout(async () => {
+        if (sentToday.aiNews === getTodayString()) {
+          logInfo("60s API: 今日AI快报已在本次任务等待期间发送，跳过");
+          setupAiNewsSchedule();
+          return;
+        }
         await sendAiNewsToChannels();
+        sentToday.aiNews = getTodayString();
         setupAiNewsSchedule();
       }, msUntilNext);
     } catch (error) {
@@ -602,6 +659,16 @@ ${newsItem.link}`).join("\n\n");
       moyuScheduleTimeout = null;
     }
     try {
+      const today = getTodayString();
+      if (sentToday.moyu === today) {
+        logInfo("60s API: 今日摸鱼日报已发送过，设置为明天任务", { today });
+        const msUntilNext2 = getMsUntilNextTime(config.moyuScheduleTime) + 24 * 60 * 60 * 1e3;
+        moyuScheduleTimeout = setTimeout(() => {
+          sentToday.moyu = "";
+          setupMoyuSchedule();
+        }, msUntilNext2);
+        return;
+      }
       const msUntilNext = getMsUntilNextTime(config.moyuScheduleTime);
       logInfo("60s API: 摸鱼日报定时任务已设置", {
         scheduleTime: config.moyuScheduleTime,
@@ -610,7 +677,13 @@ ${newsItem.link}`).join("\n\n");
         whitelist: config.scheduleWhitelist
       });
       moyuScheduleTimeout = setTimeout(async () => {
+        if (sentToday.moyu === getTodayString()) {
+          logInfo("60s API: 今日摸鱼日报已在本次任务等待期间发送，跳过");
+          setupMoyuSchedule();
+          return;
+        }
         await sendMoyuToChannels();
+        sentToday.moyu = getTodayString();
         setupMoyuSchedule();
       }, msUntilNext);
     } catch (error) {
@@ -628,6 +701,16 @@ ${newsItem.link}`).join("\n\n");
       goldScheduleTimeout = null;
     }
     try {
+      const today = getTodayString();
+      if (sentToday.gold === today) {
+        logInfo("60s API: 今日金价已发送过，设置为明天任务", { today });
+        const msUntilNext2 = getMsUntilNextTime(config.goldScheduleTime) + 24 * 60 * 60 * 1e3;
+        goldScheduleTimeout = setTimeout(() => {
+          sentToday.gold = "";
+          setupGoldSchedule();
+        }, msUntilNext2);
+        return;
+      }
       const msUntilNext = getMsUntilNextTime(config.goldScheduleTime);
       logInfo("60s API: 今日金价定时任务已设置", {
         scheduleTime: config.goldScheduleTime,
@@ -636,7 +719,13 @@ ${newsItem.link}`).join("\n\n");
         whitelist: config.scheduleWhitelist
       });
       goldScheduleTimeout = setTimeout(async () => {
+        if (sentToday.gold === getTodayString()) {
+          logInfo("60s API: 今日金价已在本次任务等待期间发送，跳过");
+          setupGoldSchedule();
+          return;
+        }
         await sendGoldToChannels();
+        sentToday.gold = getTodayString();
         setupGoldSchedule();
       }, msUntilNext);
     } catch (error) {
@@ -654,6 +743,16 @@ ${newsItem.link}`).join("\n\n");
       fuelScheduleTimeout = null;
     }
     try {
+      const today = getTodayString();
+      if (sentToday.fuel === today) {
+        logInfo("60s API: 今日油价已发送过，设置为明天任务", { today });
+        const msUntilNext2 = getMsUntilNextTime(config.fuelScheduleTime) + 24 * 60 * 60 * 1e3;
+        fuelScheduleTimeout = setTimeout(() => {
+          sentToday.fuel = "";
+          setupFuelSchedule();
+        }, msUntilNext2);
+        return;
+      }
       const msUntilNext = getMsUntilNextTime(config.fuelScheduleTime);
       logInfo("60s API: 今日油价定时任务已设置", {
         scheduleTime: config.fuelScheduleTime,
@@ -662,7 +761,13 @@ ${newsItem.link}`).join("\n\n");
         whitelist: config.scheduleWhitelist
       });
       fuelScheduleTimeout = setTimeout(async () => {
+        if (sentToday.fuel === getTodayString()) {
+          logInfo("60s API: 今日油价已在本次任务等待期间发送，跳过");
+          setupFuelSchedule();
+          return;
+        }
         await sendFuelToChannels();
+        sentToday.fuel = getTodayString();
         setupFuelSchedule();
       }, msUntilNext);
     } catch (error) {
@@ -1067,6 +1172,11 @@ ${shortDetail}
       clearTimeout(fuelScheduleTimeout);
       fuelScheduleTimeout = null;
     }
+    sentToday.news = "";
+    sentToday.aiNews = "";
+    sentToday.moyu = "";
+    sentToday.gold = "";
+    sentToday.fuel = "";
   });
 }
 __name(apply, "apply");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-aka-60s-api",
   "description": "调用60s API转发信息的工具 - 个人用",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [