Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
355f7fb4a0 | ||
|
|
325c455e38 | ||
|
|
a7a9792efe | ||
|
|
4bab93e545 | ||
|
|
3c60997b1c | ||
|
|
bf684d9166 | ||
|
|
5c4ee30f37 | ||
|
|
346374b442 | ||
|
|
cc8a387bde | ||
|
|
962685ade6 | ||
|
|
36fdaac406 | ||
|
|
db16db911b |
No files matched your search
+1
-1
@@ -4,7 +4,7 @@
|
||||
"name": "NapCatQQ",
|
||||
"slug": "NapCat.Framework",
|
||||
"description": "高性能的 OneBot 11 协议实现",
|
||||
"version": "4.9.9",
|
||||
"version": "4.9.15",
|
||||
"icon": "./logo.png",
|
||||
"authors": [
|
||||
{
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "napcat",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"version": "4.9.9",
|
||||
"version": "4.9.15",
|
||||
"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",
|
||||
|
||||
@@ -1 +1 @@
|
||||
export const napCatVersion = '4.9.9';
|
||||
export const napCatVersion = '4.9.15';
|
||||
Vendored
+10
-2
@@ -39,12 +39,20 @@
|
||||
"send": "09FF0F4",
|
||||
"recv": "1D1A039"
|
||||
},
|
||||
"6.9.82-40824-arm64": {
|
||||
"send": "05FA930",
|
||||
"recv": "0B41B90"
|
||||
},
|
||||
"6.9.82-40768-arm64": {
|
||||
"send": "05FA930",
|
||||
"recv": "0B41B90"
|
||||
},
|
||||
"6.9.82-40990-arm64": {
|
||||
"send": "0822F0C",
|
||||
"send": "05FA930",
|
||||
"recv": "0B41B90"
|
||||
},
|
||||
"6.9.83-41679-arm64": {
|
||||
"send": "06DFD30",
|
||||
"send": "0237D114",
|
||||
"recv": "0957648"
|
||||
}
|
||||
}
|
||||
+12
-1
@@ -139,10 +139,20 @@ export interface NodeQQNTWrapperUtil {
|
||||
|
||||
isNull(): unknown;
|
||||
}
|
||||
|
||||
export interface NodeIQQNTStartupSessionWrapper {
|
||||
create(): NodeIQQNTStartupSessionWrapper;
|
||||
stop(): void;
|
||||
start(): void;
|
||||
createWithModuleList(uk: unknown): unknown;
|
||||
getSessionIdList(): unknown;
|
||||
}
|
||||
export interface NodeIQQNTWrapperSession {
|
||||
getNTWrapperSession(str: string): NodeIQQNTWrapperSession;
|
||||
|
||||
get(): NodeIQQNTWrapperSession;
|
||||
|
||||
new(): NodeIQQNTWrapperSession;
|
||||
|
||||
create(): NodeIQQNTWrapperSession;
|
||||
|
||||
init(
|
||||
@@ -271,6 +281,7 @@ export interface WrapperNodeApi {
|
||||
NodeIO3MiscService: NodeIO3MiscService;
|
||||
NodeQQNTWrapperUtil: NodeQQNTWrapperUtil;
|
||||
NodeIQQNTWrapperSession: NodeIQQNTWrapperSession;
|
||||
NodeIQQNTStartupSessionWrapper: NodeIQQNTStartupSessionWrapper
|
||||
NodeIQQNTWrapperEngine: NodeIQQNTWrapperEngine;
|
||||
NodeIKernelLoginService: NodeIKernelLoginService;
|
||||
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -28,7 +28,10 @@ export class GetGroupEssence extends OneBotAction<Payload, unknown> {
|
||||
}
|
||||
|
||||
async _handle(payload: Payload, _adapter: string, config: NetworkAdapterConfig) {
|
||||
const msglist = (await this.core.apis.WebApi.getGroupEssenceMsgAll(payload.group_id.toString())).flatMap((e) => e.data.msg_list);
|
||||
const msglist = (await this.core.apis.WebApi.getGroupEssenceMsgAll(payload.group_id.toString()))
|
||||
.flatMap((e) => e?.data?.msg_list)
|
||||
// 在群精华回空的时候会出现[null]的情况~ https://github.com/NapNeko/NapCatQQ/issues/1334
|
||||
.filter(Boolean);
|
||||
if (!msglist) {
|
||||
throw new Error('获取失败');
|
||||
}
|
||||
|
||||
@@ -126,7 +126,11 @@ export class OneBotGroupApi {
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
async registerParseGroupReactEvent() {
|
||||
this.obContext.core.context.packetHandler.onCmd('trpc.msg.olpush.OlPushService.MsgPush', async (packet) => {
|
||||
console.log(packet.seq, packet.hex_data);
|
||||
});
|
||||
}
|
||||
async parsePaiYiPai(msg: RawMessage, jsonStr: string) {
|
||||
const json = JSON.parse(jsonStr);
|
||||
//判断业务类型
|
||||
|
||||
+28
-10
@@ -10,6 +10,7 @@ import {
|
||||
loadQQWrapper,
|
||||
NapCatCore,
|
||||
NapCatCoreWorkingEnv,
|
||||
NodeIQQNTStartupSessionWrapper,
|
||||
NodeIQQNTWrapperEngine,
|
||||
NodeIQQNTWrapperSession,
|
||||
PlatformType,
|
||||
@@ -242,7 +243,8 @@ async function handleLoginInner(context: { isLogined: boolean }, logger: LogWrap
|
||||
|
||||
async function initializeSession(
|
||||
session: NodeIQQNTWrapperSession,
|
||||
sessionConfig: WrapperSessionInitConfig
|
||||
sessionConfig: WrapperSessionInitConfig,
|
||||
startupSession: NodeIQQNTStartupSessionWrapper | null
|
||||
) {
|
||||
return new Promise<void>((resolve, reject) => {
|
||||
const sessionListener = new NodeIKernelSessionListener();
|
||||
@@ -259,13 +261,17 @@ async function initializeSession(
|
||||
new NodeIDispatcherAdapter(),
|
||||
sessionListener,
|
||||
);
|
||||
try {
|
||||
session.startNT(0);
|
||||
} catch {
|
||||
if (startupSession) {
|
||||
startupSession.start();
|
||||
} else {
|
||||
try {
|
||||
session.startNT();
|
||||
} catch (e: unknown) {
|
||||
reject(new Error('init failed ' + (e as Error).message));
|
||||
session.startNT(0);
|
||||
} catch {
|
||||
try {
|
||||
session.startNT();
|
||||
} catch (e: unknown) {
|
||||
reject(new Error('init failed ' + (e as Error).message));
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -335,8 +341,20 @@ export async function NCoreInitShell() {
|
||||
|
||||
const engine = wrapper.NodeIQQNTWrapperEngine.get();
|
||||
const loginService = wrapper.NodeIKernelLoginService.get();
|
||||
const session = new wrapper.NodeIQQNTWrapperSession();
|
||||
|
||||
let session: NodeIQQNTWrapperSession;
|
||||
let startupSession: NodeIQQNTStartupSessionWrapper | null = null;
|
||||
try {
|
||||
startupSession = wrapper.NodeIQQNTStartupSessionWrapper.create();
|
||||
session = wrapper.NodeIQQNTWrapperSession.getNTWrapperSession('nt_1');
|
||||
} catch (e: unknown) {
|
||||
try {
|
||||
session = wrapper.NodeIQQNTWrapperSession.create();
|
||||
} catch (error) {
|
||||
logger.logError('创建 StartupSession 失败', e);
|
||||
logger.logError('创建 Session 失败', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
const [dataPath, dataPathGlobal] = getDataPaths(wrapper);
|
||||
const systemPlatform = getPlatformType();
|
||||
|
||||
@@ -370,7 +388,7 @@ export async function NCoreInitShell() {
|
||||
dataPath,
|
||||
);
|
||||
|
||||
await initializeSession(session, sessionConfig);
|
||||
await initializeSession(session, sessionConfig, startupSession);
|
||||
|
||||
const accountDataPath = path.resolve(dataPath, './NapCat/data');
|
||||
//判断dataPath是否为根目录 或者 D:/ 之类的盘目录
|
||||
|
||||
Reference in new issue
Block a user