refactor: all demo

DEV.md

@@ -2,6 +2,21 @@
 
 该版本将支持TS、TSX环境，提供Miao-Yunzai完全的类型声明及其开发文档。
 
+- 提交
+
+```ts
+/**
+ * feature：新功能
+ * update：更新某功能
+ * fixbug：修补某功能的bug
+ * refactor：重构某个功能
+ * optimize: 优化构建工具或运行时性能
+ * style：仅样式改动
+ * docs：仅文档新增/改动
+ * chore：构建过程或辅助工具的变动
+ */
+```
+
 ## 关于lib目录
 
 lib目录将在未来逐渐放弃，在版本发布后，开发者需要有意识的对此变化做出调整.
@@ -13,11 +28,7 @@ lib目录将在未来逐渐放弃，在版本发布后，开发者需要有意
 --lib / renderer
 // 非机器人框架的核心处理代码
 // 消耗服务器内存，无扩展性，计划废弃
--- lib/tools
+--lib / tools / web.js / test.js / log.js / ksr.js
-      /web.js
-      /test.js
-      /log.js
-      /ksr.js
 // 计划废弃
 --renderers
 ```
@@ -41,6 +52,7 @@ src/mys
 src/utils
 
 ## 开发示例
+
 - 图片组件
 
 ```tsx

README.md

@@ -14,7 +14,6 @@
 
 如果你的系统不支持18.18.2版本，最低能下载16.14.0版本，这是最新的puppeteer版本限制。
 
-
 ## 使用教程
 
 - 安装源码

src/core/runtime.ts

@@ -9,7 +9,6 @@ import cfg from '../../lib/config/config.js'
 import Handler from '../../lib/plugins/handler.js'
 import puppeteer from '../../lib/puppeteer/puppeteer.js'
 
-
 /**
  * tudo
  * 不合理的调用逻辑
@@ -124,13 +123,30 @@ export default class Runtime {
           if (key === 'uidData') {
             return self.getUidData('', game)
           }
-          if (['getUid', 'getUidList', 'getMysUser', 'getCkUidList', 'getUidMapList', 'getGameDs'].includes(key)) {
+          if (
+            [
+              'getUid',
+              'getUidList',
+              'getMysUser',
+              'getCkUidList',
+              'getUidMapList',
+              'getGameDs'
+            ].includes(key)
+          ) {
             return (_game, arg2) => {
               return self[key](_game || game, arg2)
             }
           }
           // 不能将类型“symbol”分配给类型“string”。
-          if (['getUidData', 'hasUid', 'addRegUid', 'delRegUid', 'setMainUid'].includes(key)) {
+          if (
+            [
+              'getUidData',
+              'hasUid',
+              'addRegUid',
+              'delRegUid',
+              'setMainUid'
+            ].includes(key)
+          ) {
             return (uid, _game = '') => {
               return self[key](uid, _game || game)
             }
@@ -149,7 +165,10 @@ export default class Runtime {
    */
   async getMysInfo(targetType = 'all') {
     if (!this._mysInfo[targetType]) {
-      this._mysInfo[targetType] = await MysInfo.init(this.e, targetType === 'cookie' ? 'detail' : 'roleIndex')
+      this._mysInfo[targetType] = await MysInfo.init(
+        this.e,
+        targetType === 'cookie' ? 'detail' : 'roleIndex'
+      )
     }
     return this._mysInfo[targetType]
   }
@@ -206,10 +225,10 @@ export default class Runtime {
   async render(plugin, path, data = {}, cfg = {}) {
     // 处理传入的path
     path = path.replace(/.html$/, '')
-    let paths = lodash.filter(path.split('/'), (p) => !!p)
+    let paths = lodash.filter(path.split('/'), p => !!p)
     path = paths.join('/')
     // 创建目录
-    const mkdir = (check) => {
+    const mkdir = check => {
       let currDir = `${process.cwd()}/temp`
       for (let p of check.split('/')) {
         currDir = `${currDir}/${p}`
@@ -223,14 +242,14 @@ export default class Runtime {
     // 自动计算pluResPath
     let pluResPath = `../../../${lodash.repeat('../', paths.length)}plugins/${plugin}/resources/`
     let miaoResPath = `../../../${lodash.repeat('../', paths.length)}plugins/miao-plugin/resources/`
-    const layoutPath = process.cwd() + '/plugins/miao-plugin/resources/common/layout/'
+    const layoutPath =
+      process.cwd() + '/plugins/miao-plugin/resources/common/layout/'
 
     /**
      * tudo
      * 不符合阅读习惯的，data重写data
      */
 
-
     // 渲染data
     data = {
       sys: {
@@ -257,7 +276,6 @@ export default class Runtime {
       }
     }
 
-    
     // 处理beforeRender
     if (cfg.beforeRender) {
       data = cfg.beforeRender({ data }) || data

src/db/UserDB.ts

@@ -35,7 +35,7 @@ const COLUMNS = {
       } catch (e) {
         data = {}
       }
-      MysUtil.eachGame((game) => {
+      MysUtil.eachGame(game => {
         let ds = data[game] || {}
         ret[game] = {
           uid: ds.uid || '',
@@ -69,7 +69,7 @@ class UserDB extends BaseModel {
   async saveDB(user) {
     let db = this
     let ltuids = []
-    lodash.forEach(user.mysUsers, (mys) => {
+    lodash.forEach(user.mysUsers, mys => {
       if (mys.ck && mys.ltuid) {
         ltuids.push(mys.ltuid)
       }

src/db/UserGameDB.ts

@@ -20,7 +20,7 @@ const COLUMNS = {
       } catch (e) {
         data = []
       }
-      lodash.forEach(data, (ds) => {
+      lodash.forEach(data, ds => {
         if (ds.uid) {
           ret[ds.uid] = ds
         }
@@ -33,9 +33,7 @@ const COLUMNS = {
   }
 }
 
-class UserGameDB extends BaseModel {
+class UserGameDB extends BaseModel {}
-
-}
 
 BaseModel.initDB(UserGameDB, COLUMNS)
 await UserGameDB.sync()

src/mys/DailyCache.ts

@@ -67,7 +67,9 @@ export default class DailyCache extends BaseModel {
   static async clearOutdatedData() {
     let keys = await redis.keys(`${redisKeyRoot}*`)
     const date = moment().format('MM-DD')
-    const testReg = new RegExp(`^${redisKeyRoot}(mys|hoyolab|config)-\\d{2}-\\d{2}`)
+    const testReg = new RegExp(
+      `^${redisKeyRoot}(mys|hoyolab|config)-\\d{2}-\\d{2}`
+    )
     const todayReg = new RegExp(`^${redisKeyRoot}(mys|hoyolab|config)-${date}`)
     for (let key of keys) {
       if (testReg.test(key) && !todayReg.test(key)) {
@@ -90,10 +92,10 @@ export default class DailyCache extends BaseModel {
 
   // 内部方法，用于encode value
   static encodeValue(value) {
-    if (typeof (value) === 'object') {
+    if (typeof value === 'object') {
       return JSON.stringify(value) || ''
     }
-    if (typeof (value) === 'undefined') {
+    if (typeof value === 'undefined') {
       return ''
     }
     return '' + value
@@ -221,7 +223,7 @@ export default class DailyCache extends BaseModel {
     await redis.zAdd(tableKey, { score: key, value: item + '' })
 
     // 同时更新数量，用于数量统计
-    let count = await this.zCount(table, key) || 0
+    let count = (await this.zCount(table, key)) || 0
     const countKey = this.getTableKey(table, 'count')
     await redis.zAdd(countKey, { score: count, value: key + '' })
     await this.exTable(this.getTableKey(table), true)
@@ -265,7 +267,11 @@ export default class DailyCache extends BaseModel {
    * @returns {Promise<string>}
    */
   async zMinKey(table) {
-    let keys = await redis.zRangeByScore(this.getTableKey(table, 'count'), 0, 60)
+    let keys = await redis.zRangeByScore(
+      this.getTableKey(table, 'count'),
+      0,
+      60
+    )
     return keys[0]
   }
 

src/mys/MysUser.ts

@@ -15,7 +15,6 @@ import fetch from 'node-fetch'
 
 import { MysUserDB, UserDB } from '../db/index.js'
 
-
 import { Data } from './local.js'
 
 const tables = {
@@ -42,7 +41,6 @@ const tables = {
 }
 
 export default class MysUser extends BaseModel {
-
   constructor(ltuid) {
     super()
     if (!ltuid) {
@@ -76,7 +74,7 @@ export default class MysUser extends BaseModel {
 
   static async forEach(fn) {
     let dbs = await MysUserDB.findAll()
-    await Data.forEach(dbs, async (db) => {
+    await Data.forEach(dbs, async db => {
       let mys = await MysUser.create(db.ltuid, db)
       return await fn(mys)
     })
@@ -108,7 +106,9 @@ export default class MysUser extends BaseModel {
     // 根据uid检索已查询记录。包括公共CK/自己CK/已查询过
     let ret = await create(await servCache.zKey(tables.detail, uid))
     if (ret) {
-      logger.mark(`[米游社查询][uid：${uid}]${logger.green(`[使用已查询ck：${ret.ltuid}]`)}`)
+      logger.mark(
+        `[米游社查询][uid：${uid}]${logger.green(`[使用已查询ck：${ret.ltuid}]`)}`
+      )
       return ret
     }
 
@@ -118,7 +118,9 @@ export default class MysUser extends BaseModel {
     // 使用CK池内容，分配次数最少的一个ltuid
     ret = await create(await servCache.zMinKey(tables.detail))
     if (ret) {
-      logger.mark(`[米游社查询][uid：${uid}]${logger.green(`[分配查询ck：${ret.ltuid}]`)}`)
+      logger.mark(
+        `[米游社查询][uid：${uid}]${logger.green(`[分配查询ck：${ret.ltuid}]`)}`
+      )
       return ret
     }
 
@@ -126,8 +128,8 @@ export default class MysUser extends BaseModel {
   }
 
   static async eachServ(fn) {
-    await MysUtil.eachServ(async (serv) => {
+    await MysUtil.eachServ(async serv => {
-      await MysUtil.eachGame(async (game) => {
+      await MysUtil.eachGame(async game => {
         let servCache = DailyCache.create(serv, game)
         await fn(servCache, serv, game)
       })
@@ -158,7 +160,7 @@ export default class MysUser extends BaseModel {
         count[type] = num
         totalCount[type] = (totalCount[type] || 0) + num
       }
-      lodash.forEach(data, (ds) => {
+      lodash.forEach(data, ds => {
         list.push({
           ltuid: ds.value,
           num: ds.score
@@ -174,7 +176,8 @@ export default class MysUser extends BaseModel {
       stat('last', count.normal * 30 - count.query)
       list = lodash.sortBy(list, ['num', 'ltuid']).reverse()
       ret.servs[serv] = {
-        list, count
+        list,
+        count
       }
     })
     ret.count = totalCount
@@ -246,7 +249,10 @@ export default class MysUser extends BaseModel {
     let detailRet = await mys.getData('detail', { avatar_id: 10000021 })
     if (detailRet.retcode !== 0 || lodash.isEmpty(detailRet.data)) {
       let msg = noteRet.message !== 'OK' ? noteRet.message : 'CK失效'
-      return err(`${msg || 'CK失效'}，当前CK仍可查询体力及角色，但无法查询角色详情数据`, 1)
+      return err(
+        `${msg || 'CK失效'}，当前CK仍可查询体力及角色，但无法查询角色详情数据`,
+        1
+      )
     }
     return {
       uids,
@@ -331,7 +337,11 @@ export default class MysUser extends BaseModel {
 
     if (!res) return err(msg)
     let playerList = res?.data?.list || []
-    playerList = playerList.filter(v => ['hk4e_cn', 'hkrpg_cn', 'hk4e_global', 'hkrpg_global'].includes(v.game_biz))
+    playerList = playerList.filter(v =>
+      ['hk4e_cn', 'hkrpg_cn', 'hk4e_global', 'hkrpg_global'].includes(
+        v.game_biz
+      )
+    )
     if (!playerList || playerList.length <= 0) {
       return err('该账号尚未绑定原神或星穹角色')
     }
@@ -341,7 +351,10 @@ export default class MysUser extends BaseModel {
 
     /** 米游社默认展示的角色 */
     for (let val of playerList) {
-      this.addUid(val.game_uid, ['hk4e_cn', 'hk4e_global'].includes(val.game_biz) ? 'gs' : 'sr')
+      this.addUid(
+        val.game_uid,
+        ['hk4e_cn', 'hk4e_global'].includes(val.game_biz) ? 'gs' : 'sr'
+      )
     }
     await this.save()
     return { status: 0, msg: '' }
@@ -351,7 +364,8 @@ export default class MysUser extends BaseModel {
     let ck = this.ck
     let url = {
       mys: 'https://api-takumi.mihoyo.com/binding/api/getUserGameRolesByCookie',
-      hoyolab: 'https://sg-public-api.hoyolab.com/binding/api/getUserGameRolesByCookie'
+      hoyolab:
+        'https://sg-public-api.hoyolab.com/binding/api/getUserGameRolesByCookie'
     }
 
     let res = await fetch(url[serv], { method: 'get', headers: { Cookie: ck } })
@@ -415,7 +429,7 @@ export default class MysUser extends BaseModel {
     this.device = data.device || this.device || MysUtil.getDeviceGuid()
     this.uids = this.uids || {}
     let self = this
-    MysUtil.eachGame((game) => {
+    MysUtil.eachGame(game => {
       self.uids[game] = data?.uids?.[game] || self.uids[game] || []
     })
   }
@@ -454,7 +468,7 @@ export default class MysUser extends BaseModel {
       return
     }
     let self = this
-    await MysUtil.eachGame(async (game) => {
+    await MysUtil.eachGame(async game => {
       let uids = self.uids[game]
       await this.addQueryUid(uids, game)
       let cache = self.getCache(game)
@@ -463,7 +477,7 @@ export default class MysUser extends BaseModel {
       if (cacheSearchList && cacheSearchList.length > 0) {
         for (let searchedUid of cacheSearchList) {
           // 检查对应uid是否有新的查询记录
-          if (!await this.getQueryLtuid(searchedUid, game)) {
+          if (!(await this.getQueryLtuid(searchedUid, game))) {
             await this.addQueryUid(searchedUid, game)
           }
         }
@@ -487,7 +501,7 @@ export default class MysUser extends BaseModel {
     // TODO 检查一ltuid多绑定的情况
     // 将查询过的uid缓存起来，以备后续重新绑定时恢复
     let self = this
-    await MysUtil.eachGame(async (game) => {
+    await MysUtil.eachGame(async game => {
       let uids = await this.getQueryUids(game)
       let cache = self.getCache(game)
       await cache.set(tables.del, uids)

src/mys/MysUtil.ts

@@ -1,6 +1,9 @@
 import { Data } from './local.js'
 
-const games = [{ key: 'gs', name: '原神' }, { key: 'sr', name: '星穹铁道' }]
+const games = [
+  { key: 'gs', name: '原神' },
+  { key: 'sr', name: '星穹铁道' }
+]
 
 const MysUtil = {
   // 获取标准ltuid
@@ -33,12 +36,25 @@ const MysUtil = {
       return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1)
     }
 
-    return (S4() + S4() + '-' + S4() + '-' + S4() + '-' + S4() + '-' + S4() + S4() + S4())
+    return (
+      S4() +
+      S4() +
+      '-' +
+      S4() +
+      '-' +
+      S4() +
+      '-' +
+      S4() +
+      '-' +
+      S4() +
+      S4() +
+      S4()
+    )
   },
 
   // 循环game
   async eachGame(fn) {
-    await Data.forEach(games, (ds) => {
+    await Data.forEach(games, ds => {
       return fn(ds.key, ds)
     })
   },

src/mys/NoteUser.ts

@@ -10,7 +10,6 @@ import lodash from 'lodash'
 import MysUser from './MysUser.js'
 import MysUtil from './MysUtil.js'
 
-
 import { UserDB } from '../db/index.js'
 
 //
@@ -39,9 +38,11 @@ export default class NoteUser extends BaseModel {
 
   // 获取绑定CK的UID列表，如未绑定CK则返回空数组
   get ckUids() {
-    console.warn('NoteUser.ckUids 默认返回原神UID，可更改为 user.getCkUidList(game)')
+    console.warn(
+      'NoteUser.ckUids 默认返回原神UID，可更改为 user.getCkUidList(game)'
+    )
     let uids = this.getCkUidList('gs')
-    return lodash.map(uids, (ds) => ds.uid)
+    return lodash.map(uids, ds => ds.uid)
   }
 
   /**
@@ -68,7 +69,6 @@ export default class NoteUser extends BaseModel {
     return cks
   }
 
-
   /**
    * End OLD Func }}
    */
@@ -111,7 +111,7 @@ export default class NoteUser extends BaseModel {
 
   static async forEach(fn) {
     let dbs = await UserDB.findAll()
-    await Data.forEach(dbs, async (db) => {
+    await Data.forEach(dbs, async db => {
       let user = await NoteUser.create(db.id, db)
       return await fn(user)
     })
@@ -148,7 +148,6 @@ export default class NoteUser extends BaseModel {
     await this.db.saveDB(this)
   }
 
-
   getUidMapList(game = 'gs', type = 'all') {
     if (this._map?.[game]?.[type]) {
       return this._map[game][type]
@@ -156,11 +155,11 @@ export default class NoteUser extends BaseModel {
     game = this.gameKey(game)
     let uidMap = {}
     let uidList = []
-    lodash.forEach(this.mysUsers, (mys) => {
+    lodash.forEach(this.mysUsers, mys => {
       if (!mys) {
         return
       }
-      lodash.forEach(mys.uids[game] || [], (uid) => {
+      lodash.forEach(mys.uids[game] || [], uid => {
         uid = uid + ''
         if (uid && !uidMap[uid]) {
           uidMap[uid] = mys.getUidData(uid, game)
@@ -170,7 +169,7 @@ export default class NoteUser extends BaseModel {
     })
     if (type === 'all') {
       let gameDs = this.getGameDs(game)
-      lodash.forEach(gameDs.data, (ds) => {
+      lodash.forEach(gameDs.data, ds => {
         if (ds.uid && !uidMap[ds.uid]) {
           uidMap[ds.uid] = ds
           uidList.push(ds)
@@ -187,7 +186,6 @@ export default class NoteUser extends BaseModel {
     return this._map[game][type]
   }
 
-
   getUidData(uid = '', game = 'gs') {
     if (!uid) {
       uid = this.getUid(game)
@@ -282,7 +280,6 @@ export default class NoteUser extends BaseModel {
     return this._games[game]
   }
 
-
   /**
    * 设置当前用户的绑定uid
    * @param uid 要绑定的uid
@@ -320,7 +317,7 @@ export default class NoteUser extends BaseModel {
   async addMysUser(mysUser) {
     this.mysUsers[mysUser.ltuid] = mysUser
     this._map = false
-    MysUtil.eachGame((game) => {
+    MysUtil.eachGame(game => {
       let uid = mysUser.getUid(game)
       if (uid && this.getUid(game) == '') {
         this.setMainUid(uid, game, false)

src/mys/apiTool.ts

@@ -24,7 +24,9 @@ export default class apiTool {
 
   getUrlMap = (data = {}) => {
     let host, hostRecord, hostPublicData
-    if (['cn_gf01', 'cn_qd01', 'prod_gf_cn', 'prod_qd_cn'].includes(this.server)) {
+    if (
+      ['cn_gf01', 'cn_qd01', 'prod_gf_cn', 'prod_qd_cn'].includes(this.server)
+    ) {
       host = 'https://api-takumi.mihoyo.com/'
       hostRecord = 'https://api-takumi-record.mihoyo.com/'
       hostPublicData = 'https://public-data-api.mihoyo.com/'
@@ -36,7 +38,8 @@ export default class apiTool {
     let urlMap = {
       genshin: {
         /** 体力接口fp参数用于避开验证码 */
-        ...(['cn_gf01', 'cn_qd01'].includes(this.server) ? {
+        ...(['cn_gf01', 'cn_qd01'].includes(this.server)
+          ? {
               getFp: {
                 url: `${hostPublicData}device-fp/api/getFp`,
                 body: {
@@ -49,7 +52,8 @@ export default class apiTool {
                   device_fp: '38d7ee834d1e9'
                 }
               }
-        } : {
+            }
+          : {
               getFp: {
                 url: `${hostPublicData}device-fp/api/getFp`,
                 body: {
@@ -139,7 +143,8 @@ export default class apiTool {
         }
       },
       honkaisr: {
-        ...(['prod_gf_cn', 'prod_qd_cn'].includes(this.server) ? {
+        ...(['prod_gf_cn', 'prod_qd_cn'].includes(this.server)
+          ? {
               UserGame: {
                 url: `${host}binding/api/getUserGameRolesByCookie`,
                 query: `game_biz=hkrpg_cn&region=${this.server}&game_uid=${this.uid}`
@@ -157,7 +162,8 @@ export default class apiTool {
                   device_fp: '38d7ee834d1e9'
                 }
               }
-        } : {
+            }
+          : {
               UserGame: {
                 url: `${host}binding/api/getUserGameRolesByCookie`,
                 query: `game_biz=hkrpg_global&region=${this.server}&game_uid=${this.uid}`
@@ -224,18 +230,25 @@ export default class apiTool {
     }
 
     if (this.server.startsWith('os')) {
-      urlMap.genshin.detail.url = 'https://sg-public-api.hoyolab.com/event/calculateos/sync/avatar/detail'// 角色天赋详情
+      urlMap.genshin.detail.url =
+        'https://sg-public-api.hoyolab.com/event/calculateos/sync/avatar/detail' // 角色天赋详情
       urlMap.genshin.detail.query = `lang=zh-cn&uid=${this.uid}&region=${this.server}&avatar_id=${data.avatar_id}`
-      urlMap.genshin.avatarSkill.url = 'https://sg-public-api.hoyolab.com/event/calculateos/avatar/skill_list'// 查询未持有的角色天赋
+      urlMap.genshin.avatarSkill.url =
+        'https://sg-public-api.hoyolab.com/event/calculateos/avatar/skill_list' // 查询未持有的角色天赋
       urlMap.genshin.avatarSkill.query = `lang=zh-cn&avatar_id=${data.avatar_id}`
-      urlMap.genshin.compute.url = 'https://sg-public-api.hoyolab.com/event/calculateos/compute'// 已支持养成计算
+      urlMap.genshin.compute.url =
-      urlMap.genshin.blueprint.url = 'https://sg-public-api.hoyolab.com/event/calculateos/furniture/blueprint'
+        'https://sg-public-api.hoyolab.com/event/calculateos/compute' // 已支持养成计算
+      urlMap.genshin.blueprint.url =
+        'https://sg-public-api.hoyolab.com/event/calculateos/furniture/blueprint'
       urlMap.genshin.blueprint.query = `share_code=${data.share_code}&region=${this.server}&lang=zh-cn`
-      urlMap.genshin.blueprintCompute.url = 'https://sg-public-api.hoyolab.com/event/calculateos/furniture/compute'
+      urlMap.genshin.blueprintCompute.url =
+        'https://sg-public-api.hoyolab.com/event/calculateos/furniture/compute'
       urlMap.genshin.blueprintCompute.body = { lang: 'zh-cn', ...data.body }
-      urlMap.genshin.ys_ledger.url = 'https://sg-hk4e-api.hoyolab.com/event/ysledgeros/month_info'// 支持了国际服札记
+      urlMap.genshin.ys_ledger.url =
+        'https://sg-hk4e-api.hoyolab.com/event/ysledgeros/month_info' // 支持了国际服札记
       urlMap.genshin.ys_ledger.query = `lang=zh-cn&month=${data.month}&uid=${this.uid}&region=${this.server}`
-      urlMap.genshin.useCdk.url = 'https://sg-hk4e-api.hoyoverse.com/common/apicdkey/api/webExchangeCdkey'
+      urlMap.genshin.useCdk.url =
+        'https://sg-hk4e-api.hoyoverse.com/common/apicdkey/api/webExchangeCdkey'
       urlMap.genshin.useCdk.query = `uid=${this.uid}&region=${this.server}&lang=zh-cn&cdkey=${data.cdk}&game_biz=hk4e_global`
     }
     return urlMap[this.game]

src/mys/gsCfg.ts

@@ -25,7 +25,10 @@ class GsCfg {
   }
 
   get element() {
-    return { ...this.getdefSet('element', 'role'), ...this.getdefSet('element', 'weapon') }
+    return {
+      ...this.getdefSet('element', 'role'),
+      ...this.getdefSet('element', 'weapon')
+    }
   }
 
   /**
@@ -42,7 +45,10 @@ class GsCfg {
       return this.getYaml(app, name, 'config')
     }
 
-    return { ...this.getdefSet(app, name), ...this.getYaml(app, name, 'config') }
+    return {
+      ...this.getdefSet(app, name),
+      ...this.getYaml(app, name, 'config')
+    }
   }
 
   /**
@@ -58,9 +64,7 @@ class GsCfg {
     if (this[type][key]) return this[type][key]
 
     try {
-      this[type][key] = YAML.parse(
+      this[type][key] = YAML.parse(fs.readFileSync(file, 'utf8'))
-        fs.readFileSync(file, 'utf8')
-      )
     } catch (error) {
       logger.error(`[${app}][${name}] 格式错误 ${error}`)
       return false
@@ -106,9 +110,9 @@ class GsCfg {
     await NoteUser.forEach(async function (user) {
       let qq = user.qq + ''
       let tmp = {}
-      lodash.forEach(user.mysUsers, (mys) => {
+      lodash.forEach(user.mysUsers, mys => {
         let uids = mys.getUids(game)
-        lodash.forEach(uids, (uid) => {
+        lodash.forEach(uids, uid => {
           let ckData = mys.getCkInfo(game)
           ckData.qq = qq
           if (!ck[uid]) {
@@ -137,7 +141,6 @@ class GsCfg {
     return char?.id || false
   }
 
-
   /**
    * 原神角色武器长名称缩写
    * @param name 名称
@@ -203,7 +206,6 @@ class GsCfg {
     }
   }
 
-
   cpCfg(app, name) {
     if (!fs.existsSync('./plugins/genshin/config')) {
       fs.mkdirSync('./plugins/genshin/config')
@@ -248,7 +250,6 @@ class GsCfg {
     }
   }
 
-
   // 仅供内部调用
   _roleNameToID(keyword, isSr) {
     if (isSr) this.isSr = isSr
@@ -321,7 +322,6 @@ class GsCfg {
   getAbbr() {
     console.log('gsCfg.getAbbr() 已经废弃')
   }
-
 }
 
 export default new GsCfg()

src/mys/local.js

@@ -1,2 +1,2 @@
-export * from '#miao';
+export * from '#miao'
-export { Character, Weapon } from '#miao.models';
+export { Character, Weapon } from '#miao.models'

src/mys/mysApi.ts

@@ -70,7 +70,11 @@ export default class MysApi {
   }
 
   async getData(type, data = {}, cached = false) {
-    if (!this._device_fp && !data?.Getfp && !data?.headers?.['x-rpc-device_fp']) {
+    if (
+      !this._device_fp &&
+      !data?.Getfp &&
+      !data?.headers?.['x-rpc-device_fp']
+    ) {
       this._device_fp = await this.getData('getFp', {
         seed_id: this.generateSeed(16),
         Getfp: true
@@ -92,7 +96,11 @@ export default class MysApi {
       headers = { ...headers, ...data.headers }
     }
 
-    if (type !== 'getFp' && !headers['x-rpc-device_fp'] && this._device_fp.data?.device_fp) {
+    if (
+      type !== 'getFp' &&
+      !headers['x-rpc-device_fp'] &&
+      this._device_fp.data?.device_fp
+    ) {
       headers['x-rpc-device_fp'] = this._device_fp.data.device_fp
     }
 
@@ -117,7 +125,9 @@ export default class MysApi {
     }
 
     if (!response.ok) {
-      logger.error(`[米游社接口][${type}][${this.uid}] ${response.status} ${response.statusText}`)
+      logger.error(
+        `[米游社接口][${type}][${this.uid}] ${response.status} ${response.statusText}`
+      )
       return false
     }
     if (this.option.log) {
@@ -148,7 +158,8 @@ export default class MysApi {
     }
     const os = {
       app_version: '2.55.0',
-      User_Agent: 'Mozilla/5.0 (Linux; Android 11; J9110 Build/55.2.A.4.332; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/124.0.6367.179 Mobile Safari/537.36 miHoYoBBSOversea/2.55.0',
+      User_Agent:
+        'Mozilla/5.0 (Linux; Android 11; J9110 Build/55.2.A.4.332; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/124.0.6367.179 Mobile Safari/537.36 miHoYoBBSOversea/2.55.0',
       client_type: '2',
       Origin: 'https://act.hoyolab.com',
       X_Requested_With: 'com.mihoyo.hoyolab',
@@ -164,14 +175,16 @@ export default class MysApi {
       'x-rpc-app_version': client.app_version,
       'x-rpc-client_type': client.client_type,
       'User-Agent': client.User_Agent,
-      Referer: client.Referer,
+      'Referer': client.Referer,
-      DS: this.getDs(query, body)
+      'DS': this.getDs(query, body)
     }
   }
 
   getDs(q = '', b = '') {
     let n = ''
-    if (['cn_gf01', 'cn_qd01', 'prod_gf_cn', 'prod_qd_cn'].includes(this.server)) {
+    if (
+      ['cn_gf01', 'cn_qd01', 'prod_gf_cn', 'prod_qd_cn'].includes(this.server)
+    ) {
       n = 'xV8v4Qu54lUKrEYFZkJhB8cuOh9Asafs'
     } else if (/os_|official/.test(this.server)) {
       n = 'okr4obncj8bw5a65hbnn5oo6ixjc3l9w'
@@ -187,7 +200,20 @@ export default class MysApi {
       return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1)
     }
 
-    return (S4() + S4() + '-' + S4() + '-' + S4() + '-' + S4() + '-' + S4() + S4() + S4())
+    return (
+      S4() +
+      S4() +
+      '-' +
+      S4() +
+      '-' +
+      S4() +
+      '-' +
+      S4() +
+      '-' +
+      S4() +
+      S4() +
+      S4()
+    )
   }
 
   cacheKey(type, data) {
@@ -207,11 +233,13 @@ export default class MysApi {
     if (!/os_|official/.test(this.server)) return null
 
     if (HttpsProxyAgent === '') {
-      HttpsProxyAgent = await import('https-proxy-agent').catch((err) => {
+      HttpsProxyAgent = await import('https-proxy-agent').catch(err => {
         logger.error(err)
       })
 
-      HttpsProxyAgent = HttpsProxyAgent ? HttpsProxyAgent.HttpsProxyAgent : undefined
+      HttpsProxyAgent = HttpsProxyAgent
+        ? HttpsProxyAgent.HttpsProxyAgent
+        : undefined
     }
 
     if (HttpsProxyAgent) {

src/mys/mysInfo.ts

@@ -28,7 +28,22 @@ export default class MysInfo {
     }
     // ck对应MysUser对象
     this.ckUser = null
-    this.auth = ['dailyNote', 'bbs_sign_info', 'bbs_sign_home', 'bbs_sign', 'ys_ledger', 'compute', 'avatarSkill', 'detail', 'blueprint', 'UserGame', 'deckList', 'avatar_cardList', 'action_cardList', 'avatarInfo']
+    this.auth = [
+      'dailyNote',
+      'bbs_sign_info',
+      'bbs_sign_home',
+      'bbs_sign',
+      'ys_ledger',
+      'compute',
+      'avatarSkill',
+      'detail',
+      'blueprint',
+      'UserGame',
+      'deckList',
+      'avatar_cardList',
+      'action_cardList',
+      'avatarInfo'
+    ]
 
     this.gtest = false
     this.mysButton = segment.button([
@@ -58,11 +73,18 @@ export default class MysInfo {
       return false
     }
 
-    if (!['1', '2', '3', '5', '6', '7', '8', '18', '9'].includes(String(mysInfo.uid).slice(0, -8))) {
+    if (
+      !['1', '2', '3', '5', '6', '7', '8', '18', '9'].includes(
+        String(mysInfo.uid).slice(0, -8)
+      )
+    ) {
       // e.reply('只支持查询国服uid')
       return false
     }
-    if (!['6', '7', '8', '18', '9'].includes(String(mysInfo.uid).slice(0, -8)) && api === 'useCdk') {
+    if (
+      !['6', '7', '8', '18', '9'].includes(String(mysInfo.uid).slice(0, -8)) &&
+      api === 'useCdk'
+    ) {
       e.reply('兑换码使用只支持国际服uid')
       return false
     }
@@ -100,9 +122,14 @@ export default class MysInfo {
       uid = atUser.getUid(e)
       if (uid) return String(uid)
       if (e.noTips !== true) {
-        e.reply(['尚未绑定uid', segment.button([
+        e.reply(
-          { text: '绑定UID', input: '#绑定uid' }
+          [
-        ])], false, { at })
+            '尚未绑定uid',
+            segment.button([{ text: '绑定UID', input: '#绑定uid' }])
+          ],
+          false,
+          { at }
+        )
       }
       return false
     }
@@ -122,9 +149,14 @@ export default class MysInfo {
     }
 
     if (e.noTips !== true) {
-      e.reply(['请先#绑定uid', segment.button([
+      e.reply(
-        { text: '绑定UID', input: '#绑定uid' }
+        [
-      ])], false, { at: at || true })
+          '请先#绑定uid',
+          segment.button([{ text: '绑定UID', input: '#绑定uid' }])
+        ],
+        false,
+        { at: at || true }
+      )
     }
 
     return false
@@ -144,9 +176,14 @@ export default class MysInfo {
 
     if (!selfUser.hasCk) {
       if (e.noTips !== true) {
-        e.reply(['尚未绑定Cookie', segment.button([
+        e.reply(
-          { text: 'Cookie帮助', callback: '#Cookie帮助' }
+          [
-        ])], false, { at: selfUser.qq })
+            '尚未绑定Cookie',
+            segment.button([{ text: 'Cookie帮助', callback: '#Cookie帮助' }])
+          ],
+          false,
+          { at: selfUser.qq }
+        )
       }
       return false
     }
@@ -179,7 +216,13 @@ export default class MysInfo {
     e.uid = mysInfo.uid
 
     let user = e.user?.getMysUser()
-    let mysApi = new MysApi(mysInfo.uid, mysInfo.ckInfo.ck, option, e.isSr, user.device)
+    let mysApi = new MysApi(
+      mysInfo.uid,
+      mysInfo.ckInfo.ck,
+      option,
+      e.isSr,
+      user.device
+    )
 
     let res
     if (lodash.isObject(api)) {
@@ -199,7 +242,12 @@ export default class MysInfo {
       }
 
       for (let i in res) {
-        res[i] = await mysInfo.checkCode(res[i], res[i].api, mysApi, api[res[i].api])
+        res[i] = await mysInfo.checkCode(
+          res[i],
+          res[i].api,
+          mysApi,
+          api[res[i].api]
+        )
         mysInfo.gtest = true
 
         if (res[i]?.retcode === 0) continue
@@ -245,7 +293,7 @@ export default class MysInfo {
   static async initUserCk() {
     // 初始化用户缓存
     let userCount = 0
-    await MysUser.forEach(async (mys) => {
+    await MysUser.forEach(async mys => {
       let ret = await mys.initCache()
       if (ret) {
         userCount++
@@ -263,13 +311,12 @@ export default class MysInfo {
   static async initCache(force = false, clearData = false) {
     // 检查缓存标记
     const cache = DailyCache.create()
-    if (!force && await cache.get('cache-ready') || this.initing)
+    if ((!force && (await cache.get('cache-ready'))) || this.initing)
       return true
     this.initing = true
     await DailyCache.clearOutdatedData()
 
-    if (clearData)
+    if (clearData) await MysUser.clearCache()
-      await MysUser.clearCache()
 
     // 先初始化用户CK，减少一些公共CK中ltuid无法识别的情况
     await MysInfo.initUserCk()
@@ -320,15 +367,21 @@ export default class MysInfo {
     if (this.e.noTips === true) return
 
     if (!this.uid) {
-      this.e.reply(['请先#绑定uid', segment.button([
+      this.e.reply(
-        { text: '绑定UID', input: '#绑定uid' }
+        [
-      ])], false, { at: true })
+          '请先#绑定uid',
+          segment.button([{ text: '绑定UID', input: '#绑定uid' }])
+        ],
+        false,
+        { at: true }
+      )
     }
 
     if (!this.ckInfo.ck) {
-      this.e.reply(['暂无可用CK，请绑定更多用户或设置公共ck..', segment.button([
+      this.e.reply([
-        { text: 'Cookie帮助', callback: '#Cookie帮助' }
+        '暂无可用CK，请绑定更多用户或设置公共ck..',
-      ])])
+        segment.button([{ text: 'Cookie帮助', callback: '#Cookie帮助' }])
+      ])
     }
 
     this.e.noTips = true
@@ -362,7 +415,11 @@ export default class MysInfo {
 
   async checkCode(res, type, mysApi = {}, data = {}, isTask = false) {
     if (!res) {
-      if (!isTask) this.e.reply([`UID:${this.uid}，米游社接口请求失败，暂时无法查询`, this.mysButton])
+      if (!isTask)
+        this.e.reply([
+          `UID:${this.uid}，米游社接口请求失败，暂时无法查询`,
+          this.mysButton
+        ])
       return false
     }
 
@@ -384,18 +441,35 @@ export default class MysInfo {
         if (/(登录|login)/i.test(res.message)) {
           if (this.ckInfo.uid) {
             logger.mark(`[ck失效][uid:${this.uid}][qq:${this.userId}]`)
-            if (!isTask) this.e.reply([`UID:${this.ckInfo.uid}，米游社Cookie已失效`, this.mysButton])
+            if (!isTask)
+              this.e.reply([
+                `UID:${this.ckInfo.uid}，米游社Cookie已失效`,
+                this.mysButton
+              ])
           } else {
             logger.mark(`[公共ck失效][ltuid:${this.ckInfo.ltuid}]`)
-            if (!isTask) this.e.reply([`UID:${this.uid}，米游社查询失败，请稍后再试`, this.mysButton])
+            if (!isTask)
+              this.e.reply([
+                `UID:${this.uid}，米游社查询失败，请稍后再试`,
+                this.mysButton
+              ])
           }
           if (!isTask) await this.delCk()
         } else {
-          if (!isTask) this.e.reply([`UID:${this.uid}，米游社接口报错，暂时无法查询：${res.message}`, this.mysButton])
+          if (!isTask)
+            this.e.reply([
+              `UID:${this.uid}，米游社接口报错，暂时无法查询：${res.message}`,
+              this.mysButton
+            ])
         }
         break
       case 1008:
-        if (!isTask) this.e.reply([`UID:${this.uid}，请先去米游社绑定角色`, this.mysButton], false, { at: this.userId })
+        if (!isTask)
+          this.e.reply(
+            [`UID:${this.uid}，请先去米游社绑定角色`, this.mysButton],
+            false,
+            { at: this.userId }
+          )
         break
       case 10101:
         if (!isTask) {
@@ -405,9 +479,18 @@ export default class MysInfo {
         break
       case 10102:
         if (res.message === 'Data is not public for the user') {
-          if (!isTask) this.e.reply([`\nUID:${this.uid}，米游社数据未公开`, this.mysButton], false, { at: this.userId })
+          if (!isTask)
+            this.e.reply(
+              [`\nUID:${this.uid}，米游社数据未公开`, this.mysButton],
+              false,
+              { at: this.userId }
+            )
         } else {
-          if (!isTask) this.e.reply([`UID:${this.uid}，请先去米游社绑定角色`, this.mysButton])
+          if (!isTask)
+            this.e.reply([
+              `UID:${this.uid}，请先去米游社绑定角色`,
+              this.mysButton
+            ])
         }
         break
       // 伙伴不存在~
@@ -416,7 +499,11 @@ export default class MysInfo {
         break
       case 5003:
       case 10041:
-        if (!isTask) this.e.reply([`UID:${this.uid}，米游社账号异常，暂时无法查询`, this.mysButton])
+        if (!isTask)
+          this.e.reply([
+            `UID:${this.uid}，米游社账号异常，暂时无法查询`,
+            this.mysButton
+          ])
         break
       case 1034:
       case 10035:
@@ -424,20 +511,43 @@ export default class MysInfo {
 
         // 如果有注册的mys.req.err，调用
         if (handler.has('mys.req.err')) {
-          logger.mark(`[米游社查询][uid:${this.uid}][qq:${this.userId}] 遇到验证码，尝试调用 Handler mys.req.err`)
+          logger.mark(
-          res = await handler.call('mys.req.err', this.e, { mysApi, type, res, data, mysInfo: this }) || res
+            `[米游社查询][uid:${this.uid}][qq:${this.userId}] 遇到验证码，尝试调用 Handler mys.req.err`
+          )
+          res =
+            (await handler.call('mys.req.err', this.e, {
+              mysApi,
+              type,
+              res,
+              data,
+              mysInfo: this
+            })) || res
         }
 
         if (!res || res?.retcode == 1034) {
-          logger.mark(`[米游社查询失败][uid:${this.uid}][qq:${this.userId}] 遇到验证码`)
+          logger.mark(
-          if (!isTask) this.e.reply([`UID:${this.uid}，米游社查询遇到验证码，请稍后再试`, this.mysButton])
+            `[米游社查询失败][uid:${this.uid}][qq:${this.userId}] 遇到验证码`
+          )
+          if (!isTask)
+            this.e.reply([
+              `UID:${this.uid}，米游社查询遇到验证码，请稍后再试`,
+              this.mysButton
+            ])
         }
         break
       case 10307:
-        if (!isTask) this.e.reply([`UID:${this.uid}，版本更新期间，数据维护中`, this.mysButton])
+        if (!isTask)
+          this.e.reply([
+            `UID:${this.uid}，版本更新期间，数据维护中`,
+            this.mysButton
+          ])
         break
       default:
-        if (!isTask) this.e.reply([`UID:${this.uid}，米游社接口报错，暂时无法查询：${res.message || 'error'}`, this.mysButton])
+        if (!isTask)
+          this.e.reply([
+            `UID:${this.uid}，米游社接口报错，暂时无法查询：${res.message || 'error'}`,
+            this.mysButton
+          ])
         break
     }
     if (res.retcode !== 0) {