poi-plugin-quest-info-2 0.5.2 → 0.5.6

package/src/store/quest.ts

@@ -1,16 +1,9 @@
-import { useCallback, useEffect, useState } from 'react'
-import { checkIsKcwikiSupportedLanguages } from '.'
+import { useCallback } from 'react'
 import { QuestData } from '../../build/kcanotifyGamedata'
-import {
-  activeQuestsSelector,
-  GameQuest,
-  observePluginStore,
-  observePoiStore,
-  PoiQuestState,
-  usePluginTranslation,
-} from '../poi'
-import { getCategory, KcanotifyQuestExt } from '../questHelper'
-import { useKcwikiData } from './kcwiki'
+import { useGameQuest, usePluginTranslation } from '../poi/hooks'
+import { getCategory } from '../questHelper'
+import type { UnionQuest } from '../questHelper'
+import { useKcwikiData, checkIsKcwikiSupportedLanguages } from './kcwiki'
 import { useStore } from './store'
 
 const DEFAULT_LANG = 'ja-JP'
@@ -35,19 +28,6 @@ export const useLanguage = () => {
   return lang
 }
 
-const useActiveQuest = () => {
-  const [activeQuests, setActiveQuests] = useState<PoiQuestState>({})
-
-  useEffect(() => {
-    const listener = (activeQuests: PoiQuestState) =>
-      setActiveQuests(activeQuests)
-
-    return observePoiStore(listener, activeQuestsSelector)
-  }, [])
-
-  return activeQuests
-}
-
 const useQuestMap = () => {
   const lang = useLanguage()
   const kcwikiData = useKcwikiData(lang)
@@ -57,37 +37,21 @@ const useQuestMap = () => {
   return QuestData[lang]
 }
 
-const useGameQuest = () => {
-  const [quests, setQuests] = useState<GameQuest[] | null>(null)
-  useEffect(() => {
-    const listener = (quests: GameQuest[] | null) => setQuests(quests)
-    // See reducer.ts
-    return observePluginStore(listener, (i) => i?._?.questList)
-  }, [])
-  return quests
-}
-
-export const useQuest = (): KcanotifyQuestExt[] => {
-  const activeQuest = useActiveQuest()
-  const questMap = useQuestMap()
+export const useQuest = (): UnionQuest[] => {
+  const docQuestMap = useQuestMap()
   const gameQuest = useGameQuest()
   const {
     store: { syncWithGame },
   } = useStore()
 
-  if (syncWithGame) {
-    if (gameQuest == null) {
-      // TODO tip use to sync quest data
-      return []
-    }
+  if (syncWithGame && gameQuest.length) {
     return gameQuest.map((quest) => {
       const gameId = String(quest.api_no)
-      const active = gameId in activeQuest
-      if (gameId in questMap) {
+      if (gameId in docQuestMap) {
         return {
           gameId,
-          active,
-          ...questMap[gameId as unknown as keyof typeof questMap],
+          gameQuest: quest,
+          docQuest: docQuestMap[gameId as keyof typeof docQuestMap],
         }
       }
 
@@ -95,18 +59,21 @@ export const useQuest = (): KcanotifyQuestExt[] => {
       // May be a new quest
       return {
         gameId,
-        active,
-        code: `${getCategory(quest.api_category).wikiSymbol}?`,
-        name: quest.api_title,
-        desc: quest.api_detail,
+        gameQuest: quest,
+        docQuest: {
+          code: `${getCategory(quest.api_category).wikiSymbol}?`,
+          name: quest.api_title,
+          desc: quest.api_detail,
+        },
       }
     })
   } else {
     // Return all recorded quests
-    return Object.entries(questMap).map(([gameId, val]) => ({
+    return Object.entries(docQuestMap).map(([gameId, val]) => ({
       gameId,
-      active: gameId in activeQuest,
-      ...val,
+      // Maybe empty
+      gameQuest: gameQuest.find((quest) => quest.api_no === Number(gameId))!,
+      docQuest: val,
     }))
   }
 }

package/src/tags.ts

@@ -1,4 +1,4 @@
-import { IN_POI } from './poi'
+import { IN_POI } from './poi/env'
 import {
   isDailyQuest,
   isMonthlyQuest,
@@ -15,6 +15,7 @@ import {
   isUnknownCategoryQuest,
   isInProgressQuest,
 } from './questHelper'
+import type { UnionQuest } from './questHelper'
 
 const yes = () => true as const
 
@@ -25,16 +26,21 @@ export const ALL_CATEGORY_TAG = {
 
 export const ALL_TYPE_TAG = ALL_CATEGORY_TAG
 
+const withDocQuest =
+  (filterFn: (q: UnionQuest['docQuest']) => boolean) =>
+  (unionQuest: UnionQuest) =>
+    filterFn(unionQuest.docQuest)
+
 export const CATEGORY_TAGS = [
   ALL_CATEGORY_TAG,
-  { name: 'Composition', filter: isCompositionQuest },
-  { name: 'Sortie', filter: isSortieQuest },
-  { name: 'Exercise', filter: isExerciseQuest },
-  { name: 'Expedition', filter: isExpeditionQuest },
-  { name: 'Supply / Docking', filter: isSupplyOrDockingQuest },
-  { name: 'Arsenal', filter: isArsenalQuest },
-  { name: 'Modernization', filter: isModernizationQuest },
-  { name: 'Others', filter: isUnknownCategoryQuest },
+  { name: 'Composition', filter: withDocQuest(isCompositionQuest) },
+  { name: 'Sortie', filter: withDocQuest(isSortieQuest) },
+  { name: 'Exercise', filter: withDocQuest(isExerciseQuest) },
+  { name: 'Expedition', filter: withDocQuest(isExpeditionQuest) },
+  { name: 'Supply / Docking', filter: withDocQuest(isSupplyOrDockingQuest) },
+  { name: 'Arsenal', filter: withDocQuest(isArsenalQuest) },
+  { name: 'Modernization', filter: withDocQuest(isModernizationQuest) },
+  { name: 'Others', filter: withDocQuest(isUnknownCategoryQuest) },
 ] as const
 
 export const TYPE_TAGS = [

package/src/poi.ts

@@ -1,211 +0,0 @@
-import { useTranslation } from 'react-i18next'
-import { name as PACKAGE_NAME } from '../package.json'
-import type { PluginState } from './reducer'
-
-// See https://github.com/poooi/poi/blob/master/views/redux/info/quests.es
-export type GameQuest = {
-  // 1 Default
-  // 2 In progress
-  // 3 Completed
-  api_state: 1 | 2 | 3
-  api_no: number
-  api_title: string
-  api_detail: string
-  /**
-   * 任务类别
-   *
-   * 1. Composition
-   * 1. Sortie
-   * 1. Exercise
-   * 1. Expedition
-   * 1. Supply/Docking
-   * 1. Arsenal
-   * 1. Modernization
-   *
-   * @see https://github.com/poooi/plugin-quest/blob/master/index.es#L49-L57
-   */
-  api_category: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9
-  /**
-   * 任务类型
-   *
-   * 1. One-time
-   * 1. Daily
-   * 1. Weekly
-   * 1. -3rd/-7th/-0th
-   * 1. -2nd/-8th
-   * 1. Monthly
-   * 1. Quarterly
-   *
-   * @see https://github.com/poooi/plugin-quest/blob/master/index.es#L69-L77
-   */
-  api_type: 1 | 2 | 3 | 4 | 5 | 6 | 7
-  // Rewards 油弹钢铝
-  api_get_material: [number, number, number, number]
-  api_invalid_flag: 0
-  api_label_type: 1
-  // 0: Empty: [0.0, 0.5)
-  // 1: 50%: [0.5, 0.8)
-  // 2: 80%: [0.8, 1.0)
-  api_progress_flag: 0 | 1 | 2
-  api_select_rewards?: [
-    {
-      api_count: number
-      api_kind: number
-      api_mst_id: number
-      api_no: number
-    }[]
-  ]
-  api_voice_id: 0
-  api_bonus_flag: 1
-}
-
-type QuestListAction = {
-  type: '@@Response/kcsapi/api_get_member/questlist'
-  path: '/kcsapi/api_get_member/questlist'
-  postBody: {
-    api_verno: '1'
-    api_tab_id:
-      | '0' // All
-      | '9' // In progress
-      | '1' // Daily
-      | '2' // Weekly
-      | '3' // Monthly
-      | '4' // Once
-      | '5' // Others
-  }
-  body: {
-    api_completed_kind: number
-    // api_list.length
-    api_count: number
-    // In progress count
-    api_exec_count: number
-    api_exec_type: number
-    api_list: GameQuest[]
-  }
-}
-
-type OtherAction = {
-  type: 'otherString' // TODO fix me
-  path?: string
-  postBody?: unknown
-  body?: unknown
-}
-
-export type PoiAction = QuestListAction | OtherAction
-
-export type PoiState = {
-  ext: {
-    // TODO fix use constant PACKAGE_NAME
-    [packageName: string]: PluginState
-  }
-  plugins: { id: string; enabled: boolean; [x: string]: unknown }[]
-  [x: string]: any
-}
-
-type Store<S> = {
-  getState: () => S
-  subscribe: (listener: () => void) => () => void
-}
-
-// state.info.quests.activeQuests
-export type PoiQuestState = Record<number, { time: number; detail: GameQuest }>
-
-export const IN_POI = 'POI_VERSION' in globalThis
-
-const noop = () => {}
-const id = <T>(x: T) => x
-
-/**
- * Prevent webpack early error
- * Module not found: Error: Can't resolve 'views/create-store'
- * TODO fix webpack warn
- * Critical dependency: the request of a dependency is an expression
- */
-export const importFromPoi = <T = any>(path: string): Promise<T> => {
-  if (!IN_POI) {
-    return new Promise(() => {
-      // Never resolve
-    })
-  }
-  return import(path)
-}
-
-/**
- * See https://redux.js.org/api/store#subscribelistener
- */
-const observeStore = <State, SelectedState = State>(
-  store: Store<State>,
-  onChange: (state: SelectedState) => void,
-  selector: (s: State) => SelectedState = id as any
-) => {
-  let currentState: SelectedState
-
-  const handleChange = () => {
-    const nextState = selector(store.getState())
-    if (nextState !== currentState) {
-      currentState = nextState
-      onChange(currentState)
-    }
-  }
-
-  const unsubscribe = store.subscribe(handleChange)
-  handleChange()
-  return unsubscribe
-}
-
-export const observePoiStore = <SelectedState = PoiState>(
-  onChange: (state: SelectedState) => void,
-  selector: (state: PoiState) => SelectedState = id as any
-) => {
-  let valid = true
-  let unsubscribe = noop
-  getPoiStore().then((store) => {
-    if (!valid) {
-      return
-    }
-    unsubscribe = observeStore(store, onChange, selector)
-  })
-
-  return () => {
-    valid = false
-    unsubscribe()
-  }
-}
-
-export const observePluginStore = <SelectedState = PluginState>(
-  onChange: (state: SelectedState) => void,
-  selector: (state: PluginState) => SelectedState = id as any
-) => observePoiStore(onChange, (s) => selector(s?.ext[PACKAGE_NAME]))
-
-const fallbackStore: Store<PoiState> = {
-  getState: noop as () => PoiState,
-  subscribe: () => (() => {}) as () => () => void,
-}
-
-let globalStore: Store<PoiState> | null = null
-/**
- * Get poi global Store if in poi env
- */
-export const getPoiStore: () => Promise<Store<PoiState>> = async () => {
-  if (globalStore !== null) {
-    return globalStore
-  }
-  if (IN_POI) {
-    try {
-      const { store } = await importFromPoi('views/create-store')
-      globalStore = store
-      return store
-    } catch (error) {
-      console.warn('Load global store error', error)
-    }
-  }
-  globalStore = fallbackStore
-  return fallbackStore
-}
-
-export const activeQuestsSelector = (state: PoiState): PoiQuestState =>
-  state?.info?.quests?.activeQuests ?? {}
-
-export const usePluginTranslation = () => {
-  return useTranslation(PACKAGE_NAME)
-}