diff --git a/manifest.json b/manifest.json index 4afcfdba..622b4f02 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "name": "NapCat", "slug": "NapCat", "description": "现代化的 OneBot 11 协议实现", - "version": "2.0.17", + "version": "2.0.18", "icon": "./logo.png", "authors": [ { diff --git a/package.json b/package.json index f8ef55a4..831b6c71 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "napcat", "private": true, "type": "module", - "version": "2.0.17", + "version": "2.0.18", "scripts": { "build:framework": "vite build --mode framework", "build:shell": "vite build --mode shell", diff --git a/src/common/framework/napcat.ts b/src/common/framework/napcat.ts index 04417859..1476ae62 100644 --- a/src/common/framework/napcat.ts +++ b/src/common/framework/napcat.ts @@ -2,7 +2,7 @@ import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; import fs from 'fs'; -export const napcat_version = '2.0.17'; +export const napcat_version = '2.0.18'; export class NapCatPathWrapper { binaryPath: string; diff --git a/src/onebot/action/group/GetGroupMemberInfo.ts b/src/onebot/action/group/GetGroupMemberInfo.ts index 6ab927b8..7ae88cca 100644 --- a/src/onebot/action/group/GetGroupMemberInfo.ts +++ b/src/onebot/action/group/GetGroupMemberInfo.ts @@ -69,7 +69,7 @@ class GetGroupMemberInfo extends BaseAction { } } } else { - // Mlikiowa V2.0.17 Refactor Todo + // Mlikiowa V2.0.18 Refactor Todo // retMember.last_sent_time = parseInt((await getGroupMember(payload.group_id.toString(), retMember.user_id))?.lastSpeakTime || date.toString()); // retMember.join_time = parseInt((await getGroupMember(payload.group_id.toString(), retMember.user_id))?.joinTime || date.toString()); } diff --git a/src/onebot/action/group/GetGroupMemberList.ts b/src/onebot/action/group/GetGroupMemberList.ts index 4bdc47e9..de24b80c 100644 --- a/src/onebot/action/group/GetGroupMemberList.ts +++ b/src/onebot/action/group/GetGroupMemberList.ts @@ -83,7 +83,7 @@ class GetGroupMemberList extends BaseAction { } } } else { - // Mlikiowa V2.0.17 Refactor Todo + // Mlikiowa V2.0.18 Refactor Todo // _groupMembers.forEach(async item => { // item.last_sent_time = parseInt((await getGroupMember(payload.group_id.toString(), item.user_id))?.lastSpeakTime || date.toString()); // item.join_time = parseInt((await getGroupMember(payload.group_id.toString(), item.user_id))?.joinTime || date.toString()); diff --git a/src/onebot/action/msg/SendMsg/create-send-elements.ts b/src/onebot/action/msg/SendMsg/create-send-elements.ts index 5551fd6c..8edb06b2 100644 --- a/src/onebot/action/msg/SendMsg/create-send-elements.ts +++ b/src/onebot/action/msg/SendMsg/create-send-elements.ts @@ -56,7 +56,7 @@ const _handlers: { if (atQQ === 'all') return SendMsgElementConstructor.at(coreContext, atQQ, atQQ, AtType.atAll, '全体成员'); // then the qq is a group member - // Mlikiowa V2.0.17 Refactor Todo + // Mlikiowa V2.0.18 Refactor Todo const uid = await coreContext.apis.UserApi.getUidByUinV2(atQQ); if (!uid) throw new Error('Get Uid Error'); return SendMsgElementConstructor.at(coreContext, atQQ, uid, AtType.atUser, ''); @@ -161,7 +161,7 @@ const _handlers: { } else { postData = data; } - // Mlikiowa V2.0.17 Refactor Todo + // Mlikiowa V2.0.18 Refactor Todo const signUrl = obContext.configLoader.configData.musicSignUrl; if (!signUrl) { if (data.type === 'qq') { diff --git a/src/onebot/helper/data.ts b/src/onebot/helper/data.ts index 40596fe7..e6c92c9a 100644 --- a/src/onebot/helper/data.ts +++ b/src/onebot/helper/data.ts @@ -417,7 +417,7 @@ export class OB11Constructor { return; } //log("group msg", msg); - // Mlikiowa V2.0.17 Refactor Todo + // Mlikiowa V2.0.18 Refactor Todo // if (msg.senderUin && msg.senderUin !== '0') { // const member = await getGroupMember(msg.peerUid, msg.senderUin); // if (member && member.cardName !== msg.sendMemberName) { diff --git a/src/onebot/network/active-websocket.ts b/src/onebot/network/active-websocket.ts index 7e483532..235472b4 100644 --- a/src/onebot/network/active-websocket.ts +++ b/src/onebot/network/active-websocket.ts @@ -70,6 +70,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter { let isClosedByError = false; this.connection = new WebSocket(this.url, { + maxPayload: 1024 * 1024 * 1024, headers: { 'X-Self-ID': this.coreContext.selfInfo.uin, 'Authorization': `Bearer ${this.token}`, @@ -79,12 +80,12 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter { }); this.connection.on('open', () => { - try{ + try { this.connectEvent(this.coreContext); - }catch(e){ + } catch (e) { this.logger.logError('[OneBot] [WebSocket Client] 发送连接生命周期失败', e); } - + }); this.connection.on('message', (data) => { this.handleMessage(data); diff --git a/src/onebot/network/passive-websocket.ts b/src/onebot/network/passive-websocket.ts index 134da9a5..9823e713 100644 --- a/src/onebot/network/passive-websocket.ts +++ b/src/onebot/network/passive-websocket.ts @@ -36,7 +36,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter { this.logger = coreContext.context.logger; this.heartbeatInterval = heartbeatInterval; - this.wsServer = new WebSocketServer({ port: port, host: ip }); + this.wsServer = new WebSocketServer({ port: port, host: ip, maxPayload: 1024 * 1024 * 1024, }); const core = coreContext; this.wsServer.on('connection', async (wsClient, wsReq) => { if (!this.isOpen) { @@ -63,7 +63,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter { }); }).on('error', (err) => this.logger.log('[OneBot] [WebSocket Server] Server Error:', err.message)); } - + connectEvent(core: NapCatCore, wsClient: WebSocket) { try { this.checkStateAndReply(new OB11LifeCycleEvent(core, LifeCycleSubType.CONNECT), wsClient); diff --git a/src/webui/ui/NapCat.ts b/src/webui/ui/NapCat.ts index eea7ede6..7a5b3c8b 100644 --- a/src/webui/ui/NapCat.ts +++ b/src/webui/ui/NapCat.ts @@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) { SettingItem( 'Napcat', undefined, - SettingButton('V2.0.17', 'napcat-update-button', 'secondary'), + SettingButton('V2.0.18', 'napcat-update-button', 'secondary'), ), ]), SettingList([ diff --git a/static/assets/renderer.js b/static/assets/renderer.js index 2839bacb..96f6ffb7 100644 --- a/static/assets/renderer.js +++ b/static/assets/renderer.js @@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) { SettingItem( 'Napcat', void 0, - SettingButton("V2.0.17", "napcat-update-button", "secondary") + SettingButton("V2.0.18", "napcat-update-button", "secondary") ) ]), SettingList([