tyler.durden
/
d-fi-core
mirror of https://github.com/d-fi/d-fi-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: Improve error throwing

This commit is contained in:
Namkhai B 2021-08-25 12:30:27 -05:00
parent d069afcd6c
commit e19ea53563
No known key found for this signature in database
GPG Key ID: 9DC021F538318528
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/get-url.ts
View File

@ -64,7 +64,9 @@ const getTrackUrlFromServer = async (track_token: string, format: string): Promi
if (data.data.length > 0) { if (data.data.length > 0) {
if (data.data[0].errors) { if (data.data[0].errors) {
if (data.data[0].errors[0].code === 2002) throw new GeoBlocked(user.country); if (data.data[0].errors[0].code === 2002) {
throw new GeoBlocked(user.country);
}
throw new Error(Object.entries(data.data[0].errors[0]).join(', ')); throw new Error(Object.entries(data.data[0].errors[0]).join(', '));
} }
return data.data[0].media.length > 0 ? data.data[0].media[0].sources[0].url : null; return data.data[0].media.length > 0 ? data.data[0].media[0].sources[0].url : null;
@ -77,8 +79,8 @@ const getTrackUrlFromServer = async (track_token: string, format: string): Promi
* @param quality 1 = 128kbps, 3 = 320kbps and 9 = flac (around 1411kbps) * @param quality 1 = 128kbps, 3 = 320kbps and 9 = flac (around 1411kbps)
*/ */
export const getTrackDownloadUrl = async (track: trackType, quality: number): Promise<{trackUrl: string, isEncrypted: boolean, fileSize: number} | null> => { export const getTrackDownloadUrl = async (track: trackType, quality: number): Promise<{trackUrl: string, isEncrypted: boolean, fileSize: number} | null> => {
let wrongLicense = false; let wrongLicense: WrongLicense | null = null;
let geoBlocked: string | null = null; let geoBlocked: GeoBlocked | null = null;
let formatName: string; let formatName: string;
switch (quality) { switch (quality) {
case 9: case 9:
@ -109,9 +111,9 @@ export const getTrackDownloadUrl = async (track: trackType, quality: number): Pr
} }
} catch (err) { } catch (err) {
if (err instanceof WrongLicense) { if (err instanceof WrongLicense) {
wrongLicense = true; wrongLicense = err;
} else if (err instanceof GeoBlocked) { } else if (err instanceof GeoBlocked) {
geoBlocked = err.message; geoBlocked = err;
} else { } else {
throw err; throw err;
} }
@ -128,8 +130,12 @@ export const getTrackDownloadUrl = async (track: trackType, quality: number): Pr
fileSize: fileSize, fileSize: fileSize,
}; };
} }
if (wrongLicense) throw new Error(`Your account can't stream ${formatName} tracks`); if (wrongLicense) {
if (geoBlocked) throw new Error(geoBlocked); throw wrongLicense;
}
if (geoBlocked) {
throw geoBlocked;
}
return null; return null;
}; };