Merge pull request #15 from vitalygashkov/next

Wink: fixed decryption error when downloading whole season
vitalygashkov · Jul 2, 2023 · 68a5e88 · 68a5e88
2 parents 33f7936 + 37bb69c
commit 68a5e88
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -58,7 +58,7 @@ $ streamyx "https://hd.kinopoisk.ru/film/46c5df252dc1a790b82d1a00fcf44812?conten
 | ---------------------------------------- | ------------ | ------------------------------------------------------------------------ |
 | [Кинопоиск](https://hd.kinopoisk.ru/)    | Supported    |                                                                          |
 | [Иви](https://www.ivi.ru/)               | Experimental | 3D/seasons/series in progress                                            |
-| [Wink](https://wink.ru/)                 | Experimental | Seasons/series in progress                                               |
+| [Wink](https://wink.ru/)                 | Supported    |                                                                          |
 | [Okko](https://okko.tv/)                 | Experimental | Sometimes the anti-bot protection triggers and requests are not executed |
 | [KION](https://kion.ru/)                 | Planned      |                                                                          |
 | [PREMIER](https://premier.one/)          | Planned      |                                                                          |

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "streamyx",
-  "version": "3.6.4",
+  "version": "3.6.5",
   "author": "Vitaly Gashkov <[email protected]>",
   "description": "Command-line video downloader",
   "main": "dist/streamyx.js",

diff --git a/src/downloader.ts b/src/downloader.ts
@@ -182,13 +182,13 @@ class Downloader {
         if (track.bitrate) trackInfo += ` ∙ ${track.bitrate} Kbps`;
       }
       if (track.type === 'audio') {
-        trackInfo += ` ∙ ${track.language?.toUpperCase()}`;
+        if (track.language) trackInfo += ` ∙ ${track.language.toUpperCase()}`;
         if (track.label) trackInfo += ` (${track.label})`;
-        trackInfo += ` ∙ ${track.audioSamplingRate} kHz`;
+        if (track.audioSamplingRate) trackInfo += ` ∙ ${track.audioSamplingRate} kHz`;
         trackInfo += ` ∙ ${track.bitrate} Kbps`;
       }
       if (track.type === 'text') {
-        trackInfo += ` ∙ ${track.language.toUpperCase()}`;
+        if (track.language) trackInfo += ` ∙ ${track.language.toUpperCase()}`;
         if (track.label) trackInfo += ` (${track.label})`;
       }
       if (track.type === 'video' || track.type === 'audio') trackInfo += ` ∙ ${track.size} MiB`;

diff --git a/src/providers b/src/providers
diff --git a/streamyx.ts b/streamyx.ts
@@ -134,7 +134,12 @@ const run = async () => {
     logger.info(`Fetching metadata and generate download configs...`);
     const configs = await provider.getConfigList();
     const downloader = new Downloader(parsedArgs);
-    for (const config of configs) await downloader.start(config);
+    for (const config of configs) {
+      if (typeof config.drmConfig === 'function') {
+        config.drmConfig = await config.drmConfig();
+      }
+      await downloader.start(config);
+    }
   }
 
   process.exit();