fuck javascript

Update AboutUs.vue

manifest.json

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

napcat.webui/src/pages/AboutUs.vue

@@ -89,7 +89,11 @@
                         <t-tag class="tag-item pgk-color"> WebUi: {{ pkg.version }} </t-tag>
                         <t-tag class="tag-item nc-color">
                             NapCat:
-                            {{ githubReleasesData&&githubReleasesData[0] ?.tag_name ? githubReleasesData[0].tag_name : napCatVersion }}
+                            {{ napCatVersion }}
+                        </t-tag>
+                         <t-tag v-if="githubReleasesData&&githubReleasesData[0] ?.tag_name" class="tag-item nc-color">
+                            New NapCat:
+                            {{ githubReleasesData[0].tag_name }}
                         </t-tag>
                         <t-tag class="tag-item td-color"> TDesign: {{ pkg.dependencies['tdesign-vue-next'] }} </t-tag>
                     </span>

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.2.32",
+  "version": "4.2.34",
   "scripts": {
     "build:universal": "npm run build:webui && vite build --mode universal || exit 1",
     "build:framework": "npm run build:webui && vite build --mode framework || exit 1",
@@ -23,8 +23,8 @@
     "@eslint/js": "^9.14.0",
     "@log4js-node/log4js-api": "^1.0.2",
     "@napneko/nap-proto-core": "^0.0.4",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-typescript": "^11.1.6",
+    "@rollup/plugin-typescript": "^12.1.2",
+    "@rollup/plugin-node-resolve": "^16.0.0",
     "@types/cors": "^2.8.17",
     "@sinclair/typebox": "^0.34.9",
     "@types/express": "^5.0.0",

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.2.32';
+export const napCatVersion = '4.2.34';

src/onebot/api/index.ts

@@ -1,19 +1,5 @@
-import type { OneBotFriendApi } from '@/onebot/api/friend';
-import type { OneBotUserApi } from '@/onebot/api/user';
-import type { OneBotGroupApi } from '@/onebot/api/group';
-import type { OneBotMsgApi } from '@/onebot/api/msg';
-import type { OneBotQuickActionApi } from '@/onebot/api/quick-action';
-
 export * from './friend';
 export * from './group';
 export * from './user';
 export * from './msg';
-export * from './quick-action';
-
-export interface StableOneBotApiWrapper {
-    FriendApi: OneBotFriendApi;
-    UserApi: OneBotUserApi;
-    GroupApi: OneBotGroupApi;
-    MsgApi: OneBotMsgApi;
-    QuickActionApi: OneBotQuickActionApi,
-}
+export * from './quick-action';

src/onebot/api/quick-action.ts

@@ -18,8 +18,8 @@ import { ContextMode, createContext, normalize } from '@/onebot/action/msg/SendM
 import { isNull } from '@/common/helper';
 
 export class OneBotQuickActionApi {
-    private obContext: NapCatOneBot11Adapter;
-    private core: NapCatCore;
+    obContext: NapCatOneBot11Adapter;
+    core: NapCatCore;
     constructor(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
         this.obContext = obContext;
         this.core = core;

src/onebot/index.ts

@@ -31,7 +31,6 @@ import {
     OneBotMsgApi,
     OneBotQuickActionApi,
     OneBotUserApi,
-    StableOneBotApiWrapper,
 } from '@/onebot/api';
 import { ActionMap, createActionMap } from '@/onebot/action';
 import { WebUiDataRuntime } from '@/webui/src/helper/Data';
@@ -55,7 +54,7 @@ export class NapCatOneBot11Adapter {
     readonly context: InstanceContext;
 
     configLoader: OB11ConfigLoader;
-    public readonly apis: StableOneBotApiWrapper;
+    public readonly apis;
     networkManager: OB11NetworkManager;
     actions: ActionMap;
     private readonly bootTime = Date.now() / 1000;
@@ -72,7 +71,7 @@ export class NapCatOneBot11Adapter {
             UserApi: new OneBotUserApi(this, core),
             FriendApi: new OneBotFriendApi(this, core),
             MsgApi: new OneBotMsgApi(this, core),
-            QuickActionApi: new OneBotQuickActionApi(this, core),
+            QuickActionApi: new OneBotQuickActionApi(this, core)
         } as const;
         this.actions = createActionMap(this, core);
         this.networkManager = new OB11NetworkManager();

src/onebot/network/active-http.ts

@@ -30,7 +30,6 @@ export class OB11ActiveHttpAdapter implements IOB11NetworkAdapter {
 
     async emitEventAsync<T extends OB11EmitEventContent>(event: T) {
         if (!this.isEnable) return;
-
         const headers: Record<string, string> = {
             'Content-Type': 'application/json',
             'x-self-id': this.core.selfInfo.uin,
@@ -45,6 +44,10 @@ export class OB11ActiveHttpAdapter implements IOB11NetworkAdapter {
 
         const data = await RequestUtil.HttpGetText(this.config.url, 'POST', msgStr, headers);
         const resJson: QuickAction = data ? JSON.parse(data) : {};
+
+        if (!this.obContext.apis || !this.obContext.apis.QuickActionApi.handleQuickOperation) {
+            throw new Error('apis.QuickActionApi.handleQuickOperation 异常');
+        }
         await this.obContext.apis.QuickActionApi.handleQuickOperation(event as QuickActionEvent, resJson);
     }
 

src/onebot/network/active-websocket.ts

@@ -2,7 +2,7 @@ import { IOB11NetworkAdapter, OB11EmitEventContent, OB11NetworkReloadType } from
 import { WebSocket } from 'ws';
 import { OB11HeartbeatEvent } from '@/onebot/event/meta/OB11HeartbeatEvent';
 import { NapCatCore } from '@/core';
-import { ActionName } from '@/onebot/action/router';
+import {  ActionName } from '@/onebot/action/router';
 import { OB11Response } from '@/onebot/action/OneBotAction';
 import { LogWrapper } from '@/common/log';
 import { ActionMap } from '@/onebot/action';
@@ -133,7 +133,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
     }
 
     private async handleMessage(message: any) {
-        let receiveData: { action: ActionName, params?: any, echo?: any } = { action: ActionName.Unknown, params: {} };
+        let receiveData: { action: typeof ActionName[keyof typeof ActionName], params?: any, echo?: any } = { action: ActionName.Unknown, params: {} };
         let echo = undefined;
 
         try {
@@ -145,7 +145,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
             return;
         }
         receiveData.params = (receiveData?.params) ? receiveData.params : {};// 兼容类型验证
-        const action = this.actions.get(receiveData.action);
+        const action = this.actions.get(receiveData.action as any);
         if (!action) {
             this.logger.logError('[OneBot] [WebSocket Client] 发生错误', '不支持的Api ' + receiveData.action);
             this.checkStateAndReply<any>(OB11Response.error('不支持的Api ' + receiveData.action, 1404, echo));

src/onebot/network/passive-websocket.ts

@@ -166,7 +166,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
     }
 
     private async handleMessage(wsClient: WebSocket, message: any) {
-        let receiveData: { action: ActionName, params?: any, echo?: any } = { action: ActionName.Unknown, params: {} };
+        let receiveData: { action: typeof ActionName[keyof typeof ActionName], params?: any, echo?: any } = { action: ActionName.Unknown, params: {} };
         let echo = undefined;
         try {
             receiveData = JSON.parse(message.toString());
@@ -177,7 +177,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
             return;
         }
         receiveData.params = (receiveData?.params) ? receiveData.params : {};//兼容类型验证 不然类型校验爆炸
-        const action = this.actions.get(receiveData.action);
+        const action = this.actions.get(receiveData.action as any);
         if (!action) {
             this.logger.logError('[OneBot] [WebSocket Client] 发生错误', '不支持的API ' + receiveData.action);
             this.checkStateAndReply<any>(OB11Response.error('不支持的API ' + receiveData.action, 1404, echo), wsClient);