diff --git a/src/core/packet/client/nativeClient.ts b/src/core/packet/client/nativeClient.ts index abd1758b..c4d8bd8d 100644 --- a/src/core/packet/client/nativeClient.ts +++ b/src/core/packet/client/nativeClient.ts @@ -16,8 +16,8 @@ export interface NativePacketExportType { export class NativePacketClient extends IPacketClient { private readonly supportedPlatforms = ['win32.x64', 'linux.x64', 'linux.arm64', 'darwin.x64', 'darwin.arm64']; - private MoeHooExport: { exports: NativePacketExportType } = { exports: {} }; - private sendEvent = new LRUCache(500); // seq->trace_id + private readonly MoeHooExport: { exports: NativePacketExportType } = { exports: {} }; + private readonly sendEvent = new LRUCache(500); // seq->trace_id constructor(context: PacketContext, logStack: LogStack) { super(context, logStack); diff --git a/src/onebot/action/extends/GetProfileLike.ts b/src/onebot/action/extends/GetProfileLike.ts index 36910a3c..c6faf3f1 100644 --- a/src/onebot/action/extends/GetProfileLike.ts +++ b/src/onebot/action/extends/GetProfileLike.ts @@ -13,9 +13,9 @@ export class GetProfileLike extends BaseAction { const start = payload.start ? Number(payload.start) : 0; const count = payload.count ? Number(payload.count) : 10; const ret = await this.core.apis.UserApi.getProfileLike(this.core.selfInfo.uid, start, count); - const listdata: any[] = ret.info.userLikeInfos[0].voteInfo.userInfos; - for (let i = 0; i < listdata.length; i++) { - listdata[i].uin = parseInt((await this.core.apis.UserApi.getUinByUidV2(listdata[i].uid)) || ''); + const listdata = ret.info.userLikeInfos[0].voteInfo.userInfos; + for (const item of listdata) { + item.uin = parseInt((await this.core.apis.UserApi.getUinByUidV2(item.uid)) || ''); } return ret.info.userLikeInfos[0].voteInfo; } diff --git a/src/onebot/action/extends/OCRImage.ts b/src/onebot/action/extends/OCRImage.ts index ecd26435..b6bb568b 100644 --- a/src/onebot/action/extends/OCRImage.ts +++ b/src/onebot/action/extends/OCRImage.ts @@ -21,7 +21,7 @@ export class OCRImage extends BaseAction { async _handle(payload: Payload) { const { path, success } = (await uri2local(this.core.NapCatTempPath, payload.image)); if (!success) { - throw `OCR ${payload.image}失败,image字段可能格式不正确`; + throw new Error(`OCR ${payload.image}失败,image字段可能格式不正确`); } if (path) { await checkFileReceived(path, 5000); // 文件不存在QQ会崩溃，需要提前判断 @@ -29,12 +29,12 @@ export class OCRImage extends BaseAction { fs.unlink(path, () => { }); if (!ret) { - throw `OCR ${payload.file}失败`; + throw new Error(`OCR ${payload.file}失败`); } return ret.result; } fs.unlink(path, () => { }); - throw `OCR ${payload.file}失败,文件可能不存在`; + throw new Error(`OCR ${payload.file}失败,文件可能不存在`); } } diff --git a/src/onebot/action/extends/SetQQAvatar.ts b/src/onebot/action/extends/SetQQAvatar.ts index 940e852e..0f149b92 100644 --- a/src/onebot/action/extends/SetQQAvatar.ts +++ b/src/onebot/action/extends/SetQQAvatar.ts @@ -26,7 +26,7 @@ export default class SetAvatar extends BaseAction { async _handle(payload: Payload): Promise { const { path, success } = (await uri2local(this.core.NapCatTempPath, payload.file)); if (!success) { - throw `头像${payload.file}设置失败,file字段可能格式不正确`; + throw new Error(`头像${payload.file}设置失败,file字段可能格式不正确`); } if (path) { await checkFileReceived(path, 5000); // 文件不存在QQ会崩溃，需要提前判断 @@ -35,18 +35,18 @@ export default class SetAvatar extends BaseAction { }); if (!ret) { - throw `头像${payload.file}设置失败,api无返回`; + throw new Error(`头像${payload.file}设置失败,api无返回`); } // log(`头像设置返回：${JSON.stringify(ret)}`) if (ret.result as number == 1004022) { - throw `头像${payload.file}设置失败，文件可能不是图片格式`; + throw new Error(`头像${payload.file}设置失败，文件可能不是图片格式`); } else if (ret.result != 0) { - throw `头像${payload.file}设置失败,未知的错误,${ret.result}:${ret.errMsg}`; + throw new Error(`头像${payload.file}设置失败,未知的错误,${ret.result}:${ret.errMsg}`); } } else { fs.unlink(path, () => { }); - throw `头像${payload.file}设置失败,无法获取头像,文件可能不存在`; + throw new Error(`头像${payload.file}设置失败,无法获取头像,文件可能不存在`); } return null; } diff --git a/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts b/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts index f6444456..b8ce16d6 100644 --- a/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts +++ b/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts @@ -31,14 +31,14 @@ export default class GetFriendMsgHistory extends BaseAction { const uid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString()); const MsgCount = +(payload.count ?? 20); const isReverseOrder = typeof payload.reverseOrder === 'string' ? payload.reverseOrder === 'true' : !!payload.reverseOrder; - if (!uid) throw `记录${payload.user_id}不存在`; + if (!uid) throw new Error(`记录${payload.user_id}不存在`); const friend = await this.core.apis.FriendApi.isBuddy(uid); const peer = { chatType: friend ? ChatType.KCHATTYPEC2C : ChatType.KCHATTYPETEMPC2CFROMGROUP, peerUid: uid }; const hasMessageSeq = !payload.message_seq ? !!payload.message_seq : !(payload.message_seq?.toString() === '' || payload.message_seq?.toString() === '0'); const startMsgId = hasMessageSeq ? (MessageUnique.getMsgIdAndPeerByShortId(+payload.message_seq!)?.MsgId ?? payload.message_seq!.toString()) : '0'; const msgList = hasMessageSeq ? (await this.core.apis.MsgApi.getMsgHistory(peer, startMsgId, MsgCount)).msgList : (await this.core.apis.MsgApi.getAioFirstViewLatestMsgs(peer, MsgCount)).msgList; - if (msgList.length === 0) throw `消息${payload.message_seq}不存在`; + if (msgList.length === 0) throw new Error(`消息${payload.message_seq}不存在`); //翻转消息 if (isReverseOrder) msgList.reverse(); //转换序号 diff --git a/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts b/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts index 69f27f62..7be377e6 100644 --- a/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts +++ b/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts @@ -36,7 +36,7 @@ export default class GoCQHTTPGetGroupMsgHistory extends BaseAction { success, } = (await uri2local(this.core.NapCatTempPath, payload.image)); if (!success) { - throw `群公告${payload.image}设置失败,image字段可能格式不正确`; + throw new Error(`群公告${payload.image}设置失败,image字段可能格式不正确`); } if (!path) { - throw `群公告${payload.image}设置失败,获取资源失败`; + throw new Error(`群公告${payload.image}设置失败,获取资源失败`); } await checkFileReceived(path, 5000); // 文件不存在QQ会崩溃，需要提前判断 const ImageUploadResult = await this.core.apis.GroupApi.uploadGroupBulletinPic(payload.group_id.toString(), path); if (ImageUploadResult.errCode != 0) { - throw `群公告${payload.image}设置失败,图片上传失败`; + throw new Error(`群公告${payload.image}设置失败,图片上传失败`); } unlink(path, () => { diff --git a/src/onebot/action/go-cqhttp/SetGroupPortrait.ts b/src/onebot/action/go-cqhttp/SetGroupPortrait.ts index 9a68b7e0..8a2b4d63 100644 --- a/src/onebot/action/go-cqhttp/SetGroupPortrait.ts +++ b/src/onebot/action/go-cqhttp/SetGroupPortrait.ts @@ -27,24 +27,24 @@ export default class SetGroupPortrait extends BaseAction { async _handle(payload: Payload): Promise { const { path, success } = (await uri2local(this.core.NapCatTempPath, payload.file)); if (!success) { - throw `头像${payload.file}设置失败,file字段可能格式不正确`; + throw new Error( `头像${payload.file}设置失败,file字段可能格式不正确`); } if (path) { await checkFileReceived(path, 5000); // 文件不存在QQ会崩溃，需要提前判断 const ret = await this.core.apis.GroupApi.setGroupAvatar(payload.group_id.toString(), path); fs.unlink(path, () => { }); if (!ret) { - throw `头像${payload.file}设置失败,api无返回`; + throw new Error( `头像${payload.file}设置失败,api无返回`); } if (ret.result as number == 1004022) { - throw `头像${payload.file}设置失败，文件可能不是图片格式或权限不足`; + throw new Error( `头像${payload.file}设置失败，文件可能不是图片格式或权限不足`); } else if (ret.result != 0) { - throw `头像${payload.file}设置失败,未知的错误,${ret.result}:${ret.errMsg}`; + throw new Error( `头像${payload.file}设置失败,未知的错误,${ret.result}:${ret.errMsg}`); } return ret; } else { fs.unlink(path, () => {}); - throw `头像${payload.file}设置失败,无法获取头像,文件可能不存在`; + throw new Error( `头像${payload.file}设置失败,无法获取头像,文件可能不存在`); } } } diff --git a/src/onebot/action/go-cqhttp/UploadPrivateFile.ts b/src/onebot/action/go-cqhttp/UploadPrivateFile.ts index 029aa210..dfbaf0cc 100644 --- a/src/onebot/action/go-cqhttp/UploadPrivateFile.ts +++ b/src/onebot/action/go-cqhttp/UploadPrivateFile.ts @@ -27,7 +27,7 @@ export default class GoCQHTTPUploadPrivateFile extends BaseAction if (payload.user_id) { const peerUid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString()); if (!peerUid) { - throw `私聊${payload.user_id}不存在`; + throw new Error( `私聊${payload.user_id}不存在`); } const isBuddy = await this.core.apis.FriendApi.isBuddy(peerUid); return { chatType: isBuddy ? ChatType.KCHATTYPEC2C : ChatType.KCHATTYPETEMPC2CFROMGROUP, peerUid }; diff --git a/src/onebot/action/msg/MarkMsgAsRead.ts b/src/onebot/action/msg/MarkMsgAsRead.ts index 5243a7f6..188d80e0 100644 --- a/src/onebot/action/msg/MarkMsgAsRead.ts +++ b/src/onebot/action/msg/MarkMsgAsRead.ts @@ -30,7 +30,7 @@ class MarkMsgAsRead extends BaseAction { if (payload.user_id) { const peerUid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString()); if (!peerUid) { - throw `私聊${payload.user_id}不存在`; + throw new Error( `私聊${payload.user_id}不存在`); } const isBuddy = await this.core.apis.FriendApi.isBuddy(peerUid); return { chatType: isBuddy ? ChatType.KCHATTYPEC2C : ChatType.KCHATTYPETEMPC2CFROMGROUP, peerUid }; diff --git a/src/onebot/action/user/SendLike.ts b/src/onebot/action/user/SendLike.ts index e2934a0f..a81b74c7 100644 --- a/src/onebot/action/user/SendLike.ts +++ b/src/onebot/action/user/SendLike.ts @@ -18,13 +18,11 @@ export default class SendLike extends BaseAction { payloadSchema = SchemaData; async _handle(payload: Payload): Promise { - //logDebug('点赞参数', payload); const qq = payload.user_id.toString(); const uid: string = await this.core.apis.UserApi.getUidByUinV2(qq) || ''; const result = await this.core.apis.UserApi.like(uid, parseInt(payload.times?.toString()) || 1); - //logDebug('点赞结果', result); if (result.result !== 0) { - throw `点赞失败 ${result.errMsg}`; + throw new Error( `点赞失败 ${result.errMsg}`); } return null; }