Merge pull request #366 from LLOneBot/dev

3.30.4

.github/workflows/publish.yml

@@ -14,7 +14,7 @@ jobs:
       - name: setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: install dependenies
         run: |

manifest.json

@@ -4,7 +4,7 @@
   "name": "LLOneBot",
   "slug": "LLOneBot",
   "description": "实现 OneBot 11 协议，用于 QQ 机器人开发",
-  "version": "3.29.4",
+  "version": "3.30.4",
   "icon": "./icon.webp",
   "authors": [
     {

package.json

@@ -20,6 +20,7 @@
     "compressing": "^1.10.1",
     "cordis": "^3.18.0",
     "cors": "^2.8.5",
+    "cosmokit": "^1.6.2",
     "express": "^4.19.2",
     "fast-xml-parser": "^4.4.1",
     "file-type": "^19.4.1",
@@ -34,10 +35,10 @@
     "@types/fluent-ffmpeg": "^2.1.25",
     "@types/node": "^20.14.15",
     "@types/ws": "^8.5.12",
-    "electron": "^29.1.4",
+    "electron": "^31.4.0",
     "electron-vite": "^2.3.0",
     "typescript": "^5.5.4",
-    "vite": "^5.4.1",
+    "vite": "^5.4.2",
     "vite-plugin-cp": "^4.0.8"
   },
   "packageManager": "yarn@4.4.0"

scripts/test/test_db.ts

@@ -1,17 +0,0 @@
-import { Level } from 'level'
-
-const db = new Level(process.env['level_db_path'] as string, { valueEncoding: 'json' })
-
-async function getGroupNotify() {
-  let keys = await db.keys().all()
-  let result: string[] = []
-  for (const key of keys) {
-    // console.log(key)
-    if (key.startsWith('group_notify_')) {
-      result.push(key)
-    }
-  }
-  return result
-}
-
-getGroupNotify().then(console.log)

src/common/config.ts

@@ -5,9 +5,7 @@ import path from 'node:path'
 import { getSelfUin } from './data'
 import { DATA_DIR } from './utils'
 
-export const HOOK_LOG = false
+//export const HOOK_LOG = false
-
-export const ALLOW_SEND_TEMP_MSG = false
 
 export class ConfigUtil {
   private readonly configPath: string

src/common/data.ts

@@ -108,11 +108,10 @@ export function getSelfUin() {
 }
 
 const messages: Map<string, RawMessage> = new Map()
-let expire: number
 
 /** 缓存近期消息内容 */
 export async function addMsgCache(msg: RawMessage) {
-  expire ??= getConfigUtil().getConfig().msgCacheExpire! * 1000
+  const expire = getConfigUtil().getConfig().msgCacheExpire! * 1000
   if (expire === 0) {
     return
   }

src/common/server/http.ts

@@ -100,7 +100,7 @@ export abstract class HttpServerBase {
       } else if (req.query) {
         payload = { ...req.query, ...req.body }
       }
-      log('收到http请求', url, payload)
+      log('收到 HTTP 请求', url, payload)
       try {
         res.send(await handler(res, payload))
       } catch (e: any) {

src/common/server/websocket.ts

@@ -1,93 +0,0 @@
-import { WebSocket, WebSocketServer } from 'ws'
-import urlParse from 'url'
-import { IncomingMessage } from 'node:http'
-import { log } from '../utils/log'
-import { getConfigUtil } from '../config'
-import { llonebotError } from '../data'
-
-class WebsocketClientBase {
-  private wsClient: WebSocket | undefined
-
-  constructor() { }
-
-  send(msg: string) {
-    if (this.wsClient && this.wsClient.readyState == WebSocket.OPEN) {
-      this.wsClient.send(msg)
-    }
-  }
-
-  onMessage(msg: string) { }
-}
-
-export class WebsocketServerBase {
-  private ws: WebSocketServer | null = null
-
-  constructor() {
-    console.log(`llonebot websocket service started`)
-  }
-
-  start(port: number) {
-    try {
-      this.ws = new WebSocketServer({ port, maxPayload: 1024 * 1024 * 1024 })
-      llonebotError.wsServerError = ''
-    } catch (e: any) {
-      llonebotError.wsServerError = '正向ws服务启动失败, ' + e.toString()
-    }
-    this.ws?.on('connection', (wsClient, req) => {
-      const url = req.url?.split('?').shift()
-      this.authorize(wsClient, req)
-      this.onConnect(wsClient, url!, req)
-      wsClient.on('message', async (msg) => {
-        this.onMessage(wsClient, url!, msg.toString())
-      })
-    })
-  }
-
-  stop() {
-    llonebotError.wsServerError = ''
-    this.ws?.close((err) => {
-      log('ws server close failed!', err)
-    })
-    this.ws = null
-  }
-
-  restart(port: number) {
-    this.stop()
-    this.start(port)
-  }
-
-  authorize(wsClient: WebSocket, req) {
-    let token = getConfigUtil().getConfig().token
-    const url = req.url.split('?').shift()
-    log('ws connect', url)
-    let clientToken: string = ''
-    const authHeader = req.headers['authorization']
-    if (authHeader) {
-      clientToken = authHeader.split('Bearer ').pop()
-      log('receive ws header token', clientToken)
-    } else {
-      const parsedUrl = urlParse.parse(req.url, true)
-      const urlToken = parsedUrl.query.access_token
-      if (urlToken) {
-        if (Array.isArray(urlToken)) {
-          clientToken = urlToken[0]
-        } else {
-          clientToken = urlToken
-        }
-        log('receive ws url token', clientToken)
-      }
-    }
-    if (token && clientToken != token) {
-      this.authorizeFailed(wsClient)
-      return wsClient.close()
-    }
-  }
-
-  authorizeFailed(wsClient: WebSocket) { }
-
-  onConnect(wsClient: WebSocket, url: string, req: IncomingMessage) { }
-
-  onMessage(wsClient: WebSocket, url: string, msg: string) { }
-
-  sendHeart() { }
-}

src/common/utils/EventTask.ts

@@ -22,6 +22,7 @@ export class NTEventWrapper {
   private WrapperSession: NodeIQQNTWrapperSession | undefined//WrapperSession
   private ListenerManger: Map<string, ListenerClassBase> = new Map<string, ListenerClassBase>() //ListenerName-Unique -> Listener实例
   private EventTask = new Map<string, Map<string, Map<string, Internal_MapKey>>>()//tasks ListenerMainName -> ListenerSubName-> uuid -> {timeout,createtime,func}
+  public initialised = false
 
   constructor() {
   }
@@ -46,6 +47,7 @@ export class NTEventWrapper {
   init({ ListenerMap, WrapperSession }: { ListenerMap: { [key: string]: typeof ListenerClassBase }, WrapperSession: NodeIQQNTWrapperSession }) {
     this.ListenerMap = ListenerMap
     this.WrapperSession = WrapperSession
+    this.initialised = true
   }
 
   createEventFunction<T extends (...args: any) => any>(eventName: string): T | undefined {

src/common/utils/file.ts

@@ -1,9 +1,9 @@
 import fs from 'node:fs'
 import fsPromise from 'node:fs/promises'
 import path from 'node:path'
-import { log, TEMP_DIR } from './index'
+import { TEMP_DIR } from './index'
-import * as fileType from 'file-type'
 import { randomUUID, createHash } from 'node:crypto'
+import { fileURLToPath } from 'node:url'
 
 export function isGIF(path: string) {
   const buffer = Buffer.alloc(4)
@@ -32,31 +32,6 @@ export function checkFileReceived(path: string, timeout: number = 3000): Promise
   })
 }
 
-export async function file2base64(path: string) {
-  let result = {
-    err: '',
-    data: '',
-  }
-  try {
-    // 读取文件内容
-    // if (!fs.existsSync(path)){
-    //     path = path.replace("\\Ori\\", "\\Thumb\\");
-    // }
-    try {
-      await checkFileReceived(path, 5000)
-    } catch (e: any) {
-      result.err = e.toString()
-      return result
-    }
-    const data = await fsPromise.readFile(path)
-    // 转换为Base64编码
-    result.data = data.toString('base64')
-  } catch (err: any) {
-    result.err = err.toString()
-  }
-  return result
-}
-
 export function calculateFileMD5(filePath: string): Promise<string> {
   return new Promise((resolve, reject) => {
     // 创建一个流式读取器
@@ -109,112 +84,118 @@ export async function httpDownload(options: string | HttpDownloadOptions): Promi
   return Buffer.from(await fetchRes.arrayBuffer())
 }
 
+export enum FileUriType {
+  Unknown = 0,
+  FileURL = 1,
+  RemoteURL = 2,
+  OneBotBase64 = 3,
+  DataURL = 4,
+  Path = 5
+}
+
+export function checkUriType(uri: string): { type: FileUriType } {
+  if (uri.startsWith('base64://')) {
+    return { type: FileUriType.OneBotBase64 }
+  }
+  if (uri.startsWith('data:')) {
+    return { type: FileUriType.DataURL }
+  }
+  if (uri.startsWith('http://') || uri.startsWith('https://')) {
+    return { type: FileUriType.RemoteURL }
+  }
+  if (uri.startsWith('file://')) {
+    return { type: FileUriType.FileURL }
+  }
+  try {
+    if (fs.existsSync(uri)) return { type: FileUriType.Path }
+  } catch { }
+  return { type: FileUriType.Unknown }
+}
+
+interface FetchFileRes {
+  data: Buffer
+  url: string
+}
+
+async function fetchFile(url: string): Promise<FetchFileRes> {
+  const headers: Record<string, string> = {
+    'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.71 Safari/537.36',
+    'Host': new URL(url).hostname
+  }
+  const raw = await fetch(url, { headers }).catch((err) => {
+    if (err.cause) {
+      throw err.cause
+    }
+    throw err
+  })
+  if (!raw.ok) throw new Error(`statusText: ${raw.statusText}`)
+  return {
+    data: Buffer.from(await raw.arrayBuffer()),
+    url: raw.url
+  }
+}
+
 type Uri2LocalRes = {
   success: boolean
   errMsg: string
   fileName: string
-  ext: string
   path: string
   isLocal: boolean
 }
 
-export async function uri2local(uri: string, fileName: string | null = null): Promise<Uri2LocalRes> {
+export async function uri2local(uri: string, filename?: string): Promise<Uri2LocalRes> {
-  let res = {
+  const { type } = checkUriType(uri)
-    success: false,
+
-    errMsg: '',
+  if (type === FileUriType.FileURL) {
-    fileName: '',
+    const filePath = fileURLToPath(uri)
-    ext: '',
+    const fileName = path.basename(filePath)
-    path: '',
+    return { success: true, errMsg: '', fileName, path: filePath, isLocal: true }
-    isLocal: false,
-  }
-  if (!fileName) {
-    fileName = randomUUID()
-  }
-  let filePath = path.join(TEMP_DIR, fileName)
-  let url: URL | null = null
-  try {
-    url = new URL(uri)
-  } catch (e: any) {
-    res.errMsg = `uri ${uri} 解析失败,` + e.toString() + ` 可能${uri}不存在`
-    return res
   }
 
-  // log("uri protocol", url.protocol, uri);
+  if (type === FileUriType.Path) {
-  if (url.protocol == 'base64:') {
+    const fileName = path.basename(uri)
-    // base64转成文件
+    return { success: true, errMsg: '', fileName, path: uri, isLocal: true }
-    let base64Data = uri.split('base64://')[1]
+  }
+
+  if (type === FileUriType.RemoteURL) {
     try {
-      const buffer = Buffer.from(base64Data, 'base64')
+      const res = await fetchFile(uri)
-      await fsPromise.writeFile(filePath, buffer)
+      const match = res.url.match(/.+\/([^/?]*)(?=\?)?/)
-    } catch (e: any) {
+      if (match?.[1]) {
-      res.errMsg = `base64文件下载失败,` + e.toString()
+        filename ??= match[1].replace(/[/\\:*?"<>|]/g, '_')
-      return res
-    }
-  } else if (url.protocol == 'http:' || url.protocol == 'https:') {
-    // 下载文件
-    let buffer: Buffer | null = null
-    try {
-      buffer = await httpDownload(uri)
-    } catch (e: any) {
-      res.errMsg = `${url}下载失败,` + e.toString()
-      return res
-    }
-    try {
-      const pathInfo = path.parse(decodeURIComponent(url.pathname))
-      if (pathInfo.name) {
-        fileName = pathInfo.name
-        if (pathInfo.ext) {
-          fileName += pathInfo.ext
-          // res.ext = pathInfo.ext
-        }
-      }
-      fileName = fileName.replace(/[/\\:*?"<>|]/g, '_')
-      res.fileName = fileName
-      filePath = path.join(TEMP_DIR, randomUUID() + fileName)
-      await fsPromise.writeFile(filePath, buffer)
-    } catch (e: any) {
-      res.errMsg = `${url}下载失败,` + e.toString()
-      return res
-    }
-  } else {
-    let pathname: string
-    if (url.protocol === 'file:') {
-      // await fs.copyFile(url.pathname, filePath);
-      pathname = decodeURIComponent(url.pathname)
-      if (process.platform === 'win32') {
-        filePath = pathname.slice(1)
       } else {
-        filePath = pathname
+        filename ??= randomUUID()
       }
+      const filePath = path.join(TEMP_DIR, filename)
+      await fsPromise.writeFile(filePath, res.data)
+      return { success: true, errMsg: '', fileName: filename, path: filePath, isLocal: false }
+    } catch (e: any) {
+      const errMsg = `${uri}下载失败,` + e.toString()
+      return { success: false, errMsg, fileName: '', path: '', isLocal: false }
     }
+  }
 
-    res.isLocal = true
+  if (type === FileUriType.OneBotBase64) {
+    filename ??= randomUUID()
+    const filePath = path.join(TEMP_DIR, filename)
+    const base64 = uri.replace(/^base64:\/\//, '')
+    await fsPromise.writeFile(filePath, base64, 'base64')
+    return { success: true, errMsg: '', fileName: filename, path: filePath, isLocal: false }
   }
-  // else{
+
-  //     res.errMsg = `不支持的file协议,` + url.protocol
+  if (type === FileUriType.DataURL) {
-  //     return res
+    // https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
-  // }
+    const capture = /^data:([\w/.+-]+);base64,(.*)$/.exec(uri)
-  // if (isGIF(filePath) && !res.isLocal) {
+    if (capture) {
-  //     await fs.rename(filePath, filePath + ".gif");
+      filename ??= randomUUID()
-  //     filePath += ".gif";
+      const [, _type, base64] = capture
-  // }
+      const filePath = path.join(TEMP_DIR, filename)
-  if (!res.isLocal && !res.ext) {
+      await fsPromise.writeFile(filePath, base64, 'base64')
-    try {
+      return { success: true, errMsg: '', fileName: filename, path: filePath, isLocal: false }
-      const ext = (await fileType.fileTypeFromFile(filePath))?.ext
-      if (ext) {
-        log('获取文件类型', ext, filePath)
-        await fsPromise.rename(filePath, filePath + `.${ext}`)
-        filePath += `.${ext}`
-        res.fileName += `.${ext}`
-        res.ext = ext
-      }
-    } catch (e) {
-      // log("获取文件类型失败", filePath,e.stack)
     }
   }
-  res.success = true
+
-  res.path = filePath
+  return { success: false, errMsg: '未知文件类型', fileName: '', path: '', isLocal: false }
-  return res
 }
 
 export async function copyFolder(sourcePath: string, destPath: string) {

src/main/main.ts

@@ -14,7 +14,7 @@ import {
   CHANNEL_UPDATE,
 } from '../common/channels'
 import { ob11WebsocketServer } from '../onebot11/server/ws/WebsocketServer'
-import { DATA_DIR, TEMP_DIR } from '../common/utils'
+import { DATA_DIR, getBuildVersion, TEMP_DIR } from '../common/utils'
 import {
   llonebotError,
   setSelfInfo,
@@ -149,7 +149,6 @@ function onLoad() {
     const { debug, reportSelfMessage } = getConfigUtil().getConfig()
     for (let message of msgList) {
       // 过滤启动之前的消息
-      // log('收到新消息', message);
       if (parseInt(message.msgTime) < startTime / 1000) {
         continue
       }
@@ -190,13 +189,6 @@ function onLoad() {
           postOb11Event(privateEvent)
         }
       })
-      // OB11Constructor.FriendAddEvent(message).then((friendAddEvent) => {
-      //   log(message)
-      //   if (friendAddEvent) {
-      //     // log("post friend add event", friendAddEvent);
-      //     postOb11Event(friendAddEvent)
-      //   }
-      // })
     }
   }
 
@@ -354,10 +346,13 @@ function onLoad() {
         if (!!req.isInitiator || (req.isDecide && req.reqType !== BuddyReqType.KMEINITIATORWAITPEERCONFIRM)) {
           continue
         }
+        if (+req.reqTime < startTime / 1000) {
+          continue
+        }
         let userId = 0
         try {
           const requesterUin = await NTQQUserApi.getUinByUid(req.friendUid)
-          userId = parseInt(requesterUin!)
+          userId = parseInt(requesterUin)
         } catch (e) {
           log('获取加好友者QQ号失败', e)
         }
@@ -376,7 +371,7 @@ function onLoad() {
   let startTime = 0 // 毫秒
 
   async function start(uid: string, uin: string) {
-    log('llonebot pid', process.pid)
+    log('process pid', process.pid)
     const config = getConfigUtil().getConfig()
     if (!config.enableLLOB) {
       llonebotError.otherError = 'LLOneBot 未启动'
@@ -388,10 +383,13 @@ function onLoad() {
     }
     llonebotError.otherError = ''
     startTime = Date.now()
-    NTEventDispatch.init({ ListenerMap: wrapperConstructor, WrapperSession: getSession()! })
+    const WrapperSession = getSession()
+    if (WrapperSession) {
+      NTEventDispatch.init({ ListenerMap: wrapperConstructor, WrapperSession })
+    }
     MessageUnique.init(uin)
 
-    log('start activate group member info')
+    //log('start activate group member info')
     // 下面两个会导致CPU占用过高，QQ卡死
     // NTQQGroupApi.activateMemberInfoChange().then().catch(log)
     // NTQQGroupApi.activateMemberListChange().then().catch(log)
@@ -413,6 +411,8 @@ function onLoad() {
     log('LLOneBot start')
   }
 
+  const buildVersion = getBuildVersion()
+
   const intervalId = setInterval(() => {
     const current = getSelfInfo()
     if (!current.uin) {
@@ -422,7 +422,7 @@ function onLoad() {
         nick: current.uin,
       })
     }
-    if (current.uin && getSession()) {
+    if (current.uin && (buildVersion >= 27187 || getSession())) {
       clearInterval(intervalId)
       start(current.uid, current.uin)
     }
@@ -431,7 +431,7 @@ function onLoad() {
 
 // 创建窗口时触发
 function onBrowserWindowCreated(window: BrowserWindow) {
-  if (getSelfUid()) {
+  if (window.id !== 2) {
     return
   }
   mainWindow = window

src/ntqqapi/api/file.ts

@@ -1,4 +1,5 @@
-import { callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod } from '../ntcall'
+import { invoke, NTClass, NTMethod } from '../ntcall'
+import { GeneralCallResult } from '../services'
 import {
   CacheFileList,
   CacheFileListItem,
@@ -16,7 +17,7 @@ import path from 'node:path'
 import fs from 'node:fs'
 import { ReceiveCmdS } from '../hook'
 import { log, TEMP_DIR } from '@/common/utils'
-import { rkeyManager } from '@/ntqqapi/api/rkey'
+import { rkeyManager } from '@/ntqqapi/helper/rkey'
 import { getSession } from '@/ntqqapi/wrapper'
 import { Peer } from '@/ntqqapi/types/msg'
 import { calculateFileMD5 } from '@/common/utils/file'
@@ -24,43 +25,23 @@ import { fileTypeFromFile } from 'file-type'
 import fsPromise from 'node:fs/promises'
 import { NTEventDispatch } from '@/common/utils/EventTask'
 import { OnRichMediaDownloadCompleteParams } from '@/ntqqapi/listeners'
-import { NodeIKernelSearchService } from '@/ntqqapi/services'
+import { Time } from 'cosmokit'
 
 export class NTQQFileApi {
-  static async getVideoUrl(peer: Peer, msgId: string, elementId: string): Promise<string> {
+  /** 27187 TODO */
+  static async getVideoUrl(peer: Peer, msgId: string, elementId: string) {
     const session = getSession()
     return (await session?.getRichMediaService().getVideoPlayUrlV2(peer,
       msgId,
       elementId,
       0,
-      { downSourceType: 1, triggerType: 1 }))?.urlResult?.domainUrl[0]?.url!
+      { downSourceType: 1, triggerType: 1 }))?.urlResult.domainUrl[0].url
   }
 
   static async getFileType(filePath: string) {
     return fileTypeFromFile(filePath)
   }
 
-  static async copyFile(filePath: string, destPath: string) {
-    return await callNTQQApi<string>({
-      className: NTQQApiClass.FS_API,
-      methodName: NTQQApiMethod.FILE_COPY,
-      args: [
-        {
-          fromPath: filePath,
-          toPath: destPath,
-        },
-      ],
-    })
-  }
-
-  static async getFileSize(filePath: string) {
-    return await callNTQQApi<number>({
-      className: NTQQApiClass.FS_API,
-      methodName: NTQQApiMethod.FILE_SIZE,
-      args: [filePath],
-    })
-  }
-
   // 上传文件到QQ的文件夹
   static async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC, elementSubType = 0) {
     const fileMd5 = await calculateFileMD5(filePath)
@@ -73,22 +54,43 @@ export class NTQQFileApi {
       fileName += ext
     }
     const session = getSession()
-    const mediaPath = session?.getMsgService().getRichMediaFilePathForGuild({
+    let mediaPath: string
-      md5HexStr: fileMd5,
+    if (session) {
-      fileName: fileName,
+      mediaPath = session?.getMsgService().getRichMediaFilePathForGuild({
-      elementType: elementType,
+        md5HexStr: fileMd5,
-      elementSubType,
+        fileName: fileName,
-      thumbSize: 0,
+        elementType: elementType,
-      needCreate: true,
+        elementSubType,
-      downloadType: 1,
+        thumbSize: 0,
-      file_uuid: ''
+        needCreate: true,
-    })
+        downloadType: 1,
-    await fsPromise.copyFile(filePath, mediaPath!)
+        file_uuid: ''
+      })
+    } else {
+      mediaPath = await invoke<string>({
+        methodName: NTMethod.MEDIA_FILE_PATH,
+        args: [
+          {
+            path_info: {
+              md5HexStr: fileMd5,
+              fileName: fileName,
+              elementType: elementType,
+              elementSubType,
+              thumbSize: 0,
+              needCreate: true,
+              downloadType: 1,
+              file_uuid: '',
+            },
+          },
+        ],
+      })
+    }
+    await fsPromise.copyFile(filePath, mediaPath)
     const fileSize = (await fsPromise.stat(filePath)).size
     return {
       md5: fileMd5,
       fileName,
-      path: mediaPath!,
+      path: mediaPath,
       fileSize,
       ext
     }
@@ -109,53 +111,79 @@ export class NTQQFileApi {
       if (force) {
         try {
           await fsPromise.unlink(sourcePath)
-        } catch (e) {
+        } catch { }
-          //
-        }
       } else {
         return sourcePath
       }
     }
-    const data = await NTEventDispatch.CallNormalEvent<
+    let filePath: string
-      (
+    if (NTEventDispatch.initialised) {
-        params: {
+      const data = await NTEventDispatch.CallNormalEvent<
-          fileModelId: string,
+        (
-          downloadSourceType: number,
+          params: {
-          triggerType: number,
+            fileModelId: string,
-          msgId: string,
+            downloadSourceType: number,
-          chatType: ChatType,
+            triggerType: number,
-          peerUid: string,
+            msgId: string,
-          elementId: string,
+            chatType: ChatType,
-          thumbSize: number,
+            peerUid: string,
-          downloadType: number,
+            elementId: string,
-          filePath: string
+            thumbSize: number,
-        }) => Promise<unknown>,
+            downloadType: number,
-      (fileTransNotifyInfo: OnRichMediaDownloadCompleteParams) => void
+            filePath: string
-    >(
+          }) => Promise<unknown>,
-      'NodeIKernelMsgService/downloadRichMedia',
+        (fileTransNotifyInfo: OnRichMediaDownloadCompleteParams) => void
-      'NodeIKernelMsgListener/onRichMediaDownloadComplete',
+      >(
-      1,
+        'NodeIKernelMsgService/downloadRichMedia',
-      timeout,
+        'NodeIKernelMsgListener/onRichMediaDownloadComplete',
-      (arg: OnRichMediaDownloadCompleteParams) => {
+        1,
-        if (arg.msgId === msgId) {
+        timeout,
-          return true
+        (arg: OnRichMediaDownloadCompleteParams) => {
+          if (arg.msgId === msgId) {
+            return true
+          }
+          return false
+        },
+        {
+          fileModelId: '0',
+          downloadSourceType: 0,
+          triggerType: 1,
+          msgId: msgId,
+          chatType: chatType,
+          peerUid: peerUid,
+          elementId: elementId,
+          thumbSize: 0,
+          downloadType: 1,
+          filePath: thumbPath
         }
-        return false
+      )
-      },
+      filePath = data[1].filePath
-      {
+    } else {
-        fileModelId: '0',
+      const data = await invoke<{ notifyInfo: OnRichMediaDownloadCompleteParams }>({
-        downloadSourceType: 0,
+        methodName: NTMethod.DOWNLOAD_MEDIA,
-        triggerType: 1,
+        args: [
-        msgId: msgId,
+          {
-        chatType: chatType,
+            getReq: {
-        peerUid: peerUid,
+              fileModelId: '0',
-        elementId: elementId,
+              downloadSourceType: 0,
-        thumbSize: 0,
+              triggerType: 1,
-        downloadType: 1,
+              msgId: msgId,
-        filePath: thumbPath
+              chatType: chatType,
-      }
+              peerUid: peerUid,
-    )
+              elementId: elementId,
-    let filePath = data[1].filePath
+              thumbSize: 0,
+              downloadType: 1,
+              filePath: thumbPath,
+            },
+          },
+          null,
+        ],
+        cbCmd: ReceiveCmdS.MEDIA_DOWNLOAD_COMPLETE,
+        cmdCB: payload => payload.notifyInfo.msgId === msgId,
+        timeout
+      })
+      filePath = data.notifyInfo.filePath
+    }
     if (filePath.startsWith('\\')) {
       const downloadPath = TEMP_DIR
       filePath = path.join(downloadPath, filePath)
@@ -165,9 +193,9 @@ export class NTQQFileApi {
   }
 
   static async getImageSize(filePath: string) {
-    return await callNTQQApi<{ width: number; height: number }>({
+    return await invoke<{ width: number; height: number }>({
-      className: NTQQApiClass.FS_API,
+      className: NTClass.FS_API,
-      methodName: NTQQApiMethod.IMAGE_SIZE,
+      methodName: NTMethod.IMAGE_SIZE,
       args: [filePath],
     })
   }
@@ -203,128 +231,12 @@ export class NTQQFileApi {
     log('图片url获取失败', element)
     return ''
   }
-
-  // forked from https://github.com/NapNeko/NapCatQQ/blob/6f6b258f22d7563f15d84e7172c4d4cbb547f47e/src/core/src/apis/file.ts#L149
-  static async addFileCache(peer: Peer, msgId: string, msgSeq: string, senderUid: string, elemId: string, elemType: string, fileSize: string, fileName: string) {
-    let GroupData: any[] | undefined
-    let BuddyData: any[] | undefined
-    if (peer.chatType === ChatType.group) {
-      GroupData =
-        [{
-          groupCode: peer.peerUid,
-          isConf: false,
-          hasModifyConfGroupFace: true,
-          hasModifyConfGroupName: true,
-          groupName: 'LLOneBot.Cached',
-          remark: 'LLOneBot.Cached',
-        }];
-    } else if (peer.chatType === ChatType.friend) {
-      BuddyData = [{
-        category_name: 'LLOneBot.Cached',
-        peerUid: peer.peerUid,
-        peerUin: peer.peerUid,
-        remark: 'LLOneBot.Cached',
-      }]
-    } else {
-      return undefined
-    }
-
-    const session = getSession()
-    return session?.getSearchService().addSearchHistory({
-      type: 4,
-      contactList: [],
-      id: -1,
-      groupInfos: [],
-      msgs: [],
-      fileInfos: [
-        {
-          chatType: peer.chatType,
-          buddyChatInfo: BuddyData || [],
-          discussChatInfo: [],
-          groupChatInfo: GroupData || [],
-          dataLineChatInfo: [],
-          tmpChatInfo: [],
-          msgId: msgId,
-          msgSeq: msgSeq,
-          msgTime: Math.floor(Date.now() / 1000).toString(),
-          senderUid: senderUid,
-          senderNick: 'LLOneBot.Cached',
-          senderRemark: 'LLOneBot.Cached',
-          senderCard: 'LLOneBot.Cached',
-          elemId: elemId,
-          elemType: elemType,
-          fileSize: fileSize,
-          filePath: '',
-          fileName: fileName,
-          hits: [{
-            start: 12,
-            end: 14,
-          }],
-        },
-      ],
-    })
-  }
-
-  static async searchfile(keys: string[]) {
-    type EventType = NodeIKernelSearchService['searchFileWithKeywords']
-
-    interface OnListener {
-      searchId: string,
-      hasMore: boolean,
-      resultItems: {
-        chatType: ChatType,
-        buddyChatInfo: any[],
-        discussChatInfo: any[],
-        groupChatInfo:
-        {
-          groupCode: string,
-          isConf: boolean,
-          hasModifyConfGroupFace: boolean,
-          hasModifyConfGroupName: boolean,
-          groupName: string,
-          remark: string
-        }[],
-        dataLineChatInfo: any[],
-        tmpChatInfo: any[],
-        msgId: string,
-        msgSeq: string,
-        msgTime: string,
-        senderUid: string,
-        senderNick: string,
-        senderRemark: string,
-        senderCard: string,
-        elemId: string,
-        elemType: number,
-        fileSize: string,
-        filePath: string,
-        fileName: string,
-        hits:
-        {
-          start: number,
-          end: number
-        }[]
-      }[]
-    }
-
-    const Event = NTEventDispatch.createEventFunction<EventType>('NodeIKernelSearchService/searchFileWithKeywords')
-    let id = ''
-    const Listener = NTEventDispatch.RegisterListen<(params: OnListener) => void>
-      (
-        'NodeIKernelSearchListener/onSearchFileKeywordsResult',
-        1,
-        20000,
-        (params) => id !== '' && params.searchId == id,
-      )
-    id = await Event!(keys, 12)
-    const [ret] = await Listener
-    return ret
-  }
 }
 
 export class NTQQFileCacheApi {
   static async setCacheSilentScan(isSilent: boolean = true) {
-    return await callNTQQApi<GeneralCallResult>({
+    return await invoke<GeneralCallResult>({
-      methodName: NTQQApiMethod.CACHE_SET_SILENCE,
+      methodName: NTMethod.CACHE_SET_SILENCE,
       args: [
         {
           isSilent,
@@ -335,21 +247,21 @@ export class NTQQFileCacheApi {
   }
 
   static getCacheSessionPathList() {
-    return callNTQQApi<
+    return invoke<
       {
         key: string
         value: string
       }[]
     >({
-      className: NTQQApiClass.OS_API,
+      className: NTClass.OS_API,
-      methodName: NTQQApiMethod.CACHE_PATH_SESSION,
+      methodName: NTMethod.CACHE_PATH_SESSION,
     })
   }
 
   static clearCache(cacheKeys: Array<string> = ['tmp', 'hotUpdate']) {
-    return callNTQQApi<any>({
+    return invoke<any>({
       // TODO: 目前还不知道真正的返回值是什么
-      methodName: NTQQApiMethod.CACHE_CLEAR,
+      methodName: NTMethod.CACHE_CLEAR,
       args: [
         {
           keys: cacheKeys,
@@ -360,8 +272,8 @@ export class NTQQFileCacheApi {
   }
 
   static addCacheScannedPaths(pathMap: object = {}) {
-    return callNTQQApi<GeneralCallResult>({
+    return invoke<GeneralCallResult>({
-      methodName: NTQQApiMethod.CACHE_ADD_SCANNED_PATH,
+      methodName: NTMethod.CACHE_ADD_SCANNED_PATH,
       args: [
         {
           pathMap: { ...pathMap },
@@ -372,35 +284,35 @@ export class NTQQFileCacheApi {
   }
 
   static scanCache() {
-    callNTQQApi<GeneralCallResult>({
+    invoke<GeneralCallResult>({
       methodName: ReceiveCmdS.CACHE_SCAN_FINISH,
       classNameIsRegister: true,
     }).then()
-    return callNTQQApi<CacheScanResult>({
+    return invoke<CacheScanResult>({
-      methodName: NTQQApiMethod.CACHE_SCAN,
+      methodName: NTMethod.CACHE_SCAN,
       args: [null, null],
-      timeoutSecond: 300,
+      timeout: 300 * Time.second,
     })
   }
 
   static getHotUpdateCachePath() {
-    return callNTQQApi<string>({
+    return invoke<string>({
-      className: NTQQApiClass.HOTUPDATE_API,
+      className: NTClass.HOTUPDATE_API,
-      methodName: NTQQApiMethod.CACHE_PATH_HOT_UPDATE,
+      methodName: NTMethod.CACHE_PATH_HOT_UPDATE,
     })
   }
 
   static getDesktopTmpPath() {
-    return callNTQQApi<string>({
+    return invoke<string>({
-      className: NTQQApiClass.BUSINESS_API,
+      className: NTClass.BUSINESS_API,
-      methodName: NTQQApiMethod.CACHE_PATH_DESKTOP_TEMP,
+      methodName: NTMethod.CACHE_PATH_DESKTOP_TEMP,
     })
   }
 
   static getChatCacheList(type: ChatType, pageSize: number = 1000, pageIndex: number = 0) {
     return new Promise<ChatCacheList>((res, rej) => {
-      callNTQQApi<ChatCacheList>({
+      invoke<ChatCacheList>({
-        methodName: NTQQApiMethod.CACHE_CHAT_GET,
+        methodName: NTMethod.CACHE_CHAT_GET,
         args: [
           {
             chatType: type,
@@ -419,8 +331,8 @@ export class NTQQFileCacheApi {
   static getFileCacheInfo(fileType: CacheFileType, pageSize: number = 1000, lastRecord?: CacheFileListItem) {
     const _lastRecord = lastRecord ? lastRecord : { fileType: fileType }
 
-    return callNTQQApi<CacheFileList>({
+    return invoke<CacheFileList>({
-      methodName: NTQQApiMethod.CACHE_FILE_GET,
+      methodName: NTMethod.CACHE_FILE_GET,
       args: [
         {
           fileType: fileType,
@@ -435,8 +347,8 @@ export class NTQQFileCacheApi {
   }
 
   static async clearChatCache(chats: ChatCacheListItemBasic[] = [], fileKeys: string[] = []) {
-    return await callNTQQApi<GeneralCallResult>({
+    return await invoke<GeneralCallResult>({
-      methodName: NTQQApiMethod.CACHE_CHAT_CLEAR,
+      methodName: NTMethod.CACHE_CHAT_CLEAR,
       args: [
         {
           chats,

src/ntqqapi/api/friend.ts

@@ -1,16 +1,16 @@
-import { Friend, FriendV2 } from '../types'
+import { Friend, FriendV2, SimpleInfo, CategoryFriend } from '../types'
 import { ReceiveCmdS } from '../hook'
-import { callNTQQApi, GeneralCallResult, NTQQApiMethod } from '../ntcall'
+import { invoke, NTMethod, NTClass } from '../ntcall'
 import { getSession } from '@/ntqqapi/wrapper'
 import { BuddyListReqType, NodeIKernelProfileService } from '../services'
 import { NTEventDispatch } from '@/common/utils/EventTask'
-import { CacheClassFuncAsyncExtend } from '@/common/utils/helper'
 import { LimitedHashTable } from '@/common/utils/table'
+import { pick } from 'cosmokit'
 
 export class NTQQFriendApi {
   /** 大于或等于 26702 应使用 getBuddyV2 */
   static async getFriends(forced = false) {
-    const data = await callNTQQApi<{
+    const data = await invoke<{
       data: {
         categoryId: number
         categroyName: string
@@ -18,12 +18,11 @@ export class NTQQFriendApi {
         buddyList: Friend[]
       }[]
     }>({
-      methodName: NTQQApiMethod.FRIENDS,
+      methodName: NTMethod.FRIENDS,
       args: [{ force_update: forced }, undefined],
       cbCmd: ReceiveCmdS.FRIENDS,
       afterFirstCmd: false,
     })
-    // log('获取好友列表', data)
     let _friends: Friend[] = []
     for (const fData of data.data) {
       _friends.push(...fData.buddyList)
@@ -31,23 +30,6 @@ export class NTQQFriendApi {
     return _friends
   }
 
-  static async likeFriend(uid: string, count = 1) {
-    return await callNTQQApi<GeneralCallResult>({
-      methodName: NTQQApiMethod.LIKE_FRIEND,
-      args: [
-        {
-          doLikeUserInfo: {
-            friendUid: uid,
-            sourceId: 71,
-            doLikeCount: count,
-            doLikeTollCount: 0,
-          },
-        },
-        null,
-      ],
-    })
-  }
-
   static async handleFriendRequest(flag: string, accept: boolean) {
     const data = flag.split('|')
     if (data.length < 2) {
@@ -56,71 +38,150 @@ export class NTQQFriendApi {
     const friendUid = data[0]
     const reqTime = data[1]
     const session = getSession()
-    return session?.getBuddyService().approvalFriendRequest({
+    if (session) {
-      friendUid,
+      return session.getBuddyService().approvalFriendRequest({
-      reqTime,
+        friendUid,
-      accept
+        reqTime,
-    })
+        accept
+      })
+    } else {
+      return await invoke({
+        methodName: NTMethod.HANDLE_FRIEND_REQUEST,
+        args: [
+          {
+            approvalInfo: {
+              friendUid,
+              reqTime,
+              accept,
+            },
+          },
+        ],
+      })
+    }
   }
 
   static async getBuddyV2(refresh = false): Promise<FriendV2[]> {
-    const uids: string[] = []
     const session = getSession()
-    const buddyService = session?.getBuddyService()
+    if (session) {
-    const buddyListV2 = refresh ? await buddyService?.getBuddyListV2('0', BuddyListReqType.KNOMAL) : await buddyService?.getBuddyListV2('0', BuddyListReqType.KNOMAL)
+      const uids: string[] = []
-    uids.push(...buddyListV2?.data.flatMap(item => item.buddyUids)!)
+      const buddyService = session.getBuddyService()
-    const data = await NTEventDispatch.CallNoListenerEvent<NodeIKernelProfileService['getCoreAndBaseInfo']>(
+      const buddyListV2 = await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)
-      'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids
+      uids.push(...buddyListV2.data.flatMap(item => item.buddyUids))
-    )
+      const data = await NTEventDispatch.CallNoListenerEvent<NodeIKernelProfileService['getCoreAndBaseInfo']>(
-    return Array.from(data.values())
+        'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids
-  }
+      )
-
+      return Array.from(data.values())
-  @CacheClassFuncAsyncExtend(3600 * 1000, 'getBuddyIdMap', () => true)
+    } else {
-  static async getBuddyIdMapCache(refresh = false): Promise<LimitedHashTable<string, string>> {
+      const data = await invoke<{
-    return await NTQQFriendApi.getBuddyIdMap(refresh)
+        buddyCategory: CategoryFriend[]
+        userSimpleInfos: Record<string, SimpleInfo>
+      }>({
+        className: NTClass.NODE_STORE_API,
+        methodName: 'getBuddyList',
+        args: [refresh],
+        cbCmd: ReceiveCmdS.FRIENDS,
+        afterFirstCmd: false,
+      })
+      const categoryUids: Map<number, string[]> = new Map()
+      for (const item of data.buddyCategory) {
+        categoryUids.set(item.categoryId, item.buddyUids)
+      }
+      return Object.values(data.userSimpleInfos).filter(v => v.baseInfo && categoryUids.get(v.baseInfo.categoryId)?.includes(v.uid!))
+    }
   }
 
   static async getBuddyIdMap(refresh = false): Promise<LimitedHashTable<string, string>> {
-    const uids: string[] = []
     const retMap: LimitedHashTable<string, string> = new LimitedHashTable<string, string>(5000)
     const session = getSession()
-    const buddyService = session?.getBuddyService()
+    if (session) {
-    const buddyListV2 = refresh ? await buddyService?.getBuddyListV2('0', BuddyListReqType.KNOMAL) : await buddyService?.getBuddyListV2('0', BuddyListReqType.KNOMAL)
+      const uids: string[] = []
-    uids.push(...buddyListV2?.data.flatMap(item => item.buddyUids)!)
+      const buddyService = session?.getBuddyService()
-    const data = await NTEventDispatch.CallNoListenerEvent<NodeIKernelProfileService['getCoreAndBaseInfo']>(
+      const buddyListV2 = await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)
-      'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids
+      uids.push(...buddyListV2.data.flatMap(item => item.buddyUids))
-    );
+      const data = await NTEventDispatch.CallNoListenerEvent<NodeIKernelProfileService['getCoreAndBaseInfo']>(
-    data.forEach((value, key) => {
+        'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids
-      retMap.set(value.uin!, value.uid!)
+      )
-    })
+      data.forEach((value, key) => {
-    //console.log('getBuddyIdMap', retMap.getValue)
+        retMap.set(value.uin!, value.uid!)
+      })
+    } else {
+      const data = await invoke<{
+        buddyCategory: CategoryFriend[]
+        userSimpleInfos: Record<string, SimpleInfo>
+      }>({
+        className: NTClass.NODE_STORE_API,
+        methodName: 'getBuddyList',
+        args: [refresh],
+        cbCmd: ReceiveCmdS.FRIENDS,
+        afterFirstCmd: false,
+      })
+      for (const item of Object.values(data.userSimpleInfos)) {
+        retMap.set(item.uin!, item.uid!)
+      }
+    }
     return retMap
   }
 
   static async getBuddyV2ExWithCate(refresh = false) {
-    const uids: string[] = []
-    const categoryMap: Map<string, any> = new Map()
     const session = getSession()
-    const buddyService = session?.getBuddyService()
+    if (session) {
-    const buddyListV2 = refresh ? (await buddyService?.getBuddyListV2('0', BuddyListReqType.KNOMAL))?.data : (await buddyService?.getBuddyListV2('0', BuddyListReqType.KNOMAL))?.data
+      const uids: string[] = []
-    uids.push(
+      const categoryMap: Map<string, any> = new Map()
-      ...buddyListV2?.flatMap(item => {
+      const buddyService = session.getBuddyService()
-        item.buddyUids.forEach(uid => {
+      const buddyListV2 = (await buddyService?.getBuddyListV2('0', BuddyListReqType.KNOMAL))?.data
-          categoryMap.set(uid, { categoryId: item.categoryId, categroyName: item.categroyName })
+      uids.push(
+        ...buddyListV2?.flatMap(item => {
+          item.buddyUids.forEach(uid => {
+            categoryMap.set(uid, { categoryId: item.categoryId, categroyName: item.categroyName })
+          })
+          return item.buddyUids
+        })!)
+      const data = await NTEventDispatch.CallNoListenerEvent<NodeIKernelProfileService['getCoreAndBaseInfo']>(
+        'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids
+      )
+      return Array.from(data).map(([key, value]) => {
+        const category = categoryMap.get(key)
+        return category ? { ...value, categoryId: category.categoryId, categroyName: category.categroyName } : value
+      })
+    } else {
+      const data = await invoke<{
+        buddyCategory: CategoryFriend[]
+        userSimpleInfos: Record<string, SimpleInfo>
+      }>({
+        className: NTClass.NODE_STORE_API,
+        methodName: 'getBuddyList',
+        args: [refresh],
+        cbCmd: ReceiveCmdS.FRIENDS,
+        afterFirstCmd: false,
+      })
+      const category: Map<number, Pick<CategoryFriend, 'buddyUids' | 'categroyName'>> = new Map()
+      for (const item of data.buddyCategory) {
+        category.set(item.categoryId, pick(item, ['buddyUids', 'categroyName']))
+      }
+      return Object.values(data.userSimpleInfos)
+        .filter(v => v.baseInfo && category.get(v.baseInfo.categoryId)?.buddyUids.includes(v.uid!))
+        .map(value => {
+          return {
+            ...value,
+            categoryId: value.baseInfo.categoryId,
+            categroyName: category.get(value.baseInfo.categoryId)?.categroyName
+          }
         })
-        return item.buddyUids
+    }
-      })!)
-    const data = await NTEventDispatch.CallNoListenerEvent<NodeIKernelProfileService['getCoreAndBaseInfo']>(
-      'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids
-    )
-    return Array.from(data).map(([key, value]) => {
-      const category = categoryMap.get(key)
-      return category ? { ...value, categoryId: category.categoryId, categroyName: category.categroyName } : value
-    })
   }
 
   static async isBuddy(uid: string): Promise<boolean> {
     const session = getSession()
-    return session?.getBuddyService().isBuddy(uid)!
+    if (session) {
+      return session.getBuddyService().isBuddy(uid)
+    } else {
+      return await invoke<boolean>({
+        methodName: 'nodeIKernelBuddyService/isBuddy',
+        args: [
+          { uid },
+          null,
+        ],
+      })
+    }
   }
 }

src/ntqqapi/api/group.ts

@@ -1,6 +1,7 @@
 import { ReceiveCmdS } from '../hook'
 import { Group, GroupMember, GroupMemberRole, GroupNotifies, GroupRequestOperateTypes, GroupNotify } from '../types'
-import { callNTQQApi, GeneralCallResult, NTQQApiMethod } from '../ntcall'
+import { invoke, NTClass, NTMethod } from '../ntcall'
+import { GeneralCallResult } from '../services'
 import { NTQQWindowApi, NTQQWindows } from './window'
 import { getSession } from '../wrapper'
 import { NTEventDispatch } from '@/common/utils/EventTask'
@@ -8,109 +9,72 @@ import { NodeIKernelGroupListener } from '../listeners'
 import { NodeIKernelGroupService } from '../services'
 
 export class NTQQGroupApi {
-  static async activateMemberListChange() {
-    return await callNTQQApi<GeneralCallResult>({
-      methodName: NTQQApiMethod.ACTIVATE_MEMBER_LIST_CHANGE,
-      classNameIsRegister: true,
-      args: [],
-    })
-  }
-
-  static async activateMemberInfoChange() {
-    return await callNTQQApi<GeneralCallResult>({
-      methodName: NTQQApiMethod.ACTIVATE_MEMBER_INFO_CHANGE,
-      classNameIsRegister: true,
-      args: [],
-    })
-  }
-
-  static async getGroupAllInfo(groupCode: string, source: number = 4) {
-    return await callNTQQApi<GeneralCallResult & Group>({
-      methodName: NTQQApiMethod.GET_GROUP_ALL_INFO,
-      args: [
-        {
-          groupCode,
-          source
-        },
-        null,
-      ],
-    })
-  }
-
   static async getGroups(forced = false): Promise<Group[]> {
-    type ListenerType = NodeIKernelGroupListener['onGroupListUpdate']
+    if (NTEventDispatch.initialised) {
-    const [, , groupList] = await NTEventDispatch.CallNormalEvent
+      type ListenerType = NodeIKernelGroupListener['onGroupListUpdate']
-      <(force: boolean) => Promise<any>, ListenerType>
+      const [, , groupList] = await NTEventDispatch.CallNormalEvent
-      (
+        <(force: boolean) => Promise<any>, ListenerType>
-        'NodeIKernelGroupService/getGroupList',
+        (
-        'NodeIKernelGroupListener/onGroupListUpdate',
+          'NodeIKernelGroupService/getGroupList',
-        1,
+          'NodeIKernelGroupListener/onGroupListUpdate',
-        5000,
+          1,
-        () => true,
+          5000,
-        forced
+          () => true,
-      )
+          forced
-    return groupList
+        )
-  }
+      return groupList
-
+    } else {
-  static async getGroupMemberV2(GroupCode: string, uid: string, forced = false) {
+      const result = await invoke<{
-    type ListenerType = NodeIKernelGroupListener['onMemberInfoChange']
+        updateType: number
-    type EventType = NodeIKernelGroupService['getMemberInfo']
+        groupList: Group[]
-    const [, , , _members] = await NTEventDispatch.CallNormalEvent<EventType, ListenerType>
+      }>({
-      (
+        className: NTClass.NODE_STORE_API,
-        'NodeIKernelGroupService/getMemberInfo',
+        methodName: 'getGroupList',
-        'NodeIKernelGroupListener/onMemberInfoChange',
+        cbCmd: ReceiveCmdS.GROUPS_STORE,
-        1,
+        afterFirstCmd: false,
-        5000,
+      })
-        (groupCode: string, changeType: number, members: Map<string, GroupMember>) => {
+      return result.groupList
-          return groupCode == GroupCode && members.has(uid)
+    }
-        },
-        GroupCode, [uid], forced,
-      )
-    return _members.get(uid)
   }
 
   static async getGroupMembers(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
     const session = getSession()
-    const groupService = session?.getGroupService()
+    let result: Awaited<ReturnType<NodeIKernelGroupService['getNextMemberList']>>
-    const sceneId = groupService?.createMemberListScene(groupQQ, 'groupMemberList_MainWindow')
+    if (session) {
-    const result = await groupService?.getNextMemberList(sceneId!, undefined, num)
+      const groupService = session.getGroupService()
-    if (result?.errCode !== 0) {
+      const sceneId = groupService.createMemberListScene(groupQQ, 'groupMemberList_MainWindow')
-      throw ('获取群成员列表出错,' + result?.errMsg)
+      result = await groupService.getNextMemberList(sceneId, undefined, num)
+    } else {
+      const sceneId = await invoke<string>({
+        methodName: NTMethod.GROUP_MEMBER_SCENE,
+        args: [
+          {
+            groupCode: groupQQ,
+            scene: 'groupMemberList_MainWindow',
+          },
+        ],
+      })
+      result = await invoke<
+        ReturnType<NodeIKernelGroupService['getNextMemberList']>
+      >({
+        methodName: NTMethod.GROUP_MEMBERS,
+        args: [
+          {
+            sceneId,
+            num,
+          },
+          null,
+        ],
+      })
+    }
+    if (result.errCode !== 0) {
+      throw ('获取群成员列表出错,' + result.errMsg)
     }
     return result.result.infos
   }
 
-  static async getGroupMembersInfo(groupCode: string, uids: string[], forceUpdate: boolean = false) {
-    return await callNTQQApi<GeneralCallResult>({
-      methodName: NTQQApiMethod.GROUP_MEMBERS_INFO,
-      args: [
-        {
-          forceUpdate,
-          groupCode,
-          uids
-        },
-        null,
-      ],
-    })
-  }
-
-  static async getGroupNotifies() {
-    // 获取管理员变更
-    // 加群通知，退出通知，需要管理员权限
-    callNTQQApi<GeneralCallResult>({
-      methodName: ReceiveCmdS.GROUP_NOTIFY,
-      classNameIsRegister: true,
-    }).then()
-    return await callNTQQApi<GroupNotifies>({
-      methodName: NTQQApiMethod.GET_GROUP_NOTICE,
-      cbCmd: ReceiveCmdS.GROUP_NOTIFY,
-      afterFirstCmd: false,
-      args: [{ doubt: false, startSeq: '', number: 14 }, null],
-    })
-  }
-
   static async getGroupIgnoreNotifies() {
-    await NTQQGroupApi.getGroupNotifies()
+    await NTQQGroupApi.getSingleScreenNotifies(14)
     return await NTQQWindowApi.openWindow<GeneralCallResult & GroupNotifies>(
       NTQQWindows.GroupNotifyFilterWindow,
       [],
@@ -119,57 +83,90 @@ export class NTQQGroupApi {
   }
 
   static async getSingleScreenNotifies(num: number) {
-    const [_retData, _doubt, _seq, notifies] = await NTEventDispatch.CallNormalEvent
+    if (NTEventDispatch.initialised) {
-      <(arg1: boolean, arg2: string, arg3: number) => Promise<any>, (doubt: boolean, seq: string, notifies: GroupNotify[]) => void>
+      const [_retData, _doubt, _seq, notifies] = await NTEventDispatch.CallNormalEvent
-      (
+        <(arg1: boolean, arg2: string, arg3: number) => Promise<any>, (doubt: boolean, seq: string, notifies: GroupNotify[]) => void>
-        'NodeIKernelGroupService/getSingleScreenNotifies',
+        (
-        'NodeIKernelGroupListener/onGroupSingleScreenNotifies',
+          'NodeIKernelGroupService/getSingleScreenNotifies',
-        1,
+          'NodeIKernelGroupListener/onGroupSingleScreenNotifies',
-        5000,
+          1,
-        () => true,
+          5000,
-        false,
+          () => true,
-        '',
+          false,
-        num,
+          '',
-      )
+          num,
-    return notifies
+        )
+      return notifies
+    } else {
+      invoke({
+        methodName: ReceiveCmdS.GROUP_NOTIFY,
+        classNameIsRegister: true,
+      })
+      return (await invoke<GroupNotifies>({
+        methodName: NTMethod.GET_GROUP_NOTICE,
+        cbCmd: ReceiveCmdS.GROUP_NOTIFY,
+        afterFirstCmd: false,
+        args: [{ doubt: false, startSeq: '', number: num }, null],
+      })).notifies
+    }
   }
 
+  /** 27187 TODO */
   static async delGroupFile(groupCode: string, files: string[]) {
     const session = getSession()
-    return session?.getRichMediaService().deleteGroupFile(groupCode, [102], files)!
+    return session?.getRichMediaService().deleteGroupFile(groupCode, [102], files)
   }
 
-  static DelGroupFile = NTQQGroupApi.delGroupFile
-
-  static async delGroupFileFolder(groupCode: string, folderId: string) {
-    const session = getSession()
-    return session?.getRichMediaService().deleteGroupFolder(groupCode, folderId)!
-  }
-
-  static DelGroupFileFolder = NTQQGroupApi.delGroupFileFolder
-
   static async handleGroupRequest(flag: string, operateType: GroupRequestOperateTypes, reason?: string) {
     const flagitem = flag.split('|')
     const groupCode = flagitem[0]
     const seq = flagitem[1]
     const type = parseInt(flagitem[2])
     const session = getSession()
-    return session?.getGroupService().operateSysNotify(
+    if (session) {
-      false,
+      return session.getGroupService().operateSysNotify(
-      {
+        false,
-        'operateType': operateType, // 2 拒绝
+        {
-        'targetMsg': {
+          'operateType': operateType, // 2 拒绝
-          'seq': seq,  // 通知序列号
+          'targetMsg': {
-          'type': type,
+            'seq': seq,  // 通知序列号
-          'groupCode': groupCode,
+            'type': type,
-          'postscript': reason || ' ' // 仅传空值可能导致处理失败，故默认给个空格
+            'groupCode': groupCode,
-        }
+            'postscript': reason || ' ' // 仅传空值可能导致处理失败，故默认给个空格
+          }
+        })
+    } else {
+      return await invoke({
+        methodName: NTMethod.HANDLE_GROUP_REQUEST,
+        args: [
+          {
+            doubt: false,
+            operateMsg: {
+              operateType,
+              targetMsg: {
+                seq,
+                type,
+                groupCode,
+                postscript: reason || ' ' // 仅传空值可能导致处理失败，故默认给个空格
+              },
+            },
+          },
+          null,
+        ],
       })
+    }
   }
 
   static async quitGroup(groupQQ: string) {
     const session = getSession()
-    return session?.getGroupService().quitGroup(groupQQ)
+    if (session) {
+      return session.getGroupService().quitGroup(groupQQ)
+    } else {
+      return await invoke({
+        methodName: NTMethod.QUIT_GROUP,
+        args: [{ groupCode: groupQQ }, null],
+      })
+    }
   }
 
   static async kickMember(
@@ -179,37 +176,117 @@ export class NTQQGroupApi {
     kickReason = '',
   ) {
     const session = getSession()
-    return session?.getGroupService().kickMember(groupQQ, kickUids, refuseForever, kickReason)
+    if (session) {
+      return session.getGroupService().kickMember(groupQQ, kickUids, refuseForever, kickReason)
+    } else {
+      return await invoke({
+        methodName: NTMethod.KICK_MEMBER,
+        args: [
+          {
+            groupCode: groupQQ,
+            kickUids,
+            refuseForever,
+            kickReason,
+          },
+        ],
+      })
+    }
   }
 
   static async banMember(groupQQ: string, memList: Array<{ uid: string, timeStamp: number }>) {
     // timeStamp为秒数, 0为解除禁言
     const session = getSession()
-    return session?.getGroupService().setMemberShutUp(groupQQ, memList)
+    if (session) {
+      return session.getGroupService().setMemberShutUp(groupQQ, memList)
+    } else {
+      return await invoke({
+        methodName: NTMethod.MUTE_MEMBER,
+        args: [
+          {
+            groupCode: groupQQ,
+            memList,
+          },
+        ],
+      })
+    }
   }
 
   static async banGroup(groupQQ: string, shutUp: boolean) {
     const session = getSession()
-    return session?.getGroupService().setGroupShutUp(groupQQ, shutUp)
+    if (session) {
+      return session.getGroupService().setGroupShutUp(groupQQ, shutUp)
+    } else {
+      return await invoke({
+        methodName: NTMethod.MUTE_GROUP,
+        args: [
+          {
+            groupCode: groupQQ,
+            shutUp,
+          },
+          null,
+        ],
+      })
+    }
   }
 
   static async setMemberCard(groupQQ: string, memberUid: string, cardName: string) {
     const session = getSession()
-    return session?.getGroupService().modifyMemberCardName(groupQQ, memberUid, cardName)
+    if (session) {
+      return session.getGroupService().modifyMemberCardName(groupQQ, memberUid, cardName)
+    } else {
+      return await invoke({
+        methodName: NTMethod.SET_MEMBER_CARD,
+        args: [
+          {
+            groupCode: groupQQ,
+            uid: memberUid,
+            cardName,
+          },
+          null,
+        ],
+      })
+    }
   }
 
   static async setMemberRole(groupQQ: string, memberUid: string, role: GroupMemberRole) {
     const session = getSession()
-    return session?.getGroupService().modifyMemberRole(groupQQ, memberUid, role)
+    if (session) {
+      return session.getGroupService().modifyMemberRole(groupQQ, memberUid, role)
+    } else {
+      return await invoke({
+        methodName: NTMethod.SET_MEMBER_ROLE,
+        args: [
+          {
+            groupCode: groupQQ,
+            uid: memberUid,
+            role,
+          },
+          null,
+        ],
+      })
+    }
   }
 
   static async setGroupName(groupQQ: string, groupName: string) {
     const session = getSession()
-    return session?.getGroupService().modifyGroupName(groupQQ, groupName, false)
+    if (session) {
+      return session.getGroupService().modifyGroupName(groupQQ, groupName, false)
+    } else {
+      return await invoke({
+        methodName: NTMethod.SET_GROUP_NAME,
+        args: [
+          {
+            groupCode: groupQQ,
+            groupName,
+          },
+          null,
+        ],
+      })
+    }
   }
 
   static async getGroupAtAllRemainCount(groupCode: string) {
-    return await callNTQQApi<
+    return await invoke<
       GeneralCallResult & {
         atInfo: {
           canAtAll: boolean
@@ -220,7 +297,7 @@ export class NTQQGroupApi {
         }
       }
     >({
-      methodName: NTQQApiMethod.GROUP_AT_ALL_REMAIN_COUNT,
+      methodName: NTMethod.GROUP_AT_ALL_REMAIN_COUNT,
       args: [
         {
           groupCode,
@@ -230,17 +307,7 @@ export class NTQQGroupApi {
     })
   }
 
-  static async getGroupRemainAtTimes(GroupCode: string) {
+  /** 27187 TODO */
-    const session = getSession()
-    return session?.getGroupService().getGroupRemainAtTimes(GroupCode)!
-  }
-
-  // 头衔不可用
-  static async setGroupTitle(groupQQ: string, uid: string, title: string) {
-  }
-
-  static publishGroupBulletin(groupQQ: string, title: string, content: string) { }
-
   static async removeGroupEssence(GroupCode: string, msgId: string) {
     const session = getSession()
     // 代码没测过
@@ -255,6 +322,7 @@ export class NTQQGroupApi {
     return session?.getGroupService().removeGroupEssence(param)
   }
 
+  /** 27187 TODO */
   static async addGroupEssence(GroupCode: string, msgId: string) {
     const session = getSession()
     // 代码没测过

src/ntqqapi/api/msg.ts

@@ -1,36 +1,37 @@
-import { callNTQQApi, GeneralCallResult, NTQQApiMethod } from '../ntcall'
+import { invoke, NTMethod } from '../ntcall'
+import { GeneralCallResult, TmpChatInfoApi } from '../services'
 import { RawMessage, SendMessageElement, Peer, ChatType2 } from '../types'
 import { getSelfNick, getSelfUid } from '../../common/data'
-import { getBuildVersion } from '../../common/utils'
 import { getSession } from '@/ntqqapi/wrapper'
 import { NTEventDispatch } from '@/common/utils/EventTask'
 
+function generateMsgId() {
+  const timestamp = Math.floor(Date.now() / 1000)
+  const random = Math.floor(Math.random() * Math.pow(2, 32))
+  const buffer = Buffer.alloc(8)
+  buffer.writeUInt32BE(timestamp, 0)
+  buffer.writeUInt32BE(random, 4)
+  const msgId = BigInt('0x' + buffer.toString('hex')).toString()
+  return msgId
+}
+
 export class NTQQMsgApi {
   static async getTempChatInfo(chatType: ChatType2, peerUid: string) {
     const session = getSession()
-    return session?.getMsgService().getTempChatInfo(chatType, peerUid)!
+    if (session) {
-  }
+      return session.getMsgService().getTempChatInfo(chatType, peerUid)
-
+    } else {
-  static async prepareTempChat(toUserUid: string, GroupCode: string, nickname: string) {
+      return await invoke<TmpChatInfoApi>({
-    //By Jadx/Ida Mlikiowa
+        methodName: 'nodeIKernelMsgService/getTempChatInfo',
-    let TempGameSession = {
+        args: [
-      nickname: '',
+          {
-      gameAppId: '',
+            chatType,
-      selfTinyId: '',
+            peerUid,
-      peerRoleId: '',
+          },
-      peerOpenId: '',
+          null,
+        ],
+      })
     }
-    const session = getSession()
-    return session?.getMsgService().prepareTempChat({
-      chatType: ChatType2.KCHATTYPETEMPC2CFROMGROUP,
-      peerUid: toUserUid,
-      peerNickname: nickname,
-      fromGroupCode: GroupCode,
-      sig: '',
-      selfPhone: '',
-      selfUid: getSelfUid(),
-      gameSession: TempGameSession
-    })
   }
 
   static async setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, set: boolean = true) {
@@ -39,28 +40,54 @@ export class NTQQMsgApi {
     // 其实以官方文档为准是最好的，https://bot.q.qq.com/wiki/develop/api-v2/openapi/emoji/model.html#EmojiType
     emojiId = emojiId.toString()
     const session = getSession()
-    return session?.getMsgService().setMsgEmojiLikes(peer, msgSeq, emojiId, emojiId.length > 3 ? '2' : '1', set)
+    if (session) {
+      return session.getMsgService().setMsgEmojiLikes(peer, msgSeq, emojiId, emojiId.length > 3 ? '2' : '1', set)
+    } else {
+      return await invoke({
+        methodName: NTMethod.EMOJI_LIKE,
+        args: [
+          {
+            peer,
+            msgSeq,
+            emojiId,
+            emojiType: emojiId.length > 3 ? '2' : '1',
+            setEmoji: set,
+          },
+          null,
+        ],
+      })
+    }
   }
 
   static async getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string) {
     const session = getSession()
-    return session?.getMsgService().getMultiMsg(peer, rootMsgId, parentMsgId)!
+    if (session) {
+      return session.getMsgService().getMultiMsg(peer, rootMsgId, parentMsgId)
+    } else {
+      return await invoke<GeneralCallResult & { msgList: RawMessage[] }>({
+        methodName: NTMethod.GET_MULTI_MSG,
+        args: [
+          {
+            peer,
+            rootMsgId,
+            parentMsgId,
+          },
+          null,
+        ],
+      })
+    }
   }
 
   static async activateChat(peer: Peer) {
-    // await this.fetchRecentContact();
+    return await invoke<GeneralCallResult>({
-    // await sleep(500);
+      methodName: NTMethod.ACTIVE_CHAT_PREVIEW,
-    return await callNTQQApi<GeneralCallResult>({
-      methodName: NTQQApiMethod.ACTIVE_CHAT_PREVIEW,
       args: [{ peer, cnt: 20 }, null],
     })
   }
 
   static async activateChatAndGetHistory(peer: Peer) {
-    // await this.fetchRecentContact();
+    return await invoke<GeneralCallResult>({
-    // await sleep(500);
+      methodName: NTMethod.ACTIVE_CHAT_HISTORY,
-    return await callNTQQApi<GeneralCallResult>({
-      methodName: NTQQApiMethod.ACTIVE_CHAT_HISTORY,
       // 参数似乎不是这样
       args: [{ peer, cnt: 20 }, null],
     })
@@ -70,68 +97,120 @@ export class NTQQMsgApi {
     if (!peer) throw new Error('peer is not allowed')
     if (!msgIds) throw new Error('msgIds is not allowed')
     const session = getSession()
-    //Mlikiowa： 参数不合规会导致NC异常崩溃 原因是TX未对进入参数判断 对应Android标记@NotNull AndroidJADX分析可得
+    if (session) {
-    return await session?.getMsgService().getMsgsByMsgId(peer, msgIds)!
+      return session.getMsgService().getMsgsByMsgId(peer, msgIds)
+    } else {
+      return await invoke<GeneralCallResult & {
+        msgList: RawMessage[]
+      }>({
+        methodName: 'nodeIKernelMsgService/getMsgsByMsgId',
+        args: [
+          {
+            peer,
+            msgIds,
+          },
+          null,
+        ],
+      })
+    }
   }
 
   static async getMsgHistory(peer: Peer, msgId: string, count: number, isReverseOrder: boolean = false) {
     const session = getSession()
     // 消息时间从旧到新
-    return session?.getMsgService().getMsgsIncludeSelf(peer, msgId, count, isReverseOrder)!
+    if (session) {
+      return session.getMsgService().getMsgsIncludeSelf(peer, msgId, count, isReverseOrder)
+    } else {
+      return await invoke<GeneralCallResult & { msgList: RawMessage[] }>({
+        methodName: NTMethod.HISTORY_MSG,
+        args: [
+          {
+            peer,
+            msgId,
+            cnt: count,
+            queryOrder: isReverseOrder,
+          },
+          null,
+        ],
+      })
+    }
   }
 
   static async recallMsg(peer: Peer, msgIds: string[]) {
     const session = getSession()
-    return await session?.getMsgService().recallMsg({
+    if (session) {
-      chatType: peer.chatType,
+      return session.getMsgService().recallMsg({
-      peerUid: peer.peerUid
+        chatType: peer.chatType,
-    }, msgIds)
+        peerUid: peer.peerUid
+      }, msgIds)
+    } else {
+      return await invoke({
+        methodName: NTMethod.RECALL_MSG,
+        args: [
+          {
+            peer,
+            msgIds,
+          },
+          null,
+        ],
+      })
+    }
   }
 
   static async sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
-    function generateMsgId() {
+    const msgId = generateMsgId()
-      const timestamp = Math.floor(Date.now() / 1000)
-      const random = Math.floor(Math.random() * Math.pow(2, 32))
-      const buffer = Buffer.alloc(8)
-      buffer.writeUInt32BE(timestamp, 0)
-      buffer.writeUInt32BE(random, 4)
-      const msgId = BigInt("0x" + buffer.toString('hex')).toString()
-      return msgId
-    }
-    // 此处有采用Hack方法 利用数据返回正确得到对应消息
-    // 与之前 Peer队列 MsgSeq队列 真正的MsgId并发不同
-    // 谨慎采用 目前测试暂无问题  Developer.Mlikiowa
-    let msgId: string
-    try {
-      msgId = await NTQQMsgApi.getMsgUnique(peer.chatType, await NTQQMsgApi.getServerTime())
-    } catch (error) {
-      //if (!napCatCore.session.getMsgService()['generateMsgUniqueId'])
-      //兜底识别策略V2
-      msgId = generateMsgId()
-    }
     peer.guildId = msgId
-    const data = await NTEventDispatch.CallNormalEvent<
+    let msgList: RawMessage[]
-      (msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<any, any>) => Promise<unknown>,
+    if (NTEventDispatch.initialised) {
-      (msgList: RawMessage[]) => void
+      const data = await NTEventDispatch.CallNormalEvent<
-    >(
+        (msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<any, any>) => Promise<unknown>,
-      'NodeIKernelMsgService/sendMsg',
+        (msgList: RawMessage[]) => void
-      'NodeIKernelMsgListener/onMsgInfoListUpdate',
+      >(
-      1,
+        'NodeIKernelMsgService/sendMsg',
-      timeout,
+        'NodeIKernelMsgListener/onMsgInfoListUpdate',
-      (msgRecords: RawMessage[]) => {
+        1,
-        for (let msgRecord of msgRecords) {
+        timeout,
-          if (msgRecord.guildId === msgId && msgRecord.sendStatus === 2) {
+        (msgRecords: RawMessage[]) => {
-            return true
+          for (const msgRecord of msgRecords) {
+            if (msgRecord.guildId === msgId && msgRecord.sendStatus === 2) {
+              return true
+            }
           }
-        }
+          return false
-        return false
+        },
-      },
+        '0',
-      '0',
+        peer,
-      peer,
+        msgElements,
-      msgElements,
+        new Map()
-      new Map()
+      )
-    )
+      msgList = data[1]
-    const retMsg = data[1].find(msgRecord => {
+    } else {
+      const data = await invoke<{ msgList: RawMessage[] }>({
+        methodName: 'nodeIKernelMsgService/sendMsg',
+        cbCmd: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
+        afterFirstCmd: false,
+        cmdCB: payload => {
+          for (const msgRecord of payload.msgList) {
+            if (msgRecord.guildId === msgId && msgRecord.sendStatus === 2) {
+              return true
+            }
+          }
+          return false
+        },
+        args: [
+          {
+            msgId: '0',
+            peer,
+            msgElements,
+            msgAttributeInfos: new Map()
+          },
+          null
+        ],
+        timeout
+      })
+      msgList = data.msgList
+    }
+    const retMsg = msgList.find(msgRecord => {
       if (msgRecord.guildId === msgId) {
         return true
       }
@@ -139,72 +218,25 @@ export class NTQQMsgApi {
     return retMsg!
   }
 
-  static async sendMsgV2(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
-    function generateMsgId() {
-      const timestamp = Math.floor(Date.now() / 1000)
-      const random = Math.floor(Math.random() * Math.pow(2, 32))
-      const buffer = Buffer.alloc(8)
-      buffer.writeUInt32BE(timestamp, 0)
-      buffer.writeUInt32BE(random, 4)
-      const msgId = BigInt('0x' + buffer.toString('hex')).toString()
-      return msgId
-    }
-    // 此处有采用Hack方法 利用数据返回正确得到对应消息
-    // 与之前 Peer队列 MsgSeq队列 真正的MsgId并发不同
-    // 谨慎采用 目前测试暂无问题  Developer.Mlikiowa
-    let msgId: string
-    try {
-      msgId = await NTQQMsgApi.getMsgUnique(peer.chatType, await NTQQMsgApi.getServerTime())
-    } catch (error) {
-      //if (!napCatCore.session.getMsgService()['generateMsgUniqueId'])
-      //兜底识别策略V2
-      msgId = generateMsgId().toString()
-    }
-    let data = await NTEventDispatch.CallNormalEvent<
-      (msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<any, any>) => Promise<unknown>,
-      (msgList: RawMessage[]) => void
-    >(
-      'NodeIKernelMsgService/sendMsg',
-      'NodeIKernelMsgListener/onMsgInfoListUpdate',
-      1,
-      timeout,
-      (msgRecords: RawMessage[]) => {
-        for (let msgRecord of msgRecords) {
-          if (msgRecord.msgId === msgId && msgRecord.sendStatus === 2) {
-            return true
-          }
-        }
-        return false
-      },
-      msgId,
-      peer,
-      msgElements,
-      new Map()
-    )
-    const retMsg = data[1].find(msgRecord => {
-      if (msgRecord.msgId === msgId) {
-        return true
-      }
-    })
-    return retMsg!
-  }
-
-  static async getMsgUnique(chatType: number, time: string) {
-    const session = getSession()
-    if (getBuildVersion() >= 26702) {
-      return session?.getMsgService().generateMsgUniqueId(chatType, time)!
-    }
-    return session?.getMsgService().getMsgUniqueId(time)!
-  }
-
-  static async getServerTime() {
-    const session = getSession()
-    return session?.getMSFService().getServerTime()!
-  }
-
   static async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
     const session = getSession()
-    return session?.getMsgService().forwardMsg(msgIds, srcPeer, [destPeer], [])!
+    if (session) {
+      return session.getMsgService().forwardMsg(msgIds, srcPeer, [destPeer], [])
+    } else {
+      return await invoke<GeneralCallResult>({
+        methodName: NTMethod.FORWARD_MSG,
+        args: [
+          {
+            msgIds: msgIds,
+            srcContact: srcPeer,
+            dstContacts: [destPeer],
+            commentElements: [],
+            msgAttributeInfos: new Map(),
+          },
+          null,
+        ],
+      })
+    }
   }
 
   static async multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]): Promise<RawMessage> {
@@ -213,29 +245,58 @@ export class NTQQMsgApi {
       return { msgId: id, senderShowName }
     })
     const selfUid = getSelfUid()
-    let data = await NTEventDispatch.CallNormalEvent<
+    let msgList: RawMessage[]
-      (msgInfo: typeof msgInfos, srcPeer: Peer, destPeer: Peer, comment: Array<any>, attr: Map<any, any>,) => Promise<unknown>,
+    if (NTEventDispatch.initialised) {
-      (msgList: RawMessage[]) => void
+      const data = await NTEventDispatch.CallNormalEvent<
-    >(
+        (msgInfo: typeof msgInfos, srcPeer: Peer, destPeer: Peer, comment: Array<any>, attr: Map<any, any>,) => Promise<unknown>,
-      'NodeIKernelMsgService/multiForwardMsgWithComment',
+        (msgList: RawMessage[]) => void
-      'NodeIKernelMsgListener/onMsgInfoListUpdate',
+      >(
-      1,
+        'NodeIKernelMsgService/multiForwardMsgWithComment',
-      5000,
+        'NodeIKernelMsgListener/onMsgInfoListUpdate',
-      (msgRecords: RawMessage[]) => {
+        1,
-        for (let msgRecord of msgRecords) {
+        5000,
-          if (msgRecord.peerUid == destPeer.peerUid && msgRecord.senderUid == selfUid) {
+        (msgRecords: RawMessage[]) => {
-            return true
+          for (let msgRecord of msgRecords) {
+            if (msgRecord.peerUid == destPeer.peerUid && msgRecord.senderUid == selfUid) {
+              return true
+            }
           }
-        }
+          return false
-        return false
+        },
-      },
+        msgInfos,
-      msgInfos,
+        srcPeer,
-      srcPeer,
+        destPeer,
-      destPeer,
+        [],
-      [],
+        new Map()
-      new Map()
+      )
-    )
+      msgList = data[1]
-    for (let msg of data[1]) {
+    } else {
+      const data = await invoke<{ msgList: RawMessage[] }>({
+        methodName: 'nodeIKernelMsgService/multiForwardMsgWithComment',
+        cbCmd: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
+        afterFirstCmd: false,
+        cmdCB: payload => {
+          for (const msgRecord of payload.msgList) {
+            if (msgRecord.peerUid == destPeer.peerUid && msgRecord.senderUid == selfUid) {
+              return true
+            }
+          }
+          return false
+        },
+        args: [
+          {
+            msgInfos,
+            srcContact: srcPeer,
+            dstContact: destPeer,
+            commentElements: [],
+            msgAttributeInfos: new Map(),
+          },
+          null,
+        ],
+      })
+      msgList = data.msgList
+    }
+    for (const msg of msgList) {
       const arkElement = msg.elements.find(ele => ele.arkElement)
       if (!arkElement) {
         continue
@@ -251,26 +312,29 @@ export class NTQQMsgApi {
     throw new Error('转发消息超时')
   }
 
-  static async queryMsgsWithFilterExWithSeq(peer: Peer, msgSeq: string) {
-    const session = getSession()
-    const ret = await session?.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
-      chatInfo: peer,//此处为Peer 为关键查询参数 没有啥也没有 by mlik iowa
-      filterMsgType: [],
-      filterSendersUid: [],
-      filterMsgToTime: '0',
-      filterMsgFromTime: '0',
-      isReverseOrder: false,
-      isIncludeCurrent: true,
-      pageLimit: 1,
-    })
-    return ret!
-  }
-
   static async getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, z: boolean) {
     const session = getSession()
-    return await session?.getMsgService().getMsgsBySeqAndCount(peer, seq, count, desc, z)!
+    if (session) {
+      return await session.getMsgService().getMsgsBySeqAndCount(peer, seq, count, desc, z)
+    } else {
+      return await invoke<GeneralCallResult & {
+        msgList: RawMessage[]
+      }>({
+        methodName: 'nodeIKernelMsgService/getMsgsBySeqAndCount',
+        args: [
+          {
+            peer,
+            cnt: count,
+            msgSeq: seq,
+            queryOrder: desc
+          },
+          null,
+        ],
+      })
+    }
   }
 
+  /** 27187 TODO */
   static async getLastestMsgByUids(peer: Peer, count = 20, isReverseOrder = false) {
     const session = getSession()
     const ret = await session?.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
@@ -283,11 +347,26 @@ export class NTQQMsgApi {
       isIncludeCurrent: true,
       pageLimit: count,
     })
-    return ret!
+    return ret
   }
 
   static async getSingleMsg(peer: Peer, seq: string) {
     const session = getSession()
-    return await session?.getMsgService().getSingleMsg(peer, seq)!
+    if (session) {
+      return await session.getMsgService().getSingleMsg(peer, seq)
+    } else {
+      return await invoke<GeneralCallResult & {
+        msgList: RawMessage[]
+      }>({
+        methodName: 'nodeIKernelMsgService/getSingleMsg',
+        args: [
+          {
+            peer,
+            msgSeq: seq,
+          },
+          null,
+        ],
+      })
+    }
   }
 }

src/ntqqapi/api/user.ts

@@ -1,124 +1,119 @@
-import { callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod } from '../ntcall'
+import { invoke, NTMethod } from '../ntcall'
-import { SelfInfo, User, UserDetailInfoByUin, UserDetailInfoByUinV2 } from '../types'
+import { GeneralCallResult } from '../services'
-import { ReceiveCmdS } from '../hook'
+import { User, UserDetailInfoByUin, UserDetailInfoByUinV2, UserDetailInfoListenerArg } from '../types'
 import { friends, groupMembers, getSelfUin } from '@/common/data'
-import { CacheClassFuncAsync, log, getBuildVersion } from '@/common/utils'
+import { CacheClassFuncAsync, getBuildVersion } from '@/common/utils'
 import { getSession } from '@/ntqqapi/wrapper'
 import { RequestUtil } from '@/common/utils/request'
-import { NodeIKernelProfileService, UserDetailSource, ProfileBizType } from '../services'
+import { NodeIKernelProfileService, UserDetailSource, ProfileBizType, forceFetchClientKeyRetType } from '../services'
 import { NodeIKernelProfileListener } from '../listeners'
 import { NTEventDispatch } from '@/common/utils/EventTask'
 import { NTQQFriendApi } from './friend'
+import { Time } from 'cosmokit'
 
 export class NTQQUserApi {
   static async setQQAvatar(filePath: string) {
-    return await callNTQQApi<GeneralCallResult>({
+    return await invoke<GeneralCallResult>({
-      methodName: NTQQApiMethod.SET_QQ_AVATAR,
+      methodName: NTMethod.SET_QQ_AVATAR,
       args: [
         {
           path: filePath,
         },
         null,
       ],
-      timeoutSecond: 10, // 10秒不一定够
+      timeout: 10 * Time.second, // 10秒不一定够
     })
   }
 
-  static async getSelfInfo() {
-    return await callNTQQApi<SelfInfo>({
-      className: NTQQApiClass.GLOBAL_DATA,
-      methodName: NTQQApiMethod.SELF_INFO,
-      timeoutSecond: 2,
-    })
-  }
-
-  static async getUserInfo(uid: string) {
-    const result = await callNTQQApi<{ profiles: Map<string, User> }>({
-      methodName: NTQQApiMethod.USER_INFO,
-      args: [{ force: true, uids: [uid] }, undefined],
-      cbCmd: ReceiveCmdS.USER_INFO,
-    })
-    return result.profiles.get(uid)
-  }
-
-  /** 26702 */
   static async fetchUserDetailInfo(uid: string) {
-    type EventService = NodeIKernelProfileService['fetchUserDetailInfo']
+    let info: UserDetailInfoListenerArg
-    type EventListener = NodeIKernelProfileListener['onUserDetailInfoChanged']
+    if (NTEventDispatch.initialised) {
-    const [_retData, profile] = await NTEventDispatch.CallNormalEvent
+      type EventService = NodeIKernelProfileService['fetchUserDetailInfo']
-      <EventService, EventListener>
+      type EventListener = NodeIKernelProfileListener['onUserDetailInfoChanged']
-      (
+      const [_retData, profile] = await NTEventDispatch.CallNormalEvent
-        'NodeIKernelProfileService/fetchUserDetailInfo',
+        <EventService, EventListener>
-        'NodeIKernelProfileListener/onUserDetailInfoChanged',
+        (
-        1,
+          'NodeIKernelProfileService/fetchUserDetailInfo',
-        5000,
+          'NodeIKernelProfileListener/onUserDetailInfoChanged',
-        (profile) => profile.uid === uid,
+          1,
-        'BuddyProfileStore',
+          5000,
-        [uid],
+          (profile) => profile.uid === uid,
-        UserDetailSource.KSERVER,
+          'BuddyProfileStore',
-        [ProfileBizType.KALL]
+          [uid],
-      )
+          UserDetailSource.KSERVER,
-    const RetUser: User = {
+          [ProfileBizType.KALL]
-      ...profile.simpleInfo.coreInfo,
+        )
-      ...profile.simpleInfo.status,
+      info = profile
-      ...profile.simpleInfo.vasInfo,
+    } else {
-      ...profile.commonExt,
+      const result = await invoke<{ info: UserDetailInfoListenerArg }>({
-      ...profile.simpleInfo.baseInfo,
+        methodName: 'nodeIKernelProfileService/fetchUserDetailInfo',
-      qqLevel: profile.commonExt.qqLevel,
+        cbCmd: 'nodeIKernelProfileListener/onUserDetailInfoChanged',
+        afterFirstCmd: false,
+        cmdCB: payload => payload.info.uid === uid,
+        args: [
+          {
+            callFrom: 'BuddyProfileStore',
+            uid: [uid],
+            source: UserDetailSource.KSERVER,
+            bizList: [ProfileBizType.KALL]
+          },
+          null
+        ],
+      })
+      info = result.info
+    }
+    const ret: User = {
+      ...info.simpleInfo.coreInfo,
+      ...info.simpleInfo.status,
+      ...info.simpleInfo.vasInfo,
+      ...info.commonExt,
+      ...info.simpleInfo.baseInfo,
+      qqLevel: info.commonExt?.qqLevel,
       pendantId: ''
     }
-    return RetUser
+    return ret
   }
 
   static async getUserDetailInfo(uid: string, getLevel = false, withBizInfo = true) {
     if (getBuildVersion() >= 26702) {
       return NTQQUserApi.fetchUserDetailInfo(uid)
     }
-    type EventService = NodeIKernelProfileService['getUserDetailInfoWithBizInfo']
+    if (NTEventDispatch.initialised) {
-    type EventListener = NodeIKernelProfileListener['onProfileDetailInfoChanged']
+      type EventService = NodeIKernelProfileService['getUserDetailInfoWithBizInfo']
-    const [_retData, profile] = await NTEventDispatch.CallNormalEvent
+      type EventListener = NodeIKernelProfileListener['onProfileDetailInfoChanged']
-      <EventService, EventListener>
+      const [_retData, profile] = await NTEventDispatch.CallNormalEvent
-      (
+        <EventService, EventListener>
-        'NodeIKernelProfileService/getUserDetailInfoWithBizInfo',
+        (
-        'NodeIKernelProfileListener/onProfileDetailInfoChanged',
+          'NodeIKernelProfileService/getUserDetailInfoWithBizInfo',
-        2,
+          'NodeIKernelProfileListener/onProfileDetailInfoChanged',
-        5000,
+          2,
-        (profile) => profile.uid === uid,
+          5000,
-        uid,
+          (profile) => profile.uid === uid,
-        [0]
+          uid,
-      )
+          [0]
-    return profile
+        )
-  }
+      return profile
-
+    } else {
-  // return 'p_uin=o0xxx; p_skey=orXDssiGF8axxxxxxxxxxxxxx_; skey='
+      const result = await invoke<{ info: User }>({
-  static async getCookieWithoutSkey() {
+        methodName: 'nodeIKernelProfileService/getUserDetailInfoWithBizInfo',
-    return await callNTQQApi<string>({
+        cbCmd: 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
-      className: NTQQApiClass.GROUP_HOME_WORK,
+        afterFirstCmd: false,
-      methodName: NTQQApiMethod.UPDATE_SKEY,
+        cmdCB: (payload) => payload.info.uid === uid,
-      args: [
+        args: [
-        {
+          {
-          domain: 'qun.qq.com',
+            uid,
-        },
+            bizList: [0]
-      ],
+          },
-    })
+          null,
-  }
+        ],
-
+      })
-  static async getQzoneCookies() {
+      return result.info
-    const uin = getSelfUin()
-    const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + uin + '&clientkey=' + (await NTQQUserApi.getClientKey()).clientKey + '&u1=https%3A%2F%2Fuser.qzone.qq.com%2F' + uin + '%2Finfocenter&keyindex=19%27'
-    let cookies: { [key: string]: string } = {}
-    try {
-      cookies = await RequestUtil.HttpsGetCookies(requestUrl)
-    } catch (e: any) {
-      log('获取QZone Cookies失败', e)
-      cookies = {}
     }
-    return cookies
   }
-  
+
   static async getSkey(): Promise<string> {
-    const clientKeyData = await NTQQUserApi.getClientKey()
+    const clientKeyData = await NTQQUserApi.forceFetchClientKey()
-    if (clientKeyData.result !== 0) {
+    if (clientKeyData?.result !== 0) {
       throw new Error('获取clientKey失败')
     }
     const url = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + getSelfUin()
@@ -129,9 +124,12 @@ export class NTQQUserApi {
 
   @CacheClassFuncAsync(1800 * 1000)
   static async getCookies(domain: string) {
-    const ClientKeyData = await NTQQUserApi.forceFetchClientKey()
+    const clientKeyData = await NTQQUserApi.forceFetchClientKey()
+    if (clientKeyData?.result !== 0) {
+      throw new Error('获取clientKey失败')
+    }
     const uin = getSelfUin()
-    const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + uin + '&clientkey=' + ClientKeyData.clientKey + '&u1=https%3A%2F%2F' + domain + '%2F' + uin + '%2Finfocenter&keyindex=19%27'
+    const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + uin + '&clientkey=' + clientKeyData.clientKey + '&u1=https%3A%2F%2F' + domain + '%2F' + uin + '%2Finfocenter&keyindex=19%27'
     const cookies: { [key: string]: string; } = await RequestUtil.HttpsGetCookies(requestUrl)
     return cookies
   }
@@ -148,28 +146,31 @@ export class NTQQUserApi {
     return (hash & 0x7fffffff).toString()
   }
 
-  static async getPSkey(domains: string[]): Promise<Map<string, string>> {
+  static async like(uid: string, count = 1) {
     const session = getSession()
-    const res = await session?.getTipOffService().getPskey(domains, true)
+    if (session) {
-    if (res?.result !== 0) {
+      return session.getProfileLikeService().setBuddyProfileLike({
-      throw new Error(`获取Pskey失败: ${res?.errMsg}`)
+        friendUid: uid,
+        sourceId: 71,
+        doLikeCount: count,
+        doLikeTollCount: 0
+      })
+    } else {
+      return await invoke<GeneralCallResult & { succCounts: number }>({
+        methodName: 'nodeIKernelProfileLikeService/setBuddyProfileLike',
+        args: [
+          {
+            doLikeUserInfo: {
+              friendUid: uid,
+              sourceId: 71,
+              doLikeCount: count,
+              doLikeTollCount: 0
+            }
+          },
+          null,
+        ],
+      })
     }
-    return res.domainPskeyMap
-  }
-
-  static async getClientKey() {
-    const session = getSession()
-    return await session?.getTicketService().forceFetchClientKey('')!
-  }
-
-  static async like(uid: string, count = 1): Promise<{ result: number, errMsg: string, succCounts: number }> {
-    const session = getSession()
-    return session?.getProfileLikeService().setBuddyProfileLike({
-      friendUid: uid,
-      sourceId: 71,
-      doLikeCount: count,
-      doLikeTollCount: 0
-    })!
   }
 
   static async getUidByUinV1(Uin: string) {
@@ -203,23 +204,46 @@ export class NTQQUserApi {
     return uid
   }
 
-  static async getUidByUinV2(Uin: string) {
+  static async getUidByUinV2(uin: string) {
     const session = getSession()
-    let uid = (await session?.getProfileService().getUidByUin('FriendsServiceImpl', [Uin]))?.get(Uin)
+    if (session) {
-    if (uid) return uid
+      let uid = (await session.getGroupService().getUidByUins([uin])).uids.get(uin)
-    uid = (await session?.getGroupService().getUidByUins([Uin]))?.uids.get(Uin)
+      if (uid) return uid
-    if (uid) return uid
+      uid = (await session.getProfileService().getUidByUin('FriendsServiceImpl', [uin])).get(uin)
-    uid = (await session?.getUixConvertService().getUid([Uin]))?.uidInfo.get(Uin)
+      if (uid) return uid
-    if (uid) return uid
+      uid = (await session.getUixConvertService().getUid([uin])).uidInfo.get(uin)
-    console.log((await NTQQFriendApi.getBuddyIdMapCache(true)))
+      if (uid) return uid
-    uid = (await NTQQFriendApi.getBuddyIdMapCache(true)).getValue(Uin)//从Buddy缓存获取Uid
+    } else {
-    if (uid) return uid
+      let uid = (await invoke<{ uids: Map<string, string> }>({
-    uid = (await NTQQFriendApi.getBuddyIdMap(true)).getValue(Uin)
+        methodName: 'nodeIKernelGroupService/getUidByUins',
-    if (uid) return uid
+        args: [
-    let unveifyUid = (await NTQQUserApi.getUserDetailInfoByUinV2(Uin)).detail.uid//从QQ Native 特殊转换
+          { uin: [uin] },
-    if (unveifyUid.indexOf('*') == -1) uid = unveifyUid
+          null,
-    //if (uid) return uid
+        ],
-    return uid
+      })).uids.get(uin)
+      if (uid) return uid
+      uid = (await invoke<Map<string, string>>({
+        methodName: 'nodeIKernelProfileService/getUidByUin',
+        args: [
+          {
+            callFrom: 'FriendsServiceImpl',
+            uin: [uin],
+          },
+          null,
+        ],
+      })).get(uin)
+      if (uid) return uid
+      uid = (await invoke<{ uidInfo: Map<string, string> }>({
+        methodName: 'nodeIKernelUixConvertService/getUid',
+        args: [
+          { uin: [uin] },
+          null,
+        ],
+      })).uidInfo.get(uin)
+      if (uid) return uid
+    }
+    const unveifyUid = (await NTQQUserApi.getUserDetailInfoByUinV2(uin)).detail.uid //从QQ Native 特殊转换
+    if (unveifyUid.indexOf('*') == -1) return unveifyUid
   }
 
   static async getUidByUin(Uin: string) {
@@ -229,14 +253,25 @@ export class NTQQUserApi {
     return await NTQQUserApi.getUidByUinV1(Uin)
   }
 
-  static async getUserDetailInfoByUinV2(Uin: string) {
+  static async getUserDetailInfoByUinV2(uin: string) {
-    return await NTEventDispatch.CallNoListenerEvent
+    if (NTEventDispatch.initialised) {
-      <(Uin: string) => Promise<UserDetailInfoByUinV2>>(
+      return await NTEventDispatch.CallNoListenerEvent
-        'NodeIKernelProfileService/getUserDetailInfoByUin',
+        <(Uin: string) => Promise<UserDetailInfoByUinV2>>(
-        5000,
+          'NodeIKernelProfileService/getUserDetailInfoByUin',
-        Uin
+          5000,
-      )
+          uin
+        )
+    } else {
+      return await invoke<UserDetailInfoByUinV2>({
+        methodName: 'nodeIKernelProfileService/getUserDetailInfoByUin',
+        args: [
+          { uin },
+          null,
+        ],
+      })
+    }
   }
+
   static async getUserDetailInfoByUin(Uin: string) {
     return NTEventDispatch.CallNoListenerEvent
       <(Uin: string) => Promise<UserDetailInfoByUin>>(
@@ -268,32 +303,68 @@ export class NTQQUserApi {
     return uin
   }
 
-  static async getUinByUidV2(Uid: string) {
+  static async getUinByUidV2(uid: string) {
     const session = getSession()
-    let uin = (await session?.getProfileService().getUinByUid('FriendsServiceImpl', [Uid]))?.get(Uid)
+    if (session) {
+      let uin = (await session.getGroupService().getUinByUids([uid])).uins.get(uid)
+      if (uin) return uin
+      uin = (await session.getProfileService().getUinByUid('FriendsServiceImpl', [uid])).get(uid)
+      if (uin) return uin
+      uin = (await session.getUixConvertService().getUin([uid])).uinInfo.get(uid)
+      if (uin) return uin
+      return uin
+    } else {
+      let uin = (await invoke<{ uins: Map<string, string> }>({
+        methodName: 'nodeIKernelGroupService/getUinByUids',
+        args: [
+          { uid: [uid] },
+          null,
+        ],
+      })).uins.get(uid)
+      if (uin) return uin
+      uin = (await invoke<Map<string, string>>({
+        methodName: 'nodeIKernelProfileService/getUinByUid',
+        args: [
+          {
+            callFrom: 'FriendsServiceImpl',
+            uid: [uid],
+          },
+          null,
+        ],
+      })).get(uid)
+      if (uin) return uin
+      uin = (await invoke<{ uinInfo: Map<string, string> }>({
+        methodName: 'nodeIKernelUixConvertService/getUin',
+        args: [
+          { uid: [uid] },
+          null,
+        ],
+      })).uinInfo.get(uid)
+      if (uin) return uin
+    }
+    let uin = (await NTQQFriendApi.getBuddyIdMap(true)).getKey(uid)
     if (uin) return uin
-    uin = (await session?.getGroupService().getUinByUids([Uid]))?.uins.get(Uid)
+    uin = (await NTQQUserApi.getUserDetailInfo(uid)).uin //从QQ Native 转换
-    if (uin) return uin
-    uin = (await session?.getUixConvertService().getUin([Uid]))?.uinInfo.get(Uid)
-    if (uin) return uin
-    uin = (await NTQQFriendApi.getBuddyIdMapCache(true)).getKey(Uid) //从Buddy缓存获取Uin
-    if (uin) return uin
-    uin = (await NTQQFriendApi.getBuddyIdMap(true)).getKey(Uid)
-    if (uin) return uin
-    uin = (await NTQQUserApi.getUserDetailInfo(Uid)).uin //从QQ Native 转换
-    return uin
   }
 
   static async getUinByUid(Uid: string) {
     if (getBuildVersion() >= 26702) {
-      return await NTQQUserApi.getUinByUidV2(Uid)
+      return (await NTQQUserApi.getUinByUidV2(Uid))!
     }
     return await NTQQUserApi.getUinByUidV1(Uid)
   }
 
-  @CacheClassFuncAsync(3600 * 1000, 'ClientKey')
   static async forceFetchClientKey() {
     const session = getSession()
-    return await session?.getTicketService().forceFetchClientKey('')!
+    if (session) {
+      return await session.getTicketService().forceFetchClientKey('')
+    } else {
+      return await invoke<forceFetchClientKeyRetType>({
+        methodName: 'nodeIKernelTicketService/forceFetchClientKey',
+        args: [{
+          domain: ''
+        }, null],
+      })
+    }
   }
 }

src/ntqqapi/api/webapi.ts

@@ -2,7 +2,6 @@ import { getSelfUin } from '@/common/data'
 import { log } from '@/common/utils/log'
 import { NTQQUserApi } from './user'
 import { RequestUtil } from '@/common/utils/request'
-import { CacheClassFuncAsync } from '@/common/utils/helper'
 
 export enum WebHonorType {
   ALL = 'all',
@@ -179,64 +178,6 @@ export class WebApi {
     return memberData
   }
 
-  // public static async addGroupDigest(groupCode: string, msgSeq: string) {
-  //   const url = `https://qun.qq.com/cgi-bin/group_digest/cancel_digest?random=665&X-CROSS-ORIGIN=fetch&group_code=${groupCode}&msg_seq=${msgSeq}&msg_random=444021292`;
-  //   const res = await this.request(url);
-  //   return await res.json();
-  // }
-
-  // public async getGroupDigest(groupCode: string) {
-  //   const url = `https://qun.qq.com/cgi-bin/group_digest/digest_list?random=665&X-CROSS-ORIGIN=fetch&group_code=${groupCode}&page_start=0&page_limit=20`;
-  //   const res = await this.request(url);
-  //   return await res.json();
-  // }
-
-  static async setGroupNotice(GroupCode: string, Content: string = '') {
-    //https://web.qun.qq.com/cgi-bin/announce/add_qun_notice?bkn=${bkn}
-    //qid=${群号}&bkn=${bkn}&text=${内容}&pinned=0&type=1&settings={"is_show_edit_card":1,"tip_window_type":1,"confirm_required":1}
-    const _Pskey = (await NTQQUserApi.getPSkey(['qun.qq.com']))['qun.qq.com']
-    const _Skey = await NTQQUserApi.getSkey()
-    const CookieValue = 'p_skey=' + _Pskey + '; skey=' + _Skey + '; p_uin=o' + getSelfUin()
-    let ret: any = undefined
-    //console.log(CookieValue)
-    if (!_Skey || !_Pskey) {
-      //获取Cookies失败
-      return undefined
-    }
-    const Bkn = WebApi.genBkn(_Skey)
-    const data = 'qid=' + GroupCode + '&bkn=' + Bkn + '&text=' + Content + '&pinned=0&type=1&settings={"is_show_edit_card":1,"tip_window_type":1,"confirm_required":1}'
-    const url = 'https://web.qun.qq.com/cgi-bin/announce/add_qun_notice?bkn=' + Bkn
-    try {
-      ret = await RequestUtil.HttpGetJson<any>(url, 'GET', '', { 'Cookie': CookieValue })
-      return ret
-    } catch (e) {
-      return undefined
-    }
-  }
-
-  static async getGrouptNotice(GroupCode: string): Promise<undefined | WebApiGroupNoticeRet> {
-    const _Pskey = (await NTQQUserApi.getPSkey(['qun.qq.com']))['qun.qq.com']
-    const _Skey = await NTQQUserApi.getSkey()
-    const CookieValue = 'p_skey=' + _Pskey + '; skey=' + _Skey + '; p_uin=o' + getSelfUin()
-    let ret: WebApiGroupNoticeRet | undefined = undefined
-    //console.log(CookieValue)
-    if (!_Skey || !_Pskey) {
-      //获取Cookies失败
-      return undefined
-    }
-    const Bkn = WebApi.genBkn(_Skey)
-    const url = 'https://web.qun.qq.com/cgi-bin/announce/get_t_list?bkn=' + Bkn + '&qid=' + GroupCode + '&ft=23&ni=1&n=1&i=1&log_read=1&platform=1&s=-1&n=20'
-    try {
-      ret = await RequestUtil.HttpGetJson<WebApiGroupNoticeRet>(url, 'GET', '', { 'Cookie': CookieValue })
-      if (ret?.ec !== 0) {
-        return undefined
-      }
-      return ret
-    } catch (e) {
-      return undefined
-    }
-  }
-
   static genBkn(sKey: string) {
     sKey = sKey || '';
     let hash = 5381;
@@ -256,7 +197,7 @@ export class WebApi {
       let res = '';
       let resJson;
       try {
-        res = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': CookieValue });
+        res = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': cookieStr });
         const match = res.match(/window\.__INITIAL_STATE__=(.*?);/);
         if (match) {
           resJson = JSON.parse(match[1].trim());
@@ -273,7 +214,8 @@ export class WebApi {
     }
 
     let HonorInfo: any = { group_id: groupCode };
-    const CookieValue = (await NTQQUserApi.getCookies('qun.qq.com')).cookies;
+    const cookieObject = await NTQQUserApi.getCookies('qun.qq.com')
+    const cookieStr = Object.entries(cookieObject).map(([key, value]) => `${key}=${value}`).join('; ')
 
     if (getType === WebHonorType.TALKACTIVE || getType === WebHonorType.ALL) {
       try {

src/ntqqapi/api/window.ts

@@ -1,4 +1,5 @@
-import { callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod } from '../ntcall'
+import { invoke, NTClass, NTMethod } from '../ntcall'
+import { GeneralCallResult } from '../services'
 import { ReceiveCmd } from '../hook'
 import { BrowserWindow } from 'electron'
 
@@ -27,12 +28,12 @@ export class NTQQWindowApi {
   static async openWindow<R = GeneralCallResult>(
     ntQQWindow: NTQQWindow,
     args: any[],
-    cbCmd: ReceiveCmd | null = null,
+    cbCmd: ReceiveCmd | undefined,
     autoCloseSeconds: number = 2,
   ) {
-    const result = await callNTQQApi<R>({
+    const result = await invoke<R>({
-      className: NTQQApiClass.WINDOW_API,
+      className: NTClass.WINDOW_API,
-      methodName: NTQQApiMethod.OPEN_EXTRA_WINDOW,
+      methodName: NTMethod.OPEN_EXTRA_WINDOW,
       cbCmd,
       afterFirstCmd: false,
       args: [ntQQWindow.windowName, ...args],

src/ntqqapi/constructor.ts

@@ -21,7 +21,7 @@ import { log } from '../common/utils/log'
 import { defaultVideoThumb, getVideoInfo } from '../common/utils/video'
 import { encodeSilk } from '../common/utils/audio'
 import { isNull } from '../common/utils'
-import faceConfig from './face_config.json'
+import faceConfig from './helper/face_config.json'
 
 export const mFaceCache = new Map<string, string>() // emojiId -> faceName
 

src/ntqqapi/helper/rkey.ts

@@ -1,5 +1,3 @@
-//远端rkey获取
-
 import { log } from '@/common/utils'
 
 interface ServerRkeyData {

src/ntqqapi/hook.ts

@@ -1,5 +1,5 @@
 import type { BrowserWindow } from 'electron'
-import { NTQQApiClass, NTQQApiMethod } from './ntcall'
+import { NTClass, NTMethod } from './ntcall'
 import { NTQQMsgApi } from './api/msg'
 import {
   CategoryFriend,
@@ -16,7 +16,7 @@ import {
   setSelfInfo
 } from '@/common/data'
 import { postOb11Event } from '../onebot11/server/post-ob11-event'
-import { getConfigUtil, HOOK_LOG } from '@/common/config'
+import { getConfigUtil } from '@/common/config'
 import fs from 'node:fs'
 import { log } from '@/common/utils'
 import { randomUUID } from 'node:crypto'
@@ -49,83 +49,74 @@ export let ReceiveCmdS = {
   CACHE_SCAN_FINISH: 'nodeIKernelStorageCleanListener/onFinishScan',
   MEDIA_UPLOAD_COMPLETE: 'nodeIKernelMsgListener/onRichMediaUploadComplete',
   SKEY_UPDATE: 'onSkeyUpdate',
-}
+} as const
 
-export type ReceiveCmd = (typeof ReceiveCmdS)[keyof typeof ReceiveCmdS]
+export type ReceiveCmd = string
 
-interface NTQQApiReturnData<PayloadType = unknown> extends Array<any> {
+interface NTQQApiReturnData<Payload = unknown> extends Array<any> {
   0: {
     type: 'request'
-    eventName: NTQQApiClass
+    eventName: NTClass
     callbackId?: string
   }
   1: {
     cmdName: ReceiveCmd
     cmdType: 'event'
-    payload: PayloadType
+    payload: Payload
   }[]
 }
 
-let receiveHooks: Array<{
+const logHook = false
+
+const receiveHooks: Array<{
   method: ReceiveCmd[]
   hookFunc: (payload: any) => void | Promise<void>
   id: string
 }> = []
 
-let callHooks: Array<{
+const callHooks: Array<{
-  method: NTQQApiMethod[]
+  method: NTMethod[]
   hookFunc: (callParams: unknown[]) => void | Promise<void>
 }> = []
 
 export function hookNTQQApiReceive(window: BrowserWindow) {
   const originalSend = window.webContents.send
   const patchSend = (channel: string, ...args: NTQQApiReturnData) => {
-    // console.log("hookNTQQApiReceive", channel, args)
-    let isLogger = false
     try {
-      isLogger = args[0]?.eventName?.startsWith('ns-LoggerApi')
+      const isLogger = args[0]?.eventName?.startsWith('ns-LoggerApi')
-    } catch (e) { }
+      if (logHook && !isLogger) {
-    if (!isLogger) {
+        log(`received ntqq api message: ${channel}`, args)
-      try {
-        HOOK_LOG && log(`received ntqq api message: ${channel}`, args)
-      } catch (e) {
-        log('hook log error', e, args)
       }
-    }
+    } catch { }
-    try {
+    if (args?.[1] instanceof Array) {
-      if (args?.[1] instanceof Array) {
+      for (const receiveData of args?.[1]) {
-        for (let receiveData of args?.[1]) {
+        const ntQQApiMethodName = receiveData.cmdName
-          const ntQQApiMethodName = receiveData.cmdName
+        // log(`received ntqq api message: ${channel} ${ntQQApiMethodName}`, JSON.stringify(receiveData))
-          // log(`received ntqq api message: ${channel} ${ntQQApiMethodName}`, JSON.stringify(receiveData))
+        for (const hook of receiveHooks) {
-          for (let hook of receiveHooks) {
+          if (hook.method.includes(ntQQApiMethodName)) {
-            if (hook.method.includes(ntQQApiMethodName)) {
+            new Promise((resolve, reject) => {
-              new Promise((resolve, reject) => {
+              try {
-                try {
+                hook.hookFunc(receiveData.payload)
-                  let _ = hook.hookFunc(receiveData.payload)
+              } catch (e: any) {
-                  if (hook.hookFunc.constructor.name === 'AsyncFunction') {
+                log('hook error', ntQQApiMethodName, e.stack.toString())
-                    ; (_ as Promise<void>).then()
+              }
-                  }
+              resolve(undefined)
-                } catch (e: any) {
+            }).then()
-                  log('hook error', ntQQApiMethodName, e.stack.toString())
-                }
-              }).then()
-            }
           }
         }
       }
-      if (args[0]?.callbackId) {
+    }
-        // log("hookApiCallback", hookApiCallbacks, args)
+    if (args[0]?.callbackId) {
-        const callbackId = args[0].callbackId
+      // log("hookApiCallback", hookApiCallbacks, args)
-        if (hookApiCallbacks[callbackId]) {
+      const callbackId = args[0].callbackId
-          // log("callback found")
+      if (hookApiCallbacks[callbackId]) {
-          new Promise((resolve, reject) => {
+        // log("callback found")
-            hookApiCallbacks[callbackId](args[1])
+        new Promise((resolve, reject) => {
-          }).then()
+          hookApiCallbacks[callbackId](args[1])
-          delete hookApiCallbacks[callbackId]
+          resolve(undefined)
-        }
+        }).then()
+        delete hookApiCallbacks[callbackId]
       }
-    } catch (e: any) {
-      log('hookNTQQApiReceive error', e.stack.toString(), args)
     }
     originalSend.call(window.webContents, channel, ...args)
   }
@@ -146,23 +137,21 @@ export function hookNTQQApiCall(window: BrowserWindow) {
       } catch (e) { }
       if (!isLogger) {
         try {
-          HOOK_LOG && log('call NTQQ api', thisArg, args)
+          logHook && log('call NTQQ api', thisArg, args)
         } catch (e) { }
         try {
           const _args: unknown[] = args[3][1]
-          const cmdName: NTQQApiMethod = _args[0] as NTQQApiMethod
+          const cmdName: NTMethod = _args[0] as NTMethod
           const callParams = _args.slice(1)
           callHooks.forEach((hook) => {
             if (hook.method.includes(cmdName)) {
               new Promise((resolve, reject) => {
                 try {
-                  let _ = hook.hookFunc(callParams)
+                  hook.hookFunc(callParams)
-                  if (hook.hookFunc.constructor.name === 'AsyncFunction') {
+                } catch (e: any) {
-                    (_ as Promise<void>).then()
-                  }
-                } catch (e) {
                   log('hook call error', e, _args)
                 }
+                resolve(undefined)
               }).then()
             }
           })
@@ -181,16 +170,16 @@ export function hookNTQQApiCall(window: BrowserWindow) {
   const proxyIpcInvoke = new Proxy(ipc_invoke_proxy, {
     apply(target, thisArg, args) {
       // console.log(args);
-      HOOK_LOG && log('call NTQQ invoke api', thisArg, args)
+      //HOOK_LOG && log('call NTQQ invoke api', thisArg, args)
       args[0]['_replyChannel']['sendReply'] = new Proxy(args[0]['_replyChannel']['sendReply'], {
         apply(sendtarget, sendthisArg, sendargs) {
           sendtarget.apply(sendthisArg, sendargs)
         },
       })
       let ret = target.apply(thisArg, args)
-      try {
+      /*try {
         HOOK_LOG && log('call NTQQ invoke api return', ret)
-      } catch (e) { }
+      } catch (e) { }*/
       return ret
     },
   })
@@ -218,7 +207,7 @@ export function registerReceiveHook<PayloadType>(
 }
 
 export function registerCallHook(
-  method: NTQQApiMethod | NTQQApiMethod[],
+  method: NTMethod | NTMethod[],
   hookFunc: (callParams: unknown[]) => void | Promise<void>,
 ): void {
   if (!Array.isArray(method)) {
@@ -395,7 +384,7 @@ export async function startHook() {
   }>(ReceiveCmdS.FRIENDS, (payload) => {
     // log("onBuddyListChange", payload)
     // let friendListV2: {userSimpleInfos: Map<string, SimpleInfo>} = []
-    type V2data = {userSimpleInfos: Map<string, SimpleInfo>}
+    type V2data = { userSimpleInfos: Map<string, SimpleInfo> }
     let friendList: User[] = [];
     if ((payload as any).userSimpleInfos) {
       // friendListV2 = payload as any
@@ -405,12 +394,12 @@ export async function startHook() {
         }
       })
     }
-    else{
+    else {
       for (const fData of payload.data) {
         friendList.push(...fData.buddyList)
       }
     }
-    log('好友列表变动', friendList)
+    log('好友列表变动', friendList.length)
     for (let friend of friendList) {
       NTQQMsgApi.activateChat({ peerUid: friend.uid, chatType: ChatType.friend }).then()
       let existFriend = friends.find((f) => f.uin == friend.uin)
@@ -510,7 +499,7 @@ export async function startHook() {
     }
   })
 
-  registerCallHook(NTQQApiMethod.DELETE_ACTIVE_CHAT, async (payload) => {
+  registerCallHook(NTMethod.DELETE_ACTIVE_CHAT, async (payload) => {
     const peerUid = payload[0] as string
     log('激活的聊天窗口被删除，准备重新激活', peerUid)
     let chatType = ChatType.friend

src/ntqqapi/ntcall.ts

@@ -1,10 +1,10 @@
 import { ipcMain } from 'electron'
-import { hookApiCallbacks, ReceiveCmd, ReceiveCmdS, registerReceiveHook, removeReceiveHook } from './hook'
+import { hookApiCallbacks, registerReceiveHook, removeReceiveHook } from './hook'
 import { log } from '../common/utils/log'
-import { HOOK_LOG } from '../common/config'
 import { randomUUID } from 'node:crypto'
+import { GeneralCallResult } from './services'
 
-export enum NTQQApiClass {
+export enum NTClass {
   NT_API = 'ns-ntApi',
   FS_API = 'ns-FsApi',
   OS_API = 'ns-OsApi',
@@ -15,10 +15,10 @@ export enum NTQQApiClass {
   SKEY_API = 'ns-SkeyApi',
   GROUP_HOME_WORK = 'ns-GroupHomeWork',
   GROUP_ESSENCE = 'ns-GroupEssence',
+  NODE_STORE_API = 'ns-NodeStoreApi'
 }
 
-export enum NTQQApiMethod {
+export enum NTMethod {
-  TEST = 'NodeIKernelTipOffService/getPskey',
   RECENT_CONTACT = 'nodeIKernelRecentContactService/fetchAndSubscribeABatchOfRecentContact',
   ACTIVE_CHAT_PREVIEW = 'nodeIKernelMsgService/getAioFirstViewLatestMsgsAndAddActiveChat', // 激活聊天窗口，有时候必须这样才能收到消息, 并返回最新预览消息
   ACTIVE_CHAT_HISTORY = 'nodeIKernelMsgService/getMsgsIncludeSelfAndAddActiveChat', // 激活聊天窗口，有时候必须这样才能收到消息, 并返回历史消息
@@ -57,7 +57,6 @@ export enum NTQQApiMethod {
   HANDLE_GROUP_REQUEST = 'nodeIKernelGroupService/operateSysNotify',
   QUIT_GROUP = 'nodeIKernelGroupService/quitGroup',
   GROUP_AT_ALL_REMAIN_COUNT = 'nodeIKernelGroupService/getGroupRemainAtTimes',
-  // READ_FRIEND_REQUEST = "nodeIKernelBuddyListener/onDoubtBuddyReqUnreadNumChange"
   HANDLE_FRIEND_REQUEST = 'nodeIKernelBuddyService/approvalFriendRequest',
   KICK_MEMBER = 'nodeIKernelGroupService/kickMember',
   MUTE_MEMBER = 'nodeIKernelGroupService/setMemberShutUp',
@@ -87,59 +86,41 @@ export enum NTQQApiMethod {
   OPEN_EXTRA_WINDOW = 'openExternalWindow',
 
   SET_QQ_AVATAR = 'nodeIKernelProfileService/setHeader',
-  GET_PSKEY = 'nodeIKernelTipOffService/getPskey',
-  UPDATE_SKEY = 'updatePskey',
-
-  FETCH_UNITED_COMMEND_CONFIG = 'nodeIKernelUnitedConfigService/fetchUnitedCommendConfig', // 发包需要调用的
 }
 
-enum NTQQApiChannel {
+export enum NTChannel {
   IPC_UP_2 = 'IPC_UP_2',
   IPC_UP_3 = 'IPC_UP_3',
   IPC_UP_1 = 'IPC_UP_1',
 }
 
-interface NTQQApiParams {
+interface InvokeParams<ReturnType> {
-  methodName: NTQQApiMethod | string
+  methodName: string
-  className?: NTQQApiClass
+  className?: NTClass
-  channel?: NTQQApiChannel
+  channel?: NTChannel
   classNameIsRegister?: boolean
   args?: unknown[]
-  cbCmd?: ReceiveCmd | ReceiveCmd[] | null
+  cbCmd?: string | string[]
-  cmdCB?: (payload: any) => boolean
+  cmdCB?: (payload: ReturnType) => boolean
   afterFirstCmd?: boolean // 是否在methodName调用完之后再去hook cbCmd
-  timeoutSecond?: number
+  timeout?: number
 }
 
-export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
+export function invoke<ReturnType>(params: InvokeParams<ReturnType>) {
-  let {
+  const className = params.className ?? NTClass.NT_API
-    className,
+  const channel = params.channel ?? NTChannel.IPC_UP_2
-    methodName,
+  const timeout = params.timeout ?? 5000
-    channel,
+  const afterFirstCmd = params.afterFirstCmd ?? true
-    args,
-    cbCmd,
-    timeoutSecond: timeout,
-    classNameIsRegister,
-    cmdCB,
-    afterFirstCmd,
-  } = params
-  className = className ?? NTQQApiClass.NT_API
-  channel = channel ?? NTQQApiChannel.IPC_UP_2
-  args = args ?? []
-  timeout = timeout ?? 5
-  afterFirstCmd = afterFirstCmd ?? true
   const uuid = randomUUID()
-  HOOK_LOG && log('callNTQQApi', channel, className, methodName, args, uuid)
+  let eventName = className + '-' + channel[channel.length - 1]
+  if (params.classNameIsRegister) {
+    eventName += '-register'
+  }
+  const apiArgs = [params.methodName, ...(params.args ?? [])]
+  //log('callNTQQApi', channel, eventName, apiArgs, uuid)
   return new Promise((resolve: (data: ReturnType) => void, reject) => {
-    // log("callNTQQApiPromise", channel, className, methodName, args, uuid)
-    const _timeout = timeout * 1000
     let success = false
-    let eventName = className + '-' + channel[channel.length - 1]
+    if (!params.cbCmd) {
-    if (classNameIsRegister) {
-      eventName += '-register'
-    }
-    const apiArgs = [methodName, ...args]
-    if (!cbCmd) {
       // QQ后端会返回结果，并且可以根据uuid识别
       hookApiCallbacks[uuid] = (r: ReturnType) => {
         success = true
@@ -149,10 +130,10 @@ export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
     else {
       // 这里的callback比较特殊，QQ后端先返回是否调用成功，再返回一条结果数据
       const secondCallback = () => {
-        const hookId = registerReceiveHook<ReturnType>(cbCmd, (payload) => {
+        const hookId = registerReceiveHook<ReturnType>(params.cbCmd!, (payload) => {
           // log(methodName, "second callback", cbCmd, payload, cmdCB);
-          if (!!cmdCB) {
+          if (!!params.cmdCB) {
-            if (cmdCB(payload)) {
+            if (params.cmdCB(payload)) {
               removeReceiveHook(hookId)
               success = true
               resolve(payload)
@@ -167,23 +148,22 @@ export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
       }
       !afterFirstCmd && secondCallback()
       hookApiCallbacks[uuid] = (result: GeneralCallResult) => {
-        log(`${methodName} callback`, result)
+        if (result?.result === 0 || result === undefined) {
-        if (result?.result == 0 || result === undefined) {
+          log(`${params.methodName} callback`, result)
           afterFirstCmd && secondCallback()
         }
         else {
-          success = true
+          log('ntqq api call failed', result)
           reject(`ntqq api call failed, ${result.errMsg}`)
         }
       }
     }
     setTimeout(() => {
-      // log("ntqq api timeout", success, channel, className, methodName)
       if (!success) {
-        log(`ntqq api timeout ${channel}, ${eventName}, ${methodName}`, apiArgs)
+        log(`ntqq api timeout ${channel}, ${eventName}, ${params.methodName}`, apiArgs)
-        reject(`ntqq api timeout ${channel}, ${eventName}, ${methodName}, ${apiArgs}`)
+        reject(`ntqq api timeout ${channel}, ${eventName}, ${params.methodName}, ${apiArgs}`)
       }
-    }, _timeout)
+    }, timeout)
 
     ipcMain.emit(
       channel,
@@ -197,30 +177,4 @@ export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
       apiArgs,
     )
   })
-}
+}
-
-export interface GeneralCallResult {
-  result: number // 0: success
-  errMsg: string
-}
-
-export class NTQQApi {
-  static async call(className: NTQQApiClass, cmdName: string, args: any[]) {
-    return await callNTQQApi<GeneralCallResult>({
-      className,
-      methodName: cmdName,
-      args: [...args],
-    })
-  }
-
-  static async fetchUnitedCommendConfig() {
-    return await callNTQQApi<GeneralCallResult>({
-      methodName: NTQQApiMethod.FETCH_UNITED_COMMEND_CONFIG,
-      args: [
-        {
-          groups: ['100243'],
-        },
-      ],
-    })
-  }
-}

src/ntqqapi/services/index.ts

@@ -1,3 +1,4 @@
+export * from './common'
 export * from './NodeIKernelBuddyService'
 export * from './NodeIKernelProfileService'
 export * from './NodeIKernelGroupService'

src/ntqqapi/types/user.ts

@@ -78,9 +78,12 @@ export interface Friend extends User {
 
 export interface CategoryFriend {
   categoryId: number
+  categorySortId: number
   categroyName: string
   categroyMbCount: number
-  buddyList: User[]
+  onlineCount: number
+  buddyList: User[] // V1
+  buddyUids: string[]
 }
 
 export interface CoreInfo {

src/onebot11/action/file/GetFile.ts

@@ -63,7 +63,7 @@ export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResp
       } else if (fileCache[0].elementType === ElementType.VIDEO) {
         res.url = await NTQQFileApi.getVideoUrl(peer, fileCache[0].msgId, fileCache[0].elementId)
       }
-      if (enableLocalFile2Url && downloadPath && res.file === res.url) {
+      if (enableLocalFile2Url && downloadPath && (res.file === res.url || res.url === undefined)) {
         try {
           res.base64 = await fsPromise.readFile(downloadPath, 'base64')
         } catch (e) {

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

@@ -25,15 +25,16 @@ export default class GoCQHTTPGetGroupMsgHistory extends BaseAction<Payload, Resp
     const count = payload.count || 20
     const isReverseOrder = payload.reverseOrder || true
     const peer = { chatType: ChatType.group, peerUid: payload.group_id.toString() }
-    let msgList: RawMessage[]
+    let msgList: RawMessage[] | undefined
     // 包含 message_seq 0
     if (!payload.message_seq) {
-      msgList = (await NTQQMsgApi.getLastestMsgByUids(peer, count)).msgList
+      msgList = (await NTQQMsgApi.getLastestMsgByUids(peer, count))?.msgList
     } else {
       const startMsgId = (await MessageUnique.getMsgIdAndPeerByShortId(payload.message_seq))?.MsgId
       if (!startMsgId) throw `消息${payload.message_seq}不存在`
       msgList = (await NTQQMsgApi.getMsgHistory(peer, startMsgId, count)).msgList
     }
+    if (!msgList?.length) throw '未找到消息'
     if (isReverseOrder) msgList.reverse()
     await Promise.all(
       msgList.map(async msg => {

src/onebot11/action/group/GetGroupList.ts

@@ -12,7 +12,7 @@ class GetGroupList extends BaseAction<Payload, OB11Group[]> {
   actionName = ActionName.GetGroupList
 
   protected async _handle(payload: Payload) {
-    const groupList = await NTQQGroupApi.getGroups(payload?.no_cache === true || payload.no_cache === 'true')
+    const groupList = await NTQQGroupApi.getGroups(payload?.no_cache === true || payload?.no_cache === 'true')
     return OB11Constructor.groups(groupList)
   }
 }

src/onebot11/action/msg/SendMsg.ts

@@ -356,7 +356,13 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
   }
 
   protected async _handle(payload: OB11PostSendMsg) {
-    const peer = await createContext(payload, ContextMode.Normal)
+    let contextMode = ContextMode.Normal
+    if (payload.message_type === 'group') {
+      contextMode = ContextMode.Group
+    } else if (payload.message_type === 'private') {
+      contextMode = ContextMode.Private
+    }
+    const peer = await createContext(payload, contextMode)
     const messages = convertMessage2List(
       payload.message,
       payload.auto_escape === true || payload.auto_escape === 'true',

src/onebot11/action/user/GetCookie.ts

@@ -15,10 +15,13 @@ export class GetCookies extends BaseAction<Payload, Response> {
   actionName = ActionName.GetCookies
 
   protected async _handle(payload: Payload) {
+    if (!payload.domain) {
+      throw '缺少参数 domain'
+    }
     const cookiesObject = await NTQQUserApi.getCookies(payload.domain)
     //把获取到的cookiesObject转换成 k=v; 格式字符串拼接在一起
     const cookies = Object.entries(cookiesObject).map(([key, value]) => `${key}=${value}`).join('; ')
-    const bkn = WebApi.genBkn(cookiesObject.p_skey)
+    const bkn = cookiesObject.skey ? WebApi.genBkn(cookiesObject.skey) : ''
     return { cookies, bkn }
   }
 }

src/onebot11/action/user/SendLike.ts

@@ -3,8 +3,8 @@ import { ActionName } from '../types'
 import { NTQQUserApi } from '@/ntqqapi/api'
 
 interface Payload {
-  user_id: number
+  user_id: number | string
-  times: number
+  times: number | string
 }
 
 export default class SendLike extends BaseAction<Payload, null> {
@@ -14,9 +14,9 @@ export default class SendLike extends BaseAction<Payload, null> {
     try {
       const qq = payload.user_id.toString()
       const uid: string = await NTQQUserApi.getUidByUin(qq) || ''
-      const result = await NTQQUserApi.like(uid, parseInt(payload.times?.toString()) || 1)
+      const result = await NTQQUserApi.like(uid, +payload.times || 1)
-      if (result.result !== 0) {
+      if (result?.result !== 0) {
-        throw Error(result.errMsg)
+        throw Error(result?.errMsg)
       }
     } catch (e) {
       throw `点赞失败 ${e}`

src/onebot11/constructor.ts

@@ -49,6 +49,7 @@ import { OB11GroupRecallNoticeEvent } from './event/notice/OB11GroupRecallNotice
 import { OB11FriendPokeEvent, OB11GroupPokeEvent } from './event/notice/OB11PokeEvent'
 import { OB11BaseNoticeEvent } from './event/notice/OB11BaseNoticeEvent'
 import { OB11GroupEssenceEvent } from './event/notice/OB11GroupEssenceEvent'
+import { omit } from 'cosmokit'
 
 export class OB11Constructor {
   static async message(msg: RawMessage): Promise<OB11Message> {
@@ -98,7 +99,7 @@ export class OB11Constructor {
     else if (msg.chatType as unknown as ChatType2 == ChatType2.KCHATTYPETEMPC2CFROMGROUP) {
       resMsg.sub_type = 'group'
       const ret = await NTQQMsgApi.getTempChatInfo(ChatType2.KCHATTYPETEMPC2CFROMGROUP, msg.senderUid)
-      if (ret.result === 0) {
+      if (ret?.result === 0) {
         resMsg.group_id = parseInt(ret.tmpChatInfo!.groupCode)
         resMsg.sender.nickname = ret.tmpChatInfo!.fromNick
       } else {
@@ -157,20 +158,20 @@ export class OB11Constructor {
             peerUid: msg.peerUid,
             guildId: '',
             chatType: msg.chatType,
-          }, element.replyElement.replayMsgSeq, 1, true, true)).msgList[0]
+          }, element.replyElement.replayMsgSeq, 1, true, true))?.msgList[0]
           if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
             const peer = {
               chatType: msg.chatType,
               peerUid: msg.peerUid,
               guildId: '',
             }
-            replyMsg = (await NTQQMsgApi.getSingleMsg(peer, element.replyElement.replayMsgSeq)).msgList[0]
+            replyMsg = (await NTQQMsgApi.getSingleMsg(peer, element.replyElement.replayMsgSeq))?.msgList[0]
           }
           // 284840486: 合并消息内侧 消息具体定位不到
           if ((!replyMsg || records.msgRandom !== replyMsg.msgRandom) && msg.peerUin !== '284840486') {
             throw new Error('回复消息消息验证失败')
           }
-          message_data['data']['id'] = MessageUnique.createMsg({
+          message_data['data']['id'] = replyMsg && MessageUnique.createMsg({
             peerUid: msg.peerUid,
             guildId: '',
             chatType: msg.chatType,
@@ -483,8 +484,8 @@ export class OB11Constructor {
               chatType: ChatType.group,
               guildId: '',
               peerUid: msg.peerUid,
-            }, msgSeq, 1, true, true)).msgList
+            }, msgSeq, 1, true, true))?.msgList
-            if (replyMsgList.length < 1) {
+            if (!replyMsgList?.length) {
               return
             }
             const likes = [
@@ -577,7 +578,10 @@ export class OB11Constructor {
               chatType: ChatType.group,
               peerUid: Group!
             }
-            const { msgList } = await NTQQMsgApi.getMsgsBySeqAndCount(Peer, msgSeq.toString(), 1, true, true)
+            const msgList = (await NTQQMsgApi.getMsgsBySeqAndCount(Peer, msgSeq.toString(), 1, true, true))?.msgList
+            if (!msgList?.length) {
+              return
+            }
             //const origMsg = await dbUtil.getMsgByLongId(msgList[0].msgId)
             //const postMsg = await dbUtil.getMsgBySeqId(origMsg?.msgSeq!) ?? origMsg
             // 如果 senderUin 为 0，可能是 历史消息 或 自身消息
@@ -658,7 +662,7 @@ export class OB11Constructor {
     for (const friend of friends) {
       const sexValue = this.sex(friend.baseInfo.sex!)
       data.push({
-        ...friend.baseInfo,
+        ...omit(friend.baseInfo, ['richBuffer']),
         ...friend.coreInfo,
         user_id: parseInt(friend.coreInfo.uin),
         nickname: friend.coreInfo.nick,

src/onebot11/event/notice/OB11PokeEvent.ts

@@ -10,23 +10,27 @@ abstract class OB11PokeEvent extends OB11BaseNoticeEvent {
 
 export class OB11FriendPokeEvent extends OB11PokeEvent {
   user_id: number
+  raw_info: any
 
   constructor(user_id: number, target_id: number, raw_message: any) {
-    super();
+    super()
-    this.target_id = target_id;
+    this.target_id = target_id
-    this.user_id = user_id;
+    this.user_id = user_id
-    this.raw_message = raw_message;
+    // raw_message nb等框架标准为string
+    this.raw_info = raw_message
   }
 }
 
 export class OB11GroupPokeEvent extends OB11PokeEvent {
   user_id: number
   group_id: number
+  raw_info: any
+
   constructor(group_id: number, user_id: number = 0, target_id: number = 0, raw_message: any) {
     super()
     this.group_id = group_id
     this.target_id = target_id
     this.user_id = user_id
-    this.raw_message = raw_message
+    this.raw_info = raw_message
   }
 }

src/onebot11/server/post-ob11-event.ts

@@ -27,9 +27,10 @@ export function unregisterWsEventSender(ws: WebSocketClass) {
 
 export function postWsEvent(event: PostEventType) {
   for (const ws of eventWSList) {
-    new Promise(() => {
+    new Promise((resolve) => {
       wsReply(ws, event)
-    }).then().catch(log)
+      resolve(undefined)
+    }).then()
   }
 }
 

src/onebot11/server/ws/ReverseWebsocket.ts

@@ -104,6 +104,10 @@ export class ReverseWebsocket {
 
     this.websocket.on('error', log)
 
+    this.websocket.on('ping',()=>{
+      this.websocket?.pong()
+    })
+
     const wsClientInterval = setInterval(() => {
       postWsEvent(new OB11HeartbeatEvent(selfInfo.online!, true, heartInterval!))
     }, heartInterval) // 心跳包

src/onebot11/server/ws/WebsocketServer.ts

@@ -1,70 +1,131 @@
-import { WebSocket } from 'ws'
+import BaseAction from '../../action/BaseAction'
+import { WebSocket, WebSocketServer } from 'ws'
 import { actionMap } from '../../action'
 import { OB11Response } from '../../action/OB11Response'
 import { postWsEvent, registerWsEventSender, unregisterWsEventSender } from '../post-ob11-event'
 import { ActionName } from '../../action/types'
-import BaseAction from '../../action/BaseAction'
 import { LifeCycleSubType, OB11LifeCycleEvent } from '../../event/meta/OB11LifeCycleEvent'
 import { OB11HeartbeatEvent } from '../../event/meta/OB11HeartbeatEvent'
-import { WebsocketServerBase } from '../../../common/server/websocket'
 import { IncomingMessage } from 'node:http'
 import { wsReply } from './reply'
-import { getSelfInfo } from '../../../common/data'
+import { getSelfInfo } from '@/common/data'
-import { log } from '../../../common/utils/log'
+import { log } from '@/common/utils/log'
-import { getConfigUtil } from '../../../common/config'
+import { getConfigUtil } from '@/common/config'
+import { llonebotError } from '@/common/data'
 
-class OB11WebsocketServer extends WebsocketServerBase {
+export class OB11WebsocketServer {
-  authorizeFailed(wsClient: WebSocket) {
+  private ws?: WebSocketServer
-    wsClient.send(JSON.stringify(OB11Response.res(null, 'failed', 1403, 'token验证失败')))
+
+  constructor() {
+    log(`llonebot websocket service started`)
   }
 
-  async handleAction(wsClient: WebSocket, actionName: string, params: any, echo?: any) {
+  start(port: number) {
+    try {
+      this.ws = new WebSocketServer({ port, maxPayload: 1024 * 1024 * 1024 })
+      llonebotError.wsServerError = ''
+    } catch (e: any) {
+      llonebotError.wsServerError = '正向 WebSocket 服务启动失败, ' + e.toString()
+      return
+    }
+    this.ws?.on('connection', (socket, req) => {
+      const url = req.url?.split('?').shift()
+      this.authorize(socket, req)
+      this.onConnect(socket, url!)
+    })
+  }
+
+  stop() {
+    llonebotError.wsServerError = ''
+    this.ws?.close(err => {
+      log('ws server close failed!', err)
+    })
+    this.ws = undefined
+  }
+
+  restart(port: number) {
+    this.stop()
+    this.start(port)
+  }
+
+  private authorize(socket: WebSocket, req: IncomingMessage) {
+    const { token } = getConfigUtil().getConfig()
+    const url = req.url?.split('?').shift()
+    log('ws connect', url)
+    let clientToken = ''
+    const authHeader = req.headers['authorization']
+    if (authHeader) {
+      clientToken = authHeader.split('Bearer ').pop()!
+      log('receive ws header token', clientToken)
+    } else {
+      const { searchParams } = new URL(`http://localhost${req.url}`)
+      const urlToken = searchParams.get('access_token')
+      if (urlToken) {
+        if (Array.isArray(urlToken)) {
+          clientToken = urlToken[0]
+        } else {
+          clientToken = urlToken
+        }
+        log('receive ws url token', clientToken)
+      }
+    }
+    if (token && clientToken !== token) {
+      this.authorizeFailed(socket)
+      return socket.close()
+    }
+  }
+
+  private authorizeFailed(socket: WebSocket) {
+    socket.send(JSON.stringify(OB11Response.res(null, 'failed', 1403, 'token验证失败')))
+  }
+
+  private async handleAction(socket: WebSocket, actionName: string, params: any, echo?: any) {
     const action: BaseAction<any, any> = actionMap.get(actionName)!
     if (!action) {
-      return wsReply(wsClient, OB11Response.error('不支持的api ' + actionName, 1404, echo))
+      return wsReply(socket, OB11Response.error('不支持的api ' + actionName, 1404, echo))
     }
     try {
-      let handleResult = await action.websocketHandle(params, echo)
+      const handleResult = await action.websocketHandle(params, echo)
       handleResult.echo = echo
-      wsReply(wsClient, handleResult)
+      wsReply(socket, handleResult)
     } catch (e: any) {
-      wsReply(wsClient, OB11Response.error(`api处理出错:${e.stack}`, 1200, echo))
+      wsReply(socket, OB11Response.error(`api处理出错:${e.stack}`, 1200, echo))
     }
   }
 
-  onConnect(wsClient: WebSocket, url: string, req: IncomingMessage) {
+  private onConnect(socket: WebSocket, url: string) {
-    if (url == '/api' || url == '/api/' || url == '/') {
+    if (['/api', '/api/', '/'].includes(url)) {
-      wsClient.on('message', async (msg) => {
+      socket.on('message', async (msg) => {
         let receiveData: { action: ActionName | null; params: any; echo?: any } = { action: null, params: {} }
-        let echo = null
+        let echo: any
         try {
           receiveData = JSON.parse(msg.toString())
           echo = receiveData.echo
           log('收到正向Websocket消息', receiveData)
         } catch (e) {
-          return wsReply(wsClient, OB11Response.error('json解析失败，请检查数据格式', 1400, echo))
+          return wsReply(socket, OB11Response.error('json解析失败，请检查数据格式', 1400, echo))
         }
-        this.handleAction(wsClient, receiveData.action!, receiveData.params, receiveData.echo).then()
+        this.handleAction(socket, receiveData.action!, receiveData.params, receiveData.echo)
       })
     }
-    if (url == '/event' || url == '/event/' || url == '/') {
+    if (['/event', '/event/', '/'].includes(url)) {
-      registerWsEventSender(wsClient)
+      registerWsEventSender(socket)
 
       log('event上报ws客户端已连接')
 
       try {
-        wsReply(wsClient, new OB11LifeCycleEvent(LifeCycleSubType.CONNECT))
+        wsReply(socket, new OB11LifeCycleEvent(LifeCycleSubType.CONNECT))
       } catch (e) {
         log('发送生命周期失败', e)
       }
       const { heartInterval } = getConfigUtil().getConfig()
-      const wsClientInterval = setInterval(() => {
+      const intervalId = setInterval(() => {
         postWsEvent(new OB11HeartbeatEvent(getSelfInfo().online!, true, heartInterval!))
       }, heartInterval) // 心跳包
-      wsClient.on('close', () => {
+      socket.on('close', () => {
         log('event上报ws客户端已断开')
-        clearInterval(wsClientInterval)
+        clearInterval(intervalId)
-        unregisterWsEventSender(wsClient)
+        unregisterWsEventSender(socket)
       })
     }
   }

src/version.ts

@@ -1 +1 @@
-export const version = '3.29.4'
+export const version = '3.30.4'