More work on Tor support

.gitignore

@@ -1,6 +1,6 @@
 # os stuff
-.DS_Store
-desktop.ini
+**/.DS_Store
+**/desktop.ini
 
 # npm
 node_modules
@@ -24,3 +24,6 @@ docker-compose.yml
 
 # cookie file
 cookies.json
+
+# tor
+tor

src/core/api.js

@@ -15,7 +15,7 @@ import { verifyStream } from "../modules/stream/manage.js";
 
 export function runAPI(express, app, gitCommit, gitBranch, __dirname) {
     const corsConfig = process.env.cors === '0' ? {
-        origin: process.env.webURL,
+        origin: [process.env.webURL, process.env.webOnion],
         optionsSuccessStatus: 200
     } : {};
 
@@ -49,6 +49,11 @@ export function runAPI(express, app, gitCommit, gitBranch, __dirname) {
     const startTime = new Date();
     const startTimestamp = Math.floor(startTime.getTime());
 
+    app.use((req, res, next) => {
+        if (global.torEnabled && process.env.apiOnion && !(req.hostname == process.env.apiOnion)) res.setHeader('Onion-Location', `${process.env.apiOnion}${req.path}`)
+        next();
+    });
+    
     app.use('/api/:type', cors(corsConfig));
     app.use('/api/json', apiLimiter);
     app.use('/api/stream', apiLimiterStream);

src/core/web.js

@@ -14,6 +14,11 @@ export async function runWeb(express, app, gitCommit, gitBranch, __dirname) {
 
     await buildFront(gitCommit, gitBranch);
 
+    app.use((req, res, next) => {
+        if (global.torEnabled && process.env.webOnion && !(req.hostname == process.env.webOnion)) res.setHeader('Onion-Location', `${process.env.webOnion}${req.path}`)
+        next();
+    });
+
     app.use('/', express.static('./build/min'));
     app.use('/', express.static('./src/front'));
 

src/front/cobalt.js

@@ -18,7 +18,8 @@ const switchers = {
     "dubLang": ["original", "auto"],
     "vimeoDash": ["false", "true"],
     "audioMode": ["false", "true"],
-    "filenamePattern": ["classic", "pretty", "basic", "nerdy"]
+    "filenamePattern": ["classic", "pretty", "basic", "nerdy"],
+    "onionPreference": ["noOnions", "onionStrict", "clearnetFallback"]
 };
 const checkboxes = [
     "alwaysVisibleButton",
@@ -59,6 +60,14 @@ function sGet(id) {
 function sSet(id, value) {
     localStorage.setItem(id, value)
 }
+if (sGet('onionPreference') == null) {
+    if (window.location.hostname.endsWith(".onion")) sSet("onionPreference", "clearnetFallback")
+    else sSet('onionPreference', 'noOnions');
+}
+if (!(window.location.hostname.endsWith(".onion"))) {
+    document.getElementById('settings-tor').style = 'display:none;';
+    if (!(sGet('onionPreference') === 'noOnions')) sSet("onionPreference", "noOnions");
+}
 function enable(id) {
     eid(id).dataset.enabled = "true";
 }
@@ -131,6 +140,7 @@ function detectColorScheme() {
     } else if (!window.matchMedia) {
         theme = "dark"
     }
+    if (window.location.hostname.endsWith(".onion") && theme == "auto") theme = "dark";
     document.documentElement.setAttribute("data-theme", theme);
 }
 function changeTab(evnt, tabId, tabClass) {
@@ -334,7 +344,9 @@ function resetSettings() {
     localStorage.clear();
     window.location.reload();
 }
+if (window.location.hostname.endsWith(".onion")) document.getElementById('paste').style = "pointer-events:none;visibility:hidden;";
 async function pasteClipboard() {
+    if (window.location.hostname.endsWith(".onion")) return
     try {
         let t = await navigator.clipboard.readText();
         if (regex.test(t)) {
@@ -379,6 +391,7 @@ async function download(url) {
         if (url.includes("youtube.com/") || url.includes("/youtu.be/")) req.vCodec = sGet("vCodec").slice(0, 4);
         if ((url.includes("tiktok.com/") || url.includes("douyin.com/")) && sGet("disableTikTokWatermark") === "true") req.isNoTTWatermark = true;
     }
+    if (window.location.hostname.endsWith(".onion") && !(sGet("onionPreference") == "noOnions")) req.onionPreference = sGet("onionPreference")
 
     if (sGet("disableMetadata") === "true") req.disableMetadata = true;
 

src/localization/languages/en.json

@@ -156,6 +156,11 @@
         "FilenamePreviewVideoTitle": "Video Title",
         "FilenamePreviewAudioTitle": "Audio Title",
         "FilenamePreviewAudioAuthor": "Audio Author",
+        "Tor": "tor",
+        "SettingsOnionStrict": "onions only",
+        "SettingsClearnetFallback": "prefer onions",
+        "SettingsNoOnions": "no onions",
+        "SettingsTorDescription": "onions only: strictly uses .onions throughout entire process except where already known to be required.\nprefer onions: uses .onions throughout entire process but will fallback to clearnet if cobalt can't connect.\nno onions: will only use clearnet throughout entire process.\n\nthis setting affects twitter and reddit.",
         "UrgentFilenameUpdate": "customizable file names!"
     }
 }

src/modules/pageRender/page.js

@@ -38,6 +38,8 @@ export default function(obj) {
 
     audioFormats[0]["text"] = t('SettingsAudioFormatBest');
 
+    let onionLocation = (process.env.torHost && process.env.torPort && true) && process.env.webOnion ? `<meta http-equiv="onion-location" content="${process.env.webOnion}" />` : "";
+    
     try {
         return `
 <!DOCTYPE html>
@@ -49,6 +51,7 @@ export default function(obj) {
         <title>${t("AppTitleCobalt")}</title>
 
         <meta property="og:url" content="${process.env.webURL || process.env.selfURL}" />
+        ${onionLocation}
         <meta property="og:title" content="${t("AppTitleCobalt")}" />
         <meta property="og:description" content="${t('EmbedBriefDescription')}" />
         <meta property="og:image" content="${process.env.webURL || process.env.selfURL}icons/generic.png" />
@@ -497,6 +500,24 @@ export default function(obj) {
                         padding: "no-margin"
                     }])
                 })
+                + settingsCategory({
+                    name: "tor",
+                    title: t('Tor'),
+                    body: switcher({
+                        name: "onionPreference",
+                        items: [{
+                            action: "onionStrict",
+                            text: t('SettingsOnionStrict')
+                        }, {
+                            action: "clearnetFallback",
+                            text: t('SettingsClearnetFallback')
+                        }, {
+                            action: "noOnions",
+                            text: t('SettingsNoOnions')
+                        }]
+                    })
+                    + explanation(t('SettingsTorDescription'))
+                })
             }]
         })}
         ${popupWithBottomButtons({
@@ -613,7 +634,11 @@ export default function(obj) {
         </div>
     </body>
     <script type="text/javascript">
-        let defaultApiUrl = '${process.env.apiURL ? process.env.apiURL : ''}';
+        let defaultApiUrl;
+        let regularApiUrl = '${process.env.apiURL ? process.env.apiURL : ''}';
+        let onionApiUrl = '${process.env.apiOnion ? process.env.apiOnion : ''}';
+        defaultApiUrl = regularApiUrl;
+        if (window.location.hostname.endsWith('.onion')) defaultApiUrl = onionApiUrl;
         const loc = ${webLoc(t,
         [
             'ErrorNoInternet',

src/modules/processing/services/twitter.js

@@ -1,6 +1,5 @@
 import { fetch, getGlobalDispatcher } from "undici";
 import { genericUserAgent } from "../../config.js";
-import { socksDispatcher } from "fetch-socks";
 
 function bestQuality(arr) {
     return arr.filter(v => v["content_type"] === "video/mp4").sort((a, b) => Number(b.bitrate) - Number(a.bitrate))[0]["url"]