Skip to content
This repository was archived by the owner on Jan 10, 2025. It is now read-only.
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 46 additions & 27 deletions src/service/msgUploader.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,36 +122,21 @@ async function sendMsg2RecvdApi(msg) {
formData.append('isMsgFromSelf', msg.self() ? '1' : '0')

switch (msg.type()) {
case MSG_TYPE_ENUM.ATTACHMENT:
case MSG_TYPE_ENUM.ATTACHMENT: {
// hack, 如果附件类型消息
try {
dealWithFileMsg(formData, msg)
} catch (e) {
/** 已知场景转发会进入这个逻辑,但好像还是没法显示转发内容,当unknown处理 */
formData.append('type', 'unknown')
formData.append('content', msg.text()) /** 当前不支持该消息展示 */
}
break
}
case MSG_TYPE_ENUM.VOICE:
case MSG_TYPE_ENUM.PIC:
case MSG_TYPE_ENUM.VIDEO: {
// 视频
formData.append('type', 'file')
/**@type {import('file-box').FileBox} */
//@ts-expect-errors 这里msg一定是wechaty的msg
const steamFile = msg.toFileBox ? await msg.toFileBox() : msg.content()

let fileInfo = {
// @ts-ignore
ext: steamFile._name.split('.').pop() ?? '',
// @ts-ignore
mime: steamFile._mediaType ?? 'Unknown',
// @ts-ignore
filename: steamFile._name ?? 'UnknownFile'
}

formData.append(
'content',
//@ts-expect-errors 需要用到私有属性
steamFile.buffer /** 发送一个文件 */ ??
//@ts-expect-errors 需要用到私有属性
steamFile.stream /** 同一个文件转发 */,
{
filename: fileInfo.filename,
contentType: fileInfo.mime
}
)
dealWithFileMsg(formData, msg)
break
}
// 分享的Url
Expand Down Expand Up @@ -220,6 +205,40 @@ async function sendMsg2RecvdApi(msg) {
return response
}

/**
* 抽离附件上传公共逻辑
* @param {import('form-data')} formData
* @param {extendedMsg} msg
*/
async function dealWithFileMsg(formData, msg) {
/**@type {import('file-box').FileBox} */
//@ts-expect-errors 这里msg一定是wechaty的msg
const steamFile = msg.toFileBox ? await msg.toFileBox() : msg.content()
// 上面尝试转化文件报错就不会进入以下逻辑
formData.append('type', 'file')

let fileInfo = {
// @ts-ignore
ext: steamFile._name.split('.').pop() ?? '',
// @ts-ignore
mime: steamFile._mediaType ?? 'Unknown',
// @ts-ignore
filename: steamFile._name ?? 'UnknownFile'
}

formData.append(
'content',
//@ts-expect-errors 需要用到私有属性
steamFile.buffer /** 发送一个文件 */ ??
//@ts-expect-errors 需要用到私有属性
steamFile.stream /** 同一个文件转发 */,
{
filename: fileInfo.filename,
contentType: fileInfo.mime
}
)
}

module.exports = {
sendMsg2RecvdApi
}