fix(cloud): 解决临时文件清理和上传流程中的错误处理问题

- 修复了临时文件清理失败时的日志消息本地化
- 移除了重复的临时文件清理调用,统一在 finally 块中处理
- 优化了错误处理逻辑,确保在各种异常情况下正确返回错误响应
- 更新了日志消息为中文描述,提高可读性
- 修复了上传插件中的日志消息本地化问题
- 统一了错误处理流程,避免重复的清理操作
This commit is contained in:
LaoShui 2026-02-18 17:09:02 +08:00
parent 8951e32a0e
commit 4087bafd7d
2 changed files with 150 additions and 151 deletions

View File

@ -37,18 +37,18 @@ module.exports = async (query, request) => {
try { try {
await fs.promises.unlink(query.songFile.tempFilePath) await fs.promises.unlink(query.songFile.tempFilePath)
} catch (e) { } catch (e) {
logger.info('Temp file cleanup failed:', e.message) logger.info('临时文件清理失败:', e.message)
} }
} }
} }
try {
if (useTempFile) { if (useTempFile) {
try { try {
const stats = await fs.promises.stat(query.songFile.tempFilePath) const stats = await fs.promises.stat(query.songFile.tempFilePath)
fileSize = stats.size fileSize = stats.size
} catch (e) { } catch (e) {
logger.error('Failed to stat temp file:', e.message) logger.error('获取临时文件状态失败:', e.message)
await cleanupTempFile()
return Promise.reject({ return Promise.reject({
status: 500, status: 500,
body: { body: {
@ -114,7 +114,7 @@ module.exports = async (query, request) => {
artist = info.artist artist = info.artist
} }
} catch (error) { } catch (error) {
logger.info('metadata parse error:', error.message) logger.info('元数据解析错误:', error.message)
} }
const tokenRes = await request( const tokenRes = await request(
`/api/nos/token/alloc`, `/api/nos/token/alloc`,
@ -131,8 +131,7 @@ module.exports = async (query, request) => {
) )
if (!tokenRes.body.result || !tokenRes.body.result.resourceId) { if (!tokenRes.body.result || !tokenRes.body.result.resourceId) {
logger.error('Token allocation failed:', tokenRes.body) logger.error('Token分配失败:', tokenRes.body)
await cleanupTempFile()
return Promise.reject({ return Promise.reject({
status: 500, status: 500,
body: { body: {
@ -144,21 +143,18 @@ module.exports = async (query, request) => {
} }
if (res.body.needUpload) { if (res.body.needUpload) {
logger.info('Need upload, starting upload process...') logger.info('需要上传,开始上传流程...')
try { try {
const uploadInfo = await uploadPlugin(query, request) const uploadInfo = await uploadPlugin(query, request)
logger.info('Upload completed:', uploadInfo?.body?.result?.resourceId) logger.info('上传完成:', uploadInfo?.body?.result?.resourceId)
} catch (uploadError) { } catch (uploadError) {
logger.error('Upload failed:', uploadError) logger.error('上传失败:', uploadError)
await cleanupTempFile()
return Promise.reject(uploadError) return Promise.reject(uploadError)
} }
} else { } else {
logger.info('File already exists, skip upload') logger.info('文件已存在,跳过上传')
} }
await cleanupTempFile()
const res2 = await request( const res2 = await request(
`/api/upload/cloud/info/v2`, `/api/upload/cloud/info/v2`,
{ {
@ -175,7 +171,7 @@ module.exports = async (query, request) => {
) )
if (res2.body.code !== 200) { if (res2.body.code !== 200) {
logger.error('Cloud info upload failed:', res2.body) logger.error('云盘信息上传失败:', res2.body)
return Promise.reject({ return Promise.reject({
status: res2.status || 500, status: res2.status || 500,
body: { body: {
@ -201,4 +197,7 @@ module.exports = async (query, request) => {
}, },
cookie: res.cookie, cookie: res.cookie,
} }
} finally {
await cleanupTempFile()
}
} }

View File

@ -27,7 +27,7 @@ module.exports = async (query, request) => {
) )
if (!tokenRes.body.result || !tokenRes.body.result.objectKey) { if (!tokenRes.body.result || !tokenRes.body.result.objectKey) {
logger.error('Token allocation failed:', tokenRes.body) logger.error('Token分配失败:', tokenRes.body)
throw { throw {
status: 500, status: 500,
body: { body: {
@ -49,7 +49,7 @@ module.exports = async (query, request) => {
}) })
).data ).data
} catch (error) { } catch (error) {
logger.error('LBS fetch failed:', error.message) logger.error('LBS获取失败:', error.message)
throw { throw {
status: 500, status: 500,
body: { body: {
@ -61,7 +61,7 @@ module.exports = async (query, request) => {
} }
if (!lbs || !lbs.upload || !lbs.upload[0]) { if (!lbs || !lbs.upload || !lbs.upload[0]) {
logger.error('Invalid LBS response:', lbs) logger.error('无效的LBS响应:', lbs)
throw { throw {
status: 500, status: 500,
body: { body: {
@ -95,9 +95,9 @@ module.exports = async (query, request) => {
maxBodyLength: Infinity, maxBodyLength: Infinity,
timeout: 300000, timeout: 300000,
}) })
logger.info('Upload success:', filename) logger.info('上传成功:', filename)
} catch (error) { } catch (error) {
logger.error('Upload failed:', { logger.error('上传失败:', {
status: error.response?.status, status: error.response?.status,
data: error.response?.data, data: error.response?.data,
message: error.message, message: error.message,