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,7 +39,6 @@ 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.2.2",
+  "version": "4.1.3",
   "icon": "./icon.webp",
   "authors": [
     {

package.json

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

scripts/gen-manifest.ts

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

src/common/utils/file.ts

@@ -27,10 +27,9 @@ 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

@@ -1,9 +0,0 @@
-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

@@ -180,6 +180,7 @@ 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)) {
@@ -190,6 +191,7 @@ function onLoad() {
         log('LLOneBot 开关设置为关闭，不启动 LLOneBot')
         return
       }
+
       ctx.plugin(Log, {
         enable: config.log!,
         filename: logFileName
@@ -228,9 +230,6 @@ function onLoad() {
 
 // 创建窗口时触发
 function onBrowserWindowCreated(window: BrowserWindow) {
-  if (window.id === 2) {
-    mainWindow = window
-  }
 }
 
 try {

src/ntqqapi/core.ts

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

src/ntqqapi/hook.ts

@@ -2,7 +2,6 @@ import { NTMethod } from './ntcall'
 import { log } from '@/common/utils'
 import { randomUUID } from 'node:crypto'
 import { ipcMain } from 'electron'
-import { Dict } from 'cosmokit'
 
 export const hookApiCallbacks: Record<string, (res: any) => void> = {}
 
@@ -41,31 +40,30 @@ const callHooks: Array<{
 }> = []
 
 export function startHook() {
-  log('start hook')
-
   const senderExclude = Symbol()
 
   ipcMain.emit = new Proxy(ipcMain.emit, {
-    apply(target, thisArg, args: [channel: string, ...args: any]) {
-      if (args[2]?.eventName?.startsWith('ns-LoggerApi')) {
+    apply(target, thisArg, args: [eventName: string, ...args: any]) {
+      if (args[2]?.eventName.startsWith('ns-LoggerApi')) {
         return target.apply(thisArg, args)
       }
       if (logHook) {
         log('request', args)
       }
+
       const event = args[1]
       if (event.sender && !event.sender[senderExclude]) {
         event.sender[senderExclude] = true
         event.sender.send = new Proxy(event.sender.send, {
-          apply(target, thisArg, args: [channel: string, meta: Dict, data: Dict[]]) {
-            if (args[1]?.eventName?.startsWith('ns-LoggerApi')) {
+          apply(target, thisArg, args: any[]) {
+            if (args[1].eventName?.startsWith('ns-LoggerApi')) {
               return target.apply(thisArg, args)
             }
             if (logHook) {
               log('received', args)
             }
 
-            const callbackId = args[1]?.callbackId
+            const callbackId = args[1].callbackId
             if (callbackId) {
               if (hookApiCallbacks[callbackId]) {
                 Promise.resolve(hookApiCallbacks[callbackId](args[2]))
@@ -97,7 +95,7 @@ export function startHook() {
         }
       }
       return target.apply(thisArg, args)
-    },
+    }
   })
 }
 

src/ntqqapi/native/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'
 
@@ -11,7 +11,7 @@ export class Native {
   public activated = false
   private crychic?: Dict
   private seq = 0
-  private cb: Map<number, (res: any) => void> = new Map()
+  private cb: Map<number, Function> = new Map()
 
   constructor(private ctx: Context) {
     ctx.on('ready', () => {

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

@@ -1,17 +0,0 @@
-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

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

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

@@ -1,6 +0,0 @@
-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 { log } from '../common/utils'
+import { getBuildVersion, log } from '../common/utils'
 import { randomUUID } from 'node:crypto'
 import {
   GeneralCallResult,
@@ -108,26 +108,13 @@ 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 ?? getChannel()
+  const channel = options.channel ?? getBuildVersion() >= 28788 ? NTChannel.IPC_UP_3 : NTChannel.IPC_UP_2
   const timeout = options.timeout ?? 5000
   const afterFirstCmd = options.afterFirstCmd ?? true
   let eventName = className + '-' + channel[channel.length - 1]

src/ntqqapi/types/msg.ts

@@ -442,7 +442,6 @@ export interface RawMessage {
     attrType: number
     attrId: string
   }>
-  isOnlineMsg: boolean
 }
 
 export interface Peer {

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

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

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

@@ -1,19 +0,0 @@
-import { BaseAction, Schema } from '../BaseAction'
-import { ActionName } from '../types'
-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.packet.sendGroupSignPacket(selfInfo.uin, payload.group_id.toString())
-    return null
-  }
-}

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

@@ -1,30 +0,0 @@
-import { BaseAction, Schema } from '../BaseAction'
-import { ActionName } from '../types'
-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.packet.sendSetSpecialTittlePacket(payload.group_id.toString(), uid, payload.special_title || "")
-    return null
-  }
-}

src/onebot11/action/index.ts

@@ -78,8 +78,6 @@ 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 = [
@@ -163,8 +161,6 @@ 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

@@ -1,5 +1,6 @@
 import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
+import { getBuildVersion } from '@/common/utils/misc'
 
 interface Payload {
   user_id: number | string
@@ -12,15 +13,13 @@ 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)
-
-    await this.ctx.app.packet.sendPokePacket(+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)
     return null
   }
 }

src/onebot11/action/llonebot/GroupPoke.ts

@@ -1,5 +1,6 @@
 import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
+import { getBuildVersion } from '@/common/utils/misc'
 
 interface Payload {
   group_id: number | string
@@ -14,14 +15,13 @@ 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)
-    await this.ctx.app.packet.sendPokePacket(+payload.user_id, +payload.group_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)
     return null
   }
 }

src/onebot11/action/system/CleanCache.ts

@@ -7,7 +7,10 @@ import { ChatCacheListItemBasic, CacheFileType } from '@/ntqqapi/types'
 export default class CleanCache extends BaseAction<void, void> {
   actionName = ActionName.CleanCache
 
-  protected async _handle(): Promise<void> {
+  protected _handle(): Promise<void> {
+    return new Promise<void>(async (res, rej) => {
+      try {
+        // dbUtil.clearCache()
         const cacheFilePaths: string[] = []
 
         await this.ctx.ntFileCacheApi.setCacheSilentScan(false)
@@ -46,13 +49,20 @@ export default class CleanCache extends BaseAction<void, void> {
         for (const name in CacheFileType) {
           if (!isNaN(parseInt(name))) continue
 
-      const fileType = CacheFileType[name] as unknown as CacheFileType
+          const fileTypeAny: any = CacheFileType[name]
+          const fileType: CacheFileType = fileTypeAny
 
           cacheFileList.push(...(await this.ctx.ntFileCacheApi.getFileCacheInfo(fileType)).infos.map((file) => file.fileKey))
         }
 
         // 一并清除
         await this.ctx.ntFileCacheApi.clearChatCache(chatCacheList, cacheFileList)
+        res()
+      } catch (e) {
+        console.error('清理缓存时发生了错误')
+        rej(e)
+      }
+    })
   }
 }
 

src/onebot11/action/types.ts

@@ -91,6 +91,4 @@ 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/onebot11/helper/createMultiMessage.ts

@@ -221,7 +221,7 @@ export class MessageEncoder {
     }
   }
 
-  async generate(content: OB11MessageData[]) {
+  async generate(content: any[]) {
     await this.render(content)
     return {
       multiMsgItems: [{

src/renderer/index.ts

@@ -11,10 +11,6 @@ function isEmpty(value: unknown) {
 }
 
 async function onSettingWindowCreated(view: Element) {
-  console.log(view)
-  if (!view){
-    return
-  }
   const config = await window.llonebot.getConfig()
   const ob11Config = { ...config.ob11 }
 
@@ -251,9 +247,7 @@ async function onSettingWindowCreated(view: Element) {
     } else {
       errDom?.classList.add('show')
     }
-    if (errCodeDom) {
-      errCodeDom.innerHTML = errMsg
-    }
+    errCodeDom!.innerHTML = errMsg
   }
   showError().then()
 

src/satori/adapter.ts

@@ -91,7 +91,7 @@ class SatoriAdapter extends Service {
       input.subMsgType === 12 &&
       input.elements[0]?.grayTipElement?.xmlElement?.templId === '10382'
     ) {
-      // 机器人被表情回应
+
     }
     else {
       // 普通的消息

src/version.ts

@@ -1 +1 @@
-export const version = '4.2.2'
+export const version = '4.1.3'