Merge pull request #392 from LLOneBot/dev

3.31.6
chore: v3.31.6
2024-11-22 01:56:33 +00:00 · 2024-09-03 18:38:07 +08:00 · 2024-09-03 18:34:30 +08:00 · 2024-09-03 15:14:05 +08:00 · 2024-09-03 13:16:25 +08:00 · 2024-09-03 01:24:21 +08:00
33 changed files with 449 additions and 258 deletions
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,4 +1,4 @@
-name: 'publish'
+name: Publish
 on:
  push:
    tags:
@@ -8,31 +8,36 @@ jobs:
  build-and-publish:
    runs-on: ubuntu-latest
    steps:
-      - name: checkout
+      - name: Checkout
        uses: actions/checkout@v4

-      - name: setup node
+      - name: Setup node
        uses: actions/setup-node@v4
        with:
          node-version: 20

-      - name: install dependenies
+      - name: Install dependenies
        run: |
          export ELECTRON_SKIP_BINARY_DOWNLOAD=1
          npm install

-      - name: build
+      - name: Build
        run: npm run build

-      - name: zip
+      - name: Compress
        run: |
          sudo apt install zip -y
          cd ./dist/
          zip -r ../LLOneBot.zip ./*

-      - name: publish
+      - name: Extract version from tag
+        id: get-version
+        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> "$GITHUB_OUTPUT"
+
+      - name: Release
        uses: ncipollo/release-action@v1
        with:
          artifacts: 'LLOneBot.zip'
          draft: true
          token: ${{ secrets.RELEASE_TOKEN }}
+          name: LLOneBot v${{ steps.get-version.outputs.VERSION }}
--- a/README.md
+++ b/README.md
@@ -15,10 +15,6 @@ TG 群：<https://t.me/+nLZEnpne-pQ1OWFl>

 <img src="./doc/image/setting.png" width="400px" alt="设置界面"/>

-## HTTP 调用示例
-
-<img src="./doc/image/example.jpg" width="500px" alt="HTTP调用示例"/>
-
 ## 支持的 API

 见 <https://llonebot.github.io/zh-CN/develop/api>
@@ -31,10 +27,10 @@ TG 群：<https://t.me/+nLZEnpne-pQ1OWFl>

 - [NapCatQQ](https://github.com/NapNeko/NapCatQQ)
 - [LiteLoaderQQNT](https://liteloaderqqnt.github.io/guide/install.html)
- [chronocat](https://github.com/chrononeko/chronocat)
+- [Chronocat](https://github.com/chrononeko/chronocat)
 - [koishi-plugin-adapter-onebot](https://github.com/koishijs/koishi-plugin-adapter-onebot)
 - [silk-wasm](https://github.com/idranme/silk-wasm)

 ## 友链

- [Lagrange.Core](https://github.com/LagrangeDev/Lagrange.Core) 一款用C#实现的NTQQ纯协议跨平台QQ机器人框架
+- [Lagrange.Core](https://github.com/LagrangeDev/Lagrange.Core): An Implementation of NTQQ Protocol
--- a/electron.vite.config.ts
+++ b/electron.vite.config.ts
@@ -1,6 +1,7 @@
 import cp from 'vite-plugin-cp'
 import path from 'node:path'
 import './scripts/gen-manifest'
+import type { ElectronViteConfig } from 'electron-vite'

 const external = [
  'silk-wasm',
@@ -12,7 +13,7 @@ function genCpModule(module: string) {
  return { src: `./node_modules/${module}`, dest: `dist/node_modules/${module}`, flatten: false }
 }

-let config = {
+const config: ElectronViteConfig = {
  main: {
    build: {
      outDir: 'dist/main',
@@ -39,9 +40,6 @@ let config = {
          ...external.map(genCpModule),
          { src: './manifest.json', dest: 'dist' },
          { src: './icon.webp', dest: 'dist' },
-          // { src: './src/ntqqapi/native/crychic/crychic-win32-x64.node', dest: 'dist/main/' },
-          // { src: './src/ntqqapi/native/moehook/MoeHoo-win32-x64.node', dest: 'dist/main/' },
-          // { src: './src/ntqqapi/native/moehook/MoeHoo-linux-x64.node', dest: 'dist/main/' },
        ],
      }),
    ],
--- a/manifest.json
+++ b/manifest.json
@@ -4,7 +4,7 @@
  "name": "LLOneBot",
  "slug": "LLOneBot",
  "description": "实现 OneBot 11 协议，用于 QQ 机器人开发",
-  "version": "3.31.5",
+  "version": "3.31.6",
  "icon": "./icon.webp",
  "authors": [
    {
--- a/src/common/config.ts
+++ b/src/common/config.ts
@@ -38,7 +38,7 @@ export class ConfigUtil {
  }

  reloadConfig(): Config {
-    let ob11Default: OB11Config = {
+    const ob11Default: OB11Config = {
      httpPort: 3000,
      httpHosts: [],
      httpSecret: '',
@@ -52,7 +52,7 @@ export class ConfigUtil {
      enableHttpHeart: false,
      enableQOAutoQuote: false
    }
-    let defaultConfig: Config = {
+    const defaultConfig: Config = {
      enableLLOB: true,
      ob11: ob11Default,
      heartInterval: 60000,
@@ -83,7 +83,6 @@ export class ConfigUtil {
      this.checkOldConfig(jsonData.ob11, jsonData, 'httpPort', 'http')
      this.checkOldConfig(jsonData.ob11, jsonData, 'httpHosts', 'hosts')
      this.checkOldConfig(jsonData.ob11, jsonData, 'wsPort', 'wsPort')
-      // console.log("get config", jsonData);
      this.config = jsonData
      return this.config
    }
@@ -95,15 +94,15 @@ export class ConfigUtil {
  }

  private checkOldConfig(
-    currentConfig: Config | OB11Config,
-    oldConfig: Config | OB11Config,
-    currentKey: string,
-    oldKey: string,
+    currentConfig: OB11Config,
+    oldConfig: Config,
+    currentKey: 'httpPort' | 'httpHosts' | 'wsPort',
+    oldKey: 'http' | 'hosts' | 'wsPort',
  ) {
    // 迁移旧的配置到新配置，避免用户重新填写配置
    const oldValue = oldConfig[oldKey]
    if (oldValue) {
-      currentConfig[currentKey] = oldValue
+      currentConfig[currentKey] = oldValue as any
      delete oldConfig[oldKey]
    }
  }
--- a/src/common/types.ts
+++ b/src/common/types.ts
@@ -34,6 +34,12 @@ export interface Config {
  ignoreBeforeLoginMsg?: boolean
  /** 单位为秒 */
  msgCacheExpire?: number
+  /** @deprecated */
+  http?: string
+  /** @deprecated */
+  hosts?: string[]
+  /** @deprecated */
+  wsPort?: string
 }

 export interface LLOneBotError {
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -4,4 +4,6 @@ import { Dict } from 'cosmokit'
 declare global {
  var llonebot: LLOneBot
  var LiteLoader: Dict
+  var authData: Dict | undefined
+  var navigation: Dict | undefined
 }
--- a/src/ntqqapi/api/file.ts
+++ b/src/ntqqapi/api/file.ts
@@ -187,7 +187,7 @@ export class NTQQFileApi extends Service {
      filePath = data[1].filePath
    } else {
      const data = await invoke<{ notifyInfo: OnRichMediaDownloadCompleteParams }>(
-        NTMethod.DOWNLOAD_MEDIA,
+        'nodeIKernelMsgService/downloadRichMedia',
        [
          {
            getReq: {
--- a/src/ntqqapi/api/group.ts
+++ b/src/ntqqapi/api/group.ts
@@ -1,11 +1,11 @@
 import { ReceiveCmdS } from '../hook'
-import { Group, GroupMember, GroupMemberRole, GroupNotifies, GroupRequestOperateTypes, GroupNotify } from '../types'
+import { Group, GroupMember, GroupMemberRole, GroupNotifies, GroupRequestOperateTypes, GroupNotify, GetFileListParam } from '../types'
 import { invoke, NTClass, NTMethod } from '../ntcall'
 import { GeneralCallResult } from '../services'
 import { NTQQWindows } from './window'
 import { getSession } from '../wrapper'
 import { NTEventDispatch } from '@/common/utils/eventTask'
-import { NodeIKernelGroupListener } from '../listeners'
+import { NodeIKernelGroupListener, OnGroupFileInfoUpdateParams } from '../listeners'
 import { NodeIKernelGroupService } from '../services'
 import { Service, Context } from 'cordis'
 import { isNumeric } from '@/common/utils/misc'
@@ -132,7 +132,7 @@ export class NTQQGroupApi extends Service {
    } else {
      invoke(ReceiveCmdS.GROUP_NOTIFY, [], { classNameIsRegister: true })
      return (await invoke<GroupNotifies>(
-        NTMethod.GET_GROUP_NOTICE,
+        'nodeIKernelGroupService/getSingleScreenNotifies',
        [{ doubt: false, startSeq: '', number: num }, null],
        {

@@ -301,4 +301,24 @@ export class NTQQGroupApi extends Service {
  async deleteGroupFile(groupId: string, fileIdList: string[]) {
    return await invoke('nodeIKernelRichMediaService/deleteGroupFile', [{ groupId, busIdList: [102], fileIdList }, null])
  }
+
+  async getGroupFileList(groupId: string, fileListForm: GetFileListParam) {
+    invoke('nodeIKernelMsgListener/onGroupFileInfoUpdate', [], { classNameIsRegister: true })
+    const data = await invoke<{ fileInfo: OnGroupFileInfoUpdateParams }>(
+      'nodeIKernelRichMediaService/getGroupFileList',
+      [
+        {
+          groupId,
+          fileListForm
+        },
+        null,
+      ],
+      {
+        cbCmd: 'nodeIKernelMsgListener/onGroupFileInfoUpdate',
+        afterFirstCmd: false,
+        cmdCB: (payload, result) => payload.fileInfo.reqId === result
+      }
+    )
+    return data.fileInfo.item
+  }
 }
--- a/src/ntqqapi/api/msg.ts
+++ b/src/ntqqapi/api/msg.ts
@@ -68,6 +68,10 @@ export class NTQQMsgApi extends Service {
    return await invoke<GeneralCallResult>(NTMethod.ACTIVE_CHAT_HISTORY, [{ peer, cnt: 20 }, null])
  }

+  async getAioFirstViewLatestMsgs(peer: Peer, cnt: number) {
+    return await invoke('nodeIKernelMsgService/getAioFirstViewLatestMsgs', [{ peer, cnt }, null])
+  }
+
  async getMsgsByMsgId(peer: Peer | undefined, msgIds: string[] | undefined) {
    if (!peer) throw new Error('peer is not allowed')
    if (!msgIds) throw new Error('msgIds is not allowed')
@@ -260,22 +264,6 @@ export class NTQQMsgApi extends Service {
    }
  }

-  /** 27187 TODO */
-  async getLastestMsgByUids(peer: Peer, count = 20, isReverseOrder = false) {
-    const session = getSession()
-    const ret = await session?.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
-      chatInfo: peer,
-      filterMsgType: [],
-      filterSendersUid: [],
-      filterMsgToTime: '0',
-      filterMsgFromTime: '0',
-      isReverseOrder: isReverseOrder, //此参数有点离谱 注意不是本次查询的排序 而是全部消历史信息的排序 默认false 从新消息拉取到旧消息
-      isIncludeCurrent: true,
-      pageLimit: count,
-    })
-    return ret
-  }
-
  async getSingleMsg(peer: Peer, msgSeq: string) {
    const session = getSession()
    if (session) {
--- a/src/ntqqapi/api/user.ts
+++ b/src/ntqqapi/api/user.ts
@@ -25,7 +25,7 @@ export class NTQQUserApi extends Service {

  async setQQAvatar(path: string) {
    return await invoke(
-      NTMethod.SET_QQ_AVATAR,
+      'nodeIKernelProfileService/setHeader',
      [
        { path },
        null,
--- a/src/ntqqapi/entities.ts
+++ b/src/ntqqapi/entities.ts
@@ -22,7 +22,7 @@ import { encodeSilk } from '../common/utils/audio'
 import { Context } from 'cordis'
 import { isNullable } from 'cosmokit'

-export const mFaceCache = new Map<string, string>() // emojiId -> faceName
+//export const mFaceCache = new Map<string, string>() // emojiId -> faceName

 export namespace SendElementEntities {
  export function text(content: string): SendTextElement {
@@ -295,7 +295,7 @@ export namespace SendElementEntities {
    }
  }

-  export function mface(emojiPackageId: number, emojiId: string, key: string, faceName: string): SendMarketFaceElement {
+  export function mface(emojiPackageId: number, emojiId: string, key: string, summary?: string): SendMarketFaceElement {
    return {
      elementType: ElementType.MFACE,
      marketFaceElement: {
@@ -304,14 +304,13 @@ export namespace SendElementEntities {
        emojiPackageId,
        emojiId,
        key,
-        faceName: faceName || mFaceCache.get(emojiId) || '[商城表情]',
+        faceName: summary || '[商城表情]',
      },
    }
  }

-  export function dice(resultId: number | null): SendFaceElement {
+  export function dice(resultId?: string | number): SendFaceElement {
    // 实际测试并不能控制结果
-
    // 随机1到6
    if (isNullable(resultId)) resultId = Math.floor(Math.random() * 6) + 1
    return {
@@ -325,7 +324,7 @@ export namespace SendElementEntities {
        stickerId: '33',
        sourceType: 1,
        stickerType: 2,
-        resultId: resultId?.toString(),
+        resultId: resultId.toString(),
        surpriseId: '',
        // "randomType": 1,
      },
@@ -333,7 +332,7 @@ export namespace SendElementEntities {
  }

  // 猜拳(石头剪刀布)表情
-  export function rps(resultId: number | null): SendFaceElement {
+  export function rps(resultId?: string | number): SendFaceElement {
    // 实际测试并不能控制结果
    if (isNullable(resultId)) resultId = Math.floor(Math.random() * 3) + 1
    return {
@@ -347,7 +346,7 @@ export namespace SendElementEntities {
        stickerId: '34',
        sourceType: 1,
        stickerType: 2,
-        resultId: resultId?.toString(),
+        resultId: resultId.toString(),
        surpriseId: '',
        // "randomType": 1,
      },
--- a/src/ntqqapi/listeners/NodeIKernelMsgListener.ts
+++ b/src/ntqqapi/listeners/NodeIKernelMsgListener.ts
@@ -23,15 +23,55 @@ export interface OnRichMediaDownloadCompleteParams {
  userUsedSpacePerDay: unknown | null
 }

-export interface onGroupFileInfoUpdateParamType {
+export interface OnGroupFileInfoUpdateParams {
  retCode: number
  retMsg: string
  clientWording: string
  isEnd: boolean
-  item: Array<any>
-  allFileCount: string
-  nextIndex: string
-  reqId: string
+  item: {
+    peerId: string
+    type: number
+    folderInfo?: {
+      folderId: string
+      parentFolderId: string
+      folderName: string
+      createTime: number
+      modifyTime: number
+      createUin: string
+      creatorName: string
+      totalFileCount: number
+      modifyUin: string
+      modifyName: string
+      usedSpace: string
+    }
+    fileInfo?: {
+      fileModelId: string
+      fileId: string
+      fileName: string
+      fileSize: string
+      busId: number
+      uploadedSize: string
+      uploadTime: number
+      deadTime: number
+      modifyTime: number
+      downloadTimes: number
+      sha: string
+      sha3: string
+      md5: string
+      uploaderLocalPath: string
+      uploaderName: string
+      uploaderUin: string
+      parentFolderId: string
+      localPath: string
+      transStatus: number
+      transType: number
+      elementId: string
+      isFolder: boolean
+    }
+  }[]
+  allFileCount: number
+  nextIndex: number
+  reqId: number
 }

 // {
@@ -82,7 +122,7 @@ export interface IKernelMsgListener {

  onGroupFileInfoAdd(groupItem: unknown): void

-  onGroupFileInfoUpdate(groupFileListResult: onGroupFileInfoUpdateParamType): void
+  onGroupFileInfoUpdate(groupFileListResult: OnGroupFileInfoUpdateParams): void

  onGroupGuildUpdate(groupGuildNotifyInfo: unknown): void

@@ -295,7 +335,7 @@ export class MsgListener implements IKernelMsgListener {

  }

-  onGroupFileInfoUpdate(groupFileListResult: onGroupFileInfoUpdateParamType) {
+  onGroupFileInfoUpdate(groupFileListResult: OnGroupFileInfoUpdateParams) {

  }

--- a/src/ntqqapi/ntcall.ts
+++ b/src/ntqqapi/ntcall.ts
@@ -32,73 +32,48 @@ export enum NTClass {
 }

 export enum NTMethod {
-  RECENT_CONTACT = 'nodeIKernelRecentContactService/fetchAndSubscribeABatchOfRecentContact',
  ACTIVE_CHAT_PREVIEW = 'nodeIKernelMsgService/getAioFirstViewLatestMsgsAndAddActiveChat', // 激活聊天窗口，有时候必须这样才能收到消息, 并返回最新预览消息
  ACTIVE_CHAT_HISTORY = 'nodeIKernelMsgService/getMsgsIncludeSelfAndAddActiveChat', // 激活聊天窗口，有时候必须这样才能收到消息, 并返回历史消息
  HISTORY_MSG = 'nodeIKernelMsgService/getMsgsIncludeSelf',
  GET_MULTI_MSG = 'nodeIKernelMsgService/getMultiMsg',
  DELETE_ACTIVE_CHAT = 'nodeIKernelMsgService/deleteActiveChatByUid',
-  ENTER_OR_EXIT_AIO = 'nodeIKernelMsgService/enterOrExitAio',
+  MEDIA_FILE_PATH = 'nodeIKernelMsgService/getRichMediaFilePathForGuild',
+  RECALL_MSG = 'nodeIKernelMsgService/recallMsg',
+  EMOJI_LIKE = 'nodeIKernelMsgService/setMsgEmojiLikes',
+  FORWARD_MSG = 'nodeIKernelMsgService/forwardMsgWithComment',

-  LIKE_FRIEND = 'nodeIKernelProfileLikeService/setBuddyProfileLike',
  SELF_INFO = 'fetchAuthData',
-  FRIENDS = 'nodeIKernelBuddyService/getBuddyList',
-
-  GROUPS = 'nodeIKernelGroupService/getGroupList',
-  GROUP_MEMBER_SCENE = 'nodeIKernelGroupService/createMemberListScene',
-  GROUP_MEMBERS = 'nodeIKernelGroupService/getNextMemberList',
-  GROUP_MEMBERS_INFO = 'nodeIKernelGroupService/getMemberInfo',
-
-  USER_INFO = 'nodeIKernelProfileService/getUserSimpleInfo',
-  USER_DETAIL_INFO = 'nodeIKernelProfileService/getUserDetailInfo',
-  USER_DETAIL_INFO_WITH_BIZ_INFO = 'nodeIKernelProfileService/getUserDetailInfoWithBizInfo',
  FILE_TYPE = 'getFileType',
  FILE_MD5 = 'getFileMd5',
  FILE_COPY = 'copyFile',
  IMAGE_SIZE = 'getImageSizeFromPath',
  FILE_SIZE = 'getFileSize',
-  MEDIA_FILE_PATH = 'nodeIKernelMsgService/getRichMediaFilePathForGuild',
+  CACHE_PATH_HOT_UPDATE = 'getHotUpdateCachePath',
+  CACHE_PATH_DESKTOP_TEMP = 'getDesktopTmpPath',
+  CACHE_PATH_SESSION = 'getCleanableAppSessionPathList',
+  OPEN_EXTRA_WINDOW = 'openExternalWindow',

-  RECALL_MSG = 'nodeIKernelMsgService/recallMsg',
-  SEND_MSG = 'nodeIKernelMsgService/sendMsg',
-  EMOJI_LIKE = 'nodeIKernelMsgService/setMsgEmojiLikes',
-
-  DOWNLOAD_MEDIA = 'nodeIKernelMsgService/downloadRichMedia',
-  FORWARD_MSG = 'nodeIKernelMsgService/forwardMsgWithComment',
-  MULTI_FORWARD_MSG = 'nodeIKernelMsgService/multiForwardMsgWithComment', // 合并转发
-  GET_GROUP_NOTICE = 'nodeIKernelGroupService/getSingleScreenNotifies',
+  GROUP_MEMBER_SCENE = 'nodeIKernelGroupService/createMemberListScene',
+  GROUP_MEMBERS = 'nodeIKernelGroupService/getNextMemberList',
  HANDLE_GROUP_REQUEST = 'nodeIKernelGroupService/operateSysNotify',
  QUIT_GROUP = 'nodeIKernelGroupService/quitGroup',
  GROUP_AT_ALL_REMAIN_COUNT = 'nodeIKernelGroupService/getGroupRemainAtTimes',
-  HANDLE_FRIEND_REQUEST = 'nodeIKernelBuddyService/approvalFriendRequest',
  KICK_MEMBER = 'nodeIKernelGroupService/kickMember',
  MUTE_MEMBER = 'nodeIKernelGroupService/setMemberShutUp',
  MUTE_GROUP = 'nodeIKernelGroupService/setGroupShutUp',
  SET_MEMBER_CARD = 'nodeIKernelGroupService/modifyMemberCardName',
  SET_MEMBER_ROLE = 'nodeIKernelGroupService/modifyMemberRole',
-  PUBLISH_GROUP_BULLETIN = 'nodeIKernelGroupService/publishGroupBulletinBulletin',
  SET_GROUP_NAME = 'nodeIKernelGroupService/modifyGroupName',
-  SET_GROUP_TITLE = 'nodeIKernelGroupService/modifyMemberSpecialTitle',
-  ACTIVATE_MEMBER_LIST_CHANGE = 'nodeIKernelGroupListener/onMemberListChange',
-  ACTIVATE_MEMBER_INFO_CHANGE = 'nodeIKernelGroupListener/onMemberInfoChange',
-  GET_MSG_BOX_INFO = 'nodeIKernelMsgService/getABatchOfContactMsgBoxInfo',
-  GET_GROUP_ALL_INFO = 'nodeIKernelGroupService/getGroupAllInfo',
+
+  HANDLE_FRIEND_REQUEST = 'nodeIKernelBuddyService/approvalFriendRequest',

  CACHE_SET_SILENCE = 'nodeIKernelStorageCleanService/setSilentScan',
  CACHE_ADD_SCANNED_PATH = 'nodeIKernelStorageCleanService/addCacheScanedPaths',
-  CACHE_PATH_HOT_UPDATE = 'getHotUpdateCachePath',
-  CACHE_PATH_DESKTOP_TEMP = 'getDesktopTmpPath',
-  CACHE_PATH_SESSION = 'getCleanableAppSessionPathList',
  CACHE_SCAN = 'nodeIKernelStorageCleanService/scanCache',
  CACHE_CLEAR = 'nodeIKernelStorageCleanService/clearCacheDataByKeys',
-
  CACHE_CHAT_GET = 'nodeIKernelStorageCleanService/getChatCacheInfo',
  CACHE_FILE_GET = 'nodeIKernelStorageCleanService/getFileCacheInfo',
  CACHE_CHAT_CLEAR = 'nodeIKernelStorageCleanService/clearChatCacheInfo',
-
-  OPEN_EXTRA_WINDOW = 'openExternalWindow',
-
-  SET_QQ_AVATAR = 'nodeIKernelProfileService/setHeader',
 }

 export enum NTChannel {
@@ -127,16 +102,16 @@ interface InvokeOptions<ReturnType> {
  channel?: NTChannel
  classNameIsRegister?: boolean
  cbCmd?: string | string[]
-  cmdCB?: (payload: ReturnType) => boolean
+  cmdCB?: (payload: ReturnType, result: unknown) => boolean
  afterFirstCmd?: boolean // 是否在methodName调用完之后再去hook cbCmd
  timeout?: number
 }

 export function invoke<
-  R extends Awaited<ReturnType<NTService[S][M] extends (...args: any) => any ? NTService[S][M] : any>>,
+  R extends Awaited<ReturnType<Extract<NTService[S][M], (...args: any) => any>>>,
  S extends keyof NTService = any,
  M extends keyof NTService[S] & string = any
->(method: `${unknown extends `${S}/${M}` ? `${S}/${M}` : string}`, args: unknown[], options: InvokeOptions<R> = {}) {
+>(method: Extract<unknown, `${S}/${M}`> | string, args: unknown[], options: InvokeOptions<R> = {}) {
  const className = options.className ?? NTClass.NT_API
  const channel = options.channel ?? NTChannel.IPC_UP_2
  const timeout = options.timeout ?? 5000
@@ -157,12 +132,13 @@ export function invoke<
      }
    }
    else {
+      let result: unknown
      // 这里的callback比较特殊，QQ后端先返回是否调用成功，再返回一条结果数据
      const secondCallback = () => {
        const hookId = registerReceiveHook<R>(options.cbCmd!, (payload) => {
          // log(methodName, "second callback", cbCmd, payload, cmdCB);
          if (!!options.cmdCB) {
-            if (options.cmdCB(payload)) {
+            if (options.cmdCB(payload, result)) {
              removeReceiveHook(hookId)
              success = true
              resolve(payload)
@@ -176,14 +152,14 @@ export function invoke<
        })
      }
      !afterFirstCmd && secondCallback()
-      hookApiCallbacks[callbackId] = (result: GeneralCallResult) => {
-        if (result?.result === 0 || result === undefined) {
-          //log(`${params.methodName} callback`, result)
+      hookApiCallbacks[callbackId] = (res: GeneralCallResult) => {
+        result = res
+        if (res?.result === 0 || ['undefined', 'number'].includes(typeof res)) {
          afterFirstCmd && secondCallback()
        }
        else {
-          log('ntqq api call failed,', method, result)
-          reject(`ntqq api call failed, ${method}, ${result.errMsg}`)
+          log('ntqq api call failed,', method, res)
+          reject(`ntqq api call failed, ${method}, ${res.errMsg}`)
        }
      }
    }
--- a/src/ntqqapi/services/NodeIKernelMsgService.ts
+++ b/src/ntqqapi/services/NodeIKernelMsgService.ts
@@ -168,9 +168,10 @@ export interface NodeIKernelMsgService {

  getLastMessageList(peer: Peer[]): Promise<unknown>

-  getAioFirstViewLatestMsgs(peer: Peer, num: number): unknown
+  getAioFirstViewLatestMsgs(peer: Peer, num: number): Promise<GeneralCallResult & {
+    msgList: RawMessage[]
+  }>

-  //deprecated 从9.9.15-26702版本开始，该接口已经废弃，请使用getMsgsEx
  getMsgs(peer: Peer, msgId: string, count: unknown, queryOrder: boolean): Promise<unknown>

  getMsgsIncludeSelf(peer: Peer, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & {
--- a/src/ntqqapi/types/msg.ts
+++ b/src/ntqqapi/types/msg.ts
@@ -275,7 +275,7 @@ export interface PicElement {
  thumbPath: Map<number, string>
  picWidth: number
  picHeight: number
-  fileSize: number
+  fileSize: string
  fileName: string
  fileUuid: string
  md5HexStr?: string
--- a/src/ntqqapi/wrapper.ts
+++ b/src/ntqqapi/wrapper.ts
@@ -11,7 +11,8 @@ import {
  NodeIKernelTipOffService,
  NodeIKernelSearchService
 } from './services'
-import os from 'node:os'
+import { constants } from 'node:os'
+import { Dict } from 'cosmokit'
 const Process = require('node:process')

 export interface NodeIQQNTWrapperSession {
@@ -72,7 +73,7 @@ const constructor = [

 Process.dlopenOrig = Process.dlopen

-Process.dlopen = function (module, filename, flags = os.constants.dlopen.RTLD_LAZY) {
+Process.dlopen = function (module: Dict, filename: string, flags = constants.dlopen.RTLD_LAZY) {
  const dlopenRet = this.dlopenOrig(module, filename, flags)
  for (let export_name in module.exports) {
    module.exports[export_name] = new Proxy(module.exports[export_name], {
--- a/src/onebot11/action/go-cqhttp/DownloadFile.ts
+++ b/src/onebot11/action/go-cqhttp/DownloadFile.ts
@@ -6,6 +6,7 @@ import { ActionName } from '../types'
 import { calculateFileMD5, fetchFile } from '@/common/utils'
 import { TEMP_DIR } from '@/common/globalVars'
 import { randomUUID } from 'node:crypto'
+import { Dict } from 'cosmokit'

 interface Payload {
  thread_count?: number
@@ -51,7 +52,7 @@ export class DownloadFile extends BaseAction<Payload, FileResponse> {
  }

  getHeaders(headersIn?: string | string[]): Record<string, string> {
-    const headers = {}
+    const headers: Dict = {}
    if (typeof headersIn == 'string') {
      headersIn = headersIn.split('[\\r\\n]')
    }
--- a/src/onebot11/action/go-cqhttp/GetGroupMsgHistory.ts
+++ b/src/onebot11/action/go-cqhttp/GetGroupMsgHistory.ts
@@ -8,8 +8,8 @@ import { MessageUnique } from '@/common/utils/messageUnique'

 interface Payload {
  group_id: number | string
-  message_seq?: number
-  count?: number
+  message_seq?: number | string
+  count?: number | string
  reverseOrder?: boolean
 }

@@ -27,13 +27,13 @@ export class GetGroupMsgHistory extends BaseAction<Payload, Response> {
    let msgList: RawMessage[] | undefined
    // 包含 message_seq 0
    if (!payload.message_seq) {
-      msgList = (await this.ctx.ntMsgApi.getLastestMsgByUids(peer, count))?.msgList
+      msgList = (await this.ctx.ntMsgApi.getAioFirstViewLatestMsgs(peer, +count)).msgList
    } else {
-      const startMsgId = (await MessageUnique.getMsgIdAndPeerByShortId(payload.message_seq))?.MsgId
-      if (!startMsgId) throw `消息${payload.message_seq}不存在`
-      msgList = (await this.ctx.ntMsgApi.getMsgHistory(peer, startMsgId, count)).msgList
+      const startMsgId = (await MessageUnique.getMsgIdAndPeerByShortId(+payload.message_seq))?.MsgId
+      if (!startMsgId) throw new Error(`消息${payload.message_seq}不存在`)
+      msgList = (await this.ctx.ntMsgApi.getMsgHistory(peer, startMsgId, +count)).msgList
    }
-    if (!msgList?.length) throw '未找到消息'
+    if (!msgList?.length) throw new Error('未找到消息')
    if (isReverseOrder) msgList.reverse()
    await Promise.all(
      msgList.map(async msg => {
--- a/src/onebot11/action/go-cqhttp/GetGroupRootFiles.ts
+++ b/src/onebot11/action/go-cqhttp/GetGroupRootFiles.ts
@@ -0,0 +1,62 @@
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
+import { OB11GroupFile, OB11GroupFileFolder } from '../../types'
+
+interface Payload {
+  group_id: string | number
+  file_count: string | number
+}
+
+interface Response {
+  files: OB11GroupFile[]
+  folders: OB11GroupFileFolder[]
+}
+
+export class GetGroupRootFiles extends BaseAction<Payload, Response> {
+  actionName = ActionName.GoCQHTTP_GetGroupRootFiles
+
+  async _handle(payload: Payload) {
+    const data = await this.ctx.ntGroupApi.getGroupFileList(payload.group_id.toString(), {
+      sortType: 1,
+      fileCount: +(payload.file_count ?? 50),
+      startIndex: 0,
+      sortOrder: 2,
+      showOnlinedocFolder: 0,
+    })
+
+    this.ctx.logger.info(data)
+
+    return {
+      files: data.filter(item => item.fileInfo)
+        .map(item => {
+          const file = item.fileInfo!
+          return {
+            group_id: +item.peerId,
+            file_id: file.fileId,
+            file_name: file.fileName,
+            busid: file.busId,
+            file_size: +file.fileSize,
+            upload_time: file.uploadTime,
+            dead_time: file.deadTime,
+            modify_time: file.modifyTime,
+            download_times: file.downloadTimes,
+            uploader: +file.uploaderUin,
+            uploader_name: file.uploaderName
+          }
+        }),
+      folders: data.filter(item => item.folderInfo)
+        .map(item => {
+          const folder = item.folderInfo!
+          return {
+            group_id: +item.peerId,
+            folder_id: folder.folderId,
+            folder_name: folder.folderName,
+            create_time: folder.createTime,
+            creator: +folder.createUin,
+            creator_name: folder.creatorName,
+            total_file_count: folder.totalFileCount
+          }
+        })
+    }
+  }
+}
--- a/src/onebot11/action/index.ts
+++ b/src/onebot11/action/index.ts
@@ -59,6 +59,7 @@ import { GetGroupSystemMsg } from './go-cqhttp/GetGroupSystemMsg'
 import { CreateGroupFileFolder } from './go-cqhttp/CreateGroupFileFolder'
 import { DelGroupFolder } from './go-cqhttp/DelGroupFolder'
 import { GetGroupAtAllRemain } from './go-cqhttp/GetGroupAtAllRemain'
+import { GetGroupRootFiles } from './go-cqhttp/GetGroupRootFiles'

 export function initActionMap(adapter: Adapter) {
  const actionHandlers = [
@@ -124,7 +125,8 @@ export function initActionMap(adapter: Adapter) {
    new GetGroupSystemMsg(adapter),
    new CreateGroupFileFolder(adapter),
    new DelGroupFolder(adapter),
-    new GetGroupAtAllRemain(adapter)
+    new GetGroupAtAllRemain(adapter),
+    new GetGroupRootFiles(adapter)
  ]
  const actionMap = new Map<string, BaseAction<any, any>>()
  for (const action of actionHandlers) {
--- a/src/onebot11/action/llonebot/Debug.ts
+++ b/src/onebot11/action/llonebot/Debug.ts
@@ -14,8 +14,8 @@ export default class Debug extends BaseAction<Payload, any> {
    const { ntMsgApi, ntFileApi, ntFileCacheApi, ntFriendApi, ntGroupApi, ntUserApi, ntWindowApi } = this.ctx
    const ntqqApi = [ntMsgApi, ntFriendApi, ntGroupApi, ntUserApi, ntFileApi, ntFileCacheApi, ntWindowApi]
    for (const ntqqApiClass of ntqqApi) {
-      const method = ntqqApiClass[payload.method] as Function
-      if (method) {
+      const method = ntqqApiClass[payload.method as keyof typeof ntqqApiClass]
+      if (method && method instanceof Function) {
        const result = method.apply(ntqqApiClass, payload.args)
        if (method.constructor.name === 'AsyncFunction') {
          return await result
--- a/src/onebot11/action/system/CanSendRecord.ts
+++ b/src/onebot11/action/system/CanSendRecord.ts
@@ -8,7 +8,7 @@ interface ReturnType {
 export default class CanSendRecord extends BaseAction<any, ReturnType> {
  actionName = ActionName.CanSendRecord

-  protected async _handle(payload): Promise<ReturnType> {
+  protected async _handle(payload: void): Promise<ReturnType> {
    return {
      yes: true,
    }
--- a/src/onebot11/action/types.ts
+++ b/src/onebot11/action/types.ts
@@ -77,5 +77,6 @@ export enum ActionName {
  GoCQHTTP_GetGroupSystemMsg = 'get_group_system_msg',
  GoCQHTTP_CreateGroupFileFolder = 'create_group_file_folder',
  GoCQHTTP_DelGroupFolder = 'delete_group_folder',
-  GoCQHTTP_GetGroupAtAllRemain = 'get_group_at_all_remain'
+  GoCQHTTP_GetGroupAtAllRemain = 'get_group_at_all_remain',
+  GoCQHTTP_GetGroupRootFiles = 'get_group_root_files'
 }
--- a/src/onebot11/connect/http.ts
+++ b/src/onebot11/connect/http.ts
@@ -10,6 +10,7 @@ import { OB11Message } from '../types'
 import { OB11BaseEvent } from '../event/OB11BaseEvent'
 import { handleQuickOperation, QuickOperationEvent } from '../helper/quickOperation'
 import { OB11HeartbeatEvent } from '../event/meta/OB11HeartbeatEvent'
+import { Dict } from 'cosmokit'

 type RegisterHandler = (res: Response, payload: any) => Promise<any>

@@ -159,7 +160,7 @@ class OB11HttpPost {

  public async emitEvent(event: OB11BaseEvent | OB11Message) {
    const msgStr = JSON.stringify(event)
-    const headers = {
+    const headers: Dict = {
      'Content-Type': 'application/json',
      'x-self-id': selfInfo.uin,
    }
--- a/src/onebot11/connect/ws.ts
+++ b/src/onebot11/connect/ws.ts
@@ -14,7 +14,7 @@ import { version } from '../../version'

 class OB11WebSocket {
  private wsServer?: WebSocketServer
-  private wsClients: WebSocket[] = []
+  private wsClients: { socket: WebSocket; emitEvent: boolean }[] = []

  constructor(protected ctx: Context, public config: OB11WebSocket.Config) {
  }
@@ -31,7 +31,7 @@ class OB11WebSocket {
    }
    this.wsServer?.on('connection', (socket, req) => {
      this.authorize(socket, req)
-      this.connect(socket)
+      this.connect(socket, req)
    })
  }

@@ -53,8 +53,8 @@ class OB11WebSocket {
  }

  public async emitEvent(event: OB11BaseEvent | OB11Message) {
-    this.wsClients.forEach(socket => {
-      if (socket.readyState === WebSocket.OPEN) {
+    this.wsClients.forEach(({ socket, emitEvent }) => {
+      if (emitEvent && socket.readyState === WebSocket.OPEN) {
        socket.send(JSON.stringify(event))
        this.ctx.logger.info('WebSocket 事件上报', socket.url ?? '', event.post_type)
      }
@@ -70,8 +70,8 @@ class OB11WebSocket {
      return
    }
    socket.send(JSON.stringify(data))
-    if (data['post_type']) {
-      this.ctx.logger.info('WebSocket 事件上报', socket.url ?? '', data['post_type'])
+    if ('post_type' in data) {
+      this.ctx.logger.info('WebSocket 事件上报', socket.url ?? '', data.post_type)
    }
  }

@@ -122,33 +122,40 @@ class OB11WebSocket {
    }
  }

-  private connect(socket: WebSocket) {
-    try {
-      this.reply(socket, new OB11LifeCycleEvent(LifeCycleSubType.CONNECT))
-    } catch (e) {
-      this.ctx.logger.error('发送生命周期失败', e)
+  private connect(socket: WebSocket, req: IncomingMessage) {
+    const url = req.url?.split('?').shift()
+    if (['/api', '/api/', '/', undefined].includes(url)) {
+      socket.on('message', msg => {
+        this.handleAction(socket, msg.toString())
+      })
+    }
+    if (['/event', '/event/', '/', undefined].includes(url)) {
+      try {
+        this.reply(socket, new OB11LifeCycleEvent(LifeCycleSubType.CONNECT))
+      } catch (e) {
+        this.ctx.logger.error('发送生命周期失败', e)
+      }
+
+      const disposeHeartBeat = this.ctx.setInterval(() => {
+        this.reply(socket, new OB11HeartbeatEvent(selfInfo.online!, true, this.config.heartInterval))
+      }, this.config.heartInterval)
+
+      socket.on('close', () => {
+        disposeHeartBeat()
+        this.ctx.logger.info('有一个 Websocket 连接断开')
+      })
    }

    socket.on('error', err => this.ctx.logger.error(err.message))

-    socket.on('message', msg => {
-      this.handleAction(socket, msg.toString())
-    })
-
    socket.on('ping', () => {
      socket.pong()
    })

-    const disposeHeartBeat = this.ctx.setInterval(() => {
-      this.reply(socket, new OB11HeartbeatEvent(selfInfo.online!, true, this.config.heartInterval))
-    }, this.config.heartInterval)
-
-    socket.on('close', () => {
-      disposeHeartBeat()
-      this.ctx.logger.info('有一个 Websocket 连接断开')
+    this.wsClients.push({
+      socket,
+      emitEvent: ['/event', '/event/', '/', undefined].includes(url)
    })
-
-    this.wsClients.push(socket)
  }
 }

@@ -192,8 +199,8 @@ class OB11WebSocketReverse {
      return
    }
    socket.send(JSON.stringify(data))
-    if (data['post_type']) {
-      this.ctx.logger.info('WebSocket 事件上报', socket.url ?? '', data['post_type'])
+    if ('post_type' in data) {
+      this.ctx.logger.info('WebSocket 事件上报', socket.url ?? '', data.post_type)
    }
  }

--- a/src/onebot11/cqcode.ts
+++ b/src/onebot11/cqcode.ts
@@ -44,7 +44,7 @@ export function decodeCQCode(source: string): OB11MessageData[] {
  return elements
 }

-export function encodeCQCode(data: OB11MessageData) {
+export function encodeCQCode(input: OB11MessageData) {
  const CQCodeEscapeText = (text: string) => {
    return text.replace(/\&/g, '&amp;').replace(/\[/g, '&#91;').replace(/\]/g, '&#93;')
  }
@@ -53,21 +53,20 @@ export function encodeCQCode(data: OB11MessageData) {
    return text.replace(/\&/g, '&amp;').replace(/\[/g, '&#91;').replace(/\]/g, '&#93;').replace(/,/g, '&#44;')
  }

-  if (data.type === 'text') {
-    return CQCodeEscapeText(data.data.text)
+  if (input.type === 'text') {
+    return CQCodeEscapeText(input.data.text)
  }

-  let result = '[CQ:' + data.type
-  for (const name in data.data) {
-    const value = data.data[name]
+  let result = '[CQ:' + input.type
+  for (const [key, value] of Object.entries(input.data)) {
    if (value === undefined) {
      continue
    }
    try {
      const text = value.toString()
-      result += `,${name}=${CQCodeEscape(text)}`
+      result += `,${key}=${CQCodeEscape(text)}`
    } catch (error) {
-      // If it can't be converted, skip this name-value pair
+      // If it can't be converted, skip this key-value pair
    }
  }
  result += ']'
--- a/src/onebot11/entities.ts
+++ b/src/onebot11/entities.ts
@@ -37,7 +37,6 @@ import { OB11GroupTitleEvent } from './event/notice/OB11GroupTitleEvent'
 import { OB11GroupCardEvent } from './event/notice/OB11GroupCardEvent'
 import { OB11GroupDecreaseEvent } from './event/notice/OB11GroupDecreaseEvent'
 import { OB11GroupMsgEmojiLikeEvent } from './event/notice/OB11MsgEmojiLikeEvent'
-import { mFaceCache } from '../ntqqapi/entities'
 import { OB11FriendAddNoticeEvent } from './event/notice/OB11FriendAddNoticeEvent'
 import { OB11FriendRecallNoticeEvent } from './event/notice/OB11FriendRecallNoticeEvent'
 import { OB11GroupRecallNoticeEvent } from './event/notice/OB11GroupRecallNoticeEvent'
@@ -47,6 +46,7 @@ import { OB11GroupEssenceEvent } from './event/notice/OB11GroupEssenceEvent'
 import { omit, isNullable } from 'cosmokit'
 import { Context } from 'cordis'
 import { selfInfo } from '@/common/globalVars'
+import { pathToFileURL } from 'node:url'

 export namespace OB11Entities {
  export async function message(ctx: Context, msg: RawMessage): Promise<OB11Message> {
@@ -105,10 +105,7 @@ export namespace OB11Entities {
    }

    for (let element of msg.elements) {
-      let message_data: OB11MessageData = {
-        data: {} as any,
-        type: 'unknown' as any,
-      }
+      let messageSegment: OB11MessageData | undefined
      if (element.textElement && element.textElement?.atType !== AtType.notAt) {
        let qq: string
        let name: string | undefined
@@ -129,7 +126,7 @@ export namespace OB11Entities {
            name = content.replace('@', '')
          }
        }
-        message_data = {
+        messageSegment = {
          type: OB11MessageDataType.at,
          data: {
            qq: qq!,
@@ -138,12 +135,16 @@ export namespace OB11Entities {
        }
      }
      else if (element.textElement) {
-        message_data['type'] = OB11MessageDataType.text
-        let text = element.textElement.content
+        const text = element.textElement.content
        if (!text.trim()) {
          continue
        }
-        message_data['data']['text'] = text
+        messageSegment = {
+          type: OB11MessageDataType.text,
+          data: {
+            text
+          }
+        }
      }
      else if (element.replyElement) {
        const { replyElement } = element
@@ -163,7 +164,7 @@ export namespace OB11Entities {
          if ((!replyMsg || records.msgRandom !== replyMsg.msgRandom) && msg.peerUin !== '284840486') {
            throw new Error('回复消息消息验证失败')
          }
-          message_data = {
+          messageSegment = {
            type: OB11MessageDataType.reply,
            data: {
              id: MessageUnique.createMsg(peer, replyMsg ? replyMsg.msgId : records.msgId).toString()
@@ -175,18 +176,17 @@ export namespace OB11Entities {
        }
      }
      else if (element.picElement) {
-        message_data['type'] = OB11MessageDataType.image
        const { picElement } = element
-        /*let fileName = picElement.fileName
-        const isGif = picElement.picType === PicType.gif
-        if (isGif && !fileName.endsWith('.gif')) {
-          fileName += '.gif'
-        }*/
-        message_data['data']['file'] = picElement.fileName
-        message_data['data']['subType'] = picElement.picSubType
-        //message_data['data']['file_id'] = picElement.fileUuid
-        message_data['data']['url'] = await ctx.ntFileApi.getImageUrl(picElement)
-        message_data['data']['file_size'] = picElement.fileSize
+        const fileSize = picElement.fileSize ?? '0'
+        messageSegment = {
+          type: OB11MessageDataType.image,
+          data: {
+            file: picElement.fileName,
+            subType: picElement.picSubType,
+            url: await ctx.ntFileApi.getImageUrl(picElement),
+            file_size: fileSize,
+          }
+        }
        MessageUnique.addFileCache({
          peerUid: msg.peerUid,
          msgId: msg.msgId,
@@ -195,21 +195,26 @@ export namespace OB11Entities {
          elementId: element.elementId,
          elementType: element.elementType,
          fileName: picElement.fileName,
-          fileSize: String(picElement.fileSize || '0'),
-          fileUuid: picElement.fileUuid
+          fileUuid: picElement.fileUuid,
+          fileSize,
        })
      }
      else if (element.videoElement) {
-        message_data['type'] = OB11MessageDataType.video
        const { videoElement } = element
-        message_data['data']['file'] = videoElement.fileName
-        message_data['data']['path'] = videoElement.filePath
-        //message_data['data']['file_id'] = videoElement.fileUuid
-        message_data['data']['file_size'] = videoElement.fileSize
-        message_data['data']['url'] = await ctx.ntFileApi.getVideoUrl({
+        const videoUrl = await ctx.ntFileApi.getVideoUrl({
          chatType: msg.chatType,
          peerUid: msg.peerUid,
        }, msg.msgId, element.elementId)
+        const fileSize = videoElement.fileSize ?? '0'
+        messageSegment = {
+          type: OB11MessageDataType.video,
+          data: {
+            file: videoElement.fileName,
+            url: videoUrl || pathToFileURL(videoElement.filePath).href,
+            path: videoElement.filePath,
+            file_size: fileSize,
+          }
+        }
        MessageUnique.addFileCache({
          peerUid: msg.peerUid,
          msgId: msg.msgId,
@@ -218,17 +223,23 @@ export namespace OB11Entities {
          elementId: element.elementId,
          elementType: element.elementType,
          fileName: videoElement.fileName,
-          fileSize: String(videoElement.fileSize || '0'),
-          fileUuid: videoElement.fileUuid!
+          fileUuid: videoElement.fileUuid!,
+          fileSize,
        })
      }
      else if (element.fileElement) {
-        message_data['type'] = OB11MessageDataType.file
        const { fileElement } = element
-        message_data['data']['file'] = fileElement.fileName
-        message_data['data']['path'] = fileElement.filePath
-        message_data['data']['file_id'] = fileElement.fileUuid
-        message_data['data']['file_size'] = fileElement.fileSize
+        const fileSize = fileElement.fileSize ?? '0'
+        messageSegment = {
+          type: OB11MessageDataType.file,
+          data: {
+            file: fileElement.fileName,
+            url: pathToFileURL(fileElement.filePath).href,
+            file_id: fileElement.fileUuid,
+            path: fileElement.filePath,
+            file_size: fileSize,
+          }
+        }
        MessageUnique.addFileCache({
          peerUid: msg.peerUid,
          msgId: msg.msgId,
@@ -237,17 +248,22 @@ export namespace OB11Entities {
          elementId: element.elementId,
          elementType: element.elementType,
          fileName: fileElement.fileName,
-          fileSize: String(fileElement.fileSize || '0'),
-          fileUuid: fileElement.fileUuid!
+          fileUuid: fileElement.fileUuid!,
+          fileSize,
        })
      }
      else if (element.pttElement) {
-        message_data['type'] = OB11MessageDataType.voice
        const { pttElement } = element
-        message_data['data']['file'] = pttElement.fileName
-        message_data['data']['path'] = pttElement.filePath
-        //message_data['data']['file_id'] = pttElement.fileUuid
-        message_data['data']['file_size'] = pttElement.fileSize
+        const fileSize = pttElement.fileSize ?? '0'
+        messageSegment = {
+          type: OB11MessageDataType.voice,
+          data: {
+            file: pttElement.fileName,
+            url: pathToFileURL(pttElement.filePath).href,
+            path: pttElement.filePath,
+            file_size: fileSize,
+          }
+        }
        MessageUnique.addFileCache({
          peerUid: msg.peerUid,
          msgId: msg.msgId,
@@ -256,59 +272,91 @@ export namespace OB11Entities {
          elementId: element.elementId,
          elementType: element.elementType,
          fileName: pttElement.fileName,
-          fileSize: String(pttElement.fileSize || '0'),
-          fileUuid: pttElement.fileUuid
+          fileUuid: pttElement.fileUuid,
+          fileSize,
        })
      }
      else if (element.arkElement) {
-        message_data['type'] = OB11MessageDataType.json
-        message_data['data']['data'] = element.arkElement.bytesData
+        const { arkElement } = element
+        messageSegment = {
+          type: OB11MessageDataType.json,
+          data: {
+            data: arkElement.bytesData
+          }
+        }
      }
      else if (element.faceElement) {
-        const faceId = element.faceElement.faceIndex
+        const { faceElement } = element
+        const faceId = faceElement.faceIndex
        if (faceId === FaceIndex.dice) {
-          message_data['type'] = OB11MessageDataType.dice
-          message_data['data']['result'] = element.faceElement.resultId
+          messageSegment = {
+            type: OB11MessageDataType.dice,
+            data: {
+              result: faceElement.resultId!
+            }
+          }
        }
        else if (faceId === FaceIndex.RPS) {
-          message_data['type'] = OB11MessageDataType.RPS
-          message_data['data']['result'] = element.faceElement.resultId
+          messageSegment = {
+            type: OB11MessageDataType.RPS,
+            data: {
+              result: faceElement.resultId!
+            }
+          }
        }
        else {
-          message_data['type'] = OB11MessageDataType.face
-          message_data['data']['id'] = element.faceElement.faceIndex.toString()
+          messageSegment = {
+            type: OB11MessageDataType.face,
+            data: {
+              id: faceId.toString()
+            }
+          }
        }
      }
      else if (element.marketFaceElement) {
-        message_data['type'] = OB11MessageDataType.mface
-        message_data['data']['summary'] = element.marketFaceElement.faceName
-        const md5 = element.marketFaceElement.emojiId
+        const { marketFaceElement } = element
+        const { emojiId } = marketFaceElement
        // 取md5的前两位
-        const dir = md5.substring(0, 2)
+        const dir = emojiId.substring(0, 2)
        // 获取组装url
        // const url = `https://p.qpic.cn/CDN_STATIC/0/data/imgcache/htdocs/club/item/parcel/item/${dir}/${md5}/300x300.gif?max_age=31536000`
-        const url = `https://gxh.vip.qq.com/club/item/parcel/item/${dir}/${md5}/raw300.gif`
-        message_data['data']['url'] = url
-        message_data['data']['emoji_id'] = element.marketFaceElement.emojiId
-        message_data['data']['emoji_package_id'] = String(element.marketFaceElement.emojiPackageId)
-        message_data['data']['key'] = element.marketFaceElement.key
-        mFaceCache.set(md5, element.marketFaceElement.faceName!)
+        const url = `https://gxh.vip.qq.com/club/item/parcel/item/${dir}/${emojiId}/raw300.gif`
+        messageSegment = {
+          type: OB11MessageDataType.mface,
+          data: {
+            summary: marketFaceElement.faceName!,
+            url,
+            emoji_id: emojiId,
+            emoji_package_id: marketFaceElement.emojiPackageId,
+            key: marketFaceElement.key
+          }
+        }
+        //mFaceCache.set(emojiId, element.marketFaceElement.faceName!)
      }
      else if (element.markdownElement) {
-        message_data['type'] = OB11MessageDataType.markdown
-        message_data['data']['data'] = element.markdownElement.content
+        const { markdownElement } = element
+        messageSegment = {
+          type: OB11MessageDataType.markdown,
+          data: {
+            data: markdownElement.content
+          }
+        }
      }
      else if (element.multiForwardMsgElement) {
-        message_data['type'] = OB11MessageDataType.forward
-        message_data['data']['id'] = msg.msgId
+        messageSegment = {
+          type: OB11MessageDataType.forward,
+          data: {
+            id: msg.msgId
+          }
+        }
      }
-      if ((message_data.type as string) !== 'unknown' && message_data.data) {
-        const cqCode = encodeCQCode(message_data)
+      if (messageSegment) {
+        const cqCode = encodeCQCode(messageSegment)
        if (messagePostFormat === 'string') {
          (resMsg.message as string) += cqCode
+        } else {
+          (resMsg.message as OB11MessageData[]).push(messageSegment)
        }
-        else (resMsg.message as OB11MessageData[]).push(message_data)
-
        resMsg.raw_message += cqCode
      }
    }
--- a/src/onebot11/types.ts
+++ b/src/onebot11/types.ts
@@ -133,20 +133,21 @@ export interface OB11MessageMFace {
    emoji_package_id: number
    emoji_id: string
    key: string
-    summary: string
+    summary?: string
+    url?: string
  }
 }

 export interface OB11MessageDice {
  type: OB11MessageDataType.dice
  data: {
-    result: number
+    result: number /* intended */ | string /* in fact */
  }
 }
 export interface OB11MessageRPS {
  type: OB11MessageDataType.RPS
  data: {
-    result: number
+    result: number | string
  }
 }

@@ -171,6 +172,7 @@ export interface OB11MessageFileBase {
    name?: string
    file: string
    url?: string
+    file_size?: string //扩展
  }
 }

@@ -184,14 +186,24 @@ export interface OB11MessageImage extends OB11MessageFileBase {

 export interface OB11MessageRecord extends OB11MessageFileBase {
  type: OB11MessageDataType.voice
+  data: OB11MessageFileBase['data'] & {
+    path?: string //扩展
+  }
 }

 export interface OB11MessageFile extends OB11MessageFileBase {
  type: OB11MessageDataType.file
+  data: OB11MessageFileBase['data'] & {
+    file_id?: string
+    path?: string
+  }
 }

 export interface OB11MessageVideo extends OB11MessageFileBase {
  type: OB11MessageDataType.video
+  data: OB11MessageFileBase['data'] & {
+    path?: string //扩展
+  }
 }

 export interface OB11MessageAt {
@@ -298,3 +310,27 @@ export interface OB11Status {
  online: boolean | null
  good: boolean
 }
+
+export interface OB11GroupFile {
+  group_id: number
+  file_id: string
+  file_name: string
+  busid: number
+  file_size: number
+  upload_time: number
+  dead_time: number
+  modify_time: number
+  download_times: number
+  uploader: number
+  uploader_name: string
+}
+
+export interface OB11GroupFileFolder {
+  group_id: number
+  folder_id: string
+  folder_name: string
+  create_time: number
+  creator: number
+  creator_name: string
+  total_file_count: number
+}
--- a/src/renderer/components/select.ts
+++ b/src/renderer/components/select.ts
@@ -38,11 +38,9 @@ window.customElements.define(

      const buttonClick = () => {
        const isHidden = this._context.classList.toggle('hidden')
-        window[`${isHidden ? 'remove' : 'add'}EventListener`]('pointerdown', windowPointerDown)
-      }
-
-      const windowPointerDown = ({ target }) => {
-        if (!this.contains(target)) buttonClick()
+        window[`${isHidden ? 'remove' : 'add'}EventListener`]('pointerdown', ({ target }) => {
+          if (!this.contains(target as any)) buttonClick()
+        })
      }

      this._button.addEventListener('click', buttonClick)
--- a/src/renderer/index.ts
+++ b/src/renderer/index.ts
@@ -1,8 +1,10 @@
-import { CheckVersion } from '../common/types'
+import { CheckVersion, Config } from '../common/types'
 import { SettingButton, SettingItem, SettingList, SettingSwitch, SettingSelect } from './components'
+import { version } from '../version'
 // @ts-ignore
 import StyleRaw from './style.css?raw'
-import { version } from '../version'
+
+type HostsType = 'httpHosts' | 'wsHosts'

 function isEmpty(value: unknown) {
  return value === undefined || value === null || value === ''
@@ -10,17 +12,20 @@ function isEmpty(value: unknown) {

 async function onSettingWindowCreated(view: Element) {
  //window.llonebot.log('setting window created')
-  let config = await window.llonebot.getConfig()
-  let ob11Config = { ...config.ob11 }
+  const config = await window.llonebot.getConfig()
+  const ob11Config = { ...config.ob11 }

  const setConfig = (key: string, value: any) => {
    const configKey = key.split('.')
-    if (key.indexOf('ob11') === 0) {
-      if (configKey.length === 2) ob11Config[configKey[1]] = value
-      else ob11Config[key] = value
+    if (key.startsWith('ob11')) {
+      if (configKey.length === 2) Object.assign(ob11Config, { [configKey[1]]: value })
+      else Object.assign(ob11Config, { [key]: value })
    } else {
-      if (configKey.length === 2) config[configKey[0]][configKey[1]] = value
-      else config[key] = value
+      if (configKey.length === 2) {
+        Object.assign(config[configKey[0] as keyof Config[keyof Config]], { [configKey[1]]: value })
+      } else {
+        Object.assign(config, { [key]: value })
+      }
      if (!['heartInterval', 'token', 'ffmpeg'].includes(key)) {
        window.llonebot.setConfig(false, config)
      }
@@ -244,7 +249,7 @@ async function onSettingWindowCreated(view: Element) {
    window.LiteLoader.api.openExternal('https://llonebot.github.io/')
  })
  // 生成反向地址列表
-  const buildHostListItem = (type: string, host: string, index: number, inputAttrs: any = {}) => {
+  const buildHostListItem = (type: HostsType, host: string, index: number, inputAttrs: any = {}) => {
    const dom = {
      container: document.createElement('setting-item'),
      input: document.createElement('input'),
@@ -276,7 +281,7 @@ async function onSettingWindowCreated(view: Element) {

    return dom.container
  }
-  const buildHostList = (hosts: string[], type: string, inputAttr: any = {}) => {
+  const buildHostList = (hosts: string[], type: HostsType, inputAttr: any = {}) => {
    const result: HTMLElement[] = []

    hosts.forEach((host, index) => {
@@ -285,12 +290,12 @@ async function onSettingWindowCreated(view: Element) {

    return result
  }
-  const addReverseHost = (type: string, doc: Document = document, inputAttr: any = {}) => {
+  const addReverseHost = (type: HostsType, doc: Document = document, inputAttr: any = {}) => {
    const hostContainerDom = doc.body.querySelector(`#config-ob11-${type}-list`)
    hostContainerDom?.appendChild(buildHostListItem(type, '', ob11Config[type].length, inputAttr))
    ob11Config[type].push('')
  }
-  const initReverseHost = (type: string, doc: Document = document) => {
+  const initReverseHost = (type: HostsType, doc: Document = document) => {
    const hostContainerDom = doc.body.querySelector(`#config-ob11-${type}-list`)
      ;[...hostContainerDom?.childNodes!].forEach((dom) => dom.remove())
    buildHostList(ob11Config[type], type).forEach((dom) => {
@@ -431,7 +436,7 @@ function init() {
 }

 if (location.hash === '#/blank') {
-  globalThis.navigation.addEventListener('navigatesuccess', init, { once: true })
+  globalThis.navigation?.addEventListener('navigatesuccess', init, { once: true })
 } else {
  init()
 }
--- a/src/version.ts
+++ b/src/version.ts
@@ -1 +1 @@
-export const version = '3.31.5'
+export const version = '3.31.6'
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,10 +1,10 @@
 {
  "compilerOptions": {
    "target": "ESNext",
-    "module": "commonjs",
+    "module": "CommonJS",
    "outDir": "./dist",
    "strict": true,
-    "noImplicitAny": false,
+    "isolatedModules": true,
    "esModuleInterop": true,
    "allowSyntheticDefaultImports": true,
    "experimentalDecorators": true,
Author	SHA1	Message	Date
idranme	7904f45c20	Merge pull request #392 from LLOneBot/dev 3.31.6	2024-09-03 18:38:07 +08:00
idranme	1afdad1452	chore: v3.31.6	2024-09-03 18:34:30 +08:00
idranme	cd930c43b6	feat: GetGroupRootFiles	2024-09-03 15:14:05 +08:00
idranme	b7efbdf239	fix: ws	2024-09-03 13:16:25 +08:00
idranme	56706f3838	chore	2024-09-03 01:24:21 +08:00
idranme	387c9dcb52	refactor	2024-09-03 01:04:16 +08:00
idranme	a7bb55b31c	chore	2024-09-02 19:53:18 +08:00
idranme	fbf09e1db4	chore	2024-09-02 19:48:17 +08:00
idranme	9b98f8f33d	optimize	2024-09-02 19:30:23 +08:00
idranme	727f399de6	fix: GetGroupMsgHistory	2024-09-02 19:24:27 +08:00
idranme	e03b82fb44	optimize: ci	2024-09-02 18:28:21 +08:00