Merge branch 'main' into extend

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

src/common/utils/file.ts

@@ -259,7 +259,7 @@ export async function uri2local(dir: string, uri: string, filename: string | und
         if (success) {
             filePath = fileTypePath;
             fileExt = ext;
-            filename = path.basename(filePath, fileExt);
+            filename = filename + '.' + ext;
         }
         return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath, isLocal: true };
     }

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

src/onebot/network/active-websocket.ts

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

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.35', 'napcat-update-button', 'secondary'),
+                    SettingButton('V2.0.36', 'napcat-update-button', 'secondary'),
                 ),
             ]),
             SettingList([