vndangkhoa/kv-music
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor cover art fetching to use centralized getCoverBlob with CORS workaround in metadata

Browse source
This commit is contained in:
Julien Maille 2025-12-26 13:58:28 +01:00
parent 63854f4d69
commit 47d64add72
3 changed files with 55 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
js/downloads.js
View file

@ -1,57 +1,10 @@
//js/downloads.js //js/downloads.js
import { buildTrackFilename, sanitizeForFilename, RATE_LIMIT_ERROR_MESSAGE, getTrackArtists, getTrackTitle, formatTemplate, SVG_CLOSE } from './utils.js'; import { buildTrackFilename, sanitizeForFilename, RATE_LIMIT_ERROR_MESSAGE, getTrackArtists, getTrackTitle, formatTemplate, SVG_CLOSE, getCoverBlob } from './utils.js';
import { lyricsSettings } from './storage.js'; import { lyricsSettings } from './storage.js';
import { addMetadataToAudio } from './metadata.js'; import { addMetadataToAudio } from './metadata.js';
const downloadTasks = new Map(); const downloadTasks = new Map();
let downloadNotificationContainer = null; let downloadNotificationContainer = null;
const coverCache = new Map();
/**
* Fetches and caches cover art as a Blob
*/
async function getCoverBlob(api, coverId) {
if (!coverId) return null;
if (coverCache.has(coverId)) return coverCache.get(coverId);
const fetchWithProxy = async (url) => {
try {
const proxyUrl = `https://corsproxy.io/?${encodeURIComponent(url)}`;
const response = await fetch(proxyUrl);
if (response.ok) return await response.blob();
} catch (e) {
console.warn('Proxy fetch failed:', e);
}
return null;
};
try {
const url = api.getCoverUrl(coverId, '1280');
// Try direct fetch first
const response = await fetch(url);
if (response.ok) {
const blob = await response.blob();
coverCache.set(coverId, blob);
return blob;
} else {
// If direct fetch fails (e.g. 404 from SW due to CORS), try proxy
const blob = await fetchWithProxy(url);
if (blob) {
coverCache.set(coverId, blob);
return blob;
}
}
} catch (e) {
// Network error (CORS rejection not handled by SW), try proxy
const url = api.getCoverUrl(coverId, '1280');
const blob = await fetchWithProxy(url);
if (blob) {
coverCache.set(coverId, blob);
return blob;
}
}
return null;
}
/** /**
* Adds a cover blob to a JSZip instance * Adds a cover blob to a JSZip instance

14
js/metadata.js
View file

@ -1,4 +1,4 @@
import { getExtensionForQuality } from './utils.js'; import { getExtensionForQuality, getCoverBlob } from './utils.js';
const VENDOR_STRING = 'Monochrome'; const VENDOR_STRING = 'Monochrome';
const DEFAULT_TITLE = 'Unknown Title'; const DEFAULT_TITLE = 'Unknown Title';
@ -203,13 +203,11 @@ function createVorbisCommentBlock(track) {
async function createFlacPictureBlock(coverId, api) { async function createFlacPictureBlock(coverId, api) {
try { try {
// Fetch album art // Fetch album art
const coverUrl = api.getCoverUrl(coverId, '1280'); const imageBlob = await getCoverBlob(api, coverId);
const response = await fetch(coverUrl); if (!imageBlob) {
if (!response.ok) {
throw new Error('Failed to fetch album art'); throw new Error('Failed to fetch album art');
} }
const imageBlob = await response.blob();
const imageBytes = new Uint8Array(await imageBlob.arrayBuffer()); const imageBytes = new Uint8Array(await imageBlob.arrayBuffer());
// Detect MIME type from blob or use default // Detect MIME type from blob or use default
@ -497,13 +495,11 @@ function createMp4MetadataAtoms(track) {
async function fetchAlbumArtForMp4(coverId, api) { async function fetchAlbumArtForMp4(coverId, api) {
try { try {
const coverUrl = api.getCoverUrl(coverId, '1280'); const imageBlob = await getCoverBlob(api, coverId);
const response = await fetch(coverUrl); if (!imageBlob) {
if (!response.ok) {
return null; return null;
} }
const imageBlob = await response.blob();
const imageBytes = new Uint8Array(await imageBlob.arrayBuffer()); const imageBytes = new Uint8Array(await imageBlob.arrayBuffer());
return { return {

49
js/utils.js
View file

@ -202,3 +202,52 @@ export const formatDuration = (seconds) => {
} }
return `${minutes} min`; return `${minutes} min`;
}; };
const coverCache = new Map();
/**
* Fetches and caches cover art as a Blob
*/
export async function getCoverBlob(api, coverId) {
if (!coverId) return null;
if (coverCache.has(coverId)) return coverCache.get(coverId);
const fetchWithProxy = async (url) => {
try {
const proxyUrl = `https://corsproxy.io/?${encodeURIComponent(url)}`;
const response = await fetch(proxyUrl);
if (response.ok) return await response.blob();
} catch (e) {
console.warn('Proxy fetch failed:', e);
}
return null;
};
try {
const url = api.getCoverUrl(coverId, '1280');
// Try direct fetch first
const response = await fetch(url);
if (response.ok) {
const blob = await response.blob();
coverCache.set(coverId, blob);
return blob;
} else {
// If direct fetch fails (e.g. 404 from SW due to CORS), try proxy
const blob = await fetchWithProxy(url);
if (blob) {
coverCache.set(coverId, blob);
return blob;
}
}
} catch (e) {
// Network error (CORS rejection not handled by SW), try proxy
const url = api.getCoverUrl(coverId, '1280');
const blob = await fetchWithProxy(url);
if (blob) {
coverCache.set(coverId, blob);
return blob;
}
}
return null;
}