- Lv. {challengeSelected?.EventList1[0].Level}
-
+ {floorSideList.map((side, i) => {
+ const eventList = side.id === "firstNode"
+ ? challengeSelected?.EventList1
+ : side.id === "secondNode"
+ ? challengeSelected?.EventList2
+ : side.id === "thirdNode"
+ ? eventSelected?.Tierce?.EventList
+ : [];
-
- {mapMonster?.[monsterId.toString()]?.Image?.IconPath && (
-
-
-
- )}
-
+ if (!eventList || eventList.length === 0) return null;
+ const targetEvent = eventList[0];
-
-
-
-
HP
-
{monsterStats.hp.toLocaleString(undefined, { maximumFractionDigits: 0 })}
+ return (
+
+
{side.wave}
+
+ {targetEvent && Object.values(targetEvent.Infinite || []).map((waveValue, waveIndex) => (
+
+
{transI18n("wave")} {waveIndex + 1}
+
+ {Array.from(new Set(waveValue.MonsterList)).map((monsterId, enemyIndex) => {
+ const monsterStats = calcMonsterStats(
+ mapMonster?.[monsterId.toString()],
+ waveValue.EliteGroup,
+ targetEvent?.HardLevelGroup,
+ targetEvent?.Level,
+ hardLevelConfig,
+ eliteConfig
+ );
+ return (
+
+
+ Lv. {targetEvent.Level}
-
-
Speed
-
{monsterStats.spd.toLocaleString(undefined, { maximumFractionDigits: 0 })}
+
+ {mapMonster?.[monsterId.toString()]?.Image?.IconPath && (
+
+
+
+ )}
-
-
Toughness
-
{monsterStats.stance.toLocaleString(undefined, { maximumFractionDigits: 0 })}
+
+
+
+ HP
+ {monsterStats.hp.toLocaleString(undefined, { maximumFractionDigits: 0 })}
+
+
+
+ Speed
+ {monsterStats.spd.toLocaleString(undefined, { maximumFractionDigits: 0 })}
+
+
+
+ Toughness
+ {monsterStats.stance.toLocaleString(undefined, { maximumFractionDigits: 0 })}
+
+
+
+
+
+ Weakness
+
+
+ {mapMonster?.[monsterId.toString()]?.StanceWeakList?.map((icon, iconIndex) => (
+
+ ))}
+
+
-
-
-
- Weakness
-
-
- {mapMonster?.[monsterId.toString()]?.StanceWeakList?.map((icon, iconIndex) => (
-
- ))}
-
-
-
-
- )
- })}
-
+ )
+ })}
+
+
+ ))}
- ))}
-
-
- {/* Second Half */}
-
-
{transI18n("secondHalfEnemies")}
-
- {challengeSelected && Object.values(challengeSelected?.EventList2[0]?.Infinite || []).map((waveValue, waveIndex) => (
-
-
{transI18n("wave")} {waveIndex + 1}
-
- {Array.from(new Set(waveValue.MonsterList)).map((monsterId, enemyIndex) => {
- const monsterStats = calcMonsterStats(
- mapMonster?.[monsterId.toString()],
- waveValue.EliteGroup,
- challengeSelected?.EventList2?.[0]?.HardLevelGroup,
- challengeSelected?.EventList2?.[0]?.Level,
- hardLevelConfig,
- eliteConfig
- );
- return (
-
-
- Lv. {challengeSelected?.EventList2[0].Level}
-
-
-
- {mapMonster?.[monsterId.toString()]?.Image?.IconPath && (
-
-
-
- )}
-
-
-
-
-
- HP
- {monsterStats.hp.toLocaleString(undefined, { maximumFractionDigits: 0 })}
-
-
-
- Speed
- {monsterStats.spd.toLocaleString(undefined, { maximumFractionDigits: 0 })}
-
-
-
- Toughness
- {monsterStats.stance.toLocaleString(undefined, { maximumFractionDigits: 0 })}
-
-
-
-
-
- Weakness
-
-
- {mapMonster?.[monsterId.toString()]?.StanceWeakList?.map((icon, iconIndex) => (
-
- ))}
-
-
-
-
- )
- })}
-
-
- ))}
-
+ )
+ })}
)}
diff --git a/src/components/quickView/index.tsx b/src/components/quickView/index.tsx
index fdabb58..186f88c 100644
--- a/src/components/quickView/index.tsx
+++ b/src/components/quickView/index.tsx
@@ -278,33 +278,33 @@ export default function QuickView() {
if (avatarProfile?.lightcone && mapLightCone[avatarProfile?.lightcone?.item_id]) {
const lightconePromotion = calcPromotion(avatarProfile?.lightcone?.level)
statsData.HP.value += calcBaseStatRaw(
- mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats[lightconePromotion]?.BaseHP,
+ mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats?.[lightconePromotion]?.BaseHP,
mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats[lightconePromotion]?.BaseHPAdd,
avatarProfile?.lightcone?.level
)
statsData.HP.base += calcBaseStatRaw(
- mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats[lightconePromotion]?.BaseHP,
- mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats[lightconePromotion]?.BaseHPAdd,
+ mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats?.[lightconePromotion]?.BaseHP,
+ mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats?.[lightconePromotion]?.BaseHPAdd,
avatarProfile?.lightcone?.level
)
statsData.ATK.value += calcBaseStatRaw(
- mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats[lightconePromotion]?.BaseAttack,
- mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats[lightconePromotion]?.BaseAttackAdd,
+ mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats?.[lightconePromotion]?.BaseAttack,
+ mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats?.[lightconePromotion]?.BaseAttackAdd,
avatarProfile?.lightcone?.level
)
statsData.ATK.base += calcBaseStatRaw(
- mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats[lightconePromotion]?.BaseAttack,
- mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats[lightconePromotion]?.BaseAttackAdd,
+ mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats?.[lightconePromotion]?.BaseAttack,
+ mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats?.[lightconePromotion]?.BaseAttackAdd,
avatarProfile?.lightcone?.level
)
statsData.DEF.value += calcBaseStatRaw(
- mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats[lightconePromotion]?.BaseDefence,
- mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats[lightconePromotion]?.BaseDefenceAdd,
+ mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats?.[lightconePromotion]?.BaseDefence,
+ mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats?.[lightconePromotion]?.BaseDefenceAdd,
avatarProfile?.lightcone?.level
)
statsData.DEF.base += calcBaseStatRaw(
- mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats[lightconePromotion]?.BaseDefence,
- mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats[lightconePromotion]?.BaseDefenceAdd,
+ mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats?.[lightconePromotion]?.BaseDefence,
+ mapLightCone?.[avatarProfile?.lightcone?.item_id]?.Stats?.[lightconePromotion]?.BaseDefenceAdd,
avatarProfile?.lightcone?.level
)
diff --git a/src/components/showcaseCard/index.tsx b/src/components/showcaseCard/index.tsx
index eba07f8..bd0b3a4 100644
--- a/src/components/showcaseCard/index.tsx
+++ b/src/components/showcaseCard/index.tsx
@@ -95,20 +95,20 @@ export default function ShowCaseInfo() {
if (!avatarSelected || !avatarProfile?.lightcone || !mapLightCone[avatarProfile?.lightcone?.item_id]) return
const promotion = calcPromotion(avatarProfile?.lightcone?.level)
const atkStat = calcBaseStat(
- mapLightCone[avatarProfile?.lightcone?.item_id].Stats[promotion].BaseAttack,
- mapLightCone[avatarProfile?.lightcone?.item_id].Stats[promotion].BaseAttackAdd,
+ mapLightCone[avatarProfile?.lightcone?.item_id]?.Stats?.[promotion]?.BaseAttack,
+ mapLightCone[avatarProfile?.lightcone?.item_id]?.Stats?.[promotion]?.BaseAttackAdd,
0,
avatarProfile?.lightcone?.level
)
const hpStat = calcBaseStat(
- mapLightCone[avatarProfile?.lightcone?.item_id].Stats[promotion].BaseHP,
- mapLightCone[avatarProfile?.lightcone?.item_id].Stats[promotion].BaseHPAdd,
+ mapLightCone[avatarProfile?.lightcone?.item_id]?.Stats?.[promotion]?.BaseHP,
+ mapLightCone[avatarProfile?.lightcone?.item_id]?.Stats?.[promotion]?.BaseHPAdd,
0,
avatarProfile?.lightcone?.level
)
const defStat = calcBaseStat(
- mapLightCone[avatarProfile?.lightcone?.item_id].Stats[promotion].BaseDefence,
- mapLightCone[avatarProfile?.lightcone?.item_id].Stats[promotion].BaseDefenceAdd,
+ mapLightCone[avatarProfile?.lightcone?.item_id]?.Stats?.[promotion]?.BaseDefence,
+ mapLightCone[avatarProfile?.lightcone?.item_id]?.Stats?.[promotion]?.BaseDefenceAdd,
0,
avatarProfile?.lightcone?.level
)
diff --git a/src/helper/calcData.ts b/src/helper/calcData.ts
index 020e8bc..4201b81 100644
--- a/src/helper/calcData.ts
+++ b/src/helper/calcData.ts
@@ -24,7 +24,10 @@ export function calcPromotion(level: number) {
}
-export function calcRarity(rarity: string) {
+export function calcRarity(rarity?: string) {
+ if (!rarity) {
+ return 1
+ }
if (rarity.includes("5")) {
return 5
}
@@ -40,11 +43,12 @@ export function calcRarity(rarity: string) {
export function calcMainAffixBonus(affix?: MainAffixData, level?: number) {
if (!affix || typeof level !== "number") return "0"
const value = affix.BaseValue + affix.LevelAdd * level;
+ const statMeta = mappingStats[affix.Property]
- if (mappingStats?.[affix.Property].unit === "%") {
+ if (statMeta?.unit === "%") {
return (value * 100).toFixed(1);
}
- if (mappingStats?.[affix.Property].name === "SPD") {
+ if (statMeta?.name === "SPD") {
return value.toFixed(1);
}
@@ -53,10 +57,11 @@ export function calcMainAffixBonus(affix?: MainAffixData, level?: number) {
export const calcAffixBonus = (affix?: SubAffixData, stepCount?: number, rollCount?: number) => {
if (!affix || typeof stepCount !== "number" || typeof rollCount !== "number") return "0"
- if (mappingStats?.[affix.Property].unit === "%") {
+ const statMeta = mappingStats[affix.Property]
+ if (statMeta?.unit === "%") {
return ((affix.BaseValue * rollCount + affix.StepValue * stepCount) * 100).toFixed(1);
}
- if (mappingStats?.[affix.Property].name === "SPD") {
+ if (statMeta?.name === "SPD") {
return (affix.BaseValue * rollCount + affix.StepValue * stepCount).toFixed(1);
}
return (affix.BaseValue * rollCount + affix.StepValue * stepCount).toFixed(0);
@@ -107,6 +112,16 @@ export const calcMonsterStats = (
hardLevelConfig: Record
>,
eliteConfig: Record
) => {
+ if (!monster?.Base || !monster?.Modify) {
+ return {
+ atk: 0,
+ def: 0,
+ hp: 0,
+ spd: 0,
+ stance: 0,
+ }
+ }
+
let hardLevelRatio = {
AttackRatio: 1,
DefenceRatio:1,
@@ -135,4 +150,4 @@ export const calcMonsterStats = (
spd: monster.Base.SpeedBase * monster.Modify.SpeedModifyRatio * hardLevelRatio.SpeedRatio * eliteRatio.SpeedRatio,
stance: (monster.Base.StanceBase * monster.Modify.StanceModifyRatio * hardLevelRatio.StanceRatio * eliteRatio.StanceRatio) / 3,
}
-}
\ No newline at end of file
+}
diff --git a/src/helper/converterToAvatarStore.ts b/src/helper/converterToAvatarStore.ts
index dfe5fe3..7641a23 100644
--- a/src/helper/converterToAvatarStore.ts
+++ b/src/helper/converterToAvatarStore.ts
@@ -15,7 +15,7 @@ export function converterToAvatarStore(data: Record): { [k
avatar_id: Number(key),
data: {
rank: 0,
- skills: Object.values(value.SkillTrees).reduce((acc, dataPointEntry) => {
+ skills: Object.values(value.SkillTrees ?? {}).reduce((acc, dataPointEntry) => {
const firstEntry = Object.values(dataPointEntry)[0];
if (firstEntry) {
acc[firstEntry.PointID] = firstEntry.MaxLevel;
@@ -42,7 +42,8 @@ export function converterToAvatarStore(data: Record): { [k
}
export function converterOneEnkaDataToAvatarStore(data: AvatarEnkaDetail, count: number): AvatarProfileStore | null {
- if (!data.equipment && (!data.relicList || data.relicList.length === 0)) return null
+ const relicList = data.relicList ?? []
+ if (!data.equipment && relicList.length === 0) return null
const profile: AvatarProfileStore = {
profile_name: `Enka Profile ${count}`,
lightcone: (data.equipment && data.equipment.tid) ? {
@@ -51,12 +52,12 @@ export function converterOneEnkaDataToAvatarStore(data: AvatarEnkaDetail, count:
rank: data.equipment?.rank ?? 0,
promotion: data.equipment?.promotion ?? 0,
} : null,
- relics: Object.fromEntries(data.relicList.map((relic) => [relic.tid.toString()[relic.tid.toString().length - 1], {
+ relics: Object.fromEntries(relicList.map((relic) => [relic.tid.toString()[relic.tid.toString().length - 1], {
level: relic.level ?? 0,
relic_id: relic.tid,
relic_set_id: parseInt(relic.tid.toString().slice(1, -1), 10),
main_affix_id: relic.mainAffixId,
- sub_affixes: relic.subAffixList.map((subAffix) => ({
+ sub_affixes: (relic.subAffixList ?? []).map((subAffix) => ({
sub_affix_id: subAffix.affixId,
count: subAffix.cnt,
step: subAffix.step ?? 0
@@ -68,8 +69,8 @@ export function converterOneEnkaDataToAvatarStore(data: AvatarEnkaDetail, count:
export function converterOneFreeSRDataToAvatarStore(data: FreeSRJson, count: number , avatar_id: number): AvatarProfileStore | null {
- const lightcone = data.lightcones.find((lightcone) => lightcone.equip_avatar === avatar_id)
- const relics = data.relics.filter((relic) => relic.equip_avatar === avatar_id)
+ const lightcone = (data.lightcones ?? []).find((lightcone) => lightcone.equip_avatar === avatar_id)
+ const relics = (data.relics ?? []).filter((relic) => relic.equip_avatar === avatar_id)
if (!lightcone && (!relics || relics.length === 0)) return null
const relicsMap = {} as Record
@@ -79,7 +80,7 @@ export function converterOneFreeSRDataToAvatarStore(data: FreeSRJson, count: num
relic_id: relic.relic_id,
relic_set_id: relic.relic_set_id,
main_affix_id: relic.main_affix_id,
- sub_affixes: relic.sub_affixes.map((subAffix) => ({
+ sub_affixes: (relic.sub_affixes ?? []).map((subAffix) => ({
sub_affix_id: subAffix.sub_affix_id,
count: subAffix.count,
step: subAffix.step ?? 0
diff --git a/src/helper/converterToFreeSRJson.ts b/src/helper/converterToFreeSRJson.ts
index fcf1896..958ced3 100644
--- a/src/helper/converterToFreeSRJson.ts
+++ b/src/helper/converterToFreeSRJson.ts
@@ -84,7 +84,9 @@ export function converterToFreeSRJson(
let internalUidLightcone = 0
let internalUidRelic = 0
- Object.entries(avatars).forEach(([avatarId, avatar]) => {
+ Object.entries(avatars ?? {}).forEach(([avatarId, avatar]) => {
+ if (!avatar) return
+
const skillsByAnchorType: Record = {}
for (const [skillId, level] of Object.entries(avatar?.data?.skills || {})) {
if (skillConfig?.[skillId]) {
@@ -95,17 +97,20 @@ export function converterToFreeSRJson(
owner_uid: Number(avatar.owner_uid || 0),
avatar_id: Number(avatar.avatar_id || 0),
data: {
- rank: Number(avatar.data.rank || 0),
- skills: avatar.data.skills,
+ rank: Number(avatar.data?.rank || 0),
+ skills: avatar.data?.skills ?? {},
skills_by_anchor_type: Object.keys(skillsByAnchorType).length > 0 ? skillsByAnchorType : undefined,
},
level: Number(avatar.level || 0),
promotion: Number(avatar.promotion || 0),
- techniques: avatar.techniques,
+ techniques: avatar.techniques ?? [],
sp_value: Number(avatar.sp_value || 0),
sp_max: Number(avatar.sp_max || 0),
+ enhanced_id: avatar.enhanced ? Number(avatar.enhanced || 0) : undefined,
}
- const currentProfile = avatar.profileList[avatar.profileSelect]
+ const currentProfile = avatar.profileList?.[avatar.profileSelect] ?? avatar.profileList?.[0]
+ if (!currentProfile) return
+
if (currentProfile.lightcone && currentProfile.lightcone.item_id !== 0) {
const newLightcone: LightconeJson = {
level: Number(currentProfile.lightcone.level || 0),
@@ -128,7 +133,7 @@ export function converterToFreeSRJson(
relic_id: Number(relic.relic_id || 0),
relic_set_id: Number(relic.relic_set_id || 0),
main_affix_id: Number(relic.main_affix_id || 0),
- sub_affixes: relic.sub_affixes,
+ sub_affixes: relic.sub_affixes ?? [],
internal_uid: internalUidRelic,
equip_avatar: Number(avatar.avatar_id || 0),
}
@@ -146,4 +151,4 @@ export function converterToFreeSRJson(
avatars: avatarsJson,
battle_config: battleJson,
}
-}
\ No newline at end of file
+}
diff --git a/src/helper/getName.ts b/src/helper/getName.ts
index 0560298..273f461 100644
--- a/src/helper/getName.ts
+++ b/src/helper/getName.ts
@@ -43,8 +43,6 @@ export function getLocaleName(locale: string, data: Record | und
return ""
}
-
-
const langKey = listCurrentLanguageApi[locale as keyof typeof listCurrentLanguageApi].toLowerCase();
let text = data[langKey] ?? "";
diff --git a/src/helper/getSkillTree.ts b/src/helper/getSkillTree.ts
index 4fd5e8e..e886e5e 100644
--- a/src/helper/getSkillTree.ts
+++ b/src/helper/getSkillTree.ts
@@ -12,7 +12,7 @@ export function getSkillTree(avatarSelected: AvatarDetail | null, enhanced: stri
}, {} as Record)
}
- return Object.values(avatarSelected?.SkillTrees).reduce((acc, dataPointEntry) => {
+ return Object.values(avatarSelected?.SkillTrees ?? {}).reduce((acc, dataPointEntry) => {
const firstEntry = Object.values(dataPointEntry)[0];
if (firstEntry) {
acc[firstEntry.PointID] = firstEntry.MaxLevel;
diff --git a/src/helper/json.ts b/src/helper/json.ts
index c484958..07f78ea 100644
--- a/src/helper/json.ts
+++ b/src/helper/json.ts
@@ -1,15 +1,23 @@
// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function downloadJson(fileName: string, data: any) {
- const json = JSON.stringify(data, null, 2)
- const blob = new Blob([json], { type: 'application/json' })
- const url = URL.createObjectURL(blob)
+export function downloadJson(fileName: string, data: any): boolean {
+ if (typeof document === "undefined") return false
- const link = document.createElement('a')
- link.href = url
- link.download = `${fileName}.json`
- document.body.appendChild(link)
- link.click()
- document.body.removeChild(link)
+ try {
+ const json = JSON.stringify(data, null, 2)
+ const blob = new Blob([json], { type: 'application/json' })
+ const url = URL.createObjectURL(blob)
- URL.revokeObjectURL(url)
+ const link = document.createElement('a')
+ link.href = url
+ link.download = `${fileName}.json`
+ document.body.appendChild(link)
+ link.click()
+ document.body.removeChild(link)
+
+ URL.revokeObjectURL(url)
+ return true
+ } catch (error) {
+ console.error("Failed to download JSON:", error)
+ return false
+ }
}
diff --git a/src/helper/random.ts b/src/helper/random.ts
index 206575a..b7a5156 100644
--- a/src/helper/random.ts
+++ b/src/helper/random.ts
@@ -1,4 +1,11 @@
export function randomPartition(sum: number, parts: number): number[] {
+ if (!Number.isFinite(sum) || !Number.isInteger(parts) || parts <= 0) {
+ return [];
+ }
+ if (sum < parts) {
+ return Array.from({ length: parts }, () => 0);
+ }
+
const raw = Array.from({ length: parts }, () => Math.random());
const total = raw.reduce((a, b) => a + b, 0);
const result = raw.map(r => Math.floor((r / total) * (sum - parts)) + 1);
@@ -24,4 +31,4 @@ export function randomStep(x: number): number {
total += Math.floor(Math.random() * 3);
}
return total;
-}
\ No newline at end of file
+}
diff --git a/src/helper/replaceByParam.ts b/src/helper/replaceByParam.ts
index f14fd53..2f8dd38 100644
--- a/src/helper/replaceByParam.ts
+++ b/src/helper/replaceByParam.ts
@@ -13,7 +13,8 @@ const formatValue = (value: number, format: string, floatDigits?: string, hasPer
return String(value);
};
-export function replaceByParam(desc: string, params: number[]): string {
+export function replaceByParam(desc?: string, params: number[] = []): string {
+ if (!desc) return "";
const PARAM_REGEX = /#(\d+)\[(f(\d+)|i)\](%)?/g;
@@ -35,4 +36,4 @@ export function replaceByParam(desc: string, params: number[]): string {
result = result.replace(PARAM_REGEX, processor);
return result.split("\\n").join("
");
-}
\ No newline at end of file
+}
diff --git a/src/stores/connectStore.ts b/src/stores/connectStore.ts
index 9f4928c..a7d9c77 100644
--- a/src/stores/connectStore.ts
+++ b/src/stores/connectStore.ts
@@ -1,5 +1,7 @@
import { create } from 'zustand'
-import { createJSONStorage, persist } from 'zustand/middleware';
+import { persist } from 'zustand/middleware';
+import { connectPersistedSchema } from '@/zod';
+import { createValidatedJSONStorage } from './persistStorage';
interface ConnectState {
@@ -15,8 +17,10 @@ interface ConnectState {
setPassword: (newPassword: string) => void;
}
+type ConnectPersistedState = Pick;
+
const useConnectStore = create()(
- persist(
+ persist(
(set) => ({
connectionType: "FireflyGo",
privateType: "Local",
@@ -31,9 +35,16 @@ const useConnectStore = create()(
}),
{
name: 'connect-storage',
- storage: createJSONStorage(() => localStorage),
+ storage: createValidatedJSONStorage(() => localStorage, connectPersistedSchema),
+ partialize: (state) => ({
+ connectionType: state.connectionType,
+ privateType: state.privateType,
+ serverUrl: state.serverUrl,
+ username: state.username,
+ password: state.password,
+ }),
}
)
);
-export default useConnectStore;
\ No newline at end of file
+export default useConnectStore;
diff --git a/src/stores/enkaStore.ts b/src/stores/enkaStore.ts
index 28b3211..8a6c35a 100644
--- a/src/stores/enkaStore.ts
+++ b/src/stores/enkaStore.ts
@@ -6,7 +6,7 @@ interface EnkaState {
enkaData: EnkaResponse | null;
uidInput: string;
setSelectedCharacters: (newListAvatar: CharacterInfoCardType[]) => void;
- setEnkaData: (newEnkaData: EnkaResponse) => void;
+ setEnkaData: (newEnkaData: EnkaResponse | null) => void;
setUidInput: (newUidInput: string) => void;
}
@@ -16,7 +16,7 @@ const useEnkaStore = create((set) => ({
uidInput: "",
setUidInput: (newUidInput: string) => set({ uidInput: newUidInput }),
setSelectedCharacters: (newListAvatar: CharacterInfoCardType[]) => set({ selectedCharacters: newListAvatar }),
- setEnkaData: (newEnkaData: EnkaResponse) => set({ enkaData: newEnkaData }),
+ setEnkaData: (newEnkaData: EnkaResponse | null) => set({ enkaData: newEnkaData }),
}));
-export default useEnkaStore;
\ No newline at end of file
+export default useEnkaStore;
diff --git a/src/stores/localeStore.ts b/src/stores/localeStore.ts
index 419ffbc..38da530 100644
--- a/src/stores/localeStore.ts
+++ b/src/stores/localeStore.ts
@@ -1,6 +1,8 @@
import { ChangelogItemType } from '@/types';
import { create } from 'zustand'
-import { createJSONStorage, persist } from 'zustand/middleware';
+import { persist } from 'zustand/middleware';
+import { localePersistedSchema } from '@/zod';
+import { createValidatedJSONStorage } from './persistStorage';
interface LocaleState {
@@ -14,8 +16,10 @@ interface LocaleState {
setLocale: (newLocale: string) => void;
}
+type LocalePersistedState = Pick;
+
const useLocaleStore = create()(
- persist(
+ persist(
(set) => ({
locale: "en",
theme: "night",
@@ -28,9 +32,15 @@ const useLocaleStore = create()(
}),
{
name: 'locale-storage',
- storage: createJSONStorage(() => localStorage),
+ storage: createValidatedJSONStorage(() => localStorage, localePersistedSchema),
+ partialize: (state) => ({
+ locale: state.locale,
+ theme: state.theme,
+ currentVersion: state.currentVersion,
+ changelog: state.changelog,
+ }),
}
)
);
-export default useLocaleStore;
\ No newline at end of file
+export default useLocaleStore;
diff --git a/src/stores/persistStorage.ts b/src/stores/persistStorage.ts
new file mode 100644
index 0000000..46722a0
--- /dev/null
+++ b/src/stores/persistStorage.ts
@@ -0,0 +1,79 @@
+import type { PersistStorage, StateStorage, StorageValue } from "zustand/middleware";
+import type { ZodType } from "zod";
+
+export function createValidatedJSONStorage(
+ getStorage: () => StateStorage,
+ stateSchema: ZodType
+): PersistStorage | undefined {
+ let storage: StateStorage;
+
+ try {
+ storage = getStorage();
+ } catch {
+ return undefined;
+ }
+
+ const removeInvalidItem = (name: string, reason: string) => {
+ console.warn(`Invalid persisted store "${name}" was cleared: ${reason}`);
+ storage.removeItem(name);
+ };
+
+ return {
+ getItem: (name) => {
+ const raw = storage.getItem(name);
+
+ if (raw === null) {
+ return null;
+ }
+
+ if (raw instanceof Promise) {
+ return raw.then((value) => parseStorageValue(name, value, stateSchema, removeInvalidItem));
+ }
+
+ return parseStorageValue(name, raw, stateSchema, removeInvalidItem);
+ },
+ setItem: (name, value) => {
+ storage.setItem(name, JSON.stringify(value));
+ },
+ removeItem: (name) => {
+ storage.removeItem(name);
+ },
+ };
+}
+
+function parseStorageValue(
+ name: string,
+ raw: string | null,
+ stateSchema: ZodType,
+ removeInvalidItem: (name: string, reason: string) => void
+): StorageValue | null {
+ if (raw === null) {
+ return null;
+ }
+
+ let parsed: unknown;
+ try {
+ parsed = JSON.parse(raw);
+ } catch {
+ removeInvalidItem(name, "malformed JSON");
+ return null;
+ }
+
+ if (!parsed || typeof parsed !== "object" || !("state" in parsed)) {
+ removeInvalidItem(name, "missing persisted state");
+ return null;
+ }
+
+ const storedValue = parsed as StorageValue;
+ const state = stateSchema.safeParse(storedValue.state);
+
+ if (!state.success) {
+ removeInvalidItem(name, "state schema mismatch");
+ return null;
+ }
+
+ return {
+ state: state.data,
+ version: typeof storedValue.version === "number" ? storedValue.version : undefined,
+ };
+}
diff --git a/src/stores/userDataStore.ts b/src/stores/userDataStore.ts
index 134f236..63b0d35 100644
--- a/src/stores/userDataStore.ts
+++ b/src/stores/userDataStore.ts
@@ -1,6 +1,8 @@
import { ASConfigStore, AvatarStore, CEConfigStore, MOCConfigStore, PEAKConfigStore, PFConfigStore } from '@/types';
import { create } from 'zustand'
-import { createJSONStorage, persist } from 'zustand/middleware';
+import { persist } from 'zustand/middleware';
+import { micsSchema } from '@/zod';
+import { createValidatedJSONStorage } from './persistStorage';
interface UserDataState {
@@ -21,8 +23,19 @@ interface UserDataState {
setCeConfig: (newCeConfig: CEConfigStore) => void;
}
+type UserDataPersistedState = Pick<
+ UserDataState,
+ | "avatars"
+ | "battle_type"
+ | "moc_config"
+ | "pf_config"
+ | "as_config"
+ | "peak_config"
+ | "ce_config"
+>;
+
const useUserDataStore = create()(
- persist(
+ persist(
(set) => ({
avatars: {},
battle_type: "",
@@ -84,9 +97,18 @@ const useUserDataStore = create()(
}),
{
name: 'user-data-storage',
- storage: createJSONStorage(() => localStorage),
+ storage: createValidatedJSONStorage(() => localStorage, micsSchema),
+ partialize: (state) => ({
+ avatars: state.avatars,
+ battle_type: state.battle_type,
+ moc_config: state.moc_config,
+ pf_config: state.pf_config,
+ as_config: state.as_config,
+ peak_config: state.peak_config,
+ ce_config: state.ce_config,
+ }),
}
)
);
-export default useUserDataStore;
\ No newline at end of file
+export default useUserDataStore;
diff --git a/src/types/asDetail.ts b/src/types/asDetail.ts
index 5c21b07..989dc19 100644
--- a/src/types/asDetail.ts
+++ b/src/types/asDetail.ts
@@ -9,7 +9,9 @@ export interface ASGroupDetail {
EndTime: string;
BuffList1: ASBuff[];
BuffList2: ASBuff[];
+ BuffList3: ASBuff[] | null;
Level: ASLevel[];
+ Tierce: ASTierceLevel | null;
}
export interface ASBuff {
@@ -21,6 +23,16 @@ export interface ASBuff {
ExtraList?: ExtraEffect[];
}
+export interface ASTierceLevel {
+ ID: number;
+ PreChallenge: number;
+ Name: Record;
+ Target: ASTarget[];
+ DamageType: string[];
+ TurnLimit: number;
+ EventList: ASEvent[];
+}
+
export interface ASLevel {
Floor: number;
ID: number;
@@ -35,6 +47,7 @@ export interface ASLevel {
EventList2: ASEvent[];
Monster1: ASMonster;
Monster2: ASMonster;
+ Monster3: ASMonster | null;
}
export interface ASTarget {
diff --git a/src/types/enka.ts b/src/types/enka.ts
index 47c15a6..4551bcc 100644
--- a/src/types/enka.ts
+++ b/src/types/enka.ts
@@ -31,7 +31,7 @@ interface FlatProp {
interface RelicFlat {
props: FlatProp[]
- setName: string
+ setName: string | number
setID: number
}
@@ -51,7 +51,7 @@ interface SkillTree {
interface EquipmentFlat {
props: FlatProp[]
- name: string
+ name: string | number
}
interface Equipment {
diff --git a/src/types/mocDetail.ts b/src/types/mocDetail.ts
index f7b1863..12e0b76 100644
--- a/src/types/mocDetail.ts
+++ b/src/types/mocDetail.ts
@@ -7,6 +7,17 @@ export interface MOCGroupDetail {
BeginTime: string;
EndTime: string;
Level: MoCLevel[];
+ Tierce: MoCTierceLevel | null;
+}
+
+export interface MoCTierceLevel {
+ ID: number;
+ PreChallenge: number;
+ Name: Record;
+ Target: MoCTarget[];
+ DamageType: string[];
+ TurnLimit: number;
+ EventList: MoCEvent[];
}
export interface MoCLevel {
diff --git a/src/types/pfDetail.ts b/src/types/pfDetail.ts
index b18639d..3866c8b 100644
--- a/src/types/pfDetail.ts
+++ b/src/types/pfDetail.ts
@@ -6,7 +6,8 @@ export interface PFGroupDetail {
EndTime: string;
SubOption: MazeBuff[];
Option: MazeBuff[];
- Level: LevelData[];
+ Level: PFLevel[];
+ Tierce: PFTierceLevel | null;
}
export interface MazeBuff {
@@ -17,7 +18,17 @@ export interface MazeBuff {
Desc: Record;
}
-export interface LevelData {
+export interface PFTierceLevel {
+ ID: number;
+ PreChallenge: number;
+ Name: Record;
+ Target: StoryTarget[];
+ DamageType: string[];
+ TurnLimit: number;
+ EventList: PFEvent[];
+}
+
+export interface PFLevel {
Floor: number;
ID: number;
StageNum: number;
@@ -26,8 +37,8 @@ export interface LevelData {
DamageType1: string[];
DamageType2: string[];
MazeBuff: MazeBuff[];
- EventList1: StageConfig[];
- EventList2: StageConfig[];
+ EventList1: PFEvent[];
+ EventList2: PFEvent[];
TurnLimit: number;
BattleTarget: BattleTarget[];
ClearScore: number;
@@ -45,7 +56,7 @@ export interface BattleTarget {
Name: Record;
}
-export interface StageConfig {
+export interface PFEvent {
ID: number;
Name: Record;
HardLevelGroup: number;
diff --git a/src/types/srtools.ts b/src/types/srtools.ts
index f829675..1db5ecb 100644
--- a/src/types/srtools.ts
+++ b/src/types/srtools.ts
@@ -37,6 +37,7 @@ export interface AvatarJson {
techniques: number[];
sp_value: number;
sp_max: number;
+ enhanced_id?: number;
}
export interface MonsterJson {
monster_id: number;
@@ -49,7 +50,6 @@ export interface DynamicKeyJson {
value: number;
}
-//BattleBuff
export interface BattleBuffJson {
level: number;
id: number;
diff --git a/src/zod/card.zod.ts b/src/zod/card.zod.ts
index 89557ca..5ed9478 100644
--- a/src/zod/card.zod.ts
+++ b/src/zod/card.zod.ts
@@ -1,5 +1,6 @@
// Generated by ts-to-zod
import { z } from "zod";
+import { lightconeStoreSchema, relicStoreSchema } from "./mics.zod";
export const characterInfoCardTypeSchema = z.object({
key: z.number(),
@@ -18,10 +19,6 @@ export const characterInfoCardTypeSchema = z.object({
}))
});
-const lightconeStoreSchema = z.any();
-
-const relicStoreSchema = z.any();
-
export const avatarProfileCardTypeSchema = z.object({
key: z.number(),
profile_name: z.string(),
diff --git a/src/zod/enka.zod.ts b/src/zod/enka.zod.ts
index d87879e..69f51f9 100644
--- a/src/zod/enka.zod.ts
+++ b/src/zod/enka.zod.ts
@@ -33,7 +33,7 @@ const flatPropSchema = z.object({
const relicFlatSchema = z.object({
props: z.array(flatPropSchema),
- setName: z.string(),
+ setName: z.union([z.string(), z.number()]),
setID: z.number()
});
@@ -53,7 +53,7 @@ const skillTreeSchema = z.object({
const equipmentFlatSchema = z.object({
props: z.array(flatPropSchema),
- name: z.string()
+ name: z.union([z.string(), z.number()])
});
const equipmentSchema = z.object({
diff --git a/src/zod/index.ts b/src/zod/index.ts
index 99e5817..87e0fea 100644
--- a/src/zod/index.ts
+++ b/src/zod/index.ts
@@ -5,5 +5,6 @@ export * from "./enka.zod"
export * from "./card.zod"
export * from "./extraData.zod"
export * from "./showcase.zod"
+export * from "./persistedStore.zod"
export * from "./srtools.zod"
diff --git a/src/zod/mics.zod.ts b/src/zod/mics.zod.ts
index caae13a..e3c9013 100644
--- a/src/zod/mics.zod.ts
+++ b/src/zod/mics.zod.ts
@@ -125,4 +125,22 @@ export const micsSchema = z.object({
as_config: asConfigStoreSchema,
ce_config: ceConfigStoreSchema,
peak_config: peakConfigStoreSchema
+}).superRefine((data, ctx) => {
+ for (const [avatarId, avatar] of Object.entries(data.avatars)) {
+ if (avatar.profileList.length === 0) {
+ ctx.addIssue({
+ code: "custom",
+ path: ["avatars", avatarId, "profileList"],
+ message: "profileList must contain at least one profile"
+ });
+ }
+
+ if (avatar.profileSelect < 0 || avatar.profileSelect >= avatar.profileList.length) {
+ ctx.addIssue({
+ code: "custom",
+ path: ["avatars", avatarId, "profileSelect"],
+ message: "profileSelect must point to an existing profile"
+ });
+ }
+ }
});
diff --git a/src/zod/persistedStore.zod.ts b/src/zod/persistedStore.zod.ts
new file mode 100644
index 0000000..07edac5
--- /dev/null
+++ b/src/zod/persistedStore.zod.ts
@@ -0,0 +1,24 @@
+import { z } from "zod";
+import type { ChangelogItemType } from "@/types";
+
+export const changelogItemSchema: z.ZodType = z.object({
+ version: z.string(),
+ date: z.string(),
+ type: z.string(),
+ items: z.array(z.string()),
+});
+
+export const localePersistedSchema = z.object({
+ locale: z.string(),
+ theme: z.string(),
+ currentVersion: z.string(),
+ changelog: z.array(changelogItemSchema),
+});
+
+export const connectPersistedSchema = z.object({
+ connectionType: z.string(),
+ privateType: z.string(),
+ serverUrl: z.string(),
+ username: z.string(),
+ password: z.string(),
+});
diff --git a/src/zod/srtools.zod.ts b/src/zod/srtools.zod.ts
index ee74856..a024dde 100644
--- a/src/zod/srtools.zod.ts
+++ b/src/zod/srtools.zod.ts
@@ -40,7 +40,8 @@ export const avatarJsonSchema = z.object({
promotion: z.number(),
techniques: z.array(z.number()),
sp_value: z.number(),
- sp_max: z.number()
+ sp_max: z.number(),
+ enhanced_id: z.number().optional()
});
export const monsterJsonSchema = z.object({