daily-question 1.1.0 → 2.0.0

package/lib/exam-dates.js

@@ -253,16 +253,17 @@ export function computeCountdown(year, examInfo, today = todayISO()) {
     return base
   }
 
-  const diff = calendarDiff(today, examInfo.date) || { years: 0, months: 0, days: 0 }
-  base.calendar = diff
+  base.calendar = calendarDiff(today, examInfo.date)
+  const years = Math.floor(remaining / 365)
+  const months = Math.floor((remaining % 365) / 30)
+  const days = (remaining % 365) % 30
   base.lines = {
     primary: `距离${year}考研还剩${approxPrefix}${remaining}天`,
-    secondary: `距离${year}考研还剩${approxPrefix}${diff.years}年${diff.months}个月${diff.days}天`,
+    secondary: remaining <= 30 ? '' : `${approxPrefix}${years ? `${years}年` : ''}${months ? `${months}个月` : ''}${days ? `${days}天` : ''}`,
     target: targetText,
   }
   if (remaining === 0) {
     base.lines.primary = `距离${year}考研还剩${approxPrefix}0天（今日开考）`
-    base.lines.secondary = `距离${year}考研还剩${approxPrefix}0年0个月0天`
   }
   return base
 }
@@ -372,14 +373,15 @@ export function addDays(iso, days) {
  * 今年 12 月那场考试对应的入学年份是 year + 1。一旦这场初试结束，窗口整体
  * 后移一年：
  *   2026-11-04（初试前）→ 2027 / 2028 / 2029
- *   2026-12-20（初试后）→ 2028 / 2029 / 2030
+ *   2026-12-21（初试后）→ 2028 / 2029 / 2030
  */
-export function yearOptions(today = todayISO()) {
+export function yearOptions(today = todayISO(), overrides = {}) {
   const parts = parseISODate(today)
   const year = parts?.year ?? new Date().getFullYear()
   const session = year + 1
-  const sessionExamDate = resolveExamDate(session).date
-  const finished = Boolean(sessionExamDate) && daysBetween(sessionExamDate, today) > 0
+  const exam = resolveExamDate(session, overrides)
+  const endDate = exam.endDate || exam.date
+  const finished = Boolean(endDate) && daysBetween(endDate, today) > 0
   const first = finished ? session + 1 : session
   return [first, first + 1, first + 2]
 }

package/lib/generate.js

@@ -1,4 +1,4 @@
-import { describeSubjectForPrompt, QUESTION_TYPE_LABEL, CHOICE_TYPES, subjectTypes } from './subjects.js'
+import { describeSubjectForPrompt, QUESTION_TYPE_LABEL, CHOICE_TYPES } from './subjects.js'
 import { asString, asStringArray, generateText, parseJsonLoose, resolveModel } from './llm-json.js'
 
 /**
@@ -55,7 +55,7 @@ const VERIFIER_SYSTEM = `你是一位独立于命题人的审题与答案校验
  * @returns {{question: object, verification: object}}
  */
 export async function createVerifiedQuestion({ ctx, subject, examInfo, signal, preferredType }) {
-  const allowed = subjectTypes(subject.id, [])
+  const allowed = subject.types
   const allowedLabels = allowed.map((type) => QUESTION_TYPE_LABEL[type] || type)
   const typeHint = preferredType && allowed.includes(preferredType) ? preferredType : allowed[Math.floor(Math.random() * allowed.length)]
   const trail = []
@@ -348,7 +348,7 @@ const REVISER_SYSTEM = `你是一位考研命题组的答案复核老师。你
  * 只有校验通过的候选才允许替换正式版本。
  */
 export async function reviseAnswer({ ctx, subject, examInfo, question, currentAnswer, reason, signal }) {
-  const allowed = subjectTypes(question.subjectId, [])
+  const allowed = subject?.types || [question.type]
   let feedback = ''
   let lastReview = null
   let modelIdentity = ''

package/lib/routes.js

@@ -69,6 +69,7 @@ export function registerRoutes(webServer, service, logger = console) {
     judge: (args) => service.judge(args),
     favorite: (args) => service.favorite(args),
     removeFromWrongBook: (args) => service.removeFromWrongBook(args),
+    bulkQuestions: (args) => service.bulkQuestions(args),
     revise: (args) => service.revise(args),
     confirmRevision: (args) => service.confirmRevision(args),
     discardRevision: (args) => service.discardRevision(args),

package/lib/service.js

@@ -90,8 +90,8 @@ export class DailyQuestionService {
 
   async bootstrap() {
     const today = todayISO()
-    const options = yearOptions(today)
     let data = await this.data()
+    const options = yearOptions(today, data.examDates)
     // 旧设置可能落在窗口外（它的初试早已结束）：自动收敛到可选的最早一年
     if (!options.includes(data.settings.targetYear)) {
       await this.store.update((draft) => {
@@ -179,6 +179,7 @@ export class DailyQuestionService {
 
   isWrong(question, attempts) {
     if (question.wrongBookRemoved) return false
+    if (question.wrongBookAdded) return true
     const own = attempts.filter((attempt) => attempt.questionId === question.id)
     return own.some((attempt) => attempt.result === 'wrong')
   }
@@ -206,7 +207,7 @@ export class DailyQuestionService {
       }
       if (patch.targetYear !== undefined) {
         const year = Math.trunc(Number(patch.targetYear))
-        const allowed = yearOptions()
+        const allowed = yearOptions(todayISO(), draft.examDates)
         if (!Number.isFinite(year) || !allowed.includes(year)) {
           throw new Error(`考研年份只能选 ${allowed[0]}、${allowed[1]}、${allowed[2]}（初试已结束的年份不再提供）`)
         }
@@ -371,8 +372,7 @@ export class DailyQuestionService {
     }
     if (!candidates.length) return null
     candidates.sort((a, b) => String(a.lastAssignedDate).localeCompare(String(b.lastAssignedDate)))
-    const fresh = candidates.filter((candidate) => candidate.lastAssignedDate !== date)
-    const pool = fresh.length ? fresh : candidates
+    const pool = candidates.filter((candidate) => candidate.lastAssignedDate === candidates[0].lastAssignedDate)
     const chosen = pool[Math.floor(Math.random() * pool.length)]
     const repeated = Boolean(chosen.lastAssignedDate)
     return { ...chosen, repeated }
@@ -540,6 +540,7 @@ export class DailyQuestionService {
       type: question.type,
       typeLabel: QUESTION_TYPE_LABEL[question.type] || question.type,
       summary: summariseStem(question.stem),
+      stem: question.stem,
       assignedDate: question.assignedDate,
       attemptCount: attempts.length,
       favorite: Boolean(question.favoriteAt),
@@ -581,7 +582,8 @@ export class DailyQuestionService {
     const question = data.questions[qid]
     if (!question) throw new Error('题目不存在（可能已随题库删除而失效）')
     const thread = this.threadView(data, qid)
-    return { ok: true, question: this.questionView(data, question), thread }
+    const isToday = data.daily[`${todayISO()}|${question.subjectId}`]?.questionId === qid
+    return { ok: true, question: this.questionView(data, question), thread, isToday }
   }
 
   threadView(data, qid) {
@@ -600,12 +602,6 @@ export class DailyQuestionService {
     const data = await this.data()
     const question = data.questions[qid]
     if (!question) throw new Error('题目不存在')
-    if (attemptId) {
-      const existing = data.attempts.find((attempt) => attempt.id === attemptId)
-      if (existing) {
-        return { ok: true, question: this.questionView(await this.data(), question), duplicated: true }
-      }
-    }
     const isChoice = CHOICE_TYPES.has(question.type)
     let result = 'pending'
     let normalizedChoice = ''
@@ -635,18 +631,23 @@ export class DailyQuestionService {
       judgedAt: mode === 'done' ? null : stamp,
     }
 
-    await this.store.update((draft) => {
+    const duplicated = await this.store.update((draft) => {
       const target = draft.questions[qid]
       if (!target) throw new Error('题目不存在')
+      const existing = draft.attempts.find((item) => item.id === attempt.id)
+      if (existing) {
+        if (existing.questionId !== qid) throw new Error('作答 ID 已用于其他题目')
+        return true
+      }
       draft.attempts.push(attempt)
       if (target.currentAnswer && !target.currentAnswer.firstShownAt) {
         target.currentAnswer.firstShownAt = stamp
       }
       target.updatedAt = stamp
-      return draft
+      return false
     })
     const fresh = await this.data()
-    return { ok: true, question: this.questionView(fresh, fresh.questions[qid] || question) }
+    return { ok: true, question: this.questionView(fresh, fresh.questions[qid] || question), duplicated }
   }
 
   async judge({ qid, verdict }) {
@@ -689,6 +690,47 @@ export class DailyQuestionService {
     return { ok: true, question: this.questionView(data, data.questions[qid]), counts: this.counts(data) }
   }
 
+  async bulkQuestions({ qids, action, confirmProtected = false }) {
+    if (!Array.isArray(qids) || !qids.length || qids.some((id) => typeof id !== 'string' || !id)) {
+      throw new Error('请选择需要管理的题目')
+    }
+    if (!['delete', 'favorite', 'unfavorite', 'wrong', 'unwrong'].includes(action)) throw new Error('未知的批量操作')
+    const ids = new Set(qids)
+    const result = await this.store.update((draft) => {
+      const questions = [...ids].map((id) => {
+        if (!Object.hasOwn(draft.questions, id)) throw new Error('部分题目已不存在，请刷新列表后重试')
+        return draft.questions[id]
+      })
+      const protectedCount = questions.filter((q) => q.favoriteAt || this.isWrong(q, draft.attempts)).length
+      if (action === 'delete' && protectedCount && confirmProtected !== true) {
+        return { requiresConfirmation: true, protectedCount }
+      }
+      const stamp = nowISO()
+      for (const q of questions) {
+        if (action === 'delete') {
+          delete draft.questions[q.id]
+          delete draft.threads[q.id]
+        } else {
+          if (action === 'favorite') q.favoriteAt = stamp
+          if (action === 'unfavorite') q.favoriteAt = null
+          if (action === 'wrong' || action === 'unwrong') {
+            q.wrongBookAdded = action === 'wrong'
+            q.wrongBookRemoved = action === 'unwrong'
+          }
+          q.updatedAt = stamp
+        }
+      }
+      if (action === 'delete') {
+        draft.attempts = draft.attempts.filter((attempt) => !ids.has(attempt.questionId))
+        for (const [key, record] of Object.entries(draft.daily)) {
+          if (ids.has(record.questionId)) delete draft.daily[key]
+        }
+      }
+      return { affected: ids.size }
+    })
+    return { ok: true, ...result, counts: this.counts(await this.data()) }
+  }
+
   /* ------------------------------ 答案修订 ------------------------------ */
 
   async revise({ qid, reason = '' }) {
@@ -797,6 +839,7 @@ export class DailyQuestionService {
 
     // 先落盘用户消息：即使回复失败，用户输入也不会丢，并且可以按同一 id 重试。
     await this.store.update((draft) => {
+      if (!draft.questions[qid]) throw new Error('题目已删除')
       if (!draft.threads[qid]) {
         draft.threads[qid] = { threadId: qid, questionId: qid, messages: [], updatedAt: stamp }
       }
@@ -847,6 +890,7 @@ export class DailyQuestionService {
         status: 'sent',
       }
       await this.store.update((draft) => {
+        if (!draft.questions[qid]) throw new Error('题目已删除')
         if (!draft.threads[qid]) draft.threads[qid] = { threadId: qid, questionId: qid, messages: [], updatedAt: nowISO() }
         const thread = draft.threads[qid]
         const target = thread.messages.find((item) => item.id === messageId)

package/lib/store.js

@@ -147,18 +147,18 @@ export class Store {
       const draft = structuredClone(data)
       const result = await mutate(draft)
       draft.updatedAt = new Date().toISOString()
+      await this.write(draft)
       this.data = draft
-      await this.write()
       return result
     }
     this.queue = this.queue.then(run, run)
     return this.queue
   }
 
-  async write() {
+  async write(data = this.data) {
     await mkdir(this.dir, { recursive: true })
     const tmp = `${this.file}.${process.pid}.${Date.now()}.tmp`
-    await writeFile(tmp, JSON.stringify(this.data, null, 2), 'utf8')
+    await writeFile(tmp, JSON.stringify(data, null, 2), 'utf8')
     await rename(tmp, this.file)
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "daily-question",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "private": false,
   "type": "module",
   "description": "考研每日一题 — DSH 插件：每科每天一道独立校验过的考研题，含倒计时、错题本、收藏与按题隔离的追问。",