chore: ver 3.18.1

# Conflicts:
#	src/common/utils/file.ts

manifest.json

@@ -1,10 +1,10 @@
 {
   "manifest_version": 4,
   "type": "extension",
-  "name": "LLOneBot v3.17.0",
+  "name": "LLOneBot v3.18.1",
   "slug": "LLOneBot",
   "description": "LiteLoaderQQNT的OneBotApi,不支持商店在线更新",
-  "version": "3.17.0",
+  "version": "3.18.1",
   "icon": "./icon.jpg",
   "authors": [
     {

package-lock.json

@@ -14,7 +14,7 @@
         "file-type": "^19.0.0",
         "fluent-ffmpeg": "^2.1.2",
         "level": "^8.0.1",
-        "silk-wasm": "^3.2.3",
+        "silk-wasm": "^3.2.4",
         "utf-8-validate": "^6.0.3",
         "uuid": "^9.0.1",
         "ws": "^8.16.0"
@@ -5895,9 +5895,9 @@
       }
     },
     "node_modules/silk-wasm": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/silk-wasm/-/silk-wasm-3.2.3.tgz",
-      "integrity": "sha512-zZ3hgMpiPR6cFnKvCPgPpCwx6n5RoJCbEGIFlge2kAxAmgzBTf0b2F2xIPG5W4obUhQPQXXTTH074eGZJK01xw=="
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/silk-wasm/-/silk-wasm-3.2.4.tgz",
+      "integrity": "sha512-oBkXmdIRl7cyzpoXEeEVN7v1M2yCnH1/bN8oANoYTvCqbYa5lM/CGJP47DYbpUFVO9PUpm58KP/HZaVzt4J6jw=="
     },
     "node_modules/slash": {
       "version": "4.0.0",

package.json

@@ -19,7 +19,7 @@
     "file-type": "^19.0.0",
     "fluent-ffmpeg": "^2.1.2",
     "level": "^8.0.1",
-    "silk-wasm": "^3.2.3",
+    "silk-wasm": "^3.2.4",
     "utf-8-validate": "^6.0.3",
     "uuid": "^9.0.1",
     "ws": "^8.16.0"

src/common/config.ts

@@ -30,6 +30,7 @@ export class ConfigUtil {
         let ob11Default: OB11Config = {
             httpPort: 3000,
             httpHosts: [],
+            httpSecret: "",
             wsPort: 3001,
             wsHosts: [],
             enableHttp: true,

src/common/types.ts

@@ -1,6 +1,7 @@
 export interface OB11Config {
   httpPort: number
   httpHosts: string[]
+  httpSecret?: string
   wsPort: number
   wsHosts: string[]
   enableHttp?: boolean

src/common/utils/file.ts

@@ -91,6 +91,23 @@ export async function encodeSilk(filePath: string) {
         return isWav(fs.readFileSync(filePath));
     }
 
+    async function guessDuration(pttPath: string){
+        const pttFileInfo = await fsPromise.stat(pttPath)
+        let duration = pttFileInfo.size / 1024 / 3  // 3kb/s
+        duration = Math.floor(duration)
+        duration = Math.max(1, duration)
+        log(`通过文件大小估算语音的时长:`, duration)
+        return duration
+    }
+
+    function verifyDuration(oriDuration: number, guessDuration: number){
+        // 单位都是秒
+        if (oriDuration - guessDuration > 10){
+            return guessDuration
+        }
+        oriDuration = Math.max(1, oriDuration)
+        return oriDuration
+    }
     // async function getAudioSampleRate(filePath: string) {
     //     try {
     //         const mm = await import('music-metadata');
@@ -104,7 +121,6 @@ export async function encodeSilk(filePath: string) {
     // }
 
     try {
-        const fileName = path.basename(filePath);
         const pttPath = path.join(DATA_DIR, uuidv4());
         if (getFileHeader(filePath) !== "02232153494c4b") {
             log(`语音文件${filePath}需要转换成silk`)
@@ -118,7 +134,7 @@ export async function encodeSilk(filePath: string) {
                     if (ffmpegPath) {
                         ffmpeg.setFfmpegPath(ffmpegPath);
                     }
-                    ffmpeg(filePath).toFormat("wav").audioChannels(2).on('end', function () {
+                    ffmpeg(filePath).toFormat("wav").audioChannels(1).audioFrequency(24000).on('end', function () {
                         log('wav转换完成');
                     })
                         .on('error', function (err) {
@@ -139,23 +155,22 @@ export async function encodeSilk(filePath: string) {
             fs.writeFileSync(pttPath, silk.data);
             fs.unlink(wavPath, (err) => {
             });
-            log(`语音文件${filePath}转换成功!`, pttPath)
+            const gDuration = await guessDuration(pttPath)
+            log(`语音文件${filePath}转换成功!`, pttPath, `时长:`, silk.duration)
             return {
                 converted: true,
                 path: pttPath,
-                duration: silk.duration,
+                duration: verifyDuration(silk.duration / 1000, gDuration),
             };
         } else {
-            const pcm = fs.readFileSync(filePath);
+            const silk = fs.readFileSync(filePath);
             let duration = 0;
+            const gDuration = await guessDuration(filePath)
             try {
-                duration = getDuration(pcm);
+                duration = verifyDuration(getDuration(silk) / 1000, gDuration);
             } catch (e) {
-                log("获取语音文件时长失败", filePath, e.stack)
-                duration = fs.statSync(filePath).size / 1024 / 3  // 每3kb大约1s
-                duration = Math.floor(duration)
-                duration = Math.max(1, duration)
-                log("使用文件大小估算时长", duration)
+                log("获取语音文件时长失败, 使用文件大小推测时长", filePath, e.stack)
+                duration = gDuration;
             }
 
             return {

src/common/utils/index.ts

@@ -11,7 +11,7 @@ export const DATA_DIR = global.LiteLoader.plugins["LLOneBot"].path.data;
 export const TEMP_DIR = path.join(DATA_DIR, "temp");
 export const PLUGIN_DIR = global.LiteLoader.plugins["LLOneBot"].path.plugin;
 if (!fs.existsSync(TEMP_DIR)) {
-    fs.mkdirSync(TEMP_DIR);
+    fs.mkdirSync(TEMP_DIR, {recursive: true});
 }
 export {getVideoInfo} from "./video";
 export {checkFfmpeg} from "./video";

src/common/utils/qqpkg.ts

@@ -8,3 +8,5 @@ type QQPkgInfo = {
 }
 
 export const qqPkgInfo: QQPkgInfo = require(path.join(process.resourcesPath, "app/package.json"))
+
+export const isQQ998: boolean = qqPkgInfo.buildVersion >= "22106"

src/ntqqapi/api/msg.ts

@@ -5,6 +5,7 @@ import {selfInfo} from "../../common/data";
 import {ReceiveCmdS, registerReceiveHook} from "../hook";
 import {log} from "../../common/utils/log";
 import {sleep} from "../../common/utils/helper";
+import {isQQ998} from "../../common/utils";
 
 export let sendMessagePool: Record<string, ((sendSuccessMsg: RawMessage) => void) | null> = {}// peerUid: callbackFunnc
 
@@ -25,7 +26,7 @@ export class NTQQMsgApi {
     }
     static async getMsgHistory(peer: Peer, msgId: string, count: number) {
         return await callNTQQApi<GeneralCallResult & {msgList: RawMessage[]}>({
-            methodName: NTQQApiMethod.HISTORY_MSG,
+            methodName: isQQ998 ? NTQQApiMethod.HISTORY_MSG_998 : NTQQApiMethod.HISTORY_MSG,
             args: [{
                 peer,
                 msgId,

src/ntqqapi/constructor.ts

@@ -211,7 +211,7 @@ export class SendMsgElementConstructor {
                 md5HexStr: md5,
                 fileSize: fileSize,
                 // duration: Math.max(1, Math.round(fileSize / 1024 / 3)), // 一秒钟大概是3kb大小, 小于1秒的按1秒算
-                duration: duration / 1000,
+                duration: duration,
                 formatType: 1,
                 voiceType: 1,
                 voiceChangeType: 0,

src/ntqqapi/ntcall.ts

@@ -23,7 +23,8 @@ export enum NTQQApiClass {
 export enum NTQQApiMethod {
     RECENT_CONTACT = "nodeIKernelRecentContactService/fetchAndSubscribeABatchOfRecentContact",
     ADD_ACTIVE_CHAT = "nodeIKernelMsgService/getAioFirstViewLatestMsgsAndAddActiveChat",  // 激活群助手内的聊天窗口，这样才能收到消息
-    HISTORY_MSG = "nodeIKernelMsgService/getMsgsIncludeSelfAndAddActiveChat",
+    HISTORY_MSG_998 = "nodeIKernelMsgService/getMsgsIncludeSelfAndAddActiveChat",
+    HISTORY_MSG = "nodeIKernelMsgService/getMsgsIncludeSelf",
     LIKE_FRIEND = "nodeIKernelProfileLikeService/setBuddyProfileLike",
     SELF_INFO = "fetchAuthData",
     FRIENDS = "nodeIKernelBuddyService/getBuddyList",
@@ -117,7 +118,7 @@ export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
         }
         const apiArgs = [methodName, ...args]
         if (!cbCmd) {
-            // QQ后端会返回结果，并且可以插根据uuid识别
+            // QQ后端会返回结果，并且可以根据uuid识别
             hookApiCallbacks[uuid] = (r: ReturnType) => {
                 success = true
                 resolve(r)

src/onebot11/action/SetFriendAddRequest.ts

@@ -12,7 +12,8 @@ export default class SetFriendAddRequest extends BaseAction<Payload, null> {
     actionName = ActionName.SetFriendAddRequest;
 
     protected async _handle(payload: Payload): Promise<null> {
-        await NTQQFriendApi.handleFriendRequest(parseInt(payload.flag), payload.approve)
+        const approve = payload.approve.toString() === "true";
+        await NTQQFriendApi.handleFriendRequest(parseInt(payload.flag), approve)
         return null;
     }
 }

src/onebot11/action/SetGroupAddRequest.ts

@@ -16,8 +16,9 @@ export default class SetGroupAddRequest extends BaseAction<Payload, null> {
 
     protected async _handle(payload: Payload): Promise<null> {
         const seq = payload.flag.toString();
+        const approve = payload.approve.toString() === "true";
         await NTQQGroupApi.handleGroupRequest(seq,
-            payload.approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
+            approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
             payload.reason
         )
         return null

src/onebot11/action/SetGroupAdmin.ts

@@ -15,10 +15,11 @@ export default class SetGroupAdmin extends BaseAction<Payload, null> {
 
     protected async _handle(payload: Payload): Promise<null> {
         const member = await getGroupMember(payload.group_id, payload.user_id)
+        const enable = payload.enable.toString() === "true"
         if (!member) {
             throw `群成员${payload.user_id}不存在`
         }
-        await NTQQGroupApi.setMemberRole(payload.group_id.toString(), member.uid, payload.enable ? GroupMemberRole.admin : GroupMemberRole.normal)
+        await NTQQGroupApi.setMemberRole(payload.group_id.toString(), member.uid, enable ? GroupMemberRole.admin : GroupMemberRole.normal)
         return null
     }
 }

src/onebot11/action/SetGroupWholeBan.ts

@@ -11,8 +11,8 @@ export default class SetGroupWholeBan extends BaseAction<Payload, null> {
     actionName = ActionName.SetGroupWholeBan
 
     protected async _handle(payload: Payload): Promise<null> {
-
-        await NTQQGroupApi.banGroup(payload.group_id.toString(), !!payload.enable)
+        const enable = payload.enable.toString() === "true"
+        await NTQQGroupApi.banGroup(payload.group_id.toString(), enable)
         return null
     }
 }

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

@@ -11,7 +11,8 @@ import {log} from "../../../common/utils";
 
 interface Payload {
     group_id: number
-    message_seq: number
+    message_seq: number,
+    count: number
 }
 
 export default class GoCQHTTPGetGroupMsgHistory extends BaseAction<Payload, OB11Message[]> {
@@ -24,7 +25,7 @@ export default class GoCQHTTPGetGroupMsgHistory extends BaseAction<Payload, OB11
         }
         const startMsgId = (await dbUtil.getMsgByShortId(payload.message_seq))?.msgId || "0"
         // log("startMsgId", startMsgId)
-        let msgList = (await NTQQMsgApi.getMsgHistory({chatType: ChatType.group, peerUid: group.groupCode}, startMsgId, 20)).msgList
+        let msgList = (await NTQQMsgApi.getMsgHistory({chatType: ChatType.group, peerUid: group.groupCode}, startMsgId, parseInt(payload.count.toString()) || 0)).msgList
         await Promise.all(msgList.map(async msg => {
             msg.msgShortId = await dbUtil.addMsg(msg)
         }))

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

@@ -6,7 +6,9 @@ export class GoCQHTTPSendGroupForwardMsg extends SendMsg {
     actionName = ActionName.GoCQHTTP_SendGroupForwardMsg;
 
     protected async check(payload: OB11PostSendMsg) {
-        payload.message = this.convertMessage2List(payload.messages);
+        if (payload.messages){
+            payload.message = this.convertMessage2List(payload.messages);
+        }
         return super.check(payload);
     }
 }

src/onebot11/server/postOB11Event.ts

@@ -6,6 +6,7 @@ import {WebSocket as WebSocketClass} from "ws";
 import {wsReply} from "./ws/reply";
 import {log} from "../../common/utils/log";
 import {getConfigUtil} from "../../common/config";
+import crypto from 'crypto';
 
 export type PostEventType = OB11Message | OB11BaseMetaEvent | OB11BaseNoticeEvent
 
@@ -39,18 +40,26 @@ export function postOB11Event(msg: PostEventType, reportSelf = false) {
         }
     }
     if (config.ob11.enableHttpPost) {
+        const msgStr = JSON.stringify(msg);
+        const hmac = crypto.createHmac('sha1', config.ob11.httpSecret);
+        hmac.update(msgStr);
+        const sig = hmac.digest('hex');
+        let headers = {
+            "Content-Type": "application/json",
+            "x-self-id": selfInfo.uin
+        }
+        if (config.ob11.httpSecret) {
+            headers["x-signature"] = "sha1=" + sig;
+        }
         for (const host of config.ob11.httpHosts) {
             fetch(host, {
                 method: "POST",
-                headers: {
-                    "Content-Type": "application/json",
-                    "x-self-id": selfInfo.uin
-                },
-                body: JSON.stringify(msg)
+                headers,
+                body: msgStr
             }).then((res: any) => {
-                log(`新消息事件HTTP上报成功: ${host} ` + JSON.stringify(msg));
+                log(`新消息事件HTTP上报成功: ${host} ` + msgStr);
             }, (err: any) => {
-                log(`新消息事件HTTP上报失败: ${host} ` + err + JSON.stringify(msg));
+                log(`新消息事件HTTP上报失败: ${host} `, err, msg);
             });
         }
     }

src/renderer/index.ts

@@ -55,6 +55,14 @@ async function onSettingWindowCreated(view: Element) {
                 SettingSwitch('ob11.enableHttpPost', config.ob11.enableHttpPost, {'control-display-id': 'config-ob11-httpHosts'}),
             ),
             `<div class="config-host-list" id="config-ob11-httpHosts" ${config.ob11.enableHttpPost ? '' : 'is-hidden'}>
+                <setting-item data-direction="row">
+                    <div>
+                        <setting-text>HTTP 事件上报密钥</setting-text>
+                    </div>
+                    <div class="q-input">
+                        <input id="config-ob11-httpSecret" class="q-input__inner" data-config-key="ob11.httpSecret" type="text" value="${config.ob11.httpSecret}" placeholder="未设置" />
+                    </div>
+                </setting-item>
                 <setting-item data-direction="row">
                     <div>
                         <setting-text>HTTP 事件上报地址</setting-text>

src/version.ts

@@ -1 +1 @@
-export const version = "3.17.0"
+export const version = "3.18.1"