diff --git a/build.js b/build.js index bbb5ab1..2085e79 100644 --- a/build.js +++ b/build.js @@ -26,6 +26,8 @@ const options = { output: 'crunchyroll-downloader-output-${version}' }, + electronLanguages: ['en-US'], + win: { compression: 'maximum', artifactName: 'crunchyroll-downloader-${version}-windows-installer.${ext}', diff --git a/components/Settings/Main.vue b/components/Settings/Main.vue index 4c7f96b..603bb10 100644 --- a/components/Settings/Main.vue +++ b/components/Settings/Main.vue @@ -150,14 +150,18 @@ const toggleSub = (lang: { locale: string; name: string }) => { if (index !== -1) { subLocales.value.splice(index, 1) - ;(window as any).myAPI.setArraySub(JSON.stringify(subLocales.value)) + if (process.client) { + ;(window as any).myAPI.setArraySub(JSON.stringify(subLocales.value)) + } return } if (index === -1) { subLocales.value.push(lang) - ;(window as any).myAPI.setArraySub(JSON.stringify(subLocales.value)) + if (process.client) { + ;(window as any).myAPI.setArraySub(JSON.stringify(subLocales.value)) + } return } @@ -237,11 +241,30 @@ const selectMaxDownloads = () => { } onMounted(() => { + if (!(window as any).myAPI) return ;(window as any).myAPI.getArray('defdubarray').then((result: any) => { - dubLocales.value = JSON.parse(result) + try { + if (result.length !== 0 && result !== null && result !== undefined && result !== '') { + dubLocales.value = JSON.parse(result) + } else { + dubLocales.value = [] + } + } catch (e) { + console.error('Failed to parse JSON:', e) + dubLocales.value = [] + } }) ;(window as any).myAPI.getArray('defsubarray').then((result: any) => { - subLocales.value = JSON.parse(result) + try { + if (result.length !== 0 && result !== null && result !== undefined && result !== '') { + subLocales.value = JSON.parse(result) + } else { + subLocales.value = [] + } + } catch (e) { + console.error('Failed to parse JSON:', e) + subLocales.value = [] + } }) ;(window as any).myAPI.getDefaultVideoQuality().then((result: any) => { selectedVideoQuality.value = result diff --git a/package.json b/package.json index f3b4698..370a749 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "transpile-src": "tsc -p ./src --outDir .output/src", "dev:electron": "NODE_ENV=development concurrently --kill-others \"nuxt dev\" \"tsc-watch -p ./src --outDir .output/src --onSuccess 'electron ./.output/src/electron/background.js'\"", "dev:electron:win": "set NODE_ENV=development& concurrently --kill-others \"nuxt dev\" \"tsc-watch -p ./src --outDir .output/src --onSuccess run.electron\"", - "build:electron": "pnpm prettier:fix && nuxt generate && pnpm transpile-src && node build.js", + "build:electron": "pnpm prettier:fix && modclean --run && nuxt generate && pnpm transpile-src && node build.js", "prettier:fix": "pnpm prettier src --write && pnpm prettier components --write && pnpm prettier pages --write && pnpm prettier build.js --write" }, "devDependencies": { @@ -42,7 +42,7 @@ "sass": "^1.77.6", "sass-loader": "^13.3.3", "tsc-watch": "^6.2.0", - "typescript": "5.4.4", + "typescript": "^5.5.2", "wait-on": "^7.2.0" }, "dependencies": { @@ -74,7 +74,8 @@ "!**/.git/*", "!**/.github/*", "!**/.nuxt/*", - "!**/.vscode/*" + "!**/.vscode/*", + "!**/*.md" ], "extraResources": [ "./ffmpeg/**", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7bfbf72..4913820 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -71,7 +71,7 @@ importers: version: 5.2.0 '@nuxtjs/eslint-config-typescript': specifier: ^12.1.0 - version: 12.1.0(eslint@8.57.0)(typescript@5.4.4) + version: 12.1.0(eslint@8.57.0)(typescript@5.5.2) '@nuxtjs/google-fonts': specifier: ^3.2.0 version: 3.2.0(magicast@0.3.4)(rollup@4.18.0) @@ -80,7 +80,7 @@ importers: version: 6.12.0(magicast@0.3.4)(rollup@4.18.0) '@pinia/nuxt': specifier: ^0.4.11 - version: 0.4.11(magicast@0.3.4)(rollup@4.18.0)(typescript@5.4.4)(vue@3.4.31(typescript@5.4.4)) + version: 0.4.11(magicast@0.3.4)(rollup@4.18.0)(typescript@5.5.2)(vue@3.4.31(typescript@5.5.2)) '@types/crypto-js': specifier: ^4.2.2 version: 4.2.2 @@ -122,10 +122,10 @@ importers: version: 3.0.0-beta.1 nuxt: specifier: 3.11.2 - version: 3.11.2(@opentelemetry/api@1.9.0)(@parcel/watcher@2.4.1)(@types/node@20.14.9)(encoding@0.1.13)(eslint@8.57.0)(ioredis@5.4.1)(magicast@0.3.4)(optionator@0.9.4)(rollup@4.18.0)(sass@1.77.6)(terser@5.31.1)(typescript@5.4.4)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)) + version: 3.11.2(@opentelemetry/api@1.9.0)(@parcel/watcher@2.4.1)(@types/node@20.14.9)(encoding@0.1.13)(eslint@8.57.0)(ioredis@5.4.1)(magicast@0.3.4)(optionator@0.9.4)(rollup@4.18.0)(sass@1.77.6)(terser@5.31.1)(typescript@5.5.2)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)) nuxt-icon: specifier: ^0.6.10 - version: 0.6.10(magicast@0.3.4)(rollup@4.18.0)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))(vue@3.4.31(typescript@5.4.4)) + version: 0.6.10(magicast@0.3.4)(rollup@4.18.0)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))(vue@3.4.31(typescript@5.5.2)) prettier: specifier: ^2.8.8 version: 2.8.8 @@ -137,10 +137,10 @@ importers: version: 13.3.3(sass@1.77.6)(webpack@5.92.1) tsc-watch: specifier: ^6.2.0 - version: 6.2.0(typescript@5.4.4) + version: 6.2.0(typescript@5.5.2) typescript: - specifier: 5.4.4 - version: 5.4.4 + specifier: ^5.5.2 + version: 5.5.2 wait-on: specifier: ^7.2.0 version: 7.2.0 @@ -664,8 +664,8 @@ packages: peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 - '@eslint-community/regexpp@4.10.1': - resolution: {integrity: sha512-Zm2NGpWELsQAD1xsJzGQpYfvICSsFkEpU0jxBjfdC6uNEWXcHnfs9hScFWtXVDVl+rBQJGrl4g1vcKIejpH9dA==} + '@eslint-community/regexpp@4.11.0': + resolution: {integrity: sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} '@eslint/eslintrc@2.1.4': @@ -3404,8 +3404,8 @@ packages: resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==} engines: {node: '>= 6'} - https-proxy-agent@7.0.4: - resolution: {integrity: sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==} + https-proxy-agent@7.0.5: + resolution: {integrity: sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==} engines: {node: '>= 14'} httpxy@0.1.5: @@ -4308,8 +4308,8 @@ packages: '@types/node': optional: true - nypm@0.3.8: - resolution: {integrity: sha512-IGWlC6So2xv6V4cIDmoV0SwwWx7zLG086gyqkyumteH2fIgCAM4nDVFB2iDRszDvmdSVW9xb1N+2KjQ6C7d4og==} + nypm@0.3.9: + resolution: {integrity: sha512-BI2SdqqTHg2d4wJh8P9A1W+bslg33vOE9IZDY6eR2QC+Pu1iNBVZUqczrd43rJb+fMzHU7ltAYKsEFY/kHMFcw==} engines: {node: ^14.16.0 || >=16.10.0} hasBin: true @@ -5278,8 +5278,8 @@ packages: resolution: {integrity: sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==} engines: {node: '>= 10'} - socks-proxy-agent@8.0.3: - resolution: {integrity: sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A==} + socks-proxy-agent@8.0.4: + resolution: {integrity: sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==} engines: {node: '>= 14'} socks@2.8.3: @@ -5693,8 +5693,8 @@ packages: typedarray-to-buffer@3.1.5: resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==} - typescript@5.4.4: - resolution: {integrity: sha512-dGE2Vv8cpVvw28v8HCPqyb08EzbBURxDpuhJvTrusShUfGnhHBafDsLdS1EhhxyL6BJQE+2cT3dDPAv+MQ6oLw==} + typescript@5.5.2: + resolution: {integrity: sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==} engines: {node: '>=14.17'} hasBin: true @@ -6645,7 +6645,7 @@ snapshots: eslint: 8.57.0 eslint-visitor-keys: 3.4.3 - '@eslint-community/regexpp@4.10.1': {} + '@eslint-community/regexpp@4.11.0': {} '@eslint/eslintrc@2.1.4': dependencies: @@ -6725,10 +6725,10 @@ snapshots: '@iconify/types@2.0.0': {} - '@iconify/vue@4.1.2(vue@3.4.31(typescript@5.4.4))': + '@iconify/vue@4.1.2(vue@3.4.31(typescript@5.5.2))': dependencies: '@iconify/types': 2.0.0 - vue: 3.4.31(typescript@5.4.4) + vue: 3.4.31(typescript@5.5.2) '@ioredis/commands@1.2.0': {} @@ -6849,9 +6849,9 @@ snapshots: dependencies: agent-base: 7.1.1 http-proxy-agent: 7.0.2 - https-proxy-agent: 7.0.4 + https-proxy-agent: 7.0.5 lru-cache: 10.3.0 - socks-proxy-agent: 8.0.3 + socks-proxy-agent: 8.0.4 transitivePeerDependencies: - supports-color @@ -6923,7 +6923,7 @@ snapshots: local-pkg: 0.5.0 magicast: 0.3.4 npm-registry-fetch: 17.1.0 - nypm: 0.3.8 + nypm: 0.3.9 ohash: 1.1.3 pathe: 1.1.2 perfect-debounce: 1.0.0 @@ -7058,12 +7058,12 @@ snapshots: '@nuxt/ui-templates@1.3.4': {} - '@nuxt/vite-builder@3.11.2(@types/node@20.14.9)(eslint@8.57.0)(magicast@0.3.4)(optionator@0.9.4)(rollup@4.18.0)(sass@1.77.6)(terser@5.31.1)(typescript@5.4.4)(vue@3.4.31(typescript@5.4.4))': + '@nuxt/vite-builder@3.11.2(@types/node@20.14.9)(eslint@8.57.0)(magicast@0.3.4)(optionator@0.9.4)(rollup@4.18.0)(sass@1.77.6)(terser@5.31.1)(typescript@5.5.2)(vue@3.4.31(typescript@5.5.2))': dependencies: '@nuxt/kit': 3.11.2(magicast@0.3.4)(rollup@4.18.0) '@rollup/plugin-replace': 5.0.7(rollup@4.18.0) - '@vitejs/plugin-vue': 5.0.5(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))(vue@3.4.31(typescript@5.4.4)) - '@vitejs/plugin-vue-jsx': 3.1.0(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))(vue@3.4.31(typescript@5.4.4)) + '@vitejs/plugin-vue': 5.0.5(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))(vue@3.4.31(typescript@5.5.2)) + '@vitejs/plugin-vue-jsx': 3.1.0(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))(vue@3.4.31(typescript@5.5.2)) autoprefixer: 10.4.19(postcss@8.4.38) clear: 0.1.0 consola: 3.2.3 @@ -7092,8 +7092,8 @@ snapshots: unplugin: 1.10.1 vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1) vite-node: 1.6.0(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1) - vite-plugin-checker: 0.6.4(eslint@8.57.0)(optionator@0.9.4)(typescript@5.4.4)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)) - vue: 3.4.31(typescript@5.4.4) + vite-plugin-checker: 0.6.4(eslint@8.57.0)(optionator@0.9.4)(typescript@5.5.2)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)) + vue: 3.4.31(typescript@5.5.2) vue-bundle-renderer: 2.1.0 transitivePeerDependencies: - '@types/node' @@ -7116,14 +7116,14 @@ snapshots: - vti - vue-tsc - '@nuxtjs/eslint-config-typescript@12.1.0(eslint@8.57.0)(typescript@5.4.4)': + '@nuxtjs/eslint-config-typescript@12.1.0(eslint@8.57.0)(typescript@5.5.2)': dependencies: - '@nuxtjs/eslint-config': 12.0.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0) - '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint@8.57.0)(typescript@5.4.4) - '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.4.4) + '@nuxtjs/eslint-config': 12.0.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0) + '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)(typescript@5.5.2) + '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.5.2) eslint: 8.57.0 - eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint-plugin-import@2.29.1)(eslint@8.57.0) - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) + eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) eslint-plugin-vue: 9.26.0(eslint@8.57.0) transitivePeerDependencies: - eslint-import-resolver-node @@ -7131,11 +7131,11 @@ snapshots: - supports-color - typescript - '@nuxtjs/eslint-config@12.0.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0)': + '@nuxtjs/eslint-config@12.0.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0)': dependencies: eslint: 8.57.0 - eslint-config-standard: 17.1.0(eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0))(eslint-plugin-n@15.7.0(eslint@8.57.0))(eslint-plugin-promise@6.2.0(eslint@8.57.0))(eslint@8.57.0) - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) + eslint-config-standard: 17.1.0(eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0))(eslint-plugin-n@15.7.0(eslint@8.57.0))(eslint-plugin-promise@6.2.0(eslint@8.57.0))(eslint@8.57.0) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) eslint-plugin-n: 15.7.0(eslint@8.57.0) eslint-plugin-node: 11.1.0(eslint@8.57.0) eslint-plugin-promise: 6.2.0(eslint@8.57.0) @@ -7396,10 +7396,10 @@ snapshots: '@parcel/watcher-win32-ia32': 2.4.1 '@parcel/watcher-win32-x64': 2.4.1 - '@pinia/nuxt@0.4.11(magicast@0.3.4)(rollup@4.18.0)(typescript@5.4.4)(vue@3.4.31(typescript@5.4.4))': + '@pinia/nuxt@0.4.11(magicast@0.3.4)(rollup@4.18.0)(typescript@5.5.2)(vue@3.4.31(typescript@5.5.2))': dependencies: '@nuxt/kit': 3.12.2(magicast@0.3.4)(rollup@4.18.0) - pinia: 2.1.7(typescript@5.4.4)(vue@3.4.31(typescript@5.4.4)) + pinia: 2.1.7(typescript@5.5.2)(vue@3.4.31(typescript@5.5.2)) transitivePeerDependencies: - '@vue/composition-api' - magicast @@ -7708,13 +7708,13 @@ snapshots: '@types/node': 20.14.9 optional: true - '@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint@8.57.0)(typescript@5.4.4)': + '@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)(typescript@5.5.2)': dependencies: - '@eslint-community/regexpp': 4.10.1 - '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.4.4) + '@eslint-community/regexpp': 4.11.0 + '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.5.2) '@typescript-eslint/scope-manager': 6.21.0 - '@typescript-eslint/type-utils': 6.21.0(eslint@8.57.0)(typescript@5.4.4) - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.4.4) + '@typescript-eslint/type-utils': 6.21.0(eslint@8.57.0)(typescript@5.5.2) + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.5.2) '@typescript-eslint/visitor-keys': 6.21.0 debug: 4.3.5 eslint: 8.57.0 @@ -7722,22 +7722,22 @@ snapshots: ignore: 5.3.1 natural-compare: 1.4.0 semver: 7.6.2 - ts-api-utils: 1.3.0(typescript@5.4.4) + ts-api-utils: 1.3.0(typescript@5.5.2) optionalDependencies: - typescript: 5.4.4 + typescript: 5.5.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4)': + '@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2)': dependencies: '@typescript-eslint/scope-manager': 6.21.0 '@typescript-eslint/types': 6.21.0 - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.4.4) + '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.5.2) '@typescript-eslint/visitor-keys': 6.21.0 debug: 4.3.5 eslint: 8.57.0 optionalDependencies: - typescript: 5.4.4 + typescript: 5.5.2 transitivePeerDependencies: - supports-color @@ -7746,21 +7746,21 @@ snapshots: '@typescript-eslint/types': 6.21.0 '@typescript-eslint/visitor-keys': 6.21.0 - '@typescript-eslint/type-utils@6.21.0(eslint@8.57.0)(typescript@5.4.4)': + '@typescript-eslint/type-utils@6.21.0(eslint@8.57.0)(typescript@5.5.2)': dependencies: - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.4.4) - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.4.4) + '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.5.2) + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.5.2) debug: 4.3.5 eslint: 8.57.0 - ts-api-utils: 1.3.0(typescript@5.4.4) + ts-api-utils: 1.3.0(typescript@5.5.2) optionalDependencies: - typescript: 5.4.4 + typescript: 5.5.2 transitivePeerDependencies: - supports-color '@typescript-eslint/types@6.21.0': {} - '@typescript-eslint/typescript-estree@6.21.0(typescript@5.4.4)': + '@typescript-eslint/typescript-estree@6.21.0(typescript@5.5.2)': dependencies: '@typescript-eslint/types': 6.21.0 '@typescript-eslint/visitor-keys': 6.21.0 @@ -7769,20 +7769,20 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.3 semver: 7.6.2 - ts-api-utils: 1.3.0(typescript@5.4.4) + ts-api-utils: 1.3.0(typescript@5.5.2) optionalDependencies: - typescript: 5.4.4 + typescript: 5.5.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@6.21.0(eslint@8.57.0)(typescript@5.4.4)': + '@typescript-eslint/utils@6.21.0(eslint@8.57.0)(typescript@5.5.2)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) '@types/json-schema': 7.0.15 '@types/semver': 7.5.8 '@typescript-eslint/scope-manager': 6.21.0 '@typescript-eslint/types': 6.21.0 - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.4.4) + '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.5.2) eslint: 8.57.0 semver: 7.6.2 transitivePeerDependencies: @@ -7815,13 +7815,13 @@ snapshots: '@unhead/schema': 1.9.14 '@unhead/shared': 1.9.14 - '@unhead/vue@1.9.14(vue@3.4.31(typescript@5.4.4))': + '@unhead/vue@1.9.14(vue@3.4.31(typescript@5.5.2))': dependencies: '@unhead/schema': 1.9.14 '@unhead/shared': 1.9.14 hookable: 5.5.3 unhead: 1.9.14 - vue: 3.4.31(typescript@5.4.4) + vue: 3.4.31(typescript@5.5.2) '@vercel/nft@0.26.5(encoding@0.1.13)': dependencies: @@ -7847,22 +7847,22 @@ snapshots: global: 4.4.0 url-toolkit: 2.2.5 - '@vitejs/plugin-vue-jsx@3.1.0(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))(vue@3.4.31(typescript@5.4.4))': + '@vitejs/plugin-vue-jsx@3.1.0(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))(vue@3.4.31(typescript@5.5.2))': dependencies: '@babel/core': 7.24.7 '@babel/plugin-transform-typescript': 7.24.7(@babel/core@7.24.7) '@vue/babel-plugin-jsx': 1.2.2(@babel/core@7.24.7) vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1) - vue: 3.4.31(typescript@5.4.4) + vue: 3.4.31(typescript@5.5.2) transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue@5.0.5(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))(vue@3.4.31(typescript@5.4.4))': + '@vitejs/plugin-vue@5.0.5(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))(vue@3.4.31(typescript@5.5.2))': dependencies: vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1) - vue: 3.4.31(typescript@5.4.4) + vue: 3.4.31(typescript@5.5.2) - '@vue-macros/common@1.10.4(rollup@4.18.0)(vue@3.4.31(typescript@5.4.4))': + '@vue-macros/common@1.10.4(rollup@4.18.0)(vue@3.4.31(typescript@5.5.2))': dependencies: '@babel/types': 7.24.7 '@rollup/pluginutils': 5.1.0(rollup@4.18.0) @@ -7871,7 +7871,7 @@ snapshots: local-pkg: 0.5.0 magic-string-ast: 0.6.2 optionalDependencies: - vue: 3.4.31(typescript@5.4.4) + vue: 3.4.31(typescript@5.5.2) transitivePeerDependencies: - rollup @@ -7977,11 +7977,11 @@ snapshots: '@vue/shared': 3.4.31 csstype: 3.1.3 - '@vue/server-renderer@3.4.31(vue@3.4.31(typescript@5.4.4))': + '@vue/server-renderer@3.4.31(vue@3.4.31(typescript@5.5.2))': dependencies: '@vue/compiler-ssr': 3.4.31 '@vue/shared': 3.4.31 - vue: 3.4.31(typescript@5.4.4) + vue: 3.4.31(typescript@5.5.2) '@vue/shared@3.4.31': {} @@ -8806,7 +8806,7 @@ snapshots: config-file-ts@0.2.6: dependencies: glob: 10.4.2 - typescript: 5.4.4 + typescript: 5.5.2 consola@3.2.3: {} @@ -9411,10 +9411,10 @@ snapshots: dependencies: eslint: 8.57.0 - eslint-config-standard@17.1.0(eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0))(eslint-plugin-n@15.7.0(eslint@8.57.0))(eslint-plugin-promise@6.2.0(eslint@8.57.0))(eslint@8.57.0): + eslint-config-standard@17.1.0(eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0))(eslint-plugin-n@15.7.0(eslint@8.57.0))(eslint-plugin-promise@6.2.0(eslint@8.57.0))(eslint@8.57.0): dependencies: eslint: 8.57.0 - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) eslint-plugin-n: 15.7.0(eslint@8.57.0) eslint-plugin-promise: 6.2.0(eslint@8.57.0) @@ -9426,13 +9426,13 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint-plugin-import@2.29.1)(eslint@8.57.0): + eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0): dependencies: debug: 4.3.5 enhanced-resolve: 5.17.0 eslint: 8.57.0 - eslint-module-utils: 2.8.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0) - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) + eslint-module-utils: 2.8.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) fast-glob: 3.3.2 get-tsconfig: 4.7.5 is-core-module: 2.14.0 @@ -9443,14 +9443,14 @@ snapshots: - eslint-import-resolver-webpack - supports-color - eslint-module-utils@2.8.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0): + eslint-module-utils@2.8.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0): dependencies: debug: 3.2.7 optionalDependencies: - '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.4.4) + '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.5.2) eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint-plugin-import@2.29.1)(eslint@8.57.0) + eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0) transitivePeerDependencies: - supports-color @@ -9466,7 +9466,7 @@ snapshots: eslint-utils: 2.1.0 regexpp: 3.2.0 - eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0): + eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0): dependencies: array-includes: 3.1.8 array.prototype.findlastindex: 1.2.5 @@ -9476,7 +9476,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.4))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0) + eslint-module-utils: 2.8.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0) hasown: 2.0.2 is-core-module: 2.14.0 is-glob: 4.0.3 @@ -9487,7 +9487,7 @@ snapshots: semver: 6.3.1 tsconfig-paths: 3.15.0 optionalDependencies: - '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.4.4) + '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.5.2) transitivePeerDependencies: - eslint-import-resolver-typescript - eslint-import-resolver-webpack @@ -9587,7 +9587,7 @@ snapshots: eslint@8.57.0: dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) - '@eslint-community/regexpp': 4.10.1 + '@eslint-community/regexpp': 4.11.0 '@eslint/eslintrc': 2.1.4 '@eslint/js': 8.57.0 '@humanwhocodes/config-array': 0.11.14 @@ -10024,7 +10024,7 @@ snapshots: consola: 3.2.3 defu: 6.1.4 node-fetch-native: 1.6.4 - nypm: 0.3.8 + nypm: 0.3.9 ohash: 1.1.3 pathe: 1.1.2 tar: 6.2.1 @@ -10280,7 +10280,7 @@ snapshots: transitivePeerDependencies: - supports-color - https-proxy-agent@7.0.4: + https-proxy-agent@7.0.5: dependencies: agent-base: 7.1.1 debug: 4.3.5 @@ -11263,10 +11263,10 @@ snapshots: optionalDependencies: fsevents: 2.3.3 - nuxt-icon@0.6.10(magicast@0.3.4)(rollup@4.18.0)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))(vue@3.4.31(typescript@5.4.4)): + nuxt-icon@0.6.10(magicast@0.3.4)(rollup@4.18.0)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))(vue@3.4.31(typescript@5.5.2)): dependencies: '@iconify/collections': 1.0.435 - '@iconify/vue': 4.1.2(vue@3.4.31(typescript@5.4.4)) + '@iconify/vue': 4.1.2(vue@3.4.31(typescript@5.5.2)) '@nuxt/devtools-kit': 1.3.7(magicast@0.3.4)(rollup@4.18.0)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)) '@nuxt/kit': 3.12.2(magicast@0.3.4)(rollup@4.18.0) transitivePeerDependencies: @@ -11276,7 +11276,7 @@ snapshots: - vite - vue - nuxt@3.11.2(@opentelemetry/api@1.9.0)(@parcel/watcher@2.4.1)(@types/node@20.14.9)(encoding@0.1.13)(eslint@8.57.0)(ioredis@5.4.1)(magicast@0.3.4)(optionator@0.9.4)(rollup@4.18.0)(sass@1.77.6)(terser@5.31.1)(typescript@5.4.4)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)): + nuxt@3.11.2(@opentelemetry/api@1.9.0)(@parcel/watcher@2.4.1)(@types/node@20.14.9)(encoding@0.1.13)(eslint@8.57.0)(ioredis@5.4.1)(magicast@0.3.4)(optionator@0.9.4)(rollup@4.18.0)(sass@1.77.6)(terser@5.31.1)(typescript@5.5.2)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)): dependencies: '@nuxt/devalue': 2.0.2 '@nuxt/devtools': 1.3.7(rollup@4.18.0)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)) @@ -11284,10 +11284,10 @@ snapshots: '@nuxt/schema': 3.11.2(rollup@4.18.0) '@nuxt/telemetry': 2.5.4(magicast@0.3.4)(rollup@4.18.0) '@nuxt/ui-templates': 1.3.4 - '@nuxt/vite-builder': 3.11.2(@types/node@20.14.9)(eslint@8.57.0)(magicast@0.3.4)(optionator@0.9.4)(rollup@4.18.0)(sass@1.77.6)(terser@5.31.1)(typescript@5.4.4)(vue@3.4.31(typescript@5.4.4)) + '@nuxt/vite-builder': 3.11.2(@types/node@20.14.9)(eslint@8.57.0)(magicast@0.3.4)(optionator@0.9.4)(rollup@4.18.0)(sass@1.77.6)(terser@5.31.1)(typescript@5.5.2)(vue@3.4.31(typescript@5.5.2)) '@unhead/dom': 1.9.14 '@unhead/ssr': 1.9.14 - '@unhead/vue': 1.9.14(vue@3.4.31(typescript@5.4.4)) + '@unhead/vue': 1.9.14(vue@3.4.31(typescript@5.5.2)) '@vue/shared': 3.4.31 acorn: 8.11.3 c12: 1.11.1(magicast@0.3.4) @@ -11310,7 +11310,7 @@ snapshots: mlly: 1.7.1 nitropack: 2.9.7(@opentelemetry/api@1.9.0)(encoding@0.1.13)(magicast@0.3.4) nuxi: 3.12.0 - nypm: 0.3.8 + nypm: 0.3.9 ofetch: 1.3.4 ohash: 1.1.3 pathe: 1.1.2 @@ -11327,13 +11327,13 @@ snapshots: unenv: 1.9.0 unimport: 3.7.2(rollup@4.18.0) unplugin: 1.10.1 - unplugin-vue-router: 0.7.0(rollup@4.18.0)(vue-router@4.4.0(vue@3.4.31(typescript@5.4.4)))(vue@3.4.31(typescript@5.4.4)) + unplugin-vue-router: 0.7.0(rollup@4.18.0)(vue-router@4.4.0(vue@3.4.31(typescript@5.5.2)))(vue@3.4.31(typescript@5.5.2)) unstorage: 1.10.2(ioredis@5.4.1) untyped: 1.4.2 - vue: 3.4.31(typescript@5.4.4) + vue: 3.4.31(typescript@5.5.2) vue-bundle-renderer: 2.1.0 vue-devtools-stub: 0.1.0 - vue-router: 4.4.0(vue@3.4.31(typescript@5.4.4)) + vue-router: 4.4.0(vue@3.4.31(typescript@5.5.2)) optionalDependencies: '@parcel/watcher': 2.4.1 '@types/node': 20.14.9 @@ -11379,12 +11379,13 @@ snapshots: - vue-tsc - xml2js - nypm@0.3.8: + nypm@0.3.9: dependencies: citty: 0.1.6 consola: 3.2.3 execa: 8.0.1 pathe: 1.1.2 + pkg-types: 1.1.1 ufo: 1.5.3 object-assign@4.1.1: {} @@ -11593,13 +11594,13 @@ snapshots: pify@2.3.0: {} - pinia@2.1.7(typescript@5.4.4)(vue@3.4.31(typescript@5.4.4)): + pinia@2.1.7(typescript@5.5.2)(vue@3.4.31(typescript@5.5.2)): dependencies: '@vue/devtools-api': 6.6.3 - vue: 3.4.31(typescript@5.4.4) - vue-demi: 0.14.8(vue@3.4.31(typescript@5.4.4)) + vue: 3.4.31(typescript@5.5.2) + vue-demi: 0.14.8(vue@3.4.31(typescript@5.5.2)) optionalDependencies: - typescript: 5.4.4 + typescript: 5.5.2 pino-abstract-transport@1.2.0: dependencies: @@ -12363,7 +12364,7 @@ snapshots: - supports-color optional: true - socks-proxy-agent@8.0.3: + socks-proxy-agent@8.0.4: dependencies: agent-base: 7.1.1 debug: 4.3.5 @@ -12740,19 +12741,19 @@ snapshots: dependencies: utf8-byte-length: 1.0.5 - ts-api-utils@1.3.0(typescript@5.4.4): + ts-api-utils@1.3.0(typescript@5.5.2): dependencies: - typescript: 5.4.4 + typescript: 5.5.2 ts-interface-checker@0.1.13: {} - tsc-watch@6.2.0(typescript@5.4.4): + tsc-watch@6.2.0(typescript@5.5.2): dependencies: cross-spawn: 7.0.3 node-cleanup: 2.1.2 ps-tree: 1.2.0 string-argv: 0.3.2 - typescript: 5.4.4 + typescript: 5.5.2 tsconfig-paths@3.15.0: dependencies: @@ -12823,7 +12824,7 @@ snapshots: dependencies: is-typedarray: 1.0.0 - typescript@5.4.4: {} + typescript@5.5.2: {} ufo@1.5.3: {} @@ -12910,11 +12911,11 @@ snapshots: unpipe@1.0.0: {} - unplugin-vue-router@0.7.0(rollup@4.18.0)(vue-router@4.4.0(vue@3.4.31(typescript@5.4.4)))(vue@3.4.31(typescript@5.4.4)): + unplugin-vue-router@0.7.0(rollup@4.18.0)(vue-router@4.4.0(vue@3.4.31(typescript@5.5.2)))(vue@3.4.31(typescript@5.5.2)): dependencies: '@babel/types': 7.24.7 '@rollup/pluginutils': 5.1.0(rollup@4.18.0) - '@vue-macros/common': 1.10.4(rollup@4.18.0)(vue@3.4.31(typescript@5.4.4)) + '@vue-macros/common': 1.10.4(rollup@4.18.0)(vue@3.4.31(typescript@5.5.2)) ast-walker-scope: 0.5.0(rollup@4.18.0) chokidar: 3.6.0 fast-glob: 3.3.2 @@ -12926,7 +12927,7 @@ snapshots: unplugin: 1.10.1 yaml: 2.4.5 optionalDependencies: - vue-router: 4.4.0(vue@3.4.31(typescript@5.4.4)) + vue-router: 4.4.0(vue@3.4.31(typescript@5.5.2)) transitivePeerDependencies: - rollup - vue @@ -13050,7 +13051,7 @@ snapshots: - supports-color - terser - vite-plugin-checker@0.6.4(eslint@8.57.0)(optionator@0.9.4)(typescript@5.4.4)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)): + vite-plugin-checker@0.6.4(eslint@8.57.0)(optionator@0.9.4)(typescript@5.5.2)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)): dependencies: '@babel/code-frame': 7.24.7 ansi-escapes: 4.3.2 @@ -13071,7 +13072,7 @@ snapshots: optionalDependencies: eslint: 8.57.0 optionator: 0.9.4 - typescript: 5.4.4 + typescript: 5.5.2 vite-plugin-inspect@0.8.4(@nuxt/kit@3.12.2(magicast@0.3.4)(rollup@4.18.0))(rollup@4.18.0)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)): dependencies: @@ -13144,9 +13145,9 @@ snapshots: dependencies: ufo: 1.5.3 - vue-demi@0.14.8(vue@3.4.31(typescript@5.4.4)): + vue-demi@0.14.8(vue@3.4.31(typescript@5.5.2)): dependencies: - vue: 3.4.31(typescript@5.4.4) + vue: 3.4.31(typescript@5.5.2) vue-devtools-stub@0.1.0: {} @@ -13163,20 +13164,20 @@ snapshots: transitivePeerDependencies: - supports-color - vue-router@4.4.0(vue@3.4.31(typescript@5.4.4)): + vue-router@4.4.0(vue@3.4.31(typescript@5.5.2)): dependencies: '@vue/devtools-api': 6.6.3 - vue: 3.4.31(typescript@5.4.4) + vue: 3.4.31(typescript@5.5.2) - vue@3.4.31(typescript@5.4.4): + vue@3.4.31(typescript@5.5.2): dependencies: '@vue/compiler-dom': 3.4.31 '@vue/compiler-sfc': 3.4.31 '@vue/runtime-dom': 3.4.31 - '@vue/server-renderer': 3.4.31(vue@3.4.31(typescript@5.4.4)) + '@vue/server-renderer': 3.4.31(vue@3.4.31(typescript@5.5.2)) '@vue/shared': 3.4.31 optionalDependencies: - typescript: 5.4.4 + typescript: 5.5.2 wait-on@7.2.0: dependencies: diff --git a/src/api/routes/crunchyroll/crunchyroll.service.ts b/src/api/routes/crunchyroll/crunchyroll.service.ts index 15bb374..534de29 100644 --- a/src/api/routes/crunchyroll/crunchyroll.service.ts +++ b/src/api/routes/crunchyroll/crunchyroll.service.ts @@ -5,14 +5,11 @@ import { useFetch } from '../useFetch' import { parse as mpdParse } from 'mpd-parser' import { checkProxies, loggedInCheck } from '../service/service.service' import settings from 'electron-settings' +import { app } from 'electron' -// Crunchyroll Error message list -const crErrors = [ - { - error: 'invalid_grant', - response: 'Email/Password is wrong' - } -] +settings.configure({ + dir: app.getPath('documents') + '/Crunchyroll Downloader/settings/' +}) // Crunchyroll Login Handler export async function crunchyLogin(user: string, passw: string, geo: string) { diff --git a/src/api/routes/service/service.service.ts b/src/api/routes/service/service.service.ts index 35346d4..1b192a8 100644 --- a/src/api/routes/service/service.service.ts +++ b/src/api/routes/service/service.service.ts @@ -22,8 +22,13 @@ import util from 'util' import settings from 'electron-settings' import { server } from '../../api' import { createChapterFile } from '../../services/chapter' +import { app } from 'electron' const exec = util.promisify(require('child_process').exec) +settings.configure({ + dir: app.getPath('documents') + '/Crunchyroll Downloader/settings/' +}) + // Get All Accounts export async function getAllAccounts() { try { diff --git a/src/api/services/folder.ts b/src/api/services/folder.ts index dad53e4..6e7a41e 100644 --- a/src/api/services/folder.ts +++ b/src/api/services/folder.ts @@ -3,6 +3,10 @@ import { app } from 'electron' import fs from 'fs' import settings from 'electron-settings' +settings.configure({ + dir: app.getPath('documents') + '/Crunchyroll Downloader/settings/' +}) + export async function createFolder() { var tempPath = (await settings.get('tempPath')) as string diff --git a/src/api/services/subs.ts b/src/api/services/subs.ts index a80cd49..a85d610 100644 --- a/src/api/services/subs.ts +++ b/src/api/services/subs.ts @@ -5,6 +5,11 @@ import { finished } from 'stream/promises' import CryptoJS from 'crypto-js' import { server } from '../api' import settings from 'electron-settings' +import { app } from 'electron' + +settings.configure({ + dir: app.getPath('documents') + '/Crunchyroll Downloader/settings/' +}) export async function downloadCRSub( sub: { diff --git a/src/api/services/widevine.ts b/src/api/services/widevine.ts index d7a02ec..662018e 100644 --- a/src/api/services/widevine.ts +++ b/src/api/services/widevine.ts @@ -4,6 +4,10 @@ import path from 'path' import { messageBox } from '../../electron/background' import { server } from '../api' +settings.configure({ + dir: app.getPath('documents') + '/Crunchyroll Downloader/settings/' +}) + export async function getWVKPath() { const drmL3blob = (await settings.get('l3blob')) as string const drmL3key = (await settings.get('l3key')) as string diff --git a/src/electron/background.ts b/src/electron/background.ts index 074efcf..d06d1cc 100644 --- a/src/electron/background.ts +++ b/src/electron/background.ts @@ -10,6 +10,10 @@ import startAPI from '../api/api' import settings from 'electron-settings' import contextMenu from 'electron-context-menu' +settings.configure({ + dir: app.getPath('documents') + '/Crunchyroll Downloader/settings/' +}) + process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = 'true' const isProduction = process.env.NODE_ENV !== 'development' const platform: 'darwin' | 'win32' | 'linux' = process.platform as any @@ -17,14 +21,13 @@ const architucture: '64' | '32' = os.arch() === 'x64' ? '64' : '32' const modules = [titleBarActionsModule, macMenuModule, updaterModule] var mainWindow: BrowserWindow +settings.configure({ + dir: app.getPath('documents') + '/Crunchyroll Downloader/settings/' +}) + function createWindow() { console.log('System info', { isProduction, platform, architucture }) - settings.configure({ - dir: app.getPath('documents') + '/Crunchyroll Downloader/', - fileName: 'settings.json' - }) - mainWindow = new BrowserWindow({ title: 'Crunchyroll Downloader', icon: __dirname + '/icon/favicon.ico',