From fee0c25e7de136709b08ab72ad41f48927f0fc8b Mon Sep 17 00:00:00 2001 From: yoimiya-kokomi <592981798@qq.com> Date: Sun, 4 Sep 2022 17:33:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=BA=95=E5=B1=82=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin.js | 6 +- apps/character/character-img-upload.js | 6 +- apps/stat/HutaoApi.js | 7 +- apps/wiki/calendar.js | 2 +- components/Common.js | 2 +- components/Data.js | 111 ++++++++++++------------- components/profile-data/miao-meta.js | 2 +- index.js | 4 +- models/Artifact.js | 3 +- models/Avatars.js | 8 +- models/Character.js | 23 ++--- models/character-lib/CharImg.js | 19 +++-- resources/meta/material/data.json | 12 +-- tools/char-data-sprider.js | 38 ++++----- 14 files changed, 113 insertions(+), 130 deletions(-) diff --git a/apps/admin.js b/apps/admin.js index 33b0cd28..b96f96cc 100644 --- a/apps/admin.js +++ b/apps/admin.js @@ -1,7 +1,7 @@ import fs from 'fs' import lodash from 'lodash' import { exec } from 'child_process' -import { Cfg, Common } from '../components/index.js' +import { Cfg, Common, Data } from '../components/index.js' let cfgMap = { 角色: 'char.char', @@ -175,10 +175,10 @@ export async function updateMiaoPlugin (e) { } e.reply('喵喵更新成功，正在尝试重新启动Yunzai以应用更新...') timer && clearTimeout(timer) - redis.set('miao:restart-msg', JSON.stringify({ + Data.setCacheJSON('miao:restart-msg', { msg: '重启成功，新版喵喵已经生效', qq: e.user_id - }), { EX: 30 }) + }, 30) timer = setTimeout(function () { let command = 'npm run start' if (process.argv[1].includes('pm2')) { diff --git a/apps/character/character-img-upload.js b/apps/character/character-img-upload.js index 7297d343..cbc1dc98 100644 --- a/apps/character/character-img-upload.js +++ b/apps/character/character-img-upload.js @@ -57,7 +57,7 @@ async function saveImages (e, name, imageMessages) { let path = resPath + pathSuffix if (!fs.existsSync(path)) { - Data.createDir(resPath, pathSuffix) + Data.createDir(pathSuffix, resPath) } let senderName = lodash.truncate(e.sender.card, { length: 8 }) let imgCount = 0 @@ -124,13 +124,13 @@ async function isAllowedToUploadCharacterImage (e) { if (!groupId) { return false } - if (e.groupConfig.imgAddLimit === 2) { + if (e.groupConfig?.imgAddLimit === 2) { if (!e.isMaster) { e.reply('只有主人才能添加。') return false } } - if (e.groupConfig.imgAddLimit === 1 && !e.isMaster) { + if (e.groupConfig?.imgAddLimit === 1 && !e.isMaster) { if (!(e.sender.role === 'owner' || e.sender.role === 'admin')) { e.reply('只有管理员才能添加。') return false diff --git a/apps/stat/HutaoApi.js b/apps/stat/HutaoApi.js index 70bc1791..26b57457 100644 --- a/apps/stat/HutaoApi.js +++ b/apps/stat/HutaoApi.js @@ -5,6 +5,7 @@ * */ import fetch from 'node-fetch' +import { Data } from '../../components/index.js' const host = 'http://49.232.91.210:88/miaoPlugin/hutaoApi' @@ -14,9 +15,9 @@ function getApi (api) { let HutaoApi = { async req (url, param = {}) { - let cacheData = await redis.get(`hutao:${url}`) + let cacheData = await Data.getCacheJSON(`hutao:${url}`) if (cacheData && param.method !== 'POST') { - return JSON.parse(cacheData) + return cacheData } let response = await fetch(getApi(`${url}`), { @@ -27,7 +28,7 @@ let HutaoApi = { if (retData && retData.data && param.method !== 'POST') { let d = new Date() retData.lastUpdate = `${d.toLocaleDateString()} ${d.toTimeString().substr(0, 5)}` - await redis.set(`hutao:${url}`, JSON.stringify(retData), { EX: 3600 }) + await Data.setCacheJSON(`hutao:${url}`, retData, 3600) } return retData }, diff --git a/apps/wiki/calendar.js b/apps/wiki/calendar.js index 8839ee20..ad4492c9 100644 --- a/apps/wiki/calendar.js +++ b/apps/wiki/calendar.js @@ -105,7 +105,7 @@ let Cal = { } } catch (e) { } - await redis.set('cache:calendar:detail', JSON.stringify(timeMap), { EX: 60 * 10 }) + Data.setCacheJSON('cache:calendar:detail', timeMap, 60 * 10) } return { listData, timeMap } }, diff --git a/components/Common.js b/components/Common.js index 84774f08..9180dca5 100644 --- a/components/Common.js +++ b/components/Common.js @@ -11,7 +11,7 @@ export const render = async function (path, params, cfg) { let { e } = cfg let layoutPath = process.cwd() + '/plugins/miao-plugin/resources/common/layout/' let resPath = `../../../../../plugins/${plugin}/resources/` - Data.createDir(_path + '/data/', `html/${plugin}/${app}/${tpl}`) + Data.createDir(`data/html/${plugin}/${app}/${tpl}`, 'root') let data = { ...params, _plugin: plugin, diff --git a/components/Data.js b/components/Data.js index 85216db4..b07dbff6 100644 --- a/components/Data.js +++ b/components/Data.js @@ -2,15 +2,24 @@ import lodash from 'lodash' import fs from 'fs' const _path = process.cwd() +const getRoot = (root = '') => { + if (root === 'root' || root === 'yunzai') { + root = _path + } else if (!root) { + root = `${_path}/plugins/miao-plugin/` + } + return root +} let Data = { /* * 根据指定的path依次检查与创建目录 * */ - createDir (rootPath = '', path = '', includeFile = false) { + createDir (path = '', root = '', includeFile = false) { + root = getRoot(root) let pathList = path.split('/') - let nowPath = rootPath + let nowPath = root pathList.forEach((name, idx) => { name = name.trim() if (!includeFile && idx <= pathList.length - 1) { @@ -27,15 +36,14 @@ let Data = { /* * 读取json * */ - readJSON (root, path) { - if (!/\.json$/.test(path)) { - path = path + '.json' - } - // 检查并创建目录 - Data.createDir(root, path, true) - if (fs.existsSync(`${root}/${path}`)) { - let jsonRet = fs.readFileSync(`${root}/${path}`, 'utf8') - return JSON.parse(jsonRet) + readJSON (file = '', root = '') { + root = getRoot(root) + if (fs.existsSync(`${root}/${file}`)) { + try { + return JSON.parse(fs.readFileSync(`${root}/${file}`, 'utf8')) + } catch (e) { + console.log(e) + } } return {} }, @@ -43,38 +51,54 @@ let Data = { /* * 写JSON * */ - writeJson (path, file, data, space = '\t') { - if (!/\.json$/.test(file)) { - file = file + '.json' - } - + writeJSON (file, data, space = '\t', root = '') { // 检查并创建目录 - Data.createDir(_path, path, false) - console.log(data) + Data.createDir(file, root, true) + root = getRoot(root) delete data._res - return fs.writeFileSync(`${_path}/${path}/${file}`, JSON.stringify(data, null, space)) + return fs.writeFileSync(`${root}/${file}`, JSON.stringify(data, null, space)) }, - async importModule (path, file, rootPath = _path) { + async getCacheJSON (key) { + try { + let txt = await redis.get(key) + if (txt) { + return JSON.parse(txt) + } + } catch (e) { + console.log(e) + } + return {} + }, + + async setCacheJSON (key, data, EX = 3600 * 24 * 90) { + await redis.set(key, JSON.stringify(data), { EX }) + }, + + async importModule (file, root = '') { + root = getRoot(root) if (!/\.js$/.test(file)) { file = file + '.js' } // 检查并创建目录 - Data.createDir(_path, path, true) - if (fs.existsSync(`${_path}/${path}/${file}`)) { - let data = await import(`file://${_path}/${path}/${file}`) - return data || {} + if (fs.existsSync(`${root}/${file}`)) { + try { + let data = await import(`file://${root}/${file}`) + return data || {} + } catch (e) { + console.log(e) + } } return {} }, async import (name) { - return await Data.importModule('plugins/miao-plugin/components/optional-lib/', `${name}.js`) + return await Data.importModule(`components/optional-lib/${name}.js`) }, async importCfg (key) { - let sysCfg = await Data.importModule('plugins/miao-plugin/config/system', `${key}.js`) - let diyCfg = await Data.importModule('plugins/miao-plugin/config/', `${key}.js`) + let sysCfg = await Data.importModule(`config/system/${key}.js`) + let diyCfg = await Data.importModule(`config/${key}.js`) if (diyCfg.isSys) { console.error(`miao-plugin: config/${key}.js无效，已忽略`) console.error(`如需配置请复制config/${key}_default.js为config/${key}.js，请勿复制config/system下的系统文件`) @@ -128,35 +152,7 @@ let Data = { return lodash.get(target, keyFrom, defaultValue) }, - getUrlPath (url) { - let reg = /^https*:\/\/(.*)\/(\w+\.(png|jpg|jpeg|webp))(\?.*)?$/ - let ret = reg.exec(url) - if (!ret) { - return false - } - return { - path: ret[1], - filename: ret[2], - type: ret[3], - url - } - }, - pathExists (root, path) { - if (fs.existsSync(root + '/' + path)) { - return true - } - path = path.replace('\\', '/') - const dirList = path.split('/') - let currentDir = root - - for (let dir of dirList) { - currentDir = currentDir + '/' + dir - if (!fs.existsSync(currentDir)) { - fs.mkdirSync(currentDir) - } - } - return true - }, + // 异步池，聚合请求 async asyncPool (poolLimit, array, iteratorFn) { const ret = [] // 存储所有的异步任务 const executing = [] // 存储正在执行的异步任务 @@ -180,10 +176,12 @@ let Data = { return Promise.all(ret) }, + // sleep sleep (ms) { return new Promise((resolve) => setTimeout(resolve, ms)) }, + // 获取默认值 def () { for (let idx in arguments) { if (!lodash.isUndefined(arguments[idx])) { @@ -192,6 +190,7 @@ let Data = { } }, + // 循环字符串回调 eachStr: (arr, fn) => { if (lodash.isString(arr)) { arr = arr.replace(/\s*(;|；|、|，)\s*/, ',') diff --git a/components/profile-data/miao-meta.js b/components/profile-data/miao-meta.js index 00d7dc7b..60b9e1d4 100644 --- a/components/profile-data/miao-meta.js +++ b/components/profile-data/miao-meta.js @@ -11,7 +11,7 @@ export const artiIdx = { 理之冠: 5 } -let relis = Data.readJSON(`${_path}/plugins/miao-plugin/resources/meta/reliquaries/`, 'data.json') || {} +let relis = Data.readJSON('resources/meta/reliquaries/data.json') let setMap = {} lodash.forEach(relis, (ds) => { diff --git a/index.js b/index.js index 5474324f..e3cd14f6 100644 --- a/index.js +++ b/index.js @@ -3,7 +3,7 @@ import { Data, Version } from './components/index.js' export * from './apps/index.js' let index = { miao: {} } if (Version.isV3) { - index = await Data.importModule('/plugins/miao-plugin/adapter', 'v3-entrance.js') + index = await Data.importModule('adapter/v3-entrance.js') } export const miao = index.miao || {} if (Bot?.logger?.info) { @@ -18,7 +18,7 @@ setTimeout(async function () { let relpyPrivate = async function () { } if (!Version.isV3) { - let common = await Data.importModule('/lib', 'common.js') + let common = await Data.importModule('lib/common.js') if (common && common.default && common.default.relpyPrivate) { relpyPrivate = common.default.relpyPrivate } diff --git a/models/Artifact.js b/models/Artifact.js index e2514ec2..d170fa6c 100644 --- a/models/Artifact.js +++ b/models/Artifact.js @@ -5,8 +5,7 @@ import { Data } from '../components/index.js' let artisMap = {} async function init () { - let _path = process.cwd() - let artis = Data.readJSON(`${_path}/plugins/miao-plugin/resources/meta/reliquaries/`, 'data.json') || {} + let artis = Data.readJSON('resources/meta/reliquaries/data.json') lodash.forEach(artis, (ds) => { artisMap[ds.name] = ds diff --git a/models/Avatars.js b/models/Avatars.js index dc217fb8..52578fca 100644 --- a/models/Avatars.js +++ b/models/Avatars.js @@ -65,11 +65,7 @@ export default class Avatars extends Base { } async getTalentData (ids, MysApi = false) { - let avatarTalent = {} - let talentCache = await redis.get(`genshin:avatar-talent:${this.uid}`) - if (talentCache) { - avatarTalent = JSON.parse(talentCache) - } + let avatarTalent = await Data.getCacheJSON(`genshin:avatar-talent:${this.uid}`) let needReq = {} lodash.forEach(ids, (id) => { if (!avatarTalent[id]) { @@ -93,7 +89,7 @@ export default class Avatars extends Base { lodash.forEach(skillRet, (talent) => { avatarTalent[talent.id] = talent }) - await redis.set(`genshin:avatar-talent:${this.uid}`, JSON.stringify(avatarTalent), { EX: 3600 * 2 }) + await Data.setCacheJSON(`genshin:avatar-talent:${this.uid}`, avatarTalent, 3600 * 2) } let ret = this.getData(ids) lodash.forEach(ret, (avatar, id) => { diff --git a/models/Character.js b/models/Character.js index 6ca618aa..f0df4fc1 100644 --- a/models/Character.js +++ b/models/Character.js @@ -113,7 +113,7 @@ class Character extends Base { return costume.includes(id * 1) } - // 获取Character图像资源 + // 获取角色插画 getImgs (costume = '') { let costumeId = this.checkCostume(costume) ? '2' : '' let cacheId = `costume${costumeId}` @@ -135,13 +135,13 @@ class Character extends Base { if (this.isCustom) { return {} } - const path = `${_path}/plugins/miao-plugin/resources/meta/character/` + const path = 'resources/meta/character' try { if (this.isTraveler) { - this._detail = Data.readJSON(`${path}/旅行者/${this.elem}`, 'detail.json') || {} + this._detail = Data.readJSON(`${path}/旅行者/${this.elem}/detail.json`) } else { - this._detail = Data.readJSON(`${path}/${this.name}`, 'detail.json') || {} + this._detail = Data.readJSON(`${path}/${this.name}/detail.json`) } } catch (e) { console.log(e) @@ -151,23 +151,16 @@ class Character extends Base { setTraveler (uid = '') { if (this.isTraveler && uid && uid.toString().length === 9) { - redis.set(`genshin:uid-traveler:${uid}`, JSON.stringify({ + Data.setCacheJSON(`genshin:uid-traveler:${uid}`, { id: CharId.getTravelerId(this.id), elem: this.elem - }), { EX: 3600 * 24 * 120 }) + }, 3600 * 24 * 120) } } async getTraveler (uid) { if (this.isTraveler) { - let tData = {} - let uidData = await redis.get(`genshin:uid-traveler:${uid}`) - if (uidData) { - try { - tData = JSON.parse(uidData) || tData - } catch (e) { - } - } + let tData = await Data.getCacheJSON(`genshin:uid-traveler:${uid}`) return Character.get({ id: CharId.getTravelerId(tData.id || this.id), elem: tData.elem || (this.elem !== 'multi' ? this.elem : 'anemo') @@ -198,7 +191,7 @@ class Character extends Base { } let getMeta = function (name) { - return Data.readJSON(`${_path}/plugins/miao-plugin/resources/meta/character/${name}/`, 'data.json') || {} + return Data.readJSON(`resources/meta/character/${name}/data.json`) } Character.get = function (val) { diff --git a/models/character-lib/CharImg.js b/models/character-lib/CharImg.js index 3207f7eb..c0174fc2 100644 --- a/models/character-lib/CharImg.js +++ b/models/character-lib/CharImg.js @@ -3,6 +3,8 @@ import lodash from 'lodash' import sizeOf from 'image-size' const CharImg = { + + // 获取角色的插画 getCardImg (names, se = false, def = true) { let list = [] let addImg = function (charImgPath, disable = false) { @@ -48,21 +50,24 @@ const CharImg = { return ret }, - getImgs (name, cId = '', elem = '') { + // 获取角色的图像资源数据 + getImgs (name, costumeId = '', travelerElem = '') { let imgs = {} + if (!['空', '荧', '旅行者'].includes(name)) { + travelerElem = '' + } const nPath = `/meta/character/${name}/` - const tPath = `/meta/character/旅行者/${elem}` - + const tPath = `/meta/character/旅行者/${travelerElem}/` let add = (key, path, traveler = false) => { imgs[key] = `${traveler ? tPath : nPath}${path}.webp` } let tAdd = (key, path) => { - add(key, path, !!elem) + add(key, path, !!travelerElem) } - add('face', `imgs/face${cId}`) - add('side', `imgs/side${cId}`) + add('face', `imgs/face${costumeId}`) + add('side', `imgs/side${costumeId}`) add('gacha', 'imgs/gacha') - add('splash', `imgs/splash${cId}`) + add('splash', `imgs/splash${costumeId}`) tAdd('card', 'imgs/card') tAdd('banner', 'imgs/banner') for (let i = 1; i <= 6; i++) { diff --git a/resources/meta/material/data.json b/resources/meta/material/data.json index 04b67199..9d8957a4 100644 --- a/resources/meta/material/data.json +++ b/resources/meta/material/data.json @@ -507,15 +507,15 @@ "type": "talent", "star": 4, "items": { - "「诗文」的教导": { - "id": 401, - "name": "「诗文」的教导", + "「自由」的教导": { + "id": 421, + "name": "「自由」的教导", "type": "talent", "star": 2 }, - "「诗文」的指引": { - "id": 402, - "name": "「诗文」的指引", + "「抗争」的指引": { + "id": 452, + "name": "「抗争」的指引", "type": "talent", "star": 3 }, diff --git a/tools/char-data-sprider.js b/tools/char-data-sprider.js index 4ed8a08e..b5ca0856 100644 --- a/tools/char-data-sprider.js +++ b/tools/char-data-sprider.js @@ -95,7 +95,6 @@ let getCharData = async function (id, key, name = '') { dendro: 8 } let cid = `1000000${id}-${id}0${te[tElems[idx]]}` - console.log(cid) lodash.forEach(tId[cid].ProudMap || {}, (v, k) => { talentId[k] = v }) @@ -127,27 +126,18 @@ let getCharData = async function (id, key, name = '') { } function checkName (name) { - let charPath = `${_path}/plugins/miao-plugin/resources/meta/character/${name}/` - if (!fs.existsSync(charPath)) { - fs.mkdirSync(charPath) - } - if (name === '空' || name === '荧' || name === '旅行者') { + let charPath = `resources/meta/character/${name}/` + Data.createDir(charPath) + if (name === '旅行者') { for (let idx in tElems) { - Data.createDir(charPath, `${tElems[idx]}/icons`) + Data.createDir(`${charPath}${tElems[idx]}/icons`) } } else { - Data.createDir(charPath, 'icons') - } - Data.createDir(charPath, 'imgs') - if (fs.existsSync(`${charPath}data.json`)) { - try { - let data = JSON.parse(fs.readFileSync(`${charPath}data.json`, 'utf8')) - if (data && data.ver * 1 === ver * 1) { - return true - } - } catch (e) { - } + Data.createDir(`${charPath}/icons`) } + Data.createDir(`${charPath}/imgs`) + let data = Data.readJSON(`${charPath}/data.json`) + return data.ver * 1 > 1 } async function saveCharData (id, key, name = '', force = false) { @@ -171,7 +161,7 @@ async function saveCharData (id, key, name = '', force = false) { fs.writeFileSync(`${charPath}data.json`, JSON.stringify(data, '', 2)) if (details.length === 1) { fs.writeFileSync(`${charPath}detail.json`, JSON.stringify(details[0], '', 2)) - } else { + } else if (data.id === 20000000) { for (let idx in details) { let detail = details[idx] fs.writeFileSync(`${charPath}/${detail.elem}/detail.json`, JSON.stringify(detail, '', 2)) @@ -179,12 +169,12 @@ async function saveCharData (id, key, name = '', force = false) { } console.log(data.name + '数据下载完成') - await imgs.download() - console.log(data.name + '图像全部下载完成') + if (![10000005, 10000007].includes(data.id)) { + await imgs.download() + console.log(data.name + '图像全部下载完成') + } } -const ver = 1 - async function down (name = '', force = false) { if (name === '') { name = lodash.keys(charData).join(',') @@ -261,4 +251,4 @@ const charData = { 71: { key: 'cyno', name: '赛诺' }, 72: { key: 'candace', name: '坎蒂丝' } } -await down('', true) +await down('4,5,7', true)