diff --git a/backend/app.js b/backend/app.js index b786986..2db4a94 100644 --- a/backend/app.js +++ b/backend/app.js @@ -31,7 +31,7 @@ db.defaults( // config values var frontendUrl = null; var backendUrl = null; -var backendPort = 17442; +var backendPort = null; var usingEncryption = null; var basePath = null; var audioFolderPath = null; @@ -85,7 +85,7 @@ function startServer() { if (usingEncryption) { https.createServer(options, app).listen(backendPort, function() { - console.log('HTTPS: Anchor set on 17442'); + console.log('HTTPS: Started on PORT ' + backendPort); }); } else @@ -121,9 +121,9 @@ async function loadConfig() { // get config library // config = require('config'); - frontendUrl = !debugMode ? config_api.getConfigItem('ytdl_frontend_url') : 'http://localhost:4200'; - backendUrl = config_api.getConfigItem('ytdl_backend_url') - backendPort = 17442; + // frontendUrl = !debugMode ? config_api.getConfigItem('ytdl_frontend_url') : 'http://localhost:4200'; + url = !debugMode ? config_api.getConfigItem('ytdl_url') : 'http://localhost:4200'; + backendPort = config_api.getConfigItem('ytdl_port'); usingEncryption = config_api.getConfigItem('ytdl_use_encryption'); basePath = config_api.getConfigItem('ytdl_base_path'); audioFolderPath = config_api.getConfigItem('ytdl_audio_folder_path'); @@ -149,7 +149,7 @@ async function loadConfig() { }; } - url_domain = new URL(frontendUrl); + url_domain = new URL(url); // start the server here startServer(); diff --git a/backend/config/default.json b/backend/config/default.json index 77687f4..49a55a4 100644 --- a/backend/config/default.json +++ b/backend/config/default.json @@ -1,8 +1,8 @@ { "YoutubeDLMaterial": { "Host": { - "frontendurl": "http://example.com", - "backendurl": "http://example.com:17442/" + "url": "http://example.com", + "port": "17442" }, "Encryption": { "use-encryption": false, @@ -10,7 +10,7 @@ "key-file-path": "/etc/letsencrypt/live/example.com/privkey.pem" }, "Downloader": { - "path-base": "http://example.com:17442/", + "path-base": "http://example.com:17442/api/", "path-audio": "audio/", "path-video": "video/" }, diff --git a/backend/config/encrypted.json b/backend/config/encrypted.json index 0285d15..0bdf5a2 100644 --- a/backend/config/encrypted.json +++ b/backend/config/encrypted.json @@ -1,16 +1,16 @@ { "YoutubeDLMaterial": { - "Host": { - "frontendurl": "https://example.com", - "backendurl": "https://example.com:17442/" - }, + "Host": { + "url": "https://example.com", + "port": "17442" + }, "Encryption": { "use-encryption": true, "cert-file-path": "/etc/letsencrypt/live/example.com/fullchain.pem", "key-file-path": "/etc/letsencrypt/live/example.com/privkey.pem" }, "Downloader": { - "path-base": "https://example.com:17442/", + "path-base": "https://example.com:17442/api/", "path-audio": "audio/", "path-video": "video/" }, diff --git a/backend/consts.js b/backend/consts.js index b6c6d70..0d1e63c 100644 --- a/backend/consts.js +++ b/backend/consts.js @@ -2,13 +2,13 @@ var config = require('config'); let CONFIG_ITEMS = { // Host - 'ytdl_frontend_url': { - 'key': 'ytdl_frontend_url', - 'path': 'YoutubeDLMaterial.Host.frontendurl' + 'ytdl_url': { + 'key': 'ytdl_url', + 'path': 'YoutubeDLMaterial.Host.url' }, - 'ytdl_backend_url': { - 'key': 'ytdl_backend_url', - 'path': 'YoutubeDLMaterial.Host.backendurl' + 'ytdl_port': { + 'key': 'ytdl_port', + 'path': 'YoutubeDLMaterial.Host.port' }, // Encryption diff --git a/src/app/main/main.component.ts b/src/app/main/main.component.ts index 7471350..92db596 100644 --- a/src/app/main/main.component.ts +++ b/src/app/main/main.component.ts @@ -204,7 +204,6 @@ export class MainComponent implements OnInit { // loading config this.postsService.loadNavItems().subscribe(res => { // loads settings const result = !this.postsService.debugMode ? res['config_file'] : res; - const backendUrl = result['YoutubeDLMaterial']['Host']['backendurl']; this.fileManagerEnabled = result['YoutubeDLMaterial']['Extra']['file_manager_enabled']; this.downloadOnlyMode = result['YoutubeDLMaterial']['Extra']['download_only_mode']; this.allowMultiDownloadMode = result['YoutubeDLMaterial']['Extra']['allow_multi_download_mode']; @@ -217,9 +216,6 @@ export class MainComponent implements OnInit { this.allowQualitySelect = result['YoutubeDLMaterial']['Extra']['allow_quality_select']; this.allowAdvancedDownload = result['YoutubeDLMaterial']['Advanced']['allow_advanced_download']; - this.postsService.path = backendUrl + 'api/'; - this.postsService.startPath = backendUrl; - this.postsService.startPathSSL = backendUrl; if (this.fileManagerEnabled) { this.getMp3s(); @@ -395,7 +391,7 @@ export class MainComponent implements OnInit { if (new_download && this.current_download !== new_download) { // console.log('mismatched downloads'); - } else if (!this.multiDownloadMode) { + } else if (!this.multiDownloadMode || !new_download) { // if download only mode, just download the file. no redirect if (forceView === false && this.downloadOnlyMode && !this.iOS) { if (is_playlist) { @@ -434,7 +430,7 @@ export class MainComponent implements OnInit { if (new_download && this.current_download !== new_download) { // console.log('mismatched downloads'); - } else if (!this.multiDownloadMode) { + } else if (!this.multiDownloadMode || !new_download) { // if download only mode, just download the file. no redirect if (forceView === false && this.downloadOnlyMode) { if (is_playlist) { diff --git a/src/app/player/player.component.ts b/src/app/player/player.component.ts index e32e8a8..5c003fe 100644 --- a/src/app/player/player.component.ts +++ b/src/app/player/player.component.ts @@ -58,11 +58,7 @@ export class PlayerComponent implements OnInit { this.baseStreamPath = result['YoutubeDLMaterial']['Downloader']['path-base']; this.audioFolderPath = result['YoutubeDLMaterial']['Downloader']['path-audio']; this.videoFolderPath = result['YoutubeDLMaterial']['Downloader']['path-video']; - const backendUrl = result['YoutubeDLMaterial']['Host']['backendurl']; - this.postsService.path = backendUrl + 'api/'; - this.postsService.startPath = backendUrl; - this.postsService.startPathSSL = backendUrl; let fileType = null; if (this.type === 'audio') { diff --git a/src/app/posts.services.ts b/src/app/posts.services.ts index fa68aa9..ce61d83 100644 --- a/src/app/posts.services.ts +++ b/src/app/posts.services.ts @@ -30,6 +30,7 @@ export class PostsService { if (isDevMode()) { this.debugMode = true; + this.path = 'http://localhost:17442/api/'; } } diff --git a/src/assets/default.json b/src/assets/default.json index f5a8cea..f5c1cbf 100644 --- a/src/assets/default.json +++ b/src/assets/default.json @@ -1,16 +1,16 @@ { "YoutubeDLMaterial": { - "Host": { - "frontendurl": "http://localhost:4200", - "backendurl": "http://localhost:17442/" - }, + "Host": { + "url": "http://localhost", + "port": "17442" + }, "Encryption": { "use-encryption": false, "cert-file-path": "/etc/letsencrypt/live/example.com/fullchain.pem", "key-file-path": "/etc/letsencrypt/live/example.com/privkey.pem" }, "Downloader": { - "path-base": "http://localhost:17442/", + "path-base": "http://localhost:17442/api/", "path-audio": "audio/", "path-video": "video/" },