release: v2.0.37

manifest.json

@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "2.0.36",
+  "version": "2.0.37",
   "icon": "./logo.png",
   "authors": [
     {

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "2.0.36",
+  "version": "2.0.37",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",

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.36';
+export const napcat_version = '2.0.37';
 
 export class NapCatPathWrapper {
     binaryPath: string;

src/onebot/action/index.ts

@@ -79,6 +79,7 @@ import { NapCatOneBot11Adapter } from '@/onebot';
 import GetGuildProfile from './guild/GetGuildProfile';
 import SetModelShow from './go-cqhttp/SetModelShow';
 import { SetInputStatus } from './extends/SetInputStatus';
+import { GetCSRF } from './system/GetCSRF';
 
 export type ActionMap = Map<string, BaseAction<any, any>>;
 
@@ -167,6 +168,7 @@ export function createActionMap(onebotContext: NapCatOneBot11Adapter, coreContex
         new GetGuildProfile(onebotContext, coreContext),
         new SetModelShow(onebotContext, coreContext),
         new SetInputStatus(onebotContext, coreContext),
+        new GetCSRF(onebotContext, coreContext),
     ];
     const actionMap = new Map();
     for (const action of actionHandlers) {

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.36 Refactor Todo
+        // Mlikiowa V2.0.37 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.36 Refactor Todo
+        // Mlikiowa V2.0.37 Refactor Todo
         const signUrl = obContext.configLoader.configData.musicSignUrl;
         if (!signUrl) {
             if (data.type === 'qq') {

src/onebot/action/system/GetCSRF.ts

@@ -0,0 +1,12 @@
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+
+export class GetCSRF extends BaseAction<any, any> {
+    actionName = ActionName.GetCSRF;
+
+    async _handle(payload: any) {
+        return {
+            token: "",
+        };
+    }
+}

src/onebot/action/types.ts

@@ -107,5 +107,6 @@ export enum ActionName {
     FetchEmojiLike = 'fetch_emoji_like',
     GetGuildProfile = "get_guild_service_profile",
     SetModelShow = "_set_model_show",
-    SetInputStatus = "set_input_status"
+    SetInputStatus = "set_input_status",
+    GetCSRF = "get_csrf_token",
 }

src/onebot/network/active-websocket.ts

@@ -71,6 +71,8 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
 
             this.connection = new WebSocket(this.url, {
                 maxPayload: 1024 * 1024 * 1024,
+                handshakeTimeout: 2000,
+                perMessageDeflate: false,
                 headers: {
                     'X-Self-ID': this.coreContext.selfInfo.uin,
                     'Authorization': `Bearer ${this.token}`,

src/onebot/network/passive-websocket.ts

@@ -151,6 +151,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
                 //this.logger.logDebug('收到正向Websocket消息', receiveData);
             } catch (e) {
                 this.checkStateAndReply<any>(OB11Response.error('json解析失败,请检查数据格式', 1400, echo), wsClient);
+                return;
             }
             receiveData.params = (receiveData?.params) ? receiveData.params : {};//兼容类型验证
             const retdata = await this.actions.get(receiveData.action)?.websocketHandle(receiveData.params, echo || '');

src/webui/ui/NapCat.ts

@@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) {
                 SettingItem(
                     '<span id="napcat-update-title">Napcat</span>',
                     undefined,
-                    SettingButton('V2.0.36', 'napcat-update-button', 'secondary'),
+                    SettingButton('V2.0.37', 'napcat-update-button', 'secondary'),
                 ),
             ]),
             SettingList([

static/assets/renderer.js

@@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           void 0,
-          SettingButton("V2.0.36", "napcat-update-button", "secondary")
+          SettingButton("V2.0.37", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([