poi-plugin-inventory-cleaner 1.16.2 → 1.18.0

package/i18n/en-US.json

@@ -29,7 +29,10 @@
   "stock.consumeQuestEquip": "quest (equip)",
   "stock.consumeQuestStore": "quest (store)",
   "stock.consumeOther": "other",
-  "stock.consumeHidden": "{{count}} completed quest(s) hidden",
+  "stock.consumeHidden": "{{count}} completed quest(s) hidden (click to view/undo)",
+  "stock.markDone": "Mark as completed",
+  "stock.undoDone": "Undo completed mark",
+  "stock.undo": "Undo",
   "stock.keepLabel": "Keep",
   "stock.keepUnit": "",
   "stock.keepPlaceholder": "guide",
@@ -39,6 +42,7 @@
   "stock.batchToggle": "Batch keep",
   "stock.categoryAll": "All categories",
   "stock.backToTop": "Back to top",
+  "stock.refreshQuest": "Reload quest data",
   "stock.categoryTitle": "Filter by in-game equipment type",
   "stock.sortTitle": "Sort by",
   "stock.sortVerdict": "Guide verdict",

package/i18n/zh-CN.json

@@ -29,7 +29,10 @@
   "stock.consumeQuestEquip": "任务·装",
   "stock.consumeQuestStore": "任务·库",
   "stock.consumeOther": "其他",
-  "stock.consumeHidden": "已隐藏 {{count}} 个已完成任务",
+  "stock.consumeHidden": "已隐藏 {{count}} 个已完成任务（点击查看/撤销）",
+  "stock.markDone": "标记为已完成",
+  "stock.undoDone": "撤销完成标记",
+  "stock.undo": "撤销",
   "stock.keepLabel": "保留",
   "stock.keepUnit": "件",
   "stock.keepPlaceholder": "攻略",
@@ -39,6 +42,7 @@
   "stock.batchToggle": "批量保留",
   "stock.categoryAll": "全部类别",
   "stock.backToTop": "回到顶部",
+  "stock.refreshQuest": "重新读取任务数据",
   "stock.categoryTitle": "按游戏装备类型筛选",
   "stock.sortTitle": "排序方式",
   "stock.sortVerdict": "按攻略判定",

package/index.js

@@ -10,9 +10,16 @@ const {
   stepKeep,
   sortRows,
   summarize,
+  questNoFromText,
   OTHER_CATEGORY,
 } = require('./lib/inventory')
-const { buildQuestNeeds } = require('./lib/quest-needs')
+const { buildQuestNeeds, resetCaches: resetQuestNeeds } = require('./lib/quest-needs')
+const {
+  markManual,
+  recordQuestStates,
+  resetCaches: resetQuestStatus,
+  unmarkManual,
+} = require('./lib/quest-status')
 const { CSS } = require('./lib/style')
 
 const DICTIONARIES = {
@@ -71,18 +78,34 @@ function getState() {
 let snapshot = null
 let snapshotEquips = null
 let snapshotConst = null
+let snapshotQuests = null
+let snapshotExtQuest = null
 
 function getSnapshot() {
   const state = getState()
   const equips =
     state && state.info && state.info.equips ? state.info.equips : null
   const constant = state ? state.const : null
-  if (snapshot && snapshotEquips === equips && snapshotConst === constant) {
+  const quests =
+    state && state.info && state.info.quests ? state.info.quests : null
+  const ext = state && state.ext ? state.ext : null
+  const extQuest =
+    (ext && (ext['poi-plugin-quest-info-2'] || ext['poi-plugin-quest-info'])) || null
+
+  if (
+    snapshot &&
+    snapshotEquips === equips &&
+    snapshotConst === constant &&
+    snapshotQuests === quests &&
+    snapshotExtQuest === extQuest
+  ) {
     return snapshot
   }
   snapshotEquips = equips
   snapshotConst = constant
-  snapshot = state ? { info: { equips }, const: constant } : null
+  snapshotQuests = quests
+  snapshotExtQuest = extQuest
+  snapshot = state ? { info: { equips, quests }, const: constant, ext } : null
   return snapshot
 }
 
@@ -257,7 +280,7 @@ function CategoryPicker({ value, groups, onChange }) {
   )
 }
 
-function StockRow({ row, onKeepChange }) {
+function StockRow({ row, onKeepChange, onMarkDone, onUndoDone }) {
   const verdict = VERDICT[row.verdict] || VERDICT.unknown
   return h(
     'div',
@@ -365,20 +388,63 @@ function StockRow({ row, onKeepChange }) {
           h(
             'ol',
             { className: 'stock-consume-list' },
-            row.consumedItems.map((item, index) =>
-              h(
-                'li',
-                { key: index, className: 'is-' + item.kind },
-                h('span', { className: 'stock-consume-tag' }, consumeLabel(item.tag)),
-                h('span', { className: 'stock-consume-text' }, item.text),
+            row.consumedItems
+              .filter((item) => !item.done)
+              .map((item, index) =>
+                h(
+                  'li',
+                  { key: index, className: 'is-' + item.kind },
+                  h('span', { className: 'stock-consume-tag' }, consumeLabel(item.tag)),
+                  h('span', { className: 'stock-consume-text' }, item.text),
+                  item.kind === 'quest'
+                    ? h(
+                        'button',
+                        {
+                          type: 'button',
+                          className: 'stock-consume-done',
+                          title: t('stock.markDone'),
+                          onClick: () =>
+                            onMarkDone(questNoFromText(item.text), item.text),
+                        },
+                        '✓',
+                      )
+                    : null,
+                ),
               ),
-            ),
           ),
           row.consumedHidden > 0
             ? h(
-                'div',
+                'details',
                 { className: 'stock-consume-hidden' },
-                t('stock.consumeHidden', { count: row.consumedHidden }),
+                h(
+                  'summary',
+                  null,
+                  t('stock.consumeHidden', { count: row.consumedHidden }),
+                ),
+                h(
+                  'ul',
+                  { className: 'stock-consume-done-list' },
+                  row.consumedItems
+                    .filter((item) => item.done)
+                    .map((item, index) =>
+                      h(
+                        'li',
+                        { key: index, className: 'is-' + item.kind },
+                        h('span', { className: 'stock-consume-tag' }, consumeLabel(item.tag)),
+                        h('span', { className: 'stock-consume-text' }, item.text),
+                        h(
+                          'button',
+                          {
+                            type: 'button',
+                            className: 'stock-consume-undo',
+                            title: t('stock.undoDone'),
+                            onClick: () => onUndoDone(questNoFromText(item.text)),
+                          },
+                          t('stock.undo'),
+                        ),
+                      ),
+                    ),
+                ),
               )
             : null,
         )
@@ -435,8 +501,50 @@ function App() {
   const [batchOpen, setBatchOpen] = React.useState(false)
   const [batchValues, setBatchValues] = React.useState({})
   const [showTop, setShowTop] = React.useState(false)
+  const [questTick, setQuestTick] = React.useState(0)
   const rootRef = React.useRef(null)
 
+  React.useEffect(() => {
+    const onResponse = (event) => {
+      const detail = event && event.detail
+      const path = detail && detail.path ? String(detail.path) : ''
+      if (!/questlist/.test(path)) return
+      try {
+        recordQuestStates(detail)
+      } catch (_error) {
+        // 记录失败不影响刷新
+      }
+      resetQuestNeeds()
+      resetQuestStatus()
+      setQuestTick((value) => value + 1)
+      window.setTimeout(() => {
+        resetQuestNeeds()
+        resetQuestStatus()
+        setQuestTick((value) => value + 1)
+      }, 1500)
+    }
+    window.addEventListener('game.response', onResponse)
+    return () => window.removeEventListener('game.response', onResponse)
+  }, [])
+
+  const refreshQuestData = React.useCallback(() => {
+    resetQuestNeeds()
+    resetQuestStatus()
+    setQuestTick((value) => value + 1)
+  }, [])
+
+  const handleMarkDone = React.useCallback((no, title) => {
+    if (!no) return
+    markManual(no, title)
+    setQuestTick((value) => value + 1)
+  }, [])
+
+  const handleUndoDone = React.useCallback((no) => {
+    if (!no) return
+    unmarkManual(no)
+    setQuestTick((value) => value + 1)
+  }, [])
+
   const handleScroll = React.useCallback((event) => {
     setShowTop(event.currentTarget.scrollTop > 400)
   }, [])
@@ -488,10 +596,10 @@ function App() {
     saveKeeps(keeps)
   }, [keeps])
 
-  const needs = React.useMemo(() => buildQuestNeeds(state), [state])
+  const needs = React.useMemo(() => buildQuestNeeds(state), [state, questTick])
   const rows = React.useMemo(
     () => buildInventory(state, { questNeeds: needs, keeps }),
-    [state, needs, keeps],
+    [state, needs, keeps, questTick],
   )
   const summary = React.useMemo(() => summarize(rows), [rows])
 
@@ -606,6 +714,16 @@ function App() {
         h('option', { value: 'name' }, t('stock.sortName')),
         h('option', { value: 'category' }, t('stock.sortCategory')),
       ),
+      h(
+        'button',
+        {
+          type: 'button',
+          className: 'stock-chip stock-refresh',
+          title: t('stock.refreshQuest'),
+          onClick: refreshQuestData,
+        },
+        '↻',
+      ),
       h(
         'div',
         { className: 'stock-views' },
@@ -729,7 +847,15 @@ function App() {
       : h(
           'div',
           { className: 'stock-list' },
-          visible.map((row) => h(StockRow, { key: row.id, row, onKeepChange: handleKeepChange })),
+          visible.map((row) =>
+            h(StockRow, {
+              key: row.id,
+              row,
+              onKeepChange: handleKeepChange,
+              onMarkDone: handleMarkDone,
+              onUndoDone: handleUndoDone,
+            }),
+          ),
         ),
     h('p', { className: 'stock-warn' }, t('stock.warn')),
     h('p', { className: 'stock-source' }, t('stock.source')),

package/lib/inventory.js

@@ -168,7 +168,7 @@ function buildInventory(state, options = {}) {
       usage: rule ? rule.usage : '',
       obtain: rule ? rule.obtain : '',
       consumed,
-      consumedItems: allConsumed.filter((item) => !item.done),
+      consumedItems: allConsumed,
       consumedHidden: allConsumed.filter((item) => item.done).length,
       stage: guide ? guide.stage : '',
       note: guide ? guide.note : '',

package/lib/quest-needs.js

@@ -123,8 +123,6 @@ function clampCount(value) {
 }
 
 function readCachedQuests(now = Date.now()) {
-  if (cacheState.quests && now - cacheState.at < CACHE_TTL) return cacheState.quests
-
   const file = questCachePath()
   try {
     const stat = fs.statSync(file)
@@ -185,10 +183,6 @@ function questPlannerStatePath() {
  * 里面的 observed 是它见过的任务（含标题/说明/状态），completed 是已完成集合。
  */
 function readQuestPlanner(now = Date.now()) {
-  if (plannerCache.quests && now - plannerCache.at < CACHE_TTL) {
-    return plannerCache.quests
-  }
-
   const file = questPlannerStatePath()
   try {
     const stat = fs.statSync(file)

package/lib/quest-status.js

@@ -57,15 +57,107 @@ function questPlannerStatePath() {
   return path.join(root, 'state.json')
 }
 
+function pluginDataDir() {
+  return path.join(appDataPath(), 'poi', 'plugin-data', 'poi-plugin-inventory-cleaner')
+}
+
+function readJsonFile(file) {
+  try {
+    return JSON.parse(fs.readFileSync(file, 'utf8').replace(/^\uFEFF/, ''))
+  } catch (_error) {
+    return null
+  }
+}
+
+function writeJsonFile(file, value) {
+  try {
+    fs.mkdirSync(path.dirname(file), { recursive: true })
+    fs.writeFileSync(file, JSON.stringify(value, null, 1), 'utf8')
+  } catch (_error) {
+    // 写不进就只影响本次
+  }
+}
+
+function manualPath() {
+  return path.join(pluginDataDir(), 'quest-manual.json')
+}
+
+function autoPath() {
+  return path.join(pluginDataDir(), 'quest-auto.json')
+}
+
+function readMarked(file) {
+  const raw = readJsonFile(file)
+  const nos = new Set()
+  if (raw && typeof raw === 'object') {
+    for (const key of Object.keys(raw)) {
+      const no = Number(key)
+      if (no) nos.add(no)
+    }
+  }
+  return nos
+}
+
+/** 用户手动标记完成的任务。 */
+function getManualCompleted() {
+  return readMarked(manualPath())
+}
+
+/** 从任务列表响应里记下来的「达成」任务（api_state === 3）。 */
+function getAutoCompleted() {
+  return readMarked(autoPath())
+}
+
+function markManual(no, title) {
+  const value = Number(no)
+  if (!value) return false
+  const file = manualPath()
+  const raw = readJsonFile(file) || {}
+  raw[String(value)] = { at: Date.now(), title: String(title || '') }
+  writeJsonFile(file, raw)
+  return true
+}
+
+function unmarkManual(no) {
+  const value = Number(no)
+  if (!value) return false
+  const file = manualPath()
+  const raw = readJsonFile(file) || {}
+  if (!raw[String(value)]) return false
+  delete raw[String(value)]
+  writeJsonFile(file, raw)
+  return true
+}
+
+/**
+ * 记录一次 questlist 响应：api_state === 3 的任务记为已完成，长期保存。
+ */
+function recordQuestStates(detail) {
+  const body = detail && detail.body
+  const list = body && Array.isArray(body.api_list) ? body.api_list : null
+  if (!list || list.length === 0) return 0
+
+  const file = autoPath()
+  const raw = readJsonFile(file) || {}
+  let added = 0
+  for (const quest of list) {
+    if (!quest) continue
+    const no = Number(quest.api_no)
+    if (!no || Number(quest.api_state) !== 3) continue
+    if (!raw[String(no)]) {
+      raw[String(no)] = { at: Date.now(), title: String(quest.api_title || '') }
+      added += 1
+    }
+  }
+  if (added > 0) writeJsonFile(file, raw)
+  return added
+}
+
 function emptyPlannerState() {
   return { completed: new Set(), available: new Set() }
 }
 
 function readPlannerState(now = Date.now()) {
-  if (plannerCache.completed && now - plannerCache.at < CACHE_TTL) {
-    return plannerCache
-  }
-
   const file = questPlannerStatePath()
   try {
     const stat = fs.statSync(file)
@@ -189,8 +281,10 @@ function expandCompleted(completed, available) {
     }
   }
 
-  // 现在还能接的任务，一定没完成；数据互相矛盾时以「可接」为准
-  for (const no of available) result.delete(no)
+  // 还能接的任务不算完成；但如果它同时出现在「确定完成」里，以确定完成为准
+  for (const no of available) {
+    if (!completed.has(no)) result.delete(no)
+  }
   return result
 }
 
@@ -201,6 +295,8 @@ function getCompletedQuestNos(state) {
   const completed = new Set([
     ...fromState.completed,
     ...planner.completed,
+    ...getManualCompleted(),
+    ...getAutoCompleted(),
   ])
   const available = new Set([
     ...fromState.available,
@@ -217,8 +313,13 @@ function resetCaches() {
 
 module.exports = {
   expandCompleted,
+  getAutoCompleted,
   getCompletedQuestNos,
+  getManualCompleted,
+  markManual,
   readCachedAvailable,
   readPlannerState,
+  recordQuestStates,
   resetCaches,
+  unmarkManual,
 }

package/lib/style.js

@@ -438,9 +438,77 @@ const CSS = `
 }
 
 .stock-consume-hidden {
-  margin-top: 2px;
-  font-size: 10px;
-  opacity: 0.4;
+  margin-top: 4px;
+  font-size: 10.5px;
+  opacity: 0.55;
+}
+
+.stock-consume-hidden > summary {
+  cursor: pointer;
+  list-style: none;
+  user-select: none;
+}
+
+.stock-consume-hidden > summary::-webkit-details-marker {
+  display: none;
+}
+
+.stock-consume-done-list {
+  margin: 4px 0 0;
+  padding: 0;
+  list-style: none;
+  display: grid;
+  gap: 3px;
+}
+
+.stock-consume-done-list li {
+  display: flex;
+  align-items: baseline;
+  gap: 6px;
+}
+
+.stock-consume-done-list .stock-consume-text {
+  text-decoration: line-through;
+  opacity: 0.7;
+}
+
+.stock-consume-done {
+  flex: none;
+  width: 20px;
+  height: 20px;
+  padding: 0;
+  border: 1px solid var(--stock-border);
+  border-radius: 5px;
+  color: var(--stock-green);
+  background: transparent;
+  font-family: inherit;
+  font-size: 11px;
+  line-height: 1;
+  cursor: pointer;
+  opacity: 0.55;
+}
+
+.stock-consume-done:hover {
+  opacity: 1;
+  border-color: var(--stock-green);
+}
+
+.stock-consume-undo {
+  flex: none;
+  height: 18px;
+  padding: 0 6px;
+  border: 1px solid var(--stock-border);
+  border-radius: 5px;
+  color: inherit;
+  background: transparent;
+  font-family: inherit;
+  font-size: 9.5px;
+  cursor: pointer;
+}
+
+.stock-consume-undo:hover {
+  border-color: var(--stock-indigo);
+  color: var(--stock-indigo);
 }
 
 .stock-consume-text {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-inventory-cleaner",
-  "version": "1.16.2",
+  "version": "1.18.0",
   "description": "库存清理大师：对照改修攻略与保留上限，找出囤积过量、可以清理的装备，并标出不能拆的改修材料。",
   "main": "index.js",
   "files": [