diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e55f30..dbc74fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,7 @@ build: - npm ci - | - $repos = @('frontend', 'player', 'stream-api', 'live-api-streampk', 'auth-proxy') + $repos = @('frontend', 'player', 'stream-api'', 'auth-proxy') $last = @{} if (Test-Path "last-shas.json") { $last = Get-Content last-shas.json | ConvertFrom-Json -AsHashtable diff --git a/build-pipeline.js b/build-pipeline.js index 8bca97f..1ad139f 100644 --- a/build-pipeline.js +++ b/build-pipeline.js @@ -6,7 +6,7 @@ const AdmZip = require('adm-zip'); const { execSync } = require('child_process'); const BUILD_DIR = path.join(__dirname, 'dist-build'); -const REPOS = ['frontend', 'player', 'auth-proxy', 'stream-api', 'live-api-streampk']; +const REPOS = ['frontend', 'player', 'auth-proxy', 'stream-api']; const TEMP_EXTRACT_DIR = path.join(__dirname, 'temp-validation-extract'); @@ -17,7 +17,6 @@ const REPO_CONFIG = { 'player': { name: 'player', branch: 'main' }, 'auth-proxy': { name: 'auth-proxy', branch: 'main' }, 'stream-api': { name: 'stream-api', branch: 'main' }, - 'live-api-streampk': { name: 'live-api-streampk', branch: 'main' } }; function getGitLabToken() { @@ -230,7 +229,6 @@ function validatePayload(zipPath) { 'player/index.html', 'auth-proxy/server.js', 'stream-api/server.js', - 'live-api-streampk/server.js', 'frontend/index.html' ]; diff --git a/config/env.json b/config/env.json index 188df12..5e67c20 100644 --- a/config/env.json +++ b/config/env.json @@ -15,8 +15,5 @@ "PROXY_STREAMS": "true", "ENABLE_DEBUG_ROUTE": "true", "BYPASS_AUTH": "true" - }, - "live-api-streampk": { - "PORT": "5000" } } \ No newline at end of file diff --git a/config/replacements.json b/config/replacements.json index 9dd0c5a..49849f8 100644 --- a/config/replacements.json +++ b/config/replacements.json @@ -49,6 +49,5 @@ "replace": "http://localhost:3001" } ], - "stream-api": [], - "live-api-streampk": [] + "stream-api": [] } \ No newline at end of file diff --git a/github-client.js b/github-client.js index ae596ae..1583a5e 100644 --- a/github-client.js +++ b/github-client.js @@ -6,7 +6,6 @@ const REPOS = { frontend: { branch: 'main' }, player: { branch: 'main' }, 'stream-api': { branch: 'main' }, - 'live-api-streampk': { branch: 'main' }, 'auth-proxy': { branch: 'main' } }; diff --git a/last-shas.json b/last-shas.json index ac4a426..1b7bd96 100644 --- a/last-shas.json +++ b/last-shas.json @@ -1,6 +1,5 @@ { "stream-api": "5eb845865e6633511b2f68a0e1615b2391ddca6e", - "live-api-streampk": "6f2f3932360624b473c55becb7a5354b9a0fa804", "auth-proxy": "7660a5a252554af55bf84da219b63a76322d8b85", "player": "4b3a4a6523dbf019abe8f9ec02e689e5d4e3b672", "frontend": "ecab7ccd9fc2011bb78ac37f5b2a478ff25d162d" diff --git a/main.js b/main.js index 0ee549f..30a9fc8 100644 --- a/main.js +++ b/main.js @@ -601,7 +601,6 @@ button:active { await serviceManager.startServices([ { name: 'auth-proxy', relativeDir: 'auth-proxy' }, { name: 'stream-api', relativeDir: 'stream-api' }, - { name: 'live-api-streampk', relativeDir: 'live-api-streampk' } ]); const playerDir = path.join(APPDATA_DIR, 'player'); @@ -618,7 +617,6 @@ button:active { { port: 3001, name: 'player' }, { port: 3000, name: 'auth-proxy' }, { port: 7860, name: 'stream-api' }, - { port: 5000, name: 'live-api-streampk' } ]; for (const { port, name } of healthChecks) { try { diff --git a/patcher.js b/patcher.js index 1f40d6c..28a48a0 100644 --- a/patcher.js +++ b/patcher.js @@ -46,7 +46,7 @@ class Patcher { } purgeOldCode() { - const dirs = ['frontend', 'player', 'stream-api', 'live-api-streampk']; + const dirs = ['frontend', 'player', 'stream-api']; for (const dir of dirs) { const fullPath = path.join(this.appDataPath, dir); if (fs.existsSync(fullPath)) { @@ -74,7 +74,6 @@ class Patcher { 'player/index.html', 'auth-proxy/server.js', 'stream-api/server.js', - 'live-api-streampk/server.js', 'frontend/index.html' ];