From e16ee6c1d32e3c29df77728917403320e599712c Mon Sep 17 00:00:00 2001
From: wukko <me@wukko.me>
Date: Tue, 5 Mar 2024 19:08:59 +0600
Subject: [PATCH 01/10] env: readable environment variables in all files

apiPort -> API_PORT
apiURL -> API_URL
apiName -> API_NAME
cors -> ENABLE_CORS
cookiePath -> COOKIE_PATH

webPort -> WEB_PORT
webURL -> WEB_URL
showSponsors -> SHOW_SPONSORS
isBeta -> IS_BETA
---
 src/cobalt.js                            |  4 +--
 src/core/api.js                          | 14 +++++------
 src/core/web.js                          |  6 ++---
 src/modules/pageRender/elements.js       |  2 +-
 src/modules/pageRender/page.js           |  8 +++---
 src/modules/processing/cookie/manager.js |  2 +-
 src/modules/setup.js                     | 32 ++++++++++++------------
 src/modules/stream/manage.js             |  2 +-
 8 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/cobalt.js b/src/cobalt.js
index 2d90e07e..40bca04b 100644
--- a/src/cobalt.js
+++ b/src/cobalt.js
@@ -21,8 +21,8 @@ app.disable('x-powered-by');
 
 await loadLoc();
 
-const apiMode = process.env.apiURL && !process.env.webURL;
-const webMode = process.env.webURL && process.env.apiURL;
+const apiMode = process.env.API_URL && !process.env.WEB_URL;
+const webMode = process.env.WEB_URL && process.env.API_URL;
 
 if (apiMode) {
     const { runAPI } = await import('./core/api.js');
diff --git a/src/core/api.js b/src/core/api.js
index 5f910315..8e26dbd0 100644
--- a/src/core/api.js
+++ b/src/core/api.js
@@ -14,7 +14,7 @@ import { sha256 } from "../modules/sub/crypto.js";
 import { verifyStream } from "../modules/stream/manage.js";
 
 export function runAPI(express, app, gitCommit, gitBranch, __dirname) {
-    const corsConfig = process.env.cors === '0' ? {
+    const corsConfig = process.env.ENABLE_CORS === '0' ? {
         origin: process.env.CORS_URL,
         optionsSuccessStatus: 200
     } : {};
@@ -141,9 +141,9 @@ export function runAPI(express, app, gitCommit, gitBranch, __dirname) {
                         version: version,
                         commit: gitCommit,
                         branch: gitBranch,
-                        name: process.env.apiName || "unknown",
-                        url: process.env.apiURL,
-                        cors: process.env?.cors === "0" ? 0 : 1,
+                        name: process.env.API_NAME || "unknown",
+                        url: process.env.API_URL,
+                        cors: process.env?.ENABLE_CORS === "0" ? 0 : 1,
                         startTime: `${startTimestamp}`
                     });
                 default:
@@ -169,12 +169,12 @@ export function runAPI(express, app, gitCommit, gitBranch, __dirname) {
         res.redirect('/api/json')
     });
 
-    app.listen(process.env.apiPort || 9000, () => {
+    app.listen(process.env.API_PORT || 9000, () => {
         console.log(`\n` +
             `${Cyan("cobalt")} API ${Bright(`v.${version}-${gitCommit} (${gitBranch})`)}\n` +
             `Start time: ${Bright(`${startTime.toUTCString()} (${startTimestamp})`)}\n\n` +
-            `URL: ${Cyan(`${process.env.apiURL}`)}\n` +
-            `Port: ${process.env.apiPort || 9000}\n`
+            `URL: ${Cyan(`${process.env.API_URL}`)}\n` +
+            `Port: ${process.env.API_PORT || 9000}\n`
         )
     });
 }
diff --git a/src/core/web.js b/src/core/web.js
index 08a6ffed..7c0cbf33 100644
--- a/src/core/web.js
+++ b/src/core/web.js
@@ -76,12 +76,12 @@ export async function runWeb(express, app, gitCommit, gitBranch, __dirname) {
         return res.redirect('/')
     });
 
-    app.listen(process.env.webPort || 9001, () => {
+    app.listen(process.env.WEB_PORT || 9001, () => {
         console.log(`\n` +
             `${Cyan("cobalt")} WEB ${Bright(`v.${version}-${gitCommit} (${gitBranch})`)}\n` +
             `Start time: ${Bright(`${startTime.toUTCString()} (${startTimestamp})`)}\n\n` +
-            `URL: ${Cyan(`${process.env.webURL}`)}\n` +
-            `Port: ${process.env.webPort || 9001}\n`
+            `URL: ${Cyan(`${process.env.WEB_URL}`)}\n` +
+            `Port: ${process.env.WEB_PORT || 9001}\n`
         )
     })
 }
diff --git a/src/modules/pageRender/elements.js b/src/modules/pageRender/elements.js
index a677d2bc..53ad3c42 100644
--- a/src/modules/pageRender/elements.js
+++ b/src/modules/pageRender/elements.js
@@ -264,5 +264,5 @@ export function sponsoredList() {
 }
 
 export function betaTag() {
-    return process.env.isBeta ? '<span class="logo-sub">β</span>' : ''
+    return process.env.IS_BETA ? '<span class="logo-sub">β</span>' : ''
 }
diff --git a/src/modules/pageRender/page.js b/src/modules/pageRender/page.js
index 81e6d514..77b87f29 100644
--- a/src/modules/pageRender/page.js
+++ b/src/modules/pageRender/page.js
@@ -48,10 +48,10 @@ export default function(obj) {
 
         <title>${t("AppTitleCobalt")}</title>
 
-        <meta property="og:url" content="${process.env.webURL}">
+        <meta property="og:url" content="${process.env.WEB_URL}">
         <meta property="og:title" content="${t("AppTitleCobalt")}">
         <meta property="og:description" content="${t('EmbedBriefDescription')}">
-        <meta property="og:image" content="${process.env.webURL}icons/generic.png">
+        <meta property="og:image" content="${process.env.WEB_URL}icons/generic.png">
         <meta name="title" content="${t("AppTitleCobalt")}">
         <meta name="description" content="${t('AboutSummary')}">
         <meta name="theme-color" content="#000000">
@@ -165,7 +165,7 @@ export default function(obj) {
                             body: t("FairUse")
                         }])
                     },
-                    ...(process.env.showSponsors ?
+                    ...(process.env.SHOW_SPONSORS ?
                     [{
                         text: t("SponsoredBy"),
                         classes: ["sponsored-by-text"],
@@ -627,7 +627,7 @@ export default function(obj) {
             </footer>
         </div>
         <script>
-            let defaultApiUrl = '${process.env.apiURL ? process.env.apiURL : ''}';
+            let defaultApiUrl = '${process.env.API_URL || ''}';
             const loc = ${webLoc(t,
             [
                 'ErrorNoInternet',
diff --git a/src/modules/processing/cookie/manager.js b/src/modules/processing/cookie/manager.js
index 7189eb18..a0b66f48 100644
--- a/src/modules/processing/cookie/manager.js
+++ b/src/modules/processing/cookie/manager.js
@@ -3,7 +3,7 @@ import { readFile, writeFile } from 'fs/promises';
 import { parse as parseSetCookie, splitCookiesString } from 'set-cookie-parser';
 
 const WRITE_INTERVAL = 60000,
-      cookiePath = process.env.cookiePath,
+      cookiePath = process.env.COOKIE_PATH,
       COUNTER = Symbol('counter');
 
 let cookies = {}, dirty = false, intervalId;
diff --git a/src/modules/setup.js b/src/modules/setup.js
index f81a0053..932cba57 100644
--- a/src/modules/setup.js
+++ b/src/modules/setup.js
@@ -39,27 +39,27 @@ function setup() {
                 console.log(Bright("\nCool! What's the domain this API instance will be running on? (localhost)\nExample: co.wuk.sh"));
 
                 rl.question(q, apiURL => {
-                    ob['apiURL'] = `http://localhost:9000/`;
-                    ob['apiPort'] = 9000;
-                    if (apiURL && apiURL !== "localhost") ob['apiURL'] = `https://${apiURL.toLowerCase()}/`;
+                    ob['API_URL'] = `http://localhost:9000/`;
+                    ob['API_PORT'] = 9000;
+                    if (apiURL && apiURL !== "localhost") ob['API_URL'] = `https://${apiURL.toLowerCase()}/`;
 
                     console.log(Bright("\nGreat! Now, what port will it be running on? (9000)"));
 
                     rl.question(q, apiPort => {
-                        if (apiPort) ob['apiPort'] = apiPort;
-                        if (apiPort && (apiURL === "localhost" || !apiURL)) ob['apiURL'] = `http://localhost:${apiPort}/`;
+                        if (apiPort) ob['API_PORT'] = apiPort;
+                        if (apiPort && (apiURL === "localhost" || !apiURL)) ob['API_URL'] = `http://localhost:${apiPort}/`;
 
                         console.log(Bright("\nWhat will your instance's name be? Usually it's something like eu-nl aka region-country. (local)"));
 
                         rl.question(q, apiName => {
-                            ob['apiName'] = apiName.toLowerCase();
-                            if (!apiName || apiName === "local") ob['apiName'] = "local";
+                            ob['API_URL'] = apiName.toLowerCase();
+                            if (!apiName || apiName === "local") ob['API_URL'] = "local";
 
                             console.log(Bright("\nOne last thing: would you like to enable CORS? It allows other websites and extensions to use your instance's API.\ny/n (n)"));
 
                             rl.question(q, apiCors => {
                                 let answCors = apiCors.toLowerCase().trim();
-                                if (answCors !== "y" && answCors !== "yes") ob['cors'] = '0'
+                                if (answCors !== "y" && answCors !== "yes") ob['ENABLE_CORS'] = '0'
                                 final()
                             })
                         })
@@ -71,25 +71,25 @@ function setup() {
                 console.log(Bright("\nAwesome! What's the domain this web app instance will be running on? (localhost)\nExample: cobalt.tools"));
     
                 rl.question(q, webURL => {
-                    ob['webURL'] = `http://localhost:9001/`;
-                    ob['webPort'] = 9001;
-                    if (webURL && webURL !== "localhost") ob['webURL'] = `https://${webURL.toLowerCase()}/`;
+                    ob['WEB_URL'] = `http://localhost:9001/`;
+                    ob['WEB_PORT'] = 9001;
+                    if (webURL && webURL !== "localhost") ob['WEB_URL'] = `https://${webURL.toLowerCase()}/`;
     
                     console.log(
                         Bright("\nGreat! Now, what port will it be running on? (9001)")
                     )
                     rl.question(q, webPort => {
-                        if (webPort) ob['webPort'] = webPort;
-                        if (webPort && (webURL === "localhost" || !webURL)) ob['webURL'] = `http://localhost:${webPort}/`;
+                        if (webPort) ob['WEB_PORT'] = webPort;
+                        if (webPort && (webURL === "localhost" || !webURL)) ob['WEB_URL'] = `http://localhost:${webPort}/`;
 
                         console.log(
                             Bright("\nOne last thing: what default API domain should be used? (co.wuk.sh)\nIf it's hosted locally, make sure to include the port:") + Cyan(" localhost:9000")
                         );
 
                         rl.question(q, apiURL => {
-                            ob['apiURL'] = `https://${apiURL.toLowerCase()}/`;
-                            if (apiURL.includes(':')) ob['apiURL'] = `http://${apiURL.toLowerCase()}/`;
-                            if (!apiURL) ob['apiURL'] = "https://co.wuk.sh/";
+                            ob['API_URL'] = `https://${apiURL.toLowerCase()}/`;
+                            if (apiURL.includes(':')) ob['API_URL'] = `http://${apiURL.toLowerCase()}/`;
+                            if (!apiURL) ob['API_URL'] = "https://co.wuk.sh/";
                             final()
                         })
                     });
diff --git a/src/modules/stream/manage.js b/src/modules/stream/manage.js
index 459e5a6b..92a98da8 100644
--- a/src/modules/stream/manage.js
+++ b/src/modules/stream/manage.js
@@ -43,7 +43,7 @@ export function createStream(obj) {
         exp = streamInfo.exp;
         ghmac = streamInfo.hmac;
     }
-    return `${process.env.apiURL}api/stream?t=${streamID}&e=${exp}&h=${ghmac}`;
+    return `${process.env.API_URL}api/stream?t=${streamID}&e=${exp}&h=${ghmac}`;
 }
 
 export function verifyStream(id, hmac, exp) {

From a480221fdf89d3e5ecc7e9bda256801255c560cf Mon Sep 17 00:00:00 2001
From: wukko <me@wukko.me>
Date: Tue, 5 Mar 2024 19:10:04 +0600
Subject: [PATCH 02/10] docker-compose example: update env variables & clearer
 messaging

---
 docs/examples/docker-compose.example.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/examples/docker-compose.example.yml b/docs/examples/docker-compose.example.yml
index b5ce8a30..294bcb57 100644
--- a/docs/examples/docker-compose.example.yml
+++ b/docs/examples/docker-compose.example.yml
@@ -13,17 +13,17 @@ services:
 
         ports:
             - 9000:9000/tcp
-            # if you're using a reverse proxy, uncomment the next line:
+            # if you're using a reverse proxy, uncomment the next line and remove the one above (9000:9000/tcp):
             #- 127.0.0.1:9000:9000
 
         environment:
             # replace apiURL with your instance's target url in same format
-            - apiURL=https://co.wuk.sh/
+            - API_URL=https://co.wuk.sh/
             # replace apiName with your instance's distinctive name
-            - apiName=eu-nl
+            - API_NAME=eu-nl
             # if you want to use cookies when fetching data from services, uncomment the next line
-            #- cookiePath=/cookies.json
-            # see cookies_example.json for example file.
+            #- COOKIE_PATH=/cookies.json
+            # see cookies.example.json for example file.
         labels:
             - com.centurylinklabs.watchtower.scope=cobalt
 
@@ -43,14 +43,14 @@ services:
 
         ports:
             - 9001:9001/tcp
-            # if you're using a reverse proxy, uncomment the next line:
+            # if you're using a reverse proxy, uncomment the next line and remove the one above (9001:9001/tcp):
             #- 127.0.0.1:9001:9001
 
         environment:
-            # replace webURL with your instance's target url in same format
-            - webURL=https://cobalt.tools/
-            # replace apiURL with preferred api instance url
-            - apiURL=https://co.wuk.sh/
+            # replace https://cobalt.tools/ with your instance's target url in same format
+            - WEB_URL=https://cobalt.tools/
+            # replace https://co.wuk.sh/ with preferred api instance url
+            - API_URL=https://co.wuk.sh/
 
         labels:
             - com.centurylinklabs.watchtower.scope=cobalt

From 765615390a2f1cae4e1fc9c3fe634bdc5e79dfca Mon Sep 17 00:00:00 2001
From: wukko <me@wukko.me>
Date: Tue, 5 Mar 2024 19:10:35 +0600
Subject: [PATCH 03/10] docs: added a list of all variables to
 `run-an-instance.md`

---
 docs/run-an-instance.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/docs/run-an-instance.md b/docs/run-an-instance.md
index 801895dc..99a54f24 100644
--- a/docs/run-an-instance.md
+++ b/docs/run-an-instance.md
@@ -47,3 +47,25 @@ setup script installs all needed `npm` dependencies, but you have to install `no
 sudo apt install nscd
 sudo service nscd start
 ```
+
+## list of all environment variables
+### variables for api
+| variable name         | default   | example                 | description                                                                  |
+|:----------------------|:----------|:------------------------|:-----------------------------------------------------------------------------|
+| `API_PORT`            | `9000`    |  `9000`                 | changes port from which api server is accessible.                            |
+| `API_URL`             | ➖        | `https://co.wuk.sh/`    | changes url from which api server is accessible. <br> ***REQUIRED TO RUN API***.  |
+| `API_NAME`            | `unknown` | `ams-1`                 | api server name that is shown in `/api/serverInfo`.                          |
+| `ENABLE_CORS`         | `1`       | `0`                     | toggles cross-origin resource sharing. <br> `0`: disabled. `1`: enabled.          |
+| `CORS_URL`            | not used  | `https://cobalt.tools/` | cross-origin resource sharing url. api will be available only from this url. |
+| `COOKIE_PATH`         | not used  | `/cookies.json`         | path for cookie file relative to main folder.                                |
+| `PROCESSING_PRIORITY` | not used  | `10`                    | changes `nice` value* for ffmpeg subprocess. available only on unix systems. |
+
+\* the higher the nice value, the lower the priority. [read more here](https://en.wikipedia.org/wiki/Nice_(Unix)).
+
+### variables for web
+| variable name   | default | example                 | description                                                                      |
+|:--------------- |:--------|:------------------------|:---------------------------------------------------------------------------------|
+| `WEB_PORT`      | `9001`  |  `9001`                 | changes port from which frontend server is accessible.                           |
+| `WEB_URL`       | ➖      | `https://cobalt.tools/` | changes url from which frontend server is accessible. <br> ***REQUIRED TO RUN WEB***. |
+| `SHOW_SPONSORS` | `0`     | `1`                     | toggles sponsor list in about popup. <br> `0`: disabled. `1`: enabled.                |
+| `IS_BETA`       | `0`     | `1`                     | toggles beta tag next to cobalt logo. <br> `0`: disabled. `1`: enabled.               |

From 011a0127b4390995b522216306721740630a6877 Mon Sep 17 00:00:00 2001
From: wukko <me@wukko.me>
Date: Tue, 5 Mar 2024 19:20:56 +0600
Subject: [PATCH 04/10] env: rename ENABLE_CORS to CORS_WILDCARD for better
 clarity

---
 docs/run-an-instance.md | 2 +-
 src/core/api.js         | 4 ++--
 src/modules/setup.js    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/run-an-instance.md b/docs/run-an-instance.md
index 99a54f24..2f3d8f56 100644
--- a/docs/run-an-instance.md
+++ b/docs/run-an-instance.md
@@ -55,7 +55,7 @@ sudo service nscd start
 | `API_PORT`            | `9000`    |  `9000`                 | changes port from which api server is accessible.                            |
 | `API_URL`             | ➖        | `https://co.wuk.sh/`    | changes url from which api server is accessible. <br> ***REQUIRED TO RUN API***.  |
 | `API_NAME`            | `unknown` | `ams-1`                 | api server name that is shown in `/api/serverInfo`.                          |
-| `ENABLE_CORS`         | `1`       | `0`                     | toggles cross-origin resource sharing. <br> `0`: disabled. `1`: enabled.          |
+| `CORS_WILDCARD`       | `1`       | `0`                     | toggles cross-origin resource sharing. <br> `0`: disabled. `1`: enabled.          |
 | `CORS_URL`            | not used  | `https://cobalt.tools/` | cross-origin resource sharing url. api will be available only from this url. |
 | `COOKIE_PATH`         | not used  | `/cookies.json`         | path for cookie file relative to main folder.                                |
 | `PROCESSING_PRIORITY` | not used  | `10`                    | changes `nice` value* for ffmpeg subprocess. available only on unix systems. |
diff --git a/src/core/api.js b/src/core/api.js
index 8e26dbd0..de6affe3 100644
--- a/src/core/api.js
+++ b/src/core/api.js
@@ -14,7 +14,7 @@ import { sha256 } from "../modules/sub/crypto.js";
 import { verifyStream } from "../modules/stream/manage.js";
 
 export function runAPI(express, app, gitCommit, gitBranch, __dirname) {
-    const corsConfig = process.env.ENABLE_CORS === '0' ? {
+    const corsConfig = process.env.CORS_WILDCARD === '0' ? {
         origin: process.env.CORS_URL,
         optionsSuccessStatus: 200
     } : {};
@@ -143,7 +143,7 @@ export function runAPI(express, app, gitCommit, gitBranch, __dirname) {
                         branch: gitBranch,
                         name: process.env.API_NAME || "unknown",
                         url: process.env.API_URL,
-                        cors: process.env?.ENABLE_CORS === "0" ? 0 : 1,
+                        cors_wildcard: process.env?.CORS_WILDCARD === "0" ? 0 : 1,
                         startTime: `${startTimestamp}`
                     });
                 default:
diff --git a/src/modules/setup.js b/src/modules/setup.js
index 932cba57..c9eafc45 100644
--- a/src/modules/setup.js
+++ b/src/modules/setup.js
@@ -59,7 +59,7 @@ function setup() {
 
                             rl.question(q, apiCors => {
                                 let answCors = apiCors.toLowerCase().trim();
-                                if (answCors !== "y" && answCors !== "yes") ob['ENABLE_CORS'] = '0'
+                                if (answCors !== "y" && answCors !== "yes") ob['CORS_WILDCARD'] = '0'
                                 final()
                             })
                         })

From 0f515498dc40b5d84d43976be5bff24b7d9631f7 Mon Sep 17 00:00:00 2001
From: wukko <me@wukko.me>
Date: Tue, 5 Mar 2024 19:32:10 +0600
Subject: [PATCH 05/10] docker-compose example: update api comments

---
 docs/examples/docker-compose.example.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/examples/docker-compose.example.yml b/docs/examples/docker-compose.example.yml
index 294bcb57..b6f4a90b 100644
--- a/docs/examples/docker-compose.example.yml
+++ b/docs/examples/docker-compose.example.yml
@@ -17,9 +17,9 @@ services:
             #- 127.0.0.1:9000:9000
 
         environment:
-            # replace apiURL with your instance's target url in same format
+            # replace https://co.wuk.sh/ with your instance's target url in same format
             - API_URL=https://co.wuk.sh/
-            # replace apiName with your instance's distinctive name
+            # replace eu-nl with your instance's distinctive name
             - API_NAME=eu-nl
             # if you want to use cookies when fetching data from services, uncomment the next line
             #- COOKIE_PATH=/cookies.json

From 12833e18270f169600bdaefb1546677382a491cd Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Tue, 5 Mar 2024 13:41:22 +0000
Subject: [PATCH 06/10] api: alias deprecated envs to maintain backwards
 compatibility

---
 src/cobalt.js                 |  1 +
 src/modules/sub/alias-envs.js | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 src/modules/sub/alias-envs.js

diff --git a/src/cobalt.js b/src/cobalt.js
index 40bca04b..050aec46 100644
--- a/src/cobalt.js
+++ b/src/cobalt.js
@@ -1,4 +1,5 @@
 import "dotenv/config";
+import "./modules/sub/alias-envs.js";
 
 import express from "express";
 
diff --git a/src/modules/sub/alias-envs.js b/src/modules/sub/alias-envs.js
new file mode 100644
index 00000000..6cf775ef
--- /dev/null
+++ b/src/modules/sub/alias-envs.js
@@ -0,0 +1,22 @@
+import { Red } from "./consoleText.js";
+
+const mapping = {
+    apiPort: 'API_PORT',
+    apiURL: 'API_URL',
+    apiName: 'API_NAME',
+    cors: 'CORS_WILDCARD',
+    cookiePath: 'COOKIE_PATH',
+    webPort: 'WEB_PORT',
+    webUrl: 'WEB_URL',
+    showSponsors: 'SHOW_SPONSORS',
+    isBeta: 'IS_BETA'
+}
+
+for (const [ oldEnv, newEnv ] of Object.entries(mapping)) {
+    if (process.env[oldEnv] && !process.env[newEnv]) {
+        process.env[newEnv] = process.env[oldEnv];
+        console.error(`${Red('[!]')} ${oldEnv} is deprecated and will be removed in a future version.`);
+        console.error(`    You should use ${newEnv} instead.`);
+        console.error();
+    }
+}

From bcda104ddbe9aabc8a9ba7681630841aef4410a7 Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Tue, 5 Mar 2024 13:49:20 +0000
Subject: [PATCH 07/10] test: alias deprecated envs here too

---
 src/test/test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/test.js b/src/test/test.js
index 15b28cca..d8373ff7 100644
--- a/src/test/test.js
+++ b/src/test/test.js
@@ -1,4 +1,5 @@
 import "dotenv/config";
+import "../modules/sub/alias-envs.js";
 
 import { getJSON } from "../modules/api.js";
 import { services } from "../modules/config.js";

From f3f0d0eb21152d1b405c42343203454133b39c3d Mon Sep 17 00:00:00 2001
From: wukko <me@wukko.me>
Date: Tue, 5 Mar 2024 19:55:58 +0600
Subject: [PATCH 08/10] alias-envs: delete old env

---
 src/modules/sub/alias-envs.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/sub/alias-envs.js b/src/modules/sub/alias-envs.js
index 6cf775ef..f8823b6e 100644
--- a/src/modules/sub/alias-envs.js
+++ b/src/modules/sub/alias-envs.js
@@ -18,5 +18,6 @@ for (const [ oldEnv, newEnv ] of Object.entries(mapping)) {
         console.error(`${Red('[!]')} ${oldEnv} is deprecated and will be removed in a future version.`);
         console.error(`    You should use ${newEnv} instead.`);
         console.error();
+        delete process.env[oldEnv];
     }
 }

From 18056dc7af1bfcbfc4018e91058b822690a045fb Mon Sep 17 00:00:00 2001
From: wukko <me@wukko.me>
Date: Tue, 5 Mar 2024 20:13:01 +0600
Subject: [PATCH 09/10] cors: revert cors name change in serverInfo

---
 src/core/api.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/api.js b/src/core/api.js
index de6affe3..8b359632 100644
--- a/src/core/api.js
+++ b/src/core/api.js
@@ -143,7 +143,7 @@ export function runAPI(express, app, gitCommit, gitBranch, __dirname) {
                         branch: gitBranch,
                         name: process.env.API_NAME || "unknown",
                         url: process.env.API_URL,
-                        cors_wildcard: process.env?.CORS_WILDCARD === "0" ? 0 : 1,
+                        cors: process.env?.CORS_WILDCARD === "0" ? 0 : 1,
                         startTime: `${startTimestamp}`
                     });
                 default:

From a487384858e33cde6da7654363fe9c8ccc76b5d1 Mon Sep 17 00:00:00 2001
From: wukko <me@wukko.me>
Date: Tue, 5 Mar 2024 20:14:32 +0600
Subject: [PATCH 10/10] instance docs: update CORS_WILDCARD description

---
 docs/run-an-instance.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/run-an-instance.md b/docs/run-an-instance.md
index 2f3d8f56..5a181cc8 100644
--- a/docs/run-an-instance.md
+++ b/docs/run-an-instance.md
@@ -50,22 +50,22 @@ sudo service nscd start
 
 ## list of all environment variables
 ### variables for api
-| variable name         | default   | example                 | description                                                                  |
-|:----------------------|:----------|:------------------------|:-----------------------------------------------------------------------------|
-| `API_PORT`            | `9000`    |  `9000`                 | changes port from which api server is accessible.                            |
-| `API_URL`             | ➖        | `https://co.wuk.sh/`    | changes url from which api server is accessible. <br> ***REQUIRED TO RUN API***.  |
-| `API_NAME`            | `unknown` | `ams-1`                 | api server name that is shown in `/api/serverInfo`.                          |
-| `CORS_WILDCARD`       | `1`       | `0`                     | toggles cross-origin resource sharing. <br> `0`: disabled. `1`: enabled.          |
-| `CORS_URL`            | not used  | `https://cobalt.tools/` | cross-origin resource sharing url. api will be available only from this url. |
-| `COOKIE_PATH`         | not used  | `/cookies.json`         | path for cookie file relative to main folder.                                |
+| variable name         | default   | example                 | description |
+|:----------------------|:----------|:------------------------|:------------|
+| `API_PORT`            | `9000`    |  `9000`                 | changes port from which api server is accessible. |
+| `API_URL`             | ➖        | `https://co.wuk.sh/`    | changes url from which api server is accessible. <br> ***REQUIRED TO RUN API***. |
+| `API_NAME`            | `unknown` | `ams-1`                 | api server name that is shown in `/api/serverInfo`. |
+| `CORS_WILDCARD`       | `1`       | `0`                     | toggles cross-origin resource sharing. <br> `0`: disabled. `1`: enabled. |
+| `CORS_URL`            | not used  | `https://cobalt.tools/` | cross-origin resource sharing url. api will be available only from this url if `CORS_WILDCARD` is set to `0`. |
+| `COOKIE_PATH`         | not used  | `/cookies.json`         | path for cookie file relative to main folder. |
 | `PROCESSING_PRIORITY` | not used  | `10`                    | changes `nice` value* for ffmpeg subprocess. available only on unix systems. |
 
 \* the higher the nice value, the lower the priority. [read more here](https://en.wikipedia.org/wiki/Nice_(Unix)).
 
 ### variables for web
-| variable name   | default | example                 | description                                                                      |
-|:--------------- |:--------|:------------------------|:---------------------------------------------------------------------------------|
-| `WEB_PORT`      | `9001`  |  `9001`                 | changes port from which frontend server is accessible.                           |
+| variable name   | default | example                 | description                                                                           |
+|:--------------- |:--------|:------------------------|:--------------------------------------------------------------------------------------|
+| `WEB_PORT`      | `9001`  |  `9001`                 | changes port from which frontend server is accessible.                                |
 | `WEB_URL`       | ➖      | `https://cobalt.tools/` | changes url from which frontend server is accessible. <br> ***REQUIRED TO RUN WEB***. |
 | `SHOW_SPONSORS` | `0`     | `1`                     | toggles sponsor list in about popup. <br> `0`: disabled. `1`: enabled.                |
 | `IS_BETA`       | `0`     | `1`                     | toggles beta tag next to cobalt logo. <br> `0`: disabled. `1`: enabled.               |