refactor: 使用 napcat packet 实现戳一戳、群头衔、群打卡

electron.vite.config.ts

@@ -39,6 +39,7 @@ const config: ElectronViteConfig = {
           ...external.map(genCpModule),
           { src: './manifest.json', dest: 'dist' },
           { src: './icon.webp', dest: 'dist' },
+          { src: './src/ntqqapi/native/napcat-protocol-packet/Moehoo/*', dest: 'dist/main/Moehoo' },
         ],
       }),
     ],

manifest.json

@@ -4,12 +4,16 @@
   "name": "LLOneBot",
   "slug": "LLOneBot",
   "description": "实现 OneBot 11 和 Satori 协议，用于 QQ 机器人开发",
-  "version": "4.1.4",
+  "version": "4.1.5",
   "icon": "./icon.webp",
   "authors": [
     {
       "name": "linyuchen",
       "link": "https://github.com/linyuchen"
+    },
+    {
+      "name": "idranme",
+      "link": "https://github.com/idranme"
     }
   ],
   "repository": {

scripts/gen-manifest.ts

@@ -13,6 +13,10 @@ const manifest = {
     {
       name: 'linyuchen',
       link: 'https://github.com/linyuchen'
+    },
+    {
+      "name": "idranme",
+      "link": "https://github.com/idranme"
     }
   ],
   repository: {

src/main/main.ts

@@ -36,6 +36,9 @@ import {
 } from '../ntqqapi/api'
 import { existsSync, mkdirSync } from 'node:fs'
 
+import { initWrapperSession} from '@/ntqqapi/native/napcat-protocol-packet'
+initWrapperSession().then()
+
 declare module 'cordis' {
   interface Events {
     'llob/config-updated': (input: LLOBConfig) => void

src/ntqqapi/core.ts

@@ -19,7 +19,8 @@ import {
 import { selfInfo } from '../common/globalVars'
 import { version } from '../version'
 import { invoke } from './ntcall'
-import { Native } from './native/index'
+import { Native } from './native/crychic'
+import { initWrapperSession, NTQQPacketApi } from './native/napcat-protocol-packet'
 
 declare module 'cordis' {
   interface Context {
@@ -40,10 +41,12 @@ class Core extends Service {
   static inject = ['ntMsgApi', 'ntFriendApi', 'ntGroupApi', 'store']
   public startTime = 0
   public native
+  public ntqqPacketApi: NTQQPacketApi
 
   constructor(protected ctx: Context, public config: Core.Config) {
     super(ctx, 'app', true)
     this.native = new Native(ctx)
+    initWrapperSession().then(session=>{this.ntqqPacketApi = new NTQQPacketApi(session)})
   }
 
   public start() {

src/ntqqapi/native/crychic/index.ts

@@ -1,9 +1,9 @@
 import { Context } from 'cordis'
 import { Dict } from 'cosmokit'
-import { getBuildVersion } from '@/common/utils/misc'
-import { TEMP_DIR } from '@/common/globalVars'
+import { getBuildVersion } from '../../../common/utils/misc'
+import { TEMP_DIR } from '../../../common/globalVars'
 import { copyFile } from 'fs/promises'
-import { ChatType, Peer } from '../types'
+import { ChatType, Peer } from '../../types'
 import path from 'node:path'
 import addon from './external/crychic-win32-x64.node?asset'
 

src/ntqqapi/native/napcat-protocol-packet/index.d.ts

@@ -0,0 +1,16 @@
+import { WrapperSession } from './wrapper-session/types';
+export { initWrapperSession } from './wrapper-session';
+export declare class NTQQPacketApi {
+    private qqVersion;
+    private packetSession;
+    private logger;
+    private readonly wrapperSession;
+    constructor(wrapperSession: WrapperSession);
+    get available(): boolean;
+    private InitSendPacket;
+    private sendPacket;
+    private sendOidbPacket;
+    sendPokePacket(peer: number, group?: number): Promise<void>;
+    sendGroupSignPacket(selfUin: string, groupCode: string): Promise<void>;
+    sendSetSpecialTittlePacket(groupCode: string, uid: string, tittle: string): Promise<void>;
+}

src/ntqqapi/native/napcat-protocol-packet/wrapper-session/index.d.ts

@@ -0,0 +1 @@
+export declare function initWrapperSession(): Promise<any>;

src/ntqqapi/native/napcat-protocol-packet/wrapper-session/types.d.ts

@@ -0,0 +1,6 @@
+export interface MsgService {
+    sendSsoCmdReqByContend: (cmd: string, trace_id: string) => Promise<unknown>;
+}
+export type WrapperSession = {
+    getMsgService(): MsgService;
+};

src/onebot11/action/go-cqhttp/SendGroupSign.ts

@@ -0,0 +1,20 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+import { getBuildVersion } from '@/common/utils/misc'
+import { selfInfo } from '@/common/globalVars'
+
+interface Payload {
+  group_id: number | string
+}
+
+export class SendGroupSign extends BaseAction<Payload, null> {
+  actionName = ActionName.GoCQHTTP_SendGroupSign
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+  })
+
+  async _handle(payload: Payload) {
+    await this.ctx.app.ntqqPacketApi.sendGroupSignPacket(selfInfo.uin, payload.group_id.toString())
+    return null
+  }
+}

src/onebot11/action/go-cqhttp/SetGroupSpecialTitle.ts

@@ -0,0 +1,25 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+import { getBuildVersion } from '@/common/utils/misc'
+
+interface Payload {
+  group_id: number | string
+  user_id: number | string
+  special_title?: string
+}
+
+export class SetGroupSpecialTitle extends BaseAction<Payload, null> {
+  actionName = ActionName.GoCQHTTP_SetGroupSpecialTitle
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    user_id: Schema.union([Number, String]).required(),
+    special_title: Schema.string()
+  })
+
+  async _handle(payload: Payload) {
+    const uid = await this.ctx.ntUserApi.getUidByUin(payload.user_id.toString(), payload.group_id.toString())
+    if (!uid) throw new Error(`用户${payload.user_id}的uid获取失败`)
+    await this.ctx.app.ntqqPacketApi.sendSetSpecialTittlePacket(payload.group_id.toString(), uid, payload.special_title || "")
+    return null
+  }
+}

src/onebot11/action/index.ts

@@ -78,6 +78,8 @@ import { GroupPoke } from './llonebot/GroupPoke'
 import { FriendPoke } from './llonebot/FriendPoke'
 import { GetGroupFileSystemInfo } from './go-cqhttp/GetGroupFileSystemInfo'
 import { GetCredentials } from './system/GetCredentials'
+import { SetGroupSpecialTitle } from '@/onebot11/action/go-cqhttp/SetGroupSpecialTitle'
+import { SendGroupSign } from '@/onebot11/action/go-cqhttp/SendGroupSign'
 
 export function initActionMap(adapter: Adapter) {
   const actionHandlers = [
@@ -161,6 +163,8 @@ export function initActionMap(adapter: Adapter) {
     new DeleteFriend(adapter),
     new OCRImage(adapter),
     new GetGroupFileSystemInfo(adapter),
+    new SetGroupSpecialTitle(adapter),
+    new SendGroupSign(adapter),
   ]
   const actionMap = new Map()
   for (const action of actionHandlers) {

src/onebot11/action/llonebot/FriendPoke.ts

@@ -13,13 +13,15 @@ export class FriendPoke extends BaseAction<Payload, null> {
   })
 
   async _handle(payload: Payload) {
-    if (!this.ctx.app.native.checkPlatform()) {
-      throw new Error('当前系统平台或架构不支持')
-    }
-    if (!this.ctx.app.native.checkVersion()) {
-      throw new Error(`当前 QQ 版本 ${getBuildVersion()} 不支持，可尝试其他版本 27333—27597`)
-    }
-    await this.ctx.app.native.sendFriendPoke(+payload.user_id)
+    // if (!this.ctx.app.native.checkPlatform()) {
+    //   throw new Error('当前系统平台或架构不支持')
+    // }
+    // if (!this.ctx.app.native.checkVersion()) {
+    //   throw new Error(`当前 QQ 版本 ${getBuildVersion()} 不支持，可尝试其他版本 27333—27597`)
+    // }
+    // await this.ctx.app.native.sendFriendPoke(+payload.user_id)
+
+    await this.ctx.app.ntqqPacketApi.sendPokePacket(+payload.user_id)
     return null
   }
 }

src/onebot11/action/llonebot/GroupPoke.ts

@@ -1,6 +1,7 @@
 import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 import { getBuildVersion } from '@/common/utils/misc'
+import {NTQQPacketApi} from '@/ntqqapi/native/napcat-protocol-packet'
 
 interface Payload {
   group_id: number | string
@@ -15,13 +16,14 @@ export class GroupPoke extends BaseAction<Payload, null> {
   })
 
   async _handle(payload: Payload) {
-    if (!this.ctx.app.native.checkPlatform()) {
-      throw new Error('当前系统平台或架构不支持')
-    }
-    if (!this.ctx.app.native.checkVersion()) {
-      throw new Error(`当前 QQ 版本 ${getBuildVersion()} 不支持，可尝试其他版本 27333—27597`)
-    }
-    await this.ctx.app.native.sendGroupPoke(+payload.group_id, +payload.user_id)
+    // if (!this.ctx.app.native.checkPlatform()) {
+    //   throw new Error('当前系统平台或架构不支持')
+    // }
+    // if (!this.ctx.app.native.checkVersion()) {
+    //   throw new Error(`当前 QQ 版本 ${getBuildVersion()} 不支持，可尝试其他版本 27333—27597`)
+    // }
+    // await this.ctx.app.native.sendGroupPoke(+payload.group_id, +payload.user_id)
+    await this.ctx.app.ntqqPacketApi.sendPokePacket(+payload.user_id, +payload.group_id)
     return null
   }
 }

src/onebot11/action/types.ts

@@ -91,4 +91,6 @@ export enum ActionName {
   GoCQHTTP_DeleteFriend = 'delete_friend',
   GoCQHTTP_OCRImage = 'ocr_image',
   GoCQHTTP_GetGroupFileSystemInfo = 'get_group_file_system_info',
+  GoCQHTTP_SetGroupSpecialTitle = 'set_group_special_title',
+  GoCQHTTP_SendGroupSign = 'send_group_sign',
 }

src/version.ts

@@ -1 +1 @@
-export const version = '4.1.4'
+export const version = '4.1.5'