diff --git a/package.json b/package.json
index c0cb02da..fd8d37d7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "cobalt",
"description": "save what you love",
- "version": "5.3.3",
+ "version": "5.5",
"author": "wukko",
"exports": "./src/cobalt.js",
"type": "module",
@@ -34,6 +34,6 @@
"node-cache": "^5.1.2",
"url-pattern": "1.0.3",
"xml-js": "^1.6.11",
- "youtubei.js": "4.1.1"
+ "youtubei.js": "^5.0.0"
}
}
diff --git a/src/cobalt.js b/src/cobalt.js
index 93a5b3f2..118ddfb1 100644
--- a/src/cobalt.js
+++ b/src/cobalt.js
@@ -3,6 +3,9 @@ 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 path from 'path';
import { fileURLToPath } from 'url';
@@ -21,7 +24,7 @@ import { changelogHistory } from "./modules/pageRender/onDemand.js";
import { sha256 } from "./modules/sub/crypto.js";
import findRendered from "./modules/pageRender/findRendered.js";
-if (process.env.selfURL && process.env.streamSalt && process.env.port) {
+if (process.env.selfURL && process.env.port) {
const commitHash = shortCommit();
const branch = getCurrentBranch();
const app = express();
@@ -35,7 +38,7 @@ if (process.env.selfURL && process.env.streamSalt && process.env.port) {
max: 25,
standardHeaders: false,
legacyHeaders: false,
- keyGenerator: (req, res) => sha256(getIP(req), process.env.streamSalt),
+ keyGenerator: (req, res) => sha256(getIP(req), ipSalt),
handler: (req, res, next, opt) => {
res.status(429).json({ "status": "error", "text": loc(languageCode(req), 'ErrorRateLimit') });
return;
@@ -46,7 +49,7 @@ if (process.env.selfURL && process.env.streamSalt && process.env.port) {
max: 28,
standardHeaders: false,
legacyHeaders: false,
- keyGenerator: (req, res) => sha256(getIP(req), process.env.streamSalt),
+ keyGenerator: (req, res) => sha256(getIP(req), ipSalt),
handler: (req, res, next, opt) => {
res.status(429).json({ "status": "error", "text": loc(languageCode(req), 'ErrorRateLimit') });
return;
@@ -93,7 +96,7 @@ if (process.env.selfURL && process.env.streamSalt && process.env.port) {
app.post('/api/json', async (req, res) => {
try {
- let ip = sha256(getIP(req), process.env.streamSalt);
+ let ip = sha256(getIP(req), ipSalt);
let lang = languageCode(req);
let j = apiJSON(0, { t: "Bad request" });
try {
@@ -119,7 +122,7 @@ if (process.env.selfURL && process.env.streamSalt && process.env.port) {
app.get('/api/:type', (req, res) => {
try {
- let ip = sha256(getIP(req), process.env.streamSalt);
+ let ip = sha256(getIP(req), ipSalt);
switch (req.params.type) {
case 'stream':
if (req.query.p) {
diff --git a/src/front/cobalt.css b/src/front/cobalt.css
index c0ae018b..11d41aa0 100644
--- a/src/front/cobalt.css
+++ b/src/front/cobalt.css
@@ -82,37 +82,51 @@ a {
:focus-visible {
outline: var(--border-15);
}
+.checkbox {
+ display: inline-flex;
+ align-items: center;
+ flex-direction: row;
+ flex-wrap: nowrap;
+ padding: 0.55rem 1rem 0.55rem 0.7rem;
+ width: auto;
+ margin-right: var(--padding-1);
+ margin-bottom: var(--padding-1);
+ background: var(--accent-button-bg);
+}
+.checkbox-label {
+ line-height: 1.3rem;
+}
[type="checkbox"] {
-webkit-appearance: none;
appearance: none;
- margin-right: var(--padding-1);
+ width: 20px;
+ height: 20px;
z-index: 0;
- border: 0;
- height: 15px;
- width: 15px;
+ margin-right: var(--padding-1);
+ border: 0.15rem solid var(--accent);
}
[type="checkbox"]::before {
content: "";
- width: 15px;
- height: 15px;
- border: 0.15rem solid var(--accent);
- display: block;
- z-index: 5;
+ display: none;
position: relative;
+ width: 6px;
+ height: 12px;
+ z-index: 5;
+ transform: scaleX(0.9)rotate(45deg);
+ left: 6px;
+ top: 1px;
+ border-bottom: 0.18rem solid var(--background);
+ border-right: 0.18rem solid var(--background);
}
[type="checkbox"]:checked::before {
- background: var(--checkmark);
- background-size: 90%;
- background-position: center;
- background-repeat: no-repeat;
+ display: block;
}
-[type="checkbox"]:checked::before {
+[type="checkbox"]:checked {
background-color: var(--accent);
- border: 0.15rem solid var(--accent);
+ border: 0;
}
-.checkbox span {
- margin-top: 0.21rem;
- margin-left: 0.4rem;
+input[type="checkbox"] {
+ cursor: pointer;
}
button {
background: none;
@@ -160,9 +174,6 @@ button:active,
cursor: pointer;
transform: scale(0.95)
}
-input[type="checkbox"] {
- cursor: pointer;
-}
.button {
background: none;
border: var(--border-15);
@@ -449,20 +460,6 @@ input[type="checkbox"] {
.no-margin {
margin: 0!important;
}
-.checkbox {
- display: inline-flex;
- align-items: center;
- flex-direction: row;
- flex-wrap: nowrap;
- padding: 0.55rem 1rem 0.8rem 0.7rem;
- width: auto;
- margin-right: var(--padding-1);
- margin-bottom: var(--padding-1);
- background: var(--accent-button-bg);
-}
-.checkbox-label {
- line-height: 1.3rem;
-}
.switch-container {
width: 100%;
}
@@ -579,6 +576,7 @@ input[type="checkbox"] {
width: 25rem;
margin-bottom: var(--padding-1);
background-color: var(--accent-button-bg);
+ border: var(--accent-button-bg) 0.18rem solid;
position: relative;
}
#picker-holder {
diff --git a/src/front/cobalt.js b/src/front/cobalt.js
index 83cd5c65..d1592976 100644
--- a/src/front/cobalt.js
+++ b/src/front/cobalt.js
@@ -1,7 +1,7 @@
let ua = navigator.userAgent.toLowerCase();
let isIOS = ua.match("iphone os");
let isMobile = ua.match("android") || ua.match("iphone os");
-let version = 25;
+let version = 26;
let regex = new RegExp(/https:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()!@:%_\+.~#?&\/\/=]*)/);
let notification = ``
diff --git a/src/front/updateBanners/catphonestand.webp b/src/front/updateBanners/catphonestand.webp
new file mode 100644
index 00000000..9a641785
Binary files /dev/null and b/src/front/updateBanners/catphonestand.webp differ
diff --git a/src/front/vectorIcons/checkmark.svg b/src/front/vectorIcons/checkmark.svg
deleted file mode 100644
index a470f70e..00000000
--- a/src/front/vectorIcons/checkmark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/front/vectorIcons/checkmark_b.svg b/src/front/vectorIcons/checkmark_b.svg
deleted file mode 100644
index 42e9e05a..00000000
--- a/src/front/vectorIcons/checkmark_b.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/localization/languages/en.json b/src/localization/languages/en.json
index f6b88990..a0c3febb 100644
--- a/src/localization/languages/en.json
+++ b/src/localization/languages/en.json
@@ -71,7 +71,7 @@
"SettingsAudioFullTikTok": "full audio",
"SettingsAudioFullTikTokDescription": "downloads original sound used in the video without any additional changes by the post's author.",
"ErrorCantGetID": "i couldn't get the full info from the shortened link. make sure it works or try a full one! if issue persists, {ContactLink}.",
- "ErrorNoVideosInTweet": "there are no videos or gifs in this tweet, try another one!",
+ "ErrorNoVideosInTweet": "i couldn't find any media content in this tweet. try another one!",
"ImagePickerTitle": "pick images to download",
"ImagePickerDownloadAudio": "download audio",
"ImagePickerExplanationPC": "right click an image to save it.",
@@ -94,9 +94,9 @@
"ChangelogPressToHide": "collapse",
"Donate": "donate",
"DonateSub": "help me keep it up",
- "DonateExplanation": "{appName} does not (and will never) serve ads or sell your data, therefore it's completely free to use. but turns out keeping up a web service used by over 40 thousand people is somewhat costly.\n\nif you ever found {appName} useful and want to keep it online, or simply want to thank the developer, consider chipping in! each and every cent helps and is VERY appreciated :D",
+ "DonateExplanation": "{appName} does not (and will never) serve ads or sell your data, therefore it's completely free to use. but turns out developing and keeping up a web service used by over 80 thousand people is not that easy.\n\nif you ever found {appName} useful and want to keep it online, or simply want to thank the developer, consider chipping in! every cent helps and is VERY appreciated :D",
"DonateVia": "donate via",
- "DonateHireMe": "or you can hire me",
+ "DonateHireMe": "...or you can hire me :)",
"SettingsVideoMute": "mute audio",
"SettingsVideoMuteExplanation": "removes audio from video downloads when possible.",
"ErrorSoundCloudNoClientId": "i couldn't get the temporary token that's required to download songs from soundcloud. try again, but if issue persists, {ContactLink}.",
@@ -118,6 +118,7 @@
"SettingsDubAuto": "auto",
"SettingsVimeoPrefer": "vimeo downloads type",
"SettingsVimeoPreferDescription": "progressive: direct file link to vimeo's cdn. max quality is 1080p.\ndash: video and audio are merged by {appName} into one file. max quality is 4k.\n\npick \"progressive\" if you want best editor/player/social media compatibility. if progressive download isn't available, dash is used instead.",
- "ShareURL": "share"
+ "ShareURL": "share",
+ "ErrorTweetUnavailable": "couldn't find anything about this tweet. this could be because its visibility is limited. try another one!"
}
}
diff --git a/src/localization/languages/ru.json b/src/localization/languages/ru.json
index 3479e755..d971c261 100644
--- a/src/localization/languages/ru.json
+++ b/src/localization/languages/ru.json
@@ -71,7 +71,7 @@
"SettingsAudioFullTikTok": "полное аудио",
"SettingsAudioFullTikTokDescription": "скачивает оригинальный звук, использованный в видео. без каких-либо изменений от автора поста.",
"ErrorCantGetID": "у меня не получилось достать инфу по этой короткой ссылке. попробуй полную ссылку, а если так и не получится, то {ContactLink}.",
- "ErrorNoVideosInTweet": "в этом твите нет ни видео, ни гифок. попробуй другой!",
+ "ErrorNoVideosInTweet": "я не смог найти никакого медиа контента в этом твите. попробуй другой!",
"ImagePickerTitle": "выбери картинки для скачивания",
"ImagePickerDownloadAudio": "скачать звук",
"ImagePickerExplanationPC": "нажми правой кнопкой мыши на картинку, чтобы её сохранить.",
@@ -94,9 +94,9 @@
"ChangelogPressToHide": "скрыть",
"Donate": "задонатить",
"DonateSub": "ты можешь помочь!",
- "DonateExplanation": "{appName} не пихает рекламу тебе в лицо и не продаёт твои личные данные, а значит работает совершенно бесплатно. но оказывается, что хостинг сервиса, которым пользуются более 40 тысяч людей, обходится довольно дорого.\n\nесли {appName} тебе помог и ты хочешь поблагодарить или помочь разработчику, то это можно сделать через донаты! каждый рубль помогает мне, моим котам, и {appName}! спасибо :)",
+ "DonateExplanation": "{appName} не пихает рекламу тебе в лицо и не продаёт твои личные данные, а значит работает совершенно бесплатно. но оказывается, что разработка и поддержка сервиса, которым пользуются более 80 тысяч людей, обходится довольно трудно.\n\nесли {appName} тебе помог и ты хочешь поблагодарить разработчика, то это можно сделать через донаты! каждый рубль помогает мне, моим котам, и {appName}! спасибо :)",
"DonateVia": "открыть",
- "DonateHireMe": "или же ты можешь пригласить меня на работу",
+ "DonateHireMe": "...или же ты можешь пригласить меня на работу :)",
"SettingsVideoMute": "убрать аудио",
"SettingsVideoMuteExplanation": "убирает аудио при загрузке видео, но только когда это возможно.",
"ErrorSoundCloudNoClientId": "мне не удалось достать временный токен, который необходим для скачивания аудио из soundcloud. попробуй ещё раз, но если так и не получится, {ContactLink}.",
@@ -118,6 +118,7 @@
"SettingsDubAuto": "авто",
"SettingsVimeoPrefer": "тип загрузок с vimeo",
"SettingsVimeoPreferDescription": "progressive: прямая ссылка на файл с сервера vimeo. максимальное качество: 1080p.\ndash: {appName} совмещает видео и аудио в один файл. максимальное качество: 4k.\n\nвыбирай \"progressive\", если тебе нужна наилучшая совместимость с плеерами/редакторами/соцсетями. если \"progressive\" файл недоступен, {appName} скачает \"dash\".",
- "ShareURL": "поделиться"
+ "ShareURL": "поделиться",
+ "ErrorTweetUnavailable": "не смог найти что-либо об этом твите. возможно его видимость была ограничена. попробуй другой!"
}
}
diff --git a/src/modules/changelog/changelog.json b/src/modules/changelog/changelog.json
index baa5ec9e..0636d947 100644
--- a/src/modules/changelog/changelog.json
+++ b/src/modules/changelog/changelog.json
@@ -1,11 +1,16 @@
{
"current": {
+ "version": "5.4",
+ "title": "instagram support, hop, 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."
+ },
+ "history": [{
"version": "5.3",
"title": "better looks, better feel",
"banner": "cattired.webp",
"content": "this update isn't as big as previous ones, but it still greatly enhances the cobalt experience.\n\nhere's what's up:\n*; new mode switcher! elegant and 100% clear. should no longer cause any confusion. let me know if you like it better this way :D\n*; wide paste button on mobile is back, but now it's even closer to your finger.\n*; removed the weird grey chin on changelog banners.\n*; removed left-handed layout toggle since it is no longer needed.\n*; fixed input area display in chromium 112+.\n*; centered the main action box.\n*; cleaned up css of main action box to get rid of tricks and ensure correct display on all devices.\n*; fixed a bug that'd cause notifications dots to disappear when an unrelated checkbox was checked.\n\nhopefully from now on i'll focus on adding support for more services.\nthank you for using cobalt. stay cool :)"
- },
- "history": [{
+ }, {
"version": "5.2",
"title": "fastest one in the game",
"banner": "catspeed.webp",
diff --git a/src/modules/pageRender/page.js b/src/modules/pageRender/page.js
index 48e1873c..e2df0af7 100644
--- a/src/modules/pageRender/page.js
+++ b/src/modules/pageRender/page.js
@@ -51,7 +51,7 @@ export default function(obj) {
-
+
diff --git a/src/modules/processing/match.js b/src/modules/processing/match.js
index 8e8056c8..428c3fa7 100644
--- a/src/modules/processing/match.js
+++ b/src/modules/processing/match.js
@@ -15,6 +15,8 @@ import tiktok from "./services/tiktok.js";
import tumblr from "./services/tumblr.js";
import vimeo from "./services/vimeo.js";
import soundcloud from "./services/soundcloud.js";
+import instagram from "./services/instagram.js";
+import vine from "./services/vine.js";
export class YouTubeFetchInfo {
/**
@@ -145,6 +147,12 @@ export default async function (host, patternMatch, url, lang, obj) {
format: obj.aFormat
});
break;
+ case "instagram":
+ r = await instagram({ id: patternMatch["id"] });
+ break;
+ case "vine":
+ r = await vine({ id: patternMatch["id"] });
+ break;
default:
return apiJSON(0, { t: errorUnsupported(lang) });
}
diff --git a/src/modules/processing/matchActionDecider.js b/src/modules/processing/matchActionDecider.js
index cada3d6a..ba10af27 100644
--- a/src/modules/processing/matchActionDecider.js
+++ b/src/modules/processing/matchActionDecider.js
@@ -52,6 +52,8 @@ export default function(r, host, ip, audioFormat, isAudioOnly, lang, isAudioMute
params = { type: "bridge" };
break;
+ case "vine":
+ case "instagram":
case "tumblr":
case "twitter":
responseType = 1;
@@ -72,6 +74,7 @@ export default function(r, host, ip, audioFormat, isAudioOnly, lang, isAudioMute
case "picker":
responseType = 5;
switch (host) {
+ case "instagram":
case "twitter":
params = { picker: r.picker };
break;
diff --git a/src/modules/processing/services/instagram.js b/src/modules/processing/services/instagram.js
new file mode 100644
index 00000000..3bcb7246
--- /dev/null
+++ b/src/modules/processing/services/instagram.js
@@ -0,0 +1,36 @@
+import got from "got";
+
+export default async function(obj) {
+ // i hate this implementation but fetch doesn't work here for some reason (i personally blame facebook)
+ let html;
+ try {
+ html = await got.get(`https://www.instagram.com/p/${obj.id}/`)
+ html.on('error', () => {
+ html = false;
+ });
+ html = html ? html.body : false;
+ } catch (e) {
+ html = false;
+ }
+
+ if (!html) return { error: 'ErrorCouldntFetch' };
+ if (!html.includes('application/ld+json')) return { error: 'ErrorEmptyDownload' };
+
+ let single, multiple = [], postInfo = JSON.parse(html.split('script type="application/ld+json"')[1].split('">')[1].split('')[0]);
+
+ if (postInfo.video.length > 1) {
+ for (let i in postInfo.video) { multiple.push({type: "video", thumb: postInfo.video[i]["thumbnailUrl"], url: postInfo.video[i]["contentUrl"]}) }
+ } else if (postInfo.video.length === 1) {
+ single = postInfo.video[0]["contentUrl"]
+ } else {
+ return { error: 'ErrorEmptyDownload' }
+ }
+
+ if (single) {
+ return { urls: single, filename: `instagram_${obj.id}.mp4`, audioFilename: `instagram_${obj.id}_audio` }
+ } else if (multiple) {
+ return { picker: multiple }
+ } else {
+ return { error: 'ErrorEmptyDownload' }
+ }
+}
diff --git a/src/modules/processing/services/soundcloud.js b/src/modules/processing/services/soundcloud.js
index aef27bd5..0c9434d9 100644
--- a/src/modules/processing/services/soundcloud.js
+++ b/src/modules/processing/services/soundcloud.js
@@ -36,12 +36,13 @@ async function findClientID() {
export default async function(obj) {
let html;
if (!obj.author && !obj.song && obj.shortLink) {
- html = await fetch(`https://soundcloud.app.goo.gl/${obj.shortLink}/`).then((r) => { return r.text() }).catch(() => { return false });
+ html = await fetch(`https://soundcloud.app.goo.gl/${obj.shortLink}/`).then((r) => { return r.status === 404 ? false : r.text() }).catch(() => { return false });
+ if (!html) html = await fetch(`https://on.soundcloud.com/${obj.shortLink}/`).then((r) => { return r.status === 404 ? false : r.text() }).catch(() => { return false })
}
if (obj.author && obj.song) {
html = await fetch(`https://soundcloud.com/${obj.author}/${obj.song}${obj.accessKey ? `/s-${obj.accessKey}` : ''}`).then((r) => { return r.text() }).catch(() => { return false });
}
- if (!html) return { error: 'ErrorCouldntFetch'};
+ if (!html) return { error: 'ErrorCouldntFetch' };
if (!(html.includes('