koishi-plugin-aka-60s-api 0.2.8 → 0.2.10

package/lib/index.d.ts

@@ -6,6 +6,7 @@ export interface Config {
     cooldownTime: number;
     enableLog: boolean;
     scheduleWhitelist: string[];
+    scheduleCooldown: number;
     enableSchedule: boolean;
     scheduleTime: string;
     useForward: boolean;

package/lib/index.js

@@ -32,31 +32,32 @@ var inject = ["database"];
 var Config = import_koishi.Schema.intersect([
   import_koishi.Schema.object({
     apiBaseUrl: import_koishi.Schema.string().default("http://172.0.0.1:4399").description("60s 服务 URL（不含 /v2 路径）"),
-    cooldownTime: import_koishi.Schema.number().default(30).min(5).max(300).description("冷却时间(秒)"),
+    cooldownTime: import_koishi.Schema.number().default(30).min(5).max(300).description("命令冷却时间(秒)，用户手动触发命令的间隔限制"),
+    scheduleCooldown: import_koishi.Schema.number().default(86400).min(0).description("定时任务防重发冷却时间(秒)，0表示不限制。默认86400秒=24小时"),
     enableLog: import_koishi.Schema.boolean().default(true).description("启用日志记录"),
     scheduleWhitelist: import_koishi.Schema.array(String).default([]).description("定时发送群组白名单频道ID列表（格式: platform:channelId，如 onebot:123456）")
   }).description("基础设置"),
   import_koishi.Schema.object({
     enableSchedule: import_koishi.Schema.boolean().default(false).description("启用定时发送新闻"),
-    scheduleTime: import_koishi.Schema.string().default("08:00").description("定时发送时间 (格式: HH:MM，每天固定时间)"),
+    scheduleTime: import_koishi.Schema.string().default("08:00").description("定时发送时间 (格式: HH:MM 或 HH:MM / Nd，如 08:00 或 08:00 / 1d，表示每天或每N天的固定时间)"),
     useForward: import_koishi.Schema.boolean().default(false).description("是否使用合并转发(仅QQ平台效果最佳)")
   }).description("每日新闻"),
   import_koishi.Schema.object({
     enableAiNewsSchedule: import_koishi.Schema.boolean().default(false).description("启用AI快报定时发送(仅当天)"),
-    aiNewsScheduleTime: import_koishi.Schema.string().default("22:00").description("AI快报定时发送时间 (格式: HH:MM，每天固定时间)"),
+    aiNewsScheduleTime: import_koishi.Schema.string().default("22:00").description("AI快报定时发送时间 (格式: HH:MM 或 HH:MM / Nd，如 22:00 或 22:00 / 1d)"),
     aiUseForward: import_koishi.Schema.boolean().default(false).description("AI快报是否使用合并转发(仅QQ平台效果最佳)")
   }).description("AI快报"),
   import_koishi.Schema.object({
     enableMoyuSchedule: import_koishi.Schema.boolean().default(false).description("启用摸鱼日报定时发送"),
-    moyuScheduleTime: import_koishi.Schema.string().default("10:00").description("摸鱼日报定时发送时间 (格式: HH:MM，每天固定时间)")
+    moyuScheduleTime: import_koishi.Schema.string().default("10:00").description("摸鱼日报定时发送时间 (格式: HH:MM 或 HH:MM / Nd，如 10:00 或 10:00 / 1d)")
   }).description("摸鱼日报"),
   import_koishi.Schema.object({
     enableGoldSchedule: import_koishi.Schema.boolean().default(false).description("启用今日金价定时发送"),
-    goldScheduleTime: import_koishi.Schema.string().default("09:00").description("今日金价定时发送时间 (格式: HH:MM，每天固定时间)")
+    goldScheduleTime: import_koishi.Schema.string().default("09:00").description("今日金价定时发送时间 (格式: HH:MM 或 HH:MM / Nd，如 09:00 或 09:00 / 1d)")
   }).description("今日金价"),
   import_koishi.Schema.object({
     enableFuelSchedule: import_koishi.Schema.boolean().default(false).description("启用今日油价定时发送"),
-    fuelScheduleTime: import_koishi.Schema.string().default("09:30").description("今日油价定时发送时间 (格式: HH:MM，每天固定时间)"),
+    fuelScheduleTime: import_koishi.Schema.string().default("09:30").description("今日油价定时发送时间 (格式: HH:MM 或 HH:MM / Nd，如 09:30 或 09:30 / 1d)"),
     fuelDefaultRegion: import_koishi.Schema.string().default("上海").description("今日油价默认地区")
   }).description("今日油价")
 ]);
@@ -70,13 +71,34 @@ function apply(ctx, config) {
   let moyuScheduleTimeout = null;
   let goldScheduleTimeout = null;
   let fuelScheduleTimeout = null;
-  const sentToday = {
-    news: "",
-    aiNews: "",
-    moyu: "",
-    gold: "",
-    fuel: ""
+  const lastSentTime = {
+    news: 0,
+    aiNews: 0,
+    moyu: 0,
+    gold: 0,
+    fuel: 0
   };
+  function isInCooldown(type) {
+    if (config.scheduleCooldown <= 0) {
+      return false;
+    }
+    const now = Date.now();
+    const lastTime = lastSentTime[type];
+    const cooldownMs = config.scheduleCooldown * 1e3;
+    return now - lastTime < cooldownMs;
+  }
+  __name(isInCooldown, "isInCooldown");
+  function getRemainingCooldown(type) {
+    if (config.scheduleCooldown <= 0) {
+      return 0;
+    }
+    const now = Date.now();
+    const lastTime = lastSentTime[type];
+    const cooldownMs = config.scheduleCooldown * 1e3;
+    const remaining = Math.ceil((lastTime + cooldownMs - now) / 1e3);
+    return Math.max(0, remaining);
+  }
+  __name(getRemainingCooldown, "getRemainingCooldown");
   function getTodayString() {
     const now = /* @__PURE__ */ new Date();
     const year = now.getFullYear();
@@ -455,7 +477,8 @@ ${newsItem.link}`).join("\n\n");
   }
   __name(sendMoyuToChannels, "sendMoyuToChannels");
   function formatGoldText(data) {
-    const metals = data.metals.filter((item) => item.name.includes("金价") || item.name.includes("伦敦金")).map((item) => {
+    const targetKeywords = ["黄金", "伦敦金", "白银", "钯金"];
+    const metals = data.metals.filter((item) => targetKeywords.some((keyword) => item.name.includes(keyword))).map((item) => {
       return `${item.name}: ${item.today_price}${item.unit}`;
     });
     return [
@@ -529,17 +552,21 @@ ${newsItem.link}`).join("\n\n");
   }
   __name(sendFuelToChannels, "sendFuelToChannels");
   function getMsUntilNextTime(timeStr) {
-    const timePattern = /^([0-1]?\d|2[0-3]):([0-5]\d)$/;
-    if (!timePattern.test(timeStr.trim())) {
+    const trimmedTimeStr = timeStr.trim();
+    const fullPattern = /^([0-1]?\d|2[0-3]):([0-5]\d)\s*(?:\/\s*(\d+)\s*d)?$/;
+    const match = trimmedTimeStr.match(fullPattern);
+    if (!match) {
       logError("60s API: 时间格式无效，跳过今天", { timeStr });
       return null;
     }
-    const [hours, minutes] = timeStr.split(":").map(Number);
+    const hours = parseInt(match[1], 10);
+    const minutes = parseInt(match[2], 10);
+    const daysInterval = match[3] ? parseInt(match[3], 10) : 1;
     const now = /* @__PURE__ */ new Date();
     const target = /* @__PURE__ */ new Date();
     target.setHours(hours, minutes, 0, 0);
     if (target <= now) {
-      target.setDate(target.getDate() + 1);
+      target.setDate(target.getDate() + daysInterval);
     }
     const msUntilNext = target.getTime() - now.getTime();
     if (!isFinite(msUntilNext) || msUntilNext <= 0) {
@@ -550,7 +577,14 @@ ${newsItem.link}`).join("\n\n");
   }
   __name(getMsUntilNextTime, "getMsUntilNextTime");
   function isTimePassedToday(timeStr) {
-    const [hours, minutes] = timeStr.split(":").map(Number);
+    const trimmedTimeStr = timeStr.trim();
+    const fullPattern = /^([0-1]?\d|2[0-3]):([0-5]\d)\s*(?:\/\s*(\d+)\s*d)?$/;
+    const match = trimmedTimeStr.match(fullPattern);
+    if (!match) {
+      return false;
+    }
+    const hours = parseInt(match[1], 10);
+    const minutes = parseInt(match[2], 10);
     const now = /* @__PURE__ */ new Date();
     const target = /* @__PURE__ */ new Date();
     target.setHours(hours, minutes, 0, 0);
@@ -568,20 +602,23 @@ ${newsItem.link}`).join("\n\n");
     }
     try {
       const today = getTodayString();
-      if (sentToday.news === today) {
-        logInfo("60s API: 今日新闻已发送过，设置为明天任务", { today });
+      const remainingCooldown = getRemainingCooldown("news");
+      if (isInCooldown("news")) {
+        logInfo("60s API: 新闻发送冷却中，跳过本次发送", {
+          today,
+          remainingCooldownSec: remainingCooldown,
+          scheduleCooldown: config.scheduleCooldown
+        });
         const msUntilNext2 = getMsUntilNextTime(config.scheduleTime);
         if (msUntilNext2 === null) {
           scheduleTimeout = setTimeout(() => {
-            sentToday.news = "";
             setupSchedule();
           }, 24 * 60 * 60 * 1e3);
           return;
         }
         scheduleTimeout = setTimeout(() => {
-          sentToday.news = "";
           setupSchedule();
-        }, msUntilNext2 + 24 * 60 * 60 * 1e3);
+        }, msUntilNext2);
         return;
       }
       const msUntilNext = getMsUntilNextTime(config.scheduleTime);
@@ -597,17 +634,18 @@ ${newsItem.link}`).join("\n\n");
         msUntilNext,
         nextRun: new Date(Date.now() + msUntilNext).toLocaleString(),
         whitelist: config.scheduleWhitelist,
-        today,
-        alreadySent: sentToday.news === today
+        scheduleCooldown: config.scheduleCooldown
       });
       scheduleTimeout = setTimeout(async () => {
-        if (sentToday.news === getTodayString()) {
-          logInfo("60s API: 今日新闻已在本次任务等待期间发送，跳过");
+        if (isInCooldown("news")) {
+          logInfo("60s API: 新闻发送冷却中，跳过本次发送", {
+            remainingCooldownSec: getRemainingCooldown("news")
+          });
           setupSchedule();
           return;
         }
         await sendNewsToChannels();
-        sentToday.news = getTodayString();
+        lastSentTime.news = Date.now();
         setupSchedule();
       }, msUntilNext);
     } catch (error) {
@@ -626,20 +664,23 @@ ${newsItem.link}`).join("\n\n");
     }
     try {
       const today = getTodayString();
-      if (sentToday.aiNews === today) {
-        logInfo("60s API: 今日AI快报已发送过，设置为明天任务", { today });
+      const remainingCooldown = getRemainingCooldown("aiNews");
+      if (isInCooldown("aiNews")) {
+        logInfo("60s API: AI快报发送冷却中，跳过本次发送", {
+          today,
+          remainingCooldownSec: remainingCooldown,
+          scheduleCooldown: config.scheduleCooldown
+        });
         const msUntilNext2 = getMsUntilNextTime(config.aiNewsScheduleTime);
         if (msUntilNext2 === null) {
           aiNewsScheduleTimeout = setTimeout(() => {
-            sentToday.aiNews = "";
             setupAiNewsSchedule();
           }, 24 * 60 * 60 * 1e3);
           return;
         }
         aiNewsScheduleTimeout = setTimeout(() => {
-          sentToday.aiNews = "";
           setupAiNewsSchedule();
-        }, msUntilNext2 + 24 * 60 * 60 * 1e3);
+        }, msUntilNext2);
         return;
       }
       const msUntilNext = getMsUntilNextTime(config.aiNewsScheduleTime);
@@ -654,16 +695,19 @@ ${newsItem.link}`).join("\n\n");
         scheduleTime: config.aiNewsScheduleTime,
         msUntilNext,
         nextRun: new Date(Date.now() + msUntilNext).toLocaleString(),
-        whitelist: config.scheduleWhitelist
+        whitelist: config.scheduleWhitelist,
+        scheduleCooldown: config.scheduleCooldown
       });
       aiNewsScheduleTimeout = setTimeout(async () => {
-        if (sentToday.aiNews === getTodayString()) {
-          logInfo("60s API: 今日AI快报已在本次任务等待期间发送，跳过");
+        if (isInCooldown("aiNews")) {
+          logInfo("60s API: AI快报发送冷却中，跳过本次发送", {
+            remainingCooldownSec: getRemainingCooldown("aiNews")
+          });
           setupAiNewsSchedule();
           return;
         }
         await sendAiNewsToChannels();
-        sentToday.aiNews = getTodayString();
+        lastSentTime.aiNews = Date.now();
         setupAiNewsSchedule();
       }, msUntilNext);
     } catch (error) {
@@ -682,20 +726,23 @@ ${newsItem.link}`).join("\n\n");
     }
     try {
       const today = getTodayString();
-      if (sentToday.moyu === today) {
-        logInfo("60s API: 今日摸鱼日报已发送过，设置为明天任务", { today });
+      const remainingCooldown = getRemainingCooldown("moyu");
+      if (isInCooldown("moyu")) {
+        logInfo("60s API: 摸鱼日报发送冷却中，跳过本次发送", {
+          today,
+          remainingCooldownSec: remainingCooldown,
+          scheduleCooldown: config.scheduleCooldown
+        });
         const msUntilNext2 = getMsUntilNextTime(config.moyuScheduleTime);
         if (msUntilNext2 === null) {
           moyuScheduleTimeout = setTimeout(() => {
-            sentToday.moyu = "";
             setupMoyuSchedule();
           }, 24 * 60 * 60 * 1e3);
           return;
         }
         moyuScheduleTimeout = setTimeout(() => {
-          sentToday.moyu = "";
           setupMoyuSchedule();
-        }, msUntilNext2 + 24 * 60 * 60 * 1e3);
+        }, msUntilNext2);
         return;
       }
       const msUntilNext = getMsUntilNextTime(config.moyuScheduleTime);
@@ -710,16 +757,19 @@ ${newsItem.link}`).join("\n\n");
         scheduleTime: config.moyuScheduleTime,
         msUntilNext,
         nextRun: new Date(Date.now() + msUntilNext).toLocaleString(),
-        whitelist: config.scheduleWhitelist
+        whitelist: config.scheduleWhitelist,
+        scheduleCooldown: config.scheduleCooldown
       });
       moyuScheduleTimeout = setTimeout(async () => {
-        if (sentToday.moyu === getTodayString()) {
-          logInfo("60s API: 今日摸鱼日报已在本次任务等待期间发送，跳过");
+        if (isInCooldown("moyu")) {
+          logInfo("60s API: 摸鱼日报发送冷却中，跳过本次发送", {
+            remainingCooldownSec: getRemainingCooldown("moyu")
+          });
           setupMoyuSchedule();
           return;
         }
         await sendMoyuToChannels();
-        sentToday.moyu = getTodayString();
+        lastSentTime.moyu = Date.now();
         setupMoyuSchedule();
       }, msUntilNext);
     } catch (error) {
@@ -738,20 +788,23 @@ ${newsItem.link}`).join("\n\n");
     }
     try {
       const today = getTodayString();
-      if (sentToday.gold === today) {
-        logInfo("60s API: 今日金价已发送过，设置为明天任务", { today });
+      const remainingCooldown = getRemainingCooldown("gold");
+      if (isInCooldown("gold")) {
+        logInfo("60s API: 今日金价发送冷却中，跳过本次发送", {
+          today,
+          remainingCooldownSec: remainingCooldown,
+          scheduleCooldown: config.scheduleCooldown
+        });
         const msUntilNext2 = getMsUntilNextTime(config.goldScheduleTime);
         if (msUntilNext2 === null) {
           goldScheduleTimeout = setTimeout(() => {
-            sentToday.gold = "";
             setupGoldSchedule();
           }, 24 * 60 * 60 * 1e3);
           return;
         }
         goldScheduleTimeout = setTimeout(() => {
-          sentToday.gold = "";
           setupGoldSchedule();
-        }, msUntilNext2 + 24 * 60 * 60 * 1e3);
+        }, msUntilNext2);
         return;
       }
       const msUntilNext = getMsUntilNextTime(config.goldScheduleTime);
@@ -766,16 +819,19 @@ ${newsItem.link}`).join("\n\n");
         scheduleTime: config.goldScheduleTime,
         msUntilNext,
         nextRun: new Date(Date.now() + msUntilNext).toLocaleString(),
-        whitelist: config.scheduleWhitelist
+        whitelist: config.scheduleWhitelist,
+        scheduleCooldown: config.scheduleCooldown
       });
       goldScheduleTimeout = setTimeout(async () => {
-        if (sentToday.gold === getTodayString()) {
-          logInfo("60s API: 今日金价已在本次任务等待期间发送，跳过");
+        if (isInCooldown("gold")) {
+          logInfo("60s API: 今日金价发送冷却中，跳过本次发送", {
+            remainingCooldownSec: getRemainingCooldown("gold")
+          });
           setupGoldSchedule();
           return;
         }
         await sendGoldToChannels();
-        sentToday.gold = getTodayString();
+        lastSentTime.gold = Date.now();
         setupGoldSchedule();
       }, msUntilNext);
     } catch (error) {
@@ -794,20 +850,23 @@ ${newsItem.link}`).join("\n\n");
     }
     try {
       const today = getTodayString();
-      if (sentToday.fuel === today) {
-        logInfo("60s API: 今日油价已发送过，设置为明天任务", { today });
+      const remainingCooldown = getRemainingCooldown("fuel");
+      if (isInCooldown("fuel")) {
+        logInfo("60s API: 今日油价发送冷却中，跳过本次发送", {
+          today,
+          remainingCooldownSec: remainingCooldown,
+          scheduleCooldown: config.scheduleCooldown
+        });
         const msUntilNext2 = getMsUntilNextTime(config.fuelScheduleTime);
         if (msUntilNext2 === null) {
           fuelScheduleTimeout = setTimeout(() => {
-            sentToday.fuel = "";
             setupFuelSchedule();
           }, 24 * 60 * 60 * 1e3);
           return;
         }
         fuelScheduleTimeout = setTimeout(() => {
-          sentToday.fuel = "";
           setupFuelSchedule();
-        }, msUntilNext2 + 24 * 60 * 60 * 1e3);
+        }, msUntilNext2);
         return;
       }
       const msUntilNext = getMsUntilNextTime(config.fuelScheduleTime);
@@ -822,16 +881,19 @@ ${newsItem.link}`).join("\n\n");
         scheduleTime: config.fuelScheduleTime,
         msUntilNext,
         nextRun: new Date(Date.now() + msUntilNext).toLocaleString(),
-        whitelist: config.scheduleWhitelist
+        whitelist: config.scheduleWhitelist,
+        scheduleCooldown: config.scheduleCooldown
       });
       fuelScheduleTimeout = setTimeout(async () => {
-        if (sentToday.fuel === getTodayString()) {
-          logInfo("60s API: 今日油价已在本次任务等待期间发送，跳过");
+        if (isInCooldown("fuel")) {
+          logInfo("60s API: 今日油价发送冷却中，跳过本次发送", {
+            remainingCooldownSec: getRemainingCooldown("fuel")
+          });
           setupFuelSchedule();
           return;
         }
         await sendFuelToChannels();
-        sentToday.fuel = getTodayString();
+        lastSentTime.fuel = Date.now();
         setupFuelSchedule();
       }, msUntilNext);
     } catch (error) {
@@ -1225,11 +1287,11 @@ ${shortDetail}
       clearTimeout(fuelScheduleTimeout);
       fuelScheduleTimeout = null;
     }
-    sentToday.news = "";
-    sentToday.aiNews = "";
-    sentToday.moyu = "";
-    sentToday.gold = "";
-    sentToday.fuel = "";
+    lastSentTime.news = 0;
+    lastSentTime.aiNews = 0;
+    lastSentTime.moyu = 0;
+    lastSentTime.gold = 0;
+    lastSentTime.fuel = 0;
   });
 }
 __name(apply, "apply");

package/package.json

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