feat: 修复清除数据、语音缓存、排行榜限制,新增项目配置文件
- 修复 cloud.clearAll 静默失败导致重启后数据恢复 - 清除数据弹窗改用自定义 ui-modal 替代 wx.showModal - TTS 语音合成增加 fileID 持久化缓存,重启不再重新合成 - 排行榜限制前15名,maxRank 参数化到 config.js - 新增 config.js 统一管理版本号/更新日期/开发者/排行榜限制 - progress-ring 消除 getSystemInfoSync 弃用警告 - voice.js 增加 InnerAudioContext 错误监听 - storage/util 完善用户资料、打卡日期精度、记录日志
This commit is contained in:
+99
-43
@@ -4,7 +4,10 @@ const ENV_ID = 'cloudbase-d1g56kl2q8f4f7d8a'
|
||||
let _db = null
|
||||
let _pushTimer = null
|
||||
let _enabled = false
|
||||
let _docId = null // cache doc id after first successful query
|
||||
let _docId = null // cache doc id after first successful push
|
||||
let _openid = null // cache openid from first successful add, used to
|
||||
// re-locate our doc when _docId goes stale
|
||||
// (e.g. user manually deleted the doc in the console)
|
||||
|
||||
const getDb = () => {
|
||||
if (!_enabled) return null
|
||||
@@ -27,36 +30,55 @@ const pullAll = async () => {
|
||||
const db = getDb()
|
||||
if (!db) return null
|
||||
try {
|
||||
// First try cached doc id
|
||||
if (_docId) {
|
||||
try {
|
||||
const res = await db.collection(DB_COLLECTION).doc(_docId).get()
|
||||
if (res && res.data) return res.data
|
||||
} catch (e) {
|
||||
_docId = null // doc deleted or inaccessible
|
||||
}
|
||||
// Always need the openid to safely locate OUR doc under the custom
|
||||
// security rule. Cache it on first call so subsequent pulls are fast.
|
||||
if (!_openid) {
|
||||
_openid = await _fetchOpenid()
|
||||
}
|
||||
// Query: rely on security rules to scope to current user
|
||||
const res = await db.collection(DB_COLLECTION).limit(1).get()
|
||||
if (res && res.data && res.data.length > 0) {
|
||||
_docId = res.data[0]._id
|
||||
return res.data[0]
|
||||
if (!_openid) return null // cloud function call failed; bail
|
||||
|
||||
// Locate our doc by _openid, not by limit(1) which can pick someone
|
||||
// else's doc when the custom rule is in effect.
|
||||
const mine = await db.collection(DB_COLLECTION)
|
||||
.where({ _openid: _openid })
|
||||
.limit(1)
|
||||
.get()
|
||||
if (mine && mine.data && mine.data.length > 0) {
|
||||
_docId = mine.data[0]._id
|
||||
return mine.data[0]
|
||||
}
|
||||
// No doc for us — that's a fresh install on a new device with no
|
||||
// history, or the user cleared their cloud data. Either way, nothing
|
||||
// to restore.
|
||||
_docId = null
|
||||
return null
|
||||
} catch (e) {
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
// One-shot helper: call the getOpenid cloud function and return the
|
||||
// openid string. Returns null on any failure (function not deployed,
|
||||
// network error, etc.) — pullAll then bails cleanly.
|
||||
const _fetchOpenid = async () => {
|
||||
try {
|
||||
const res = await wx.cloud.callFunction({ name: 'getOpenid' })
|
||||
if (res && res.result && res.result.openid) return res.result.openid
|
||||
} catch (e) { /* function not deployed, etc. */ }
|
||||
return null
|
||||
}
|
||||
|
||||
const pushAll = () => {
|
||||
if (!_enabled) return
|
||||
if (!_enabled) { console.log('[cloud] pushAll skipped (not enabled)'); return }
|
||||
if (_pushTimer) clearTimeout(_pushTimer)
|
||||
console.log('[cloud] pushAll scheduled')
|
||||
_pushTimer = setTimeout(() => _doPush(), 2000)
|
||||
}
|
||||
|
||||
const _doPush = async () => {
|
||||
console.log('[cloud] _doPush starting...')
|
||||
const db = getDb()
|
||||
if (!db) return
|
||||
if (!db) { console.log('[cloud] _doPush aborted (no db)'); return }
|
||||
try {
|
||||
const storage = require('./storage')
|
||||
const themeMod = require('./theme')
|
||||
@@ -66,55 +88,89 @@ const _doPush = async () => {
|
||||
settings: storage.getSettings(),
|
||||
streak: storage.getStreak(),
|
||||
customPlans: storage.getCustomPlans(),
|
||||
profile: storage.getProfile(),
|
||||
themeId: themeMod.getCurrentTheme().id,
|
||||
updatedAt: db.serverDate()
|
||||
}
|
||||
console.log('[cloud] _doPush records keys:', Object.keys(data.records || {}))
|
||||
|
||||
// Use cached doc id if available
|
||||
if (_docId) {
|
||||
try {
|
||||
await db.collection(DB_COLLECTION).doc(_docId).update({ data })
|
||||
console.log('[cloud] _doPush update ok')
|
||||
return
|
||||
} catch (e) {
|
||||
_docId = null // doc may have been deleted
|
||||
// Most commonly: doc was deleted out from under us (user cleared
|
||||
// the collection in the console). The custom write rule evaluates
|
||||
// `doc._openid == auth.openid` → `undefined == openid` → false,
|
||||
// so this surfaces as -502003 rather than "not found". Either way,
|
||||
// fall through and re-locate the doc via cached _openid (or add).
|
||||
console.log('[cloud] _doPush cached _docId stale, clearing:', e.message)
|
||||
_docId = null
|
||||
}
|
||||
}
|
||||
|
||||
// Query for existing doc (relies on security rules to scope to current user)
|
||||
const existing = await db.collection(DB_COLLECTION).limit(1).get()
|
||||
if (existing && existing.data && existing.data.length > 0) {
|
||||
_docId = existing.data[0]._id
|
||||
await db.collection(DB_COLLECTION).doc(_docId).update({ data })
|
||||
} else {
|
||||
const res = await db.collection(DB_COLLECTION).add({ data })
|
||||
if (res && res._id) _docId = res._id
|
||||
// Fallback: locate OUR doc by _openid (cached from a previous add) and
|
||||
// update it. If we have no cached openid yet (first ever push) just add.
|
||||
if (_openid) {
|
||||
const existing = await db.collection(DB_COLLECTION)
|
||||
.where({ _openid: _openid })
|
||||
.limit(1)
|
||||
.get()
|
||||
if (existing && existing.data && existing.data.length > 0) {
|
||||
_docId = existing.data[0]._id
|
||||
await db.collection(DB_COLLECTION).doc(_docId).update({ data })
|
||||
console.log('[cloud] _doPush update ok (re-located by _openid)')
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
// First push ever, or our doc was deleted and no other doc exists.
|
||||
const res = await db.collection(DB_COLLECTION).add({ data })
|
||||
if (res && res._id) _docId = res._id
|
||||
if (res && res._openid) _openid = res._openid
|
||||
console.log('[cloud] _doPush add ok, docId=', _docId)
|
||||
} catch (e) {
|
||||
// Silently retry on next write
|
||||
console.log('[cloud] _doPush error:', e.message || e)
|
||||
}
|
||||
}
|
||||
|
||||
const clearAll = async () => {
|
||||
const db = getDb()
|
||||
if (!db) return
|
||||
try {
|
||||
if (_docId) {
|
||||
try {
|
||||
await db.collection(DB_COLLECTION).doc(_docId).remove()
|
||||
_docId = null
|
||||
return
|
||||
} catch (e) {
|
||||
_docId = null
|
||||
}
|
||||
}
|
||||
const existing = await db.collection(DB_COLLECTION).limit(1).get()
|
||||
if (existing && existing.data && existing.data.length > 0) {
|
||||
await db.collection(DB_COLLECTION).doc(existing.data[0]._id).remove()
|
||||
}
|
||||
_docId = null
|
||||
} catch (e) {
|
||||
// Nothing to clear
|
||||
|
||||
// Ensure _openid is cached before trying to delete — without it we
|
||||
// can't reliably locate the user's doc (add() only returns _id).
|
||||
if (!_openid) {
|
||||
_openid = await _fetchOpenid()
|
||||
}
|
||||
if (!_openid) {
|
||||
console.log('[cloud] clearAll: cannot fetch openid, giving up')
|
||||
return
|
||||
}
|
||||
|
||||
// Always locate by _openid (never by cached _docId alone) so we're
|
||||
// guaranteed to target OUR doc under the custom permission rule.
|
||||
const mine = await db.collection(DB_COLLECTION)
|
||||
.where({ _openid: _openid })
|
||||
.limit(1)
|
||||
.get()
|
||||
if (mine && mine.data && mine.data.length > 0) {
|
||||
const myDocId = mine.data[0]._id
|
||||
try {
|
||||
await db.collection(DB_COLLECTION).doc(myDocId).remove()
|
||||
console.log('[cloud] clearAll: removed doc', myDocId)
|
||||
} catch (e) {
|
||||
console.log('[cloud] clearAll: remove failed:', e.message || e)
|
||||
}
|
||||
} else {
|
||||
console.log('[cloud] clearAll: no doc found for openid')
|
||||
}
|
||||
|
||||
// Always invalidate cached ids so the next _doPush starts fresh
|
||||
// instead of trying to update a now-deleted or foreign doc.
|
||||
_docId = null
|
||||
}
|
||||
|
||||
module.exports = { init, pullAll, pushAll, clearAll, get enabled() { return _enabled } }
|
||||
|
||||
Reference in New Issue
Block a user