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

package/lib/index.js

@@ -34,29 +34,29 @@ var Config = import_koishi.Schema.intersect([
     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("冷却时间(秒)"),
     enableLog: import_koishi.Schema.boolean().default(true).description("启用日志记录"),
-    scheduleWhitelist: import_koishi.Schema.array(String).default([]).description("定时发送群组白名单频道ID列表（为空=不发送）")
+    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 / 1d").description("定时发送时间 (格式: HH:MM / 1d)"),
+    scheduleTime: import_koishi.Schema.string().default("08:00").description("定时发送时间 (格式: HH:MM，每天固定时间)"),
     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 / 1d").description("AI快报定时发送时间 (格式: HH:MM / 1d)"),
+    aiNewsScheduleTime: import_koishi.Schema.string().default("22:00").description("AI快报定时发送时间 (格式: HH:MM，每天固定时间)"),
     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 / 1d").description("摸鱼日报定时发送时间 (格式: HH:MM / 1d)")
+    moyuScheduleTime: import_koishi.Schema.string().default("10:00").description("摸鱼日报定时发送时间 (格式: HH:MM，每天固定时间)")
   }).description("摸鱼日报"),
   import_koishi.Schema.object({
     enableGoldSchedule: import_koishi.Schema.boolean().default(false).description("启用今日金价定时发送"),
-    goldScheduleTime: import_koishi.Schema.string().default("09:00 / 1d").description("今日金价定时发送时间 (格式: HH:MM / 1d)")
+    goldScheduleTime: import_koishi.Schema.string().default("09:00").description("今日金价定时发送时间 (格式: HH:MM，每天固定时间)")
   }).description("今日金价"),
   import_koishi.Schema.object({
     enableFuelSchedule: import_koishi.Schema.boolean().default(false).description("启用今日油价定时发送"),
-    fuelScheduleTime: import_koishi.Schema.string().default("09:30 / 1d").description("今日油价定时发送时间 (格式: HH:MM / 1d)"),
+    fuelScheduleTime: import_koishi.Schema.string().default("09:30").description("今日油价定时发送时间 (格式: HH:MM，每天固定时间)"),
     fuelDefaultRegion: import_koishi.Schema.string().default("上海").description("今日油价默认地区")
   }).description("今日油价")
 ]);
@@ -65,27 +65,65 @@ function apply(ctx, config) {
   const normalizedApiBaseUrl = (config.apiBaseUrl || "http://172.0.0.1:4399").replace(/\/$/, "");
   const buildApiUrl = /* @__PURE__ */ __name((path) => `${normalizedApiBaseUrl}${path}`, "buildApiUrl");
   const cooldowns = /* @__PURE__ */ new Map();
-  let scheduleInterval = null;
-  let aiNewsScheduleInterval = null;
-  let moyuScheduleInterval = null;
-  let goldScheduleInterval = null;
-  let fuelScheduleInterval = null;
+  let scheduleTimeout = null;
+  let aiNewsScheduleTimeout = null;
+  let moyuScheduleTimeout = null;
+  let goldScheduleTimeout = null;
+  let fuelScheduleTimeout = null;
   async function resolveGroupScheduleChannels(whitelist, tag) {
     try {
       if (!whitelist.length) {
         logInfo("60s API: 未配置定时发送白名单", { tag });
         return [];
       }
+      const normalize = /* @__PURE__ */ __name((raw) => {
+        const value = String(raw || "").trim();
+        const withoutAt = value.includes("@") ? value.split("@")[0] : value;
+        const [platform, id] = withoutAt.includes(":") ? withoutAt.split(":", 2) : ["", withoutAt];
+        return {
+          raw: value,
+          withoutAt,
+          platform,
+          id
+        };
+      }, "normalize");
+      const whitelistNormalized = whitelist.map(normalize).filter((item) => item.withoutAt);
+      const whitelistKeys = /* @__PURE__ */ new Set();
+      whitelistNormalized.forEach((item) => {
+        whitelistKeys.add(item.raw);
+        whitelistKeys.add(item.withoutAt);
+        if (item.id) whitelistKeys.add(item.id);
+      });
       const assigned = await ctx.database.getAssignedChannels(["id", "platform", "guildId"]);
-      const groupChannels = assigned.filter((channel) => !!channel.guildId).map((channel) => `${channel.platform}:${channel.id}`);
+      logInfo("60s API: 获取到的频道列表", {
+        tag,
+        count: assigned.length,
+        channels: assigned.map((c) => ({ platform: c.platform, id: c.id, guildId: c.guildId }))
+      });
+      const groupChannels = assigned.filter((channel) => !!channel.guildId).map((channel) => ({
+        platform: channel.platform,
+        id: channel.id,
+        key: `${channel.platform}:${channel.id}`
+      }));
       if (!groupChannels.length) {
         logInfo("60s API: 没有可发送的群组频道", { tag });
         return [];
       }
-      const whitelistSet = new Set(whitelist);
-      const targets = groupChannels.filter((channelId) => whitelistSet.has(channelId));
+      logInfo("60s API: 群组频道列表", { tag, channels: groupChannels.map((c) => c.key) });
+      logInfo("60s API: 白名单配置(原始)", { tag, whitelist });
+      logInfo("60s API: 白名单配置(规范化)", {
+        tag,
+        whitelist: whitelistNormalized.map((w) => ({ raw: w.raw, withoutAt: w.withoutAt, id: w.id }))
+      });
+      const targets = groupChannels.filter((c) => whitelistKeys.has(c.key) || whitelistKeys.has(c.id)).map((c) => c.key);
       if (!targets.length) {
-        logInfo("60s API: 白名单未命中任何已加入群组频道", { tag });
+        logInfo("60s API: 白名单未命中任何已加入群组频道", {
+          tag,
+          groupChannels: groupChannels.map((c) => c.key),
+          whitelist
+        });
+      } else {
+        logInfo("60s API: 白名单匹配成功", { tag, targets });
       }
       return targets;
     } catch (error) {
@@ -253,7 +291,10 @@ function apply(ctx, config) {
   __name(getFuelPrice, "getFuelPrice");
   async function sendNewsToChannels() {
     const targetChannels = await resolveGroupScheduleChannels(config.scheduleWhitelist, "news");
-    if (targetChannels.length === 0) return;
+    if (targetChannels.length === 0) {
+      logInfo("60s API: 没有目标频道，跳过新闻发送");
+      return;
+    }
     try {
       const imageBuffer = await get60sNewsImage();
       const imageMessage = import_koishi.h.image(imageBuffer, "image/png");
@@ -329,7 +370,10 @@ ${newsItem.link}`).join("\n\n");
   __name(fetchAiNewsByDates, "fetchAiNewsByDates");
   async function sendAiNewsToChannels() {
     const targetChannels = await resolveGroupScheduleChannels(config.scheduleWhitelist, "ai-news");
-    if (targetChannels.length === 0) return;
+    if (targetChannels.length === 0) {
+      logInfo("60s API: 没有目标频道，跳过AI快报发送");
+      return;
+    }
     try {
       const response = await getAiNews({ encoding: "json" });
       if (response.code !== 200 || !response.data) {
@@ -371,7 +415,10 @@ ${newsItem.link}`).join("\n\n");
   __name(formatMoyuText, "formatMoyuText");
   async function sendMoyuToChannels() {
     const targetChannels = await resolveGroupScheduleChannels(config.scheduleWhitelist, "moyu");
-    if (targetChannels.length === 0) return;
+    if (targetChannels.length === 0) {
+      logInfo("60s API: 没有目标频道，跳过摸鱼日报发送");
+      return;
+    }
     try {
       const response = await getMoyuDaily("json");
       if (response.code !== 200 || !response.data) {
@@ -432,7 +479,10 @@ ${newsItem.link}`).join("\n\n");
   __name(formatFuelText, "formatFuelText");
   async function sendGoldToChannels() {
     const targetChannels = await resolveGroupScheduleChannels(config.scheduleWhitelist, "gold");
-    if (targetChannels.length === 0) return;
+    if (targetChannels.length === 0) {
+      logInfo("60s API: 没有目标频道，跳过金价发送");
+      return;
+    }
     try {
       const response = await getGoldPrice("json");
       if (response.code !== 200 || !response.data) {
@@ -455,7 +505,10 @@ ${newsItem.link}`).join("\n\n");
   __name(sendGoldToChannels, "sendGoldToChannels");
   async function sendFuelToChannels() {
     const targetChannels = await resolveGroupScheduleChannels(config.scheduleWhitelist, "fuel");
-    if (targetChannels.length === 0) return;
+    if (targetChannels.length === 0) {
+      logInfo("60s API: 没有目标频道，跳过油价发送");
+      return;
+    }
     try {
       const response = await getFuelPrice({ region: config.fuelDefaultRegion, encoding: "json" });
       if (response.code !== 200 || !response.data) {
@@ -476,49 +529,40 @@ ${newsItem.link}`).join("\n\n");
     }
   }
   __name(sendFuelToChannels, "sendFuelToChannels");
-  function parseScheduleTime(timeStr) {
-    if (timeStr.includes("/")) {
-      const [timePart] = timeStr.split(" / ");
-      const [hours, minutes] = timePart.split(":").map(Number);
-      const now = /* @__PURE__ */ new Date();
-      const targetTime = /* @__PURE__ */ new Date();
-      targetTime.setHours(hours, minutes, 0, 0);
-      if (targetTime <= now) {
-        targetTime.setDate(targetTime.getDate() + 1);
-      }
-      return targetTime.getTime() - now.getTime();
-    } else if (timeStr.includes("h")) {
-      const hours = parseInt(timeStr.replace("h", ""));
-      return hours * 60 * 60 * 1e3;
-    } else if (timeStr.includes("m")) {
-      const minutes = parseInt(timeStr.replace("m", ""));
-      return minutes * 60 * 1e3;
-    } else {
-      return 60 * 60 * 1e3;
+  function getMsUntilNextTime(timeStr) {
+    const [hours, minutes] = timeStr.split(":").map(Number);
+    const now = /* @__PURE__ */ new Date();
+    const target = /* @__PURE__ */ new Date();
+    target.setHours(hours, minutes, 0, 0);
+    if (target <= now) {
+      target.setDate(target.getDate() + 1);
     }
+    return target.getTime() - now.getTime();
   }
-  __name(parseScheduleTime, "parseScheduleTime");
+  __name(getMsUntilNextTime, "getMsUntilNextTime");
   function setupSchedule() {
     if (!config.enableSchedule) {
-      logInfo("60s API: 定时发送功能已禁用");
+      logInfo("60s API: 定时发送新闻功能已禁用");
       return;
     }
-    if (scheduleInterval) {
-      clearInterval(scheduleInterval);
-      scheduleInterval = null;
+    if (scheduleTimeout) {
+      clearTimeout(scheduleTimeout);
+      scheduleTimeout = null;
     }
     try {
-      const interval = parseScheduleTime(config.scheduleTime);
-      scheduleInterval = setInterval(async () => {
-        await sendNewsToChannels();
-      }, interval);
-      logInfo("60s API: 定时任务设置成功", {
+      const msUntilNext = getMsUntilNextTime(config.scheduleTime);
+      logInfo("60s API: 新闻定时任务已设置", {
         scheduleTime: config.scheduleTime,
-        interval,
-        channels: config.scheduleWhitelist
+        msUntilNext,
+        nextRun: new Date(Date.now() + msUntilNext).toLocaleString(),
+        whitelist: config.scheduleWhitelist
       });
+      scheduleTimeout = setTimeout(async () => {
+        await sendNewsToChannels();
+        setupSchedule();
+      }, msUntilNext);
     } catch (error) {
-      logError("60s API: 设置定时任务失败", error);
+      logError("60s API: 设置新闻定时任务失败", error);
     }
   }
   __name(setupSchedule, "setupSchedule");
@@ -527,20 +571,22 @@ ${newsItem.link}`).join("\n\n");
       logInfo("60s API: AI快报定时发送功能已禁用");
       return;
     }
-    if (aiNewsScheduleInterval) {
-      clearInterval(aiNewsScheduleInterval);
-      aiNewsScheduleInterval = null;
+    if (aiNewsScheduleTimeout) {
+      clearTimeout(aiNewsScheduleTimeout);
+      aiNewsScheduleTimeout = null;
     }
     try {
-      const interval = parseScheduleTime(config.aiNewsScheduleTime);
-      aiNewsScheduleInterval = setInterval(async () => {
-        await sendAiNewsToChannels();
-      }, interval);
-      logInfo("60s API: AI快报定时任务设置成功", {
+      const msUntilNext = getMsUntilNextTime(config.aiNewsScheduleTime);
+      logInfo("60s API: AI快报定时任务已设置", {
         scheduleTime: config.aiNewsScheduleTime,
-        interval,
-        channels: config.scheduleWhitelist
+        msUntilNext,
+        nextRun: new Date(Date.now() + msUntilNext).toLocaleString(),
+        whitelist: config.scheduleWhitelist
       });
+      aiNewsScheduleTimeout = setTimeout(async () => {
+        await sendAiNewsToChannels();
+        setupAiNewsSchedule();
+      }, msUntilNext);
     } catch (error) {
       logError("60s API: 设置AI快报定时任务失败", error);
     }
@@ -551,20 +597,22 @@ ${newsItem.link}`).join("\n\n");
       logInfo("60s API: 摸鱼日报定时发送功能已禁用");
       return;
     }
-    if (moyuScheduleInterval) {
-      clearInterval(moyuScheduleInterval);
-      moyuScheduleInterval = null;
+    if (moyuScheduleTimeout) {
+      clearTimeout(moyuScheduleTimeout);
+      moyuScheduleTimeout = null;
     }
     try {
-      const interval = parseScheduleTime(config.moyuScheduleTime);
-      moyuScheduleInterval = setInterval(async () => {
-        await sendMoyuToChannels();
-      }, interval);
-      logInfo("60s API: 摸鱼日报定时任务设置成功", {
+      const msUntilNext = getMsUntilNextTime(config.moyuScheduleTime);
+      logInfo("60s API: 摸鱼日报定时任务已设置", {
         scheduleTime: config.moyuScheduleTime,
-        interval,
-        channels: config.scheduleWhitelist
+        msUntilNext,
+        nextRun: new Date(Date.now() + msUntilNext).toLocaleString(),
+        whitelist: config.scheduleWhitelist
       });
+      moyuScheduleTimeout = setTimeout(async () => {
+        await sendMoyuToChannels();
+        setupMoyuSchedule();
+      }, msUntilNext);
     } catch (error) {
       logError("60s API: 设置摸鱼日报定时任务失败", error);
     }
@@ -575,20 +623,22 @@ ${newsItem.link}`).join("\n\n");
       logInfo("60s API: 今日金价定时发送功能已禁用");
       return;
     }
-    if (goldScheduleInterval) {
-      clearInterval(goldScheduleInterval);
-      goldScheduleInterval = null;
+    if (goldScheduleTimeout) {
+      clearTimeout(goldScheduleTimeout);
+      goldScheduleTimeout = null;
     }
     try {
-      const interval = parseScheduleTime(config.goldScheduleTime);
-      goldScheduleInterval = setInterval(async () => {
-        await sendGoldToChannels();
-      }, interval);
-      logInfo("60s API: 今日金价定时任务设置成功", {
+      const msUntilNext = getMsUntilNextTime(config.goldScheduleTime);
+      logInfo("60s API: 今日金价定时任务已设置", {
         scheduleTime: config.goldScheduleTime,
-        interval,
-        channels: config.scheduleWhitelist
+        msUntilNext,
+        nextRun: new Date(Date.now() + msUntilNext).toLocaleString(),
+        whitelist: config.scheduleWhitelist
       });
+      goldScheduleTimeout = setTimeout(async () => {
+        await sendGoldToChannels();
+        setupGoldSchedule();
+      }, msUntilNext);
     } catch (error) {
       logError("60s API: 设置今日金价定时任务失败", error);
     }
@@ -599,20 +649,22 @@ ${newsItem.link}`).join("\n\n");
       logInfo("60s API: 今日油价定时发送功能已禁用");
       return;
     }
-    if (fuelScheduleInterval) {
-      clearInterval(fuelScheduleInterval);
-      fuelScheduleInterval = null;
+    if (fuelScheduleTimeout) {
+      clearTimeout(fuelScheduleTimeout);
+      fuelScheduleTimeout = null;
     }
     try {
-      const interval = parseScheduleTime(config.fuelScheduleTime);
-      fuelScheduleInterval = setInterval(async () => {
-        await sendFuelToChannels();
-      }, interval);
-      logInfo("60s API: 今日油价定时任务设置成功", {
+      const msUntilNext = getMsUntilNextTime(config.fuelScheduleTime);
+      logInfo("60s API: 今日油价定时任务已设置", {
         scheduleTime: config.fuelScheduleTime,
-        interval,
-        channels: config.scheduleWhitelist
+        msUntilNext,
+        nextRun: new Date(Date.now() + msUntilNext).toLocaleString(),
+        whitelist: config.scheduleWhitelist
       });
+      fuelScheduleTimeout = setTimeout(async () => {
+        await sendFuelToChannels();
+        setupFuelSchedule();
+      }, msUntilNext);
     } catch (error) {
       logError("60s API: 设置今日油价定时任务失败", error);
     }
@@ -987,33 +1039,33 @@ ${shortDetail}
     }
   });
   ctx.on("ready", async () => {
-    await setupSchedule();
-    await setupAiNewsSchedule();
-    await setupMoyuSchedule();
-    await setupGoldSchedule();
-    await setupFuelSchedule();
+    setupSchedule();
+    setupAiNewsSchedule();
+    setupMoyuSchedule();
+    setupGoldSchedule();
+    setupFuelSchedule();
   });
   ctx.on("dispose", () => {
     cooldowns.clear();
-    if (scheduleInterval) {
-      clearInterval(scheduleInterval);
-      scheduleInterval = null;
+    if (scheduleTimeout) {
+      clearTimeout(scheduleTimeout);
+      scheduleTimeout = null;
     }
-    if (aiNewsScheduleInterval) {
-      clearInterval(aiNewsScheduleInterval);
-      aiNewsScheduleInterval = null;
+    if (aiNewsScheduleTimeout) {
+      clearTimeout(aiNewsScheduleTimeout);
+      aiNewsScheduleTimeout = null;
     }
-    if (moyuScheduleInterval) {
-      clearInterval(moyuScheduleInterval);
-      moyuScheduleInterval = null;
+    if (moyuScheduleTimeout) {
+      clearTimeout(moyuScheduleTimeout);
+      moyuScheduleTimeout = null;
     }
-    if (goldScheduleInterval) {
-      clearInterval(goldScheduleInterval);
-      goldScheduleInterval = null;
+    if (goldScheduleTimeout) {
+      clearTimeout(goldScheduleTimeout);
+      goldScheduleTimeout = null;
     }
-    if (fuelScheduleInterval) {
-      clearInterval(fuelScheduleInterval);
-      fuelScheduleInterval = null;
+    if (fuelScheduleTimeout) {
+      clearTimeout(fuelScheduleTimeout);
+      fuelScheduleTimeout = null;
     }
   });
 }