koishi-plugin-ll-schedule 1.7.3 → 1.7.5

package/index.js

@@ -627,6 +627,11 @@ function apply(ctx, config) {
     return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`
   }
 
+  // 分钟数 → "HH:MM"
+  function minToHM(min) {
+    return `${String(Math.floor(min / 60) % 24).padStart(2, '0')}:${String(min % 60).padStart(2, '0')}`
+  }
+
   // ===== 发送 =====
   const KNOWN_IGNORE_CODES = new Set([11293, 40034101, 40034105, 304101, 304102])
 
@@ -829,10 +834,19 @@ function apply(ctx, config) {
     // ① 活动表模式（有新活动表就只跑它，避免和旧任务重复发）
     const activities = parseActivities(config.activities)
     if (activities.length) {
+      const nowMin = hmToMin(hm)
       const reminds = computeReminders(activities, now, hm)
       for (const r of reminds) {
+        // 发送前复核：独立再算一次"这条提醒该在几点发"，对不上就拒发（防任何上游错位）
+        const fireMin = r.inst.startMin - (r.inst.advance || 0)
+        if (fireMin !== nowMin) {
+          logger.warn(`[schedule] 触发复核未通过，已拒发：「${r.inst.activity}」提醒点 ${minToHM(fireMin)}，当前 ${hm}`)
+          continue
+        }
         if (firedToday[r.key]) continue
         firedToday[r.key] = true
+        logger.info(`[schedule] 触发提醒：「${r.inst.activity}」星期${WEEK_CN[r.inst.day]} ${r.inst.start}-${r.inst.end}` +
+          `${r.inst.place ? '｜' + r.inst.place : ''}｜提醒点 ${minToHM(fireMin)}｜当前 ${hm}`)
         await sendReminder(r.inst, r.next, now, hm)
       }
       return
@@ -918,30 +932,60 @@ function apply(ctx, config) {
       return formatTaskList()
     })
 
-  // 自检：把"插件认为的当前时间 / 解析出的活动表 / 下一次提醒时刻"全打出来，便于排查
-  ctx.command('schedule.debug', '自检：查看当前时间、活动表解析结果、下一次提醒时刻')
-    .action(() => {
+  // 自检：看当前时间 / 活动表解析结果 / 某时刻会触发什么
+  // 可加参数模拟，如：schedule.debug 18:58  或  schedule.debug 周四18:58
+  ctx.command('schedule.debug [arg:text]', '自检：可加时间模拟（例：schedule.debug 18:58）')
+    .action((_, arg) => {
+      logger.info(`[schedule] 命令被调用: schedule.debug arg=${arg || ''}`)
       const now = new Date()
-      const day = todayDay(now)
-      const hm = nowHM(now)
-      const nowMin = hmToMin(hm)
+      const nowDay = todayDay(now)
       const acts = parseActivities(config.activities)
       const instances = expandInstances(acts)
+      let day = nowDay
+      let hm = nowHM(now)
+      let simulated = false
+      if (arg) {
+        const tm = String(arg).match(/(\d{1,2}):(\d{2})/)
+        if (tm) {
+          hm = `${String(tm[1]).padStart(2, '0')}:${tm[2]}`
+          simulated = true
+        }
+        const dm = String(arg).match(/(?:周|星期|礼拜)([一二三四五六日天1-7])/)
+        if (dm) {
+          const map = { '一': 1, '二': 2, '三': 3, '四': 4, '五': 5, '六': 6, '日': 7, '天': 7 }
+          day = map[dm[1]] || parseInt(dm[1], 10) || day
+          simulated = true
+        }
+      }
+      const simDate = new Date(now)
+      simDate.setDate(now.getDate() + ((day - nowDay + 7) % 7))
+
       const lines = [
-        `🕐 插件当前时间：${todayStr(now)} ${hm}:${String(now.getSeconds()).padStart(2, '0')}（星期${WEEK_CN[day]}）`,
-        `📋 活动表：解析出 ${acts.length} 个活动 / ${instances.length} 个时段实例`,
+        `🕐 插件当前时间：${todayStr(now)} ${nowHM(now)}:${String(now.getSeconds()).padStart(2, '0')}（星期${WEEK_CN[nowDay]}）`,
+        `📋 活动表：${acts.length} 个活动 / ${instances.length} 个时段实例`,
       ]
       for (const a of acts) {
-        lines.push(`【${a.name}】提前 ${a.advance} 分钟，${a.slots.length} 行`)
+        lines.push(`【${a.name}】提前 ${a.advance} 分钟`)
         for (const s of a.slots) {
-          lines.push(`　· ${s.wd} ${s.start}-${s.end}${s.place ? '　地点：' + s.place : ''}`)
+          lines.push(`　· ${s.wd} ${s.start}-${s.end}${s.place ? '　' + s.place : ''}`)
+        }
+      }
+      const label = `${simulated ? '模拟' : '当前'} ${todayStr(simDate)} ${hm}（星期${WEEK_CN[day]}）`
+      const hits = computeReminders(acts, simDate, hm)
+      if (hits.length) {
+        for (const h of hits) {
+          lines.push(`🔔 ${label} 会触发：「${h.inst.activity}」${h.inst.start}-${h.inst.end}${h.inst.place ? '　' + h.inst.place : ''}（提前 ${h.inst.advance} 分钟）`)
         }
       }
-      // 下一次提醒
+      else {
+        lines.push(`🔔 ${label} 不会触发任何提醒`)
+      }
+      // 下一次提醒（按当前时刻往后算）
+      const nowMin = hmToMin(nowHM(now))
       let best = null
       for (const inst of instances) {
         const fireMin = inst.startMin - (inst.advance || 0)
-        let offset = (inst.day - day + 7) % 7
+        let offset = (inst.day - nowDay + 7) % 7
         if (offset === 0 && fireMin <= nowMin) offset = 7
         const key = offset * 1440 + fireMin
         if (!best || key < best.key) best = { key, inst, offset, fireMin }
@@ -949,14 +993,12 @@ function apply(ctx, config) {
       if (best) {
         const hh = String(Math.floor(best.fireMin / 60)).padStart(2, '0')
         const mm = String(best.fireMin % 60).padStart(2, '0')
-        const when = best.offset === 0 ? '今天' : `星期${WEEK_CN[((day - 1 + best.offset) % 7) + 1]}`
+        const when = best.offset === 0 ? '今天' : `星期${WEEK_CN[((nowDay - 1 + best.offset) % 7) + 1]}`
         lines.push(`⏭ 下一次提醒：「${best.inst.activity}」${when} ${hh}:${mm}（活动 ${best.inst.start}-${best.inst.end}${best.inst.place ? '　' + best.inst.place : ''}）`)
       }
-      else {
-        lines.push('⏭ 下一次提醒：（活动表为空）')
-      }
       lines.push(`💾 已订阅群：${(subs.get(ALL) || new Map()).size} 个`)
-      logger.info('[schedule] 命令被调用: schedule.debug')
+      const fired = Object.keys(firedToday).filter(k => k !== 'date')
+      lines.push(`📤 今天已发过的提醒（${firedToday.date || todayStr(now)}）：${fired.length ? fired.join('、') : '无'}`)
       return lines.join('\n')
     })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-ll-schedule",
-  "version": "1.7.3",
+  "version": "1.7.5",
   "description": "Scheduled message sender with weekly slots (per-day time & content), QQ official markdown card support",
   "main": "index.js",
   "files": [
@@ -35,3 +35,5 @@
 
 
 
+
+