mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-08 23:23:08 +02:00
[fix] .wav .flac ファイルを再生可能にする (#10686)
* .wav .flac ファイルを再生可能にする
file-typeにより判定されたMIME TypeをHTML5 Audio/Video要素に認識されるものに書き換える
* fix typecheck error
* frontend側の FILE_TYPE_BROWSERSAFEも更新
* Update packages/backend/src/core/FileInfoService.ts
* ✌️
* 後方互換を確保
* add tests
* update changelog.md
---------
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
This commit is contained in:
parent
2aa75f5489
commit
a986203b38
11 changed files with 292 additions and 160 deletions
|
@ -43,6 +43,7 @@
|
|||
- Fix: Content-Dispositionのパースでエラーが発生した場合にダウンロードが完了しない問題を修正
|
||||
- Fix: API: i/update avatarIdとbannerIdにnullを渡した時、画像がリセットされない問題を修正
|
||||
- Fix: 1:1ではない画像のリアクション通知バッジが左や上に寄ってしまっていたのを中央に来るように修正
|
||||
- Fix: .wav, .flacが再生できない問題を修正(新しくアップロードされたファイルのみ修正が適用されます)
|
||||
|
||||
## 13.11.3
|
||||
|
||||
|
|
|
@ -56,6 +56,11 @@ export const FILE_TYPE_BROWSERSAFE = [
|
|||
'audio/webm',
|
||||
|
||||
'audio/aac',
|
||||
|
||||
// see https://github.com/misskey-dev/misskey/pull/10686
|
||||
'audio/flac',
|
||||
'audio/wav',
|
||||
// backward compatibility
|
||||
'audio/x-flac',
|
||||
'audio/vnd.wave',
|
||||
];
|
||||
|
|
|
@ -5,7 +5,7 @@ import * as stream from 'node:stream';
|
|||
import * as util from 'node:util';
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { FSWatcher } from 'chokidar';
|
||||
import { fileTypeFromFile } from 'file-type';
|
||||
import * as fileType from 'file-type';
|
||||
import FFmpeg from 'fluent-ffmpeg';
|
||||
import isSvg from 'is-svg';
|
||||
import probeImageSize from 'probe-image-size';
|
||||
|
@ -301,6 +301,19 @@ export class FileInfoService {
|
|||
return fs.promises.access(path).then(() => true, () => false);
|
||||
}
|
||||
|
||||
@bindThis
|
||||
public fixMime(mime: string | fileType.MimeType): string {
|
||||
// see https://github.com/misskey-dev/misskey/pull/10686
|
||||
if (mime === "audio/x-flac") {
|
||||
return "audio/flac";
|
||||
}
|
||||
if (mime === "audio/vnd.wave") {
|
||||
return "audio/wav";
|
||||
}
|
||||
|
||||
return mime;
|
||||
}
|
||||
|
||||
/**
|
||||
* Detect MIME Type and extension
|
||||
*/
|
||||
|
@ -308,14 +321,14 @@ export class FileInfoService {
|
|||
public async detectType(path: string): Promise<{
|
||||
mime: string;
|
||||
ext: string | null;
|
||||
}> {
|
||||
}> {
|
||||
// Check 0 byte
|
||||
const fileSize = await this.getFileSize(path);
|
||||
if (fileSize === 0) {
|
||||
return TYPE_OCTET_STREAM;
|
||||
}
|
||||
|
||||
const type = await fileTypeFromFile(path);
|
||||
const type = await fileType.fileTypeFromFile(path);
|
||||
|
||||
if (type) {
|
||||
// XMLはSVGかもしれない
|
||||
|
@ -324,7 +337,7 @@ export class FileInfoService {
|
|||
}
|
||||
|
||||
return {
|
||||
mime: type.mime,
|
||||
mime: this.fixMime(type.mime),
|
||||
ext: type.ext,
|
||||
};
|
||||
}
|
||||
|
|
|
@ -454,7 +454,8 @@ export class FileServerService {
|
|||
fileRole: 'original',
|
||||
file,
|
||||
filename: file.name,
|
||||
mime: file.type,
|
||||
// 古いファイルは修正前のmimeを持っているのでできるだけ修正してあげる
|
||||
mime: this.fileInfoService.fixMime(file.type),
|
||||
ext: null,
|
||||
path,
|
||||
};
|
||||
|
|
BIN
packages/backend/test/resources/kick_gaba7.aac
Normal file
BIN
packages/backend/test/resources/kick_gaba7.aac
Normal file
Binary file not shown.
BIN
packages/backend/test/resources/kick_gaba7.flac
Normal file
BIN
packages/backend/test/resources/kick_gaba7.flac
Normal file
Binary file not shown.
BIN
packages/backend/test/resources/kick_gaba7.mp3
Normal file
BIN
packages/backend/test/resources/kick_gaba7.mp3
Normal file
Binary file not shown.
BIN
packages/backend/test/resources/kick_gaba7.wav
Normal file
BIN
packages/backend/test/resources/kick_gaba7.wav
Normal file
Binary file not shown.
BIN
packages/backend/test/resources/kick_gaba7.webm
Normal file
BIN
packages/backend/test/resources/kick_gaba7.webm
Normal file
Binary file not shown.
|
@ -7,10 +7,10 @@ import { ModuleMocker } from 'jest-mock';
|
|||
import { Test } from '@nestjs/testing';
|
||||
import { GlobalModule } from '@/GlobalModule.js';
|
||||
import { FileInfoService } from '@/core/FileInfoService.js';
|
||||
import { DI } from '@/di-symbols.js';
|
||||
//import { DI } from '@/di-symbols.js';
|
||||
import { AiService } from '@/core/AiService.js';
|
||||
import type { TestingModule } from '@nestjs/testing';
|
||||
import type { jest } from '@jest/globals';
|
||||
import { describe, beforeAll, afterAll, test } from '@jest/globals';
|
||||
import type { MockFunctionMetadata } from 'jest-mock';
|
||||
|
||||
const _filename = fileURLToPath(import.meta.url);
|
||||
|
@ -74,6 +74,7 @@ describe('FileInfoService', () => {
|
|||
});
|
||||
});
|
||||
|
||||
describe('IMAGE', () => {
|
||||
test('Generic JPEG', async () => {
|
||||
const path = `${resources}/Lenna.jpg`;
|
||||
const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
|
||||
|
@ -234,4 +235,110 @@ describe('FileInfoService', () => {
|
|||
orientation: 8,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('AUDIO', () => {
|
||||
test('MP3', async () => {
|
||||
const path = `${resources}/kick_gaba7.mp3`;
|
||||
const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
|
||||
delete info.warnings;
|
||||
delete info.blurhash;
|
||||
delete info.sensitive;
|
||||
delete info.porn;
|
||||
delete info.width;
|
||||
delete info.height;
|
||||
delete info.orientation;
|
||||
assert.deepStrictEqual(info, {
|
||||
size: 19853,
|
||||
md5: '4f557df8548bc3cecc794c652f690446',
|
||||
type: {
|
||||
mime: 'audio/mpeg',
|
||||
ext: 'mp3',
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
test('WAV', async () => {
|
||||
const path = `${resources}/kick_gaba7.wav`;
|
||||
const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
|
||||
delete info.warnings;
|
||||
delete info.blurhash;
|
||||
delete info.sensitive;
|
||||
delete info.porn;
|
||||
delete info.width;
|
||||
delete info.height;
|
||||
delete info.orientation;
|
||||
assert.deepStrictEqual(info, {
|
||||
size: 87630,
|
||||
md5: '8bc9bb4fe5e77bb1871448209be635c1',
|
||||
type: {
|
||||
mime: 'audio/wav',
|
||||
ext: 'wav',
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
test('AAC', async () => {
|
||||
const path = `${resources}/kick_gaba7.aac`;
|
||||
const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
|
||||
delete info.warnings;
|
||||
delete info.blurhash;
|
||||
delete info.sensitive;
|
||||
delete info.porn;
|
||||
delete info.width;
|
||||
delete info.height;
|
||||
delete info.orientation;
|
||||
assert.deepStrictEqual(info, {
|
||||
size: 7291,
|
||||
md5: '2789323f05e3392b648066f50be6a2a6',
|
||||
type: {
|
||||
mime: 'audio/aac',
|
||||
ext: 'aac',
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
test('FLAC', async () => {
|
||||
const path = `${resources}/kick_gaba7.flac`;
|
||||
const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
|
||||
delete info.warnings;
|
||||
delete info.blurhash;
|
||||
delete info.sensitive;
|
||||
delete info.porn;
|
||||
delete info.width;
|
||||
delete info.height;
|
||||
delete info.orientation;
|
||||
assert.deepStrictEqual(info, {
|
||||
size: 108793,
|
||||
md5: 'bc0f3adfe0e1ca99ae6c7528c46b3173',
|
||||
type: {
|
||||
mime: 'audio/flac',
|
||||
ext: 'flac',
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
/*
|
||||
* video/webmとして検出されてしまう
|
||||
test('WEBM AUDIO', async () => {
|
||||
const path = `${resources}/kick_gaba7.webm`;
|
||||
const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
|
||||
delete info.warnings;
|
||||
delete info.blurhash;
|
||||
delete info.sensitive;
|
||||
delete info.porn;
|
||||
delete info.width;
|
||||
delete info.height;
|
||||
delete info.orientation;
|
||||
assert.deepStrictEqual(info, {
|
||||
size: 8879,
|
||||
md5: '3350083dec312419cfdc06c16413aca7',
|
||||
type: {
|
||||
mime: 'audio/webm',
|
||||
ext: 'webm',
|
||||
},
|
||||
});
|
||||
});
|
||||
*/
|
||||
});
|
||||
});
|
||||
|
|
|
@ -35,6 +35,11 @@ export const FILE_TYPE_BROWSERSAFE = [
|
|||
'audio/webm',
|
||||
|
||||
'audio/aac',
|
||||
|
||||
// see https://github.com/misskey-dev/misskey/pull/10686
|
||||
'audio/flac',
|
||||
'audio/wav',
|
||||
// backward compatibility
|
||||
'audio/x-flac',
|
||||
'audio/vnd.wave',
|
||||
];
|
||||
|
|
Loading…
Reference in a new issue