fix:settings lost

Author: zyronon

packages/core/src/composables/useDataSyncPersistence.ts

@@ -144,6 +144,7 @@ async function fetchServerMeta(types: SyncType[], client?: SupabaseClient | null
 async function fetchServerData(type: SyncType, client?: SupabaseClient | null): Promise<RemoteDataRow | null> {
   const sb = getSyncClient(client)
   if (!sb) return null
+  console.log('Fetching server data', type)
   try {
     const { data, error } = await sb
       .from('typewords_data')
@@ -189,6 +190,7 @@ async function upsertServerData(
 ): Promise<boolean> {
   const sb = getSyncClient(client)
   if (!sb) return false
+  console.log('Upserting server data', type)
   const data_version = getDataVersion(type)
   try {
     const { error } = await (sb as any)
@@ -234,7 +236,6 @@ async function applyRemoteDataByType(
   await persistLocalState(type, row.data, row.updated_at ?? now)
 }
 
-
 type HashBackupIndexItem = {
   hash: string
   key: string
@@ -373,7 +374,7 @@ export function useDataSyncPersistence() {
     return compareResult
   }
 
-  async function forcePushLocalDataToRemote(data: BackupData['val'],client?: SupabaseClient | null): Promise<boolean> {
+  async function forcePushLocalDataToRemote(data: BackupData['val'], client?: SupabaseClient | null): Promise<boolean> {
     let syncResult = true
     const updated_at = new Date().toISOString()
     const sb = getSyncClient(client)

packages/core/src/composables/useInit.ts

@@ -1,5 +1,5 @@
 import { APP_VERSION, AppEnv, DictId, LOCAL_FILE_KEY } from '../config/env.ts'
-import { debounce, shakeCommonDict } from '../utils'
+import { _dateFormat, debounce, shakeCommonDict } from '../utils'
 import { get, set } from 'idb-keyval'
 import { syncSetting } from '../apis'
 import { useBaseStore } from '../stores/base.ts'
@@ -9,6 +9,7 @@ import { useUserStore } from '../stores/user.ts'
 import { CompareResult } from '../types'
 import { Supabase } from '../utils/supabase.ts'
 import { ensureHashGuardBeforeInit, useDataSyncPersistence } from './useDataSyncPersistence'
+import dayjs from 'dayjs'
 
 let unsub = null
 let unsub2 = null
@@ -122,6 +123,7 @@ export function useInit() {
     await dataSync.pullRemoteIfNewer(['setting', 'dict'])
     console.timeEnd('init')
     store.load = true
+    console.log('注册时间', _dateFormat(settingStore.firstTime))
     isInitializing = false // 初始化完成，允许保存数据
 
     runtimeStore.isNew = APP_VERSION.version > Number(settingStore.webAppVersion)

packages/core/src/config/env.ts

@@ -72,9 +72,10 @@ export const SAVE_DICT_KEY = {
 }
 //18版本，移除单独保存的 app version字段，转移到 settingStore的webAppVersion里面
 //19:修复快捷键下一个单词和跳过单词重复了
+//20:修复19版本未导入变量，导致抛错所有用户setting变默认值的bug
 export const SAVE_SETTING_KEY = {
   key: 'typing-word-setting',
-  version: 19,
+  version: 20,
 }
 
 //5版本，不再单独保存 app version字段

packages/core/src/stores/setting.ts

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia'
 import { checkAndUpgradeSaveSetting, cloneDeep } from '../utils'
-import { get } from 'idb-keyval'
+import { get, set } from 'idb-keyval'
 import { APP_VERSION, AppEnv, DefaultShortcutKeyMap, SAVE_SETTING_KEY } from '../config/env'
 import { getSetting } from '../apis'
 import { WordPracticeMode, WordPracticeType } from '../types'
@@ -152,12 +152,28 @@ export const useSettingStore = defineStore('setting', {
       return new Promise(async resolve => {
         let configStr = await get(SAVE_SETTING_KEY.key)
         let data = await checkAndUpgradeSaveSetting(configStr)
+
+        //特殊处理
+        const shouldRefreshUpdatedAt = !!(data as any)?.__firstTimePatchedFromSnapshot ?? false
+        delete (data as any)?.__firstTimePatchedFromSnapshot
+        if (shouldRefreshUpdatedAt) {
+          await set(
+            SAVE_SETTING_KEY.key,
+            JSON.stringify({
+              val: data,
+              version: SAVE_SETTING_KEY.version,
+              updated_at: new Date().toISOString(),
+            })
+          )
+        }
+
         if (AppEnv.CAN_REQUEST) {
           let res = await getSetting()
           if (res.success) {
             Object.assign(data, res.data)
           }
         }
+
         this.setState({ ...data, load: true })
         resolve(true)
       })

packages/core/src/utils/index.ts

@@ -2,13 +2,21 @@ import type { BaseState } from '../stores/base'
 import { getDefaultBaseState, useBaseStore } from '../stores/base'
 import type { SettingState } from '../stores/setting'
 import { getDefaultSettingState } from '../stores/setting'
-import { Dict, ShortcutKey } from '../types'
 import type { DictResource } from '../types'
-import { CompareResult, DictType, getDefaultDict, getDefaultWord } from '../types'
+import { CompareResult, Dict, DictType, getDefaultDict, getDefaultWord, ShortcutKey } from '../types'
 import { useRouter } from 'vue-router'
 import { useRuntimeStore } from '../stores/runtime'
 import dayjs from 'dayjs'
-import { APP_VERSION, AppEnv, DefaultShortcutKeyMap, DictId, ENV, RESOURCE_PATH, SAVE_DICT_KEY } from '../config/env'
+import {
+  APP_VERSION,
+  AppEnv,
+  BACKUP_INDEX_KEY,
+  DefaultShortcutKeyMap,
+  DictId,
+  ENV,
+  RESOURCE_PATH,
+  SAVE_DICT_KEY,
+} from '../config/env'
 import { nextTick } from 'vue'
 import { Toast } from '@typewords/base'
 import duration from 'dayjs/plugin/duration'
@@ -121,13 +129,48 @@ export async function checkAndUpgradeSaveSetting(val: any) {
       if (version <= 18) {
         defaultState.shortcutKeyMap[ShortcutKey.Next] = DefaultShortcutKeyMap[ShortcutKey.Next]
       }
+      //3/20晚上10点25推的代码，这个地方出了一个bug，ShortcutKey没导入，导致抛异常后返回了默认值，所有的用户的setting都变成默认值了。
+      //在这里读取之前的快照，如果存在则从里面读取setting的firstTime，
+      //判断是否与当前值相等，不相等则取快照的值并将本地的update_at更新，以免被远程覆盖
+      if (version === 19) {
+        try {
+          let firstTimePatchedFromSnapshot = false
+          const snapshotCutoffTime = new Date('2026-03-20T22:25:00+08:00').getTime()
+          const rawIndex = (await get(BACKUP_INDEX_KEY)) as Array<{ key?: string; createdAt?: number }> | null
+          const index = Array.isArray(rawIndex) ? rawIndex : []
+          const targetSnapshot = index
+            .filter(item => typeof item?.key === 'string' && Number(item?.createdAt) <= snapshotCutoffTime)
+            .sort((a, b) => Number(b.createdAt) - Number(a.createdAt))[0]
+          if (targetSnapshot?.key) {
+            const snapshot = await get(targetSnapshot.key)
+            const snapshotSettingRaw = snapshot?.data?.setting
+            let snapshotSettingState: any = null
+            if (typeof snapshotSettingRaw === 'string') {
+              snapshotSettingState = JSON.parse(snapshotSettingRaw)?.val ?? null
+            } else if (snapshotSettingRaw && typeof snapshotSettingRaw === 'object') {
+              snapshotSettingState = snapshotSettingRaw?.val ?? null
+            }
+            const snapshotFirstTime = Number(snapshotSettingState?.firstTime)
+            const currentFirstTime = Number(state?.firstTime)
+            if (Number.isFinite(snapshotFirstTime) && snapshotFirstTime > 0 && snapshotFirstTime !== currentFirstTime) {
+              state.firstTime = snapshotFirstTime
+              firstTimePatchedFromSnapshot = true
+            }
+            ;(defaultState as any).__firstTimePatchedFromSnapshot = firstTimePatchedFromSnapshot
+          }
+        } catch (e) {
+          console.warn('firstTime 快照回填跳过或失败，忽略并继续', e)
+        }
+      }
+
       //为了保持永远是最新的快捷键选项列表，但保留住用户的自定义设置，去掉无效的快捷键选项
       //例: 2版本，可能有快捷键A。3版本没有了
       checkRiskKey(defaultState.shortcutKeyMap, state.shortcutKeyMap)
       delete state.shortcutKeyMap
       checkRiskKey(defaultState, state)
       return defaultState
     } catch (e) {
+      await saveHashSnapshot('数据解析异常-自动备份', '')
       return defaultState
     }
   }