diff --git a/src/core b/src/core index 85d0256d..1177d245 160000 --- a/src/core +++ b/src/core @@ -1 +1 @@ -Subproject commit 85d0256dbcc9cf0d1773da3f10cfc180be1ab56b +Subproject commit 1177d2452bbc5e47263da69ab8d944d19e1318b8 diff --git a/src/core.lib/MoeHoo-linux-x64.node b/src/core.lib/MoeHoo-linux-x64.node deleted file mode 100644 index fdf52e9f..00000000 Binary files a/src/core.lib/MoeHoo-linux-x64.node and /dev/null differ diff --git a/src/core.lib/MoeHoo-win32-x64.node b/src/core.lib/MoeHoo-win32-x64.node deleted file mode 100644 index b85f394a..00000000 Binary files a/src/core.lib/MoeHoo-win32-x64.node and /dev/null differ diff --git a/src/index.ts b/src/index.ts index 3f64a807..6f5b9be0 100644 --- a/src/index.ts +++ b/src/index.ts @@ -7,7 +7,6 @@ import { postLoginStatus } from '@/common/utils/umami'; import { checkVersion } from '@/common/utils/version'; import { log, logDebug, logError, LogLevel, setLogLevel } from '@/common/utils/log'; import { NapCatOnebot11 } from '@/onebot11/main'; -import { hookApi } from '@/core/external/hook'; import { InitWebUi } from './webui/index'; import { WebUiDataRuntime } from './webui/src/helper/Data'; program @@ -18,11 +17,7 @@ InitWebUi(); const cmdOptions = program.opts(); // console.log(process.argv); -for (let k = 0; k < 30; k++) { - new Promise((r, j) => { - hookApi.getRKey(); - }).then(); -} + checkVersion().then((remoteVersion: string) => { const localVersion = require('./package.json').version; const localVersionList = localVersion.split('.'); @@ -70,7 +65,7 @@ napCatCore.getQuickLoginList().then((res) => { }); WebUiDataRuntime.setQQQuickLogin(async (uin: string) => { - let QuickLogin: Promise<{ result: boolean, message: string }> = new Promise((resolve, reject) => { + const QuickLogin: Promise<{ result: boolean, message: string }> = new Promise((resolve, reject) => { if (quickLoginQQ) { log('正在快速登录 ', quickLoginQQ); napCatCore.quickLogin(quickLoginQQ).then(res => { @@ -86,7 +81,7 @@ WebUiDataRuntime.setQQQuickLogin(async (uin: string) => { resolve({ result: false, message: '快速登录失败' }); } }); - let result = await QuickLogin; + const result = await QuickLogin; return result; }); diff --git a/src/onebot11/action/extends/GetFriendCategory.ts b/src/onebot11/action/extends/GetFriendCategory.ts deleted file mode 100644 index 399552a1..00000000 --- a/src/onebot11/action/extends/GetFriendCategory.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { OB11User } from '../../types'; -import { OB11Constructor } from '../../constructor'; -import { buddyCategory, friends } from '@/core/data'; -import BaseAction from '../BaseAction'; -import { ActionName } from '../types'; -import { buddyCategorType } from '@/core/entities/'; - -export class GetFriendCategory extends BaseAction> { - actionName = ActionName.GetFriendCategory; - - protected async _handle(payload: void) { - return buddyCategory.data; - } -} diff --git a/src/onebot11/action/extends/GetFriendWithCategory.ts b/src/onebot11/action/extends/GetFriendWithCategory.ts new file mode 100644 index 00000000..cf339b30 --- /dev/null +++ b/src/onebot11/action/extends/GetFriendWithCategory.ts @@ -0,0 +1,14 @@ +import { OB11User } from '../../types'; +import { OB11Constructor } from '../../constructor'; +import { rawFriends, friends } from '@/core/data'; +import BaseAction from '../BaseAction'; +import { ActionName } from '../types'; +import { BuddyCategoryType } from '@/core/entities/'; + +export class GetFriendWithCategory extends BaseAction> { + actionName = ActionName.GetFriendsWithCategory; + + protected async _handle(payload: void) { + return rawFriends; + } +} diff --git a/src/onebot11/action/index.ts b/src/onebot11/action/index.ts index ea5c84b7..0eac336a 100644 --- a/src/onebot11/action/index.ts +++ b/src/onebot11/action/index.ts @@ -52,7 +52,7 @@ import { SetOnlineStatus } from './extends/SetOnlineStatus'; import { GetGroupNotice } from './group/GetGroupNotice'; import { GetGroupEssence } from './group/GetGroupEssence'; import { ForwardFriendSingleMsg, ForwardGroupSingleMsg } from '@/onebot11/action/msg/ForwardSingleMsg'; -import { GetFriendCategory } from './extends/GetFriendCategory'; +import { GetFriendWithCategory } from './extends/GetFriendWithCategory'; export const actionHandlers = [ new GetFile(), @@ -95,7 +95,7 @@ export const actionHandlers = [ // new SetOnlineStatus(), new GetRobotUinRange(), - new GetFriendCategory(), + new GetFriendWithCategory(), //以下为go-cqhttp api new GetGroupNotice(), new GetGroupEssence(), diff --git a/src/onebot11/action/types.ts b/src/onebot11/action/types.ts index dc448a78..16381099 100644 --- a/src/onebot11/action/types.ts +++ b/src/onebot11/action/types.ts @@ -57,7 +57,7 @@ export enum ActionName { // 以下为扩展napcat扩展 GetRobotUinRange = 'get_robot_uin_range', SetOnlineStatus = 'set_online_status', - GetFriendCategory = 'get_friend_category', + GetFriendsWithCategory = 'get_friends_with_category', // 以下为go-cqhttp api GoCQHTTP_GetEssenceMsg = 'get_essence_msg_list', GoCQHTTP_SetGroupNotice = '_send_group_notice', diff --git a/src/onebot11/rkey.ts b/src/onebot11/rkey.ts deleted file mode 100644 index b60a2677..00000000 --- a/src/onebot11/rkey.ts +++ /dev/null @@ -1,58 +0,0 @@ -//远端rkey获取 -class ServerRkeyWrapper { - serverUrl: string = ""; - GroupRkey: string = ""; - PrivateRkey: string = ""; - expired_time: number = 0; - async Init(ServerUrl: string) { - this.serverUrl = ServerUrl; - } - async GetGroupRkey(): Promise { - if (await this.IsRkeyExpired()) { - await this.RefreshRkey(); - } - return this.GroupRkey; - } - async GetPrivateRkey(): Promise { - if (await this.IsRkeyExpired()) { - await this.RefreshRkey(); - } - return this.PrivateRkey; - } - async IsRkeyExpired(): Promise { - return new Promise((resolve, reject) => { - let now = new Date().getTime(); - if (now > this.expired_time || this.expired_time == 0) { - resolve(true); - } else { - resolve(false); - } - reject("error"); - }); - } - async RefreshRkey(): Promise { - //刷新rkey - let data = await this.Internal_RefreshRkey(); - this.GroupRkey = data.group_rkey; - this.PrivateRkey = data.private_rkey; - this.expired_time = data.expired_time; - } - async Internal_RefreshRkey(): Promise { - return new Promise((resolve, reject) => { - fetch(this.serverUrl) - .then(response => { - if (!response.ok) { - reject(response.statusText); // 请求失败，返回错误信息 - } - return response.json(); // 解析 JSON 格式的响应体 - }) - .then(data => { - resolve(data); - }) - .catch(error => { - reject(error); - }); - }); - } -} -export const serverRkey = new ServerRkeyWrapper(); \ No newline at end of file diff --git a/src/onebot11/server/ws/ReverseWebsocket.ts b/src/onebot11/server/ws/ReverseWebsocket.ts index 1fa0dedc..e001b6d1 100644 --- a/src/onebot11/server/ws/ReverseWebsocket.ts +++ b/src/onebot11/server/ws/ReverseWebsocket.ts @@ -57,7 +57,7 @@ export class ReverseWebsocket { } public onclose = () => { - logDebug('反向ws断开', this.url); + logError('反向ws断开', this.url); unregisterWsEventSender(this.websocket!); if (this.running) { this.reconnect(); diff --git a/vite.config.ts b/vite.config.ts index 1986e30c..281cbba0 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -48,7 +48,7 @@ const baseConfigPlugin: PluginOption[] = [ { src: './package.json', dest: 'dist' }, { src: './README.md', dest: 'dist' }, { src: './logo.png', dest: 'dist/logs' }, - ...MoeHooModule, + // ...MoeHooModule, ...(startScripts.map((startScript) => { return { src: startScript, dest: 'dist' }; })),