gerdur-core 2.2.0 → 2.4.0

package/CHANGELOG.md

@@ -1,5 +1,58 @@
 # Changelog
 
+## 2.4.0 - 2026-08-31
+
+Phase 3.3 — deterministic retries and typed errors.
+
+### Fixed
+
+- **The gateway retry loop had no cap** on `error.code === 4`,
+  `NEED_API_AUTH_REQUIRED`, or `GATEWAY_ERROR` — a failing endpoint could spin
+  forever. `requestWithRetry` is now a bounded loop: per-class attempt caps
+  (`code 4` ×6, re-auth ×3, token refresh ×15), full-jittered exponential
+  backoff, and a 30 s wall-clock deadline. On exhaustion it throws.
+
+### Added
+
+- **`DeezerError`** (`extends Error`) — thrown for gateway / media-API failures
+  instead of `new Error(Object.entries(error).join(', '))`. Carries `code`,
+  `keys`, `retryable`, and the raw `payload`. `message` stays human-readable.
+- **`RETRY_POLICY`** — the exported, inspectable retry configuration.
+
+### Changed
+
+- Gateway helpers (`request`, `requestLight`, `requestGet`, `requestPublicApi`)
+  and `resolveDownloadUrls` now throw `DeezerError`. `message` text changed shape
+  (`"KEY: value"` rather than `"KEY,value"`); read `err.code` / `err.keys`
+  instead of matching the string.
+
+## 2.3.0 - 2026-08-31
+
+Phase 2.1 — all the formats, and previews. Additive; the `1 / 3 / 9` path is
+unchanged.
+
+### Added
+
+- **`getTrackPreview(track)` / `downloadPreview(track)`** — the 30-second preview
+  clip. A plain MP3: no licence, no `arl`, no Blowfish. Accepts a gw track (reads
+  `MEDIA`, no extra request), a track id, or a number.
+- **`DEEZER_FORMATS`** — every format `get_url` understands, best → worst
+  (`FLAC`, `MP3_320`, `MP3_256`, `MP3_128`, `MP3_64`, `AAC_64`, `MP4_RA3/2/1`).
+- **`resolveDownloadUrls(tracks, qualities)`** now accepts format strings in the
+  preference list (`['FLAC', 'MP3_320', 'AAC_64']`), not just `1 | 3 | 9`. Each
+  `ResolvedUrl` gains `cipher` (`'BF_CBC_STRIPE'` | `'NONE'`).
+- **`toFormat(quality)`** — normalise a number or format string to the `get_url`
+  format string. `formatName` now also accepts format strings (identity).
+- `Quality` / `DeezerFormat` exported types.
+
+### Changed
+
+- `isEncrypted` (from `getTrackDownloadUrl` and `resolveDownloadUrls`) is now
+  taken from the media API's `cipher` field instead of guessing from the URL
+  path — authoritative, and correct for `cipher: NONE` content.
+- `trackType.FILESIZE_*` fields are typed `string` (several were mistyped as the
+  literal `'0'`); added `FILESIZE_MP3_MISC` / `FILESIZE_MHM1_RA*`.
+
 ## 2.2.0 - 2026-08-31
 
 Phase 2.4 — browse & discovery. All additive, all on the public REST API (no

package/README.md

@@ -82,7 +82,20 @@ if (model.lyricsSynced) fs.writeFileSync(track.SNG_TITLE + '.lrc', model.lyricsS
 
 ## Methods
 
-All method returns `Object` or throws `Error`. Make sure to catch error on your side.
+Every method returns an `Object` or throws. Gateway / media-API failures throw a
+**`DeezerError`** (`extends Error`) with:
+
+| Field | |
+| :--- | :--- |
+| `code` | Deezer's numeric error code, when it sent one (e.g. `4`, `800`) |
+| `keys` | the gateway error keys, e.g. `['VALID_TOKEN_REQUIRED']`, `['DATA_ERROR']` |
+| `retryable` | whether a retry could plausibly succeed |
+| `payload` | the raw error object |
+
+Retries are bounded — `RETRY_POLICY` (exported) sets per-class attempt caps and a
+30 s wall-clock deadline, so a persistently failing endpoint surfaces a
+`DeezerError` instead of spinning. `GeoBlocked`, `WrongLicense` and
+`ExpiredTrackToken` are still thrown as their own types from the download path.
 
 ### `.initDeezerApi(arl_cookie);`
 
@@ -238,6 +251,37 @@ pass the `id` to `getTrackInfo` / `getAlbumTracks` (or use the converter's
 | `track`    |   Yes    |    `string` |                       track object |
 | `quality`  |   Yes    | `1, 3 or 9` | 1 = 128kbps, 3 = 320kbps, 9 = flac |
 
+Resolves `{trackUrl, isEncrypted, fileSize}`. `isEncrypted` now comes from the
+media API's `cipher` field (authoritative) rather than a URL guess.
+
+### Formats
+
+Deezer's `get_url` understands more than `1 / 3 / 9`. `DEEZER_FORMATS` lists them
+best → worst: `FLAC`, `MP3_320`, `MP3_256`, `MP3_128`, `MP3_64`, `AAC_64`,
+`MP4_RA3`, `MP4_RA2`, `MP4_RA1` (the last four are the HE-AAC ladder some
+accounts / regions expose).
+
+- **`resolveDownloadUrls(tracks, qualities)`** — `qualities` entries may be the
+  `1 | 3 | 9` shorthand **or** any format string, e.g.
+  `resolveDownloadUrls(tracks, ['FLAC', 'MP3_320', 'AAC_64'])`. Deezer returns
+  the best each track is licensed for. Each result now also carries `format` and
+  `cipher` (`'BF_CBC_STRIPE'` or `'NONE'`).
+- **`formatName(quality)`** / **`toFormat(quality)`** — normalise a number or
+  format string to the `get_url` format string.
+
+### `.getTrackPreview(track)` / `.downloadPreview(track)`
+
+The 30-second preview clip — a plain MP3, **no licence, no `arl`, no
+encryption**. `track` may be a gw track object (reads its `MEDIA`, no extra
+request), a track id, or a number.
+
+```js
+const {url} = await getTrackPreview('3135556');      // {url, duration: 30}
+const clip = await downloadPreview('3135556');       // Buffer (ID3-tagged MP3)
+```
+
+Useful for "audition before download" and for CI that shouldn't pull full tracks.
+
 ### `.decryptDownload(data, song_id);`
 
 | Parameters | Required |     Type |            Description |

package/dist/api/index.d.ts

@@ -2,3 +2,4 @@ export * from './api';
 export * from './request';
 export * from './search';
 export * from './browse';
+export * from './preview';

package/dist/api/index.js

@@ -18,3 +18,4 @@ __exportStar(require("./api"), exports);
 __exportStar(require("./request"), exports);
 __exportStar(require("./search"), exports);
 __exportStar(require("./browse"), exports);
+__exportStar(require("./preview"), exports);

package/dist/api/preview.d.ts

@@ -0,0 +1,21 @@
+/// <reference types="node" />
+import type { trackType } from '../types';
+export interface TrackPreview {
+    /** direct URL to a ~30 s MP3 clip — no licence, no encryption, no `arl` */
+    url: string;
+    /** clip length in seconds (Deezer previews are 30 s) */
+    duration: number;
+}
+/**
+ * The 30-second preview clip for a track. Deezer exposes it two ways:
+ * `song.getData` carries it in `MEDIA` (`{TYPE: 'preview', HREF}`), and the
+ * public `/track/` endpoint carries it as `preview`. Pass a gw `track` object
+ * (uses `MEDIA`, no extra request) or a track id (one public-API lookup).
+ *
+ * The clip is a plain MP3 — never Blowfish-encrypted — so it needs no
+ * `decryptDownload` and is safe to use in tests and "audition before download"
+ * flows.
+ */
+export declare const getTrackPreview: (track: trackType | string | number) => Promise<TrackPreview | null>;
+/** Fetch the 30-second preview clip as a `Buffer` (plain MP3, no decryption needed). */
+export declare const downloadPreview: (track: trackType | string | number) => Promise<Buffer | null>;

package/dist/api/preview.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.downloadPreview = exports.getTrackPreview = void 0;
+const http_1 = require("../lib/http");
+const api_1 = require("./api");
+/**
+ * The 30-second preview clip for a track. Deezer exposes it two ways:
+ * `song.getData` carries it in `MEDIA` (`{TYPE: 'preview', HREF}`), and the
+ * public `/track/` endpoint carries it as `preview`. Pass a gw `track` object
+ * (uses `MEDIA`, no extra request) or a track id (one public-API lookup).
+ *
+ * The clip is a plain MP3 — never Blowfish-encrypted — so it needs no
+ * `decryptDownload` and is safe to use in tests and "audition before download"
+ * flows.
+ */
+const getTrackPreview = async (track) => {
+    var _a;
+    if (typeof track === 'object') {
+        const media = (_a = track.MEDIA) === null || _a === void 0 ? void 0 : _a[0];
+        if ((media === null || media === void 0 ? void 0 : media.HREF) && (!media.TYPE || media.TYPE === 'preview')) {
+            return { url: media.HREF, duration: 30 };
+        }
+        const pub = await (0, api_1.getTrackInfoPublicApi)(track.SNG_ID);
+        return pub.preview ? { url: pub.preview, duration: 30 } : null;
+    }
+    const pub = await (0, api_1.getTrackInfoPublicApi)(String(track));
+    return pub.preview ? { url: pub.preview, duration: 30 } : null;
+};
+exports.getTrackPreview = getTrackPreview;
+/** Fetch the 30-second preview clip as a `Buffer` (plain MP3, no decryption needed). */
+const downloadPreview = async (track) => {
+    const preview = await (0, exports.getTrackPreview)(track);
+    if (!preview)
+        return null;
+    return (0, http_1.getBuffer)(preview.url);
+};
+exports.downloadPreview = downloadPreview;

package/dist/api/request.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requestPublicApi = exports.requestGet = exports.requestLight = exports.request = void 0;
 const request_1 = __importDefault(require("../lib/request"));
+const errors_1 = require("../lib/errors");
 const cache_1 = __importDefault(require("./cache"));
 /**
  * In-flight request coalescing (single-flight).
@@ -47,11 +48,11 @@ const request = async (body, method) => {
     const cacheKey = method + ':' + Object.entries(body).join(':');
     return coalesce(cacheKey, async () => {
         const { data: { error, results }, } = await request_1.default.post('/gateway.php', body, { params: { method } });
-        if (Object.keys(results).length > 0) {
+        if (results && Object.keys(results).length > 0) {
             cache_1.default.set(cacheKey, results);
             return results;
         }
-        throw new Error(Object.entries(error).join(', '));
+        throw new errors_1.DeezerError(error);
     });
 };
 exports.request = request;
@@ -66,11 +67,11 @@ const requestLight = async (body, method) => {
         const { data: { error, results }, } = await request_1.default.post('https://www.deezer.com/ajax/gw-light.php', body, {
             params: { method, api_version: '1.0' },
         });
-        if (Object.keys(results).length > 0) {
+        if (results && Object.keys(results).length > 0) {
             cache_1.default.set(cacheKey, results);
             return results;
         }
-        throw new Error(Object.entries(error).join(', '));
+        throw new errors_1.DeezerError(error);
     });
 };
 exports.requestLight = requestLight;
@@ -83,11 +84,11 @@ const requestGet = async (method, params = {}, key = 'get_request') => {
     const cacheKey = method + key;
     return coalesce(cacheKey, async () => {
         const { data: { error, results }, } = await request_1.default.get('/gateway.php', { params: { method, ...params } });
-        if (Object.keys(results).length > 0) {
+        if (results && Object.keys(results).length > 0) {
             cache_1.default.set(cacheKey, results);
             return results;
         }
-        throw new Error(Object.entries(error).join(', '));
+        throw new errors_1.DeezerError(error);
     });
 };
 exports.requestGet = requestGet;
@@ -99,8 +100,7 @@ const requestPublicApi = async (slug) => {
     return coalesce(slug, async () => {
         const { data } = await request_1.default.get('https://api.deezer.com' + slug);
         if (data.error) {
-            const errorMessage = Object.entries(data.error).join(', ');
-            throw new Error(errorMessage);
+            throw new errors_1.DeezerError(data.error);
         }
         cache_1.default.set(slug, data);
         return data;

package/dist/index.d.ts

@@ -1,4 +1,6 @@
-export { initDeezerApi } from './lib/request';
+export { initDeezerApi, RETRY_POLICY } from './lib/request';
+export { DeezerError } from './lib/errors';
+export type { DeezerErrorPayload } from './lib/errors';
 export * from './api';
 export * from './converter';
 export * from './lib/decrypt';

package/dist/index.js

@@ -14,9 +14,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getText = exports.getJson = exports.getBuffer = exports.httpsAgent = exports.httpAgent = exports.initDeezerApi = void 0;
+exports.getText = exports.getJson = exports.getBuffer = exports.httpsAgent = exports.httpAgent = exports.DeezerError = exports.RETRY_POLICY = exports.initDeezerApi = void 0;
 var request_1 = require("./lib/request");
 Object.defineProperty(exports, "initDeezerApi", { enumerable: true, get: function () { return request_1.initDeezerApi; } });
+Object.defineProperty(exports, "RETRY_POLICY", { enumerable: true, get: function () { return request_1.RETRY_POLICY; } });
+var errors_1 = require("./lib/errors");
+Object.defineProperty(exports, "DeezerError", { enumerable: true, get: function () { return errors_1.DeezerError; } });
 __exportStar(require("./api"), exports);
 __exportStar(require("./converter"), exports);
 __exportStar(require("./lib/decrypt"), exports);

package/dist/lib/errors.d.ts

@@ -0,0 +1,27 @@
+/** The raw `error` object a Deezer gateway response carries. */
+export type DeezerErrorPayload = Record<string, unknown>;
+/**
+ * A structured error from the Deezer gateway or media API — replaces the old
+ * `new Error(Object.entries(error).join(', '))`. Carries the numeric `code`, the
+ * gateway error `keys`, a `retryable` hint, and the raw `payload`.
+ *
+ * The `message` is still human-readable (`"VALID_TOKEN_REQUIRED: …"`), so code
+ * that only reads `err.message` keeps working — but prefer `err.code` /
+ * `err.keys` / `err.retryable`.
+ */
+export declare class DeezerError extends Error {
+    /** `error.code` when Deezer sent a numeric one */
+    readonly code?: number;
+    /** the gateway error keys, e.g. `['VALID_TOKEN_REQUIRED']`, `['DATA_ERROR']` */
+    readonly keys: string[];
+    /** whether a retry could plausibly succeed */
+    readonly retryable: boolean;
+    /** the raw error payload */
+    readonly payload: DeezerErrorPayload;
+    constructor(payload: DeezerErrorPayload | null | undefined, opts?: {
+        retryable?: boolean;
+        message?: string;
+    });
+    /** Whether a `code` / key set is worth retrying. */
+    static retryable(code: number | undefined, keys: string[]): boolean;
+}

package/dist/lib/errors.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeezerError = void 0;
+/** Gateway error keys where retrying (after a token refresh / re-auth) can help. */
+const RETRYABLE_KEYS = new Set(['NEED_API_AUTH_REQUIRED', 'GATEWAY_ERROR', 'VALID_TOKEN_REQUIRED']);
+/**
+ * A structured error from the Deezer gateway or media API — replaces the old
+ * `new Error(Object.entries(error).join(', '))`. Carries the numeric `code`, the
+ * gateway error `keys`, a `retryable` hint, and the raw `payload`.
+ *
+ * The `message` is still human-readable (`"VALID_TOKEN_REQUIRED: …"`), so code
+ * that only reads `err.message` keeps working — but prefer `err.code` /
+ * `err.keys` / `err.retryable`.
+ */
+class DeezerError extends Error {
+    constructor(payload, opts = {}) {
+        var _a, _b;
+        const p = payload && typeof payload === 'object' ? payload : {};
+        const keys = Object.keys(p);
+        const rawCode = p.code;
+        const code = typeof rawCode === 'number' ? rawCode : undefined;
+        super((_a = opts.message) !== null && _a !== void 0 ? _a : describe(p, keys));
+        this.name = 'DeezerError';
+        this.code = code;
+        this.keys = keys;
+        this.payload = p;
+        this.retryable = (_b = opts.retryable) !== null && _b !== void 0 ? _b : isRetryable(code, keys);
+    }
+    /** Whether a `code` / key set is worth retrying. */
+    static retryable(code, keys) {
+        return isRetryable(code, keys);
+    }
+}
+exports.DeezerError = DeezerError;
+const describe = (payload, keys) => {
+    if (!keys.length)
+        return 'Deezer request failed';
+    return keys.map((k) => `${k}: ${String(payload[k])}`).join(', ');
+};
+const isRetryable = (code, keys) => {
+    if (code === 4)
+        return true; // Deezer's transient "quota exceeded"
+    return keys.some((k) => RETRYABLE_KEYS.has(k));
+};

package/dist/lib/get-url.d.ts

@@ -13,8 +13,24 @@ export declare class ExpiredTrackToken extends Error {
     readonly sngId: string;
     constructor(sngId: string);
 }
-/** quality code -> the `format` string the media API expects */
-export declare const formatName: (quality: number) => string;
+/**
+ * Every audio format Deezer's `get_url` understands, best → worst. `FLAC`,
+ * `MP3_320` and `MP3_128` are the classic `9 / 3 / 1` qualities; the rest are
+ * additional tiers (`MP3_256`, `MP3_64`, the `AAC_64` / `MP4_RA*` HE-AAC ladder)
+ * that some accounts and regions expose.
+ */
+export declare const DEEZER_FORMATS: readonly ["FLAC", "MP3_320", "MP3_256", "MP3_128", "MP3_64", "AAC_64", "MP4_RA3", "MP4_RA2", "MP4_RA1"];
+export type DeezerFormat = (typeof DEEZER_FORMATS)[number];
+/** A quality request: the numeric `1 | 3 | 9` shorthand, or any format string. */
+export type Quality = number | DeezerFormat | string;
+/** Normalise a {@link Quality} (number shorthand or format string) to a format string. */
+export declare const toFormat: (quality: Quality) => string;
+/**
+ * Quality code (`1 | 3 | 9`) or format string → the `format` string the media
+ * API expects. Format strings pass straight through, so this doubles as a
+ * validator-free identity for `'AAC_64'`, `'MP3_256'`, …
+ */
+export declare const formatName: (quality: Quality) => string;
 /**
  * @param track Track info json returned from `getTrackInfo`
  * @param quality 1 = 128kbps, 3 = 320kbps and 9 = flac (around 1411kbps)
@@ -28,18 +44,21 @@ export interface ResolvedUrl {
     trackUrl: string;
     isEncrypted: boolean;
     fileSize: number;
-    /** the format Deezer actually returned, e.g. `'FLAC'` */
+    /** the format Deezer actually returned, e.g. `'FLAC'`, `'MP3_128'`, `'AAC_64'` */
     format: string;
+    /** the cipher Deezer applied — `'BF_CBC_STRIPE'` (stripe-encrypted) or `'NONE'` */
+    cipher: string;
 }
 /**
  * Resolve download URLs for many tracks in a **single** `get_url` request.
  *
- * `qualities` is an ordered preference list (e.g. `[9, 3, 1]`): Deezer returns
- * the best each track is licensed for, so there is no per-quality retry. The
- * result has one entry per input track, in order; `null` for a track that is
- * geo-blocked, unavailable, or errored.
+ * `qualities` is an ordered preference list: Deezer returns the best each track
+ * is licensed for, so there is no per-quality retry. Entries may be the numeric
+ * `1 | 3 | 9` shorthand **or** any format string from {@link DEEZER_FORMATS}
+ * (e.g. `['FLAC', 'MP3_320', 'AAC_64']`). The result has one entry per input
+ * track, in order; `null` for a track that is geo-blocked, unavailable, or errored.
  *
  * @param tracks    from `getTrackInfo` / `parseInfo` (needs `TRACK_TOKEN`, `SNG_ID`, `FILESIZE_*`)
- * @param qualities preference order — 9 = FLAC, 3 = MP3 320, 1 = MP3 128
+ * @param qualities preference order — default `[9, 3, 1]` (FLAC → MP3 320 → MP3 128)
  */
-export declare const resolveDownloadUrls: (tracks: trackType[], qualities?: number[]) => Promise<(ResolvedUrl | null)[]>;
+export declare const resolveDownloadUrls: (tracks: trackType[], qualities?: Quality[]) => Promise<(ResolvedUrl | null)[]>;

package/dist/lib/get-url.js

@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveDownloadUrls = exports.getTrackDownloadUrl = exports.formatName = exports.ExpiredTrackToken = exports.GeoBlocked = exports.WrongLicense = void 0;
+exports.resolveDownloadUrls = exports.getTrackDownloadUrl = exports.formatName = exports.toFormat = exports.DEEZER_FORMATS = exports.ExpiredTrackToken = exports.GeoBlocked = exports.WrongLicense = void 0;
 const delay_1 = __importDefault(require("delay"));
 const decrypt_1 = require("../lib/decrypt");
+const errors_1 = require("../lib/errors");
 const http_1 = require("../lib/http");
 const request_1 = __importDefault(require("../lib/request"));
 class WrongLicense extends Error {
@@ -37,17 +38,50 @@ class ExpiredTrackToken extends Error {
 }
 exports.ExpiredTrackToken = ExpiredTrackToken;
 let user_data = null;
-const getTrackFileSize = (track, quality) => {
-    switch (quality) {
-        case 9:
-            return Number(track.FILESIZE_FLAC);
-        case 3:
-            return Number(track.FILESIZE_MP3_320);
-        case 1:
-            return Number(track.FILESIZE_MP3_128);
-        default:
-            return 0;
+/**
+ * Every audio format Deezer's `get_url` understands, best → worst. `FLAC`,
+ * `MP3_320` and `MP3_128` are the classic `9 / 3 / 1` qualities; the rest are
+ * additional tiers (`MP3_256`, `MP3_64`, the `AAC_64` / `MP4_RA*` HE-AAC ladder)
+ * that some accounts and regions expose.
+ */
+exports.DEEZER_FORMATS = [
+    'FLAC',
+    'MP3_320',
+    'MP3_256',
+    'MP3_128',
+    'MP3_64',
+    'AAC_64',
+    'MP4_RA3',
+    'MP4_RA2',
+    'MP4_RA1',
+];
+const FORMAT_FILESIZE_KEY = {
+    FLAC: 'FILESIZE_FLAC',
+    MP3_320: 'FILESIZE_MP3_320',
+    MP3_256: 'FILESIZE_MP3_256',
+    MP3_128: 'FILESIZE_MP3_128',
+    MP3_64: 'FILESIZE_MP3_64',
+    MP3_MISC: 'FILESIZE_MP3_MISC',
+    AAC_64: 'FILESIZE_AAC_64',
+    MP4_RA1: 'FILESIZE_MP4_RA1',
+    MP4_RA2: 'FILESIZE_MP4_RA2',
+    MP4_RA3: 'FILESIZE_MP4_RA3',
+};
+const NUMERIC_FORMAT = { 9: 'FLAC', 3: 'MP3_320', 1: 'MP3_128' };
+/** Normalise a {@link Quality} (number shorthand or format string) to a format string. */
+const toFormat = (quality) => {
+    if (typeof quality === 'number') {
+        const f = NUMERIC_FORMAT[quality];
+        if (!f)
+            throw new Error(`Unknown quality ${quality}`);
+        return f;
     }
+    return quality;
+};
+exports.toFormat = toFormat;
+const getTrackFileSize = (track, quality) => {
+    const key = FORMAT_FILESIZE_KEY[(0, exports.toFormat)(quality)];
+    return key ? Number(track[key]) || 0 : 0;
 };
 const dzAuthenticate = async () => {
     const { data } = await request_1.default.get('https://www.deezer.com/ajax/gw-light.php', {
@@ -66,19 +100,12 @@ const dzAuthenticate = async () => {
     return user_data;
 };
 const MEDIA_MAX_RETRIES = 3;
-/** quality code -> the `format` string the media API expects */
-const formatName = (quality) => {
-    switch (quality) {
-        case 9:
-            return 'FLAC';
-        case 3:
-            return 'MP3_320';
-        case 1:
-            return 'MP3_128';
-        default:
-            throw new Error(`Unknown quality ${quality}`);
-    }
-};
+/**
+ * Quality code (`1 | 3 | 9`) or format string → the `format` string the media
+ * API expects. Format strings pass straight through, so this doubles as a
+ * validator-free identity for `'AAC_64'`, `'MP3_256'`, …
+ */
+const formatName = (quality) => (0, exports.toFormat)(quality);
 exports.formatName = formatName;
 /** POST media.deezer.com/v1/get_url with re-auth + exponential-backoff retry on 403/429/5xx. */
 const mediaGetUrl = async (track_tokens, formats, attempt = 0) => {
@@ -104,22 +131,23 @@ const mediaGetUrl = async (track_tokens, formats, attempt = 0) => {
 };
 /** Parse one `data[i]` entry from a get_url response into a source URL (or null / throw). */
 const parseMediaEntry = (entry, token, country) => {
-    var _a, _b;
+    var _a, _b, _c, _d;
     if (entry === null || entry === void 0 ? void 0 : entry.errors) {
         const { code } = entry.errors[0];
         if (code === 2002)
             throw new GeoBlocked(country);
         if (code === 2000 || code === 2001)
             throw new ExpiredTrackToken(token);
-        throw new Error(Object.entries(entry.errors[0]).join(', '));
+        throw new errors_1.DeezerError(entry.errors[0]);
     }
     const media = (_a = entry === null || entry === void 0 ? void 0 : entry.media) === null || _a === void 0 ? void 0 : _a[0];
     if (!((_b = media === null || media === void 0 ? void 0 : media.sources) === null || _b === void 0 ? void 0 : _b.length))
         return null;
-    return { url: media.sources[0].url, format: media.format };
+    return { url: media.sources[0].url, format: media.format, cipher: (_d = (_c = media.cipher) === null || _c === void 0 ? void 0 : _c.type) !== null && _d !== void 0 ? _d : 'BF_CBC_STRIPE' };
 };
+/** Whether a track fetched with the given cipher needs Blowfish stripe decryption. */
+const cipherIsEncrypted = (cipher, url) => cipher ? cipher !== 'NONE' : url.includes('/mobile/') || url.includes('/media/');
 const getTrackUrlFromServer = async (track_token, format) => {
-    var _a, _b;
     const user = user_data ? user_data : await dzAuthenticate();
     if ((format === 'FLAC' && !user.can_stream_lossless) || (format === 'MP3_320' && !user.can_stream_hq)) {
         throw new WrongLicense(format);
@@ -127,7 +155,7 @@ const getTrackUrlFromServer = async (track_token, format) => {
     const { data, country } = await mediaGetUrl([track_token], [{ format, cipher: 'BF_CBC_STRIPE' }]);
     if (!data.length)
         return null;
-    return (_b = (_a = parseMediaEntry(data[0], track_token, country)) === null || _a === void 0 ? void 0 : _a.url) !== null && _b !== void 0 ? _b : null;
+    return parseMediaEntry(data[0], track_token, country);
 };
 /**
  * @param track Track info json returned from `getTrackInfo`
@@ -148,11 +176,11 @@ const getTrackDownloadUrl = async (track, quality) => {
     else {
         // Get URL with the official API
         try {
-            const url = await getTrackUrlFromServer(track.TRACK_TOKEN, format);
-            if (url) {
+            const resolved = await getTrackUrlFromServer(track.TRACK_TOKEN, format);
+            if (resolved) {
                 return {
-                    trackUrl: url,
-                    isEncrypted: url.includes('/mobile/') || url.includes('/media/'),
+                    trackUrl: resolved.url,
+                    isEncrypted: cipherIsEncrypted(resolved.cipher, resolved.url),
                     fileSize: getTrackFileSize(track, quality),
                 };
             }
@@ -213,17 +241,17 @@ const testUrl = async (url) => {
         return 0;
     }
 };
-const QUALITY_OF_FORMAT = { FLAC: 9, MP3_320: 3, MP3_128: 1, MP3_256: 3, MP3_64: 1 };
 /**
  * Resolve download URLs for many tracks in a **single** `get_url` request.
  *
- * `qualities` is an ordered preference list (e.g. `[9, 3, 1]`): Deezer returns
- * the best each track is licensed for, so there is no per-quality retry. The
- * result has one entry per input track, in order; `null` for a track that is
- * geo-blocked, unavailable, or errored.
+ * `qualities` is an ordered preference list: Deezer returns the best each track
+ * is licensed for, so there is no per-quality retry. Entries may be the numeric
+ * `1 | 3 | 9` shorthand **or** any format string from {@link DEEZER_FORMATS}
+ * (e.g. `['FLAC', 'MP3_320', 'AAC_64']`). The result has one entry per input
+ * track, in order; `null` for a track that is geo-blocked, unavailable, or errored.
  *
  * @param tracks    from `getTrackInfo` / `parseInfo` (needs `TRACK_TOKEN`, `SNG_ID`, `FILESIZE_*`)
- * @param qualities preference order — 9 = FLAC, 3 = MP3 320, 1 = MP3 128
+ * @param qualities preference order — default `[9, 3, 1]` (FLAC → MP3 320 → MP3 128)
  */
 const resolveDownloadUrls = async (tracks, qualities = [9, 3, 1]) => {
     if (!tracks.length)
@@ -231,7 +259,6 @@ const resolveDownloadUrls = async (tracks, qualities = [9, 3, 1]) => {
     const formats = qualities.map((q) => ({ format: (0, exports.formatName)(q), cipher: 'BF_CBC_STRIPE' }));
     const { data, country } = await mediaGetUrl(tracks.map((t) => t.TRACK_TOKEN), formats);
     return tracks.map((track, i) => {
-        var _a;
         let parsed;
         try {
             parsed = parseMediaEntry(data[i], track.TRACK_TOKEN, country);
@@ -242,12 +269,12 @@ const resolveDownloadUrls = async (tracks, qualities = [9, 3, 1]) => {
         }
         if (!parsed)
             return null;
-        const q = (_a = QUALITY_OF_FORMAT[parsed.format]) !== null && _a !== void 0 ? _a : qualities[0];
         return {
             trackUrl: parsed.url,
-            isEncrypted: parsed.url.includes('/mobile/') || parsed.url.includes('/media/'),
-            fileSize: getTrackFileSize(track, q),
+            isEncrypted: cipherIsEncrypted(parsed.cipher, parsed.url),
+            fileSize: getTrackFileSize(track, parsed.format),
             format: parsed.format,
+            cipher: parsed.cipher,
         };
     });
 };

package/dist/lib/request.d.ts

@@ -3,6 +3,26 @@ type DeezerRequestConfig = {
     headers?: Record<string, string>;
     params?: HttpQuery;
 };
+/**
+ * Bounded-retry policy for the gateway. Every retry class has its own attempt
+ * cap **and** there is a wall-clock deadline, so a persistently failing endpoint
+ * can no longer spin forever (the old code had no cap on `code === 4`,
+ * `NEED_API_AUTH_REQUIRED` or `GATEWAY_ERROR`).
+ */
+export declare const RETRY_POLICY: {
+    /** total attempts for the transient `code === 4` class */
+    code4Attempts: number;
+    /** re-inits allowed for `NEED_API_AUTH_REQUIRED` */
+    authReinits: number;
+    /** token refreshes allowed for `GATEWAY_ERROR` / `VALID_TOKEN_REQUIRED` */
+    tokenRefreshes: number;
+    /** base backoff (ms) — grows exponentially, full-jittered */
+    baseMs: number;
+    /** cap on a single backoff wait */
+    maxDelayMs: number;
+    /** overall wall-clock budget from the first attempt */
+    deadlineMs: number;
+};
 export declare const initDeezerApi: (arl: string) => Promise<string>;
 declare const _default: {
     defaults: {

package/dist/lib/request.js

@@ -3,10 +3,36 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initDeezerApi = void 0;
+exports.initDeezerApi = exports.RETRY_POLICY = void 0;
 const delay_1 = __importDefault(require("delay"));
 const http_1 = require("./http");
+const errors_1 = require("./errors");
 let user_arl = 'c973964816688562722418b5200c1515dffaad15a42643ebf87cc72824a54612ec51c2ad42d566743f9e424c774e98ccae7737770acff59251328e6cd598c7bcac38ca269adf78bfb88ec5bbad6cd800db3c0b88b2af645bb22b99e71de26416';
+/**
+ * Bounded-retry policy for the gateway. Every retry class has its own attempt
+ * cap **and** there is a wall-clock deadline, so a persistently failing endpoint
+ * can no longer spin forever (the old code had no cap on `code === 4`,
+ * `NEED_API_AUTH_REQUIRED` or `GATEWAY_ERROR`).
+ */
+exports.RETRY_POLICY = {
+    /** total attempts for the transient `code === 4` class */
+    code4Attempts: 6,
+    /** re-inits allowed for `NEED_API_AUTH_REQUIRED` */
+    authReinits: 3,
+    /** token refreshes allowed for `GATEWAY_ERROR` / `VALID_TOKEN_REQUIRED` */
+    tokenRefreshes: 15,
+    /** base backoff (ms) — grows exponentially, full-jittered */
+    baseMs: 800,
+    /** cap on a single backoff wait */
+    maxDelayMs: 8000,
+    /** overall wall-clock budget from the first attempt */
+    deadlineMs: 30000,
+};
+/** Exponential backoff (ms) with full jitter on the top half of the window. */
+const backoffDelay = (attempt) => {
+    const windowMs = Math.min(exports.RETRY_POLICY.baseMs * 2 ** attempt, exports.RETRY_POLICY.maxDelayMs);
+    return windowMs / 2 + Math.random() * (windowMs / 2);
+};
 const instance = new http_1.HttpClient({
     baseURL: 'https://api.deezer.com/1.0',
     timeout: 15000,
@@ -54,30 +80,41 @@ const initDeezerApi = async (arl) => {
     return data.results.SESSION;
 };
 exports.initDeezerApi = initDeezerApi;
-let token_retry = 0;
 const requestWithRetry = async (method, url, body, config = {}) => {
     var _a;
-    const response = method === 'POST' ? await instance.post(url, body, config) : await instance.get(url, config);
-    const error = (_a = response.data) === null || _a === void 0 ? void 0 : _a.error;
-    if (!error || Object.keys(error).length === 0) {
-        token_retry = 0;
-        return response;
-    }
-    if (error.NEED_API_AUTH_REQUIRED) {
-        await (0, exports.initDeezerApi)(user_arl);
-        return await requestWithRetry(method, url, body, config);
-    }
-    if (error.code === 4) {
-        await delay_1.default.range(1000, 1500);
-        return await requestWithRetry(method, url, body, config);
-    }
-    if (error.GATEWAY_ERROR || (error.VALID_TOKEN_REQUIRED && token_retry < 15)) {
-        token_retry += 1;
-        await getApiToken();
-        return await requestWithRetry(method, url, body, config);
+    const startedAt = Date.now();
+    let authReinits = 0;
+    let tokenRefreshes = 0;
+    let code4Attempts = 0;
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+        const response = method === 'POST' ? await instance.post(url, body, config) : await instance.get(url, config);
+        const error = (_a = response.data) === null || _a === void 0 ? void 0 : _a.error;
+        if (!error || Object.keys(error).length === 0) {
+            return response;
+        }
+        const overDeadline = Date.now() - startedAt > exports.RETRY_POLICY.deadlineMs;
+        if (error.NEED_API_AUTH_REQUIRED && authReinits < exports.RETRY_POLICY.authReinits && !overDeadline) {
+            authReinits += 1;
+            await (0, exports.initDeezerApi)(user_arl);
+            continue;
+        }
+        if ((error.GATEWAY_ERROR || error.VALID_TOKEN_REQUIRED) &&
+            tokenRefreshes < exports.RETRY_POLICY.tokenRefreshes &&
+            !overDeadline) {
+            tokenRefreshes += 1;
+            await getApiToken();
+            await (0, delay_1.default)(backoffDelay(tokenRefreshes - 1));
+            continue;
+        }
+        if (error.code === 4 && code4Attempts < exports.RETRY_POLICY.code4Attempts && !overDeadline) {
+            await (0, delay_1.default)(backoffDelay(code4Attempts));
+            code4Attempts += 1;
+            continue;
+        }
+        // Unhandled error, or a retry class ran out of attempts / hit the deadline.
+        throw new errors_1.DeezerError(error);
     }
-    token_retry = 0;
-    return response;
 };
 exports.default = {
     defaults: instance.defaults,

package/dist/types/tracks.d.ts

@@ -1,6 +1,6 @@
 import type { artistType } from './artist';
 interface mediaType {
-    TYPE: 'preview';
+    TYPE: 'preview' | string;
     HREF: string;
 }
 export interface lyricsSync {
@@ -59,15 +59,19 @@ interface songType {
     URL_REWRITING: string;
     VERSION?: string;
     MD5_ORIGIN?: string;
-    FILESIZE_AAC_64: '0';
+    FILESIZE_AAC_64: string;
     FILESIZE_MP3_64: string;
     FILESIZE_MP3_128: string;
-    FILESIZE_MP3_256: '0';
-    FILESIZE_MP3_320: '0';
-    FILESIZE_MP4_RA1: '0';
-    FILESIZE_MP4_RA2: '0';
-    FILESIZE_MP4_RA3: '0';
-    FILESIZE_FLAC: '0';
+    FILESIZE_MP3_256: string;
+    FILESIZE_MP3_320: string;
+    FILESIZE_MP3_MISC?: string;
+    FILESIZE_MP4_RA1: string;
+    FILESIZE_MP4_RA2: string;
+    FILESIZE_MP4_RA3: string;
+    FILESIZE_MHM1_RA1?: string;
+    FILESIZE_MHM1_RA2?: string;
+    FILESIZE_MHM1_RA3?: string;
+    FILESIZE_FLAC: string;
     FILESIZE: string;
     GAIN: string;
     MEDIA_VERSION: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gerdur-core",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "description": "Core module for gerdur.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",