mirror of
https://github.com/NapNeko/NapCatQQ.git
synced 2025-07-19 12:03:37 +00:00
Compare commits
32 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
aaefa2e83c | ||
![]() |
f8e92f7c8d | ||
![]() |
b6430e6eb6 | ||
![]() |
e60605c7bb | ||
![]() |
58d2bd3c81 | ||
![]() |
6534d05b76 | ||
![]() |
2d7de174c5 | ||
![]() |
79aa1dc67f | ||
![]() |
7792ad9ea0 | ||
![]() |
be6671923b | ||
![]() |
0fa1b3f044 | ||
![]() |
4ab751696b | ||
![]() |
dce4eedf7d | ||
![]() |
129b67b751 | ||
![]() |
9ab776d53a | ||
![]() |
2759a34d96 | ||
![]() |
2f9f42750e | ||
![]() |
30abd1f904 | ||
![]() |
008075466e | ||
![]() |
5b4035c320 | ||
![]() |
e3feb6a73c | ||
![]() |
40fe73317d | ||
![]() |
073745030c | ||
![]() |
c523437506 | ||
![]() |
9eef570d37 | ||
![]() |
be37b8cbbd | ||
![]() |
c635496677 | ||
![]() |
8753ecfd92 | ||
![]() |
5eda1f2870 | ||
![]() |
d5a60074f7 | ||
![]() |
91df57d932 | ||
![]() |
e27d4c4302 |
@@ -4,7 +4,7 @@
|
|||||||
"name": "NapCatQQ",
|
"name": "NapCatQQ",
|
||||||
"slug": "NapCat.Framework",
|
"slug": "NapCat.Framework",
|
||||||
"description": "高性能的 OneBot 11 协议实现",
|
"description": "高性能的 OneBot 11 协议实现",
|
||||||
"version": "4.7.0",
|
"version": "4.7.7",
|
||||||
"icon": "./logo.png",
|
"icon": "./logo.png",
|
||||||
"authors": [
|
"authors": [
|
||||||
{
|
{
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
"name": "napcat",
|
"name": "napcat",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"version": "4.7.0",
|
"version": "4.7.7",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build:universal": "npm run build:webui && vite build --mode universal || exit 1",
|
"build:universal": "npm run build:webui && vite build --mode universal || exit 1",
|
||||||
"build:framework": "npm run build:webui && vite build --mode framework || exit 1",
|
"build:framework": "npm run build:webui && vite build --mode framework || exit 1",
|
||||||
@@ -45,7 +45,7 @@
|
|||||||
"cors": "^2.8.5",
|
"cors": "^2.8.5",
|
||||||
"esbuild": "0.25.0",
|
"esbuild": "0.25.0",
|
||||||
"eslint": "^9.14.0",
|
"eslint": "^9.14.0",
|
||||||
"eslint-import-resolver-typescript": "^3.6.1",
|
"eslint-import-resolver-typescript": "^4.0.0",
|
||||||
"eslint-plugin-import": "^2.29.1",
|
"eslint-plugin-import": "^2.29.1",
|
||||||
"express-rate-limit": "^7.5.0",
|
"express-rate-limit": "^7.5.0",
|
||||||
"fast-xml-parser": "^4.3.6",
|
"fast-xml-parser": "^4.3.6",
|
||||||
|
@@ -1 +1 @@
|
|||||||
export const napCatVersion = '4.7.0';
|
export const napCatVersion = '4.7.7';
|
||||||
|
@@ -5,6 +5,9 @@ export async function runTask<T, R>(workerScript: string, taskData: T): Promise<
|
|||||||
try {
|
try {
|
||||||
return await new Promise<R>((resolve, reject) => {
|
return await new Promise<R>((resolve, reject) => {
|
||||||
worker.on('message', (result: R) => {
|
worker.on('message', (result: R) => {
|
||||||
|
if ((result as any)?.error) {
|
||||||
|
reject(new Error((result as { error: string }).error));
|
||||||
|
}
|
||||||
resolve(result);
|
resolve(result);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
8
src/core/external/appid.json
vendored
8
src/core/external/appid.json
vendored
@@ -218,5 +218,13 @@
|
|||||||
"9.9.18-32869": {
|
"9.9.18-32869": {
|
||||||
"appid": 537271294,
|
"appid": 537271294,
|
||||||
"qua": "V1_WIN_NQ_9.9.18_32869_GW_B"
|
"qua": "V1_WIN_NQ_9.9.18_32869_GW_B"
|
||||||
|
},
|
||||||
|
"3.2.16-33139": {
|
||||||
|
"appid": 537273909,
|
||||||
|
"qua": "V1_LNX_NQ_3.2.16_33139_GW_B"
|
||||||
|
},
|
||||||
|
"9.9.18-33139": {
|
||||||
|
"appid": 537273874,
|
||||||
|
"qua": "V1_WIN_NQ_9.9.18_33139_GW_B"
|
||||||
}
|
}
|
||||||
}
|
}
|
12
src/core/external/offset.json
vendored
12
src/core/external/offset.json
vendored
@@ -290,5 +290,17 @@
|
|||||||
"3.2.16-32869-arm64": {
|
"3.2.16-32869-arm64": {
|
||||||
"send": "7226630",
|
"send": "7226630",
|
||||||
"recv": "7229F60"
|
"recv": "7229F60"
|
||||||
|
},
|
||||||
|
"9.9.18-33139-x64": {
|
||||||
|
"send": "39F5870",
|
||||||
|
"recv": "39FA070"
|
||||||
|
},
|
||||||
|
"3.2.16-33139-x64": {
|
||||||
|
"send": "A634F60",
|
||||||
|
"recv": "A638980"
|
||||||
|
},
|
||||||
|
"3.2.16-33139-arm64": {
|
||||||
|
"send": "7262BB0",
|
||||||
|
"recv": "72664E0"
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -9,15 +9,14 @@ class SetSpecialTitle extends PacketTransformer<typeof proto.OidbSvcTrpcTcpBase>
|
|||||||
}
|
}
|
||||||
|
|
||||||
build(groupCode: number, uid: string, tittle: string): OidbPacket {
|
build(groupCode: number, uid: string, tittle: string): OidbPacket {
|
||||||
const oidb_0x8FC_2_body = new NapProtoMsg(proto.OidbSvcTrpcTcp0X8FC_2_Body).encode({
|
|
||||||
targetUid: uid,
|
|
||||||
specialTitle: tittle,
|
|
||||||
expiredTime: -1,
|
|
||||||
uinName: tittle
|
|
||||||
});
|
|
||||||
const oidb_0x8FC_2 = new NapProtoMsg(proto.OidbSvcTrpcTcp0X8FC_2).encode({
|
const oidb_0x8FC_2 = new NapProtoMsg(proto.OidbSvcTrpcTcp0X8FC_2).encode({
|
||||||
groupUin: +groupCode,
|
groupUin: +groupCode,
|
||||||
body: oidb_0x8FC_2_body
|
body: {
|
||||||
|
targetUid: uid,
|
||||||
|
specialTitle: tittle,
|
||||||
|
expiredTime: -1,
|
||||||
|
uinName: tittle
|
||||||
|
}
|
||||||
});
|
});
|
||||||
return OidbBase.build(0x8FC, 2, oidb_0x8FC_2, false, false);
|
return OidbBase.build(0x8FC, 2, oidb_0x8FC_2, false, false);
|
||||||
}
|
}
|
||||||
|
@@ -4,12 +4,12 @@ import { ProtoField, ScalarType } from '@napneko/nap-proto-core';
|
|||||||
//设置群头衔 OidbSvcTrpcTcp.0x8fc_2
|
//设置群头衔 OidbSvcTrpcTcp.0x8fc_2
|
||||||
export const OidbSvcTrpcTcp0X8FC_2_Body = {
|
export const OidbSvcTrpcTcp0X8FC_2_Body = {
|
||||||
targetUid: ProtoField(1, ScalarType.STRING),
|
targetUid: ProtoField(1, ScalarType.STRING),
|
||||||
specialTitle: ProtoField(5, ScalarType.STRING),
|
specialTitle: ProtoField(5, ScalarType.STRING, true),
|
||||||
expiredTime: ProtoField(6, ScalarType.SINT32),
|
expiredTime: ProtoField(6, ScalarType.INT32),
|
||||||
uinName: ProtoField(7, ScalarType.STRING),
|
uinName: ProtoField(7, ScalarType.STRING, true),
|
||||||
targetName: ProtoField(8, ScalarType.STRING),
|
targetName: ProtoField(8, ScalarType.STRING),
|
||||||
};
|
};
|
||||||
export const OidbSvcTrpcTcp0X8FC_2 = {
|
export const OidbSvcTrpcTcp0X8FC_2 = {
|
||||||
groupUin: ProtoField(1, ScalarType.UINT32),
|
groupUin: ProtoField(1, ScalarType.UINT32),
|
||||||
body: ProtoField(3, ScalarType.BYTES),
|
body: ProtoField(3, () => OidbSvcTrpcTcp0X8FC_2_Body),
|
||||||
};
|
};
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -20,6 +20,7 @@ class GetGroupInfo extends OneBotAction<Payload, OB11Group> {
|
|||||||
const data = await this.core.apis.GroupApi.fetchGroupDetail(payload.group_id.toString());
|
const data = await this.core.apis.GroupApi.fetchGroupDetail(payload.group_id.toString());
|
||||||
return {
|
return {
|
||||||
...data,
|
...data,
|
||||||
|
group_remark: '',
|
||||||
group_id: +payload.group_id,
|
group_id: +payload.group_id,
|
||||||
group_name: data.groupName,
|
group_name: data.groupName,
|
||||||
member_count: data.memberNum,
|
member_count: data.memberNum,
|
||||||
|
@@ -73,6 +73,7 @@ export class OB11Construct {
|
|||||||
|
|
||||||
static group(group: Group): OB11Group {
|
static group(group: Group): OB11Group {
|
||||||
return {
|
return {
|
||||||
|
group_remark: group.remarkName,
|
||||||
group_id: +group.groupCode,
|
group_id: +group.groupCode,
|
||||||
group_name: group.groupName,
|
group_name: group.groupName,
|
||||||
member_count: group.memberCount,
|
member_count: group.memberCount,
|
||||||
|
@@ -57,6 +57,7 @@ export interface OB11GroupMember {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export interface OB11Group {
|
export interface OB11Group {
|
||||||
|
group_remark: string; // 群备注
|
||||||
group_id: number; // 群ID
|
group_id: number; // 群ID
|
||||||
group_name: string; // 群名称
|
group_name: string; // 群名称
|
||||||
member_count?: number; // 成员数量
|
member_count?: number; // 成员数量
|
||||||
|
@@ -31,6 +31,7 @@ import { WebUiDataRuntime } from '@/webui/src/helper/Data';
|
|||||||
import { napCatVersion } from '@/common/version';
|
import { napCatVersion } from '@/common/version';
|
||||||
import { NodeIO3MiscListener } from '@/core/listeners/NodeIO3MiscListener';
|
import { NodeIO3MiscListener } from '@/core/listeners/NodeIO3MiscListener';
|
||||||
import { sleep } from '@/common/helper';
|
import { sleep } from '@/common/helper';
|
||||||
|
|
||||||
// NapCat Shell App ES 入口文件
|
// NapCat Shell App ES 入口文件
|
||||||
async function handleUncaughtExceptions(logger: LogWrapper) {
|
async function handleUncaughtExceptions(logger: LogWrapper) {
|
||||||
process.on('uncaughtException', (err) => {
|
process.on('uncaughtException', (err) => {
|
||||||
@@ -114,18 +115,19 @@ async function handleLogin(
|
|||||||
quickLoginUin: string | undefined,
|
quickLoginUin: string | undefined,
|
||||||
historyLoginList: LoginListItem[]
|
historyLoginList: LoginListItem[]
|
||||||
): Promise<SelfInfo> {
|
): Promise<SelfInfo> {
|
||||||
|
let context = { isLogined: false };
|
||||||
let inner_resolve: (value: SelfInfo) => void;
|
let inner_resolve: (value: SelfInfo) => void;
|
||||||
let selfInfo: Promise<SelfInfo> = new Promise((resolve) => {
|
let selfInfo: Promise<SelfInfo> = new Promise((resolve) => {
|
||||||
inner_resolve = resolve;
|
inner_resolve = resolve;
|
||||||
});
|
});
|
||||||
// 连接服务
|
// 连接服务
|
||||||
let isLogined = false;
|
|
||||||
const loginListener = new NodeIKernelLoginListener();
|
const loginListener = new NodeIKernelLoginListener();
|
||||||
loginListener.onUserLoggedIn = (userid: string) => {
|
loginListener.onUserLoggedIn = (userid: string) => {
|
||||||
logger.logError(`当前账号(${userid})已登录,无法重复登录`);
|
logger.logError(`当前账号(${userid})已登录,无法重复登录`);
|
||||||
};
|
};
|
||||||
loginListener.onQRCodeLoginSucceed = async (loginResult) => {
|
loginListener.onQRCodeLoginSucceed = async (loginResult) => {
|
||||||
isLogined = true;
|
context.isLogined = true;
|
||||||
inner_resolve({
|
inner_resolve({
|
||||||
uid: loginResult.uid,
|
uid: loginResult.uid,
|
||||||
uin: loginResult.uin,
|
uin: loginResult.uin,
|
||||||
@@ -134,7 +136,11 @@ async function handleLogin(
|
|||||||
});
|
});
|
||||||
|
|
||||||
};
|
};
|
||||||
|
loginListener.onLoginConnected = () => {
|
||||||
|
waitForNetworkConnection(loginService, logger).then(() => {
|
||||||
|
handleLoginInner(context, logger, loginService, quickLoginUin, historyLoginList).then().catch(e => logger.logError(e));
|
||||||
|
});
|
||||||
|
}
|
||||||
loginListener.onQRCodeGetPicture = ({ pngBase64QrcodeData, qrcodeUrl }) => {
|
loginListener.onQRCodeGetPicture = ({ pngBase64QrcodeData, qrcodeUrl }) => {
|
||||||
WebUiDataRuntime.setQQLoginQrcodeURL(qrcodeUrl);
|
WebUiDataRuntime.setQQLoginQrcodeURL(qrcodeUrl);
|
||||||
|
|
||||||
@@ -156,7 +162,7 @@ async function handleLogin(
|
|||||||
};
|
};
|
||||||
|
|
||||||
loginListener.onQRCodeSessionFailed = (errType: number, errCode: number) => {
|
loginListener.onQRCodeSessionFailed = (errType: number, errCode: number) => {
|
||||||
if (!isLogined) {
|
if (!context.isLogined) {
|
||||||
logger.logError('[Core] [Login] Login Error,ErrType: ', errType, ' ErrCode:', errCode);
|
logger.logError('[Core] [Login] Login Error,ErrType: ', errType, ' ErrCode:', errCode);
|
||||||
if (errType == 1 && errCode == 3) {
|
if (errType == 1 && errCode == 3) {
|
||||||
// 二维码过期刷新
|
// 二维码过期刷新
|
||||||
@@ -168,10 +174,12 @@ async function handleLogin(
|
|||||||
loginListener.onLoginFailed = (...args) => {
|
loginListener.onLoginFailed = (...args) => {
|
||||||
logger.logError('[Core] [Login] Login Error , ErrInfo: ', JSON.stringify(args));
|
logger.logError('[Core] [Login] Login Error , ErrInfo: ', JSON.stringify(args));
|
||||||
};
|
};
|
||||||
|
|
||||||
loginService.addKernelLoginListener(proxiedListenerOf(loginListener, logger));
|
loginService.addKernelLoginListener(proxiedListenerOf(loginListener, logger));
|
||||||
loginService.connect();
|
loginService.connect();
|
||||||
await waitForNetworkConnection(loginService, logger);
|
return await selfInfo;
|
||||||
// 等待网络
|
}
|
||||||
|
async function handleLoginInner(context: { isLogined: boolean }, logger: LogWrapper, loginService: NodeIKernelLoginService, quickLoginUin: string | undefined, historyLoginList: LoginListItem[]) {
|
||||||
WebUiDataRuntime.setQuickLoginCall(async (uin: string) => {
|
WebUiDataRuntime.setQuickLoginCall(async (uin: string) => {
|
||||||
return await new Promise((resolve) => {
|
return await new Promise((resolve) => {
|
||||||
if (uin) {
|
if (uin) {
|
||||||
@@ -197,13 +205,13 @@ async function handleLogin(
|
|||||||
.then(result => {
|
.then(result => {
|
||||||
if (result.loginErrorInfo.errMsg) {
|
if (result.loginErrorInfo.errMsg) {
|
||||||
logger.logError('快速登录错误:', result.loginErrorInfo.errMsg);
|
logger.logError('快速登录错误:', result.loginErrorInfo.errMsg);
|
||||||
if (!isLogined) loginService.getQRCodePicture();
|
if (!context.isLogined) loginService.getQRCodePicture();
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch();
|
.catch();
|
||||||
} else {
|
} else {
|
||||||
logger.logError('快速登录失败,未找到该 QQ 历史登录记录,将使用二维码登录方式');
|
logger.logError('快速登录失败,未找到该 QQ 历史登录记录,将使用二维码登录方式');
|
||||||
if (!isLogined) loginService.getQRCodePicture();
|
if (!context.isLogined) loginService.getQRCodePicture();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
logger.log('没有 -q 指令指定快速登录,将使用二维码登录方式');
|
logger.log('没有 -q 指令指定快速登录,将使用二维码登录方式');
|
||||||
@@ -222,8 +230,6 @@ async function handleLogin(
|
|||||||
WebUiDataRuntime.setQQQuickLoginList(list.map((item) => item.uin.toString()));
|
WebUiDataRuntime.setQQQuickLoginList(list.map((item) => item.uin.toString()));
|
||||||
WebUiDataRuntime.setQQNewLoginList(list);
|
WebUiDataRuntime.setQQNewLoginList(list);
|
||||||
});
|
});
|
||||||
|
|
||||||
return await selfInfo;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function initializeSession(
|
async function initializeSession(
|
||||||
@@ -285,7 +291,7 @@ async function waitForNetworkConnection(loginService: NodeIKernelLoginService, l
|
|||||||
let network_ok = false;
|
let network_ok = false;
|
||||||
let tryCount = 0;
|
let tryCount = 0;
|
||||||
while (!network_ok) {
|
while (!network_ok) {
|
||||||
network_ok = loginService.getMsfStatus() === 0;
|
network_ok = loginService.getMsfStatus() !== 3;// win 11 0连接 1未连接
|
||||||
logger.log('等待网络连接...');
|
logger.log('等待网络连接...');
|
||||||
await sleep(500);
|
await sleep(500);
|
||||||
tryCount++;
|
tryCount++;
|
||||||
|
Reference in New Issue
Block a user