gerdur 1.0.1 → 1.0.2

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gerdur",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "description": "The crucial streaming module for dabox systems.",
     "author": "Christian",
     "license": "SEE LICENSE IN LICENSE",
@@ -48,7 +48,7 @@
         "adm-zip": "^0.5.16",
         "chalk": "^4.1.2",
         "commander": "^9.5.0",
-        "gerdur-core": "^1.0.3",
+        "gerdur-core": "^1.0.4",
         "dot-prop": "^6.0.1",
         "got": "^11.8.6",
         "gradient-string": "^2.0.2",

package/dist/src/gerdur.js

@@ -219,6 +219,32 @@ const startDownload = async (saveLayout, url, skipPrompt) => {
             const resolveFullPath = options.resolveFullPath ?? conf.get('playlist.resolveFullPath');
             const savedFiles = [];
             let m3u8 = [];
+            // One batched get_url for the whole selection instead of a request per track.
+            // Deezer returns the best licensed format, so pass an ordered preference list.
+            const QUALITY_PREF = {
+                '1': [1],
+                '128': [1],
+                '3': [3, 1],
+                '320': [3, 1],
+                '9': [9, 3, 1],
+                flac: [9, 3, 1],
+            };
+            const prefetchedUrls = new Map();
+            if (data.tracks.length > 1 && !process.env.SIMULATE) {
+                try {
+                    const base = QUALITY_PREF[String(options.quality).toLowerCase()] ?? [3, 1];
+                    const pref = fallbackQuality ? base : [base[0]];
+                    const resolved = await (0, gerdur_core_1.resolveDownloadUrls)(data.tracks, pref);
+                    resolved.forEach((r, i) => {
+                        if (r) {
+                            prefetchedUrls.set(data.tracks[i].SNG_ID, r);
+                        }
+                    });
+                }
+                catch {
+                    // batch resolve failed wholesale — every track falls back to per-track resolution
+                }
+            }
             await queue.addAll(data.tracks.map((track, index) => {
                 return async () => {
                     const savedPath = await (0, download_track_1.default)({
@@ -233,6 +259,7 @@ const startDownload = async (saveLayout, url, skipPrompt) => {
                         fallbackQuality,
                         overwrite,
                         message: `(${index}/${data.tracks.length})`,
+                        prefetched: prefetchedUrls.get(track.SNG_ID) ?? null,
                     });
                     // Add to saved list
                     if (savedPath) {

package/dist/src/lib/download-track.d.ts

@@ -19,6 +19,18 @@ interface downloadTrackProps {
     isQualityFallback?: boolean;
     overwrite?: boolean;
     message?: string;
+    /**
+     * A download URL already resolved for this track by a batch `resolveDownloadUrls`
+     * pass. When set, the per-track `get_url` request and quality-fallback round-trips
+     * are skipped and `quality` is taken from the format Deezer actually granted.
+     * Falls through to the normal path when absent or `null` (track not in the batch).
+     */
+    prefetched?: {
+        trackUrl: string;
+        isEncrypted: boolean;
+        fileSize: number;
+        format: string;
+    } | null;
 }
-declare const downloadTrack: ({ track, quality, info, coverSizes, path, totalTracks, trackNumber, fallbackTrack, fallbackQuality, isFallback, isQualityFallback, overwrite, message, }: downloadTrackProps) => Promise<string | undefined>;
+declare const downloadTrack: ({ track, quality, info, coverSizes, path, totalTracks, trackNumber, fallbackTrack, fallbackQuality, isFallback, isQualityFallback, overwrite, message, prefetched, }: downloadTrackProps) => Promise<string | undefined>;
 export default downloadTrack;

package/dist/src/lib/download-track.js

@@ -16,10 +16,17 @@ const util_2 = require("./util");
 const decrypt_1 = require("./decrypt");
 const pipeline = (0, util_1.promisify)(stream_1.default.pipeline);
 const simulate = process.env.SIMULATE;
-const downloadTrack = async ({ track, quality, info, coverSizes, path, totalTracks, trackNumber = true, fallbackTrack = true, fallbackQuality = true, isFallback = false, isQualityFallback = false, overwrite = false, message = '', }) => {
+/** media-API format string -> gerdur's numeric quality */
+const FORMAT_TO_QUALITY = { FLAC: 9, MP3_320: 3, MP3_256: 3, MP3_128: 1, MP3_64: 1 };
+const downloadTrack = async ({ track, quality, info, coverSizes, path, totalTracks, trackNumber = true, fallbackTrack = true, fallbackQuality = true, isFallback = false, isQualityFallback = false, overwrite = false, message = '', prefetched = null, }) => {
     (0, log_update_1.default)(signale_1.default.pending(track.SNG_TITLE + ' by ' + track.ART_NAME + ' from ' + track.ALB_TITLE));
     try {
         let ext = '.mp3', fileSize = 0, downloaded = 0, coverSize = 500;
+        // A batch resolve already picked the best licensed format for this track —
+        // align `quality` with it so the extension, cover size and file size match.
+        if (prefetched && FORMAT_TO_QUALITY[prefetched.format]) {
+            quality = FORMAT_TO_QUALITY[prefetched.format];
+        }
         switch (quality) {
             case 1:
             case '1':
@@ -54,12 +61,17 @@ const downloadTrack = async ({ track, quality, info, coverSizes, path, totalTrac
             return savePath;
         }
         let trackData;
-        try {
-            trackData = await (0, gerdur_core_1.getTrackDownloadUrl)(track, quality);
+        if (prefetched) {
+            trackData = prefetched;
         }
-        catch (err) {
-            if (!(err instanceof gerdur_core_1.GeoBlocked) || !track.FALLBACK) {
-                throw err;
+        else {
+            try {
+                trackData = await (0, gerdur_core_1.getTrackDownloadUrl)(track, quality);
+            }
+            catch (err) {
+                if (!(err instanceof gerdur_core_1.GeoBlocked) || !track.FALLBACK) {
+                    throw err;
+                }
             }
         }
         if (!trackData) {
@@ -114,7 +126,13 @@ const downloadTrack = async ({ track, quality, info, coverSizes, path, totalTrac
         const bar = (0, util_2.progressBar)(fileSize, 40);
         const humanSizeTotal = (fileSize / 1024 / 1024).toFixed(2);
         let transferredLast = downloaded;
-        await pipeline(got_1.default.stream(trackData.trackUrl, { responseType: 'buffer', headers }).on('downloadProgress', ({ transferred }) => {
+        await pipeline(got_1.default
+            .stream(trackData.trackUrl, {
+            responseType: 'buffer',
+            headers,
+            agent: { http: gerdur_core_1.httpAgent, https: gerdur_core_1.httpsAgent },
+        })
+            .on('downloadProgress', ({ transferred }) => {
             // Report download progress
             transferred += downloaded;
             if (transferred - transferredLast > 50000) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gerdur",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "The crucial streaming module for dabox systems.",
   "author": "Christian",
   "license": "SEE LICENSE IN LICENSE",
@@ -48,7 +48,7 @@
     "adm-zip": "^0.5.16",
     "chalk": "^4.1.2",
     "commander": "^9.5.0",
-    "gerdur-core": "^1.0.3",
+    "gerdur-core": "^1.0.4",
     "dot-prop": "^6.0.1",
     "got": "^11.8.6",
     "gradient-string": "^2.0.2",