Merge branch 'dev'

release: 4.1.2

README.md

@@ -23,6 +23,10 @@ TG 群：<https://t.me/+nLZEnpne-pQ1OWFl>
 
 [![Stargazers over time](https://starchart.cc/LLOneBot/LLOneBot.svg?variant=adaptive)](https://starchart.cc/LLOneBot/LLOneBot)
 
+## 贡献者
+
+[![Contributors](https://contributors-img.web.app/image?repo=LLOneBot/LLOneBot)](https://github.com/LOneBot/LLOneBot/graphs/contributors)
+
 ## 鸣谢
 
 - [NapCatQQ](https://github.com/NapNeko/NapCatQQ)

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,7 +4,7 @@
   "name": "LLOneBot",
   "slug": "LLOneBot",
   "description": "实现 OneBot 11 和 Satori 协议，用于 QQ 机器人开发",
-  "version": "4.1.3",
+  "version": "4.2.0",
   "icon": "./icon.webp",
   "authors": [
     {
@@ -34,4 +34,4 @@
     "main": "./main/main.cjs",
     "preload": "./preload/preload.cjs"
   }
-}
+}

package.json

@@ -26,7 +26,7 @@
     "cosmokit": "^1.6.3",
     "express": "^5.0.1",
     "fluent-ffmpeg": "^2.1.3",
-    "minato": "^3.6.0",
+    "minato": "^3.6.1",
     "protobufjs": "^7.4.0",
     "silk-wasm": "^3.6.3",
     "ts-case-convert": "^2.1.0",
@@ -35,14 +35,14 @@
   "devDependencies": {
     "@types/cors": "^2.8.17",
     "@types/express": "^5.0.0",
-    "@types/fluent-ffmpeg": "^2.1.26",
+    "@types/fluent-ffmpeg": "^2.1.27",
     "@types/node": "^20.14.15",
-    "@types/ws": "^8.5.12",
+    "@types/ws": "^8.5.13",
     "electron": "^31.4.0",
     "electron-vite": "^2.3.0",
     "protobufjs-cli": "^1.1.3",
     "typescript": "^5.6.3",
-    "vite": "^5.4.10 ",
+    "vite": "^5.4.10",
     "vite-plugin-cp": "^4.0.8"
   },
   "packageManager": "yarn@4.5.1"

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/common/utils/file.ts

@@ -27,9 +27,10 @@ export function checkFileReceived(path: string, timeout: number = 3000): Promise
 
 export function calculateFileMD5(filePath: string): Promise<string> {
   return new Promise((resolve, reject) => {
+    const hash = createHash('md5')
+
     // 创建一个流式读取器
     const stream = fs.createReadStream(filePath)
-    const hash = createHash('md5')
 
     stream.on('data', (data: Buffer) => {
       // 当读取到数据时，更新哈希对象的状态

src/common/utils/window.ts

@@ -0,0 +1,9 @@
+import { BrowserWindow } from 'electron'
+import { log } from '@/common/utils'
+
+export function getAllWindowIds(): number[] {
+  const allWindows = BrowserWindow.getAllWindows();
+  const ids = allWindows.map(window => window.id);
+  log('getAllWindowIds', ids);
+  return ids;
+}

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
@@ -180,7 +183,6 @@ function onLoad() {
     if (self.uin) {
       clearInterval(intervalId)
       log('process pid', process.pid)
-
       const config = getConfigUtil().getConfig()
 
       if (config.enableLLOB && (config.satori.enable || config.ob11.enable)) {
@@ -191,7 +193,6 @@ function onLoad() {
         log('LLOneBot 开关设置为关闭，不启动 LLOneBot')
         return
       }
-
       ctx.plugin(Log, {
         enable: config.log!,
         filename: logFileName

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/hook.ts

@@ -40,6 +40,8 @@ const callHooks: Array<{
 }> = []
 
 export function startHook() {
+  log('start hook')
+
   const senderExclude = Symbol()
 
   ipcMain.emit = new Proxy(ipcMain.emit, {
@@ -50,7 +52,6 @@ export function startHook() {
       if (logHook) {
         log('request', args)
       }
-
       const event = args[1]
       if (event.sender && !event.sender[senderExclude]) {
         event.sender[senderExclude] = true

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,17 @@
+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 checkQQVersion;
+    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/ntqqapi/ntcall.ts

@@ -1,6 +1,6 @@
 import { ipcMain } from 'electron'
 import { hookApiCallbacks, registerReceiveHook, removeReceiveHook } from './hook'
-import { getBuildVersion, log } from '../common/utils'
+import { log } from '../common/utils'
 import { randomUUID } from 'node:crypto'
 import {
   GeneralCallResult,
@@ -108,13 +108,26 @@ interface InvokeOptions<ReturnType> {
   timeout?: number
 }
 
+let channel: NTChannel
+
+function getChannel() {
+  if (channel) {
+    return channel
+  }
+  if (ipcMain.eventNames().includes(NTChannel.IPC_UP_2)) {
+    return channel = NTChannel.IPC_UP_2
+  } else {
+    return channel = NTChannel.IPC_UP_3
+  }
+}
+
 export function invoke<
   R extends Awaited<ReturnType<Extract<NTService[S][M], (...args: any) => unknown>>>,
   S extends keyof NTService = any,
   M extends keyof NTService[S] & string = any
 >(method: Extract<unknown, `${S}/${M}`> | string, args: unknown[], options: InvokeOptions<R> = {}) {
   const className = options.className ?? NTClass.NT_API
-  const channel = options.channel ?? getBuildVersion() >= 28788 ? NTChannel.IPC_UP_3 : NTChannel.IPC_UP_2
+  const channel = options.channel ?? getChannel()
   const timeout = options.timeout ?? 5000
   const afterFirstCmd = options.afterFirstCmd ?? true
   let eventName = className + '-' + channel[channel.length - 1]

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

@@ -12,6 +12,7 @@ interface Payload {
 interface Response extends OB11User {
   reg_time: number
   long_nick: string
+  city: string
 }
 
 export class GetStrangerInfo extends BaseAction<Payload, Response> {
@@ -33,7 +34,8 @@ export class GetStrangerInfo extends BaseAction<Payload, Response> {
         level: data.detail.commonExt.qqLevel && calcQQLevel(data.detail.commonExt.qqLevel) || 0,
         login_days: 0,
         reg_time: data.detail.commonExt.regTime,
-        long_nick: data.detail.simpleInfo.baseInfo.longNick
+        long_nick: data.detail.simpleInfo.baseInfo.longNick,
+        city: data.detail.commonExt.city
       }
     } else {
       const data = await this.ctx.ntUserApi.getUserDetailInfoByUin(uin)
@@ -46,7 +48,8 @@ export class GetStrangerInfo extends BaseAction<Payload, Response> {
         level: data.info.qqLevel && calcQQLevel(data.info.qqLevel) || 0,
         login_days: 0,
         reg_time: data.info.regTime,
-        long_nick: data.info.longNick
+        long_nick: data.info.longNick,
+        city: data.info.city
       }
     }
   }

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,31 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+import { getBuildVersion } from '@/common/utils/misc'
+import { selfInfo } from '@/common/globalVars'
+import { GroupMemberRole } from '@/ntqqapi/types'
+
+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获取失败`)
+    const self = await this.ctx.ntGroupApi.getGroupMember(payload.group_id.toString(), selfInfo.uid, false)
+    if (self.role !== GroupMemberRole.Owner){
+      throw new Error(`不是群${payload.group_id}的群主，无法设置群头衔`)
+    }
+    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.3'
+export const version = '4.2.0'