diff --git a/.gitignore b/.gitignore
index 305746b2..7d12aa29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,11 +5,15 @@ package-lock.json
# secrets
.env
-# esbuild
-min
-
# page build
+min
build
# stuff i already made but delayed
future
+
+# docker
+docker-compose.yml
+
+# vscode
+.vscode
diff --git a/README.md b/README.md
index 881a6347..e5355d1d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# cobalt
Best way to save what you love.
-Main instance: [co.wukko.me](https://co.wukko.me/)
+Live web app: [co.wukko.me](https://co.wukko.me/)
@@ -21,21 +21,22 @@ Paste the link, get the video, move on. It's that simple. Just how it should be.
| Reddit | ✅ | ✅ | ✅ | Support for GIFs and videos. |
| SoundCloud | ➖ | ✅ | ➖ | Audio metadata, downloads from private links. |
| TikTok | ✅ | ✅ | ✅ | Supports downloads of: videos with or without watermark, images from slideshow without watermark, full (original) audios. |
-| Tumblr | ✅ | ✅ | ✅ | |
+| Tumblr | ✅ | ✅ | ✅ | Support for audio file downloads. |
| Twitter | ✅ | ✅ | ✅ | Ability to pick what to save from multi-media tweets. |
| Twitter Spaces | ➖ | ✅ | ➖ | Audio metadata with all participants and other info. |
| Vimeo | ✅ | ✅ | ✅ | Audio downloads are only available for dash files. |
| Vine Archive | ✅ | ✅ | ✅ | |
| VK Videos | ✅ | ❌ | ❌ | |
| VK Clips | ✅ | ❌ | ❌ | |
-| YouTube Videos & Shorts | ✅ | ✅ | ✅ | Support for 8K, 4K, HDR, and high FPS videos. Audio metadata & dubs. h264/av1/vp9 codecs. |
+| YouTube Videos & Shorts | ✅ | ✅ | ✅ | Support for 8K, 4K, HDR, VR, and high FPS videos. Audio metadata & dubs. h264/av1/vp9 codecs. |
| YouTube Music | ➖ | ✅ | ➖ | Audio metadata. |
This list is not final and keeps expanding over time, make sure to check it once in a while!
## cobalt API
cobalt has an open API that you can use in your projects for **free**.
-It's easy and straightforward to use, [check out the docs](https://github.com/wukko/cobalt/blob/current/docs/API.md) and see for yourself.
+It's easy and straightforward to use, [check out the docs](https://github.com/wukko/cobalt/blob/current/docs/API.md) and see for yourself.
+Feel free to use the main API instance ([co.wuk.sh](https://co.wuk.sh/)) in your projects.
## How to contribute translations
You can translate cobalt to any language you want on [cobalt's Crowdin](https://crowdin-co.wukko.me/). Feel free to ignore QA errors if you think you know better. If you don't see a language you want to translate cobalt to, open an issue, and I'll add it to Crowdin.
@@ -62,6 +63,8 @@ Setup script installs all needed `npm` dependencies, but you have to install `No
3. Run cobalt via `npm start`
4. Done.
+You need to host API and web app separately ever since v.6.0. Setup script will help you with that!
+
### Ubuntu 22.04+ workaround
`nscd` needs to be installed and running so that the `ffmpeg-static` binary can resolve DNS ([#101](https://github.com/wukko/cobalt/issues/101#issuecomment-1494822258)):
@@ -71,13 +74,8 @@ sudo service nscd start
```
### Docker
-It's also possible to run cobalt via Docker, but you **need** to set all environment variables yourself:
-
-| Variable | Description | Example |
-| -------- | :--- | :--- |
-| `selfURL` | Instance URL | `http://localhost:9000/` or `https://co.wukko.me/` or etc |
-| `port` | Instance port | `9000` |
-| `cors` | CORS toggle | `0` |
+It's also possible to run cobalt via Docker. I *highly* recommend using Docker compose.
+Check out the [example compose file](https://github.com/wukko/cobalt/blob/current/docker-compose.yml.example) and alter it for your needs.
## Disclaimer
cobalt is my passion project, so update schedule depends solely on my free time, motivation, and mood.
diff --git a/docker-compose.yml.example b/docker-compose.yml.example
new file mode 100644
index 00000000..8ba8c870
--- /dev/null
+++ b/docker-compose.yml.example
@@ -0,0 +1,32 @@
+version: '3.5'
+
+services:
+ cobalt-api:
+ build: .
+ restart: unless-stopped
+ container_name: cobalt-api
+ ports:
+ - 9000:9000/tcp
+ environment:
+ - apiPort=9000
+ - apiURL=https://co.wuk.sh/
+ - apiName=eu-nl
+ cobalt-web:
+ build: .
+ restart: unless-stopped
+ container_name: cobalt-web
+ ports:
+ - 9000:9000/tcp
+ environment:
+ - webPort=9000
+ - webURL=https://co.wukko.me/
+ - apiURL=https://co.wuk.sh/
+ cobalt-both:
+ build: .
+ restart: unless-stopped
+ container_name: cobalt-both
+ ports:
+ - 9000:9000/tcp
+ environment:
+ - port=9000
+ - selfURL=https://co.wukko.me/
diff --git a/docs/API.md b/docs/API.md
index f45e2c0e..38038bd0 100644
--- a/docs/API.md
+++ b/docs/API.md
@@ -1,5 +1,13 @@
# cobalt API Documentation
This document provides info about methods and acceptable variables for all cobalt API requests.
+
+```
+⚠️ Main API instance has moved to https://co.wuk.sh/
+
+Previous API domain will stop redirecting users to correct API instance after July 25th.
+Make sure to update your projects in time.
+```
+
## POST: ``/api/json``
Main processing endpoint.
diff --git a/package.json b/package.json
index 1382b1f5..9db76a44 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "cobalt",
"description": "save what you love",
- "version": "5.7",
+ "version": "6.0-dev",
"author": "wukko",
"exports": "./src/cobalt.js",
"type": "module",
@@ -11,7 +11,8 @@
"scripts": {
"start": "node src/cobalt",
"setup": "node src/modules/setup",
- "test": "node src/test/test"
+ "test": "node src/test/test",
+ "build": "node src/modules/buildStatic"
},
"repository": {
"type": "git",
diff --git a/src/cobalt.js b/src/cobalt.js
index 990f5d31..d349a79e 100644
--- a/src/cobalt.js
+++ b/src/cobalt.js
@@ -1,199 +1,37 @@
import "dotenv/config";
import express from "express";
-import cors from "cors";
-import rateLimit from "express-rate-limit";
-import { randomBytes } from "crypto";
-const ipSalt = randomBytes(64).toString('hex');
+import { Bright, Green, Red } from "./modules/sub/consoleText.js";
+import { getCurrentBranch, shortCommit } from "./modules/sub/currentCommit.js";
+import { loadLoc } from "./localization/manager.js";
import path from 'path';
import { fileURLToPath } from 'url';
+
+import { runWeb } from "./core/web.js";
+import { runAPI } from "./core/api.js";
+import { runBoth } from "./core/both.js";
+
+const app = express();
+
+const gitCommit = shortCommit();
+const gitBranch = getCurrentBranch();
+
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename).slice(0, -4); // go up another level (get rid of src/)
-import { getCurrentBranch, shortCommit } from "./modules/sub/currentCommit.js";
-import { appName, genericUserAgent, version } from "./modules/config.js";
-import { getJSON } from "./modules/api.js";
-import { apiJSON, checkJSONPost, getIP, languageCode } from "./modules/sub/utils.js";
-import { Bright, Cyan, Green, Red } from "./modules/sub/consoleText.js";
-import stream from "./modules/stream/stream.js";
-import loc from "./localization/manager.js";
-import { buildFront } from "./modules/build.js";
-import { changelogHistory } from "./modules/pageRender/onDemand.js";
-import { sha256 } from "./modules/sub/crypto.js";
-import findRendered from "./modules/pageRender/findRendered.js";
-import { celebrationsEmoji } from "./modules/pageRender/elements.js";
+app.disable('x-powered-by');
-if (process.env.selfURL && process.env.port) {
- const commitHash = shortCommit();
- const branch = getCurrentBranch();
- const app = express();
+await loadLoc(); // preload localization
- app.disable('x-powered-by');
-
- const corsConfig = process.env.cors === '0' ? { origin: process.env.selfURL, optionsSuccessStatus: 200 } : {};
-
- const apiLimiter = rateLimit({
- windowMs: 60000,
- max: 25,
- standardHeaders: false,
- legacyHeaders: false,
- keyGenerator: (req, res) => sha256(getIP(req), ipSalt),
- handler: (req, res, next, opt) => {
- res.status(429).json({ "status": "error", "text": loc(languageCode(req), 'ErrorRateLimit') });
- return;
- }
- });
- const apiLimiterStream = rateLimit({
- windowMs: 60000,
- max: 28,
- standardHeaders: false,
- legacyHeaders: false,
- keyGenerator: (req, res) => sha256(getIP(req), ipSalt),
- handler: (req, res, next, opt) => {
- res.status(429).json({ "status": "error", "text": loc(languageCode(req), 'ErrorRateLimit') });
- return;
- }
- });
-
- await buildFront(commitHash, branch);
-
- app.use('/api/:type', cors(corsConfig));
- app.use('/api/json', apiLimiter);
- app.use('/api/stream', apiLimiterStream);
- app.use('/api/onDemand', apiLimiter);
-
- app.use('/', express.static('./min'));
- app.use('/', express.static('./src/front'));
-
- app.use((req, res, next) => {
- try { decodeURIComponent(req.path) } catch (e) { return res.redirect('/') }
- next();
- });
- app.use((req, res, next) => {
- if (req.header("user-agent") && req.header("user-agent").includes("Trident")) res.destroy();
- next();
- });
- app.use('/api/json', express.json({
- verify: (req, res, buf) => {
- try {
- JSON.parse(buf);
- if (buf.length > 720) throw new Error();
- if (String(req.header('Content-Type')) !== "application/json") {
- res.status(400).json({ 'status': 'error', 'text': 'invalid content type header' });
- return;
- }
- if (String(req.header('Accept')) !== "application/json") {
- res.status(400).json({ 'status': 'error', 'text': 'invalid accept header' });
- return;
- }
- } catch(e) {
- res.status(400).json({ 'status': 'error', 'text': 'invalid json body.' });
- return;
- }
- }
- }));
-
- app.post('/api/json', async (req, res) => {
- try {
- let ip = sha256(getIP(req), ipSalt);
- let lang = languageCode(req);
- let j = apiJSON(0, { t: "Bad request" });
- try {
- let request = req.body;
- if (request.url) {
- request.dubLang = request.dubLang ? lang : false;
- let chck = checkJSONPost(request);
- if (chck) chck["ip"] = ip;
- j = chck ? await getJSON(chck["url"], lang, chck) : apiJSON(0, { t: loc(lang, 'ErrorCouldntFetch') });
- } else {
- j = apiJSON(0, { t: loc(lang, 'ErrorNoLink') });
- }
- } catch (e) {
- j = apiJSON(0, { t: loc(lang, 'ErrorCantProcess') });
- }
- res.status(j.status).json(j.body);
- return;
- } catch (e) {
- res.destroy();
- return
- }
- });
-
- app.get('/api/:type', (req, res) => {
- try {
- let ip = sha256(getIP(req), ipSalt);
- switch (req.params.type) {
- case 'stream':
- if (req.query.p) {
- res.status(200).json({ "status": "continue" });
- return;
- } else if (req.query.t && req.query.h && req.query.e) {
- stream(res, ip, req.query.t, req.query.h, req.query.e);
- } else {
- let j = apiJSON(0, { t: "no stream id" })
- res.status(j.status).json(j.body);
- return;
- }
- break;
- case 'onDemand':
- if (req.query.blockId) {
- let blockId = req.query.blockId.slice(0, 3);
- let r, j;
- switch(blockId) {
- case "0": // changelog history
- r = changelogHistory();
- j = r ? apiJSON(3, { t: r }) : apiJSON(0, { t: "couldn't render this block" })
- break;
- case "1": // celebrations emoji
- r = celebrationsEmoji();
- j = r ? apiJSON(3, { t: r }) : false
- break;
- default:
- j = apiJSON(0, { t: "couldn't find a block with this id" })
- break;
- }
- if (j.body) {
- res.status(j.status).json(j.body)
- } else {
- res.status(204).end()
- }
- } else {
- let j = apiJSON(0, { t: "no block id" });
- res.status(j.status).json(j.body)
- }
- break;
- default:
- let j = apiJSON(0, { t: "unknown response type" })
- res.status(j.status).json(j.body);
- break;
- }
- } catch (e) {
- res.status(500).json({ 'status': 'error', 'text': loc(languageCode(req), 'ErrorCantProcess') });
- return;
- }
- });
- app.get("/api", (req, res) => {
- res.redirect('/api/json')
- });
- app.get("/status", (req, res) => {
- res.status(200).end()
- });
- app.get("/", (req, res) => {
- res.sendFile(`${__dirname}/${findRendered(languageCode(req), req.header('user-agent') ? req.header('user-agent') : genericUserAgent)}`);
- });
- app.get("/favicon.ico", (req, res) => {
- res.redirect('/icons/favicon.ico');
- });
- app.get("/*", (req, res) => {
- res.redirect('/')
- });
-
- app.listen(process.env.port, () => {
- let startTime = new Date();
- console.log(`\n${Cyan(appName)} ${Bright(`v.${version}-${commitHash} (${branch})`)}\nStart time: ${Bright(`${startTime.toUTCString()} (${Math.floor(new Date().getTime())})`)}\n\nURL: ${Cyan(`${process.env.selfURL}`)}\nPort: ${process.env.port}\n`)
- })
+// i don't like this at all
+if (process.env.apiURL && process.env.apiPort && !((process.env.webURL && process.env.webPort) || (process.env.selfURL && process.env.port))) {
+ await runAPI(express, app, gitCommit, gitBranch, __dirname);
+} else if (process.env.webURL && process.env.webPort && !((process.env.apiURL && process.env.apiPort) || (process.env.selfURL && process.env.port))) {
+ await runWeb(express, app, gitCommit, gitBranch, __dirname);
+} else if (process.env.selfURL && process.env.port && !((process.env.apiURL && process.env.apiPort) || (process.env.webURL && process.env.webPort))) {
+ await runBoth(express, app, gitCommit, gitBranch, __dirname)
} else {
console.log(Red(`cobalt hasn't been configured yet or configuration is invalid.\n`) + Bright(`please run the setup script to fix this: `) + Green(`npm run setup`));
}
diff --git a/src/config.json b/src/config.json
index 2871c3ea..91915bcf 100644
--- a/src/config.json
+++ b/src/config.json
@@ -14,6 +14,10 @@
"mastodon": {
"url": "https://wetdry.world/@cobalt",
"handle": "@cobalt@wetdry.world"
+ },
+ "discord": {
+ "url": "https://discord.gg/pQPt8HBUPu",
+ "handle": "cobalt community server"
}
}
},
diff --git a/src/core/api.js b/src/core/api.js
new file mode 100644
index 00000000..6826efd2
--- /dev/null
+++ b/src/core/api.js
@@ -0,0 +1,185 @@
+import cors from "cors";
+import rateLimit from "express-rate-limit";
+import { randomBytes } from "crypto";
+
+const ipSalt = randomBytes(64).toString('hex');
+
+import { appName, version } from "../modules/config.js";
+import { getJSON } from "../modules/api.js";
+import { apiJSON, checkJSONPost, getIP, languageCode } from "../modules/sub/utils.js";
+import { Bright, Cyan } from "../modules/sub/consoleText.js";
+import stream from "../modules/stream/stream.js";
+import loc from "../localization/manager.js";
+import { changelogHistory } from "../modules/pageRender/onDemand.js";
+import { sha256 } from "../modules/sub/crypto.js";
+import { celebrationsEmoji } from "../modules/pageRender/elements.js";
+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, optionsSuccessStatus: 200 } : {};
+
+ const apiLimiter = rateLimit({
+ windowMs: 60000,
+ max: 25,
+ standardHeaders: false,
+ legacyHeaders: false,
+ keyGenerator: (req, res) => sha256(getIP(req), ipSalt),
+ handler: (req, res, next, opt) => {
+ res.status(429).json({ "status": "error", "text": loc(languageCode(req), 'ErrorRateLimit') });
+ return;
+ }
+ });
+ const apiLimiterStream = rateLimit({
+ windowMs: 60000,
+ max: 28,
+ standardHeaders: false,
+ legacyHeaders: false,
+ keyGenerator: (req, res) => sha256(getIP(req), ipSalt),
+ handler: (req, res, next, opt) => {
+ res.status(429).json({ "status": "error", "text": loc(languageCode(req), 'ErrorRateLimit') });
+ return;
+ }
+ });
+
+ const startTime = new Date();
+ const startTimestamp = Math.floor(startTime.getTime());
+
+ app.use('/api/:type', cors(corsConfig));
+ app.use('/api/json', apiLimiter);
+ app.use('/api/stream', apiLimiterStream);
+ app.use('/api/onDemand', apiLimiter);
+
+ app.use((req, res, next) => {
+ try { decodeURIComponent(req.path) } catch (e) { return res.redirect('/') }
+ next();
+ });
+ app.use('/api/json', express.json({
+ verify: (req, res, buf) => {
+ try {
+ JSON.parse(buf);
+ if (buf.length > 720) throw new Error();
+ if (String(req.header('Content-Type')) !== "application/json") {
+ res.status(400).json({ 'status': 'error', 'text': 'invalid content type header' });
+ return;
+ }
+ if (String(req.header('Accept')) !== "application/json") {
+ res.status(400).json({ 'status': 'error', 'text': 'invalid accept header' });
+ return;
+ }
+ } catch(e) {
+ res.status(400).json({ 'status': 'error', 'text': 'invalid json body.' });
+ return;
+ }
+ }
+ }));
+
+ app.post('/api/json', async (req, res) => {
+ try {
+ let ip = sha256(getIP(req), ipSalt);
+ let lang = languageCode(req);
+ let j = apiJSON(0, { t: "Bad request" });
+ try {
+ let request = req.body;
+ if (request.url) {
+ request.dubLang = request.dubLang ? lang : false;
+ let chck = checkJSONPost(request);
+ if (chck) chck["ip"] = ip;
+ j = chck ? await getJSON(chck["url"], lang, chck) : apiJSON(0, { t: loc(lang, 'ErrorCouldntFetch') });
+ } else {
+ j = apiJSON(0, { t: loc(lang, 'ErrorNoLink') });
+ }
+ } catch (e) {
+ j = apiJSON(0, { t: loc(lang, 'ErrorCantProcess') });
+ }
+ res.status(j.status).json(j.body);
+ return;
+ } catch (e) {
+ res.destroy();
+ return
+ }
+ });
+
+ app.get('/api/:type', (req, res) => {
+ try {
+ let ip = sha256(getIP(req), ipSalt);
+ switch (req.params.type) {
+ case 'stream':
+ let streamInfo = verifyStream(ip, req.query.t, req.query.h, req.query.e);
+ if (streamInfo.error) {
+ res.status(streamInfo.status).json(apiJSON(0, { t: streamInfo.error }).body);
+ return;
+ }
+
+ if (req.query.p) {
+ res.status(200).json({ "status": "continue" });
+ return;
+ } else if (req.query.t && req.query.h && req.query.e) {
+ stream(res, ip, req.query.t, req.query.h, req.query.e);
+ } else {
+ let j = apiJSON(0, { t: "no stream id" })
+ res.status(j.status).json(j.body);
+ return;
+ }
+ break;
+ case 'onDemand':
+ if (req.query.blockId) {
+ let blockId = req.query.blockId.slice(0, 3);
+ let r, j;
+ switch(blockId) {
+ case "0": // changelog history
+ r = changelogHistory();
+ j = r ? apiJSON(3, { t: r }) : apiJSON(0, { t: "couldn't render this block" })
+ break;
+ case "1": // celebrations emoji
+ r = celebrationsEmoji();
+ j = r ? apiJSON(3, { t: r }) : false
+ break;
+ default:
+ j = apiJSON(0, { t: "couldn't find a block with this id" })
+ break;
+ }
+ if (j.body) {
+ res.status(j.status).json(j.body)
+ } else {
+ res.status(204).end()
+ }
+ } else {
+ let j = apiJSON(0, { t: "no block id" });
+ res.status(j.status).json(j.body)
+ }
+ break;
+ case 'serverInfo':
+ res.status(200).json({
+ version: version,
+ commit: gitCommit,
+ branch: gitBranch,
+ name: process.env.apiName ? process.env.apiName : "unknown",
+ url: process.env.apiURL,
+ cors: process.env.cors,
+ startTime: `${startTimestamp}`
+ });
+ break;
+ default:
+ let j = apiJSON(0, { t: "unknown response type" })
+ res.status(j.status).json(j.body);
+ break;
+ }
+ } catch (e) {
+ res.status(500).json({ 'status': 'error', 'text': loc(languageCode(req), 'ErrorCantProcess') });
+ return;
+ }
+ });
+ app.get('/api/status', (req, res) => {
+ res.status(200).end()
+ });
+ app.get('/favicon.ico', (req, res) => {
+ res.sendFile(`${__dirname}/src/front/icons/favicon.ico`)
+ });
+ app.get('/*', (req, res) => {
+ res.redirect('/api/json')
+ });
+
+ app.listen(process.env.apiPort, () => {
+ console.log(`\n${Cyan(appName)} API ${Bright(`v.${version}-${gitCommit} (${gitBranch})`)}\nStart time: ${Bright(`${startTime.toUTCString()} (${startTimestamp})`)}\n\nURL: ${Cyan(`${process.env.apiURL}`)}\nPort: ${process.env.apiPort}\n`)
+ });
+}
diff --git a/src/core/both.js b/src/core/both.js
new file mode 100644
index 00000000..4b14592f
--- /dev/null
+++ b/src/core/both.js
@@ -0,0 +1,197 @@
+import cors from "cors";
+import rateLimit from "express-rate-limit";
+import { randomBytes } from "crypto";
+
+const ipSalt = randomBytes(64).toString('hex');
+
+import { appName, genericUserAgent, version } from "../modules/config.js";
+import { getJSON } from "../modules/api.js";
+import { apiJSON, checkJSONPost, getIP, languageCode } from "../modules/sub/utils.js";
+import { Bright, Cyan, Green, Red } from "../modules/sub/consoleText.js";
+import stream from "../modules/stream/stream.js";
+import loc from "../localization/manager.js";
+import { buildFront } from "../modules/build.js";
+import { changelogHistory } from "../modules/pageRender/onDemand.js";
+import { sha256 } from "../modules/sub/crypto.js";
+import findRendered from "../modules/pageRender/findRendered.js";
+import { celebrationsEmoji } from "../modules/pageRender/elements.js";
+
+export async function runBoth(express, app, gitCommit, gitBranch, __dirname) {
+ const corsConfig = process.env.cors === '0' ? { origin: process.env.selfURL, optionsSuccessStatus: 200 } : {};
+
+ const apiLimiter = rateLimit({
+ windowMs: 60000,
+ max: 25,
+ standardHeaders: false,
+ legacyHeaders: false,
+ keyGenerator: (req, res) => sha256(getIP(req), ipSalt),
+ handler: (req, res, next, opt) => {
+ res.status(429).json({ "status": "error", "text": loc(languageCode(req), 'ErrorRateLimit') });
+ return;
+ }
+ });
+ const apiLimiterStream = rateLimit({
+ windowMs: 60000,
+ max: 28,
+ standardHeaders: false,
+ legacyHeaders: false,
+ keyGenerator: (req, res) => sha256(getIP(req), ipSalt),
+ handler: (req, res, next, opt) => {
+ res.status(429).json({ "status": "error", "text": loc(languageCode(req), 'ErrorRateLimit') });
+ return;
+ }
+ });
+
+ const startTime = new Date();
+ const startTimestamp = Math.floor(startTime.getTime());
+
+ // preload localization files and build static pages
+ await buildFront(gitCommit, gitBranch);
+
+ app.use('/api/:type', cors(corsConfig));
+ app.use('/api/json', apiLimiter);
+ app.use('/api/stream', apiLimiterStream);
+ app.use('/api/onDemand', apiLimiter);
+
+ app.use('/', express.static('./build/min'));
+ app.use('/', express.static('./src/front'));
+
+ app.use((req, res, next) => {
+ try { decodeURIComponent(req.path) } catch (e) { return res.redirect('/') }
+ next();
+ });
+ app.use((req, res, next) => {
+ if (req.header("user-agent") && req.header("user-agent").includes("Trident")) res.destroy();
+ next();
+ });
+ app.use('/api/json', express.json({
+ verify: (req, res, buf) => {
+ try {
+ JSON.parse(buf);
+ if (buf.length > 720) throw new Error();
+ if (String(req.header('Content-Type')) !== "application/json") {
+ res.status(400).json({ 'status': 'error', 'text': 'invalid content type header' });
+ return;
+ }
+ if (String(req.header('Accept')) !== "application/json") {
+ res.status(400).json({ 'status': 'error', 'text': 'invalid accept header' });
+ return;
+ }
+ } catch(e) {
+ res.status(400).json({ 'status': 'error', 'text': 'invalid json body.' });
+ return;
+ }
+ }
+ }));
+
+ app.post('/api/json', async (req, res) => {
+ try {
+ let ip = sha256(getIP(req), ipSalt);
+ let lang = languageCode(req);
+ let j = apiJSON(0, { t: "Bad request" });
+ try {
+ let request = req.body;
+ if (request.url) {
+ request.dubLang = request.dubLang ? lang : false;
+ let chck = checkJSONPost(request);
+ if (chck) chck["ip"] = ip;
+ j = chck ? await getJSON(chck["url"], lang, chck) : apiJSON(0, { t: loc(lang, 'ErrorCouldntFetch') });
+ } else {
+ j = apiJSON(0, { t: loc(lang, 'ErrorNoLink') });
+ }
+ } catch (e) {
+ j = apiJSON(0, { t: loc(lang, 'ErrorCantProcess') });
+ }
+ res.status(j.status).json(j.body);
+ return;
+ } catch (e) {
+ res.destroy();
+ return
+ }
+ });
+
+ app.get('/api/:type', (req, res) => {
+ try {
+ let ip = sha256(getIP(req), ipSalt);
+ switch (req.params.type) {
+ case 'stream':
+ if (req.query.p) {
+ res.status(200).json({ "status": "continue" });
+ return;
+ } else if (req.query.t && req.query.h && req.query.e) {
+ stream(res, ip, req.query.t, req.query.h, req.query.e);
+ } else {
+ let j = apiJSON(0, { t: "no stream id" })
+ res.status(j.status).json(j.body);
+ return;
+ }
+ break;
+ case 'onDemand':
+ if (req.query.blockId) {
+ let blockId = req.query.blockId.slice(0, 3);
+ let r, j;
+ switch(blockId) {
+ case "0": // changelog history
+ r = changelogHistory();
+ j = r ? apiJSON(3, { t: r }) : apiJSON(0, { t: "couldn't render this block" })
+ break;
+ case "1": // celebrations emoji
+ r = celebrationsEmoji();
+ j = r ? apiJSON(3, { t: r }) : false
+ break;
+ default:
+ j = apiJSON(0, { t: "couldn't find a block with this id" })
+ break;
+ }
+ if (j.body) {
+ res.status(j.status).json(j.body)
+ } else {
+ res.status(204).end()
+ }
+ } else {
+ let j = apiJSON(0, { t: "no block id" });
+ res.status(j.status).json(j.body)
+ }
+ break;
+ case 'serverInfo':
+ res.status(200).json({
+ version: version,
+ commit: gitCommit,
+ branch: gitBranch,
+ name: process.env.apiName ? process.env.apiName : "unknown",
+ url: process.env.apiURL,
+ cors: process.env.cors,
+ startTime: `${startTimestamp}`
+ });
+ break;
+ default:
+ let j = apiJSON(0, { t: "unknown response type" })
+ res.status(j.status).json(j.body);
+ break;
+ }
+ } catch (e) {
+ res.status(500).json({ 'status': 'error', 'text': loc(languageCode(req), 'ErrorCantProcess') });
+ return;
+ }
+ });
+ app.get("/api/status", (req, res) => {
+ res.status(200).end()
+ });
+ app.get("/api", (req, res) => {
+ res.redirect('/api/json')
+ });
+ app.get("/", (req, res) => {
+ res.sendFile(`${__dirname}/${findRendered(languageCode(req), req.header('user-agent') ? req.header('user-agent') : genericUserAgent)}`);
+ });
+ app.get("/favicon.ico", (req, res) => {
+ res.redirect('/icons/favicon.ico');
+ });
+ app.get("/*", (req, res) => {
+ res.redirect('/')
+ });
+
+ app.listen(process.env.port, () => {
+ console.log(`${Red("⚠️ This way of running cobalt has been deprecated and will be removed soon.\nCheck the docs and get ready: ")}${Green("WIP")}`)
+ console.log(`\n${Cyan(appName)} ${Bright(`v.${version}-${gitCommit} (${gitBranch})`)}\nStart time: ${Bright(`${startTime.toUTCString()} (${Math.floor(startTimestamp)})`)}\n\nURL: ${Cyan(`${process.env.selfURL}`)}\nPort: ${process.env.port}\n`)
+ })
+}
diff --git a/src/core/web.js b/src/core/web.js
new file mode 100644
index 00000000..afde9fe7
--- /dev/null
+++ b/src/core/web.js
@@ -0,0 +1,51 @@
+import { appName, genericUserAgent, version } from "../modules/config.js";
+import { languageCode } from "../modules/sub/utils.js";
+import { Bright, Cyan } from "../modules/sub/consoleText.js";
+import { buildFront } from "../modules/build.js";
+import findRendered from "../modules/pageRender/findRendered.js";
+
+// * will be removed in the future
+import cors from "cors";
+// *
+
+export async function runWeb(express, app, gitCommit, gitBranch, __dirname) {
+ await buildFront(gitCommit, gitBranch);
+
+ // * will be removed in the future
+ const corsConfig = process.env.cors === '0' ? { origin: process.env.webURL, optionsSuccessStatus: 200 } : {};
+ app.use('/api/:type', cors(corsConfig));
+ // *
+
+ app.use('/', express.static('./build/min'));
+ app.use('/', express.static('./src/front'));
+
+ app.use((req, res, next) => {
+ try { decodeURIComponent(req.path) } catch (e) { return res.redirect('/') }
+ next();
+ });
+ app.get("/status", (req, res) => {
+ res.status(200).end()
+ });
+ app.get("/", (req, res) => {
+ res.sendFile(`${__dirname}/${findRendered(languageCode(req), req.header('user-agent') ? req.header('user-agent') : genericUserAgent)}`)
+ });
+ app.get("/favicon.ico", (req, res) => {
+ res.sendFile(`${__dirname}/src/front/icons/favicon.ico`)
+ });
+ // * will be removed in the future
+ app.get("/api/*", (req, res) => {
+ res.redirect(308, process.env.apiURL.slice(0, -1) + req.url)
+ });
+ app.post("/api/*", (req, res) => {
+ res.redirect(308, process.env.apiURL.slice(0, -1) + req.url)
+ });
+ // *
+ app.get("/*", (req, res) => {
+ res.redirect('/')
+ });
+
+ app.listen(process.env.webPort, () => {
+ let startTime = new Date();
+ console.log(`\n${Cyan(appName)} WEB ${Bright(`v.${version}-${gitCommit} (${gitBranch})`)}\nStart time: ${Bright(`${startTime.toUTCString()} (${Math.floor(new Date().getTime())})`)}\n\nURL: ${Cyan(`${process.env.webURL}`)}\nPort: ${process.env.webPort}\n`)
+ })
+}
diff --git a/src/front/cobalt.css b/src/front/cobalt.css
index 9f9c8a9c..749ff065 100644
--- a/src/front/cobalt.css
+++ b/src/front/cobalt.css
@@ -156,7 +156,7 @@ button:active,
.text-to-copy:active {
background: var(--accent-press);
cursor: pointer;
- transform: scale(0.95)
+ transform: scale(0.95);
}
.collapse-header:active {
background: var(--accent-press);
@@ -664,10 +664,6 @@ button:active,
#pd-share {
display: none;
}
-#hop-attribution {
- display: block;
- text-align: right;
-}
#about-donate-footer::before {
content: "";
position: absolute;
@@ -681,6 +677,9 @@ button:active,
#about-donate-footer:active::before {
opacity: 0;
}
+.popup-tabs-child {
+ width: 100%;
+}
/* adapt the page according to screen size */
@media screen and (min-width: 2300px) {
html {
diff --git a/src/front/cobalt.js b/src/front/cobalt.js
index cd77b2d2..f801a704 100644
--- a/src/front/cobalt.js
+++ b/src/front/cobalt.js
@@ -19,10 +19,12 @@ const exceptions = { // used for mobile devices
"vQuality": "720"
};
-const apiURL = '';
-
let store = {};
+function changeAPI(url) {
+ apiURL = url;
+ return true
+}
function eid(id) {
return document.getElementById(id)
}
diff --git a/src/front/emoji/alien_monster.svg b/src/front/emoji/alien_monster.svg
new file mode 100644
index 00000000..66be00bd
--- /dev/null
+++ b/src/front/emoji/alien_monster.svg
@@ -0,0 +1,9 @@
+
\ No newline at end of file
diff --git a/src/localization/languages/en.json b/src/localization/languages/en.json
index 4f052578..4fe42dbd 100644
--- a/src/localization/languages/en.json
+++ b/src/localization/languages/en.json
@@ -47,7 +47,7 @@
"SettingsQualityDescription": "if selected quality isn't available, closest one is used instead.",
"LinkGitHubChanges": ">> see previous commits and contribute on github",
"NoScriptMessage": "{appName} uses javascript for api requests and interactive interface. you have to allow javascript to use this site. there are no pesty scripts, pinky promise.",
- "DownloadPopupDescriptionIOS": "easiest way to save videos on ios:\n1. add this siri shortcut.\n2. press \"share\" above and select \"save to photos\" in appeared share sheet.\nif asked, review the permission request popup on top, and press \"always allow\".\n\nalternative method: press and hold the download button, hide the video preview, and select \"download linked file\" to download.\nthen, open safari downloads, select the file you downloaded, open share menu, and finally press \"save video\".",
+ "DownloadPopupDescriptionIOS": "easiest way to save videos on ios:\n1. add this siri shortcut.\n2. press \"share\" above and select \"save to photos\" in appeared share sheet.\nif asked, review the permission request, and press \"always allow\".\n\nalternative method:\npress and hold the download button, hide the video preview, and select \"download linked file\" to download.\nthen, open safari downloads, select the file you downloaded, open share menu, and finally press \"save video\".",
"DownloadPopupDescription": "download button opens a new tab with requested file. you can disable this popup in settings.",
"DownloadPopupWayToSave": "pick a way to save",
"ClickToCopy": "press to copy",
diff --git a/src/localization/languages/ru.json b/src/localization/languages/ru.json
index 7f59f356..8a0845f8 100644
--- a/src/localization/languages/ru.json
+++ b/src/localization/languages/ru.json
@@ -47,7 +47,7 @@
"SettingsQualityDescription": "если выбранное качество недоступно, то выбирается ближайшее к нему.",
"LinkGitHubChanges": ">> смотри предыдущие изменения на github",
"NoScriptMessage": "{appName} использует javascript для обработки ссылок и интерактивного интерфейса. ты должен разрешить использование javascript, чтобы пользоваться сайтом. тут нет никаких зловредных скриптов, обещаю.",
- "DownloadPopupDescriptionIOS": "наиболее простой метод скачивания видео на ios:\n1. добавь этот сценарий siri.\n2. нажми \"поделиться\" выше и выбери \"save to photos\" в открывшемся окне.\nесли появляется окно с запросом разрешения, то прочитай его, потом нажми \"всегда разрешать\".\n\nальтернативный метод: зажми кнопку \"скачать\", затем скрой превью и выбери \"загрузить файл по ссылке\" в появившемся окне.\nпотом открой загрузки в safari, выбери скачанный файл, нажми иконку \"поделиться\", и, наконец, нажми \"сохранить видео\".",
+ "DownloadPopupDescriptionIOS": "наиболее простой метод скачивания видео на ios:\n1. добавь этот сценарий siri.\n2. нажми \"поделиться\" выше и выбери \"save to photos\" в открывшемся окне.\nесли появляется окно с запросом разрешения, то прочитай его, потом нажми \"всегда разрешать\".\n\nальтернативный метод:\nзажми кнопку \"скачать\", затем скрой превью и выбери \"загрузить файл по ссылке\" в появившемся окне.\nпотом открой загрузки в safari, выбери скачанный файл, нажми иконку \"поделиться\", и, наконец, нажми \"сохранить видео\".",
"DownloadPopupDescription": "кнопка скачивания открывает новое окно с файлом. ты можешь отключить выбор метода скачивания файла в настройках.",
"DownloadPopupWayToSave": "выбери, как сохранить",
"ClickToCopy": "нажми, чтобы скопировать",
diff --git a/src/localization/manager.js b/src/localization/manager.js
index 2f5a334a..e5eec9bb 100644
--- a/src/localization/manager.js
+++ b/src/localization/manager.js
@@ -7,16 +7,13 @@ const locPath = './src/localization/languages';
let loc = {}
let languages = [];
-export function loadLoc() {
- fs.readdir(locPath, (err, files) => {
- if (err) return false;
- files.forEach(file => {
- loc[file.split('.')[0]] = loadJson(`${locPath}/${file}`);
- languages.push(file.split('.')[0])
- });
- })
+export async function loadLoc() {
+ const files = await fs.promises.readdir(locPath).catch((e) => { return [] });
+ files.forEach(file => {
+ loc[file.split('.')[0]] = loadJson(`${locPath}/${file}`);
+ languages.push(file.split('.')[0])
+ });
}
-loadLoc();
export function replaceBase(s) {
return s.replace(/\n/g, '
').replace(/{saveToGalleryShortcut}/g, links.saveToGalleryShortcut).replace(/{appName}/g, appName).replace(/{repo}/g, repo).replace(/\*;/g, "•");
diff --git a/src/modules/api.js b/src/modules/api.js
index d5446810..94ed5040 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -34,8 +34,9 @@ export async function getJSON(originalURL, lang, obj) {
}
if (!(host && host.length < 20 && host in patterns && patterns[host]["enabled"])) return apiJSON(0, { t: errorUnsupported(lang) });
+ let pathToMatch = cleanURL(url, host).split(`.${patterns[host]['tld'] ? patterns[host]['tld'] : "com"}/`)[1].replace('.', '');
for (let i in patterns[host]["patterns"]) {
- patternMatch = new UrlPattern(patterns[host]["patterns"][i]).match(cleanURL(url, host).split(`.${patterns[host]['tld'] ? patterns[host]['tld'] : "com"}/`)[1].replace('.', ''));
+ patternMatch = new UrlPattern(patterns[host]["patterns"][i]).match(pathToMatch);
if (patternMatch) break
}
if (!patternMatch) return apiJSON(0, { t: errorUnsupported(lang) });
diff --git a/src/modules/build.js b/src/modules/build.js
index 6c4bee85..a2515b0e 100644
--- a/src/modules/build.js
+++ b/src/modules/build.js
@@ -1,6 +1,7 @@
import * as esbuild from "esbuild";
import * as fs from "fs";
-import { languageList } from "../localization/manager.js";
+import { loadLoc, languageList } from "../localization/manager.js";
+
import page from "./pageRender/page.js";
function cleanHTML(html) {
@@ -10,6 +11,9 @@ function cleanHTML(html) {
}
export async function buildFront(commitHash, branch) {
try {
+ // preload localization files
+ await loadLoc();
+
// build html
if (!fs.existsSync('./build/')){
fs.mkdirSync('./build/');
@@ -17,6 +21,10 @@ export async function buildFront(commitHash, branch) {
fs.mkdirSync('./build/pc/');
fs.mkdirSync('./build/mob/');
}
+ // get rid of old build path
+ if (fs.existsSync('./min')) {
+ fs.rmSync('./min', { recursive: true, force: true });
+ }
for (let i in languageList) {
i = languageList[i];
let params = {
@@ -36,7 +44,7 @@ export async function buildFront(commitHash, branch) {
// build js & css
await esbuild.build({
entryPoints: ['src/front/cobalt.js', 'src/front/cobalt.css'],
- outdir: 'min/',
+ outdir: 'build/min/',
minify: true,
loader: { '.js': 'js', '.css': 'css', },
charset: 'utf8'
diff --git a/src/modules/buildStatic.js b/src/modules/buildStatic.js
new file mode 100644
index 00000000..d3ed909f
--- /dev/null
+++ b/src/modules/buildStatic.js
@@ -0,0 +1,7 @@
+import { buildFront } from "./build.js";
+import { getCurrentBranch, shortCommit } from "./sub/currentCommit.js";
+
+const commitHash = shortCommit();
+const branch = getCurrentBranch();
+
+await buildFront(commitHash, branch);
diff --git a/src/modules/changelog/changelog.json b/src/modules/changelog/changelog.json
index 0636d947..aa573457 100644
--- a/src/modules/changelog/changelog.json
+++ b/src/modules/changelog/changelog.json
@@ -1,9 +1,9 @@
{
"current": {
"version": "5.4",
- "title": "instagram support, hop, docker, and more!",
+ "title": "instagram support, docker, and more!",
"banner": "catphonestand.webp",
- "content": "something many of you've been waiting for is finally here! try it out and let me know what you think :)\n\ntl;dr:\n*; added experimental instagram support! download any reels or videos you like, and make sure to report any issues you encounter. yes, you can convert either to audio.\n*; fixed support for on.soundcloud links.\n*; added share button to \"how to save?\" popup.\n*; added docker support.\n*; main instance is now powered by hop.io.\n\nservice improvements:\n*; added experimental support for videos from instagram. currently only reels and post videos are downloadable, but i'm looking into ways to save high resolution photos too. if you experience any issues, please report them on either of support platforms.\n*; fixed support for on.soundcloud share links. should work just as well as other versions!\n*; fixed an issue that made some youtube videos impossible to download.\n\ninterface improvements:\n*; new css-only checkmark! yes, i can't stop tinkering with it because slight flashing on svg load annoyed me. now it loads instantly (and also looks slightly better).\n*; fixed copy animation.\n*; minor localization improvements.\n*; fixed the embed logo that i broke somewhere in between 5.3 and 5.4.\n\ninternal improvements:\n*; now using nanoid for live render stream ids.\n*; added support for docker. it's kind of clumsy because of how i get .git folder inside the container, but if you know how to do it better, feel free to make a pr.\n*; cobalt now checks only for existence of environment variables, not exactly the .env file.\n*; changed the way user ip address is retrieved for instances using cloudflare.\n*; added ability to disable cors, both to setup script and environment variables.\n*; moved main instance to hop.io infra. there should no longer be random downtimes. huge shout out to the hop team for being so nice and helping me out :D\n\ni can't believe how diverse and widespread cobalt has become. it's used in all fields: music production, education, content creation, and even game development. thank you. this is absolutely nuts.\nif you don't mind sharing, please tell me about your use case. i'd really love to hear how you use cobalt and how i could make it even more useful for you."
+ "content": "something many of you've been waiting for is finally here! try it out and let me know what you think :)\n\ntl;dr:\n*; added experimental instagram support! download any reels or videos you like, and make sure to report any issues you encounter. yes, you can convert either to audio.\n*; fixed support for on.soundcloud links.\n*; added share button to \"how to save?\" popup.\n*; added docker support.\n\nservice improvements:\n*; added experimental support for videos from instagram. currently only reels and post videos are downloadable, but i'm looking into ways to save high resolution photos too. if you experience any issues, please report them on either of support platforms.\n*; fixed support for on.soundcloud share links. should work just as well as other versions!\n*; fixed an issue that made some youtube videos impossible to download.\n\ninterface improvements:\n*; new css-only checkmark! yes, i can't stop tinkering with it because slight flashing on svg load annoyed me. now it loads instantly (and also looks slightly better).\n*; fixed copy animation.\n*; minor localization improvements.\n*; fixed the embed logo that i broke somewhere in between 5.3 and 5.4.\n\ninternal improvements:\n*; now using nanoid for live render stream ids.\n*; added support for docker. it's kind of clumsy because of how i get .git folder inside the container, but if you know how to do it better, feel free to make a pr.\n*; cobalt now checks only for existence of environment variables, not exactly the .env file.\n*; changed the way user ip address is retrieved for instances using cloudflare.\n*; added ability to disable cors, both to setup script and environment variables.\n\ni can't believe how diverse and widespread cobalt has become. it's used in all fields: music production, education, content creation, and even game development. thank you. this is absolutely nuts.\nif you don't mind sharing, please tell me about your use case. i'd really love to hear how you use cobalt and how i could make it even more useful for you."
},
"history": [{
"version": "5.3",
diff --git a/src/modules/emoji.js b/src/modules/emoji.js
index 284404d4..3565a452 100644
--- a/src/modules/emoji.js
+++ b/src/modules/emoji.js
@@ -23,7 +23,8 @@ const names = {
"🐙": "octopus",
"🔮": "crystal_ball",
"💪": "biceps",
- "💖": "sparkling_heart"
+ "💖": "sparkling_heart",
+ "👾": "alien_monster"
}
let sizing = {
22: 0.4,
diff --git a/src/modules/pageRender/elements.js b/src/modules/pageRender/elements.js
index cdf155ed..dd9861a0 100644
--- a/src/modules/pageRender/elements.js
+++ b/src/modules/pageRender/elements.js
@@ -89,14 +89,13 @@ export function multiPagePopup(obj) {
tabs += ``
tabContent += ``
}
- tabs += ``
return `
`
}
export function collapsibleList(arr) {
diff --git a/src/modules/pageRender/page.js b/src/modules/pageRender/page.js
index d506890a..9e6bf957 100644
--- a/src/modules/pageRender/page.js
+++ b/src/modules/pageRender/page.js
@@ -48,10 +48,10 @@ export default function(obj) {
${appName}
-
+
-
+
@@ -96,8 +96,9 @@ export default function(obj) {
"name": "support",
"title": t("CollapseSupport"),
"body": `${t("FollowSupport")}
- ${socialLink(emoji("🐘"), "mastodon", authorInfo.support.mastodon.handle, authorInfo.support.mastodon.url)}
- ${socialLink(emoji("🐦"), "twitter", authorInfo.support.twitter.handle, authorInfo.support.twitter.url)}
+ ${socialLink(emoji("🐦"), "twitter", authorInfo.support.twitter.handle, authorInfo.support.twitter.url)}
+ ${socialLink(emoji("👾"), "discord", authorInfo.support.discord.handle, authorInfo.support.discord.url)}
+ ${socialLink(emoji("🐘"), "mastodon", authorInfo.support.mastodon.handle, authorInfo.support.mastodon.url)}
${t("SourceCode")}
${socialLink(emoji("🐙"), "github", repo.replace("https://github.com/", ''), repo)}
${t("SupportNote")}`
@@ -106,7 +107,6 @@ export default function(obj) {
"title": t("CollapsePrivacy"),
"body": t("PrivacyPolicy")
}])
- + `${process.env.DEPLOYMENT_ID && process.env.INTERNAL_IP ? 'powered by hop.io' : ''}`
}]
})
}, {
@@ -408,7 +408,8 @@ export default function(obj) {
}])}
-