poi-plugin-inventory-cleaner 1.16.2 → 1.17.1

package/i18n/en-US.json

@@ -39,6 +39,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

@@ -39,6 +39,7 @@
   "stock.batchToggle": "批量保留",
   "stock.categoryAll": "全部类别",
   "stock.backToTop": "回到顶部",
+  "stock.refreshQuest": "重新读取任务数据",
   "stock.categoryTitle": "按游戏装备类型筛选",
   "stock.sortTitle": "排序方式",
   "stock.sortVerdict": "按攻略判定",

package/index.js

@@ -12,7 +12,8 @@ const {
   summarize,
   OTHER_CATEGORY,
 } = require('./lib/inventory')
-const { buildQuestNeeds } = require('./lib/quest-needs')
+const { buildQuestNeeds, resetCaches: resetQuestNeeds } = require('./lib/quest-needs')
+const { resetCaches: resetQuestStatus } = require('./lib/quest-status')
 const { CSS } = require('./lib/style')
 
 const DICTIONARIES = {
@@ -71,18 +72,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
 }
 
@@ -435,8 +452,33 @@ 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
+      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 handleScroll = React.useCallback((event) => {
     setShowTop(event.currentTarget.scrollTop > 400)
   }, [])
@@ -488,10 +530,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 +648,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' },

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

@@ -62,10 +62,6 @@ function emptyPlannerState() {
 }
 
 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 +185,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
 }
 

package/package.json

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