Merge pull request #1181 from ektatas/fix-useless-first-comma

fix first comma when select all episodes

.commitlintrc.json

@@ -0,0 +1,6 @@
+{
+    "extends": ["@commitlint/config-conventional"],
+    "rules": {
+        "type-enum": [2, "always", ["ci", "chore", "docs", "ticket", "feat", "fix", "perf", "refactor", "revert", "style"]]
+    }
+}

.github/workflows/auto-documentation.yml

@@ -4,23 +4,26 @@ on:
     push:
         branches: [master]
 
+permissions:
+    contents: write
+
 jobs:
     documentation:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
               with:
                   ref: ${{ github.head_ref }}
-            - uses: pnpm/action-setup@v2
+            - uses: pnpm/action-setup@v4
               with:
                   version: latest
             - name: Use Node.js
               uses: actions/setup-node@v3
               with:
-                  node-version: 22
+                  node-version: 24
             - run: pnpm i
             - run: pnpm run docs
             - uses: stefanzweifel/git-auto-commit-action@v4
               with:
-                  commit_message: ${{ github.event.head_commit.message }} + Documentation
+                  commit_message: 'docs(main): bump version'

.github/workflows/docker.yml

@@ -0,0 +1,35 @@
+# This workflow will build a Node project with Docker
+
+name: build and push docker image
+
+on:
+    push:
+        branches: [master]
+    workflow_dispatch:
+
+permissions:
+    contents: read
+
+jobs:
+    build-node:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - name: Set up Docker Buildx
+              id: buildx
+              uses: docker/setup-buildx-action@v1
+            - name: Login to DockerHub
+              if: ${{ github.ref == 'refs/heads/master' }}
+              uses: docker/login-action@v1
+              with:
+                  username: ${{ secrets.DOCKERHUB_USERNAME }}
+                  password: ${{ secrets.DOCKERHUB_TOKEN }}
+            - name: Build and push Docker images
+              uses: docker/build-push-action@v2.9.0
+              with:
+                  github-token: ${{ github.token }}
+                  push: ${{ github.ref == 'refs/heads/master' }}
+                  tags: |
+                      "multidl/multi-downloader-nx:latest"
+            - name: Image digest
+              run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/release-matrix.yml

@@ -4,6 +4,9 @@ on:
     release:
         types: [published]
 
+permissions:
+    contents: write
+
 jobs:
     build:
         strategy:
@@ -52,10 +55,6 @@ jobs:
                       build_type: linux
                       build_arch: arm64
                       gui: cli
-                    - os: ubuntu-latest
-                      build_type: android
-                      build_arch: armv7
-                      gui: cli
                     - os: ubuntu-latest
                       build_type: linux
                       build_arch: x64
@@ -64,10 +63,6 @@ jobs:
                       build_type: linux
                       build_arch: arm64
                       gui: gui
-                    - os: ubuntu-latest
-                      build_type: android
-                      build_arch: armv7
-                      gui: gui
                     # ALPINE
                     - os: ubuntu-latest
                       build_type: alpine
@@ -88,14 +83,14 @@ jobs:
         runs-on: ${{ matrix.os }}
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
-            - uses: pnpm/action-setup@v2
+              uses: actions/checkout@v4
+            - uses: pnpm/action-setup@v4
               with:
                   version: latest
             - name: Set up Node.js
               uses: actions/setup-node@v3
               with:
-                  node-version: 22
+                  node-version: 24
                   check-latest: true
             - name: Install Node modules
               run: |
@@ -108,28 +103,17 @@ jobs:
                   echo PACKAGE_VERSION=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV || exit 1
             - name: Make build
               run: pnpm run build-${{ matrix.build_type }}-${{ matrix.build_arch }}-${{ matrix.gui }}
-            - name: Upload release
-              uses: actions/upload-release-asset@v1
+            - name: Upload assets to the GitHub Release
+              uses: softprops/action-gh-release@v2
               with:
-                  upload_url: ${{ github.event.release.upload_url }}
-                  asset_name: multi-downloader-nx-${{ matrix.build_type }}-${{ matrix.build_arch }}-${{ matrix.gui }}.7z
-                  asset_path: ./lib/_builds/multi-downloader-nx-${{ matrix.build_type }}-${{ matrix.build_arch }}-${{ matrix.gui }}.7z
-                  asset_content_type: application/x-7z-compressed
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            - name: Upload SHA256 checksum
-              uses: actions/upload-release-asset@v1
-              with:
-                  upload_url: ${{ github.event.release.upload_url }}
-                  asset_name: multi-downloader-nx-${{ matrix.build_type }}-${{ matrix.build_arch }}-${{ matrix.gui }}.7z.sha256
-                  asset_path: ./lib/_builds/multi-downloader-nx-${{ matrix.build_type }}-${{ matrix.build_arch }}-${{ matrix.gui }}.7z.sha256
-                  asset_content_type: text/plain
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  files: |
+                      ./lib/_builds/multi-downloader-nx-${{ matrix.build_type }}-${{ matrix.build_arch }}-${{ matrix.gui }}.7z
+                      ./lib/_builds/multi-downloader-nx-${{ matrix.build_type }}-${{ matrix.build_arch }}-${{ matrix.gui }}.7z.sha256
+                  fail_on_unmatched_files: true
     build-docker:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
             - name: Set up Docker Buildx
               id: buildx
               uses: docker/setup-buildx-action@v1
@@ -144,7 +128,6 @@ jobs:
                   github-token: ${{ github.token }}
                   push: true
                   tags: |
-                      "multidl/multi-downloader-nx:${{ github.event.release.tag_name }}""
-                      "multidl/multi-downloader-nx:latest"
+                      "multidl/multi-downloader-nx:${{ github.event.release.tag_name }}"
             - name: Image digest
               run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/test.yml

@@ -6,18 +6,21 @@ on:
     pull_request:
         branches: [master]
 
+permissions:
+    contents: read
+
 jobs:
     tsc:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
             - uses: pnpm/action-setup@v2
               with:
                   version: latest
             - name: Set up Node.js
               uses: actions/setup-node@v3
               with:
-                  node-version: 22
+                  node-version: 24
                   check-latest: true
             - run: pnpm i
             - run: npx tsc
@@ -25,14 +28,14 @@ jobs:
         needs: tsc
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
             - uses: pnpm/action-setup@v2
               with:
                   version: latest
             - name: Set up Node.js
               uses: actions/setup-node@v3
               with:
-                  node-version: 22
+                  node-version: 24
                   check-latest: true
             - run: pnpm i
             - run: pnpm run eslint
@@ -40,44 +43,104 @@ jobs:
         needs: tsc
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
             - uses: pnpm/action-setup@v2
               with:
                   version: latest
             - name: Set up Node.js
               uses: actions/setup-node@v3
               with:
-                  node-version: 22
+                  node-version: 24
                   check-latest: true
             - run: pnpm i
             - run: pnpm run prettier
-    build-test-arm64:
+    build-test-windows-arm64:
+        needs: [eslint, prettier, tsc]
+        runs-on: windows-11-arm
+        steps:
+            - uses: actions/checkout@v4
+            - uses: pnpm/action-setup@v2
+              with:
+                  version: latest
+            - name: Set up Node.js
+              uses: actions/setup-node@v3
+              with:
+                  node-version: 24
+                  check-latest: true
+            - run: pnpm i
+            - run: pnpm run test-windows-arm64
+    build-test-linux-arm64:
+        needs: [eslint, prettier, tsc]
+        runs-on: ubuntu-24.04-arm
+        steps:
+            - uses: actions/checkout@v4
+            - uses: pnpm/action-setup@v2
+              with:
+                  version: latest
+            - name: Set up Node.js
+              uses: actions/setup-node@v3
+              with:
+                  node-version: 24
+                  check-latest: true
+            - run: pnpm i
+            - run: pnpm run test-linux-arm64
+    build-test-macos-arm64:
         needs: [eslint, prettier, tsc]
         runs-on: macos-latest
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
             - uses: pnpm/action-setup@v2
               with:
                   version: latest
             - name: Set up Node.js
               uses: actions/setup-node@v3
               with:
-                  node-version: 22
+                  node-version: 24
                   check-latest: true
             - run: pnpm i
-            - run: pnpm run test-arm64
-    build-test-x64:
+            - run: pnpm run test-macos-arm64
+    build-test-windows-x64:
+        needs: [eslint, prettier, tsc]
+        runs-on: windows-latest
+        steps:
+            - uses: actions/checkout@v4
+            - uses: pnpm/action-setup@v2
+              with:
+                  version: latest
+            - name: Set up Node.js
+              uses: actions/setup-node@v3
+              with:
+                  node-version: 24
+                  check-latest: true
+            - run: pnpm i
+            - run: pnpm run test-windows-x64
+    build-test-linux-x64:
         needs: [eslint, prettier, tsc]
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
             - uses: pnpm/action-setup@v2
               with:
                   version: latest
             - name: Set up Node.js
               uses: actions/setup-node@v3
               with:
-                  node-version: 22
+                  node-version: 24
                   check-latest: true
             - run: pnpm i
-            - run: pnpm run test-x64
+            - run: pnpm run test-linux-x64
+    build-test-macos-x64:
+        needs: [eslint, prettier, tsc]
+        runs-on: macos-15-intel
+        steps:
+            - uses: actions/checkout@v4
+            - uses: pnpm/action-setup@v2
+              with:
+                  version: latest
+            - name: Set up Node.js
+              uses: actions/setup-node@v3
+              with:
+                  node-version: 24
+                  check-latest: true
+            - run: pnpm i
+            - run: pnpm run test-macos-x64

.husky/commit-msg

@@ -0,0 +1 @@
+npx commitlint --edit .git/COMMIT_EDITMSG

.husky/pre-commit

@@ -0,0 +1 @@
+npx tsc

@types/crunchyTypes.d.ts

@@ -52,6 +52,7 @@ export type CrunchyDownloadOptions = {
 	scaledBorderAndShadowFix: boolean;
 	scaledBorderAndShadow: 'yes' | 'no';
 	originalScriptFix: boolean;
+	subtitleTimestampFix: boolean;
 };
 
 export type CrunchyMultiDownload = {
@@ -88,6 +89,7 @@ export type CrunchyEpMeta = {
 		versions?: EpisodeVersion[] | null;
 		isSubbed: boolean;
 		isDubbed: boolean;
+		durationMs: number;
 	}[];
 	seriesTitle: string;
 	seasonTitle: string;

@types/m3u8-parsed.d.ts

@@ -1,49 +0,0 @@
-declare module 'm3u8-parsed' {
-	export type M3U8 = {
-		allowCache: boolean;
-		discontinuityStarts: [];
-		segments: {
-			duration: number;
-			byterange?: {
-				length: number;
-				offset: number;
-			};
-			uri: string;
-			key: {
-				method: string;
-				uri: string;
-			};
-			timeline: number;
-		}[];
-		version: number;
-		mediaGroups: {
-			[type: string]: {
-				[index: string]: {
-					[language: string]: {
-						default: boolean;
-						autoselect: boolean;
-						language: string;
-						uri: string;
-					};
-				};
-			};
-		};
-		playlists: {
-			uri: string;
-			timeline: number;
-			attributes: {
-				'CLOSED-CAPTIONS': string;
-				AUDIO: string;
-				'FRAME-RATE': number;
-				RESOLUTION: {
-					width: number;
-					height: number;
-				};
-				CODECS: string;
-				'AVERAGE-BANDWIDTH': string;
-				BANDWIDTH: number;
-			};
-		}[];
-	};
-	export default function (data: string): M3U8;
-}

TODO.md

@@ -1,15 +0,0 @@
-# Todo/Future Ideas list
-
-- [ ] Look into implementing wvd file support
-- [ ] Merge sync branch with latest master
-  - [ ] Finish implementing old algorithm
-  - [ ] Look into adding suggested algorithm [#599](https://github.com/anidl/multi-downloader-nx/issues/599)
-- [ ] Remove Funimation
-- [ ] Remove old hidive API or find a way to make it work
-- [ ] Look into adding other services
-- [ ] Refactor downloading code
-  - [ ] Allow audio and video download at the same time
-  - [ ] Reduce/Refactor the amount of duplicate/boilerplate code required
-    - [ ] Create a generic service class for the CLI with set inputs/outputs
-    - [ ] Modularize site modules to ease addition of new sites
-  - [ ] Create generic MPD/M3U8 playlist downloader

adn.ts

@@ -3,11 +3,11 @@ import packageJson from './package.json';
 
 // Node
 import path from 'path';
-import fs from 'fs-extra';
+import fs from 'fs';
 import crypto from 'crypto';
 
 // Plugins
-import m3u8 from 'm3u8-parsed';
+import { Parser } from 'm3u8-parser';
 
 // Modules
 import * as fontsData from './modules/module.fontsData';
@@ -18,7 +18,6 @@ import * as reqModule from './modules/module.fetch';
 import Merger, { Font, MergerInput, SubtitleInput } from './modules/module.merger';
 import streamdl from './modules/hls-download';
 import { console } from './modules/log';
-import { domain } from './modules/module.api-urls';
 import { downloaded } from './modules/module.downloadArchive';
 import parseSelect from './modules/module.parseSelect';
 import parseFileName, { Variable } from './modules/module.filename';
@@ -411,7 +410,7 @@ export default class AnimationDigitalNetwork implements ServiceClass {
 		const bin = Merger.checkMerger(this.cfg.bin, options.mp4, options.forceMuxer);
 		// collect fonts info
 		// mergers
-		let isMuxed = false;
+		let isMuxed: boolean = false;
 		if (options.syncTiming) {
 			await merger.createDelays();
 		}
@@ -601,22 +600,32 @@ export default class AnimationDigitalNetwork implements ServiceClass {
 					dlFailed = true;
 				} else {
 					const streamPlaylistBody = await streamPlaylistsReq.res.text();
-					const streamPlaylists = m3u8(streamPlaylistBody);
+
+					// Init parser
+					const parser = new Parser();
+
+					// Parse M3U8
+					parser.push(streamPlaylistBody);
+					parser.end();
+
+					const streamPlaylists = parser.manifest;
+					if (!streamPlaylists) throw Error('Failed to parse M3U8');
+
 					const plServerList: string[] = [],
 						plStreams: Record<string, Record<string, string>> = {},
 						plQuality: {
 							str: string;
 							dim: string;
-							CODECS: string;
-							RESOLUTION: {
-								width: number;
-								height: number;
+							CODECS?: string;
+							RESOLUTION?: {
+								width?: number;
+								height?: number;
 							};
 						}[] = [];
-					for (const pl of streamPlaylists.playlists) {
+					for (const pl of streamPlaylists.playlists ?? []) {
 						// set quality
 						const plResolution = pl.attributes.RESOLUTION;
-						const plResolutionText = `${plResolution.width}x${plResolution.height}`;
+						const plResolutionText = `${plResolution?.width}x${plResolution?.height}`;
 						// set codecs
 						const plCodecs = pl.attributes.CODECS;
 						// parse uri
@@ -643,7 +652,7 @@ export default class AnimationDigitalNetwork implements ServiceClass {
 							plStreams[plServer][plResolutionText] = pl.uri;
 						}
 						// set plQualityStr
-						const plBandwidth = Math.round(pl.attributes.BANDWIDTH / 1024);
+						const plBandwidth = Math.round(pl.attributes?.BANDWIDTH ?? 0 / 1024);
 						const qualityStrAdd = `${plResolutionText} (${plBandwidth}KiB/s)`;
 						const qualityStrRegx = new RegExp(qualityStrAdd.replace(/([:()/])/g, '\\$1'), 'm');
 						const qualityStrMatch = !plQuality
@@ -692,12 +701,12 @@ export default class AnimationDigitalNetwork implements ServiceClass {
 							{
 								name: 'height',
 								type: 'number',
-								replaceWith: quality === 0 ? (plQuality[plQuality.length - 1].RESOLUTION.height as number) : plQuality[quality - 1].RESOLUTION.height
+								replaceWith: quality === 0 ? (plQuality[plQuality.length - 1].RESOLUTION?.height as number) : (plQuality[quality - 1].RESOLUTION?.height as number)
 							},
 							{
 								name: 'width',
 								type: 'number',
-								replaceWith: quality === 0 ? (plQuality[plQuality.length - 1].RESOLUTION.width as number) : plQuality[quality - 1].RESOLUTION.width
+								replaceWith: quality === 0 ? (plQuality[plQuality.length - 1].RESOLUTION?.width as number) : (plQuality[quality - 1].RESOLUTION?.width as number)
 							}
 						);
 
@@ -713,7 +722,17 @@ export default class AnimationDigitalNetwork implements ServiceClass {
 							dlFailed = true;
 						} else {
 							const chunkPageBody = await chunkPage.res.text();
-							const chunkPlaylist = m3u8(chunkPageBody);
+
+							// Init parser
+							const parser = new Parser();
+
+							// Parse M3U8
+							parser.push(chunkPageBody);
+							parser.end();
+
+							const chunkPlaylist = parser.manifest;
+							if (!chunkPlaylist) throw Error('Failed to parse M3U8');
+
 							const totalParts = chunkPlaylist.segments.length;
 							const mathParts = Math.ceil(totalParts / options.partsize);
 							const mathMsg = `(${mathParts}*${options.partsize})`;

commitlint.config.ts

@@ -0,0 +1 @@
+export default { extends: ['@commitlint/config-conventional'] };

config/bin-path.yml

@@ -1,5 +1,4 @@
 ffmpeg: 'ffmpeg.exe'
 mkvmerge: 'mkvmerge.exe'
-ffprobe: 'ffprobe.exe'
 mp4decrypt: 'mp4decrypt.exe'
 shaka: 'shaka-packager.exe'

crunchy.ts

@@ -1,15 +1,15 @@
 // build-in
 import path from 'path';
-import fs from 'fs-extra';
+import fs from 'fs';
 
 // package program
 import packageJson from './package.json';
 
 // plugins
 import { console } from './modules/log';
-import m3u8 from 'm3u8-parsed';
 import streamdl, { M3U8Json } from './modules/hls-download';
 import Helper from './modules/module.helper';
+import { Parser } from 'm3u8-parser';
 
 // custom modules
 import * as fontsData from './modules/module.fontsData';
@@ -27,7 +27,7 @@ import { CrunchyEpisodeList, CrunchyEpisode } from './@types/crunchyEpisodeList'
 import { CrunchyDownloadOptions, CrunchyEpMeta, CrunchyMuxOptions, CrunchyMultiDownload, DownloadedMedia, ParseItem, SeriesSearch, SeriesSearchItem } from './@types/crunchyTypes';
 import { ObjectInfo } from './@types/objectInfo';
 import parseFileName, { Variable } from './modules/module.filename';
-import { CrunchyStreams, PlaybackData, Subtitles } from './@types/playbackData';
+import { CrunchyStreams, PlaybackData } from './@types/playbackData';
 import { downloaded } from './modules/module.downloadArchive';
 import parseSelect from './modules/module.parseSelect';
 import { AvailableFilenameVars, getDefault } from './modules/module.args';
@@ -70,7 +70,7 @@ export default class Crunchy implements ServiceClass {
 	}
 
 	public checkToken(): boolean {
-		return Object.keys(this.cmsToken.cms_web ?? {}).length > 0;
+		return Object.keys(this.cmsToken.cms ?? {}).length > 0;
 	}
 
 	public async cli() {
@@ -105,7 +105,7 @@ export default class Crunchy implements ServiceClass {
 			await this.getCmsData();
 		} else if (argv.new) {
 			await this.refreshToken();
-			await this.getNewlyAdded(argv.page, argv['search-type'], argv.raw, argv.rawoutput);
+			await this.getNewlyAdded(argv.page, argv.searchType, argv.raw, argv.rawoutput);
 		} else if (argv.search && argv.search.length > 2) {
 			await this.refreshToken();
 			await this.doSearch({ ...argv, search: argv.search as string });
@@ -122,16 +122,16 @@ export default class Crunchy implements ServiceClass {
 				}
 			}
 			return true;
-		} else if (argv['movie-listing'] && argv['movie-listing'].match(/^[0-9A-Z]{9,}$/)) {
+		} else if (argv.movieListing && argv.movieListing.match(/^[0-9A-Z]{9,}$/)) {
 			await this.refreshToken();
-			await this.logMovieListingById(argv['movie-listing'] as string);
-		} else if (argv['show-raw'] && argv['show-raw'].match(/^[0-9A-Z]{9,}$/)) {
+			await this.logMovieListingById(argv.movieListing as string);
+		} else if (argv.showRaw && argv.showRaw.match(/^[0-9A-Z]{9,}$/)) {
 			await this.refreshToken();
-			await this.logShowRawById(argv['show-raw'] as string);
-		} else if (argv['season-raw'] && argv['season-raw'].match(/^[0-9A-Z]{9,}$/)) {
+			await this.logShowRawById(argv.showRaw as string);
+		} else if (argv.seasonRaw && argv.seasonRaw.match(/^[0-9A-Z]{9,}$/)) {
 			await this.refreshToken();
-			await this.logSeasonRawById(argv['season-raw'] as string);
-		} else if (argv['show-list-raw']) {
+			await this.logSeasonRawById(argv.seasonRaw as string);
+		} else if (argv.showListRaw) {
 			await this.refreshToken();
 			await this.logShowListRaw();
 		} else if (argv.s && argv.s.match(/^[0-9A-Z]{9,}$/)) {
@@ -185,7 +185,7 @@ export default class Crunchy implements ServiceClass {
 
 	public async logShowRawById(id: string) {
 		// check token
-		if (!this.cmsToken.cms_web) {
+		if (!this.cmsToken.cms) {
 			console.error('Authentication required!');
 			return;
 		}
@@ -215,7 +215,7 @@ export default class Crunchy implements ServiceClass {
 
 	public async logSeasonRawById(id: string) {
 		// check token
-		if (!this.cmsToken.cms_web) {
+		if (!this.cmsToken.cms) {
 			console.error('Authentication required!');
 			return;
 		}
@@ -231,16 +231,16 @@ export default class Crunchy implements ServiceClass {
 		//get episode info
 		const reqEpsListOpts = [
 			api.cms_bucket,
-			this.cmsToken.cms_web.bucket,
+			this.cmsToken.cms.bucket,
 			'/episodes?',
 			new URLSearchParams({
 				force_locale: '',
 				preferred_audio_language: 'ja-JP',
 				locale: this.locale,
 				season_id: id,
-				Policy: this.cmsToken.cms_web.policy,
-				Signature: this.cmsToken.cms_web.signature,
-				'Key-Pair-Id': this.cmsToken.cms_web.key_pair_id
+				Policy: this.cmsToken.cms.policy,
+				Signature: this.cmsToken.cms.signature,
+				'Key-Pair-Id': this.cmsToken.cms.key_pair_id
 			})
 		].join('');
 		const reqEpsList = await this.req.getData(reqEpsListOpts, AuthHeaders);
@@ -266,7 +266,7 @@ export default class Crunchy implements ServiceClass {
 
 	public async logShowListRaw() {
 		// check token
-		if (!this.cmsToken.cms_web) {
+		if (!this.cmsToken.cms) {
 			console.error('Authentication required!');
 			return;
 		}
@@ -347,10 +347,10 @@ export default class Crunchy implements ServiceClass {
 			} else {
 				const fontFolder = path.dirname(fontLoc);
 				if (fs.existsSync(fontLoc) && fs.statSync(fontLoc).size == 0) {
-					fs.unlinkSync(fontLoc);
+					fs.rmSync(fontLoc, { recursive: true, force: true });
 				}
 				try {
-					fs.ensureDirSync(fontFolder);
+					fs.existsSync(fontFolder);
 				} catch (e) {
 					console.info('');
 				}
@@ -390,15 +390,20 @@ export default class Crunchy implements ServiceClass {
 	// }
 
 	public async doAuth(data: AuthData): Promise<AuthResponse> {
+		const basic = atob(api.basic_auth_token);
+		const client = basic.split(':');
+
 		const uuid = randomUUID();
 		const authData = new URLSearchParams({
 			username: data.username,
 			password: data.password,
 			grant_type: 'password',
 			scope: 'offline_access',
+			client_id: client[0],
+			client_secret: client[1],
 			device_id: uuid,
-			device_name: 'iPhone',
-			device_type: 'iPhone 13'
+			device_name: 'emu64xa',
+			device_type: 'ANDROIDTV'
 		}).toString();
 		const authReqOpts: FetchParams = {
 			method: 'POST',
@@ -411,6 +416,7 @@ export default class Crunchy implements ServiceClass {
 			console.error('Authentication failed!');
 			return { isOk: false, reason: new Error('Authentication failed') };
 		}
+
 		// To prevent any Cloudflare errors in the future
 		if (authReq.res.headers.get('Set-Cookie')) {
 			api.crunchyDefHeader['Cookie'] = authReq.res.headers.get('Set-Cookie') as string;
@@ -422,6 +428,7 @@ export default class Crunchy implements ServiceClass {
 			api.crunchyDefHeader['User-Agent'] = authReq.headers['User-Agent'];
 			api.crunchyAuthHeader['User-Agent'] = authReq.headers['User-Agent'];
 		}
+
 		this.token = await authReq.res.json();
 		this.token.device_id = uuid;
 		this.token.expires = new Date(Date.now() + this.token.expires_in * 1000);
@@ -432,13 +439,18 @@ export default class Crunchy implements ServiceClass {
 	}
 
 	public async doAnonymousAuth() {
+		const basic = atob(api.basic_auth_token);
+		const client = basic.split(':');
+
 		const uuid = randomUUID();
 		const authData = new URLSearchParams({
 			grant_type: 'client_id',
 			scope: 'offline_access',
+			client_id: client[0],
+			client_secret: client[1],
 			device_id: uuid,
-			device_name: 'iPhone',
-			device_type: 'iPhone 13'
+			device_name: 'emu64xa',
+			device_type: 'ANDROIDTV'
 		}).toString();
 		const authReqOpts: FetchParams = {
 			method: 'POST',
@@ -462,6 +474,7 @@ export default class Crunchy implements ServiceClass {
 			api.crunchyDefHeader['User-Agent'] = authReq.headers['User-Agent'];
 			api.crunchyAuthHeader['User-Agent'] = authReq.headers['User-Agent'];
 		}
+
 		this.token = await authReq.res.json();
 		this.token.device_id = uuid;
 		this.token.expires = new Date(Date.now() + this.token.expires_in * 1000);
@@ -473,6 +486,7 @@ export default class Crunchy implements ServiceClass {
 			console.error('No access token!');
 			return false;
 		}
+
 		const profileReqOptions = {
 			headers: {
 				...api.crunchyDefHeader,
@@ -498,15 +512,20 @@ export default class Crunchy implements ServiceClass {
 	}
 
 	public async loginWithToken(refreshToken: string) {
+		const basic = atob(api.basic_auth_token);
+		const client = basic.split(':');
+
 		const uuid = randomUUID();
 		const authData = new URLSearchParams({
 			refresh_token: this.token.refresh_token,
 			grant_type: 'refresh_token',
 			//'grant_type': 'etp_rt_cookie',
 			scope: 'offline_access',
+			client_id: client[0],
+			client_secret: client[1],
 			device_id: uuid,
-			device_name: 'iPhone',
-			device_type: 'iPhone 13'
+			device_name: 'emu64xa',
+			device_type: 'ANDROIDTV'
 		}).toString();
 		const authReqOpts: FetchParams = {
 			method: 'POST',
@@ -533,6 +552,7 @@ export default class Crunchy implements ServiceClass {
 			api.crunchyDefHeader['User-Agent'] = authReq.headers['User-Agent'];
 			api.crunchyAuthHeader['User-Agent'] = authReq.headers['User-Agent'];
 		}
+
 		this.token = await authReq.res.json();
 		this.token.device_id = uuid;
 		this.token.expires = new Date(Date.now() + this.token.expires_in * 1000);
@@ -552,17 +572,24 @@ export default class Crunchy implements ServiceClass {
 			} else {
 				//console.info('[WARN] The token has expired compleatly. I will try to refresh the token anyway, but you might have to reauth.');
 			}
+
+			const basic = atob(api.basic_auth_token);
+			const client = basic.split(':');
+
 			const uuid = this.token.device_id || randomUUID();
 			const authData = new URLSearchParams({
-				refresh_token: this.token.refresh_token,
 				grant_type: 'refresh_token',
+				refresh_token: this.token.refresh_token,
+				scope: 'offline_access',
+				client_id: client[0],
+				client_secret: client[1],
 				device_id: uuid,
-				device_name: 'iPhone',
-				device_type: 'iPhone 13'
+				device_name: 'emu64xa',
+				device_type: 'ANDROIDTV'
 			}).toString();
 			const authReqOpts: FetchParams = {
 				method: 'POST',
-				headers: { ...api.crunchyAuthHeader, 'ETP-Anonymous-ID': uuid },
+				headers: { ...api.crunchyAuthHeader },
 				body: authData,
 				useProxy: true
 			};
@@ -585,6 +612,7 @@ export default class Crunchy implements ServiceClass {
 				api.crunchyDefHeader['User-Agent'] = authReq.headers['User-Agent'];
 				api.crunchyAuthHeader['User-Agent'] = authReq.headers['User-Agent'];
 			}
+
 			this.token = await authReq.res.json();
 			this.token.device_id = uuid;
 			this.token.expires = new Date(Date.now() + this.token.expires_in * 1000);
@@ -604,8 +632,8 @@ export default class Crunchy implements ServiceClass {
 			return;
 		}
 
-		if (ifNeeded && this.cmsToken.cms_web) {
-			if (!(Date.now() >= new Date(this.cmsToken.cms_web.expires).getTime())) {
+		if (ifNeeded && this.cmsToken.cms) {
+			if (!(Date.now() >= new Date(this.cmsToken.cms.expires).getTime())) {
 				return;
 			}
 		}
@@ -622,27 +650,27 @@ export default class Crunchy implements ServiceClass {
 			return;
 		}
 		this.cmsToken = await cmsTokenReq.res.json();
-		console.info('Your Country: %s\n', this.cmsToken.cms_web?.bucket.split('/')[1]);
+		console.info('Your Country: %s\n', this.cmsToken.cms?.bucket.split('/')[1]);
 	}
 
 	public async getCmsData() {
 		// check token
-		if (!this.cmsToken.cms_web) {
+		if (!this.cmsToken.cms) {
 			console.error('Authentication required!');
 			return;
 		}
 		// opts
 		const indexReqOpts = [
 			api.cms_bucket,
-			this.cmsToken.cms_web.bucket,
+			this.cmsToken.cms.bucket,
 			'/index?',
 			new URLSearchParams({
 				force_locale: '',
 				preferred_audio_language: 'ja-JP',
 				locale: this.locale,
-				Policy: this.cmsToken.cms_web.policy,
-				Signature: this.cmsToken.cms_web.signature,
-				'Key-Pair-Id': this.cmsToken.cms_web.key_pair_id
+				Policy: this.cmsToken.cms.policy,
+				Signature: this.cmsToken.cms.signature,
+				'Key-Pair-Id': this.cmsToken.cms.key_pair_id
 			})
 		].join('');
 		const indexReq = await this.req.getData(indexReqOpts, {
@@ -719,7 +747,7 @@ export default class Crunchy implements ServiceClass {
 			value: toSend
 				.map((a) => {
 					return a.items.map((a): SearchResponseItem => {
-						const images = (a.images.poster_tall ?? [[{ source: '/notFound.png' }]])[0];
+						const images = (a.images?.poster_tall ?? [[{ source: '/notFound.png' }]])[0];
 						return {
 							id: a.id,
 							image: images[Math.floor(images.length / 2)].source,
@@ -919,7 +947,7 @@ export default class Crunchy implements ServiceClass {
 		pad = pad || 0;
 		hideSeriesTitle = hideSeriesTitle !== undefined ? hideSeriesTitle : false;
 		// check token
-		if (!this.cmsToken.cms_web) {
+		if (!this.cmsToken.cms) {
 			console.error('Authentication required!');
 			return;
 		}
@@ -962,7 +990,7 @@ export default class Crunchy implements ServiceClass {
 
 	public async logMovieListingById(id: string, pad?: number) {
 		pad = pad || 2;
-		if (!this.cmsToken.cms_web) {
+		if (!this.cmsToken.cms) {
 			console.error('Authentication required!');
 			return;
 		}
@@ -1050,14 +1078,14 @@ export default class Crunchy implements ServiceClass {
 			await this.logObject(i, 2);
 		}
 		// calculate pages
-		const itemPad = parseInt(new URL(newlyAddedResults.__href__, domain.cr_www).searchParams.get('start') as string);
+		const itemPad = parseInt(new URL(newlyAddedResults.__href__, domain.cr_api).searchParams.get('start') as string);
 		const pageCur = itemPad > 0 ? Math.ceil(itemPad / 25) + 1 : 1;
 		const pageMax = Math.ceil(newlyAddedResults.total / 25);
 		console.info(`  Total results: ${newlyAddedResults.total} (Page: ${pageCur}/${pageMax})`);
 	}
 
 	public async getSeasonById(id: string, numbers: number, e: string | undefined, but: boolean, all: boolean): Promise<ResponseBase<CrunchyEpMeta[]>> {
-		if (!this.cmsToken.cms_web) {
+		if (!this.cmsToken.cms) {
 			console.error('Authentication required!');
 			return { isOk: false, reason: new Error('Authentication required') };
 		}
@@ -1079,19 +1107,39 @@ export default class Crunchy implements ServiceClass {
 		await this.logObject(showInfo.data[0], 0);
 
 		let episodeList = { total: 0, data: [], meta: {} } as CrunchyEpisodeList;
-		//get episode info
-		const reqEpsListOpts = [
+		//get episode info CMS
+		const reqEpsCMSListOpts = [
 			api.cms_bucket,
-			this.cmsToken.cms_web.bucket,
+			this.cmsToken.cms.bucket,
 			'/episodes?',
 			new URLSearchParams({
 				force_locale: '',
 				preferred_audio_language: 'ja-JP',
 				locale: this.locale,
 				season_id: id,
-				Policy: this.cmsToken.cms_web.policy,
-				Signature: this.cmsToken.cms_web.signature,
-				'Key-Pair-Id': this.cmsToken.cms_web.key_pair_id
+				Policy: this.cmsToken.cms.policy,
+				Signature: this.cmsToken.cms.signature,
+				'Key-Pair-Id': this.cmsToken.cms.key_pair_id
+			})
+		].join('');
+		const reqEpsCMSList = await this.req.getData(reqEpsCMSListOpts, AuthHeaders);
+		if (!reqEpsCMSList.ok || !reqEpsCMSList.res) {
+			console.error('Episode List Request FAILED!');
+			return { isOk: false, reason: new Error('Episode List request failed. No more information provided.') };
+		}
+		//CrunchyEpisodeList
+		const episodeListAndroid = (await reqEpsCMSList.res.json()) as CrunchyAndroidEpisodes;
+
+		//get episode info API
+		const reqEpsListOpts = [
+			domain.cr_api,
+			'/content/v2/cms/seasons/',
+			id,
+			'/episodes?',
+			new URLSearchParams({
+				force_locale: '',
+				preferred_audio_language: 'ja-JP',
+				locale: this.locale
 			})
 		].join('');
 		const reqEpsList = await this.req.getData(reqEpsListOpts, AuthHeaders);
@@ -1100,12 +1148,22 @@ export default class Crunchy implements ServiceClass {
 			return { isOk: false, reason: new Error('Episode List request failed. No more information provided.') };
 		}
 		//CrunchyEpisodeList
-		const episodeListAndroid = (await reqEpsList.res.json()) as CrunchyAndroidEpisodes;
-		episodeList = {
-			total: episodeListAndroid.total,
-			data: episodeListAndroid.items,
-			meta: {}
-		};
+		const episodeListAPI = (await reqEpsList.res.json()) as CrunchyEpisodeList;
+
+		// if API has more items than CMS use API episodes
+		if (episodeListAPI.total > episodeListAndroid.total) {
+			episodeList = {
+				total: episodeListAPI.total,
+				data: episodeListAPI.data,
+				meta: {}
+			};
+		} else {
+			episodeList = {
+				total: episodeListAndroid.total,
+				data: episodeListAndroid.items,
+				meta: {}
+			};
+		}
 
 		const epNumList: {
 			ep: number[];
@@ -1143,7 +1201,7 @@ export default class Crunchy implements ServiceClass {
 			}
 			const selEpId = isSpecial ? 'S' + epNumList.sp.toString().padStart(epNumLen, '0') : '' + parseInt(epNum, 10).toString().padStart(epNumLen, '0');
 			// set data
-			const images = (item.images.thumbnail ?? [[{ source: '/notFound.png' }]])[0];
+			const images = (item.images?.thumbnail ?? [[{ source: '/notFound.png' }]])[0];
 			const epMeta: CrunchyEpMeta = {
 				data: [
 					{
@@ -1151,7 +1209,8 @@ export default class Crunchy implements ServiceClass {
 						versions: null,
 						lang: langsData.languages.find((a) => a.code == yargs.appArgv(this.cfg.cli).dubLang[0]),
 						isSubbed: item.is_subbed,
-						isDubbed: item.is_dubbed
+						isDubbed: item.is_dubbed,
+						durationMs: item.duration_ms ?? 0
 					}
 				],
 				seriesTitle: item.series_title,
@@ -1237,7 +1296,7 @@ export default class Crunchy implements ServiceClass {
 	}
 
 	public async getObjectById(e?: string, earlyReturn?: boolean, external_id?: boolean): Promise<ObjectInfo | Partial<CrunchyEpMeta>[] | undefined> {
-		if (!this.cmsToken.cms_web) {
+		if (!this.cmsToken.cms) {
 			console.error('Authentication required!');
 			return [];
 		}
@@ -1249,7 +1308,7 @@ export default class Crunchy implements ServiceClass {
 			for (const ob of epFilter.values) {
 				const extIdReqOpts = [
 					api.cms_bucket,
-					this.cmsToken.cms_web.bucket,
+					this.cmsToken.cms.bucket,
 					'/channels/crunchyroll/objects',
 					'?',
 					new URLSearchParams({
@@ -1257,9 +1316,9 @@ export default class Crunchy implements ServiceClass {
 						preferred_audio_language: 'ja-JP',
 						locale: this.locale,
 						external_id: ob,
-						Policy: this.cmsToken.cms_web.policy,
-						Signature: this.cmsToken.cms_web.signature,
-						'Key-Pair-Id': this.cmsToken.cms_web.key_pair_id
+						Policy: this.cmsToken.cms.policy,
+						Signature: this.cmsToken.cms.signature,
+						'Key-Pair-Id': this.cmsToken.cms.key_pair_id
 					})
 				].join('');
 
@@ -1339,7 +1398,7 @@ export default class Crunchy implements ServiceClass {
 		if (doEpsFilter.values.length > 0) {
 			const objectReqOpts = [
 				api.cms_bucket,
-				this.cmsToken.cms_web.bucket,
+				this.cmsToken.cms.bucket,
 				'/objects/',
 				doEpsFilter.values.join(','),
 				'?',
@@ -1347,9 +1406,9 @@ export default class Crunchy implements ServiceClass {
 					force_locale: '',
 					preferred_audio_language: 'ja-JP',
 					locale: this.locale,
-					Policy: this.cmsToken.cms_web.policy,
-					Signature: this.cmsToken.cms_web.signature,
-					'Key-Pair-Id': this.cmsToken.cms_web.key_pair_id
+					Policy: this.cmsToken.cms.policy,
+					Signature: this.cmsToken.cms.signature,
+					'Key-Pair-Id': this.cmsToken.cms.key_pair_id
 				})
 			].join('');
 			const objectReq = await this.req.getData(objectReqOpts, AuthHeaders);
@@ -1393,7 +1452,8 @@ export default class Crunchy implements ServiceClass {
 						mediaId: 'E:' + item.id,
 						versions: item.episode_metadata.versions,
 						isSubbed: item.episode_metadata.is_subbed,
-						isDubbed: item.episode_metadata.is_dubbed
+						isDubbed: item.episode_metadata.is_dubbed,
+						durationMs: item.episode_metadata.duration_ms ?? 0
 					}
 				];
 				epMeta.seriesTitle = item.episode_metadata.series_title;
@@ -1407,7 +1467,8 @@ export default class Crunchy implements ServiceClass {
 					{
 						mediaId: 'M:' + item.id,
 						isSubbed: item.movie_listing_metadata.is_subbed,
-						isDubbed: item.movie_listing_metadata.is_dubbed
+						isDubbed: item.movie_listing_metadata.is_dubbed,
+						durationMs: item.movie_listing_metadata.duration_ms ?? 0
 					}
 				];
 				epMeta.seriesTitle = item.title;
@@ -1420,7 +1481,8 @@ export default class Crunchy implements ServiceClass {
 					{
 						mediaId: 'M:' + item.id,
 						isSubbed: item.movie_metadata.is_subbed,
-						isDubbed: item.movie_metadata.is_dubbed
+						isDubbed: item.movie_metadata.is_dubbed,
+						durationMs: item.movie_metadata.duration_ms ?? 0
 					}
 				];
 				epMeta.season = 0;
@@ -1455,7 +1517,8 @@ export default class Crunchy implements ServiceClass {
 				{
 					mediaId: 'V:' + item.id,
 					isSubbed: false,
-					isDubbed: false
+					isDubbed: false,
+					durationMs: item.durationMs ?? 0
 				}
 			];
 			epMeta.season = 0;
@@ -1504,7 +1567,7 @@ export default class Crunchy implements ServiceClass {
 		  }
 		| undefined
 	> {
-		if (!this.cmsToken.cms_web) {
+		if (!this.cmsToken.cms) {
 			console.error('Authentication required!');
 			return;
 		}
@@ -1689,7 +1752,7 @@ export default class Crunchy implements ServiceClass {
 				const me = await this.req.getData(api.me, AuthHeaders);
 				if (me.ok && me.res) {
 					const data_me = await me.res.json();
-					const benefits = await this.req.getData(`https://www.crunchyroll.com/subs/v1/subscriptions/${data_me.external_id}/benefits`, AuthHeaders);
+					const benefits = await this.req.getData(`https://beta-api.crunchyroll.com/subs/v1/subscriptions/${data_me.external_id}/benefits`, AuthHeaders);
 					if (benefits.ok && benefits.res) {
 						const data_benefits = (await benefits.res.json()) as { items: { benefit: string }[] };
 						if (data_benefits?.items && !data_benefits.items.find((i) => i.benefit === 'offline_viewing')) {
@@ -1719,20 +1782,28 @@ export default class Crunchy implements ServiceClass {
 				);
 			}
 
+			// Disable CBR bypass for Music Videos since it does not work
+			if ((currentVersion ? currentVersion.guid : currentMediaId).startsWith('MV')) {
+				isDLVideoBypass = false;
+				isDLAudioBypass = false;
+				options.vstream = 'androidtv';
+				options.astream = 'androidtv';
+			}
+
 			if (options.tsd) {
 				console.warn('Total Session Death Active');
 				const activeStreamsReq = await this.req.getData(api.streaming_sessions, AuthHeaders);
 				if (activeStreamsReq.ok && activeStreamsReq.res) {
 					const data = await activeStreamsReq.res.json();
 					for (const s of data.items) {
-						await this.req.getData(`https://www.crunchyroll.com/playback/v1/token/${s.contentId}/${s.token}`, { ...{ method: 'DELETE' }, ...AuthHeaders });
+						await this.req.getData(`https://cr-play-service.prd.crunchyrollsvc.com/v1/token/${s.contentId}/${s.token}`, { ...{ method: 'DELETE' }, ...AuthHeaders });
 					}
 					console.warn(`Killed ${data.items?.length ?? 0} Sessions`);
 				}
 			}
 
 			const videoPlaybackReq = await this.req.getData(
-				`https://www.crunchyroll.com/playback/v3/${currentVersion ? currentVersion.guid : currentMediaId}/${CrunchyVideoPlayStreams['androidtv']}/play?queue=0`,
+				`https://cr-play-service.prd.crunchyrollsvc.com/v3/${currentVersion ? currentVersion.guid : currentMediaId}/${CrunchyVideoPlayStreams['androidtv']}/play?queue=0`,
 				AuthHeaders
 			);
 			if (!videoPlaybackReq.ok || !videoPlaybackReq.res) {
@@ -1749,7 +1820,7 @@ export default class Crunchy implements ServiceClass {
 				}
 				if (isDLVideoBypass) {
 					const videoDLReq = await this.req.getData(
-						`https://www.crunchyroll.com/playback/v3/${currentVersion ? currentVersion.guid : currentMediaId}/${CrunchyVideoPlayStreams[options.vstream]}/download`,
+						`https://cr-play-service.prd.crunchyrollsvc.com/v3/${currentVersion ? currentVersion.guid : currentMediaId}/${CrunchyVideoPlayStreams[options.vstream]}/download`,
 						AuthHeaders
 					);
 					if (videoDLReq.ok && videoDLReq.res) {
@@ -1786,7 +1857,7 @@ export default class Crunchy implements ServiceClass {
 
 			if (!options.cstream && options.vstream !== options.astream && videoStream) {
 				const audioPlaybackReq = await this.req.getData(
-					`https://www.crunchyroll.com/playback/v3/${currentVersion ? currentVersion.guid : currentMediaId}/${CrunchyAudioPlayStreams[options.astream]}/${isDLAudioBypass ? 'download' : 'play?queue=1'}`,
+					`https://cr-play-service.prd.crunchyrollsvc.com/v3/${currentVersion ? currentVersion.guid : currentMediaId}/${CrunchyAudioPlayStreams[options.astream]}/${isDLAudioBypass ? 'download' : 'play?queue=1'}`,
 					AuthHeaders
 				);
 				if (!audioPlaybackReq.ok || !audioPlaybackReq.res) {
@@ -1794,6 +1865,8 @@ export default class Crunchy implements ServiceClass {
 				} else {
 					audioStream = (await audioPlaybackReq.res.json()) as CrunchyPlayStream;
 					const derivedPlaystreams = {} as CrunchyStreams;
+					// Give Audiostream the Videostream hardsubs if undefined or empty array
+					if (!audioStream.hardSubs || Object.values(audioStream.hardSubs).length === 0) audioStream.hardSubs = videoStream.hardSubs;
 					for (const hardsub in audioStream.hardSubs) {
 						const stream = audioStream.hardSubs[hardsub];
 						derivedPlaystreams[hardsub] = {
@@ -1954,6 +2027,14 @@ export default class Crunchy implements ServiceClass {
 						}
 						return s.hardsub_lang == options.hslang;
 					});
+					if (astreams.length < 1) {
+						console.warn('No audio streams found, using video audio streams instead');
+						astreams = vstreams;
+					}
+					if (vstreams.length < 1) {
+						console.error('Raw video streams not available!');
+						dlFailed = true;
+					}
 				} else {
 					console.warn('Selected stream with %s hardsubs not available', langsData.locale2language(options.hslang).language);
 					if (hsLangs.length > 0) {
@@ -1968,15 +2049,12 @@ export default class Crunchy implements ServiceClass {
 				astreams = astreams.filter((s) => {
 					return s.hardsub_lang == '-';
 				});
-				if (vstreams.length < 1) {
-					console.warn('Raw video streams not available!');
-					if (hsLangs.length > 0) {
-						console.warn('Try hardsubs stream:', hsLangs.join(', '));
-					}
-					dlFailed = true;
-				}
 				if (astreams.length < 1) {
-					console.warn('Raw audio streams not available!');
+					console.warn('No audio streams found, using video audio streams instead');
+					astreams = vstreams;
+				}
+				if (vstreams.length < 1) {
+					console.error('Raw video streams not available!');
 					if (hsLangs.length > 0) {
 						console.warn('Try hardsubs stream:', hsLangs.join(', '));
 					}
@@ -2003,16 +2081,22 @@ export default class Crunchy implements ServiceClass {
 			if (options.novids && options.noaudio) {
 				if (videoStream) {
 					await this.refreshToken(true, true);
-					await this.req.getData(`https://www.crunchyroll.com/playback/v1/token/${currentVersion ? currentVersion.guid : currentMediaId}/${videoStream.token}`, {
-						...{ method: 'DELETE' },
-						...AuthHeaders
-					});
+					await this.req.getData(
+						`https://cr-play-service.prd.crunchyrollsvc.com/v1/token/${currentVersion ? currentVersion.guid : currentMediaId}/${videoStream.token}`,
+						{
+							...{ method: 'DELETE' },
+							...AuthHeaders
+						}
+					);
 				}
 				if (audioStream && videoStream?.token !== audioStream.token) {
-					await this.req.getData(`https://www.crunchyroll.com/playback/v1/token/${currentVersion ? currentVersion.guid : currentMediaId}/${audioStream.token}`, {
-						...{ method: 'DELETE' },
-						...AuthHeaders
-					});
+					await this.req.getData(
+						`https://cr-play-service.prd.crunchyrollsvc.com/v1/token/${currentVersion ? currentVersion.guid : currentMediaId}/${audioStream.token}`,
+						{
+							...{ method: 'DELETE' },
+							...AuthHeaders
+						}
+					);
 				}
 			}
 
@@ -2135,13 +2219,13 @@ export default class Crunchy implements ServiceClass {
 							await this.refreshToken(true, true);
 							if (videoStream) {
 								await this.req.getData(
-									`https://www.crunchyroll.com/playback/v1/token/${currentVersion ? currentVersion.guid : currentMediaId}/${videoStream.token}/keepAlive?playhead=1`,
+									`https://cr-play-service.prd.crunchyrollsvc.com/v1/token/${currentVersion ? currentVersion.guid : currentMediaId}/${videoStream.token}/keepAlive?playhead=1`,
 									{ ...{ method: 'PATCH' }, ...AuthHeaders }
 								);
 							}
 							if (audioStream && videoStream?.token !== audioStream.token) {
 								await this.req.getData(
-									`https://www.crunchyroll.com/playback/v1/token/${currentVersion ? currentVersion.guid : currentMediaId}/${audioStream.token}/keepAlive?playhead=1`,
+									`https://cr-play-service.prd.crunchyrollsvc.com/v1/token/${currentVersion ? currentVersion.guid : currentMediaId}/${audioStream.token}/keepAlive?playhead=1`,
 									{ ...{ method: 'PATCH' }, ...AuthHeaders }
 								);
 							}
@@ -2213,16 +2297,22 @@ export default class Crunchy implements ServiceClass {
 
 						if (videoStream) {
 							await this.refreshToken(true, true);
-							await this.req.getData(`https://www.crunchyroll.com/playback/v1/token/${currentVersion ? currentVersion.guid : currentMediaId}/${videoStream.token}`, {
-								...{ method: 'DELETE' },
-								...AuthHeaders
-							});
+							await this.req.getData(
+								`https://cr-play-service.prd.crunchyrollsvc.com/v1/token/${currentVersion ? currentVersion.guid : currentMediaId}/${videoStream.token}`,
+								{
+									...{ method: 'DELETE' },
+									...AuthHeaders
+								}
+							);
 						}
 						if (audioStream && videoStream?.token !== audioStream.token) {
-							await this.req.getData(`https://www.crunchyroll.com/playback/v1/token/${currentVersion ? currentVersion.guid : currentMediaId}/${audioStream.token}`, {
-								...{ method: 'DELETE' },
-								...AuthHeaders
-							});
+							await this.req.getData(
+								`https://cr-play-service.prd.crunchyrollsvc.com/v1/token/${currentVersion ? currentVersion.guid : currentMediaId}/${audioStream.token}`,
+								{
+									...{ method: 'DELETE' },
+									...AuthHeaders
+								}
+							);
 						}
 
 						let [audioDownloaded, videoDownloaded] = [false, false];
@@ -2355,7 +2445,7 @@ export default class Crunchy implements ServiceClass {
 									} else {
 										console.info('Decryption done for video');
 										if (!options.nocleanup) {
-											fs.removeSync(`${tempTsFile}.video.enc.m4s`);
+											fs.unlinkSync(`${tempTsFile}.video.enc.m4s`);
 										}
 										fs.copyFileSync(`${tempTsFile}.video.m4s`, `${tsFile}.video.m4s`);
 										fs.unlinkSync(`${tempTsFile}.video.m4s`);
@@ -2385,7 +2475,7 @@ export default class Crunchy implements ServiceClass {
 										return undefined;
 									} else {
 										if (!options.nocleanup) {
-											fs.removeSync(`${tempTsFile}.audio.enc.m4s`);
+											fs.unlinkSync(`${tempTsFile}.audio.enc.m4s`);
 										}
 										fs.copyFileSync(`${tempTsFile}.audio.m4s`, `${tsFile}.audio.m4s`);
 										fs.unlinkSync(`${tempTsFile}.audio.m4s`);
@@ -2422,22 +2512,31 @@ export default class Crunchy implements ServiceClass {
 							}
 						}
 					} else if (!options.novids) {
-						const streamPlaylists = m3u8(vstreamPlaylistBody);
+						// Init parser
+						const parser = new Parser();
+
+						// Parse M3U8
+						parser.push(vstreamPlaylistBody);
+						parser.end();
+
+						const streamPlaylists = parser.manifest;
+						if (!streamPlaylists) throw Error('Failed to parse M3U8');
+
 						const plServerList: string[] = [],
 							plStreams: Record<string, Record<string, string>> = {},
 							plQuality: {
 								str: string;
 								dim: string;
-								CODECS: string;
-								RESOLUTION: {
-									width: number;
-									height: number;
+								CODECS?: string;
+								RESOLUTION?: {
+									width?: number;
+									height?: number;
 								};
 							}[] = [];
-						for (const pl of streamPlaylists.playlists) {
+						for (const pl of streamPlaylists.playlists ?? []) {
 							// set quality
 							const plResolution = pl.attributes.RESOLUTION;
-							const plResolutionText = `${plResolution.width}x${plResolution.height}`;
+							const plResolutionText = `${plResolution?.width}x${plResolution?.height}`;
 							// set codecs
 							const plCodecs = pl.attributes.CODECS;
 							// parse uri
@@ -2464,7 +2563,7 @@ export default class Crunchy implements ServiceClass {
 								plStreams[plServer][plResolutionText] = pl.uri;
 							}
 							// set plQualityStr
-							const plBandwidth = Math.round(pl.attributes.BANDWIDTH / 1024);
+							const plBandwidth = Math.round((pl.attributes?.BANDWIDTH ?? 0) / 1024);
 							const qualityStrAdd = `${plResolutionText} (${plBandwidth}KiB/s)`;
 							const qualityStrRegx = new RegExp(qualityStrAdd.replace(/([:()/])/g, '\\$1'), 'm');
 							const qualityStrMatch = !plQuality
@@ -2511,12 +2610,14 @@ export default class Crunchy implements ServiceClass {
 								{
 									name: 'height',
 									type: 'number',
-									replaceWith: quality === 0 ? (plQuality[plQuality.length - 1].RESOLUTION.height as number) : plQuality[quality - 1].RESOLUTION.height
+									replaceWith:
+										quality === 0 ? (plQuality[plQuality.length - 1].RESOLUTION?.height as number) : (plQuality[quality - 1].RESOLUTION?.height as number)
 								},
 								{
 									name: 'width',
 									type: 'number',
-									replaceWith: quality === 0 ? (plQuality[plQuality.length - 1].RESOLUTION.width as number) : plQuality[quality - 1].RESOLUTION.width
+									replaceWith:
+										quality === 0 ? (plQuality[plQuality.length - 1].RESOLUTION?.width as number) : (plQuality[quality - 1].RESOLUTION?.width as number)
 								}
 							);
 							const lang = langsData.languages.find((a) => a.code === vcurStream?.audio_lang);
@@ -2541,19 +2642,28 @@ export default class Crunchy implements ServiceClass {
 								if (videoStream) {
 									await this.refreshToken(true, true);
 									await this.req.getData(
-										`https://www.crunchyroll.com/playback/v1/token/${currentVersion ? currentVersion.guid : currentMediaId}/${videoStream.token}`,
+										`https://cr-play-service.prd.crunchyrollsvc.com/v1/token/${currentVersion ? currentVersion.guid : currentMediaId}/${videoStream.token}`,
 										{ ...{ method: 'DELETE' }, ...AuthHeaders }
 									);
 								}
 								if (audioStream && videoStream?.token !== audioStream.token) {
 									await this.req.getData(
-										`https://www.crunchyroll.com/playback/v1/token/${currentVersion ? currentVersion.guid : currentMediaId}/${audioStream.token}`,
+										`https://cr-play-service.prd.crunchyrollsvc.com/v1/token/${currentVersion ? currentVersion.guid : currentMediaId}/${audioStream.token}`,
 										{ ...{ method: 'DELETE' }, ...AuthHeaders }
 									);
 								}
 
 								const chunkPageBody = await chunkPage.res.text();
-								const chunkPlaylist = m3u8(chunkPageBody);
+								// Init parser
+								const parser = new Parser();
+
+								// Parse M3U8
+								parser.push(chunkPageBody);
+								parser.end();
+
+								const chunkPlaylist = parser.manifest;
+								if (!chunkPlaylist) throw Error('Failed to parse M3U8');
+
 								const totalParts = chunkPlaylist.segments.length;
 								const mathParts = Math.ceil(totalParts / options.partsize);
 								const mathMsg = `(${mathParts}*${options.partsize})`;
@@ -2709,18 +2819,20 @@ export default class Crunchy implements ServiceClass {
 							});
 							if (subsAssReq.ok && subsAssReq.res) {
 								let sBody = await subsAssReq.res.text();
-								if (subsItem.format == 'vtt') {
+
+								if (subsItem.format === 'vtt') {
 									if (!options.noASSConv) {
 										const chosenFontSize = options.originalFontSize ? undefined : options.fontSize;
 										if (!options.originalFontSize) sBody = sBody.replace(/( font-size:.+?;)/g, '').replace(/(font-size:.+?;)/g, '');
 										sBody = vtt2ass(undefined, chosenFontSize, sBody, '', undefined, options.fontName);
-										sxData.fonts = fontsData.assFonts(sBody) as Font[];
 										sxData.file = sxData.file.replace('.vtt', '.ass');
 									} else {
 										// Yeah, whatever
 										sxData.fonts = [];
 									}
-								} else {
+								}
+
+								if (!options.noASSConv || subsItem.format !== 'vtt') {
 									// Extract PlayRes
 									const mX = sBody.match(/^PlayResX:\s*(\d+)/m);
 									const mY = sBody.match(/^PlayResY:\s*(\d+)/m);
@@ -2862,6 +2974,50 @@ export default class Crunchy implements ServiceClass {
 
 										// Remove YCbCr
 										sBody = sBody.replace(/^[ \t]*YCbCr Matrix:\s*.*\r?\n?/m, '');
+
+										// Make sure no Dialogue timestamp goes over video length
+										if (options.subtitleTimestampFix && mMeta?.durationMs && mMeta.durationMs > 15000) {
+											const lines = sBody.split('\n');
+											const newLines: string[] = [];
+											const durationS = mMeta.durationMs / 1000;
+
+											const toSec = (t: string) => {
+												const [h, m, s] = t.replace(',', '.').split(/[:.]/).map(Number);
+												return h * 3600 + m * 60 + s;
+											};
+
+											for (let line of lines) {
+												if (line.startsWith('Dialogue:')) {
+													const parts = line.split(',');
+													const start = parts[1];
+													const end = parts[2];
+
+													const s = toSec(start);
+													const e = toSec(end);
+
+													// If start time is longer than durationS skip the subtitle line completely
+													if (s > durationS) continue;
+
+													// If only end time is longer than durationS short it down
+													if (e > durationS) {
+														const h = String(Math.floor(durationS / 3600));
+														const m = String(Math.floor((durationS % 3600) / 60)).padStart(2, '0');
+														const sec = (durationS % 60).toFixed(2).padStart(5, '0');
+														parts[2] = `${h}:${m}:${sec}`;
+														line = parts.join(',');
+													}
+												}
+
+												newLines.push(line);
+											}
+
+											sBody = newLines.join('\n');
+										}
+
+										// Force outline thickness for ru-RU: if the 17th field (Outline) equals 2.6 → 2
+										if (langItem.cr_locale === 'ru-RU') {
+											sBody = sBody.replace(/^[ \t]*(Style:\s*[^,\n]*(?:,[^,\n]*){15}),\s*2(?:[.,]6(?:0+)?)?(\s*,)/gm, '$1,2$2');
+										}
 									}
 
 									sxData.title = langItem.language;
@@ -3103,7 +3259,7 @@ export default class Crunchy implements ServiceClass {
 		return {
 			data: sortedEpisodes,
 			list: Object.entries(sortedEpisodes).map(([key, value]) => {
-				const images = (value.items[0].images.thumbnail ?? [[{ source: '/notFound.png' }]])[0];
+				const images = (value.items[0].images?.thumbnail ?? [[{ source: '/notFound.png' }]])[0];
 				const seconds = Math.floor(value.items[0].duration_ms / 1000);
 				let epNum;
 				if (data?.absolute) {
@@ -3202,14 +3358,15 @@ export default class Crunchy implements ServiceClass {
 				}
 
 				// set data
-				const images = (item.images.thumbnail ?? [[{ source: '/notFound.png' }]])[0];
+				const images = (item.images?.thumbnail ?? [[{ source: '/notFound.png' }]])[0];
 				const epMeta: CrunchyEpMeta = {
 					data: [
 						{
 							mediaId: item.id,
 							versions: item.versions,
 							isSubbed: item.is_subbed,
-							isDubbed: item.is_dubbed
+							isDubbed: item.is_dubbed,
+							durationMs: item.duration_ms ?? 0
 						}
 					],
 					seriesTitle: itemE.items.find((a) => !a.series_title.match(/\(\w+ Dub\)/))?.series_title ?? itemE.items[0].series_title.replace(/\(\w+ Dub\)/g, '').trimEnd(),
@@ -3289,7 +3446,7 @@ export default class Crunchy implements ServiceClass {
 	}
 
 	public async parseSeriesById(id: string) {
-		if (!this.cmsToken.cms_web) {
+		if (!this.cmsToken.cms) {
 			console.error('Authentication required!');
 			return;
 		}
@@ -3320,7 +3477,7 @@ export default class Crunchy implements ServiceClass {
 	}
 
 	public async getSeasonDataById(item: SeriesSearchItem, log = false) {
-		if (!this.cmsToken.cms_web) {
+		if (!this.cmsToken.cms) {
 			console.error('Authentication required!');
 			return;
 		}
@@ -3347,18 +3504,39 @@ export default class Crunchy implements ServiceClass {
 			const original_id = s.versions?.find((v: { original: boolean }) => v.original)?.guid;
 			const id = original_id ? original_id : s.id;
 
-			const reqEpsListOpts = [
+			//get episode info CMS
+			const reqEpsCMSListOpts = [
 				api.cms_bucket,
-				this.cmsToken.cms_web.bucket,
+				this.cmsToken.cms.bucket,
 				'/episodes?',
 				new URLSearchParams({
 					force_locale: '',
 					preferred_audio_language: 'ja-JP',
 					locale: this.locale,
 					season_id: id,
-					Policy: this.cmsToken.cms_web.policy,
-					Signature: this.cmsToken.cms_web.signature,
-					'Key-Pair-Id': this.cmsToken.cms_web.key_pair_id
+					Policy: this.cmsToken.cms.policy,
+					Signature: this.cmsToken.cms.signature,
+					'Key-Pair-Id': this.cmsToken.cms.key_pair_id
+				})
+			].join('');
+			const reqEpsCMSList = await this.req.getData(reqEpsCMSListOpts, AuthHeaders);
+			if (!reqEpsCMSList.ok || !reqEpsCMSList.res) {
+				console.error('Episode List Request FAILED!');
+				return;
+			}
+			//CrunchyEpisodeList
+			const episodeListAndroid = (await reqEpsCMSList.res.json()) as CrunchyAndroidEpisodes;
+
+			//get episode info API
+			const reqEpsListOpts = [
+				domain.cr_api,
+				'/content/v2/cms/seasons/',
+				id,
+				'/episodes?',
+				new URLSearchParams({
+					force_locale: '',
+					preferred_audio_language: 'ja-JP',
+					locale: this.locale
 				})
 			].join('');
 			const reqEpsList = await this.req.getData(reqEpsListOpts, AuthHeaders);
@@ -3366,13 +3544,23 @@ export default class Crunchy implements ServiceClass {
 				console.error('Episode List Request FAILED!');
 				return;
 			}
+			//CrunchyEpisodeList
+			const episodeListAPI = (await reqEpsList.res.json()) as CrunchyEpisodeList;
 
-			const episodeListAndroid = (await reqEpsList.res.json()) as CrunchyAndroidEpisodes;
-			episodeList = {
-				total: episodeList.total + episodeListAndroid.total,
-				data: [...episodeList.data, ...episodeListAndroid.items],
-				meta: {}
-			};
+			// if API has more items than CMS use API episodes
+			if (episodeListAPI.total > episodeListAndroid.total) {
+				episodeList = {
+					total: episodeList.total + episodeListAPI.total,
+					data: [...episodeList.data, ...episodeListAPI.data],
+					meta: {}
+				};
+			} else {
+				episodeList = {
+					total: episodeList.total + episodeListAndroid.total,
+					data: [...episodeList.data, ...episodeListAndroid.items],
+					meta: {}
+				};
+			}
 		}
 
 		if (episodeList.total < 1) {

dev.js

@@ -1,23 +0,0 @@
-const { exec } = require('child_process');
-const path = require('path');
-const toRun = process.argv.slice(2).join(' ').split('---');
-
-const waitForProcess = async (proc) => {
-	return new Promise((resolve, reject) => {
-		proc.stdout?.on('data', (data) => process.stdout.write(data));
-		proc.stderr?.on('data', (data) => process.stderr.write(data));
-		proc.on('close', resolve);
-		proc.on('error', reject);
-	});
-};
-
-(async () => {
-	await waitForProcess(exec('pnpm run tsc test false'));
-	for (let command of toRun) {
-		await waitForProcess(
-			exec(`node index.js --service hidive ${command}`, {
-				cwd: path.join(__dirname, 'lib')
-			})
-		);
-	}
-})();

docs/CHANGELOG.md

@@ -1,200 +0,0 @@
-## Change Log
-
-This changelog is out of date and wont be continued. Please see the releases comments, or if not present the commit comments.
-
-### 4.7.0 (unreleased)
-- Change subtitles parser from ttml to vtt
-- Improve help command
-- Update modules
-
-#### Known issues:
-- Proxy not supported
-
-### 4.6.1 (2020/09/19)
-- Update modules
-
-#### Known issues:
-- Proxy not supported
-
-### 4.6.0 (2020/06/03)
-- Bug fixes and improvements
-
-#### Known issues:
-- Proxy not supported
-
-### 4.5.1 (2020/03/10)
-- Better binary files handling
-- Binary build for windows
-
-#### Known issues:
-- Proxy not supported
-
-### 4.5.0 (2020/01/21)
-- Resume downloading
-
-#### Known issues:
-- Proxy not supported
-
-### 4.4.2 (2019/07/21)
-- Better proxy handling for stream download
-
-### 4.4.1 (2019/07/21)
-- Fixed proxy for stream download
-
-### 4.4.0 (2019/06/04)
-- Added `--novids` option (Thanks to @subdiox)
-- Update modules
-
-### 4.3.2 (2019/05/09)
-- Code improvements
-- Fix `hls-download` error printing
-
-### 4.3.1 (2019/05/09)
-- Fix auto detection max quality (Regression in d7d280c)
-
-### 4.3.0 (2019/05/09)
-- Better server selection (Closes #42)
-
-### 4.2.1 (2019/05/04)
-- Filter duplicate urls for cloudfront.net (Closes #40)
-
-### 4.2.0 (2019/05/02)
-- Replace `request` module with `got`
-- Changed proxy cli options
-- Changed `login` option name to `auth`
-- Changed `hls-download` parallel download configuration from 5 parts to 10
-- Update modules
-
-### 4.1.0 (2019/04/05)
-- CLI options for login moved to CUI
-- Removed showing set token at startup
-
-### 4.0.5 (2019/02/09)
-- Fix downloading shows with autoselect max quality
-
-### 4.0.4 (2019/01/26)
-- Fix search when shows not found
-- Update modules
-
-### 4.0.3 (2018/12/06)
-- Select only non-encrypted (HLS) streams, encrypted streams is MPEG-DASH
-
-### 4.0.2 (2018/11/25)
-- Fix typos and update modules
-
-### 4.0.1 (2018/11/23)
-- Code refactoring and small fixes
-
-### 4.0.0 RC 1 (2018/11/17)
-- Select range of episodes using hyphen-sequence
-- Skip muxing if executables not found
-- Fixed typos and duplicate options
-
-### 4.0.0 Beta 2 (2018/11/12)
-- Select alternative server
-- Updated readme
-
-### 4.0.0 Beta 1 (2018/11/10)
-- Rearrange folders structure
-- Configuration changed to yaml format
-- Muxing changed to MKV by default
-- tsMuxeR+mp4box replaced with FFMPEG
-- Updated commands help and readme
-- Fixed typos and duplicate options
-- `ttml2srt` moved to separate module
-- Drop `m3u8-stream-list` module
-- Code improvements
-
-### 3.2.8 (2018/06/16)
-- Fix video request when token not specified
-
-### 3.2.7 (2018/06/15)
-- Update modules
-
-### 3.2.6 (2018/02/18)
-- Fix commands help
-
-### 3.2.5 (2018/02/12)
-- Fixes and update modules
-
-### 3.2.4 (2018/02/01)
-- Update modules
-
-### 3.2.3 (2018/01/31)
-- Rearrange folders structure
-
-### 3.2.2 (2018/01/16)
-- Update modules
-
-### 3.2.1 (2018/01/16)
-- Update modules
-- Small fixes
-
-### 3.2.0 (2018/01/16)
-- `hls-download` module moved to independent module
-- Auth for socks proxy
-
-### 3.1.0 (2017/12/30)
-- Convert DXFP (TTML) subtitles to SRT format
-
-### 3.0.1 (2017/12/05)
-- Check subtitles availability
-- Download subtitles in SRT format instead of VTT
-- Extended hls download progress info
-
-### 3.0.0 Beta 3 (2017/12/03)
-- Restored MKV and MP4 muxing
-- Convert VTT subtitles to SRT format
-
-### 3.0.0 Beta 2 (2017/10/18)
-- Fix video downloading
-
-### 3.0.0 Beta 1 (2017/10/17)
-- Major code changes and improvements
-- Drop Streamlink and added own module for hls download
-
-### 2.5.0 (2017/09/04)
-- `nosubs` option
-- Request video with app api
-
-### 2.4.1 (2017/09/02)
-- Fixed typo in package.json
-- Fix #11: URL for getting video stream url was changed
-
-### 2.4.0 (2017/07/04)
-- IPv4 Socks5 proxy support
-
-### 2.3.3 (2017/06/19)
-- Removed forgotten debug code
-
-### 2.3.2 (2017/06/19)
-- Fix #5: Script fails to multiplex unique file names
-
-### 2.3.1 (2017/04/29)
-- Code improvements
-
-### 2.3.0 (2017/04/27)
-- Code improvements
-
-### 2.2.5 (2017/04/17)
-- Minor code improvements and fixes
-
-### 2.1.4 (2017/04/10)
-- Minor changes
-
-### 2.1.3 (2017/04/10)
-- Minor changes and fixes
-
-### 2.1.2 (2017/04/10)
-- Fix config path
-
-### 2.1.1 (2017/04/10)
-- Minor text changes
-- Fix config
-- Minor changes
-
-### 2.1.0 (2017/04/10)
-- First stable release
-
-### 2.0.0 Beta (lost in time)
-- First public release

docs/DOCUMENTATION.md

@@ -1,4 +1,4 @@
-# multi-downloader-nx (v5.6.1)
+# multi-downloader-nx (v5.6.9)
 
 If you find any bugs in this documentation or in the program itself please report it [over on GitHub](https://github.com/anidl/multi-downloader-nx/issues).
 
@@ -195,19 +195,19 @@ Select the server to use
 | --- | --- | --- | --- | --- | --- | ---| 
 | Crunchyroll | `--cstream ${device}` | `string` | `No`| `--cs` | [`androidtv`, `android`, `androidtab`, `none`] | `NaN` |
 
-(Please use --vstream and --astream instead, this will deprecate soon) Select a specific Crunchyroll playback endpoint by device. Since Crunchyroll has started rolling out their new VBR encodes, we highly recommend using a TV endpoint (e.g. vidaa, samsungtv, lgtv, rokutv, chromecast, firetv, androidtv) to access the old CBR encodes. Please note: The older encodes do not include the new 192 kbps audio, the new audio is only available with the new VBR encodes.
+(Please use --vstream and --astream instead, this will deprecate soon)
 #### `--vstream`
 | **Service** | **Usage** | **Type** | **Required** | **Alias** | **Choices** | **Default** |**cli-default Entry**
 | --- | --- | --- | --- | --- | --- | --- | ---| 
 | Crunchyroll | `--vstream ${device}` | `string` | `No`| `--vs` | [`androidtv`, `android`, `androidtab`, `none`] | `androidtv`| `vstream: ` |
 
-Select a specific Crunchyroll video playback endpoint by device.
+Select a specific Crunchyroll video playback endpoint by device. androidtv provides the best video (CBR).
 #### `--astream`
 | **Service** | **Usage** | **Type** | **Required** | **Alias** | **Choices** | **Default** |**cli-default Entry**
 | --- | --- | --- | --- | --- | --- | --- | ---| 
 | Crunchyroll | `--astream ${device}` | `string` | `No`| `--as` | [`androidtv`, `android`, `androidtab`, `none`] | `android`| `astream: ` |
 
-Select a specific Crunchyroll audio playback endpoint by device.
+Select a specific Crunchyroll audio playback endpoint by device. android provides the best audio (192 kbps).
 #### `--tsd`
 | **Service** | **Usage** | **Type** | **Required** | **Alias** |  **Default** |**cli-default Entry**
 | --- | --- | --- | --- | --- | --- | ---| 
@@ -275,6 +275,12 @@ Select if ScaledBorderAndShadow should be set to "yes" or "no".
 | Crunchyroll | `--originalScriptFix ` | `boolean` | `No`| `NaN` | `true`| `originalScriptFix: ` |
 
 Removes the URL in the Original Script line of the ASS subtitles, it prevents from bricking the subs in VLC (Fonts not loading when url not returning 200).
+#### `--subtitleTimestampFix`
+| **Service** | **Usage** | **Type** | **Required** | **Alias** |  **Default** |**cli-default Entry**
+| --- | --- | --- | --- | --- | --- | ---| 
+| Crunchyroll | `--subtitleTimestampFix ` | `boolean` | `No`| `NaN` | `false`| `subtitleTimestampFix: ` |
+
+Fixes subtitle dialogues that go over the video length (deletes dialogues where start is over video length and updates the end timestamp when end is over video length).
 #### `--novids`
 | **Service** | **Usage** | **Type** | **Required** | **Alias** |  **cli-default Entry**
 | --- | --- | --- | --- | --- | ---| 
@@ -536,7 +542,7 @@ Provide a path to output the raw data from the API into a file (Where applicable
 | --- | --- | --- | --- | --- | --- | ---| 
 | All | `--proxy ${proxy_url}` | `string` | `No`| `NaN` | ``| `proxy: ` |
 
-Uses Proxy on geo-restricted or geo-defining endpoints (e.g. socks5://127.0.0.1:1080 or http://127.0.0.1:1080)
+Uses Proxy on geo-restricted or geo-defining endpoints (e.g. https://127.0.0.1:1080 or http://127.0.0.1:1080)
 #### `--proxyAll`
 | **Service** | **Usage** | **Type** | **Required** | **Alias** |  **Default** |**cli-default Entry**
 | --- | --- | --- | --- | --- | --- | ---| 

docs/GET-STARTED.md

@@ -1,4 +1,4 @@
-# multi-downloader-nx (v5.5.3)
+# multi-downloader-nx (v5.6.5)
 
 If you find any bugs in this documentation or in the program itself please report it [over on GitHub](https://github.com/anidl/multi-downloader-nx/issues).
 
@@ -23,6 +23,7 @@ This tool is not responsible for your actions; please make an informed decision
     - [Playready CDM](#playready)
 - [Installation](#installation)
 - [Configuration](#configuration)
+- [Endpoint Notes](#endpoint-notes)
 - [Usage](#usage)
     - [Authentication](#authentication)
     - [Output Directory](#output-directory)
@@ -38,7 +39,7 @@ This tool is not responsible for your actions; please make an informed decision
 The dependencies for this application are:
 - [ffmpeg](https://www.videohelp.com/software/ffmpeg)
 - [MKVToolNix](https://www.videohelp.com/software/MKVToolNix)
-- Either [Bento4-SDK (mp4decrypt)](https://www.bento4.com/downloads/) or [shaka-packager](https://github.com/shaka-project/shaka-packager/releases)
+- Either [Bento4-SDK (mp4decrypt)](https://www.bento4.com/downloads/) or [shaka-packager](https://github.com/stratumadev/shaka-packager/releases/latest)
 
 For ffmpeg, i chose this option from the website: \
 ![ffmpeg download](./imgs/ffmpeg.png)
@@ -125,7 +126,6 @@ C:.
 12. Great! Now we have all dependencies installed and available in our PATH. To confirm that everything is working, open a new Command Prompt window and run the following commands:
 ```
 ffmpeg
-ffprobe
 mkvmerge
 mp4decrypt (or shaka-packager's .exe name, if you chose that instead)
 ```
@@ -140,24 +140,32 @@ You have now completed the dependencies installation!
 
 ### Widevine
 
-When you dump your CDM key, you will usually get 2 files. One ending in `.bin` and the other in `.pem`. \
-All you need to do is place both files in the `widevine` folder, which is in the same directory you opened `aniDL.exe` from. \
-It will detect what each file is based on the file contents.
-
-If you do want to name them though (optional):
-- The `.bin` file should be named `device_client_id_blob.bin` or `client_id.bin`
-- The `.pem` file should be named `device_private_key.pem` or `private_key.pem`
-
-Again, the renaming is totally optional. Just make sure both files are in the `widevine` folder.
+If you have a Widevine CDM key dump, its either going to be a single `.wvd` file or a pair of `.bin` and `.pem` files. \
+In any case, multi-downloader-nx supports both formats. Place them in the `widevine` folder and you are good to go.
 
 ### Playready
 
 If you have a Playready CDM key dump, you just need to make sure:
-1. Its provisioned as a V3 Device by [pyplayready](https://github.com/ready-dl/pyplayready).
-2. Security level is either SL2000 or SL3000
-3. Make sure you are using shaka-packager v2.6.1, as later versions have issues.
+1. Security level is either SL2000 or SL3000
+2. Make sure you are using the latest version of shaka-packager from Stratuma, as he has patched it to work with multi-downloader-nx.\
+   You can find his releases [here](https://github.com/stratumadev/shaka-packager/releases/latest)
 
-After you have confirmed the above, place the file(s) in the `playready` folder, which is in the same directory you opened `aniDL.exe` from.
+File type does not matter, as multi-downloader-nx supports both `.prd` device files and the `bgroupcert.dat` and `zgpriv.dat` blobs. \
+`.prd` files can be placed into the `playready` folder with whatever name it has.
+
+But if you are using the 2 `.dat` blob files, you need to rename them like so:
+- `.dat` file that is 1.xx KiB -> `bgroupcert.dat`
+- `.dat` file that is 32 bytes -> `zgpriv.dat`
+
+Output form [mediainfo](https://mediaarea.net/en/MediaInfo) can help you identify which file is which.
+```
+bgroupcert.dat
+1.26 KiB
+
+zgpriv.dat
+32.0 Bytes
+```
+Keep in mind that the `bgroupcert.dat` may not always be exactly 1.26 KiB but it should be in the KiB range, while the `zgpriv.dat` will always be 32 bytes.
 
 ## Installation
 
@@ -213,6 +221,25 @@ If you wanted to set `--tsd` to `true`, you would do it like this:
 tsd: true
 ```
 
+## Endpoint Notes
+
+This section explains what each endpoint is capable of, and what subscription level is required to use it. \
+If you are new to the project, please use the defaults found in the [`cli-defaults.yml`](https://github.com/HyperNylium/multi-downloader-nx/blob/master/config/cli-defaults.yml) file, as those are the recommended settings.
+
+| Endpoint     | Video quality               | Audio quality | Subscription level required |
+|--------------|-----------------------------|---------------|-----------------------------|
+| `android`    | 4-6k variable bitrate (VBR) | 192kbps       | "Fan" or higher             |
+| `androidtab` | 4-6k variable bitrate (VBR) | 128kbps       | "Fan" or higher             |
+| `androidtv`  | 8k constent bitrate (CBR)   | 128kbps       | "Fan" or higher             |
+
+> [!NOTE]
+> If you pick 192kbps audio (`--astream android`) with 8k CBR video (`--vstream androidtv`) but don’t have "Mega Fan" sub or higher,
+> the audio will fall back to 128 kbps, which will download the CBR video with 128 kbps audio.
+
+> [!NOTE]
+> 192 kbps audio comes from the `android` endpoint. CBR video comes from `androidtv` endpoint. \
+> Using both means you are using **two streams**, which needs the "Mega Fan" tier or higher.
+
 ## Usage
 
 ### Authentication
@@ -279,4 +306,4 @@ If you wanted to download the show via the ID, you would enter `G4PH0WXVJ` in th
 
 #### Filename Overwrite
 
-1. **Filename Overwrite**: This is where you can change the filename format for the downloaded episodes. [`DOCUMENTATION.md`](https://github.com/anidl/multi-downloader-nx/blob/master/docs/DOCUMENTATION.md#--filename) for all available options.
+1. **Filename Overwrite**: This is where you can change the filename format for the downloaded episodes. [`DOCUMENTATION.md`](https://github.com/anidl/multi-downloader-nx/blob/master/docs/DOCUMENTATION.md#--filename) for all available options.

docs/README.md

@@ -18,10 +18,9 @@ This application is not endorsed by or affiliated with *Crunchyroll*, *Hidive* o
 By default this application uses the following paths to programs (main executables):
 
 * `ffmpeg.exe` (Windows) or `ffmpeg` (other) (From PATH)
-* `ffprobe.exe` (Windows) or `ffprobe` (other) (From PATH)
 * `mkvmerge.exe` (Windows) or `mkvmerge` (other) (From PATH)
 * `mp4decrypt.exe` (Windows) or `mp4decrypt` (other) (From PATH) (or shaka-packager)
-* `shaka-packager.exe` (Windows) or `shaka-packager` (other) (v2.6.1 or older) (From PATH) (or mp4decrypt)
+* `shaka-packager.exe` (Windows) or `shaka-packager` (other) (From PATH) (or mp4decrypt)
 
 To change these paths you need to edit `bin-path.yml` in `./config/` directory.
 
@@ -102,7 +101,7 @@ If you want to package the application, run pnpm run build-`{platform}`-`{type}`
 ### Decryption Requirements
 
 * mp4decrypt >= Any (http://www.bento4.com/) - Only required for decrypting (or shaka-packager)
-* shaka-packager >= Any (https://github.com/shaka-project/shaka-packager/releases) - Only required for decrypting (or mp4decrypt)
+* shaka-packager >= Any (https://github.com/stratumadev/shaka-packager/releases) - Only required for decrypting (or mp4decrypt)
 
 ### Instructions (Widevine)
 
@@ -111,5 +110,4 @@ In order to decrypt DRM content, you will need to have a dumped CDM, after that
 ### Instructions (Playready)
 
 Playready CDMs are very easy to obtain, you can find them even on Github.
-Place the CDM in the `./playready/` directory and you're all set!
-**IMPORTANT**: The Playready CDM (SL2000/SL3000) needs to be provisioned as a **V3 Device** by pyplayready (https://github.com/ready-dl/pyplayready).
+Place the CDM files (bgroupcert.dat and zgpriv.dat) in the `./playready/` directory and you're all set!

eslint.config.ts

@@ -33,7 +33,7 @@ export default tseslint.config(
 		}
 	},
 	{
-		ignores: ['**/lib', '**/videos', '**/build', 'dev.js', 'tsc.ts']
+		ignores: ['**/lib', '**/videos', '**/build', 'tsc.ts']
 	},
 	{
 		files: ['gui/react/**/*'],

gui/react/package.json

@@ -5,9 +5,9 @@
 	"dependencies": {
 		"@emotion/react": "^11.14.0",
 		"@emotion/styled": "^11.14.1",
-		"@mui/icons-material": "^7.3.4",
+		"@mui/icons-material": "^7.3.5",
 		"@mui/lab": "7.0.0-beta.12",
-		"@mui/material": "^7.3.4",
+		"@mui/material": "^7.3.5",
 		"notistack": "^3.0.2",
 		"react": "^19.2.0",
 		"react-dom": "^19.2.0",
@@ -16,22 +16,22 @@
 	},
 	"devDependencies": {
 		"@babel/cli": "^7.28.3",
-		"@babel/core": "^7.28.4",
-		"@babel/preset-env": "^7.28.3",
-		"@babel/preset-react": "^7.27.1",
-		"@babel/preset-typescript": "^7.27.1",
-		"@types/node": "^24.7.1",
-		"@types/react": "^19.2.2",
-		"@types/react-dom": "^19.2.1",
+		"@babel/core": "^7.28.5",
+		"@babel/preset-env": "^7.28.5",
+		"@babel/preset-react": "^7.28.5",
+		"@babel/preset-typescript": "^7.28.5",
+		"@types/node": "^24.10.1",
+		"@types/react": "^19.2.7",
+		"@types/react-dom": "^19.2.3",
 		"@types/uuid": "^10.0.0",
 		"babel-loader": "^10.0.0",
 		"concurrently": "^9.2.1",
 		"css-loader": "^7.1.2",
-		"html-webpack-plugin": "^5.6.4",
+		"html-webpack-plugin": "^5.6.5",
 		"style-loader": "^4.0.0",
 		"ts-node": "^10.9.2",
 		"typescript": "^5.9.3",
-		"webpack": "^5.102.1",
+		"webpack": "^5.103.0",
 		"webpack-cli": "^6.0.1",
 		"webpack-dev-server": "^5.2.2"
 	},

gui/react/src/Style.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Container, Box, ThemeProvider, createTheme, Theme } from '@mui/material';
+import { Box, ThemeProvider, createTheme, Theme } from '@mui/material';
 
 const makeTheme = (mode: 'dark' | 'light'): Partial<Theme> => {
 	return createTheme({

gui/react/src/components/AddToQueue/AddToQueue.tsx

@@ -1,5 +1,5 @@
 import { Add } from '@mui/icons-material';
-import { Box, Button, Dialog, Divider, Typography } from '@mui/material';
+import { Box, Button, Dialog, Divider } from '@mui/material';
 import React from 'react';
 import DownloadSelector from './DownloadSelector/DownloadSelector';
 import EpisodeListing from './DownloadSelector/Listing/EpisodeListing';

gui/react/src/components/AddToQueue/DownloadSelector/DownloadSelector.tsx

@@ -1,4 +1,4 @@
-import React, { ChangeEvent } from 'react';
+import React from 'react';
 import { Box, Button, Divider, FormControl, InputBase, InputLabel, Link, MenuItem, Select, TextField, Tooltip, Typography } from '@mui/material';
 import useStore from '../../../hooks/useStore';
 import MultiSelect from '../../reusable/MultiSelect';

gui/react/src/components/AddToQueue/DownloadSelector/Listing/EpisodeListing.tsx

@@ -27,17 +27,15 @@ const EpisodeListing: React.FC = () => {
 	}, [store.episodeListing]);
 
 	const close = () => {
-		dispatch({
-			type: 'episodeListing',
-			payload: []
-		});
+		const mergedEpisodes = [...parseEpisodes(store.downloadOptions.e), ...selected];
 		dispatch({
 			type: 'downloadOptions',
 			payload: {
 				...store.downloadOptions,
-				e: `${[...new Set([...parseSelect(store.downloadOptions.e), ...selected])].join(',')}`
+				e: serializeEpisodes(mergedEpisodes)
 			}
 		});
+		dispatch({ type: 'episodeListing', payload: [] });
 	};
 
 	const getEpisodesForSeason = (season: string | 'all') => {
@@ -168,6 +166,16 @@ const EpisodeListing: React.FC = () => {
 		</Dialog>
 	);
 };
+const parseEpisodes = (e: string): string[] => {
+	if (!e) return [];
+	return e
+		.split(',')
+		.map((s) => s.trim())
+		.filter((s) => s.length > 0);
+};
+const serializeEpisodes = (episodes: string[]): string => {
+	return [...new Set(episodes)].join(',');
+};
 
 const parseSelect = (s: string): string[] => {
 	const ret: string[] = [];

gui/react/src/components/MainFrame/Queue/Queue.tsx

@@ -1,4 +1,4 @@
-import { Badge, Box, Button, CircularProgress, Divider, IconButton, LinearProgress, Skeleton, Tooltip, Typography } from '@mui/material';
+import { Box, CircularProgress, IconButton, LinearProgress, Skeleton, Tooltip, Typography } from '@mui/material';
 import React from 'react';
 import { messageChannelContext } from '../../../provider/MessageChannel';
 import { queueContext } from '../../../provider/QueueProvider';

gui/react/src/provider/ServiceProvider.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Divider, Box, Button, Typography, Avatar } from '@mui/material';
+import { Box, Button, Typography, Avatar } from '@mui/material';
 import useStore from '../hooks/useStore';
 import { StoreState } from './Store';
 

gui/server/index.ts

@@ -1,8 +1,7 @@
 import express from 'express';
 import { ensureConfig, loadCfg, workingDir } from '../../modules/module.cfg-loader';
-import cors from 'cors';
-import ServiceHandler from './serviceHandler';
 import open from 'open';
+import ServiceHandler from './serviceHandler';
 import path from 'path';
 import { PublicWebSocket } from './websocket';
 import { console } from '../../modules/log';
@@ -19,7 +18,14 @@ const app = express();
 export { app, cfg };
 
 app.use(express.json());
-app.use(cors());
+
+app.use((_, res, next) => {
+	res.header('Access-Control-Allow-Origin', '*');
+	res.header('Access-Control-Allow-Methods', 'GET,POST,PUT,DELETE,OPTIONS');
+	res.header('Access-Control-Allow-Headers', 'Content-Type, Authorization');
+	next();
+});
+
 app.use(express.static(path.join(workingDir, 'gui', 'server', 'build'), { maxAge: 1000 * 60 * 20 }));
 
 console.info(`\n=== Multi Downloader NX GUI ${packageJson.version} ===\n`);

hidive.ts

@@ -1,6 +1,6 @@
 // build-in
 import path from 'path';
-import fs from 'fs-extra';
+import fs from 'fs';
 
 // package program
 import packageJson from './package.json';
@@ -19,7 +19,7 @@ import vtt2ass from './modules/module.vtt2ass';
 import Helper from './modules/module.helper';
 
 // load req
-import { domain, api } from './modules/module.api-urls';
+import { api } from './modules/module.api-urls';
 import * as reqModule from './modules/module.fetch';
 import { DownloadedMedia } from './@types/hidiveTypes';
 import parseFileName, { Variable } from './modules/module.filename';
@@ -36,8 +36,8 @@ import { NewHidiveEpisode } from './@types/newHidiveEpisode';
 import { NewHidivePlayback, Subtitle } from './@types/newHidivePlayback';
 import { MPDParsed, parse } from './modules/module.transform-mpd';
 import { canDecrypt, getKeysWVD, cdm, getKeysPRD } from './modules/cdm';
-import { KeyContainer } from './modules/widevine/license';
 import { FetchParams } from './modules/module.fetch';
+import { KeyContainer } from 'widevine';
 
 export default class Hidive implements ServiceClass {
 	public cfg: yamlCfg.ConfigObject;
@@ -934,7 +934,7 @@ export default class Hidive implements ServiceClass {
 						} else {
 							console.info('Decryption done for video');
 							if (!options.nocleanup) {
-								fs.removeSync(`${tempTsFile}.video.enc.m4s`);
+								fs.unlinkSync(`${tempTsFile}.video.enc.m4s`);
 							}
 							fs.copyFileSync(`${tempTsFile}.video.m4s`, `${tsFile}.video.m4s`);
 							fs.unlinkSync(`${tempTsFile}.video.m4s`);
@@ -1028,7 +1028,7 @@ export default class Hidive implements ServiceClass {
 							return undefined;
 						} else {
 							if (!options.nocleanup) {
-								fs.removeSync(`${tempTsFile}.audio.enc.m4s`);
+								fs.unlinkSync(`${tempTsFile}.audio.enc.m4s`);
 							}
 							fs.copyFileSync(`${tempTsFile}.audio.m4s`, `${tsFile}.audio.m4s`);
 							fs.unlinkSync(`${tempTsFile}.audio.m4s`);

index.ts

@@ -1,11 +1,19 @@
 import { console } from './modules/log';
-import { ServiceClass } from './@types/serviceClassInterface';
 import { appArgv, overrideArguments } from './modules/module.app-args';
 import * as yamlCfg from './modules/module.cfg-loader';
 import { makeCommand, addToArchive } from './modules/module.downloadArchive';
+import Crunchy from './crunchy';
+import Hidive from './hidive';
+import ADN from './adn';
 
 import update from './modules/module.updater';
 
+const SERVICES: Record<string, any> = {
+	crunchy: Crunchy,
+	hidive: Hidive,
+	adn: ADN
+};
+
 (async () => {
 	const cfg = yamlCfg.loadCfg();
 	const argv = appArgv(cfg.cli);
@@ -40,47 +48,27 @@ import update from './modules/module.updater';
 			);
 			console.info('Added %s to the downloadArchive list', argv.s === undefined ? argv.series : argv.s);
 		}
-	} else if (argv.downloadArchive) {
+	} else if (argv.downloadArchive && argv.service) {
 		const ids = makeCommand(argv.service);
 		for (const id of ids) {
 			overrideArguments(cfg.cli, id);
-			/* Reimport module to override appArgv */
-			Object.keys(require.cache).forEach((key) => {
-				if (key.endsWith('crunchy.js') || key.endsWith('hidive.js')) delete require.cache[key];
-			});
-			let service: ServiceClass;
-			switch (argv.service) {
-				case 'crunchy':
-					service = new (await import('./crunchy')).default();
-					break;
-				case 'hidive':
-					service = new (await import('./hidive')).default();
-					break;
-				case 'adn':
-					service = new (await import('./adn')).default();
-					break;
-				default:
-					service = new (await import(`./${argv.service}`)).default();
-					break;
+			const Service = SERVICES[argv.service];
+			if (!Service) {
+				console.error('Unknown service:', argv.service);
+				process.exit(1);
 			}
+
+			const service = new Service();
 			await service.cli();
 		}
-	} else {
-		let service: ServiceClass;
-		switch (argv.service) {
-			case 'crunchy':
-				service = new (await import('./crunchy')).default();
-				break;
-			case 'hidive':
-				service = new (await import('./hidive')).default();
-				break;
-			case 'adn':
-				service = new (await import('./adn')).default();
-				break;
-			default:
-				service = new (await import(`./${argv.service}`)).default();
-				break;
+	} else if (argv.service) {
+		const Service = SERVICES[argv.service];
+		if (!Service) {
+			console.error('Unknown service:', argv.service);
+			process.exit(1);
 		}
+
+		const service = new Service();
 		await service.cli();
 	}
 })();

modules/build.ts

@@ -1,6 +1,6 @@
 // build requirements
 import crypto from 'crypto';
-import fs from 'fs-extra';
+import fs from 'fs';
 import pkg from '../package.json';
 import modulesCleanup from 'removeNPMAbsolutePaths';
 import { exec } from '@yao-pkg/pkg';
@@ -10,7 +10,7 @@ import esbuild from 'esbuild';
 import path from 'path';
 
 const buildsDir = './_builds';
-const nodeVer = 'node22-';
+const nodeVer = 'node24-';
 
 type BuildTypes = `${'windows' | 'macos' | 'linux' | 'linuxstatic' | 'alpine'}-${'x64' | 'arm64'}` | 'linuxstatic-armv7';
 
@@ -38,14 +38,14 @@ async function buildBinary(buildType: BuildTypes, gui: boolean) {
 	}
 	await modulesCleanup('.');
 	if (!fs.existsSync(buildsDir)) {
-		fs.mkdirSync(buildsDir);
+		fs.mkdirSync(buildsDir, { recursive: true });
 	}
 	const buildFull = `${buildStr}-${getFriendlyName(buildType)}-${gui ? 'gui' : 'cli'}`;
 	const buildDir = `${buildsDir}/${buildFull}`;
 	if (fs.existsSync(buildDir)) {
-		fs.removeSync(buildDir);
+		fs.rmSync(buildDir, { recursive: true, force: true });
 	}
-	fs.mkdirSync(buildDir);
+	fs.mkdirSync(buildDir, { recursive: true });
 	console.info('Running esbuild');
 
 	const build = await esbuild.build({
@@ -79,24 +79,24 @@ async function buildBinary(buildType: BuildTypes, gui: boolean) {
 	}
 
 	// Moving required default files/folders into build dir
-	fs.mkdirSync(`${buildDir}/config`);
-	fs.mkdirSync(`${buildDir}/videos`);
-	fs.mkdirSync(`${buildDir}/widevine`);
-	fs.mkdirSync(`${buildDir}/playready`);
-	fs.copySync('./config/cli-defaults.yml', `${buildDir}/config/cli-defaults.yml`);
-	fs.copySync('./config/dir-path.yml', `${buildDir}/config/dir-path.yml`);
-	fs.copySync('./config/gui.yml', `${buildDir}/config/gui.yml`);
-	fs.copySync('./modules/cmd-here.bat', `${buildDir}/cmd-here.bat`);
-	fs.copySync('./modules/NotoSans-Regular.ttf', `${buildDir}/NotoSans-Regular.ttf`);
-	fs.copySync('./package.json', `${buildDir}/package.json`);
-	fs.copySync('./docs/', `${buildDir}/docs/`);
-	fs.copySync('./LICENSE.md', `${buildDir}/docs/LICENSE.md`);
+	fs.mkdirSync(`${buildDir}/config`, { recursive: true });
+	fs.mkdirSync(`${buildDir}/videos`, { recursive: true });
+	fs.mkdirSync(`${buildDir}/widevine`, { recursive: true });
+	fs.mkdirSync(`${buildDir}/playready`, { recursive: true });
+	fs.copyFileSync('./config/cli-defaults.yml', `${buildDir}/config/cli-defaults.yml`);
+	fs.copyFileSync('./config/dir-path.yml', `${buildDir}/config/dir-path.yml`);
+	fs.copyFileSync('./config/gui.yml', `${buildDir}/config/gui.yml`);
+	fs.copyFileSync('./modules/cmd-here.bat', `${buildDir}/cmd-here.bat`);
+	fs.copyFileSync('./modules/NotoSans-Regular.ttf', `${buildDir}/NotoSans-Regular.ttf`);
+	fs.copyFileSync('./package.json', `${buildDir}/package.json`);
+	fs.cpSync('./docs/', `${buildDir}/docs/`, { recursive: true });
+	fs.copyFileSync('./LICENSE.md', `${buildDir}/docs/LICENSE.md`);
 	if (gui) {
-		fs.copySync('./gui', `${buildDir}/gui`);
-		fs.copySync('./node_modules/open/xdg-open', `${buildDir}/xdg-open`);
+		fs.cpSync('./gui', `${buildDir}/gui`, { recursive: true });
+		fs.cpSync('./node_modules/open/xdg-open', `${buildDir}/xdg-open`, { recursive: true });
 	}
 	if (fs.existsSync(`${buildsDir}/${buildFull}.7z`)) {
-		fs.removeSync(`${buildsDir}/${buildFull}.7z`);
+		fs.unlinkSync(`${buildsDir}/${buildFull}.7z`);
 	}
 
 	// Generate bin-path.yml
@@ -105,7 +105,6 @@ async function buildBinary(buildType: BuildTypes, gui: boolean) {
 	const binConf = {
 		ffmpeg: `ffmpeg${ext}`,
 		mkvmerge: `mkvmerge${ext}`,
-		ffprobe: `ffprobe${ext}`,
 		mp4decrypt: `mp4decrypt${ext}`,
 		shaka: `shaka-packager${ext}`
 	};

modules/cdm.ts

@@ -2,87 +2,105 @@ import fs from 'fs';
 import { console } from './log';
 import { workingDir } from './module.cfg-loader';
 import path from 'path';
-import { Device } from './playready/device';
-import Cdm from './playready/cdm';
-import { PSSH } from './playready/pssh';
-import { KeyContainer, Session } from './widevine/license';
 import * as reqModule from './module.fetch';
+import Playready from 'node-playready';
+import Widevine, { KeyContainer, LicenseType } from 'widevine';
 
 const req = new reqModule.Req();
 
 //read cdm files located in the same directory
-let privateKey: Buffer = Buffer.from([]),
-	identifierBlob: Buffer = Buffer.from([]),
-	prd: Buffer = Buffer.from([]),
-	prd_cdm: Cdm | undefined;
+let widevine: Widevine | undefined, playready: Playready | undefined;
 export let cdm: 'widevine' | 'playready';
 export let canDecrypt: boolean;
 try {
 	const files_prd = fs.readdirSync(path.join(workingDir, 'playready'));
-	const prd_file_found = files_prd.find((f) => f.includes('.prd'));
+	const bgroup_file_found = files_prd.find((f) => f.includes('bgroupcert'));
+	const zgpriv_file_found = files_prd.find((f) => f.includes('zgpriv'));
+	const prd_file_found = files_prd.find((f) => f.endsWith('.prd'));
 	try {
-		if (prd_file_found) {
-			const file_prd = path.join(workingDir, 'playready', prd_file_found);
-			const stats = fs.statSync(file_prd);
-			if (stats.size < 1024 * 8 && stats.isFile()) {
-				const fileContents = fs.readFileSync(file_prd, {
-					encoding: 'utf8'
-				});
-				if (fileContents.includes('CERT')) {
-					prd = fs.readFileSync(file_prd);
-					const device = Device.loads(prd);
-					prd_cdm = Cdm.fromDevice(device);
-				}
+		const file_bgroup = path.join(workingDir, 'playready', 'bgroupcert.dat');
+		const file_zgpriv = path.join(workingDir, 'playready', 'zgpriv.dat');
+
+		if (bgroup_file_found && zgpriv_file_found) {
+			const bgroup_stats = fs.statSync(file_bgroup);
+			const zgpriv_stats = fs.statSync(file_zgpriv);
+
+			// Zgpriv is always 32 bytes long
+			if (bgroup_stats.isFile() && zgpriv_stats.isFile() && zgpriv_stats.size === 32) {
+				const bgroup = fs.readFileSync(file_bgroup);
+				const zgpriv = fs.readFileSync(file_zgpriv);
+
+				// Init Playready Client
+				playready = Playready.init(bgroup, zgpriv);
 			}
+		} else if (prd_file_found) {
+			const file_prd = path.join(workingDir, 'playready', prd_file_found);
+			const prd = fs.readFileSync(file_prd);
+
+			// Init Playready Client with PRD file
+			playready = Playready.initPRD(prd);
 		}
 	} catch (e) {
-		console.error('Error loading Playready CDM, ensure the CDM is provisioned as a V3 Device and not malformed. For more informations read the readme.');
-		prd = Buffer.from([]);
+		console.error('Error loading Playready CDM. For more informations read the readme.');
+		console.error(e);
 	}
 
 	const files_wvd = fs.readdirSync(path.join(workingDir, 'widevine'));
 	try {
+		let identifierBlob: Buffer = Buffer.from([]);
+		let privateKey: Buffer = Buffer.from([]);
+		let wvd: Buffer = Buffer.from([]);
+
+		// Searching files for client id blob and private key
 		files_wvd.forEach(function (file) {
 			file = path.join(workingDir, 'widevine', file);
 			const stats = fs.statSync(file);
 			if (stats.size < 1024 * 8 && stats.isFile()) {
 				const fileContents = fs.readFileSync(file, { encoding: 'utf8' });
+				// Handle client id blob
+				if (fileContents.includes('widevine_cdm_version') && fileContents.includes('oem_crypto_security_patch_level') && !fileContents.startsWith('WVD')) {
+					identifierBlob = fs.readFileSync(file);
+				}
+				// Handle private key
 				if (
 					(fileContents.includes('-----BEGIN RSA PRIVATE KEY-----') && fileContents.includes('-----END RSA PRIVATE KEY-----')) ||
 					(fileContents.includes('-----BEGIN PRIVATE KEY-----') && fileContents.includes('-----END PRIVATE KEY-----'))
 				) {
 					privateKey = fs.readFileSync(file);
 				}
-				if (fileContents.includes('widevine_cdm_version') && fileContents.includes('oem_crypto_security_patch_level') && !fileContents.startsWith('WVD')) {
-					identifierBlob = fs.readFileSync(file);
-				}
+				// Handle WVD file
 				if (fileContents.startsWith('WVD')) {
-					console.warn(
-						'Found WVD file in folder, AniDL currently only supports device_client_id_blob and device_private_key, make sure to have them in the widevine folder.'
-					);
+					wvd = fs.readFileSync(file);
 				}
 			}
 		});
+
+		// Error if no client blob but private key
+		if (identifierBlob.length === 0 && privateKey.length !== 0 && wvd.length === 0) {
+			console.error('Widevine initialization failed, found private key but not the client id blob!');
+		}
+
+		// Error if no private key but client blob
+		if (identifierBlob.length !== 0 && privateKey.length === 0 && wvd.length === 0) {
+			console.error('Widevine initialization failed, found client id blob but not the private key!');
+		}
+
+		// Init Widevine Client
+		if (identifierBlob.length !== 0 && privateKey.length !== 0) {
+			widevine = Widevine.init(identifierBlob, privateKey);
+		} else if (wvd.length !== 0) {
+			widevine = Widevine.initWVD(wvd);
+		}
 	} catch (e) {
 		console.error('Error loading Widevine CDM, malformed client blob or private key.');
-		privateKey = Buffer.from([]);
-		identifierBlob = Buffer.from([]);
 	}
 
-	if (privateKey.length !== 0 && identifierBlob.length !== 0) {
+	if (widevine) {
 		cdm = 'widevine';
 		canDecrypt = true;
-	} else if (prd.length !== 0) {
+	} else if (playready) {
 		cdm = 'playready';
 		canDecrypt = true;
-	} else if (privateKey.length === 0 && identifierBlob.length !== 0) {
-		console.warn('Private key missing');
-		canDecrypt = false;
-	} else if (identifierBlob.length === 0 && privateKey.length !== 0) {
-		console.warn('Identifier blob missing');
-		canDecrypt = false;
-	} else if (prd.length == 0) {
-		canDecrypt = false;
 	} else {
 		canDecrypt = false;
 	}
@@ -92,17 +110,17 @@ try {
 }
 
 export async function getKeysWVD(pssh: string | undefined, licenseServer: string, authData: Record<string, string>): Promise<KeyContainer[]> {
-	if (!pssh || !canDecrypt) return [];
-	//pssh found in the mpd manifest
+	if (!pssh || !canDecrypt || !widevine) return [];
+	// pssh found in the mpd manifest
 	const psshBuffer = Buffer.from(pssh, 'base64');
 
-	//Create a new widevine session
-	const session = new Session({ privateKey, identifierBlob }, psshBuffer);
+	// Create a new widevine session
+	const session = widevine.createSession(psshBuffer, LicenseType.STREAMING);
 
 	// Request License
 	const licReq = await req.getData(licenseServer, {
 		method: 'POST',
-		body: session.createLicenseRequest(),
+		body: session.generateChallenge(),
 		headers: authData
 	});
 
@@ -122,13 +140,12 @@ export async function getKeysWVD(pssh: string | undefined, licenseServer: string
 }
 
 export async function getKeysPRD(pssh: string | undefined, licenseServer: string, authData: Record<string, string>): Promise<KeyContainer[]> {
-	if (!pssh || !canDecrypt || !prd_cdm) return [];
-	const pssh_parsed = new PSSH(pssh);
+	if (!pssh || !canDecrypt || !playready) return [];
 
-	//Create a new playready session
-	const session = prd_cdm.getLicenseChallenge(pssh_parsed.get_wrm_headers(true)[0]);
+	// Generate Playready challenge
+	const session = playready.generateChallenge(pssh);
 
-	//Generate license
+	// Fetch license
 	const licReq = await req.getData(licenseServer, {
 		method: 'POST',
 		body: session,
@@ -140,13 +157,12 @@ export async function getKeysPRD(pssh: string | undefined, licenseServer: string
 		return [];
 	}
 
-	//Parse License and return keys
+	// Parse License and return keys
 	try {
-		const keys = prd_cdm.parseLicense(await licReq.res.text());
-
+		const keys = playready.parseLicense(Buffer.from(await licReq.res.text(), 'utf-8'));
 		return keys.map((k) => {
 			return {
-				kid: k.key_id,
+				kid: k.kid,
 				key: k.key
 			};
 		});

modules/hls-download.ts

@@ -8,6 +8,7 @@ import { console } from './log';
 import { ProgressData } from '../@types/messageHandler';
 import Helper from './module.helper';
 import * as reqModule from './module.fetch';
+import { Manifest } from 'm3u8-parser';
 
 const req = new reqModule.Req();
 
@@ -33,7 +34,7 @@ type Key = {
 };
 
 export type HLSOptions = {
-	m3u8json: M3U8Json;
+	m3u8json: M3U8Json | Partial<Manifest>;
 	output?: string;
 	threads?: number;
 	retries?: number;
@@ -52,7 +53,7 @@ type Data = {
 		total: number;
 		completed: number;
 	};
-	m3u8json: M3U8Json;
+	m3u8json: M3U8Json | Partial<Manifest>;
 	outputFile: string;
 	threads: number;
 	retries: number;
@@ -90,7 +91,7 @@ class hlsDownload {
 			m3u8json: options.m3u8json,
 			outputFile: options.output || 'stream.ts',
 			threads: options.threads || 5,
-			retries: options.retries || 4,
+			retries: options.retries || 10,
 			offset: options.offset || 0,
 			baseurl: options.baseurl,
 			skipInit: options.skipInit,
@@ -118,7 +119,7 @@ class hlsDownload {
 				if (age < 24 * 60 * 60 * 1000) {
 					console.info('Resume data found! Trying to resume...');
 					const resumeData = JSON.parse(await fs.readFile(`${fn}.resume`, 'utf-8'));
-					if (resumeData.total == this.data.m3u8json.segments.length && resumeData.completed != resumeData.total && !isNaN(resumeData.completed)) {
+					if (resumeData.total == this.data.m3u8json.segments?.length && resumeData.completed != resumeData.total && !isNaN(resumeData.completed)) {
 						console.info('Resume data is ok!');
 						this.data.offset = resumeData.completed;
 						this.data.isResume = true;
@@ -126,7 +127,7 @@ class hlsDownload {
 						console.warn(' Resume data is wrong!');
 						console.warn({
 							resume: { total: resumeData.total, dled: resumeData.completed },
-							current: { total: this.data.m3u8json.segments.length }
+							current: { total: this.data.m3u8json.segments?.length }
 						});
 					}
 				} else {
@@ -166,7 +167,7 @@ class hlsDownload {
 		this.data.dateStart = Date.now();
 		let segments = this.data.m3u8json.segments;
 		// download init part
-		if (segments[0].map && this.data.offset === 0 && !this.data.skipInit) {
+		if (segments?.[0].map && this.data.offset === 0 && !this.data.skipInit) {
 			console.info('Download and save init part...');
 			const initSeg = segments[0].map as Segment;
 			if (segments[0].key) {
@@ -179,7 +180,7 @@ class hlsDownload {
 					`${fn}.resume`,
 					JSON.stringify({
 						completed: 0,
-						total: this.data.m3u8json.segments.length
+						total: this.data.m3u8json.segments?.length
 					})
 				);
 				console.info('Init part downloaded.');
@@ -187,17 +188,17 @@ class hlsDownload {
 				console.error(`Part init download error:\n\t${e.message}`);
 				return { ok: false, parts: this.data.parts };
 			}
-		} else if (segments[0].map && this.data.offset === 0 && this.data.skipInit) {
+		} else if (segments?.[0].map && this.data.offset === 0 && this.data.skipInit) {
 			console.warn('Skipping init part can lead to broken video!');
 		}
 		// resuming ...
 		if (this.data.offset > 0) {
-			segments = segments.slice(this.data.offset);
+			segments = segments?.slice(this.data.offset);
 			console.info(`Resuming download from part ${this.data.offset + 1}...`);
 			this.data.parts.completed = this.data.offset;
 		}
 		// dl process
-		for (let p = 0; p < segments.length / this.data.threads; p++) {
+		for (let p = 0; p < (segments?.length ?? 0) / this.data.threads; p++) {
 			// set offsets
 			const offset = p * this.data.threads;
 			const dlOffset = offset + this.data.threads;
@@ -206,9 +207,9 @@ class hlsDownload {
 				prq = new Map();
 			const res: any[] = [];
 			let errcnt = 0;
-			for (let px = offset; px < dlOffset && px < segments.length; px++) {
-				const curp = segments[px];
-				const key = curp.key as Key;
+			for (let px = offset; px < dlOffset && px < (segments?.length ?? 0); px++) {
+				const curp = segments?.[px];
+				const key = curp?.key as Key;
 				if (key && !krq.has(key.uri) && !this.data.keys[key.uri as string]) {
 					krq.set(key.uri, this.downloadKey(key, px, this.data.offset));
 				}
@@ -219,8 +220,8 @@ class hlsDownload {
 				console.error(`Key ${er.p + 1} download error:\n\t${er.message}`);
 				return { ok: false, parts: this.data.parts };
 			}
-			for (let px = offset; px < dlOffset && px < segments.length; px++) {
-				const curp = segments[px] as Segment;
+			for (let px = offset; px < dlOffset && px < (segments?.length ?? 0); px++) {
+				const curp = segments?.[px] as Segment;
 				prq.set(px, () => this.downloadPart(curp, px, this.data.offset));
 			}
 			// Parallelized part download with retry logic and optional concurrency limit
@@ -286,7 +287,7 @@ class hlsDownload {
 				}
 			}
 			// log downloaded
-			const totalSeg = segments.length + this.data.offset; // Add the sliced lenght back so the resume data will be correct even if an resumed download fails
+			const totalSeg = (segments?.length ?? 0) + this.data.offset; // Add the sliced lenght back so the resume data will be correct even if an resumed download fails
 			const downloadedSeg = dlOffset < totalSeg ? dlOffset : totalSeg;
 			this.data.parts.completed = downloadedSeg + this.data.offset;
 			const data = extFn.getDownloadInfo(this.data.dateStart, downloadedSeg, totalSeg, this.data.bytesDownloaded);

modules/log.ts

@@ -7,7 +7,7 @@ const logFolder = path.join(workingDir, 'logs');
 const latest = path.join(logFolder, 'latest.log');
 
 const makeLogFolder = () => {
-	if (!fs.existsSync(logFolder)) fs.mkdirSync(logFolder);
+	if (!fs.existsSync(logFolder)) fs.mkdirSync(logFolder, { recursive: true });
 	if (fs.existsSync(latest)) {
 		const stats = fs.statSync(latest);
 		fs.renameSync(latest, path.join(logFolder, `${stats.mtimeMs}.log`));

modules/module.api-urls.ts

@@ -1,7 +1,9 @@
 // api domains
 const domain = {
 	cr_www: 'https://www.crunchyroll.com',
-	cr_api: 'https://api.crunchyroll.com',
+	cr_api: 'https://beta-api.crunchyroll.com',
+	cr_playback: 'https://cr-play-service.prd.crunchyrollsvc.com',
+	cr_license: 'https://cr-license-proxy.prd.crunchyrollsvc.com',
 	hd_www: 'https://www.hidive.com',
 	hd_api: 'https://api.hidive.com',
 	hd_new: 'https://dce-frontoffice.imggaming.com'
@@ -28,8 +30,9 @@ export type APIType = {
 	cms_auth: string;
 	// Crunchyroll Headers
 	crunchyDefUserAgent: string;
-	crunchyDefHeader: Record<string, string>;
+	crunchyDefHeader: Record<string, any>;
 	crunchyAuthHeader: Record<string, string>;
+	crunchyAuthRefreshHeader: Record<string, string>;
 	// Hidive
 	hd_apikey: string;
 	hd_devName: string;
@@ -50,27 +53,28 @@ const api: APIType = {
 	bundlejs: 'https://static.crunchyroll.com/vilos-v2/web/vilos/js/bundle.js',
 	//
 	// Crunchyroll API
-	basic_auth_token: 'ZGsxYndzemRyc3lkeTR1N2xvenE6bDl0SU1BdTlzTGc4ZjA4ajlfQkQ4eWZmQmZTSms0R0o=',
-	auth: `${domain.cr_www}/auth/v1/token`,
-	me: `${domain.cr_www}/accounts/v1/me`,
-	profile: `${domain.cr_www}/accounts/v1/me/profile`,
-	search: `${domain.cr_www}/content/v2/discover/search`,
-	content_cms: `${domain.cr_www}/content/v2/cms`,
-	content_music: `${domain.cr_www}/content/v2/music`,
-	browse: `${domain.cr_www}/content/v1/browse`,
-	browse_all_series: `${domain.cr_www}/content/v2/discover/browse`,
-	streaming_sessions: `${domain.cr_www}/playback/v1/sessions/streaming`,
-	drm_widevine: `${domain.cr_www}/license/v1/license/widevine`,
-	drm_playready: `${domain.cr_www}/license/v1/license/playReady`,
+	basic_auth_token: 'b2g0cnYxbHpsOXR5ZzF4b2NqZ2o6cDI4bEhwM3J1ZVV0ek1aNDRhZmNyam84MUNmaFZGemg=',
+	auth: `${domain.cr_api}/auth/v1/token`,
+	me: `${domain.cr_api}/accounts/v1/me`,
+	profile: `${domain.cr_api}/accounts/v1/me/profile`,
+	search: `${domain.cr_api}/content/v2/discover/search`,
+	content_cms: `${domain.cr_api}/content/v2/cms`,
+	content_music: `${domain.cr_api}/content/v2/music`,
+	browse: `${domain.cr_api}/content/v1/browse`,
+	browse_all_series: `${domain.cr_api}/content/v2/discover/browse`,
+	streaming_sessions: `${domain.cr_playback}/v1/sessions/streaming`,
+	drm_widevine: `https://cr-license-proxy.prd.crunchyrollsvc.com/v1/license/widevine`,
+	drm_playready: `https://cr-license-proxy.prd.crunchyrollsvc.com/v1/license/playReady`,
 	//
 	// Crunchyroll Bucket
-	cms_bucket: `${domain.cr_www}/cms/v2`,
-	cms_auth: `${domain.cr_www}/index/v2`,
+	cms_bucket: `${domain.cr_api}/cms/v2`,
+	cms_auth: `${domain.cr_api}/index/v2`,
 	//
 	// Crunchyroll Headers
-	crunchyDefUserAgent: 'Crunchyroll/ANDROIDTV/3.47.0_22277 (Android 12; en-US; SHIELD Android TV Build/SR1A.211012.001)',
+	crunchyDefUserAgent: 'Crunchyroll/ANDROIDTV/3.53.1_22290 (Android 12; en-US; SHIELD Android TV Build/SR1A.211012.001)',
 	crunchyDefHeader: {},
 	crunchyAuthHeader: {},
+	crunchyAuthRefreshHeader: {},
 	//
 	//
 	// Hidive
@@ -89,7 +93,6 @@ const api: APIType = {
 
 api.crunchyDefHeader = {
 	'User-Agent': api.crunchyDefUserAgent,
-	Accept: '*/*',
 	'Accept-Encoding': 'gzip',
 	Connection: 'Keep-Alive',
 	Host: 'www.crunchyroll.com'
@@ -97,10 +100,19 @@ api.crunchyDefHeader = {
 
 // set header
 api.crunchyAuthHeader = {
-	Authorization: `Basic ${api.basic_auth_token}`,
-	'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8',
+	Accept: 'application/json',
+	'Accept-Charset': 'UTF-8',
+	'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
 	'Request-Type': 'SignIn',
 	...api.crunchyDefHeader
 };
 
+// set header
+api.crunchyAuthRefreshHeader = {
+	Accept: 'application/json',
+	'Accept-Charset': 'UTF-8',
+	'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
+	...api.crunchyDefHeader
+};
+
 export { domain, api };

modules/module.app-args.ts

@@ -1,4 +1,4 @@
-import yargs, { Choices } from 'yargs';
+import { Command } from 'commander';
 import { args, AvailableMuxer, groups } from './module.args';
 import { LanguageItem } from './module.langsData';
 import { DownloadInfo } from '../@types/messageHandler';
@@ -32,13 +32,13 @@ export let argvC: {
 	auth: boolean | undefined;
 	dlFonts: boolean | undefined;
 	search: string | undefined;
-	'search-type': string;
+	searchType: string;
 	page: number | undefined;
 	locale: string;
 	new: boolean | undefined;
-	'movie-listing': string | undefined;
-	'show-raw': string | undefined;
-	'season-raw': string | undefined;
+	movieListing: string | undefined;
+	showRaw: string | undefined;
+	seasonRaw: string | undefined;
 	series: string | undefined;
 	s: string | undefined;
 	srz: string | undefined;
@@ -95,6 +95,7 @@ export let argvC: {
 	scaledBorderAndShadowFix: boolean;
 	scaledBorderAndShadow: 'yes' | 'no';
 	originalScriptFix: boolean;
+	subtitleTimestampFix: boolean;
 	// Proxy
 	proxy: string;
 	proxyAll: boolean;
@@ -102,6 +103,43 @@ export let argvC: {
 
 export type ArgvType = typeof argvC;
 
+// This functions manages slight mismatches like -srz and returns it as --srz
+const processArgv = () => {
+	const argv = [];
+	const arrayFlags = args.filter((a) => a.type === 'array').map((a) => `--${a.name}`);
+
+	for (let i = 0; i < process.argv.length; i++) {
+		const arg = process.argv[i];
+
+		if (/^-[a-zA-Z]{2,}$/.test(arg)) {
+			const found = args.find((a) => a.name === arg.substring(1) || a.alias === arg.substring(1));
+			if (found) {
+				argv.push(`--${found.name}`);
+				continue;
+			}
+		}
+
+		if (arrayFlags.includes(arg)) {
+			const col = [];
+			let n = i + 1;
+
+			while (n < process.argv.length && !process.argv[n].startsWith('-')) {
+				col.push(process.argv[n]);
+				n++;
+			}
+
+			argv.push(arg);
+			argv.push(col.join(' '));
+			i = n - 1;
+			continue;
+		}
+
+		argv.push(arg);
+	}
+
+	return argv;
+};
+
 const appArgv = (
 	cfg: {
 		[key: string]: unknown;
@@ -109,41 +147,91 @@ const appArgv = (
 	isGUI = false
 ) => {
 	if (argvC) return argvC;
-	yargs(process.argv.slice(2));
-	const argv = getArgv(cfg, isGUI).parseSync();
-	argvC = argv;
-	return argv;
+	const argv = getCommander(cfg, isGUI).parse(processArgv());
+	const parsed = argv.opts() as ArgvType;
+
+	// Be sure that both vars (name and alias) are defined
+	for (const item of args) {
+		const name = item.name;
+		const alias = item.alias;
+
+		if (!alias) continue;
+
+		if (parsed[name] !== undefined) {
+			parsed[alias] = parsed[name];
+		}
+
+		if (parsed[alias] !== undefined) {
+			parsed[name] = parsed[alias];
+		}
+	}
+
+	if (!isGUI && (process.argv.length <= 2 || parsed.help)) {
+		argv.outputHelp();
+		process.exit(0);
+	}
+
+	argvC = parsed;
+	return parsed;
 };
 
 const overrideArguments = (cfg: { [key: string]: unknown }, override: Partial<typeof argvC>, isGUI = false) => {
-	const argv = getArgv(cfg, isGUI)
-		.middleware((ar) => {
-			for (const key of Object.keys(override)) {
-				ar[key] = override[key];
-			}
-		})
-		.parseSync();
-	argvC = argv;
+	const argv = getCommander(cfg, isGUI);
+	const baseArgv = [...processArgv()];
+
+	for (const [key, val] of Object.entries(override)) {
+		if (val === undefined) continue;
+		if (typeof val === 'boolean') {
+			if (val) baseArgv.push(key.length > 1 ? `--${key}` : `-${key}`);
+		} else {
+			baseArgv.push(key.length > 1 ? `--${key}` : `-${key}`, String(val));
+		}
+	}
+
+	const data = argv.parse(baseArgv);
+	const parsed = data.opts() as ArgvType;
+
+	// Be sure that both vars (name and alias) are defined
+	for (const item of args) {
+		const name = item.name;
+		const alias = item.alias;
+
+		if (!alias) continue;
+
+		if (parsed[name] !== undefined) {
+			parsed[alias] = parsed[name];
+		}
+
+		if (parsed[alias] !== undefined) {
+			parsed[name] = parsed[alias];
+		}
+	}
+
+	if (!isGUI && (process.argv.length <= 2 || parsed.help)) {
+		argv.outputHelp();
+		process.exit(0);
+	}
+
+	argvC = parsed;
 };
 
 export { appArgv, overrideArguments };
 
-const getArgv = (cfg: { [key: string]: unknown }, isGUI: boolean) => {
+const getCommander = (cfg: Record<string, unknown>, isGUI: boolean) => {
+	const program = new Command();
+	program
+		.name(process.platform === 'win32' ? 'aniDL.exe' : 'aniDL')
+		.description(pj.description)
+		.version(pj.version, '-v, --version', 'Show version')
+		.allowUnknownOption(false)
+		.allowExcessArguments(true);
+
 	const parseDefault = <T = unknown>(key: string, _default: T): T => {
 		if (Object.prototype.hasOwnProperty.call(cfg, key)) {
 			return cfg[key] as T;
 		} else return _default;
 	};
-	const argv = yargs
-		.parserConfiguration({
-			'duplicate-arguments-array': false,
-			'camel-case-expansion': false
-		})
-		.wrap(yargs.terminalWidth())
-		.usage('Usage: $0 [options]')
-		.version(pj.version)
-		.help(true);
-	//.strictOptions()
+
 	const data = args.map((a) => {
 		return {
 			...a,
@@ -152,40 +240,93 @@ const getArgv = (cfg: { [key: string]: unknown }, isGUI: boolean) => {
 			default: typeof a.default === 'object' && !Array.isArray(a.default) ? parseDefault((a.default as any).name || a.name, (a.default as any).default) : a.default
 		};
 	});
-	for (const item of data)
-		argv.option(item.name, {
-			...item,
-			coerce: (value) => {
-				if (item.transformer) {
-					return item.transformer(value);
-				} else {
-					return value;
+
+	for (const item of data) {
+		const option = program.createOption(
+			(item.alias
+				? `${item.alias.length === 1 ? `-${item.alias}` : `--${item.alias}`}, ${item.name.length === 1 ? `-${item.name}` : `--${item.name}`}`
+				: item.name.length === 1
+					? `-${item.name}`
+					: `--${item.name}`) + (item.type === 'boolean' ? '' : ` <value>`),
+			item.describe ?? ''
+		);
+		if (item.default !== undefined) option.default(item.transformer ? item.transformer(item.default) : item.default);
+
+		const optionNames = [...args.map((a) => `--${a.name}`), ...args.map((a) => (a.alias ? `-${a.alias}` : null)).filter(Boolean)];
+
+		option.argParser((value) => {
+			if (item.transformer) return item.transformer(value);
+
+			// Prevent from passing other options als value for option
+			if (value && typeof value === 'string' && value.startsWith('-') && optionNames.includes(value)) return undefined;
+
+			if (item.type === 'boolean') {
+				if (value === undefined) return true;
+				if (value === 'true') return true;
+				if (value === 'false') return false;
+				return Boolean(value);
+			}
+
+			if (item.type === 'array') {
+				if (typeof value === 'string' && value.includes(',')) {
+					return value.split(',').map((v) => v.trim());
 				}
-			},
-			choices: item.name === 'service' && isGUI ? undefined : (item.choices as unknown as Choices)
+
+				if (typeof value === 'string' && value.includes(' ')) {
+					return value.split(' ').map((v) => v.trim());
+				}
+
+				return Array.isArray(value) ? value : [value];
+			}
+
+			if (item.type === 'number') {
+				const num = Number(value);
+				return Number.isFinite(num) ? num : 0;
+			}
+
+			if (item.type === 'string') {
+				if (value === undefined) return undefined;
+				return value;
+			}
+
+			if (item.choices && !(isGUI && item.name === 'service')) {
+				if (!item.choices.includes(value)) {
+					console.error(`Invalid value '${value}' for --${item.name}. Allowed: ${item.choices.join(', ')}`);
+					process.exit(1);
+				}
+			}
+			return value;
 		});
 
-	// Custom logic for suggesting corrections for misspelled options
-	argv.middleware((argv: Record<string, any>) => {
-		// List of valid options
-		const validOptions = [...args.map((a) => a.name), ...(args.map((a) => a.alias).filter((alias) => alias !== undefined) as string[])];
-		const unknownOptions = Object.keys(argv).filter((key) => !validOptions.includes(key) && key !== '_' && key !== '$0'); // Filter out known options
+		program.addOption(option);
+	}
 
-		const suggestedOptions: Record<string, boolean> = {};
-		unknownOptions.forEach((actualOption) => {
-			const closestOption = validOptions.find((option) => {
-				const levenVal = leven(option, actualOption);
-				return levenVal <= 2 && levenVal > 0;
+	// Custom logic for suggesting corrections for misspelled options
+	program.hook('preAction', (_, command) => {
+		const used = command.parent?.args || [];
+
+		const validOptions = [...args.map((a) => a.name), ...args.map((a) => a.alias).filter((a): a is string => a !== undefined)];
+
+		const unknownOptions = used.filter((arg) => arg.startsWith('-'));
+		const suggestions: Record<string, boolean> = {};
+
+		unknownOptions.forEach((opt) => {
+			const cleaned = opt.replace(/^-+/, '');
+
+			const closest = validOptions.find((vo) => {
+				const dist = leven(vo, cleaned);
+				return dist <= 2 && dist > 0;
 			});
 
-			if (closestOption && !suggestedOptions[closestOption]) {
-				suggestedOptions[closestOption] = true;
-				console.info(`Unknown option ${actualOption}, did you mean ${closestOption}?`);
-			} else if (!suggestedOptions[actualOption]) {
-				suggestedOptions[actualOption] = true;
-				console.info(`Unknown option ${actualOption}`);
+			if (closest && !suggestions[closest]) {
+				console.info(`Unknown option ${opt}, did you mean --${closest}?`);
+				suggestions[closest] = true;
+			} else if (!suggestions[cleaned]) {
+				console.info(`Unknown option ${opt}`);
+				suggestions[cleaned] = true;
 			}
 		});
 	});
-	return argv as unknown as yargs.Argv<typeof argvC>;
+
+	return program;
 };

modules/module.args.ts

@@ -295,8 +295,7 @@ const args: TAppArg<boolean | number | string | unknown[]>[] = [
 		alias: 'cs',
 		service: ['crunchy'],
 		type: 'string',
-		describe:
-			'(Please use --vstream and --astream instead, this will deprecate soon) Select a specific Crunchyroll playback endpoint by device. Since Crunchyroll has started rolling out their new VBR encodes, we highly recommend using a TV endpoint (e.g. vidaa, samsungtv, lgtv, rokutv, chromecast, firetv, androidtv) to access the old CBR encodes. Please note: The older encodes do not include the new 192 kbps audio, the new audio is only available with the new VBR encodes.',
+		describe: '(Please use --vstream and --astream instead, this will deprecate soon)',
 		choices: [...Object.keys(CrunchyVideoPlayStreams), 'none'],
 		docDescribe: true,
 		usage: '${device}'
@@ -307,7 +306,7 @@ const args: TAppArg<boolean | number | string | unknown[]>[] = [
 		alias: 'vs',
 		service: ['crunchy'],
 		type: 'string',
-		describe: 'Select a specific Crunchyroll video playback endpoint by device.',
+		describe: 'Select a specific Crunchyroll video playback endpoint by device. androidtv provides the best video (CBR).',
 		choices: [...Object.keys(CrunchyVideoPlayStreams), 'none'],
 		default: {
 			default: 'androidtv'
@@ -321,7 +320,7 @@ const args: TAppArg<boolean | number | string | unknown[]>[] = [
 		alias: 'as',
 		service: ['crunchy'],
 		type: 'string',
-		describe: 'Select a specific Crunchyroll audio playback endpoint by device.',
+		describe: 'Select a specific Crunchyroll audio playback endpoint by device. android provides the best audio (192 kbps).',
 		choices: [...Object.keys(CrunchyAudioPlayStreams), 'none'],
 		default: {
 			default: 'android'
@@ -469,6 +468,19 @@ const args: TAppArg<boolean | number | string | unknown[]>[] = [
 			default: true
 		}
 	},
+	{
+		name: 'subtitleTimestampFix',
+		group: 'dl',
+		describe:
+			'Fixes subtitle dialogues that go over the video length (deletes dialogues where start is over video length and updates the end timestamp when end is over video length).',
+		docDescribe: true,
+		service: ['crunchy'],
+		type: 'boolean',
+		usage: '',
+		default: {
+			default: false
+		}
+	},
 	{
 		name: 'novids',
 		group: 'dl',
@@ -1017,7 +1029,7 @@ const args: TAppArg<boolean | number | string | unknown[]>[] = [
 	},
 	{
 		name: 'proxy',
-		describe: 'Uses Proxy on geo-restricted or geo-defining endpoints (e.g. socks5://127.0.0.1:1080 or http://127.0.0.1:1080)',
+		describe: 'Uses Proxy on geo-restricted or geo-defining endpoints (e.g. https://127.0.0.1:1080 or http://127.0.0.1:1080)',
 		docDescribe: true,
 		group: 'util',
 		service: ['all'],

modules/module.cfg-loader.ts

@@ -1,6 +1,6 @@
 import path from 'path';
 import yaml from 'yaml';
-import fs from 'fs-extra';
+import fs from 'fs';
 import { lookpath } from 'lookpath';
 import { console } from './log';
 import { GuiState } from '../@types/messageHandler';
@@ -37,7 +37,7 @@ const tokenFile = {
 };
 
 export const ensureConfig = () => {
-	if (!fs.existsSync(path.join(workingDir, 'config'))) fs.mkdirSync(path.join(workingDir, 'config'));
+	if (!fs.existsSync(path.join(workingDir, 'config'))) fs.mkdirSync(path.join(workingDir, 'config'), { recursive: true });
 	if (process.env.contentDirectory)
 		[binCfgFile, dirCfgFile, cliCfgFile, guiCfgFile].forEach((a) => {
 			if (!fs.existsSync(`${a}.yml`)) fs.copyFileSync(path.join(__dirname, '..', 'config', `${path.basename(a)}.yml`), `${a}.yml`);
@@ -66,7 +66,7 @@ export type WriteObjects = {
 
 const writeYamlCfgFile = <T extends keyof WriteObjects>(file: T, data: WriteObjects[T]) => {
 	const fn = path.join(workingDir, 'config', `${file}.yml`);
-	if (fs.existsSync(fn)) fs.removeSync(fn);
+	if (fs.existsSync(fn)) fs.unlinkSync(fn);
 	fs.writeFileSync(fn, yaml.stringify(data));
 };
 
@@ -85,7 +85,6 @@ export type ConfigObject = {
 	bin: {
 		ffmpeg?: string;
 		mkvmerge?: string;
-		ffprobe?: string;
 		mp4decrypt?: string;
 		shaka?: string;
 	};
@@ -131,7 +130,7 @@ const loadCfg = (): ConfigObject => {
 	}
 	if (!fs.existsSync(defaultCfg.dir.content)) {
 		try {
-			fs.ensureDirSync(defaultCfg.dir.content);
+			fs.mkdirSync(defaultCfg.dir.content, { recursive: true });
 		} catch (e) {
 			console.error('Content directory not accessible!');
 			return defaultCfg;
@@ -150,7 +149,6 @@ const loadBinCfg = async () => {
 	const defaultBin = {
 		ffmpeg: 'ffmpeg',
 		mkvmerge: 'mkvmerge',
-		ffprobe: 'ffprobe',
 		mp4decrypt: 'mp4decrypt',
 		shaka: 'shaka-packager'
 	};
@@ -192,7 +190,7 @@ const loadCRSession = () => {
 const saveCRSession = (data: Record<string, unknown>) => {
 	const cfgFolder = path.dirname(sessCfgFile.cr);
 	try {
-		fs.ensureDirSync(cfgFolder);
+		fs.mkdirSync(cfgFolder, { recursive: true });
 		fs.writeFileSync(`${sessCfgFile.cr}.yml`, yaml.stringify(data));
 	} catch (e) {
 		console.error("Can't save session file to disk!");
@@ -210,7 +208,7 @@ const loadCRToken = () => {
 const saveCRToken = (data: Record<string, unknown>) => {
 	const cfgFolder = path.dirname(tokenFile.cr);
 	try {
-		fs.ensureDirSync(cfgFolder);
+		fs.mkdirSync(cfgFolder, { recursive: true });
 		fs.writeFileSync(`${tokenFile.cr}.yml`, yaml.stringify(data));
 	} catch (e) {
 		console.error("Can't save token file to disk!");
@@ -228,7 +226,7 @@ const loadADNToken = () => {
 const saveADNToken = (data: Record<string, unknown>) => {
 	const cfgFolder = path.dirname(tokenFile.adn);
 	try {
-		fs.ensureDirSync(cfgFolder);
+		fs.mkdirSync(cfgFolder, { recursive: true });
 		fs.writeFileSync(`${tokenFile.adn}.yml`, yaml.stringify(data));
 	} catch (e) {
 		console.error("Can't save token file to disk!");
@@ -251,7 +249,7 @@ const loadHDSession = () => {
 const saveHDSession = (data: Record<string, unknown>) => {
 	const cfgFolder = path.dirname(sessCfgFile.hd);
 	try {
-		fs.ensureDirSync(cfgFolder);
+		fs.mkdirSync(cfgFolder, { recursive: true });
 		fs.writeFileSync(`${sessCfgFile.hd}.yml`, yaml.stringify(data));
 	} catch (e) {
 		console.error("Can't save session file to disk!");
@@ -269,7 +267,7 @@ const loadHDToken = () => {
 const saveHDToken = (data: Record<string, unknown>) => {
 	const cfgFolder = path.dirname(tokenFile.hd);
 	try {
-		fs.ensureDirSync(cfgFolder);
+		fs.mkdirSync(cfgFolder, { recursive: true });
 		fs.writeFileSync(`${tokenFile.hd}.yml`, yaml.stringify(data));
 	} catch (e) {
 		console.error("Can't save token file to disk!");
@@ -279,7 +277,7 @@ const saveHDToken = (data: Record<string, unknown>) => {
 const saveHDProfile = (data: Record<string, unknown>) => {
 	const cfgFolder = path.dirname(hdPflCfgFile);
 	try {
-		fs.ensureDirSync(cfgFolder);
+		fs.mkdirSync(cfgFolder, { recursive: true });
 		fs.writeFileSync(`${hdPflCfgFile}.yml`, yaml.stringify(data));
 	} catch (e) {
 		console.error("Can't save profile file to disk!");
@@ -318,7 +316,7 @@ const loadNewHDToken = () => {
 const saveNewHDToken = (data: Record<string, unknown>) => {
 	const cfgFolder = path.dirname(tokenFile.hdNew);
 	try {
-		fs.ensureDirSync(cfgFolder);
+		fs.mkdirSync(cfgFolder, { recursive: true });
 		fs.writeFileSync(`${tokenFile.hdNew}.yml`, yaml.stringify(data));
 	} catch (e) {
 		console.error("Can't save token file to disk!");

modules/module.fetch.ts

@@ -1,7 +1,6 @@
 import * as yamlCfg from './module.cfg-loader';
 import * as yargs from './module.app-args';
 import { console } from './log';
-import { connect } from 'puppeteer-real-browser';
 import { argvC } from './module.app-args';
 import { ProxyAgent, fetch, RequestInit } from 'undici';
 
@@ -30,13 +29,13 @@ type GetDataResponse = {
 		};
 };
 
-function hasDisplay(): boolean {
-	if (process.platform === 'linux') {
-		return !!process.env.DISPLAY || !!process.env.WAYLAND_DISPLAY;
-	}
-	// Win and Mac true by default
-	return true;
-}
+// function hasDisplay(): boolean {
+// 	if (process.platform === 'linux') {
+// 		return !!process.env.DISPLAY || !!process.env.WAYLAND_DISPLAY;
+// 	}
+// 	// Win and Mac true by default
+// 	return true;
+// }
 
 // req
 export class Req {
@@ -85,36 +84,38 @@ export class Req {
 				const body = await res.text();
 				const docTitle = body.match(/<title>(.*)<\/title>/);
 				if (body && docTitle) {
-					if (docTitle[1] === 'Just a moment...' && durl.includes('crunchyroll') && hasDisplay()) {
-						console.warn('Cloudflare triggered, trying to get cookies...');
+					// if (docTitle[1] === 'Just a moment...' && durl.includes('crunchyroll') && hasDisplay()) {
+					// 	console.warn('Cloudflare triggered, trying to get cookies...');
 
-						const { page } = await connect({
-							headless: false,
-							turnstile: true
-						});
+					// 	const { page } = await connect({
+					// 		headless: false,
+					// 		turnstile: true
+					// 	});
 
-						await page.goto('https://www.crunchyroll.com/', {
-							waitUntil: 'networkidle2'
-						});
+					// 	await page.goto('https://www.crunchyroll.com/', {
+					// 		waitUntil: 'networkidle2'
+					// 	});
 
-						await page.waitForRequest('https://www.crunchyroll.com/auth/v1/token');
+					// 	await page.waitForRequest('https://www.crunchyroll.com/auth/v1/token');
 
-						const cookies = await page.cookies();
+					// 	const cookies = await page.cookies();
 
-						await page.close();
+					// 	await page.close();
 
-						params.headers = {
-							...params.headers,
-							Cookie: cookies.map((c) => `${c.name}=${c.value}`).join('; '),
-							'Set-Cookie': cookies.map((c) => `${c.name}=${c.value}`).join('; ')
-						};
+					// 	params.headers = {
+					// 		...params.headers,
+					// 		Cookie: cookies.map((c) => `${c.name}=${c.value}`).join('; '),
+					// 		'Set-Cookie': cookies.map((c) => `${c.name}=${c.value}`).join('; ')
+					// 	};
 
-						(params as any).headers['User-Agent'] = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36';
+					// 	(params as any).headers['User-Agent'] = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36';
 
-						return await this.getData(durl, params);
-					} else {
-						console.error(docTitle[1]);
-					}
+					// 	return await this.getData(durl, params);
+					// } else {
+					// 	console.error(docTitle[1]);
+					// }
+
+					console.error(docTitle[1]);
 				} else {
 					console.error(body);
 				}
@@ -159,7 +160,7 @@ export class Req {
 
 			if (!url.hostname) return false;
 
-			if (!['http:', 'https:', 'socks4:', 'socks5:'].includes(url.protocol)) {
+			if (!['http:', 'https:'].includes(url.protocol)) {
 				return false;
 			}
 

modules/module.merger.ts

@@ -1,14 +1,14 @@
 import * as iso639 from 'iso-639';
-import * as yamlCfg from './module.cfg-loader';
 import { fontFamilies, fontMime } from './module.fontsData';
 import path from 'path';
 import fs from 'fs';
+import fsp from 'fs/promises';
 import { LanguageItem } from './module.langsData';
 import { AvailableMuxer } from './module.args';
 import { console } from './log';
-import ffprobe from 'ffprobe';
 import Helper from './module.helper';
 import { convertChaptersToFFmpegFormat } from './module.ffmpegChapter';
+import { mediaInfoFactory } from 'mediainfo.js';
 
 export type MergerInput = {
 	path: string;
@@ -67,13 +67,26 @@ class Merger {
 	public async createDelays() {
 		//Don't bother scanning it if there is only 1 vna stream
 		if (this.options.videoAndAudio.length > 1) {
-			const bin = await yamlCfg.loadBinCfg();
 			const vnas = this.options.videoAndAudio;
 			//get and set durations on each videoAndAudio Stream
 			for (const [vnaIndex, vna] of vnas.entries()) {
-				const streamInfo = await ffprobe(vna.path, { path: bin.ffprobe as string });
-				const videoInfo = streamInfo.streams.filter((stream) => stream.codec_type == 'video');
-				vnas[vnaIndex].duration = parseInt(videoInfo[0].duration as string);
+				const file = await fsp.open(vna.path);
+				const { size } = await fsp.stat(vna.path);
+
+				// Mediainfo
+				const mediaInfo = await mediaInfoFactory();
+				const result = await mediaInfo.analyzeData(
+					() => size,
+					async (size, offset) => {
+						const buf = Buffer.alloc(size);
+						const { bytesRead } = await file.read(buf, 0, size, offset);
+						return buf.subarray(0, bytesRead);
+					}
+				);
+				await file.close();
+
+				const videoInfo = result?.media?.track?.filter((stream) => stream['@type'] == 'Video');
+				vnas[vnaIndex].duration = videoInfo?.[0].Duration;
 			}
 			//Sort videoAndAudio streams by duration (shortest first)
 			vnas.sort((a, b) => {

modules/module.transform-mpd.ts

@@ -229,7 +229,3 @@ export async function parse(manifest: string, language?: LanguageItem, url?: str
 
 	return ret;
 }
-
-function arrayBufferToBase64(buffer: Uint8Array): string {
-	return Buffer.from(buffer).toString('base64');
-}

modules/module.updater.ts

@@ -1,11 +1,10 @@
-import fs from 'fs';
 import { GithubTag, TagCompare } from '../@types/github';
 import path from 'path';
 import { UpdateFile } from '../@types/updateFile';
 import packageJson from '../package.json';
 import { CompilerOptions, transpileModule } from 'typescript';
 import tsConfig from '../tsconfig.json';
-import fsextra from 'fs-extra';
+import fs from 'fs';
 import { workingDir } from './module.cfg-loader';
 import { console } from './log';
 import Helper from './module.helper';
@@ -142,7 +141,7 @@ export default async (force = false) => {
 
 		changesToApply.forEach((a) => {
 			try {
-				fsextra.ensureDirSync(path.dirname(a.path));
+				fs.mkdirSync(path.dirname(a.path), { recursive: true });
 				fs.writeFileSync(path.join(__dirname, '..', a.path), a.content);
 				console.info('✓ Written %s', a.path);
 			} catch (er) {

modules/playready/bcert.ts

@@ -1,450 +0,0 @@
-import * as fs from 'fs';
-import { createHash } from 'crypto';
-import { Parser } from 'binary-parser-encoder';
-import ECCKey from './ecc_key';
-import { console } from '../log';
-
-function alignUp(length: number, alignment: number): number {
-	return Math.ceil(length / alignment) * alignment;
-}
-
-export class BCertStructs {
-	static DrmBCertBasicInfo = new Parser()
-		.buffer('cert_id', { length: 16 })
-		.uint32be('security_level')
-		.uint32be('flags')
-		.uint32be('cert_type')
-		.buffer('public_key_digest', { length: 32 })
-		.uint32be('expiration_date')
-		.buffer('client_id', { length: 16 });
-
-	static DrmBCertDomainInfo = new Parser()
-		.buffer('service_id', { length: 16 })
-		.buffer('account_id', { length: 16 })
-		.uint32be('revision_timestamp')
-		.uint32be('domain_url_length')
-		.buffer('domain_url', {
-			length: function () {
-				return alignUp((this as any).domain_url_length, 4);
-			}
-		});
-
-	static DrmBCertPCInfo = new Parser().uint32be('security_version');
-
-	static DrmBCertDeviceInfo = new Parser().uint32be('max_license').uint32be('max_header').uint32be('max_chain_depth');
-
-	static DrmBCertFeatureInfo = new Parser().uint32be('feature_count').array('features', {
-		type: 'uint32be',
-		length: 'feature_count'
-	});
-
-	static CertKey = new Parser()
-		.uint16be('type')
-		.uint16be('length')
-		.uint32be('flags')
-		.buffer('key', {
-			length: function () {
-				return (this as any).length / 8;
-			}
-		})
-		.uint32be('usages_count')
-		.array('usages', {
-			type: 'uint32be',
-			length: 'usages_count'
-		});
-
-	static DrmBCertKeyInfo = new Parser().uint32be('key_count').array('cert_keys', {
-		type: BCertStructs.CertKey,
-		length: 'key_count'
-	});
-
-	static DrmBCertManufacturerInfo = new Parser()
-		.uint32be('flags')
-		.uint32be('manufacturer_name_length')
-		.buffer('manufacturer_name', {
-			length: function () {
-				return alignUp((this as any).manufacturer_name_length, 4);
-			}
-		})
-		.uint32be('model_name_length')
-		.buffer('model_name', {
-			length: function () {
-				return alignUp((this as any).model_name_length, 4);
-			}
-		})
-		.uint32be('model_number_length')
-		.buffer('model_number', {
-			length: function () {
-				return alignUp((this as any).model_number_length, 4);
-			}
-		});
-
-	static DrmBCertSignatureInfo = new Parser()
-		.uint16be('signature_type')
-		.uint16be('signature_size')
-		.buffer('signature', { length: 'signature_size' })
-		.uint32be('signature_key_size')
-		.buffer('signature_key', {
-			length: function () {
-				return (this as any).signature_key_size / 8;
-			}
-		});
-
-	static DrmBCertSilverlightInfo = new Parser().uint32be('security_version').uint32be('platform_identifier');
-
-	static DrmBCertMeteringInfo = new Parser()
-		.buffer('metering_id', { length: 16 })
-		.uint32be('metering_url_length')
-		.buffer('metering_url', {
-			length: function () {
-				return alignUp((this as any).metering_url_length, 4);
-			}
-		});
-
-	static DrmBCertExtDataSignKeyInfo = new Parser()
-		.uint16be('key_type')
-		.uint16be('key_length')
-		.uint32be('flags')
-		.buffer('key', {
-			length: function () {
-				return (this as any).length / 8;
-			}
-		});
-
-	static BCertExtDataRecord = new Parser().uint32be('data_size').buffer('data', {
-		length: 'data_size'
-	});
-
-	static DrmBCertExtDataSignature = new Parser().uint16be('signature_type').uint16be('signature_size').buffer('signature', {
-		length: 'signature_size'
-	});
-
-	static BCertExtDataContainer = new Parser()
-		.uint32be('record_count')
-		.array('records', {
-			length: 'record_count',
-			type: BCertStructs.BCertExtDataRecord
-		})
-		.nest('signature', {
-			type: BCertStructs.DrmBCertExtDataSignature
-		});
-
-	static DrmBCertServerInfo = new Parser().uint32be('warning_days');
-
-	static DrmBcertSecurityVersion = new Parser().uint32be('security_version').uint32be('platform_identifier');
-
-	static Attribute = new Parser()
-		.uint16be('flags')
-		.uint16be('tag')
-		.uint32be('length')
-		.choice('attribute', {
-			tag: 'tag',
-			choices: {
-				1: BCertStructs.DrmBCertBasicInfo,
-				2: BCertStructs.DrmBCertDomainInfo,
-				3: BCertStructs.DrmBCertPCInfo,
-				4: BCertStructs.DrmBCertDeviceInfo,
-				5: BCertStructs.DrmBCertFeatureInfo,
-				6: BCertStructs.DrmBCertKeyInfo,
-				7: BCertStructs.DrmBCertManufacturerInfo,
-				8: BCertStructs.DrmBCertSignatureInfo,
-				9: BCertStructs.DrmBCertSilverlightInfo,
-				10: BCertStructs.DrmBCertMeteringInfo,
-				11: BCertStructs.DrmBCertExtDataSignKeyInfo,
-				12: BCertStructs.BCertExtDataContainer,
-				13: BCertStructs.DrmBCertExtDataSignature,
-				14: new Parser().buffer('data', {
-					length: function () {
-						return (this as any).length - 8;
-					}
-				}),
-				15: BCertStructs.DrmBCertServerInfo,
-				16: BCertStructs.DrmBcertSecurityVersion,
-				17: BCertStructs.DrmBcertSecurityVersion
-			},
-			defaultChoice: new Parser().buffer('data', {
-				length: function () {
-					return (this as any).length - 8;
-				}
-			})
-		});
-
-	static BCert = new Parser()
-		.string('signature', { length: 4, assert: 'CERT' })
-		.int32be('version')
-		.int32be('total_length')
-		.int32be('certificate_length')
-		.array('attributes', {
-			type: BCertStructs.Attribute,
-			lengthInBytes: function () {
-				return (this as any).total_length - 16;
-			}
-		});
-
-	static BCertChain = new Parser()
-		.string('signature', { length: 4, assert: 'CHAI' })
-		.int32be('version')
-		.int32be('total_length')
-		.int32be('flags')
-		.int32be('certificate_count')
-		.array('certificates', {
-			type: BCertStructs.BCert,
-			length: 'certificate_count'
-		});
-}
-
-export class Certificate {
-	parsed: any;
-	_BCERT: Parser;
-
-	constructor(parsed_bcert: any, bcert_obj: Parser = BCertStructs.BCert) {
-		this.parsed = parsed_bcert;
-		this._BCERT = bcert_obj;
-	}
-
-	// UNSTABLE
-	static new_leaf_cert(
-		cert_id: Buffer,
-		security_level: number,
-		client_id: Buffer,
-		signing_key: ECCKey,
-		encryption_key: ECCKey,
-		group_key: ECCKey,
-		parent: CertificateChain,
-		expiry: number = 0xffffffff,
-		max_license: number = 10240,
-		max_header: number = 15360,
-		max_chain_depth: number = 2
-	): Certificate {
-		const basic_info = {
-			cert_id: cert_id,
-			security_level: security_level,
-			flags: 0,
-			cert_type: 2,
-			public_key_digest: signing_key.publicSha256Digest(),
-			expiration_date: expiry,
-			client_id: client_id
-		};
-		const basic_info_attribute = {
-			flags: 1,
-			tag: 1,
-			length: BCertStructs.DrmBCertBasicInfo.encode(basic_info).length + 8,
-			attribute: basic_info
-		};
-
-		const device_info = {
-			max_license: max_license,
-			max_header: max_header,
-			max_chain_depth: max_chain_depth
-		};
-
-		const device_info_attribute = {
-			flags: 1,
-			tag: 4,
-			length: BCertStructs.DrmBCertDeviceInfo.encode(device_info).length + 8,
-			attribute: device_info
-		};
-
-		const feature = {
-			feature_count: 3,
-			features: [4, 9, 13]
-		};
-		const feature_attribute = {
-			flags: 1,
-			tag: 5,
-			length: BCertStructs.DrmBCertFeatureInfo.encode(feature).length + 8,
-			attribute: feature
-		};
-
-		const cert_key_sign = {
-			type: 1,
-			length: 512, // bits
-			flags: 0,
-			key: signing_key.privateBytes(),
-			usages_count: 1,
-			usages: [1]
-		};
-		const cert_key_encrypt = {
-			type: 1,
-			length: 512, // bits
-			flags: 0,
-			key: encryption_key.privateBytes(),
-			usages_count: 1,
-			usages: [2]
-		};
-		const key_info = {
-			key_count: 2,
-			cert_keys: [cert_key_sign, cert_key_encrypt]
-		};
-		const key_info_attribute = {
-			flags: 1,
-			tag: 6,
-			length: BCertStructs.DrmBCertKeyInfo.encode(key_info).length + 8,
-			attribute: key_info
-		};
-
-		const manufacturer_info = parent.get_certificate(0).get_attribute(7);
-
-		const new_bcert_container = {
-			signature: 'CERT',
-			version: 1,
-			total_length: 0,
-			certificate_length: 0,
-			attributes: [basic_info_attribute, device_info_attribute, feature_attribute, key_info_attribute, manufacturer_info]
-		};
-
-		let payload = BCertStructs.BCert.encode(new_bcert_container);
-		new_bcert_container.certificate_length = payload.length;
-		new_bcert_container.total_length = payload.length + 144;
-		payload = BCertStructs.BCert.encode(new_bcert_container);
-
-		const hash = createHash('sha256');
-		hash.update(payload);
-		const digest = hash.digest();
-
-		const signatureObj = group_key.keyPair.sign(digest);
-		const r = Buffer.from(signatureObj.r.toArray('be', 32));
-		const s = Buffer.from(signatureObj.s.toArray('be', 32));
-		const signature = Buffer.concat([r, s]);
-
-		const signature_info = {
-			signature_type: 1,
-			signature_size: 64,
-			signature: signature,
-			signature_key_size: 512, // bits
-			signature_key: group_key.publicBytes()
-		};
-		const signature_info_attribute = {
-			flags: 1,
-			tag: 8,
-			length: BCertStructs.DrmBCertSignatureInfo.encode(signature_info).length + 8,
-			attribute: signature_info
-		};
-		new_bcert_container.attributes.push(signature_info_attribute);
-
-		return new Certificate(new_bcert_container);
-	}
-
-	static loads(data: string | Buffer): Certificate {
-		if (typeof data === 'string') {
-			data = Buffer.from(data, 'base64');
-		}
-		if (!Buffer.isBuffer(data)) {
-			throw new Error(`Expecting Bytes or Base64 input, got ${data}`);
-		}
-
-		const cert = BCertStructs.BCert;
-		const parsed_bcert = cert.parse(data);
-		return new Certificate(parsed_bcert, cert);
-	}
-
-	static load(filePath: string): Certificate {
-		const data = fs.readFileSync(filePath);
-		return Certificate.loads(data);
-	}
-
-	get_attribute(type_: number) {
-		for (const attribute of this.parsed.attributes) {
-			if (attribute.tag === type_) {
-				return attribute;
-			}
-		}
-	}
-
-	get_security_level(): number {
-		const basic_info_attribute = this.get_attribute(1);
-		if (basic_info_attribute) {
-			return basic_info_attribute.attribute.security_level;
-		}
-		return 0;
-	}
-
-	private static _unpad(name: Buffer): string {
-		return name.toString('utf8').replace(/\0+$/, '');
-	}
-
-	get_name(): string {
-		const manufacturer_info_attribute = this.get_attribute(7);
-		if (manufacturer_info_attribute) {
-			const manufacturer_info = manufacturer_info_attribute.attribute;
-			const manufacturer_name = Certificate._unpad(manufacturer_info.manufacturer_name);
-			const model_name = Certificate._unpad(manufacturer_info.model_name);
-			const model_number = Certificate._unpad(manufacturer_info.model_number);
-			return `${manufacturer_name} ${model_name} ${model_number}`;
-		}
-		return '';
-	}
-
-	dumps(): Buffer {
-		return this._BCERT.encode(this.parsed);
-	}
-
-	struct(): Parser {
-		return this._BCERT;
-	}
-}
-
-export class CertificateChain {
-	parsed: any;
-	_BCERT_CHAIN: Parser;
-
-	constructor(parsed_bcert_chain: any, bcert_chain_obj: Parser = BCertStructs.BCertChain) {
-		this.parsed = parsed_bcert_chain;
-		this._BCERT_CHAIN = bcert_chain_obj;
-	}
-
-	static loads(data: string | Buffer): CertificateChain {
-		if (typeof data === 'string') {
-			data = Buffer.from(data, 'base64');
-		}
-		if (!Buffer.isBuffer(data)) {
-			throw new Error(`Expecting Bytes or Base64 input, got ${data}`);
-		}
-
-		const cert_chain = BCertStructs.BCertChain;
-		try {
-			const parsed_bcert_chain = cert_chain.parse(data);
-			return new CertificateChain(parsed_bcert_chain, cert_chain);
-		} catch (error) {
-			console.error('Error during parsing:', error);
-			throw error;
-		}
-	}
-
-	static load(filePath: string): CertificateChain {
-		const data = fs.readFileSync(filePath);
-		return CertificateChain.loads(data);
-	}
-
-	dumps(): Buffer {
-		return this._BCERT_CHAIN.encode(this.parsed);
-	}
-
-	struct(): Parser {
-		return this._BCERT_CHAIN;
-	}
-
-	get_certificate(index: number): Certificate {
-		return new Certificate(this.parsed.certificates[index]);
-	}
-
-	get_security_level(): number {
-		return this.get_certificate(0).get_security_level();
-	}
-
-	get_name(): string {
-		return this.get_certificate(0).get_name();
-	}
-
-	append(bcert: Certificate): void {
-		this.parsed.certificate_count += 1;
-		this.parsed.certificates.push(bcert.parsed);
-		this.parsed.total_length += bcert.dumps().length;
-	}
-
-	prepend(bcert: Certificate): void {
-		this.parsed.certificate_count += 1;
-		this.parsed.certificates.unshift(bcert.parsed);
-		this.parsed.total_length += bcert.dumps().length;
-	}
-}

modules/playready/cdm.ts

@@ -1,228 +0,0 @@
-import { CertificateChain } from './bcert';
-import ECCKey from './ecc_key';
-import ElGamal, { Point } from './elgamal';
-import XmlKey from './xml_key';
-import { Key } from './key';
-import { XmrUtil } from './xmrlicense';
-import crypto from 'crypto';
-import { randomBytes } from 'crypto';
-import { createHash } from 'crypto';
-import elliptic from 'elliptic';
-import { Device } from './device';
-import { XMLParser } from 'fast-xml-parser';
-
-export default class Cdm {
-	security_level: number;
-	certificate_chain: CertificateChain;
-	encryption_key: ECCKey;
-	signing_key: ECCKey;
-	client_version: string;
-	la_version: number;
-
-	curve: elliptic.ec;
-	elgamal: ElGamal;
-
-	private wmrm_key: elliptic.ec.KeyPair;
-	private xml_key: XmlKey;
-
-	constructor(
-		security_level: number,
-		certificate_chain: CertificateChain,
-		encryption_key: ECCKey,
-		signing_key: ECCKey,
-		client_version: string = '2.4.117.27',
-		la_version: number = 1
-	) {
-		this.security_level = security_level;
-		this.certificate_chain = certificate_chain;
-		this.encryption_key = encryption_key;
-		this.signing_key = signing_key;
-		this.client_version = client_version;
-		this.la_version = la_version;
-
-		this.curve = new elliptic.ec('p256');
-		this.elgamal = new ElGamal(this.curve);
-
-		const x = 'c8b6af16ee941aadaa5389b4af2c10e356be42af175ef3face93254e7b0b3d9b';
-		const y = '982b27b5cb2341326e56aa857dbfd5c634ce2cf9ea74fca8f2af5957efeea562';
-		this.wmrm_key = this.curve.keyFromPublic({ x, y }, 'hex');
-		this.xml_key = new XmlKey();
-	}
-
-	static fromDevice(device: Device): Cdm {
-		return new Cdm(device.security_level, device.group_certificate, device.encryption_key, device.signing_key);
-	}
-
-	private getKeyData(): Buffer {
-		const messagePoint = this.xml_key.getPoint(this.elgamal.curve);
-		const [point1, point2] = this.elgamal.encrypt(messagePoint, this.wmrm_key.getPublic() as Point);
-
-		const bufferArray = Buffer.concat([ElGamal.toBytes(point1.getX()), ElGamal.toBytes(point1.getY()), ElGamal.toBytes(point2.getX()), ElGamal.toBytes(point2.getY())]);
-
-		return bufferArray;
-	}
-
-	private getCipherData(): Buffer {
-		const b64_chain = this.certificate_chain.dumps().toString('base64');
-		const body = `<Data><CertificateChains><CertificateChain>${b64_chain}</CertificateChain></CertificateChains><Features><Feature Name="AESCBC"></Feature></Features></Data>`;
-
-		const cipher = crypto.createCipheriv('aes-128-cbc', this.xml_key.aesKey, this.xml_key.aesIv);
-
-		const ciphertext = Buffer.concat([cipher.update(Buffer.from(body, 'utf-8')), cipher.final()]);
-
-		return Buffer.concat([this.xml_key.aesIv, ciphertext]);
-	}
-
-	private buildDigestContent(content_header: string, nonce: string, wmrm_cipher: string, cert_cipher: string): string {
-		const clientTime = Math.floor(Date.now() / 1000);
-
-		return (
-			'<LA xmlns="http://schemas.microsoft.com/DRM/2007/03/protocols" Id="SignedData" xml:space="preserve">' +
-			'<Version>4</Version>' +
-			`<ContentHeader>${content_header}</ContentHeader>` +
-			'<CLIENTINFO>' +
-			`<CLIENTVERSION>${this.client_version}</CLIENTVERSION>` +
-			'</CLIENTINFO>' +
-			`<LicenseNonce>${nonce}</LicenseNonce>` +
-			`<ClientTime>${clientTime}</ClientTime>` +
-			'<EncryptedData xmlns="http://www.w3.org/2001/04/xmlenc#" Type="http://www.w3.org/2001/04/xmlenc#Element">' +
-			'<EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"></EncryptionMethod>' +
-			'<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">' +
-			'<EncryptedKey xmlns="http://www.w3.org/2001/04/xmlenc#">' +
-			'<EncryptionMethod Algorithm="http://schemas.microsoft.com/DRM/2007/03/protocols#ecc256"></EncryptionMethod>' +
-			'<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">' +
-			'<KeyName>WMRMServer</KeyName>' +
-			'</KeyInfo>' +
-			'<CipherData>' +
-			`<CipherValue>${wmrm_cipher}</CipherValue>` +
-			'</CipherData>' +
-			'</EncryptedKey>' +
-			'</KeyInfo>' +
-			'<CipherData>' +
-			`<CipherValue>${cert_cipher}</CipherValue>` +
-			'</CipherData>' +
-			'</EncryptedData>' +
-			'</LA>'
-		);
-	}
-
-	private static buildSignedInfo(digest_value: string): string {
-		return (
-			'<SignedInfo xmlns="http://www.w3.org/2000/09/xmldsig#">' +
-			'<CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"></CanonicalizationMethod>' +
-			'<SignatureMethod Algorithm="http://schemas.microsoft.com/DRM/2007/03/protocols#ecdsa-sha256"></SignatureMethod>' +
-			'<Reference URI="#SignedData">' +
-			'<DigestMethod Algorithm="http://schemas.microsoft.com/DRM/2007/03/protocols#sha256"></DigestMethod>' +
-			`<DigestValue>${digest_value}</DigestValue>` +
-			'</Reference>' +
-			'</SignedInfo>'
-		);
-	}
-
-	getLicenseChallenge(content_header: string): string {
-		const nonce = randomBytes(16).toString('base64');
-		const wmrm_cipher = this.getKeyData().toString('base64');
-		const cert_cipher = this.getCipherData().toString('base64');
-
-		const la_content = this.buildDigestContent(content_header, nonce, wmrm_cipher, cert_cipher);
-
-		const la_hash = createHash('sha256').update(la_content, 'utf-8').digest();
-
-		const signed_info = Cdm.buildSignedInfo(la_hash.toString('base64'));
-		const signed_info_digest = createHash('sha256').update(signed_info, 'utf-8').digest();
-
-		const signatureObj = this.signing_key.keyPair.sign(signed_info_digest);
-
-		const r = signatureObj.r.toArrayLike(Buffer, 'be', 32);
-		const s = signatureObj.s.toArrayLike(Buffer, 'be', 32);
-
-		const rawSignature = Buffer.concat([r, s]);
-		const signatureValue = rawSignature.toString('base64');
-
-		const publicKeyBytes = this.signing_key.keyPair.getPublic().encode('array', false);
-		const publicKeyBuffer = Buffer.from(publicKeyBytes);
-		const publicKeyBase64 = publicKeyBuffer.toString('base64');
-
-		const main_body =
-			'<?xml version="1.0" encoding="utf-8"?>' +
-			'<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ' +
-			'xmlns:xsd="http://www.w3.org/2001/XMLSchema" ' +
-			'xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">' +
-			'<soap:Body>' +
-			'<AcquireLicense xmlns="http://schemas.microsoft.com/DRM/2007/03/protocols">' +
-			'<challenge>' +
-			'<Challenge xmlns="http://schemas.microsoft.com/DRM/2007/03/protocols/messages">' +
-			la_content +
-			'<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">' +
-			signed_info +
-			`<SignatureValue>${signatureValue}</SignatureValue>` +
-			'<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">' +
-			'<KeyValue>' +
-			'<ECCKeyValue>' +
-			`<PublicKey>${publicKeyBase64}</PublicKey>` +
-			'</ECCKeyValue>' +
-			'</KeyValue>' +
-			'</KeyInfo>' +
-			'</Signature>' +
-			'</Challenge>' +
-			'</challenge>' +
-			'</AcquireLicense>' +
-			'</soap:Body>' +
-			'</soap:Envelope>';
-
-		return main_body;
-	}
-
-	private decryptEcc256Key(encrypted_key: Buffer): Buffer {
-		const point1 = this.curve.curve.point(encrypted_key.subarray(0, 32).toString('hex'), encrypted_key.subarray(32, 64).toString('hex'));
-		const point2 = this.curve.curve.point(encrypted_key.subarray(64, 96).toString('hex'), encrypted_key.subarray(96, 128).toString('hex'));
-
-		const decrypted = ElGamal.decrypt([point1, point2], this.encryption_key.keyPair.getPrivate());
-		const decryptedBytes = decrypted.getX().toArray('be', 32).slice(16, 32);
-
-		return Buffer.from(decryptedBytes);
-	}
-
-	parseLicense(license: string | Buffer): {
-		key_id: string;
-		key_type: number;
-		cipher_type: number;
-		key_length: number;
-		key: string;
-	}[] {
-		try {
-			const parser = new XMLParser({
-				removeNSPrefix: true
-			});
-			const result = parser.parse(license);
-
-			let licenses = result['Envelope']['Body']['AcquireLicenseResponse']['AcquireLicenseResult']['Response']['LicenseResponse']['Licenses']['License'];
-
-			if (!Array.isArray(licenses)) {
-				licenses = [licenses];
-			}
-
-			const keys = [];
-
-			for (const licenseElement of licenses) {
-				const keyMaterial = XmrUtil.parse(Buffer.from(licenseElement, 'base64')).license.license.keyMaterial;
-
-				if (!keyMaterial || !keyMaterial.contentKey) throw new Error('No Content Keys retrieved');
-
-				keys.push(
-					new Key(
-						keyMaterial.contentKey.kid,
-						keyMaterial.contentKey.keyType,
-						keyMaterial.contentKey.ciphertype,
-						keyMaterial.contentKey.length,
-						this.decryptEcc256Key(keyMaterial.contentKey.value)
-					)
-				);
-			}
-
-			return keys;
-		} catch (error) {
-			throw new Error(`Unable to parse license, ${error}`);
-		}
-	}
-}

modules/playready/device.ts

@@ -1,124 +0,0 @@
-import { Parser } from 'binary-parser-encoder';
-import { CertificateChain } from './bcert';
-import ECCKey from './ecc_key';
-import * as fs from 'fs';
-
-type RawDeviceV2 = {
-	signature: string;
-	version: number;
-	group_certificate_length: number;
-	group_certificate: Buffer;
-	encryption_key: Buffer;
-	signing_key: Buffer;
-};
-
-class DeviceStructs {
-	static magic = 'PRD';
-
-	static v1 = new Parser()
-		.string('signature', { length: 3, assert: DeviceStructs.magic })
-		.uint8('version')
-		.uint32('group_key_length')
-		.buffer('group_key', { length: 'group_key_length' })
-		.uint32('group_certificate_length')
-		.buffer('group_certificate', { length: 'group_certificate_length' });
-
-	static v2 = new Parser()
-		.string('signature', { length: 3, assert: DeviceStructs.magic })
-		.uint8('version')
-		.uint32('group_certificate_length')
-		.buffer('group_certificate', { length: 'group_certificate_length' })
-		.buffer('encryption_key', { length: 96 })
-		.buffer('signing_key', { length: 96 });
-
-	static v3 = new Parser()
-		.string('signature', { length: 3, assert: DeviceStructs.magic })
-		.uint8('version')
-		.buffer('group_key', { length: 96 })
-		.buffer('encryption_key', { length: 96 })
-		.buffer('signing_key', { length: 96 })
-		.uint32('group_certificate_length')
-		.buffer('group_certificate', { length: 'group_certificate_length' });
-}
-
-export class Device {
-	static CURRENT_STRUCT = DeviceStructs.v3;
-
-	group_certificate: CertificateChain;
-	encryption_key: ECCKey;
-	signing_key: ECCKey;
-	security_level: number;
-
-	constructor(parsedData: RawDeviceV2) {
-		this.group_certificate = CertificateChain.loads(parsedData.group_certificate);
-		this.encryption_key = ECCKey.loads(parsedData.encryption_key);
-		this.signing_key = ECCKey.loads(parsedData.signing_key);
-		this.security_level = this.group_certificate.get_security_level();
-	}
-
-	static loads(data: Buffer): Device {
-		const parsedData = Device.CURRENT_STRUCT.parse(data);
-		return new Device(parsedData);
-	}
-
-	static load(filePath: string): Device {
-		const data = fs.readFileSync(filePath);
-		return Device.loads(data);
-	}
-
-	dumps(): Buffer {
-		const groupCertBytes = this.group_certificate.dumps();
-		const encryptionKeyBytes = this.encryption_key.dumps();
-		const signingKeyBytes = this.signing_key.dumps();
-
-		const buildData = {
-			signature: DeviceStructs.magic,
-			version: 2,
-			group_certificate_length: groupCertBytes.length,
-			group_certificate: groupCertBytes,
-			encryption_key: encryptionKeyBytes,
-			signing_key: signingKeyBytes
-		};
-
-		return Device.CURRENT_STRUCT.encode(buildData);
-	}
-
-	dump(filePath: string): void {
-		const data = this.dumps();
-		fs.writeFileSync(filePath, data);
-	}
-
-	get_name(): string {
-		const name = `${this.group_certificate.get_name()}_sl${this.security_level}`;
-		return name.replace(/[^a-zA-Z0-9]/g, '_').toLowerCase();
-	}
-}
-
-// Device V2 disabled because unstable provisioning
-// export class Device {
-//     group_certificate: CertificateChain
-//     encryption_key: ECCKey
-//     signing_key: ECCKey
-//     security_level: number
-
-//     constructor(group_certificate: Buffer, group_key: Buffer) {
-// this.group_certificate = CertificateChain.loads(group_certificate)
-
-// this.encryption_key = ECCKey.generate()
-// this.signing_key = ECCKey.generate()
-
-// this.security_level = this.group_certificate.get_security_level()
-
-// const new_certificate = Certificate.new_key_cert(
-//     randomBytes(16),
-//     this.group_certificate.get_security_level(),
-//     randomBytes(16),
-//     this.signing_key,
-//     this.encryption_key,
-//     ECCKey.loads(group_key),
-//     this.group_certificate
-// )
-
-// this.group_certificate.prepend(new_certificate)
-//     }
-// }

modules/playready/ecc_key.ts

@@ -1,91 +0,0 @@
-import elliptic from 'elliptic';
-import { createHash } from 'crypto';
-import * as fs from 'fs';
-
-export default class ECCKey {
-	keyPair: elliptic.ec.KeyPair;
-
-	constructor(keyPair: elliptic.ec.KeyPair) {
-		this.keyPair = keyPair;
-	}
-
-	static generate(): ECCKey {
-		const EC = new elliptic.ec('p256');
-		const keyPair = EC.genKeyPair();
-		return new ECCKey(keyPair);
-	}
-
-	static construct(privateKey: Buffer | string | number): ECCKey {
-		if (Buffer.isBuffer(privateKey)) {
-			privateKey = privateKey.toString('hex');
-		} else if (typeof privateKey === 'number') {
-			privateKey = privateKey.toString(16);
-		}
-
-		const EC = new elliptic.ec('p256');
-		const keyPair = EC.keyFromPrivate(privateKey, 'hex');
-
-		return new ECCKey(keyPair);
-	}
-
-	static loads(data: string | Buffer): ECCKey {
-		if (typeof data === 'string') {
-			data = Buffer.from(data, 'base64');
-		}
-		if (!Buffer.isBuffer(data)) {
-			throw new Error(`Expecting Bytes or Base64 input, got ${data}`);
-		}
-
-		if (data.length !== 96 && data.length !== 32) {
-			throw new Error(`Invalid data length. Expecting 96 or 32 bytes, got ${data.length}`);
-		}
-
-		const privateKey = data.subarray(0, 32);
-		return ECCKey.construct(privateKey);
-	}
-
-	static load(filePath: string): ECCKey {
-		const data = fs.readFileSync(filePath);
-		return ECCKey.loads(data);
-	}
-
-	dumps(): Buffer {
-		return Buffer.concat([this.privateBytes(), this.publicBytes()]);
-	}
-
-	dump(filePath: string): void {
-		fs.writeFileSync(filePath, this.dumps());
-	}
-
-	getPoint(): { x: string; y: string } {
-		const publicKey = this.keyPair.getPublic();
-		return {
-			x: publicKey.getX().toString('hex'),
-			y: publicKey.getY().toString('hex')
-		};
-	}
-
-	privateBytes(): Buffer {
-		const privateKey = this.keyPair.getPrivate();
-		return Buffer.from(privateKey.toArray('be', 32));
-	}
-
-	privateSha256Digest(): Buffer {
-		const hash = createHash('sha256');
-		hash.update(this.privateBytes());
-		return hash.digest();
-	}
-
-	publicBytes(): Buffer {
-		const publicKey = this.keyPair.getPublic();
-		const x = publicKey.getX().toArray('be', 32);
-		const y = publicKey.getY().toArray('be', 32);
-		return Buffer.concat([Buffer.from(x), Buffer.from(y)]);
-	}
-
-	publicSha256Digest(): Buffer {
-		const hash = createHash('sha256');
-		hash.update(this.publicBytes());
-		return hash.digest();
-	}
-}

modules/playready/elgamal.ts

@@ -1,43 +0,0 @@
-import { ec as EC } from 'elliptic';
-import { randomBytes } from 'crypto';
-import BN from 'bn.js';
-
-export interface Point {
-	getY(): BN;
-	getX(): BN;
-	add(point: Point): Point;
-	mul(n: BN | bigint | number): Point;
-	neg(): Point;
-}
-
-export default class ElGamal {
-	curve: EC;
-
-	constructor(curve: EC) {
-		this.curve = curve;
-	}
-
-	static toBytes(n: BN): Uint8Array {
-		const byteArray = n.toString(16).padStart(2, '0');
-		if (byteArray.length % 2 !== 0) {
-			return Uint8Array.from(Buffer.from('0' + byteArray, 'hex'));
-		}
-		return Uint8Array.from(Buffer.from(byteArray, 'hex'));
-	}
-
-	encrypt(messagePoint: Point, publicKey: Point): [Point, Point] {
-		const ephemeralKey = new BN(randomBytes(32).toString('hex'), 16).mod(this.curve.n!);
-		const ephemeralKeyBigInt = BigInt(ephemeralKey.toString(10));
-		const point1 = this.curve.g.mul(ephemeralKeyBigInt);
-		const point2 = messagePoint.add(publicKey.mul(ephemeralKeyBigInt));
-
-		return [point1, point2];
-	}
-
-	static decrypt(encrypted: [Point, Point], privateKey: BN): Point {
-		const [point1, point2] = encrypted;
-		const sharedSecret = point1.mul(privateKey);
-		const decryptedMessage = point2.add(sharedSecret.neg());
-		return decryptedMessage;
-	}
-}

modules/playready/key.ts

@@ -1,63 +0,0 @@
-enum KeyType {
-	Invalid = 0x0000,
-	AES128CTR = 0x0001,
-	RC4 = 0x0002,
-	AES128ECB = 0x0003,
-	Cocktail = 0x0004,
-	AESCBC = 0x0005,
-	UNKNOWN = 0xffff
-}
-
-function getKeyType(value: number): KeyType {
-	switch (value) {
-		case KeyType.Invalid:
-		case KeyType.AES128CTR:
-		case KeyType.RC4:
-		case KeyType.AES128ECB:
-		case KeyType.Cocktail:
-		case KeyType.AESCBC:
-			return value;
-		default:
-			return KeyType.UNKNOWN;
-	}
-}
-
-enum CipherType {
-	Invalid = 0x0000,
-	RSA128 = 0x0001,
-	ChainedLicense = 0x0002,
-	ECC256 = 0x0003,
-	ECCforScalableLicenses = 0x0004,
-	Scalable = 0x0005,
-	UNKNOWN = 0xffff
-}
-
-function getCipherType(value: number): CipherType {
-	switch (value) {
-		case CipherType.Invalid:
-		case CipherType.RSA128:
-		case CipherType.ChainedLicense:
-		case CipherType.ECC256:
-		case CipherType.ECCforScalableLicenses:
-		case CipherType.Scalable:
-			return value;
-		default:
-			return CipherType.UNKNOWN;
-	}
-}
-
-export class Key {
-	key_id: string;
-	key_type: KeyType;
-	cipher_type: CipherType;
-	key_length: number;
-	key: string;
-
-	constructor(key_id: string, key_type: number, cipher_type: number, key_length: number, key: Buffer) {
-		this.key_id = key_id;
-		this.key_type = getKeyType(key_type);
-		this.cipher_type = getCipherType(cipher_type);
-		this.key_length = key_length;
-		this.key = key.toString('hex');
-	}
-}

modules/playready/pssh.ts

@@ -1,122 +0,0 @@
-import { Parser } from 'binary-parser';
-import { Buffer } from 'buffer';
-import WRMHeader from './wrmheader';
-
-const SYSTEM_ID = Buffer.from('9a04f07998404286ab92e65be0885f95', 'hex');
-
-const PSSHBox = new Parser()
-	.uint32('length')
-	.string('pssh', { length: 4, assert: 'pssh' })
-	.uint32('fullbox')
-	.buffer('system_id', { length: 16 })
-	.uint32('data_length')
-	.buffer('data', {
-		length: 'data_length'
-	});
-
-const PlayreadyObject = new Parser()
-	.useContextVars()
-	.uint16('type')
-	.uint16('length')
-	.choice('data', {
-		tag: 'type',
-		choices: {
-			1: new Parser().string('data', {
-				length: function () {
-					return (this as any).$parent.length;
-				},
-				encoding: 'utf16le'
-			})
-		},
-		defaultChoice: new Parser().buffer('data', {
-			length: function () {
-				return (this as any).$parent.length;
-			}
-		})
-	});
-
-const PlayreadyHeader = new Parser().uint32('length').uint16('record_count').array('records', {
-	length: 'record_count',
-	type: PlayreadyObject
-});
-
-function isPlayreadyPsshBox(data: Buffer): boolean {
-	if (data.length < 28) return false;
-	return data.subarray(12, 28).equals(SYSTEM_ID);
-}
-
-function isUtf16(data: Buffer): boolean {
-	for (let i = 1; i < data.length; i += 2) {
-		if (data[i] !== 0) {
-			return false;
-		}
-	}
-	return true;
-}
-
-function* getWrmHeaders(wrm_header: any): IterableIterator<string> {
-	for (const record of wrm_header.records) {
-		if (record.type === 1 && typeof record.data === 'string') {
-			yield record.data;
-		}
-	}
-}
-
-export class PSSH {
-	public wrm_headers: string[];
-
-	constructor(data: string | Buffer) {
-		if (!data) {
-			throw new Error('Data must not be empty');
-		}
-
-		if (typeof data === 'string') {
-			try {
-				data = Buffer.from(data, 'base64');
-			} catch (e) {
-				throw new Error(`Could not decode data as Base64: ${e}`);
-			}
-		}
-
-		try {
-			if (isPlayreadyPsshBox(data)) {
-				const pssh_box = PSSHBox.parse(data);
-				const psshData = pssh_box.data;
-
-				if (isUtf16(psshData)) {
-					this.wrm_headers = [psshData.toString('utf16le')];
-				} else if (isUtf16(psshData.subarray(6))) {
-					this.wrm_headers = [psshData.subarray(6).toString('utf16le')];
-				} else if (isUtf16(psshData.subarray(10))) {
-					this.wrm_headers = [psshData.subarray(10).toString('utf16le')];
-				} else {
-					const playready_header = PlayreadyHeader.parse(psshData);
-					this.wrm_headers = Array.from(getWrmHeaders(playready_header));
-				}
-			} else {
-				if (isUtf16(data)) {
-					this.wrm_headers = [data.toString('utf16le')];
-				} else if (isUtf16(data.subarray(6))) {
-					this.wrm_headers = [data.subarray(6).toString('utf16le')];
-				} else if (isUtf16(data.subarray(10))) {
-					this.wrm_headers = [data.subarray(10).toString('utf16le')];
-				} else {
-					const playready_header = PlayreadyHeader.parse(data);
-					this.wrm_headers = Array.from(getWrmHeaders(playready_header));
-				}
-			}
-		} catch (e) {
-			throw new Error('Could not parse data as a PSSH Box nor a PlayReadyHeader');
-		}
-	}
-
-	// Header downgrade
-	public get_wrm_headers(downgrade_to_v4: boolean = false): string[] {
-		return this.wrm_headers.map(downgrade_to_v4 ? this.downgradePSSH : (_) => _);
-	}
-
-	private downgradePSSH(wrm_header: string): string {
-		const header = new WRMHeader(wrm_header);
-		return header.to_v4_0_0_0();
-	}
-}

modules/playready/wrmheader.ts

@@ -1,88 +0,0 @@
-import { XMLParser } from 'fast-xml-parser';
-
-export class SignedKeyID {
-	constructor(
-		public alg_id: string,
-		public value: string,
-		public checksum?: string
-	) {}
-}
-
-export type Version = '4.0.0.0' | '4.1.0.0' | '4.2.0.0' | '4.3.0.0' | 'UNKNOWN';
-
-export type ReturnStructure = [SignedKeyID[], string | null, string | null, string | null];
-
-interface ParsedWRMHeader {
-	WRMHEADER: {
-		'@_version': string;
-		DATA?: any;
-	};
-}
-
-export default class WRMHeader {
-	private header: ParsedWRMHeader['WRMHEADER'];
-	version: Version;
-
-	constructor(data: string) {
-		if (!data) throw new Error('Data must not be empty');
-
-		const parser = new XMLParser({
-			ignoreAttributes: false,
-			removeNSPrefix: true,
-			attributeNamePrefix: '@_'
-		});
-		const parsed = parser.parse(data) as ParsedWRMHeader;
-
-		if (!parsed.WRMHEADER) throw new Error('Data is not a valid WRMHEADER');
-
-		this.header = parsed.WRMHEADER;
-		this.version = WRMHeader.fromString(this.header['@_version']);
-	}
-
-	private static fromString(value: string): Version {
-		if (['4.0.0.0', '4.1.0.0', '4.2.0.0', '4.3.0.0'].includes(value)) {
-			return value as Version;
-		}
-		return 'UNKNOWN';
-	}
-
-	to_v4_0_0_0(): string {
-		const [key_ids, la_url, lui_url, ds_id] = this.readAttributes();
-		if (key_ids.length === 0) throw new Error('No Key IDs available');
-		const key_id = key_ids[0];
-		return `<WRMHEADER xmlns="http://schemas.microsoft.com/DRM/2007/03/PlayReadyHeader" version="4.0.0.0"><DATA><PROTECTINFO><KEYLEN>16</KEYLEN><ALGID>AESCTR</ALGID></PROTECTINFO><KID>${
-			key_id.value
-		}</KID>${la_url ? `<LA_URL>${la_url}</LA_URL>` : ''}${lui_url ? `<LUI_URL>${lui_url}</LUI_URL>` : ''}${ds_id ? `<DS_ID>${ds_id}</DS_ID>` : ''}${
-			key_id.checksum ? `<CHECKSUM>${key_id.checksum}</CHECKSUM>` : ''
-		}</DATA></WRMHEADER>`;
-	}
-
-	readAttributes(): ReturnStructure {
-		const data = this.header.DATA;
-		if (!data) throw new Error('Not a valid PlayReady Header Record, WRMHEADER/DATA required');
-		switch (this.version) {
-			case '4.0.0.0':
-				return WRMHeader.read_v4(data);
-			case '4.1.0.0':
-			case '4.2.0.0':
-			case '4.3.0.0':
-				return WRMHeader.read_vX(data);
-			default:
-				throw new Error(`Unsupported version: ${this.version}`);
-		}
-	}
-
-	private static read_v4(data: any): ReturnStructure {
-		const protectInfo = data.PROTECTINFO;
-		return [[new SignedKeyID(protectInfo.ALGID, data.KID, data.CHECKSUM)], data.LA_URL || null, data.LUI_URL || null, data.DS_ID || null];
-	}
-
-	private static read_vX(data: any): ReturnStructure {
-		const protectInfo = data.PROTECTINFO;
-
-		const signedKeyID: SignedKeyID | undefined = protectInfo.KIDS.KID
-			? new SignedKeyID(protectInfo.KIDS.KID['@_ALGID'] || '', protectInfo.KIDS.KID['@_VALUE'], protectInfo.KIDS.KID['@_CHECKSUM'])
-			: undefined;
-		return [signedKeyID ? [signedKeyID] : [], data.LA_URL || null, data.LUI_URL || null, data.DS_ID || null];
-	}
-}

modules/playready/xml_key.ts

@@ -1,45 +0,0 @@
-import BN from 'bn.js';
-import { ec as EC } from 'elliptic';
-import ECCKey from './ecc_key';
-import ElGamal, { Point } from './elgamal';
-
-export default class XmlKey {
-	private _sharedPoint: ECCKey;
-	public sharedKeyX: BN;
-	public sharedKeyY: BN;
-	public _shared_key_x_bytes: Uint8Array;
-	public aesIv: Uint8Array;
-	public aesKey: Uint8Array;
-
-	constructor() {
-		this._sharedPoint = ECCKey.generate();
-		this.sharedKeyX = this._sharedPoint.keyPair.getPublic().getX();
-		this.sharedKeyY = this._sharedPoint.keyPair.getPublic().getY();
-		this._shared_key_x_bytes = ElGamal.toBytes(this.sharedKeyX);
-		this.aesIv = this._shared_key_x_bytes.subarray(0, 16);
-		this.aesKey = this._shared_key_x_bytes.subarray(16, 32);
-	}
-
-	getPoint(curve: EC): Point {
-		return curve.curve.point(this.sharedKeyX, this.sharedKeyY);
-	}
-}
-
-// Make it more undetectable (not working right now)
-// import { randomBytes } from 'crypto'
-// export default class XmlKey {
-//     public aesIv: Uint8Array
-//     public aesKey: Uint8Array
-//     public bytes: Uint8Array
-
-//     constructor() {
-//         this.aesIv = randomBytes(16)
-//         this.aesKey = randomBytes(16)
-//         this.bytes = new Uint8Array([...this.aesIv, ...this.aesKey])
-
-//         console.log('XML key (AES/CBC)')
-//         console.log('iv:', Buffer.from(this.aesIv).toString('hex'))
-//         console.log('key:', Buffer.from(this.aesKey).toString('hex'))
-//         console.log('bytes:', this.bytes)
-//     }
-// }

modules/playready/xmrlicense.ts

@@ -1,228 +0,0 @@
-import { Parser } from 'binary-parser';
-
-type ParsedLicense = {
-	version: number;
-	rights: string;
-	length: number;
-	license: {
-		length: number;
-		signature?: {
-			length: number;
-			type: string;
-			value: string;
-		};
-		global_container?: {
-			revocationInfo?: {
-				version: number;
-			};
-			securityLevel?: {
-				level: number;
-			};
-		};
-		keyMaterial?: {
-			contentKey?: {
-				kid: string;
-				keyType: number;
-				ciphertype: number;
-				length: number;
-				value: Buffer;
-			};
-			encryptionKey?: {
-				curve: number;
-				length: number;
-				value: string;
-			};
-			auxKeys?: {
-				count: number;
-				value: {
-					location: number;
-					value: string;
-				};
-			};
-		};
-	};
-};
-
-export class XMRLicenseStructsV2 {
-	static CONTENT_KEY = new Parser().buffer('kid', { length: 16 }).uint16('keytype').uint16('ciphertype').uint16('length').buffer('value', {
-		length: 'length'
-	});
-
-	static ECC_KEY = new Parser().uint16('curve').uint16('length').buffer('value', {
-		length: 'length'
-	});
-
-	static FTLV = new Parser()
-		.uint16('flags')
-		.uint16('type')
-		.uint32('length')
-		.buffer('value', {
-			length: function () {
-				return (this as any).length - 8;
-			}
-		});
-
-	static AUXILIARY_LOCATIONS = new Parser().uint32('location').buffer('value', { length: 16 });
-
-	static AUXILIARY_KEY_OBJECT = new Parser().uint16('count').array('locations', {
-		length: 'count',
-		type: XMRLicenseStructsV2.AUXILIARY_LOCATIONS
-	});
-
-	static SIGNATURE = new Parser().uint16('type').uint16('siglength').buffer('signature', {
-		length: 'siglength'
-	});
-
-	static XMR = new Parser().string('constant', { length: 4, assert: 'XMR\x00' }).int32('version').buffer('rightsid', { length: 16 }).nest('data', {
-		type: XMRLicenseStructsV2.FTLV
-	});
-}
-
-enum XMRTYPE {
-	XMR_OUTER_CONTAINER = 0x0001,
-	XMR_GLOBAL_POLICY_CONTAINER = 0x0002,
-	XMR_PLAYBACK_POLICY_CONTAINER = 0x0004,
-	XMR_KEY_MATERIAL_CONTAINER = 0x0009,
-	XMR_RIGHTS_SETTINGS = 0x000d,
-	XMR_EMBEDDED_LICENSE_SETTINGS = 0x0033,
-	XMR_REVOCATION_INFORMATION_VERSION = 0x0032,
-	XMR_SECURITY_LEVEL = 0x0034,
-	XMR_CONTENT_KEY_OBJECT = 0x000a,
-	XMR_ECC_KEY_OBJECT = 0x002a,
-	XMR_SIGNATURE_OBJECT = 0x000b,
-	XMR_OUTPUT_LEVEL_RESTRICTION = 0x0005,
-	XMR_AUXILIARY_KEY_OBJECT = 0x0051,
-	XMR_EXPIRATION_RESTRICTION = 0x0012,
-	XMR_ISSUE_DATE = 0x0013,
-	XMR_EXPLICIT_ANALOG_CONTAINER = 0x0007
-}
-
-export class XmrUtil {
-	public data: Buffer;
-	public license: ParsedLicense;
-
-	constructor(data: Buffer, license: ParsedLicense) {
-		this.data = data;
-		this.license = license;
-	}
-
-	static parse(license: Buffer) {
-		const xmr = XMRLicenseStructsV2.XMR.parse(license);
-
-		const parsed_license: ParsedLicense = {
-			version: xmr.version,
-			rights: Buffer.from(xmr.rightsid).toString('hex'),
-			length: license.length,
-			license: {
-				length: xmr.data.length
-			}
-		};
-		const container = parsed_license.license;
-		const data = xmr.data;
-
-		let pos = 0;
-		while (pos < data.length - 16) {
-			const value = XMRLicenseStructsV2.FTLV.parse(data.value.slice(pos));
-
-			// XMR_SIGNATURE_OBJECT
-			if (value.type === XMRTYPE.XMR_SIGNATURE_OBJECT) {
-				const signature = XMRLicenseStructsV2.SIGNATURE.parse(value.value);
-
-				container.signature = {
-					length: value.length,
-					type: signature.type,
-					value: Buffer.from(signature.signature).toString('hex')
-				};
-			}
-
-			// XMRTYPE.XMR_GLOBAL_POLICY_CONTAINER
-			if (value.type === XMRTYPE.XMR_GLOBAL_POLICY_CONTAINER) {
-				container.global_container = {};
-
-				let index = 0;
-				while (index < value.length - 16) {
-					const data = XMRLicenseStructsV2.FTLV.parse(value.value.slice(index));
-
-					// XMRTYPE.XMR_REVOCATION_INFORMATION_VERSION
-					if (data.type === XMRTYPE.XMR_REVOCATION_INFORMATION_VERSION) {
-						container.global_container.revocationInfo = {
-							version: data.value.readUInt32BE(0)
-						};
-					}
-
-					// XMRTYPE.XMR_SECURITY_LEVEL
-					if (data.type === XMRTYPE.XMR_SECURITY_LEVEL) {
-						container.global_container.securityLevel = {
-							level: data.value.readUInt16BE(0)
-						};
-					}
-
-					index += data.length;
-				}
-			}
-
-			// XMRTYPE.XMR_KEY_MATERIAL_CONTAINER
-			if (value.type === XMRTYPE.XMR_KEY_MATERIAL_CONTAINER) {
-				container.keyMaterial = {};
-
-				let index = 0;
-				while (index < value.length - 16) {
-					const data = XMRLicenseStructsV2.FTLV.parse(value.value.slice(index));
-
-					// XMRTYPE.XMR_CONTENT_KEY_OBJECT
-					if (data.type === XMRTYPE.XMR_CONTENT_KEY_OBJECT) {
-						const content_key = XMRLicenseStructsV2.CONTENT_KEY.parse(data.value);
-
-						container.keyMaterial.contentKey = {
-							kid: XmrUtil.fixUUID(content_key.kid).toString('hex'),
-							keyType: content_key.keytype,
-							ciphertype: content_key.ciphertype,
-							length: content_key.length,
-							value: content_key.value
-						};
-					}
-
-					// XMRTYPE.XMR_ECC_KEY_OBJECT
-					if (data.type === XMRTYPE.XMR_ECC_KEY_OBJECT) {
-						const ecc_key = XMRLicenseStructsV2.ECC_KEY.parse(data.value);
-
-						container.keyMaterial.encryptionKey = {
-							curve: ecc_key.curve,
-							length: ecc_key.length,
-							value: Buffer.from(ecc_key.value).toString('hex')
-						};
-					}
-
-					// XMRTYPE.XMR_AUXILIARY_KEY_OBJECT
-					if (data.type === XMRTYPE.XMR_AUXILIARY_KEY_OBJECT) {
-						const aux_keys = XMRLicenseStructsV2.AUXILIARY_KEY_OBJECT.parse(data.value);
-
-						container.keyMaterial.auxKeys = {
-							count: aux_keys.count,
-							value: aux_keys.locations.map((a: any) => {
-								return {
-									location: a.location,
-									value: Buffer.from(a.value).toString('hex')
-								};
-							})
-						};
-					}
-					index += data.length;
-				}
-			}
-
-			pos += value.length;
-		}
-
-		return new XmrUtil(license, parsed_license);
-	}
-
-	static fixUUID(data: Buffer): Buffer {
-		return Buffer.concat([
-			Buffer.from(data.subarray(0, 4).reverse()),
-			Buffer.from(data.subarray(4, 6).reverse()),
-			Buffer.from(data.subarray(6, 8).reverse()),
-			data.subarray(8, 16)
-		]);
-	}
-}

modules/widevine/cmac.ts

@@ -1,113 +0,0 @@
-// Modified version of https://github.com/Frooastside/node-widevine
-import crypto from 'crypto';
-
-export class AES_CMAC {
-	private readonly BLOCK_SIZE = 16;
-	private readonly XOR_RIGHT = Buffer.from([0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87]);
-	private readonly EMPTY_BLOCK_SIZE_BUFFER = Buffer.alloc(this.BLOCK_SIZE) as Buffer;
-
-	private _key: Buffer;
-	private _subkeys: { first: Buffer; second: Buffer };
-
-	public constructor(key: Buffer) {
-		if (![16, 24, 32].includes(key.length)) {
-			throw new Error('Key size must be 128, 192, or 256 bits.');
-		}
-		this._key = key;
-		this._subkeys = this._generateSubkeys();
-	}
-
-	public calculate(message: Buffer): Buffer {
-		const blockCount = this._getBlockCount(message);
-
-		let x = this.EMPTY_BLOCK_SIZE_BUFFER;
-		let y;
-
-		for (let i = 0; i < blockCount - 1; i++) {
-			const from = i * this.BLOCK_SIZE;
-			const block = message.subarray(from, from + this.BLOCK_SIZE);
-			y = this._xor(x, block);
-			x = this._aes(y);
-		}
-
-		y = this._xor(x, this._getLastBlock(message));
-		x = this._aes(y);
-
-		return x;
-	}
-
-	private _generateSubkeys(): { first: Buffer; second: Buffer } {
-		const l = this._aes(this.EMPTY_BLOCK_SIZE_BUFFER);
-
-		let first = this._bitShiftLeft(l);
-		if (l[0] & 0x80) {
-			first = this._xor(first, this.XOR_RIGHT);
-		}
-
-		let second = this._bitShiftLeft(first);
-		if (first[0] & 0x80) {
-			second = this._xor(second, this.XOR_RIGHT);
-		}
-
-		return { first: first, second: second };
-	}
-
-	private _getBlockCount(message: Buffer): number {
-		const blockCount = Math.ceil(message.length / this.BLOCK_SIZE);
-		return blockCount === 0 ? 1 : blockCount;
-	}
-
-	private _aes(message: Buffer): Buffer {
-		const cipher = crypto.createCipheriv(`aes-${this._key.length * 8}-cbc`, this._key, Buffer.alloc(this.BLOCK_SIZE));
-		const result = cipher.update(message).subarray(0, 16);
-		cipher.destroy();
-		return result;
-	}
-
-	private _getLastBlock(message: Buffer): Buffer {
-		const blockCount = this._getBlockCount(message);
-		const paddedBlock = this._padding(message, blockCount - 1);
-
-		let complete = false;
-		if (message.length > 0) {
-			complete = message.length % this.BLOCK_SIZE === 0;
-		}
-
-		const key = complete ? this._subkeys.first : this._subkeys.second;
-		return this._xor(paddedBlock, key);
-	}
-
-	private _padding(message: Buffer, blockIndex: number): Buffer {
-		const block = Buffer.alloc(this.BLOCK_SIZE);
-
-		const from = blockIndex * this.BLOCK_SIZE;
-
-		const slice = message.subarray(from, from + this.BLOCK_SIZE);
-		block.set(slice);
-
-		if (slice.length !== this.BLOCK_SIZE) {
-			block[slice.length] = 0x80;
-		}
-
-		return block;
-	}
-
-	private _bitShiftLeft(input: Buffer): Buffer {
-		const output = Buffer.alloc(input.length);
-		let overflow = 0;
-		for (let i = input.length - 1; i >= 0; i--) {
-			output[i] = (input[i] << 1) | overflow;
-			overflow = input[i] & 0x80 ? 1 : 0;
-		}
-		return output;
-	}
-
-	private _xor(a: Buffer, b: Buffer): Buffer {
-		const length = Math.min(a.length, b.length);
-		const output = Buffer.alloc(length);
-		for (let i = 0; i < length; i++) {
-			output[i] = a[i] ^ b[i];
-		}
-		return output;
-	}
-}

modules/widevine/license.ts

@@ -1,303 +0,0 @@
-// Modified version of https://github.com/Frooastside/node-widevine
-
-import { AES_CMAC } from './cmac';
-import forge from 'node-forge';
-import {
-	ClientIdentification,
-	ClientIdentificationSchema,
-	DrmCertificateSchema,
-	EncryptedClientIdentification,
-	EncryptedClientIdentificationSchema,
-	LicenseRequest,
-	LicenseRequest_ContentIdentification_WidevinePsshDataSchema,
-	LicenseRequest_ContentIdentificationSchema,
-	LicenseRequest_RequestType,
-	LicenseRequestSchema,
-	LicenseSchema,
-	LicenseType,
-	ProtocolVersion,
-	SignedDrmCertificate,
-	SignedDrmCertificateSchema,
-	SignedMessage,
-	SignedMessage_MessageType,
-	SignedMessageSchema,
-	WidevinePsshData,
-	WidevinePsshDataSchema
-} from './license_protocol_pb3';
-import { create, fromBinary, toBinary } from '@bufbuild/protobuf';
-
-const WIDEVINE_SYSTEM_ID = new Uint8Array([0xed, 0xef, 0x8b, 0xa9, 0x79, 0xd6, 0x4a, 0xce, 0xa3, 0xc8, 0x27, 0xdc, 0xd5, 0x1d, 0x21, 0xed]);
-
-const WIDEVINE_ROOT_PUBLIC_KEY = new Uint8Array([
-	0x30, 0x82, 0x01, 0x8a, 0x02, 0x82, 0x01, 0x81, 0x00, 0xb4, 0xfe, 0x39, 0xc3, 0x65, 0x90, 0x03, 0xdb, 0x3c, 0x11, 0x97, 0x09, 0xe8, 0x68, 0xcd, 0xf2, 0xc3, 0x5e, 0x9b, 0xf2,
-	0xe7, 0x4d, 0x23, 0xb1, 0x10, 0xdb, 0x87, 0x65, 0xdf, 0xdc, 0xfb, 0x9f, 0x35, 0xa0, 0x57, 0x03, 0x53, 0x4c, 0xf6, 0x6d, 0x35, 0x7d, 0xa6, 0x78, 0xdb, 0xb3, 0x36, 0xd2, 0x3f,
-	0x9c, 0x40, 0xa9, 0x95, 0x26, 0x72, 0x7f, 0xb8, 0xbe, 0x66, 0xdf, 0xc5, 0x21, 0x98, 0x78, 0x15, 0x16, 0x68, 0x5d, 0x2f, 0x46, 0x0e, 0x43, 0xcb, 0x8a, 0x84, 0x39, 0xab, 0xfb,
-	0xb0, 0x35, 0x80, 0x22, 0xbe, 0x34, 0x23, 0x8b, 0xab, 0x53, 0x5b, 0x72, 0xec, 0x4b, 0xb5, 0x48, 0x69, 0x53, 0x3e, 0x47, 0x5f, 0xfd, 0x09, 0xfd, 0xa7, 0x76, 0x13, 0x8f, 0x0f,
-	0x92, 0xd6, 0x4c, 0xdf, 0xae, 0x76, 0xa9, 0xba, 0xd9, 0x22, 0x10, 0xa9, 0x9d, 0x71, 0x45, 0xd6, 0xd7, 0xe1, 0x19, 0x25, 0x85, 0x9c, 0x53, 0x9a, 0x97, 0xeb, 0x84, 0xd7, 0xcc,
-	0xa8, 0x88, 0x82, 0x20, 0x70, 0x26, 0x20, 0xfd, 0x7e, 0x40, 0x50, 0x27, 0xe2, 0x25, 0x93, 0x6f, 0xbc, 0x3e, 0x72, 0xa0, 0xfa, 0xc1, 0xbd, 0x29, 0xb4, 0x4d, 0x82, 0x5c, 0xc1,
-	0xb4, 0xcb, 0x9c, 0x72, 0x7e, 0xb0, 0xe9, 0x8a, 0x17, 0x3e, 0x19, 0x63, 0xfc, 0xfd, 0x82, 0x48, 0x2b, 0xb7, 0xb2, 0x33, 0xb9, 0x7d, 0xec, 0x4b, 0xba, 0x89, 0x1f, 0x27, 0xb8,
-	0x9b, 0x88, 0x48, 0x84, 0xaa, 0x18, 0x92, 0x0e, 0x65, 0xf5, 0xc8, 0x6c, 0x11, 0xff, 0x6b, 0x36, 0xe4, 0x74, 0x34, 0xca, 0x8c, 0x33, 0xb1, 0xf9, 0xb8, 0x8e, 0xb4, 0xe6, 0x12,
-	0xe0, 0x02, 0x98, 0x79, 0x52, 0x5e, 0x45, 0x33, 0xff, 0x11, 0xdc, 0xeb, 0xc3, 0x53, 0xba, 0x7c, 0x60, 0x1a, 0x11, 0x3d, 0x00, 0xfb, 0xd2, 0xb7, 0xaa, 0x30, 0xfa, 0x4f, 0x5e,
-	0x48, 0x77, 0x5b, 0x17, 0xdc, 0x75, 0xef, 0x6f, 0xd2, 0x19, 0x6d, 0xdc, 0xbe, 0x7f, 0xb0, 0x78, 0x8f, 0xdc, 0x82, 0x60, 0x4c, 0xbf, 0xe4, 0x29, 0x06, 0x5e, 0x69, 0x8c, 0x39,
-	0x13, 0xad, 0x14, 0x25, 0xed, 0x19, 0xb2, 0xf2, 0x9f, 0x01, 0x82, 0x0d, 0x56, 0x44, 0x88, 0xc8, 0x35, 0xec, 0x1f, 0x11, 0xb3, 0x24, 0xe0, 0x59, 0x0d, 0x37, 0xe4, 0x47, 0x3c,
-	0xea, 0x4b, 0x7f, 0x97, 0x31, 0x1c, 0x81, 0x7c, 0x94, 0x8a, 0x4c, 0x7d, 0x68, 0x15, 0x84, 0xff, 0xa5, 0x08, 0xfd, 0x18, 0xe7, 0xe7, 0x2b, 0xe4, 0x47, 0x27, 0x12, 0x11, 0xb8,
-	0x23, 0xec, 0x58, 0x93, 0x3c, 0xac, 0x12, 0xd2, 0x88, 0x6d, 0x41, 0x3d, 0xc5, 0xfe, 0x1c, 0xdc, 0xb9, 0xf8, 0xd4, 0x51, 0x3e, 0x07, 0xe5, 0x03, 0x6f, 0xa7, 0x12, 0xe8, 0x12,
-	0xf7, 0xb5, 0xce, 0xa6, 0x96, 0x55, 0x3f, 0x78, 0xb4, 0x64, 0x82, 0x50, 0xd2, 0x33, 0x5f, 0x91, 0x02, 0x03, 0x01, 0x00, 0x01
-]);
-
-export const SERVICE_CERTIFICATE_CHALLENGE = new Uint8Array([0x08, 0x04]);
-
-const COMMON_SERVICE_CERTIFICATE = new Uint8Array([
-	0x08, 0x05, 0x12, 0xc7, 0x05, 0x0a, 0xc1, 0x02, 0x08, 0x03, 0x12, 0x10, 0x17, 0x05, 0xb9, 0x17, 0xcc, 0x12, 0x04, 0x86, 0x8b, 0x06, 0x33, 0x3a, 0x2f, 0x77, 0x2a, 0x8c, 0x18,
-	0x82, 0xb4, 0x82, 0x92, 0x05, 0x22, 0x8e, 0x02, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0x99, 0xed, 0x5b, 0x3b, 0x32, 0x7d, 0xab, 0x5e, 0x24, 0xef, 0xc3, 0xb6,
-	0x2a, 0x95, 0xb5, 0x98, 0x52, 0x0a, 0xd5, 0xbc, 0xcb, 0x37, 0x50, 0x3e, 0x06, 0x45, 0xb8, 0x14, 0xd8, 0x76, 0xb8, 0xdf, 0x40, 0x51, 0x04, 0x41, 0xad, 0x8c, 0xe3, 0xad, 0xb1,
-	0x1b, 0xb8, 0x8c, 0x4e, 0x72, 0x5a, 0x5e, 0x4a, 0x9e, 0x07, 0x95, 0x29, 0x1d, 0x58, 0x58, 0x40, 0x23, 0xa7, 0xe1, 0xaf, 0x0e, 0x38, 0xa9, 0x12, 0x79, 0x39, 0x30, 0x08, 0x61,
-	0x0b, 0x6f, 0x15, 0x8c, 0x87, 0x8c, 0x7e, 0x21, 0xbf, 0xfb, 0xfe, 0xea, 0x77, 0xe1, 0x01, 0x9e, 0x1e, 0x57, 0x81, 0xe8, 0xa4, 0x5f, 0x46, 0x26, 0x3d, 0x14, 0xe6, 0x0e, 0x80,
-	0x58, 0xa8, 0x60, 0x7a, 0xdc, 0xe0, 0x4f, 0xac, 0x84, 0x57, 0xb1, 0x37, 0xa8, 0xd6, 0x7c, 0xcd, 0xeb, 0x33, 0x70, 0x5d, 0x98, 0x3a, 0x21, 0xfb, 0x4e, 0xec, 0xbd, 0x4a, 0x10,
-	0xca, 0x47, 0x49, 0x0c, 0xa4, 0x7e, 0xaa, 0x5d, 0x43, 0x82, 0x18, 0xdd, 0xba, 0xf1, 0xca, 0xde, 0x33, 0x92, 0xf1, 0x3d, 0x6f, 0xfb, 0x64, 0x42, 0xfd, 0x31, 0xe1, 0xbf, 0x40,
-	0xb0, 0xc6, 0x04, 0xd1, 0xc4, 0xba, 0x4c, 0x95, 0x20, 0xa4, 0xbf, 0x97, 0xee, 0xbd, 0x60, 0x92, 0x9a, 0xfc, 0xee, 0xf5, 0x5b, 0xba, 0xf5, 0x64, 0xe2, 0xd0, 0xe7, 0x6c, 0xd7,
-	0xc5, 0x5c, 0x73, 0xa0, 0x82, 0xb9, 0x96, 0x12, 0x0b, 0x83, 0x59, 0xed, 0xce, 0x24, 0x70, 0x70, 0x82, 0x68, 0x0d, 0x6f, 0x67, 0xc6, 0xd8, 0x2c, 0x4a, 0xc5, 0xf3, 0x13, 0x44,
-	0x90, 0xa7, 0x4e, 0xec, 0x37, 0xaf, 0x4b, 0x2f, 0x01, 0x0c, 0x59, 0xe8, 0x28, 0x43, 0xe2, 0x58, 0x2f, 0x0b, 0x6b, 0x9f, 0x5d, 0xb0, 0xfc, 0x5e, 0x6e, 0xdf, 0x64, 0xfb, 0xd3,
-	0x08, 0xb4, 0x71, 0x1b, 0xcf, 0x12, 0x50, 0x01, 0x9c, 0x9f, 0x5a, 0x09, 0x02, 0x03, 0x01, 0x00, 0x01, 0x3a, 0x14, 0x6c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x2e, 0x77, 0x69,
-	0x64, 0x65, 0x76, 0x69, 0x6e, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x12, 0x80, 0x03, 0xae, 0x34, 0x73, 0x14, 0xb5, 0xa8, 0x35, 0x29, 0x7f, 0x27, 0x13, 0x88, 0xfb, 0x7b, 0xb8, 0xcb,
-	0x52, 0x77, 0xd2, 0x49, 0x82, 0x3c, 0xdd, 0xd1, 0xda, 0x30, 0xb9, 0x33, 0x39, 0x51, 0x1e, 0xb3, 0xcc, 0xbd, 0xea, 0x04, 0xb9, 0x44, 0xb9, 0x27, 0xc1, 0x21, 0x34, 0x6e, 0xfd,
-	0xbd, 0xea, 0xc9, 0xd4, 0x13, 0x91, 0x7e, 0x6e, 0xc1, 0x76, 0xa1, 0x04, 0x38, 0x46, 0x0a, 0x50, 0x3b, 0xc1, 0x95, 0x2b, 0x9b, 0xa4, 0xe4, 0xce, 0x0f, 0xc4, 0xbf, 0xc2, 0x0a,
-	0x98, 0x08, 0xaa, 0xaf, 0x4b, 0xfc, 0xd1, 0x9c, 0x1d, 0xcf, 0xcd, 0xf5, 0x74, 0xcc, 0xac, 0x28, 0xd1, 0xb4, 0x10, 0x41, 0x6c, 0xf9, 0xde, 0x88, 0x04, 0x30, 0x1c, 0xbd, 0xb3,
-	0x34, 0xca, 0xfc, 0xd0, 0xd4, 0x09, 0x78, 0x42, 0x3a, 0x64, 0x2e, 0x54, 0x61, 0x3d, 0xf0, 0xaf, 0xcf, 0x96, 0xca, 0x4a, 0x92, 0x49, 0xd8, 0x55, 0xe4, 0x2b, 0x3a, 0x70, 0x3e,
-	0xf1, 0x76, 0x7f, 0x6a, 0x9b, 0xd3, 0x6d, 0x6b, 0xf8, 0x2b, 0xe7, 0x6b, 0xbf, 0x0c, 0xba, 0x4f, 0xde, 0x59, 0xd2, 0xab, 0xcc, 0x76, 0xfe, 0xb6, 0x42, 0x47, 0xb8, 0x5c, 0x43,
-	0x1f, 0xbc, 0xa5, 0x22, 0x66, 0xb6, 0x19, 0xfc, 0x36, 0x97, 0x95, 0x43, 0xfc, 0xa9, 0xcb, 0xbd, 0xbb, 0xfa, 0xfa, 0x0e, 0x1a, 0x55, 0xe7, 0x55, 0xa3, 0xc7, 0xbc, 0xe6, 0x55,
-	0xf9, 0x64, 0x6f, 0x58, 0x2a, 0xb9, 0xcf, 0x70, 0xaa, 0x08, 0xb9, 0x79, 0xf8, 0x67, 0xf6, 0x3a, 0x0b, 0x2b, 0x7f, 0xdb, 0x36, 0x2c, 0x5b, 0xc4, 0xec, 0xd5, 0x55, 0xd8, 0x5b,
-	0xca, 0xa9, 0xc5, 0x93, 0xc3, 0x83, 0xc8, 0x57, 0xd4, 0x9d, 0xaa, 0xb7, 0x7e, 0x40, 0xb7, 0x85, 0x1d, 0xdf, 0xd2, 0x49, 0x98, 0x80, 0x8e, 0x35, 0xb2, 0x58, 0xe7, 0x5d, 0x78,
-	0xea, 0xc0, 0xca, 0x16, 0xf7, 0x04, 0x73, 0x04, 0xc2, 0x0d, 0x93, 0xed, 0xe4, 0xe8, 0xff, 0x1c, 0x6f, 0x17, 0xe6, 0x24, 0x3e, 0x3f, 0x3d, 0xa8, 0xfc, 0x17, 0x09, 0x87, 0x0e,
-	0xc4, 0x5f, 0xba, 0x82, 0x3a, 0x26, 0x3f, 0x0c, 0xef, 0xa1, 0xf7, 0x09, 0x3b, 0x19, 0x09, 0x92, 0x83, 0x26, 0x33, 0x37, 0x05, 0x04, 0x3a, 0x29, 0xbd, 0xa6, 0xf9, 0xb4, 0x34,
-	0x2c, 0xc8, 0xdf, 0x54, 0x3c, 0xb1, 0xa1, 0x18, 0x2f, 0x7c, 0x5f, 0xff, 0x33, 0xf1, 0x04, 0x90, 0xfa, 0xca, 0x5b, 0x25, 0x36, 0x0b, 0x76, 0x01, 0x5e, 0x9c, 0x5a, 0x06, 0xab,
-	0x8e, 0xe0, 0x2f, 0x00, 0xd2, 0xe8, 0xd5, 0x98, 0x61, 0x04, 0xaa, 0xcc, 0x4d, 0xd4, 0x75, 0xfd, 0x96, 0xee, 0x9c, 0xe4, 0xe3, 0x26, 0xf2, 0x1b, 0x83, 0xc7, 0x05, 0x85, 0x77,
-	0xb3, 0x87, 0x32, 0xcd, 0xda, 0xbc, 0x6a, 0x6b, 0xed, 0x13, 0xfb, 0x0d, 0x49, 0xd3, 0x8a, 0x45, 0xeb, 0x87, 0xa5, 0xf4
-]);
-
-export type KeyContainer = {
-	kid: string;
-	key: string;
-};
-
-export type ContentDecryptionModule = {
-	privateKey: Buffer;
-	identifierBlob: Buffer;
-};
-
-export class Session {
-	private _devicePrivateKey: forge.pki.rsa.PrivateKey;
-	private _identifierBlob: ClientIdentification;
-	private _pssh: Buffer;
-	private _rawLicenseRequest?: Buffer;
-	private _serviceCertificate?: SignedDrmCertificate;
-
-	constructor(contentDecryptionModule: ContentDecryptionModule, pssh: Buffer) {
-		this._devicePrivateKey = forge.pki.privateKeyFromPem(contentDecryptionModule.privateKey.toString('binary'));
-
-		this._identifierBlob = fromBinary(ClientIdentificationSchema, contentDecryptionModule.identifierBlob);
-		this._pssh = pssh;
-	}
-
-	async setDefaultServiceCertificate() {
-		await this.setServiceCertificate(Buffer.from(COMMON_SERVICE_CERTIFICATE));
-	}
-
-	async setServiceCertificateFromMessage(rawSignedMessage: Buffer) {
-		const signedMessage: SignedMessage = fromBinary(SignedMessageSchema, rawSignedMessage);
-		if (!signedMessage.msg) {
-			throw new Error('the service certificate message does not contain a message');
-		}
-		await this.setServiceCertificate(Buffer.from(signedMessage.msg));
-	}
-
-	async setServiceCertificate(serviceCertificate: Buffer) {
-		const signedServiceCertificate: SignedDrmCertificate = fromBinary(SignedDrmCertificateSchema, serviceCertificate);
-		if (!(await this._verifyServiceCertificate(signedServiceCertificate))) {
-			throw new Error('Service certificate is not signed by the Widevine root certificate');
-		}
-		this._serviceCertificate = signedServiceCertificate;
-	}
-
-	createLicenseRequest(licenseType: LicenseType = LicenseType.STREAMING, android: boolean = false): Buffer {
-		if (!this._pssh.subarray(12, 28).equals(Buffer.from(WIDEVINE_SYSTEM_ID))) {
-			throw new Error('the pssh is not an actuall pssh');
-		}
-
-		const pssh = this._parsePSSH(this._pssh);
-		if (!pssh) {
-			throw new Error('pssh is invalid');
-		}
-
-		const licenseRequest: LicenseRequest = create(LicenseRequestSchema, {
-			type: LicenseRequest_RequestType.NEW,
-			contentId: create(LicenseRequest_ContentIdentificationSchema, {
-				contentIdVariant: {
-					case: 'widevinePsshData',
-					value: create(LicenseRequest_ContentIdentification_WidevinePsshDataSchema, {
-						psshData: [this._pssh.subarray(32)],
-						licenseType: licenseType,
-						requestId: android ? this._generateAndroidIdentifier() : this._generateGenericIdentifier()
-					})
-				}
-			}),
-			requestTime: BigInt(Date.now()) / BigInt(1000),
-			protocolVersion: ProtocolVersion.VERSION_2_1,
-			keyControlNonce: Math.floor(Math.random() * 2 ** 31)
-		});
-
-		if (this._serviceCertificate) {
-			const encryptedClientIdentification = this._encryptClientIdentification(this._identifierBlob, this._serviceCertificate);
-			licenseRequest.encryptedClientId = encryptedClientIdentification;
-		} else {
-			licenseRequest.clientId = this._identifierBlob;
-		}
-
-		this._rawLicenseRequest = Buffer.from(toBinary(LicenseRequestSchema, licenseRequest));
-
-		const pss: forge.pss.PSS = forge.pss.create({ md: forge.md.sha1.create(), mgf: forge.mgf.mgf1.create(forge.md.sha1.create()), saltLength: 20 });
-		const md = forge.md.sha1.create();
-		md.update(this._rawLicenseRequest.toString('binary'), 'raw');
-		const signature = Buffer.from(this._devicePrivateKey.sign(md, pss), 'binary');
-
-		const signedLicenseRequest: SignedMessage = create(SignedMessageSchema, {
-			type: SignedMessage_MessageType.LICENSE_REQUEST,
-			msg: this._rawLicenseRequest,
-			signature: signature
-		});
-
-		return Buffer.from(toBinary(SignedMessageSchema, signedLicenseRequest));
-	}
-
-	parseLicense(rawLicense: Buffer) {
-		if (!this._rawLicenseRequest) {
-			throw new Error('please request a license first');
-		}
-
-		const signedLicense = fromBinary(SignedMessageSchema, rawLicense);
-		if (!signedLicense.sessionKey) {
-			throw new Error('the license does not contain a session key');
-		}
-		if (!signedLicense.msg) {
-			throw new Error('the license does not contain a message');
-		}
-		if (!signedLicense.signature) {
-			throw new Error('the license does not contain a signature');
-		}
-
-		const sessionKey = this._devicePrivateKey.decrypt(Buffer.from(signedLicense.sessionKey).toString('binary'), 'RSA-OAEP', {
-			md: forge.md.sha1.create()
-		});
-
-		const cmac = new AES_CMAC(Buffer.from(sessionKey, 'binary'));
-
-		const encKeyBase = Buffer.concat([Buffer.from('ENCRYPTION'), Buffer.from('\x00', 'ascii'), this._rawLicenseRequest, Buffer.from('\x00\x00\x00\x80', 'ascii')]);
-		const authKeyBase = Buffer.concat([Buffer.from('AUTHENTICATION'), Buffer.from('\x00', 'ascii'), this._rawLicenseRequest, Buffer.from('\x00\x00\x02\x00', 'ascii')]);
-
-		const encKey = cmac.calculate(Buffer.concat([Buffer.from('\x01'), encKeyBase]));
-		const serverKey = Buffer.concat([cmac.calculate(Buffer.concat([Buffer.from('\x01'), authKeyBase])), cmac.calculate(Buffer.concat([Buffer.from('\x02'), authKeyBase]))]);
-		/*const clientKey = Buffer.concat([
-      cmac.calculate(Buffer.concat([Buffer.from("\x03"), authKeyBase])),
-      cmac.calculate(Buffer.concat([Buffer.from("\x04"), authKeyBase]))
-    ]);*/
-
-		const hmac = forge.hmac.create();
-		hmac.start(forge.md.sha256.create(), serverKey.toString('binary'));
-		hmac.update(Buffer.from(signedLicense.msg).toString('binary'));
-		const calculatedSignature = Buffer.from(hmac.digest().data, 'binary');
-
-		if (!calculatedSignature.equals(signedLicense.signature)) {
-			throw new Error('signatures do not match');
-		}
-
-		const license = fromBinary(LicenseSchema, signedLicense.msg);
-
-		const keyContainers = license.key
-			.filter((k) => k.id)
-			.map((keyContainer) => {
-				if (keyContainer.type && keyContainer.key && keyContainer.iv) {
-					const keyId = Buffer.from(keyContainer.id!).toString('hex');
-					const decipher = forge.cipher.createDecipher('AES-CBC', encKey.toString('binary'));
-					decipher.start({ iv: Buffer.from(keyContainer.iv).toString('binary') });
-					decipher.update(forge.util.createBuffer(new Uint8Array(keyContainer.key)));
-					decipher.finish();
-					const decryptedKey = Buffer.from(decipher.output.data, 'binary');
-					const key: KeyContainer = {
-						kid: keyId,
-						key: decryptedKey.toString('hex')
-					};
-					return key;
-				}
-			});
-		if (keyContainers.filter((container) => !!container).length < 1) {
-			throw new Error('there was not a single valid key in the response');
-		}
-		return keyContainers;
-	}
-
-	private _encryptClientIdentification(clientIdentification: ClientIdentification, signedServiceCertificate: SignedDrmCertificate): EncryptedClientIdentification {
-		if (!signedServiceCertificate.drmCertificate) {
-			throw new Error('the service certificate does not contain an actual certificate');
-		}
-
-		const serviceCertificate = fromBinary(DrmCertificateSchema, signedServiceCertificate.drmCertificate);
-		if (!serviceCertificate.publicKey) {
-			throw new Error('the service certificate does not contain a public key');
-		}
-
-		const key = forge.random.getBytesSync(16);
-		const iv = forge.random.getBytesSync(16);
-		const cipher = forge.cipher.createCipher('AES-CBC', key);
-		cipher.start({ iv: iv });
-		cipher.update(forge.util.createBuffer(toBinary(ClientIdentificationSchema, clientIdentification)));
-		cipher.finish();
-		const rawEncryptedClientIdentification = Buffer.from(cipher.output.data, 'binary');
-
-		const publicKey = forge.pki.publicKeyFromAsn1(forge.asn1.fromDer(Buffer.from(serviceCertificate.publicKey).toString('binary')));
-		const encryptedKey = publicKey.encrypt(key, 'RSA-OAEP', { md: forge.md.sha1.create() });
-
-		const encryptedClientIdentification: EncryptedClientIdentification = create(EncryptedClientIdentificationSchema, {
-			encryptedClientId: rawEncryptedClientIdentification,
-			encryptedClientIdIv: Buffer.from(iv, 'binary'),
-			encryptedPrivacyKey: Buffer.from(encryptedKey, 'binary'),
-			providerId: serviceCertificate.providerId,
-			serviceCertificateSerialNumber: serviceCertificate.serialNumber
-		});
-		return encryptedClientIdentification;
-	}
-
-	private async _verifyServiceCertificate(signedServiceCertificate: SignedDrmCertificate): Promise<boolean> {
-		if (!signedServiceCertificate.drmCertificate) {
-			throw new Error('the service certificate does not contain an actual certificate');
-		}
-		if (!signedServiceCertificate.signature) {
-			throw new Error('the service certificate does not contain a signature');
-		}
-
-		const publicKey = forge.pki.publicKeyFromAsn1(forge.asn1.fromDer(Buffer.from(WIDEVINE_ROOT_PUBLIC_KEY).toString('binary')));
-		const pss: forge.pss.PSS = forge.pss.create({ md: forge.md.sha1.create(), mgf: forge.mgf.mgf1.create(forge.md.sha1.create()), saltLength: 20 });
-		const sha1 = forge.md.sha1.create();
-		sha1.update(Buffer.from(signedServiceCertificate.drmCertificate).toString('binary'), 'raw');
-		return publicKey.verify(sha1.digest().bytes(), Buffer.from(signedServiceCertificate.signature).toString('binary'), pss);
-	}
-
-	private _parsePSSH(pssh: Buffer): WidevinePsshData | null {
-		try {
-			return fromBinary(WidevinePsshDataSchema, pssh.subarray(32));
-		} catch {
-			return null;
-		}
-	}
-
-	private _generateAndroidIdentifier(): Buffer {
-		return Buffer.from(`${forge.util.bytesToHex(forge.random.getBytesSync(8))}${'01'}${'00000000000000'}`);
-	}
-
-	private _generateGenericIdentifier(): Buffer {
-		return Buffer.from(forge.random.getBytesSync(16), 'binary');
-	}
-
-	get pssh(): Buffer {
-		return this._pssh;
-	}
-}

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "multi-downloader-nx",
 	"short_name": "aniDL",
-	"version": "5.6.1",
+	"version": "5.6.9",
 	"description": "Downloader for Crunchyroll, Hidive, and AnimationDigitalNetwork with CLI and GUI",
 	"keywords": [
 		"download",
@@ -15,8 +15,8 @@
 		"gui"
 	],
 	"engines": {
-		"node": ">=18",
-		"pnpm": ">=7"
+		"node": ">=22",
+		"pnpm": ">=10"
 	},
 	"author": "AnimeDL <AnimeDL@users.noreply.github.com>",
 	"contributors": [
@@ -40,57 +40,44 @@
 	},
 	"license": "MIT",
 	"dependencies": {
-		"@bufbuild/protobuf": "^2.9.0",
-		"binary-parser": "^2.2.1",
-		"binary-parser-encoder": "^1.5.3",
-		"bn.js": "^5.2.2",
-		"cors": "^2.8.5",
-		"elliptic": "^6.6.1",
-		"esbuild": "^0.25.10",
-		"express": "^5.1.0",
-		"fast-xml-parser": "^5.3.0",
-		"ffprobe": "^1.1.2",
-		"fs-extra": "^11.3.2",
+		"@bufbuild/protobuf": "^2.10.2",
+		"commander": "^14.0.2",
+		"express": "^5.2.1",
 		"iso-639": "^0.2.2",
-		"leven": "^3.1.0",
+		"leven": "^4.1.0",
 		"log4js": "^6.9.1",
-		"long": "^5.3.2",
 		"lookpath": "^1.2.3",
-		"m3u8-parsed": "^2.0.0",
+		"m3u8-parser": "^7.2.0",
+		"mediainfo.js": "^0.3.6",
 		"mpd-parser": "^1.3.1",
-		"node-forge": "^1.3.1",
-		"open": "^8.4.2",
-		"protobufjs": "^7.5.4",
-		"puppeteer-real-browser": "^1.4.4",
+		"node-playready": "^1.1.1",
+		"open": "^11.0.0",
 		"undici": "^7.16.0",
+		"widevine": "^1.0.3",
 		"ws": "^8.18.3",
-		"yaml": "^2.8.1",
-		"yargs": "17.7.2"
+		"yaml": "^2.8.2"
 	},
 	"devDependencies": {
-		"@bufbuild/buf": "^1.58.0",
-		"@bufbuild/protoc-gen-es": "^2.9.0",
-		"@eslint/js": "^9.37.0",
-		"@types/bn.js": "^5.2.0",
-		"@types/cors": "^2.8.19",
-		"@types/elliptic": "^6.4.18",
-		"@types/express": "^5.0.3",
-		"@types/ffprobe": "^1.1.8",
-		"@types/fs-extra": "^11.0.4",
-		"@types/node": "^24.7.1",
-		"@types/node-forge": "^1.3.14",
+		"@commitlint/cli": "^20.2.0",
+		"@commitlint/config-conventional": "^20.2.0",
+		"@eslint/js": "^9.39.2",
+		"@types/express": "^5.0.6",
+		"@types/m3u8-parser": "^7.2.5",
+		"@types/node": "^25.0.3",
 		"@types/ws": "^8.18.1",
-		"@types/yargs": "^17.0.33",
-		"@typescript-eslint/eslint-plugin": "^8.46.0",
-		"@typescript-eslint/parser": "^8.46.0",
-		"@yao-pkg/pkg": "^6.8.0",
-		"eslint": "^9.37.0",
+		"@typescript-eslint/eslint-plugin": "^8.50.0",
+		"@typescript-eslint/parser": "^8.50.0",
+		"@yao-pkg/pkg": "^6.11.0",
+		"esbuild": "0.26.0",
+		"eslint": "^9.39.2",
 		"eslint-config-prettier": "^10.1.8",
-		"prettier": "^3.6.2",
+		"husky": "^9.1.7",
+		"jiti": "^2.6.1",
+		"prettier": "^3.7.4",
 		"removeNPMAbsolutePaths": "^3.0.1",
 		"ts-node": "^10.9.2",
 		"typescript": "^5.9.3",
-		"typescript-eslint": "^8.46.0"
+		"typescript-eslint": "^8.50.0"
 	},
 	"scripts": {
 		"prestart": "pnpm run tsc test",
@@ -100,7 +87,7 @@
 		"tsc": "ts-node tsc.ts",
 		"eslint": "npx eslint . --quiet",
 		"prettier": "npx prettier . --check",
-		"prettier-fix": "npx prettier . --write",
+		"prettier:fix": "npx prettier . --write",
 		"pretest": "pnpm run tsc",
 		"proto:compile": "protoc --plugin=protoc-gen-ts_proto=.\\node_modules\\.bin\\protoc-gen-ts_proto.cmd --ts_proto_opt=\"esModuleInterop=true\" --ts_proto_opt=\"forceLong=long\" --ts_proto_opt=\"env=node\" --ts_proto_out=. modules/*.proto",
 		"prebuild-cli": "pnpm run tsc false false",
@@ -123,7 +110,12 @@
 		"build-macos-arm64-gui": "pnpm run prebuild-gui && cd lib && node modules/build macos-arm64 true",
 		"build-alpine-x64-gui": "pnpm run prebuild-gui && cd lib && node modules/build alpine-x64 true",
 		"build-alpine-arm64-gui": "pnpm run prebuild-gui && cd lib && node modules/build alpine-arm64 true",
-		"test-x64": "pnpm run pretest && cd lib && node modules/build windows-x64 && node modules/build macos-x64 && node modules/build linuxstatic-x64 && node modules/build alpine-x64 && node modules/build linuxstatic-armv7",
-		"test-arm64": "pnpm run pretest && cd lib && node modules/build windows-arm64 && node modules/build macos-arm64 && node modules/build linuxstatic-arm64 && node modules/build alpine-x64"
+		"test-windows-x64": "pnpm run pretest && cd lib && node modules/build windows-x64",
+		"test-linux-x64": "pnpm run pretest && cd lib && node modules/build linuxstatic-x64 && node modules/build alpine-x64",
+		"test-macos-x64": "pnpm run pretest && cd lib && node modules/build macos-x64",
+		"test-windows-arm64": "pnpm run pretest && cd lib && node modules/build windows-arm64",
+		"test-linux-arm64": "pnpm run pretest && cd lib && node modules/build linuxstatic-arm64 && node modules/build alpine-x64",
+		"test-macos-arm64": "pnpm run pretest && cd lib && node modules/build macos-arm64",
+		"prepare": "husky"
 	}
 }

tsc.ts

@@ -1,7 +1,6 @@
 import { ChildProcess, exec } from 'child_process';
-import fs from 'fs-extra';
 import path from 'path';
-import { removeSync, copyFileSync } from 'fs-extra';
+import fs from 'fs';
 
 const argv = process.argv.slice(2);
 let buildIgnore: string[] = [];
@@ -29,7 +28,6 @@ const ignore = [
 	'*/*\\.tsx?$',
 	'./fonts*',
 	'./gui/react*',
-	'./dev.js$',
 	'*/node_modules/*',
 	'./widevine/*',
 	'./playready/*',
@@ -57,15 +55,14 @@ export { ignore };
 	};
 
 	process.stdout.write('Removing lib dir... ');
-	removeSync('lib');
+	fs.rmSync('lib', { recursive: true, force: true });
 	process.stdout.write('✓\nRunning tsc... ');
 	const tsc = exec('npx tsc');
 
 	await waitForProcess(tsc);
 
 	if (!isGUI) {
-		fs.emptyDirSync(path.join('lib', 'gui'));
-		fs.rmdirSync(path.join('lib', 'gui'));
+		fs.rmSync(path.join('lib', 'gui'), { recursive: true, force: true });
 	}
 
 	if (!isTest && isGUI) {
@@ -97,9 +94,9 @@ export { ignore };
 	files.forEach((item) => {
 		const itemPath = path.join(__dirname, 'lib', item.path.replace(__dirname, ''));
 		if (item.stats.isDirectory()) {
-			if (!fs.existsSync(itemPath)) fs.mkdirSync(itemPath);
+			if (!fs.existsSync(itemPath)) fs.mkdirSync(itemPath, { recursive: true });
 		} else {
-			copyFileSync(item.path, itemPath);
+			fs.cpSync(item.path, itemPath, { recursive: true });
 		}
 	});
 

tsconfig.json

@@ -1,7 +1,7 @@
 {
 	"compilerOptions": {
 		"target": "ES2020",
-		"module": "commonjs",
+		"module": "CommonJS",
 		"outDir": "./lib",
 		"strict": true,
 		"esModuleInterop": true,
@@ -9,6 +9,7 @@
 		"skipLibCheck": true,
 		"forceConsistentCasingInFileNames": true,
 		"downlevelIteration": true,
+		"removeComments": true,
 		"jsx": "react"
 	},
 	"exclude": ["./videos", "./tsc.ts", "lib/**/*", "gui/react/**/*"]