Merge pull request #766 from LLOneBot/dev

chore: update version to 7.12.14

Author: idranme

doc/更新日志.txt

@@ -1,3 +1,9 @@
+V7.12.14
+更新时间 2026-05-15
+
+* Milky 修复 get_history_messages API 获取包含 ark 的消息时可能报错
+
+=================
 V7.12.13
 更新时间 2026-05-05
 

package-dist.json

@@ -1 +1 @@
-{"name":"llonebot-dist","version":"7.12.13","type":"module","description":"","main":"llbot.js","author":"linyuchen","repository":{"type":"git","url":"https://github.com/LLOneBot/LuckyLilliaBot"}}
+{"name":"llonebot-dist","version":"7.12.14","type":"module","description":"","main":"llbot.js","author":"linyuchen","repository":{"type":"git","url":"https://github.com/LLOneBot/LuckyLilliaBot"}}

package.json

@@ -21,7 +21,7 @@
   "dependencies": {
     "@cordisjs/plugin-logger": "^1.0.2",
     "@cordisjs/plugin-timer": "^1.1.1",
-    "@hono/node-server": "^2.0.0",
+    "@hono/node-server": "^2.0.2",
     "@minatojs/driver-sqlite": "^5.0.3",
     "@saltify/milky-types": "^1.2.2",
     "@saltify/typeproto": "^0.4.1",
@@ -30,11 +30,11 @@
     "compare-versions": "^6.1.1",
     "cordis": "^4.0.0-rc.4",
     "cosmokit": "^1.8.1",
-    "fast-xml-parser": "^5.7.2",
+    "fast-xml-parser": "^5.7.3",
     "file-type": "^22.0.1",
     "fluent-ffmpeg": "^2.1.3",
     "get-port": "^7.2.0",
-    "hono": "^4.12.15",
+    "hono": "^4.12.18",
     "image-size": "^2.0.2",
     "json5": "^2.2.3",
     "minato": "^4.0.1",
@@ -55,7 +55,7 @@
     "ts-case-convert": "^2.1.0",
     "tsx": "^4.21.0",
     "typescript": "^6.0.3",
-    "vite": "^8.0.10",
+    "vite": "^8.0.11",
     "vite-plugin-cp": "^6.0.3",
     "vitest": "^4.1.5"
   },

src/common/types.ts

@@ -147,25 +147,12 @@ export interface CheckVersion {
   version: string
 }
 
-
 export interface FileCache {
-  fileName: string
-  fileSize: string
-  msgId: string
-  peerUid: string
-  chatType: number
-  elementId: string
-  elementType: number
-}
-
-export interface FileCacheV2 {
   fileName: string
   fileSize: string
   fileUuid: string
-  msgId: string
   msgTime: number
-  peerUid: string
   chatType: number
-  elementId: string
   elementType: number
+  md5HexStr: string
 }

src/common/utils/file.ts

@@ -7,6 +7,7 @@ import { TEMP_DIR } from '../globalVars'
 import { randomUUID, createHash } from 'node:crypto'
 import { fileURLToPath } from 'node:url'
 import { Context } from 'cordis'
+import { ChatType, ElementType } from '@/ntqqapi/types'
 
 // 定义一个异步函数来检查文件是否存在
 export function checkFileReceived(path: string, timeout: number = 3000): Promise<void> {
@@ -122,7 +123,7 @@ export async function uri2local(ctx: Context, uri: string, needExt?: boolean): P
       let filePath = path.join(TEMP_DIR, fileName)
       await fsPromise.writeFile(filePath, res.data)
       if (needExt) {
-        const ext = (await ctx.ntFileApi.getFileType(filePath)).ext
+        const ext = (await getFileType(filePath)).ext
         fileName += `.${ext}`
         const newPath = `${filePath}.${ext}`
         await fsPromise.rename(filePath, newPath)
@@ -141,7 +142,7 @@ export async function uri2local(ctx: Context, uri: string, needExt?: boolean): P
     const base64 = uri.replace(/^base64:\/\//, '')
     await fsPromise.writeFile(filePath, base64, 'base64')
     if (needExt) {
-      const ext = (await ctx.ntFileApi.getFileType(filePath)).ext
+      const ext = (await getFileType(filePath)).ext
       filename += `.${ext}`
       await fsPromise.rename(filePath, `${filePath}.${ext}`)
       filePath = `${filePath}.${ext}`
@@ -158,7 +159,7 @@ export async function uri2local(ctx: Context, uri: string, needExt?: boolean): P
       let filePath = path.join(TEMP_DIR, filename)
       await fsPromise.writeFile(filePath, base64, 'base64')
       if (needExt) {
-        const ext = (await ctx.ntFileApi.getFileType(filePath)).ext
+        const ext = (await getFileType(filePath)).ext
         filename += `.${ext}`
         await fsPromise.rename(filePath, `${filePath}.${ext}`)
         filePath = `${filePath}.${ext}`
@@ -174,15 +175,21 @@ export async function uri2local(ctx: Context, uri: string, needExt?: boolean): P
       fileCache = await ctx.store.getFileCacheByName(uri)
     }
     if (fileCache?.length) {
-      const downloadPath = await ctx.ntFileApi.downloadMedia(
-        fileCache[0].msgId,
-        fileCache[0].chatType,
-        fileCache[0].peerUid,
-        fileCache[0].elementId,
-        '',
-        '',
-      )
-      return { success: true, errMsg: '', fileName: fileCache[0].fileName, path: downloadPath, isLocal: true }
+      const isGroup = fileCache[0].chatType === ChatType.Group
+      let url
+      if (fileCache[0].elementType === ElementType.Pic) {
+        const originImageUrl = `/download?appid=${isGroup ? 1407 : 1406}&fileid=${fileCache[0].fileUuid}&spec=0`
+        url = await ctx.ntFileApi.getImageUrl(originImageUrl, fileCache[0].md5HexStr)
+      } else if (fileCache[0].elementType === ElementType.Video) {
+        url = await ctx.ntFileApi.getVideoUrl(fileCache[0].fileUuid, isGroup)
+      } else if (fileCache[0].elementType === ElementType.Ptt) {
+        url = await ctx.ntFileApi.getPttUrl(fileCache[0].fileUuid, isGroup)
+      }
+      if (url) {
+        return await uri2local(ctx, url, needExt)
+      } else {
+        return { success: false, errMsg: `不支持的文件类型: ${fileCache[0].elementType}`, fileName: '', path: '', isLocal: false }
+      }
     }
   }
 

src/common/utils/misc.ts

@@ -70,3 +70,7 @@ export function uint32ToIPV4Addr(value: number) {
 export function sleep(ms = 0) {
   return new Promise<void>((resolve) => setTimeout(resolve, ms))
 }
+
+export function isHttpUrl(str: string) {
+  return /^https?:\/\/.+/.test(str)
+}

src/main/main.ts

@@ -17,7 +17,6 @@ import { Context } from 'cordis'
 import { selfInfo, LOG_DIR, TEMP_DIR, dbDir } from '../common/globalVars'
 import {
   NTQQFileApi,
-  NTQQFileCacheApi,
   NTQQFriendApi,
   NTQQGroupApi,
   NTLoginApi,
@@ -64,7 +63,6 @@ async function onLoad() {
   ctx.plugin(ConfigService)
   ctx.plugin(PMHQ)
   ctx.plugin(NTQQFileApi)
-  ctx.plugin(NTQQFileCacheApi)
   ctx.plugin(NTQQFriendApi)
   ctx.plugin(NTQQGroupApi)
   ctx.plugin(NTLoginApi)

src/main/pmhq/index.ts

@@ -1,5 +1,5 @@
 import { PMHQBase } from './base'
-import { FriendMixin, GroupMixin, MediaMixin, MessageMixin, UserMixin } from './mixins'
+import { FriendMixin, GroupMixin, MediaMixin, MessageMixin, SystemMixin, UserMixin } from './mixins'
 
 export type {
   PBData,
@@ -49,7 +49,7 @@ function applyMixins<TBase extends Constructor, TMixins extends readonly Mixin<a
 /**
  * PMHQ 类 - 通过 Mixin 模式组合所有功能
  */
-const mixins = [GroupMixin, FriendMixin, MediaMixin, MessageMixin, UserMixin] as const
+const mixins = [GroupMixin, FriendMixin, MediaMixin, MessageMixin, UserMixin, SystemMixin] as const
 export const PMHQ = applyMixins(PMHQBase, mixins)
 
 declare module 'cordis' {

src/main/pmhq/mixins/friend.ts

@@ -46,5 +46,68 @@ export function FriendMixin<T extends new (...args: any[]) => PMHQBase>(Base: T)
         url: `https://${download.downloadDns}/ftn_handler/${download.downloadUrl.toString('hex')}/?fname=${encodeURIComponent(fileName)}`
       }
     }
+
+    async setFriendRequest(targetUid: string, accept: number) {
+      const body = Oidb.SetFriendRequestReq.encode({
+        targetUid,
+        accept,
+      })
+      const data = Oidb.Base.encode({
+        command: 0xb5d,
+        subCommand: 44,
+        body,
+      })
+      await this.httpSendPB('OidbSvcTrpcTcp.0xb5d_44', data)
+    }
+
+    async setFilteredFriendRequestReq(selfUid: string, requestUid: string) {
+      const body = Oidb.SetFilteredFriendRequestReq.encode({
+        selfUid,
+        requestUid,
+      })
+      const data = Oidb.Base.encode({
+        command: 0xd72,
+        subCommand: 0,
+        body,
+      })
+      await this.httpSendPB('OidbSvcTrpcTcp.0xd72_0', data)
+    }
+
+    async fetchFriends() {
+      const body = Oidb.IncPullReq.encode({
+        reqCount: 500,
+        flag: 1,
+        requestBiz: [{
+          bizType: 1,
+          bizData: {
+            extBusi: [102, 103, 20002, 20009, 20031, 20037, 27394]
+          }
+        }]
+      })
+      const data = Oidb.Base.encode({
+        command: 0xfd4,
+        subCommand: 1,
+        body,
+      })
+      const res = await this.httpSendPB('OidbSvcTrpcTcp.0xfd4_1', data)
+      const oidbRespBody = Oidb.Base.decode(Buffer.from(res.pb, 'hex')).body
+      return Oidb.IncPullResp.decode(oidbRespBody)
+    }
+
+    async getFriendRecommendContactArk(uin: number) {
+      const body = Oidb.GetFriendRecommendContactArkReq.encode({
+        uin,
+        phoneNumber: '-',
+        jumpUrl: `mqqapi://card/show_pslcard?src_type=internal&source=sharecard&version=1&uin=${uin}`,
+      })
+      const data = Oidb.Base.encode({
+        command: 0x12b6,
+        subCommand: 0,
+        body,
+      })
+      const res = await this.httpSendPB('OidbSvcTrpcTcp.0x12b6_0', data)
+      const oidbRespBody = Oidb.Base.decode(Buffer.from(res.pb, 'hex')).body
+      return Oidb.GetFriendRecommendContactArkResp.decode(oidbRespBody)
+    }
   }
 }

src/main/pmhq/mixins/index.ts

@@ -3,3 +3,4 @@ export { GroupMixin } from './group'
 export { MediaMixin } from './media'
 export { MessageMixin } from './message'
 export { UserMixin } from './user'
+export { SystemMixin } from './system'