From 52850d172ef508382f6dc66885a35fb30bc90cf8 Mon Sep 17 00:00:00 2001 From: linyuchen Date: Mon, 17 Jun 2024 16:05:38 +0800 Subject: [PATCH 1/3] feat: decode silk --- src/common/utils/audio.ts | 46 +++++++++++++++++++++++++-- src/onebot11/action/file/GetRecord.ts | 8 +++-- 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/src/common/utils/audio.ts b/src/common/utils/audio.ts index 3e14343..edd08b2 100644 --- a/src/common/utils/audio.ts +++ b/src/common/utils/audio.ts @@ -1,9 +1,10 @@ import fs from 'fs' -import { encode, getDuration, getWavFileInfo, isWav } from 'silk-wasm' +import fsAsync from 'fs/promises' import fsPromise from 'fs/promises' +import { decode, encode, getDuration, getWavFileInfo, isWav } from 'silk-wasm' import { log } from './log' import path from 'node:path' -import { DATA_DIR, TEMP_DIR } from './index' +import { TEMP_DIR } from './index' import { v4 as uuidv4 } from 'uuid' import { getConfigUtil } from '../config' import { spawn } from 'node:child_process' @@ -79,7 +80,8 @@ export async function encodeSilk(filePath: string) { if (code == null || EXIT_CODES.includes(code)) { sampleRate = 24000 const data = fs.readFileSync(pcmPath) - fs.unlink(pcmPath, (err) => {}) + fs.unlink(pcmPath, (err) => { + }) return resolve(data) } log(`FFmpeg exit: code=${code ?? 'unknown'} sig=${signal ?? 'unknown'}`) @@ -128,3 +130,41 @@ export async function encodeSilk(filePath: string) { return {} } } + +export async function decodeSilk(inputFilePath: string, outFormat: 'mp3' | 'amr' | 'wma' | 'm4a' | 'spx' | 'ogg' | 'wav' | 'flac' = 'mp3') { + const silkArrayBuffer = await fsAsync.readFile(inputFilePath) + const data = (await decode(silkArrayBuffer, 24000)).data + const fileName = path.join(TEMP_DIR, uuidv4()) + const outPCMPath = fileName + '.pcm' + const outFilePath = fileName + '.' + outFormat + await fsAsync.writeFile(outPCMPath, data) + const convert = () => { + return new Promise((resolve, reject) => { + const ffmpegPath = getConfigUtil().getConfig().ffmpeg || process.env.FFMPEG_PATH || 'ffmpeg' + const cp = spawn(ffmpegPath, [ + '-y', + '-f', 's16le', // PCM format + '-ar', '24000', // Sample rate + '-ac', '1', // Number of audio channels + '-i', outPCMPath, + outFilePath, + ]) + cp.on('error', (err) => { + log(`FFmpeg处理转换出错: `, err.message) + return reject(err) + }) + cp.on('exit', (code, signal) => { + const EXIT_CODES = [0, 255] + if (code == null || EXIT_CODES.includes(code)) { + fs.unlink(outPCMPath, (err) => { + }) + return resolve(outFilePath) + } + const exitErr = `FFmpeg exit: code=${code ?? 'unknown'} sig=${signal ?? 'unknown'}` + log(exitErr) + reject(Error(`FFmpeg处理转换失败,${exitErr}`)) + }) + }) + } + return convert() +} \ No newline at end of file diff --git a/src/onebot11/action/file/GetRecord.ts b/src/onebot11/action/file/GetRecord.ts index 2e57624..1f12ba3 100644 --- a/src/onebot11/action/file/GetRecord.ts +++ b/src/onebot11/action/file/GetRecord.ts @@ -1,5 +1,6 @@ import { GetFileBase, GetFilePayload, GetFileResponse } from './GetFile' import { ActionName } from '../types' +import {decodeSilk} from "@/common/utils/audio"; interface Payload extends GetFilePayload { out_format: 'mp3' | 'amr' | 'wma' | 'm4a' | 'spx' | 'ogg' | 'wav' | 'flac' @@ -8,8 +9,9 @@ interface Payload extends GetFilePayload { export default class GetRecord extends GetFileBase { actionName = ActionName.GetRecord - protected async _handle(payload: Payload): Promise { - let res = super._handle(payload) - return res + protected async _handle(payload: Payload): Promise<{file: string}> { + let res = await super._handle(payload) + res.file = await decodeSilk(res.file, payload.out_format) + return {file: res.file} } } From 781c3311ae8e93724350c246a5c2e3bae0e9b7e2 Mon Sep 17 00:00:00 2001 From: linyuchen Date: Mon, 17 Jun 2024 16:20:37 +0800 Subject: [PATCH 2/3] fix: get_file cache not found --- src/common/utils/audio.ts | 2 +- src/onebot11/action/file/GetRecord.ts | 12 ++++++++++-- src/onebot11/constructor.ts | 3 +-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/common/utils/audio.ts b/src/common/utils/audio.ts index edd08b2..0510f43 100644 --- a/src/common/utils/audio.ts +++ b/src/common/utils/audio.ts @@ -134,7 +134,7 @@ export async function encodeSilk(filePath: string) { export async function decodeSilk(inputFilePath: string, outFormat: 'mp3' | 'amr' | 'wma' | 'm4a' | 'spx' | 'ogg' | 'wav' | 'flac' = 'mp3') { const silkArrayBuffer = await fsAsync.readFile(inputFilePath) const data = (await decode(silkArrayBuffer, 24000)).data - const fileName = path.join(TEMP_DIR, uuidv4()) + const fileName = path.join(TEMP_DIR, path.basename(inputFilePath)) const outPCMPath = fileName + '.pcm' const outFilePath = fileName + '.' + outFormat await fsAsync.writeFile(outPCMPath, data) diff --git a/src/onebot11/action/file/GetRecord.ts b/src/onebot11/action/file/GetRecord.ts index 1f12ba3..a73de3c 100644 --- a/src/onebot11/action/file/GetRecord.ts +++ b/src/onebot11/action/file/GetRecord.ts @@ -1,6 +1,9 @@ import { GetFileBase, GetFilePayload, GetFileResponse } from './GetFile' import { ActionName } from '../types' import {decodeSilk} from "@/common/utils/audio"; +import { getConfigUtil } from '@/common/config' +import path from 'node:path' +import fs from 'node:fs' interface Payload extends GetFilePayload { out_format: 'mp3' | 'amr' | 'wma' | 'm4a' | 'spx' | 'ogg' | 'wav' | 'flac' @@ -9,9 +12,14 @@ interface Payload extends GetFilePayload { export default class GetRecord extends GetFileBase { actionName = ActionName.GetRecord - protected async _handle(payload: Payload): Promise<{file: string}> { + protected async _handle(payload: Payload): Promise { let res = await super._handle(payload) res.file = await decodeSilk(res.file, payload.out_format) - return {file: res.file} + res.file_name = path.basename(res.file) + res.file_size = fs.statSync(res.file).size.toString() + if (getConfigUtil().getConfig().enableLocalFile2Url){ + res.base64 = fs.readFileSync(res.file, 'base64') + } + return res } } diff --git a/src/onebot11/constructor.ts b/src/onebot11/constructor.ts index 378f6e5..ac82a99 100644 --- a/src/onebot11/constructor.ts +++ b/src/onebot11/constructor.ts @@ -171,7 +171,7 @@ export class OB11Constructor { message_data['data']['url'] = await NTQQFileApi.getImageUrl(element.picElement, msg.chatType) // message_data["data"]["file_id"] = element.picElement.fileUuid message_data['data']['file_size'] = element.picElement.fileSize - dbUtil + await dbUtil .addFileCache(fileName, { fileName, elementId: element.elementId, @@ -189,7 +189,6 @@ export class OB11Constructor { ) }, }) - .then() // 不在自动下载图片 } else if (element.videoElement || element.fileElement) { From 958b21e47ea3886c9faaffdd68fb762a131abd9d Mon Sep 17 00:00:00 2001 From: linyuchen Date: Mon, 17 Jun 2024 17:41:23 +0800 Subject: [PATCH 3/3] fix: wait get_file download complete --- src/onebot11/action/file/GetFile.ts | 9 +++++---- src/onebot11/constructor.ts | 5 ++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/onebot11/action/file/GetFile.ts b/src/onebot11/action/file/GetFile.ts index 6d5bf90..a15aa33 100644 --- a/src/onebot11/action/file/GetFile.ts +++ b/src/onebot11/action/file/GetFile.ts @@ -2,7 +2,7 @@ import BaseAction from '../BaseAction' import fs from 'fs/promises' import { dbUtil } from '@/common/db' import { getConfigUtil } from '@/common/config' -import { log, sleep, uri2local } from '@/common/utils' +import { checkFileReceived, log, sleep, uri2local } from '@/common/utils' import { NTQQFileApi } from '@/ntqqapi/api' import { ActionName } from '../types' import { FileElement, RawMessage, VideoElement } from '@/ntqqapi/types' @@ -38,20 +38,21 @@ export class GetFileBase extends BaseAction { log('找到了文件 element', element) // 构建下载函数 await NTQQFileApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid, cache.elementId, '', '', true) - await sleep(1000) // 这里延时是为何？ + // 等待文件下载完成 msg = await dbUtil.getMsgByLongId(cache.msgId) log('下载完成后的msg', msg) cache.filePath = this.getElement(msg, cache.elementId).filePath + await checkFileReceived(cache.filePath, 10 * 1000) dbUtil.addFileCache(file, cache).then() } } } protected async _handle(payload: GetFilePayload): Promise { - const cache = await dbUtil.getFileCache(payload.file) - const { autoDeleteFile, enableLocalFile2Url, autoDeleteFileSecond } = getConfigUtil().getConfig() + let cache = await dbUtil.getFileCache(payload.file) if (!cache) { throw new Error('file not found') } + const { autoDeleteFile, enableLocalFile2Url, autoDeleteFileSecond } = getConfigUtil().getConfig() if (cache.downloadFunc) { await cache.downloadFunc() } diff --git a/src/onebot11/constructor.ts b/src/onebot11/constructor.ts index ac82a99..abfaad4 100644 --- a/src/onebot11/constructor.ts +++ b/src/onebot11/constructor.ts @@ -171,7 +171,7 @@ export class OB11Constructor { message_data['data']['url'] = await NTQQFileApi.getImageUrl(element.picElement, msg.chatType) // message_data["data"]["file_id"] = element.picElement.fileUuid message_data['data']['file_size'] = element.picElement.fileSize - await dbUtil + dbUtil .addFileCache(fileName, { fileName, elementId: element.elementId, @@ -188,8 +188,7 @@ export class OB11Constructor { element.picElement.sourcePath, ) }, - }) - // 不在自动下载图片 + }).then() } else if (element.videoElement || element.fileElement) { const videoOrFileElement = element.videoElement || element.fileElement