blitzwing/cobalt-7
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'current' into feat/twitch

Browse source
This commit is contained in:
Snazzah 2023-05-23 12:24:54 -05:00 committed by GitHub
commit 8551243207
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 352 additions and 203 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
README.md
View file

@ -1,7 +1,6 @@
# cobalt # cobalt
Best way to save what you love. Best way to save what you love.
Main instance: [co.wukko.me](https://co.wukko.me/)
Live: [co.wukko.me](https://co.wukko.me/)
![cobalt logo with repeated logo pattern background](https://raw.githubusercontent.com/wukko/cobalt/current/src/front/icons/pattern.png "cobalt logo with repeated logo pattern background") ![cobalt logo with repeated logo pattern background](https://raw.githubusercontent.com/wukko/cobalt/current/src/front/icons/pattern.png "cobalt logo with repeated logo pattern background")
@ -10,62 +9,53 @@ Live: [co.wukko.me](https://co.wukko.me/)
## What's cobalt? ## What's cobalt?
cobalt is a social and media platform downloader that doesn't piss you off. cobalt is a social and media platform downloader that doesn't piss you off.
It's fast, friendly, and doesn't have any bullshit that modern web is filled with: no ads, trackers, or analytics. Paste the link, get the video, move on. It's that simple. Just how it should be. It's fast, friendly, and doesn't have any bullshit that modern web is filled with: no ads, trackers, or analytics.
Paste the link, get the video, move on. It's that simple. Just how it should be.
## Supported services ## Supported services
| Service | Video + Audio | Only audio | Additional features | | Service | Video + Audio | Only audio | Only video | Additional notes or features |
| -------- | :---: | :---: | :----- | | -------- | :---: | :---: | :---: | :----- |
| Twitter | ✅ | ✅ | Ability to save multiple videos/GIFs from a single tweet. | | bilibili.com | ✅ | ✅ | ✅ | |
| Twitter Spaces | ❌️ | ✅ | Audio metadata. | | Instagram | ✅ | ✅ | ✅ | Ability to pick what to save from multi-media posts. |
| YouTube & Shorts | ✅ | ✅ | Support for 8K, 4K, HDR, and high FPS videos. Audio metadata & dubs. h264/av1/vp9 codecs. | | Instagram Reels | ✅ | ✅ | ✅ | |
| YouTube Music | ❌ | ✅ | Audio metadata. | | Reddit | ✅ | ✅ | ✅ | Support for GIFs and videos. |
| Reddit | ✅ | ✅ | GIFs and videos. | | SoundCloud | ➖ | ✅ | ➖ | Audio metadata, downloads from private links. |
| TikTok | ✅ | ✅ | Video downloads with or without watermark; image slideshow downloads without watermark. Full audio downloads. | | TikTok | ✅ | ✅ | ✅ | Supports downloads of: videos with or without watermark, images from slideshow without watermark, full (original) audios. |
| Twitch | ✅ | ✅ | | | Tumblr | ✅ | ✅ | ✅ | |
| SoundCloud | ❌ | ✅ | Audio metadata, downloads from private links. | | Twitter | ✅ | ✅ | ✅ | Ability to pick what to save from multi-media tweets. |
| bilibili.com | ✅ | ✅ | | | Twitter Spaces | ➖ | ✅ | ➖ | Audio metadata with all participants and other info. |
| Tumblr | ✅ | ✅ | | | Twitch | ✅ | ✅ | ✅ | |
| Vimeo | ✅ | ❌️ | | | Vimeo | ✅ | ✅ | ✅ | Audio downloads are only available for dash files. |
| VK Videos & Clips | ✅ | ❌️ | | | 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 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 API
cobalt has an open API that you can use 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. 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.
## How to contribute translations ## 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. 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.
### Translation guidelines: ### Translation guidelines:
- All text is **ALWAYS** stylized as **lowercase** unless it's STRESSED LIKE THIS or is an internal value like `{ContactLink}` or `{appName}`. - Text is **ALWAYS** stylized as **lowercase** unless it's STRESSED LIKE THIS or is an internal value like `{ContactLink}` or `{appName}`.
- Example: "`this is a live video, i am yet to learn how to look into future. wait for the stream to finish and try again!`". - Example: "`this is a live video, i am yet to learn how to look into future. wait for the stream to finish and try again!`".
Notice how **everything is lowercase**, no matter the punctuation marks? Yes, that's cobalt's style and you have to follow it. *Notice how **everything is lowercase**, no matter the punctuation marks? Yes, that's cobalt's style and you have to follow it.*
- Avoid formal language. Leave it for big and classy tech companies. Use informal language wherever possible. - Avoid extremely formal language, leave it for big and classy tech companies. Use informal language wherever possible.
- Keep translations lively, friendly, and fun. Translate strings as if the user was your buddy.
- You can (and should) rephrase sentences as long as they keep the same sense and send the same message as original. - You can (and should) rephrase sentences as long as they keep the same sense and send the same message as original.
- You can add wordplays or puns if it feels natural to do so.
- Do **NOT** use offensive or explicit vocabulary. - Do **NOT** use offensive or explicit vocabulary.
- Check if there are issues in UI with your localization, and optimize it accordingly. If impossible, open an issue. - Check if there are issues in UI with your localization and optimize it accordingly. If impossible, open an issue.
- Be nice. - Be nice.
## Host an instance yourself ## Host an instance yourself
You might find cobalt's source code a bit messy, but I do my best to improve it with every commit.
### Requirements ### Requirements
- Node.js 17.5 or above - Node.js 18 or above
- git - git
### npm modules
- cors
- dotenv
- esbuild
- express
- express-rate-limit
- ffmpeg-static
- got
- node-cache
- url-pattern
- xml-js
- youtubei.js
Setup script installs all needed `npm` dependencies, but you have to install `Node.js` and `git` yourself. Setup script installs all needed `npm` dependencies, but you have to install `Node.js` and `git` yourself.
1. Clone the repo: `git clone https://github.com/wukko/cobalt` 1. Clone the repo: `git clone https://github.com/wukko/cobalt`
@ -73,20 +63,27 @@ Setup script installs all needed `npm` dependencies, but you have to install `No
3. Run cobalt via `npm start` 3. Run cobalt via `npm start`
4. Done. 4. Done.
### 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)):
```bash
sudo apt install nscd
sudo service nscd start
```
### Docker ### Docker
It's also possible to host cobalt via a Docker image, but in that case you'd need to set all environment variables by yourself. It's also possible to run cobalt via Docker, but you **need** to set all environment variables yourself:
That includes:
| Variable | Example | | Variable | Description | Example |
| -------- | :--- | | -------- | :--- | :--- |
| `selfURL` | `https://co.wukko.me/` | | `selfURL` | Instance URL | `http://localhost:9000/` or `https://co.wukko.me/` or etc |
| `port` | `9000` | | `port` | Instance port | `9000` |
| `streamSalt` | `randomly generated sha512 hash` | | `cors` | CORS toggle | `0` |
| `cors` | `0` |
## Disclaimer ## Disclaimer
cobalt is my passion project, so update release schedule depends solely on my motivation, free time, and mood. Don't expect any consistency in that. cobalt is my passion project, so update schedule depends solely on my free time, motivation, and mood.
Don't expect any consistency in that.
## License ## License
cobalt is under [AGPL-3.0](https://github.com/wukko/cobalt/blob/current/LICENSE) license. cobalt is under [AGPL-3.0](https://github.com/wukko/cobalt/blob/current/LICENSE) license.
[Fluent Emoji](https://github.com/microsoft/fluentui-emoji) used in the project is under [MIT](https://github.com/microsoft/fluentui-emoji/blob/main/LICENSE) license. [Fluent Emoji](https://github.com/microsoft/fluentui-emoji) used in the project is under [MIT](https://github.com/microsoft/fluentui-emoji/blob/main/LICENSE) license.

4
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "cobalt", "name": "cobalt",
"description": "save what you love", "description": "save what you love",
"version": "5.5", "version": "5.7",
"author": "wukko", "author": "wukko",
"exports": "./src/cobalt.js", "exports": "./src/cobalt.js",
"type": "module", "type": "module",
@ -34,6 +34,6 @@
"node-cache": "^5.1.2", "node-cache": "^5.1.2",
"url-pattern": "1.0.3", "url-pattern": "1.0.3",
"xml-js": "^1.6.11", "xml-js": "^1.6.11",
"youtubei.js": "^5.0.0" "youtubei.js": "^5.1.0"
} }
} }

19
src/cobalt.js
View file

@ -23,6 +23,7 @@ import { buildFront } from "./modules/build.js";
import { changelogHistory } from "./modules/pageRender/onDemand.js"; import { changelogHistory } from "./modules/pageRender/onDemand.js";
import { sha256 } from "./modules/sub/crypto.js"; import { sha256 } from "./modules/sub/crypto.js";
import findRendered from "./modules/pageRender/findRendered.js"; import findRendered from "./modules/pageRender/findRendered.js";
import { celebrationsEmoji } from "./modules/pageRender/elements.js";
if (process.env.selfURL && process.env.port) { if (process.env.selfURL && process.env.port) {
const commitHash = shortCommit(); const commitHash = shortCommit();
@ -138,21 +139,29 @@ if (process.env.selfURL && process.env.port) {
break; break;
case 'onDemand': case 'onDemand':
if (req.query.blockId) { if (req.query.blockId) {
let blockId = req.query.blockId.slice(0, 3) let blockId = req.query.blockId.slice(0, 3);
let r, j; let r, j;
switch(blockId) { switch(blockId) {
case "0": case "0": // changelog history
r = changelogHistory(); r = changelogHistory();
j = r ? apiJSON(3, { t: r }) : apiJSON(0, { t: "couldn't render this block" }) j = r ? apiJSON(3, { t: r }) : apiJSON(0, { t: "couldn't render this block" })
break; break;
case "1": // celebrations emoji
r = celebrationsEmoji();
j = r ? apiJSON(3, { t: r }) : false
break;
default: default:
j = apiJSON(0, { t: "couldn't find a block with this id" }) j = apiJSON(0, { t: "couldn't find a block with this id" })
break; break;
} }
res.status(j.status).json(j.body); if (j.body) {
res.status(j.status).json(j.body)
} else { } else {
let j = apiJSON(0, { t: "no block id" }) res.status(204).end()
res.status(j.status).json(j.body); }
} else {
let j = apiJSON(0, { t: "no block id" });
res.status(j.status).json(j.body)
} }
break; break;
default: default:

3
src/config.json
View file

@ -27,6 +27,9 @@
"boosty": "https://boosty.to/wukko" "boosty": "https://boosty.to/wukko"
} }
}, },
"links": {
"saveToGalleryShortcut": "https://www.icloud.com/shortcuts/6d4fe6e5bade4150b8759ce20720c7a3"
},
"celebrations": { "celebrations": {
"01-01": "🎄", "01-01": "🎄",
"02-17": "😺", "02-17": "😺",

119
src/front/cobalt.css
View file

@ -7,8 +7,9 @@
--padding-1: 0.75rem; --padding-1: 0.75rem;
--line-height: 1.65rem; --line-height: 1.65rem;
--red: rgb(255, 0, 61); --red: rgb(255, 0, 61);
--color: rgb(107, 67, 139); --gap: 0.5rem;
--gap: 0.6rem; --gap-no-icon: 0.6rem;
--rainbow-gradient: linear-gradient(161deg,#ffe454,#ff6964,#fe85e5,#bd26fe,#587ae9,#8ded95);
} }
@media (prefers-color-scheme: dark) { @media (prefers-color-scheme: dark) {
:root { :root {
@ -19,7 +20,7 @@
--accent-unhover: rgb(100, 100, 100); --accent-unhover: rgb(100, 100, 100);
--accent-unhover-2: rgb(110, 110, 110); --accent-unhover-2: rgb(110, 110, 110);
--background: rgb(0, 0, 0); --background: rgb(0, 0, 0);
--checkmark: url(vectorIcons/checkmark_b.svg); --glow-transparency: 0.45;
} }
} }
@media (prefers-color-scheme: light) { @media (prefers-color-scheme: light) {
@ -31,7 +32,7 @@
--accent-unhover: rgb(190, 190, 190); --accent-unhover: rgb(190, 190, 190);
--accent-unhover-2: rgb(110, 110, 110); --accent-unhover-2: rgb(110, 110, 110);
--background: rgb(255, 255, 255); --background: rgb(255, 255, 255);
--checkmark: url(vectorIcons/checkmark.svg); --glow-transparency: 0.6;
} }
} }
[data-theme="dark"] { [data-theme="dark"] {
@ -42,7 +43,7 @@
--accent-unhover: rgb(100, 100, 100); --accent-unhover: rgb(100, 100, 100);
--accent-unhover-2: rgb(110, 110, 110); --accent-unhover-2: rgb(110, 110, 110);
--background: rgb(0, 0, 0); --background: rgb(0, 0, 0);
--checkmark: url(vectorIcons/checkmark_b.svg); --glow-transparency: 0.45;
} }
[data-theme="light"] { [data-theme="light"] {
--accent: rgb(25, 25, 25); --accent: rgb(25, 25, 25);
@ -52,7 +53,7 @@
--accent-unhover: rgb(190, 190, 190); --accent-unhover: rgb(190, 190, 190);
--accent-unhover-2: rgb(110, 110, 110); --accent-unhover-2: rgb(110, 110, 110);
--background: rgb(255, 255, 255); --background: rgb(255, 255, 255);
--checkmark: url(vectorIcons/checkmark.svg); --glow-transparency: 0.6;
} }
html, html,
body { body {
@ -87,7 +88,7 @@ a {
align-items: center; align-items: center;
flex-direction: row; flex-direction: row;
flex-wrap: nowrap; flex-wrap: nowrap;
padding: 0.55rem 1rem 0.55rem 0.7rem; padding: calc(var(--gap) - 0.1rem) calc(var(--gap)*2 - 0.2rem) calc(var(--gap) - 0.1rem) var(--gap);
width: auto; width: auto;
margin-right: var(--padding-1); margin-right: var(--padding-1);
margin-bottom: var(--padding-1); margin-bottom: var(--padding-1);
@ -227,7 +228,7 @@ button:active,
color: var(--accent); color: var(--accent);
} }
#url-input-area { #url-input-area {
background: var(--background); background: none;
padding: 0 1rem; padding: 0 1rem;
width: 100%; width: 100%;
color: var(--accent); color: var(--accent);
@ -349,7 +350,7 @@ button:active,
} }
.changelog-subtitle { .changelog-subtitle {
font-size: 1.1rem; font-size: 1.1rem;
padding-bottom: 0.7rem; padding-bottom: var(--gap-no-icon);
} }
.changelog-banner { .changelog-banner {
width: 100%; width: 100%;
@ -441,7 +442,7 @@ button:active,
color: var(--accent-unhover-2); color: var(--accent-unhover-2);
border-bottom: 0.05rem solid var(--accent-unhover-2); border-bottom: 0.05rem solid var(--accent-unhover-2);
padding-bottom: 0.25rem; padding-bottom: 0.25rem;
margin-bottom: 1rem; margin-bottom: calc(var(--gap-no-icon)*1.5);
} }
.category-title { .category-title {
text-align: left; text-align: left;
@ -474,7 +475,7 @@ button:active,
margin-top: 0.5rem; margin-top: 0.5rem;
} }
.explanation { .explanation {
margin-top: 1rem; margin-top: 0.8rem;
width: 100%; width: 100%;
font-size: 0.8rem; font-size: 0.8rem;
text-align: left; text-align: left;
@ -485,7 +486,7 @@ button:active,
color: var(--accent-unhover-2); color: var(--accent-unhover-2);
} }
.switch { .switch {
padding: 0.7rem; padding: var(--gap-no-icon);
width: 100%; width: 100%;
text-align: left; text-align: left;
color: var(--accent); color: var(--accent);
@ -515,6 +516,13 @@ button:active,
overflow-x: scroll; overflow-x: scroll;
scrollbar-width: none; scrollbar-width: none;
} }
.switches .switch {
padding-left: calc(var(--gap-no-icon) + 0.1rem);
padding-right: calc(var(--gap-no-icon) + 0.1rem);
}
#popup-settings .switches .switch {
text-align: center;
}
.autowidth { .autowidth {
width: auto; width: auto;
} }
@ -524,12 +532,12 @@ button:active,
.text-to-copy { .text-to-copy {
user-select: text; user-select: text;
-webkit-user-select: text; -webkit-user-select: text;
border: var(--border-15); background: var(--accent-button-bg);
padding: var(--padding-1); padding: var(--padding-1);
overflow: auto; overflow: auto;
} }
#close-button { #close-button {
max-width: 2.8rem; max-width: 2.6rem;
margin-left: var(--padding-1); margin-left: var(--padding-1);
background: var(--background); background: var(--background);
border: var(--border-15); border: var(--border-15);
@ -540,7 +548,7 @@ button:active,
float: right; float: right;
position: absolute; position: absolute;
right: 0; right: 0;
height: 2.8rem; height: 2.6rem;
} }
.popup-tab-content { .popup-tab-content {
display: none; display: none;
@ -552,7 +560,7 @@ button:active,
width: 100%; width: 100%;
} }
.popup-tabs { .popup-tabs {
margin-top: 0.8rem; margin-top: 0.9rem;
} }
.emoji { .emoji {
margin-right: 0.4rem; margin-right: 0.4rem;
@ -660,6 +668,19 @@ button:active,
display: block; display: block;
text-align: right; text-align: right;
} }
#about-donate-footer::before {
content: "";
position: absolute;
height: 110%;
width: 32%;
background: var(--rainbow-gradient);
z-index: -2;
filter: blur(5px);
opacity: var(--glow-transparency);
}
#about-donate-footer:active::before {
opacity: 0;
}
/* adapt the page according to screen size */ /* adapt the page according to screen size */
@media screen and (min-width: 2300px) { @media screen and (min-width: 2300px) {
html { html {
@ -754,9 +775,14 @@ button:active,
} }
} }
@media screen and (max-width: 320px) { @media screen and (max-width: 320px) {
:root {
--gap: 0.38rem;
--gap-no-icon: 0.38rem;
--line-height: 1.2rem;
}
#popup-title { #popup-title {
font-size: 1.3rem; font-size: 1.07rem;
line-height: 2rem; line-height: 1.5rem;
} }
.footer-button, .footer-button,
#audioMode-false, #audioMode-false,
@ -770,22 +796,61 @@ button:active,
#paste .emoji { #paste .emoji {
margin-right: 0; margin-right: 0;
} }
.switch, .checkbox, .category-title, .subtitle, #popup-desc { .switch,
font-size: .75rem; .checkbox,
.category-title,
.subtitle,
#popup-desc,
.collapse-title {
font-size: .7rem;
}
.collapse-header {
padding: 0.5rem;
}
#popup-above-title,
#url-input-area {
font-size: 0.6rem;
} }
.explanation { .explanation {
font-size: .77rem; font-size: .6rem;
margin-top: 0.8rem; margin-top: 0.5rem;
line-height: 1rem!important;
} }
#popup-desc { #popup-desc {
line-height: 1.4rem; line-height: 1.2rem;
font-size: .64rem;
} }
.changelog-subtitle, #popup-subtitle { .changelog-subtitle, #popup-subtitle {
font-size: 0.9rem!important; font-size: 0.8rem!important;
} }
.category-title { .category-title {
margin-bottom: 0.8rem; margin-bottom: 0.8rem;
} }
.emoji {
height: 18px;
width: 18px;
}
.desc-padding {
padding-bottom: 0.8rem;
}
#logo {
font-size: 0.8rem;
}
.popup,
.popup.scrollable,
.popup.small {
height: 98%;
}
[type=checkbox] {
width: 15px;
height: 15px;
border: 0.12rem solid var(--accent);
}
[type=checkbox]:before {
transform: scaleY(.8)scaleX(.7)rotate(45deg);
left: 3.4px;
top: -2px;
}
} }
@media screen and (max-width: 720px) { @media screen and (max-width: 720px) {
#cobalt-main-box #bottom { #cobalt-main-box #bottom {
@ -795,13 +860,17 @@ button:active,
width: 100%; width: 100%;
} }
#footer { #footer {
bottom: 4%; bottom: 4.9%;
transform: translate(-50%, 0%); transform: translate(-50%, 0%);
} }
#footer-buttons { #footer-buttons {
flex-direction: column; flex-direction: column;
align-items: stretch; align-items: stretch;
} }
#about-donate-footer::before {
height: 50%;
width: 50%;
}
.footer-pair .footer-button { .footer-pair .footer-button {
width: 100%!important; width: 100%!important;
} }

90
src/front/cobalt.js
View file

@ -1,13 +1,11 @@
let ua = navigator.userAgent.toLowerCase(); const ua = navigator.userAgent.toLowerCase();
let isIOS = ua.match("iphone os"); const isIOS = ua.match("iphone os");
let isMobile = ua.match("android") || ua.match("iphone os"); const isMobile = ua.match("android") || ua.match("iphone os");
let version = 26; const 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()!@:%_\+.~#?&\/\/=]*)/); const regex = new RegExp(/https:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()!@:%_\+.~#?&\/\/=]*)/);
let notification = `<div class="notification-dot"></div>` const notification = `<div class="notification-dot"></div>`;
let store = {} const switchers = {
let switchers = {
"theme": ["auto", "light", "dark"], "theme": ["auto", "light", "dark"],
"vCodec": ["h264", "av1", "vp9"], "vCodec": ["h264", "av1", "vp9"],
"vQuality": ["1080", "max", "2160", "1440", "720", "480", "360"], "vQuality": ["1080", "max", "2160", "1440", "720", "480", "360"],
@ -15,11 +13,15 @@ let switchers = {
"dubLang": ["original", "auto"], "dubLang": ["original", "auto"],
"vimeoDash": ["false", "true"], "vimeoDash": ["false", "true"],
"audioMode": ["false", "true"] "audioMode": ["false", "true"]
} };
let checkboxes = ["disableTikTokWatermark", "fullTikTokAudio", "muteAudio"]; const checkboxes = ["disableTikTokWatermark", "fullTikTokAudio", "muteAudio"];
let exceptions = { // used for mobile devices const exceptions = { // used for mobile devices
"vQuality": "720" "vQuality": "720"
} };
const apiURL = '';
let store = {};
function eid(id) { function eid(id) {
return document.getElementById(id) return document.getElementById(id)
@ -333,10 +335,23 @@ async function download(url) {
if (url.includes("youtube.com/") || url.includes("/youtu.be/")) req.vCodec = sGet("vCodec").slice(0, 4); 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 ((url.includes("tiktok.com/") || url.includes("douyin.com/")) && sGet("disableTikTokWatermark") === "true") req.isNoTTWatermark = true;
} }
await fetch('/api/json', { method: "POST", body: JSON.stringify(req), headers: { 'Accept': 'application/json', 'Content-Type': 'application/json' } }).then(async (r) => {
let j = await r.json(); let j = await fetch(`${apiURL}/api/json`, {
if (j.status !== "error" && j.status !== "rate-limit") { method: "POST",
if (j.url || j.picker) { body: JSON.stringify(req),
headers: { 'Accept': 'application/json', 'Content-Type': 'application/json' }
}).then((r) => { return r.json() }).catch((e) => { return false });
if (!j) {
internetError();
return
}
if (j && j.status !== "error" && j.status !== "rate-limit") {
if (j.text && (!j.url || !j.picker)) {
if (j.status === "success") {
changeButton(2, j.text)
} else changeButton(0, loc.noURLReturned);
}
switch (j.status) { switch (j.status) {
case "redirect": case "redirect":
changeDownloadButton(2, '>>>'); changeDownloadButton(2, '>>>');
@ -383,38 +398,40 @@ async function download(url) {
changeButton(0, loc.unknownStatus); changeButton(0, loc.unknownStatus);
break; break;
} }
} else { } else if (j && j.text) {
if (j.status === "success") {
changeButton(2, j.text)
} else changeButton(0, loc.noURLReturned);
}
} else {
changeButton(0, j.text); changeButton(0, j.text);
} }
}).catch((error) => internetError()); }
async function loadCelebrationsEmoji() {
let bac = eid("about-footer").innerHTML;
try {
let j = await fetch(`${apiURL}/api/onDemand?blockId=1`).then((r) => { if (r.status === 200) { return r.json() } else { return false } }).catch(() => { return false });
if (j && j.status === "success" && j.text) {
eid("about-footer").innerHTML = eid("about-footer").innerHTML.replace('<img class="emoji" draggable="false" height="22" width="22" alt="🐲" src="emoji/dragon_face.svg">', j.text);
}
} catch (e) {
eid("about-footer").innerHTML = bac;
}
} }
async function loadOnDemand(elementId, blockId) { async function loadOnDemand(elementId, blockId) {
let j = {};
store.historyButton = eid(elementId).innerHTML; store.historyButton = eid(elementId).innerHTML;
let j = {} eid(elementId).innerHTML = "...";
eid(elementId).innerHTML = "..."
try { try {
if (store.historyContent) { if (store.historyContent) {
j = store.historyContent; j = store.historyContent;
} else { } else {
await fetch(`/api/onDemand?blockId=${blockId}`).then(async (r) => { await fetch(`${apiURL}/api/onDemand?blockId=${blockId}`).then(async(r) => {
j = await r.json(); j = await r.json();
if (j.status === "success") store.historyContent = j; if (j && j.status === "success") {
}) store.historyContent = j;
} else throw new Error();
}).catch(() => { throw new Error() });
} }
if (j.status === "success" && j.status !== "rate-limit") {
if (j.text) { if (j.text) {
eid(elementId).innerHTML = `<button class="switch bottom-margin" onclick="restoreUpdateHistory()">${loc.collapseHistory}</button>${j.text}`; eid(elementId).innerHTML = `<button class="switch bottom-margin" onclick="restoreUpdateHistory()">${loc.collapseHistory}</button>${j.text}`;
} else { } else throw new Error()
throw new Error()
}
} else {
throw new Error()
}
} catch (e) { } catch (e) {
eid(elementId).innerHTML = store.historyButton; eid(elementId).innerHTML = store.historyButton;
internetError() internetError()
@ -431,6 +448,7 @@ window.onload = () => {
eid("footer").style.visibility = 'visible'; eid("footer").style.visibility = 'visible';
eid("url-input-area").value = ""; eid("url-input-area").value = "";
notificationCheck(); notificationCheck();
loadCelebrationsEmoji();
if (isIOS) sSet("downloadPopup", "true"); if (isIOS) sSet("downloadPopup", "true");
let urlQuery = new URLSearchParams(window.location.search).get("u"); let urlQuery = new URLSearchParams(window.location.search).get("u");
if (urlQuery !== null && regex.test(urlQuery)) { if (urlQuery !== null && regex.test(urlQuery)) {

4
src/front/emoji/money_bag.svg
View file

@ -1,4 +0,0 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M17.44 3.385C17.77 3.765 18.33 3.835 18.74 3.545C19.54 2.975 20.58 3.835 20.17 4.715L17.75 7.485H13.88L11.44 4.685C11.03 3.795 12.07 2.935 12.87 3.505L12.94 3.555C13.35 3.845 13.91 3.765 14.23 3.385L15.1 2.345C15.48 1.885 16.19 1.885 16.57 2.345L17.44 3.385ZM4 21.2249C4 14.6849 9.3 9.38489 15.84 9.38489C22.38 9.38489 27.68 14.6849 27.67 21.2249C27.67 26.0549 23.75 29.9749 18.92 29.9749H12.75C7.92 29.9749 4 26.0549 4 21.2249Z" fill="#FFB02E"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.12 7.46484H17.56C18.17 7.46484 18.67 7.96484 18.67 8.57484C18.67 9.18484 18.17 9.68484 17.56 9.68484H14.12C13.51 9.68484 13.01 9.18484 13.01 8.57484C13.01 7.96484 13.51 7.46484 14.12 7.46484ZM15.8401 19.3449H15.9101C17.4101 19.3849 18.6101 20.6049 18.6101 22.1049C18.6101 23.3849 17.7401 24.4549 16.5601 24.7749V25.8949C16.5601 26.2949 16.2401 26.6149 15.8401 26.6149C15.4401 26.6149 15.1201 26.2949 15.1201 25.8949V24.7749C13.9401 24.4549 13.0701 23.3849 13.0701 22.1049C13.0701 21.7049 13.3901 21.3849 13.7901 21.3849C14.1901 21.3849 14.5101 21.7049 14.5101 22.1049C14.5101 22.8449 15.1001 23.4349 15.8301 23.4349C16.5601 23.4349 17.1601 22.8349 17.1601 22.1049C17.1601 21.3749 16.5601 20.7749 15.8301 20.7749H15.7601C14.2701 20.7349 13.0701 19.5149 13.0701 18.0149C13.0701 16.7349 13.9401 15.6649 15.1201 15.3449V14.2249C15.1201 13.8249 15.4401 13.5049 15.8401 13.5049C16.2401 13.5049 16.5601 13.8249 16.5601 14.2249V15.3449C17.7401 15.6649 18.6101 16.7349 18.6101 18.0149C18.6101 18.4149 18.2901 18.7349 17.8901 18.7349C17.4901 18.7349 17.1701 18.4149 17.1701 18.0149C17.1701 17.2849 16.5701 16.6849 15.8401 16.6849C15.1101 16.6849 14.5101 17.2849 14.5101 18.0149C14.5101 18.7449 15.1101 19.3449 15.8401 19.3449Z" fill="#8C5543"/>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.8 KiB

5
src/front/emoji/sparkling_heart.svg Normal file
View file

@ -0,0 +1,5 @@
<svg width="100%" height="100%" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M21.0222 4.15959C18.1822 4.65959 16.0022 7.99959 16.0022 7.99959C16.0022 7.99959 13.8222 4.65959 10.9822 4.15959C3.98216 2.92959 1.08217 9.06959 2.25217 13.6496C4.34217 21.7896 16.0022 28.9096 16.0022 28.9096C16.0022 28.9096 27.6722 21.7896 29.7522 13.6496C30.9322 9.06959 28.0322 2.92959 21.0222 4.15959Z" fill="#F92F60" />
<path d="M24.6221 8.98956C24.7221 9.21956 24.9021 9.40956 25.1321 9.50956L26.0921 9.92956C26.3821 10.0696 26.3821 10.4796 26.0921 10.6196L25.1221 11.0496C24.8921 11.1496 24.7121 11.3396 24.6121 11.5696L23.8521 13.3596C23.7121 13.6396 23.3021 13.6396 23.1621 13.3596L22.4021 11.5696C22.3021 11.3396 22.1221 11.1496 21.8921 11.0496L20.9221 10.6196C20.6321 10.4796 20.6321 10.0696 20.9221 9.92956L21.8921 9.49956C22.1221 9.39956 22.3021 9.20956 22.4021 8.97956L23.1721 7.19956C23.3121 6.91956 23.7221 6.91956 23.8621 7.19956L24.6221 8.98956Z" fill="#FCD53F" />
<path d="M10.552 18.8796C10.742 19.3096 11.072 19.6596 11.502 19.8496L13.282 20.6496C13.812 20.9096 13.812 21.6596 13.282 21.9196L11.502 22.7196C11.072 22.9196 10.732 23.2596 10.552 23.6896L9.14197 26.9996C8.88197 27.5296 8.13197 27.5296 7.87197 26.9996L6.46197 23.6896C6.27197 23.2596 5.94197 22.9096 5.51197 22.7196L3.73197 21.9196C3.20197 21.6596 3.20197 20.9096 3.73197 20.6496L5.51197 19.8496C5.94197 19.6496 6.28197 19.3096 6.46197 18.8796L7.87197 15.5696C8.13197 15.0396 8.88197 15.0396 9.14197 15.5696L10.552 18.8796Z" fill="#FCD53F" />
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

4
src/localization/languages/en.json
View file

@ -47,7 +47,7 @@
"SettingsQualityDescription": "if selected quality isn't available, closest one is used instead.", "SettingsQualityDescription": "if selected quality isn't available, closest one is used instead.",
"LinkGitHubChanges": "&gt;&gt; see previous commits and contribute on github", "LinkGitHubChanges": "&gt;&gt; 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.", "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": "press and hold the download button, hide the video preview, and then select \"download linked file\" to save.", "DownloadPopupDescriptionIOS": "easiest way to save videos on ios:\n1. add <a class=\"text-backdrop italic\" href=\"{saveToGalleryShortcut}\" target=\"_blank\">this siri shortcut</a>.\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\".",
"DownloadPopupDescription": "download button opens a new tab with requested file. you can disable this popup in settings.", "DownloadPopupDescription": "download button opens a new tab with requested file. you can disable this popup in settings.",
"DownloadPopupWayToSave": "pick a way to save", "DownloadPopupWayToSave": "pick a way to save",
"ClickToCopy": "press to copy", "ClickToCopy": "press to copy",
@ -94,7 +94,7 @@
"ChangelogPressToHide": "collapse", "ChangelogPressToHide": "collapse",
"Donate": "donate", "Donate": "donate",
"DonateSub": "help me keep it up", "DonateSub": "help me keep it up",
"DonateExplanation": "{appName} does not (and will never) serve ads or sell your data, therefore it's <span class=\"text-backdrop\">completely free to use</span>. 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", "DonateExplanation": "{appName} does not (and will never) serve ads or sell your data, therefore it's <span class=\"text-backdrop\">completely free to use</span>. but turns out developing and keeping up a web service used by over 150,000 people is not that easy.\n\nif you ever found {appName} useful and want to help continue its development and support, or simply want to thank the developer, consider chipping in! every cent helps and is VERY appreciated :D\n\ncurrently, i have big (scaling) plans, and i need your help. {appName}'s usage is growing daily, so i need to make up for it. <span class=\"text-backdrop\">donations are more appreciated than ever.</span>\n\ni am yet to earn anything from {appName}, everything goes back to users, so you're essentially helping everyone.",
"DonateVia": "donate via", "DonateVia": "donate via",
"DonateHireMe": "...or you can <a class=\"text-backdrop italic\" href=\"{s}\" target=\"_blank\">hire me</a> :)", "DonateHireMe": "...or you can <a class=\"text-backdrop italic\" href=\"{s}\" target=\"_blank\">hire me</a> :)",
"SettingsVideoMute": "mute audio", "SettingsVideoMute": "mute audio",

4
src/localization/languages/ru.json
View file

@ -47,7 +47,7 @@
"SettingsQualityDescription": "если выбранное качество недоступно, то выбирается ближайшее к нему.", "SettingsQualityDescription": "если выбранное качество недоступно, то выбирается ближайшее к нему.",
"LinkGitHubChanges": "&gt;&gt; смотри предыдущие изменения на github", "LinkGitHubChanges": "&gt;&gt; смотри предыдущие изменения на github",
"NoScriptMessage": "{appName} использует javascript для обработки ссылок и интерактивного интерфейса. ты должен разрешить использование javascript, чтобы пользоваться сайтом. тут нет никаких зловредных скриптов, обещаю.", "NoScriptMessage": "{appName} использует javascript для обработки ссылок и интерактивного интерфейса. ты должен разрешить использование javascript, чтобы пользоваться сайтом. тут нет никаких зловредных скриптов, обещаю.",
"DownloadPopupDescriptionIOS": "зажми кнопку \"скачать\", затем скрой превью и выбери \"загрузить файл по ссылке\" в появившемся окне.", "DownloadPopupDescriptionIOS": "наиболее простой метод скачивания видео на ios:\n1. добавь <a class=\"text-backdrop italic\" href=\"{saveToGalleryShortcut}\" target=\"_blank\">этот сценарий siri</a>.\n2. нажми \"поделиться\" выше и выбери \"save to photos\" в открывшемся окне.\nесли появляется окно с запросом разрешения, то прочитай его, потом нажми \"всегда разрешать\".\n\nальтернативный метод: зажми кнопку \"скачать\", затем скрой превью и выбери \"загрузить файл по ссылке\" в появившемся окне.\nпотом открой загрузки в safari, выбери скачанный файл, нажми иконку \"поделиться\", и, наконец, нажми \"сохранить видео\".",
"DownloadPopupDescription": "кнопка скачивания открывает новое окно с файлом. ты можешь отключить выбор метода скачивания файла в настройках.", "DownloadPopupDescription": "кнопка скачивания открывает новое окно с файлом. ты можешь отключить выбор метода скачивания файла в настройках.",
"DownloadPopupWayToSave": "выбери, как сохранить", "DownloadPopupWayToSave": "выбери, как сохранить",
"ClickToCopy": "нажми, чтобы скопировать", "ClickToCopy": "нажми, чтобы скопировать",
@ -94,7 +94,7 @@
"ChangelogPressToHide": "скрыть", "ChangelogPressToHide": "скрыть",
"Donate": "задонатить", "Donate": "задонатить",
"DonateSub": "ты можешь помочь!", "DonateSub": "ты можешь помочь!",
"DonateExplanation": "{appName} не пихает рекламу тебе в лицо и не продаёт твои личные данные, а значит работает <span class=\"text-backdrop\">совершенно бесплатно</span>. но оказывается, что разработка и поддержка сервиса, которым пользуются более 80 тысяч людей, обходится довольно трудно.\n\nесли {appName} тебе помог и ты хочешь поблагодарить разработчика, то это можно сделать через донаты! каждый рубль помогает мне, моим котам, и {appName}! спасибо :)", "DonateExplanation": "{appName} не пихает рекламу тебе в лицо и не продаёт твои личные данные, а значит работает <span class=\"text-backdrop\">совершенно бесплатно</span>. но оказывается, что разработка и поддержка сервиса, которым пользуются более 150 тысяч людей, обходится довольно затратно.\n\nесли {appName} тебе помог и ты хочешь поблагодарить разработчика, то это можно сделать через донаты! каждый рубль помогает мне, моим котам, и {appName}! спасибо :)",
"DonateVia": "открыть", "DonateVia": "открыть",
"DonateHireMe": "...или же ты можешь <a class=\"text-backdrop italic\" href=\"{s}\" target=\"_blank\">пригласить меня на работу</a> :)", "DonateHireMe": "...или же ты можешь <a class=\"text-backdrop italic\" href=\"{s}\" target=\"_blank\">пригласить меня на работу</a> :)",
"SettingsVideoMute": "убрать аудио", "SettingsVideoMute": "убрать аудио",

6
src/localization/manager.js
View file

@ -1,8 +1,8 @@
import * as fs from "fs"; import * as fs from "fs";
import { appName, repo } from "../modules/config.js"; import { appName, links, repo } from "../modules/config.js";
import loadJson from "../modules/sub/loadJSON.js"; import loadJson from "../modules/sub/loadJSON.js";
const locPath = './src/localization/languages' const locPath = './src/localization/languages';
let loc = {} let loc = {}
let languages = []; let languages = [];
@ -19,7 +19,7 @@ export function loadLoc() {
loadLoc(); loadLoc();
export function replaceBase(s) { export function replaceBase(s) {
return s.replace(/\n/g, '<br/>').replace(/{appName}/g, appName).replace(/{repo}/g, repo).replace(/\*;/g, "&bull;"); return s.replace(/\n/g, '<br/>').replace(/{saveToGalleryShortcut}/g, links.saveToGalleryShortcut).replace(/{appName}/g, appName).replace(/{repo}/g, repo).replace(/\*;/g, "&bull;");
} }
export function replaceAll(lang, str, string, replacement) { export function replaceAll(lang, str, string, replacement) {
let s = replaceBase(str[string]) let s = replaceBase(str[string])

3
src/modules/config.js
View file

@ -16,4 +16,5 @@ export const
donations = config.donations, donations = config.donations,
ffmpegArgs = config.ffmpegArgs, ffmpegArgs = config.ffmpegArgs,
supportedAudio = config.supportedAudio, supportedAudio = config.supportedAudio,
celebrations = config.celebrations celebrations = config.celebrations,
links = config.links

4
src/modules/emoji.js
View file

@ -1,7 +1,6 @@
const names = { const names = {
"🎶": "musical_notes", "🎶": "musical_notes",
"🎬": "clapper_board", "🎬": "clapper_board",
"💰": "money_bag",
"🎉": "party_popper", "🎉": "party_popper",
"❓": "question_mark", "❓": "question_mark",
"✨": "sparkles", "✨": "sparkles",
@ -23,7 +22,8 @@ const names = {
"🐦": "bird", "🐦": "bird",
"🐙": "octopus", "🐙": "octopus",
"🔮": "crystal_ball", "🔮": "crystal_ball",
"💪": "biceps" "💪": "biceps",
"💖": "sparkling_heart"
} }
let sizing = { let sizing = {
22: 0.4, 22: 0.4,

30
src/modules/pageRender/elements.js
View file

@ -1,4 +1,5 @@
import { celebrations } from "../config.js"; import { celebrations } from "../config.js";
import emoji from "../emoji.js";
export function switcher(obj) { export function switcher(obj) {
let items = ``; let items = ``;
@ -11,7 +12,7 @@ export function switcher(obj) {
} }
} }
if (obj.noParent) return `<div class="switches">${items}</div>`; if (obj.noParent) return `<div id="${obj.name}" class="switches">${items}</div>`;
return `<div id="${obj.name}-switcher" class="switch-container"> return `<div id="${obj.name}-switcher" class="switch-container">
${obj.subtitle ? `<div class="subtitle">${obj.subtitle}</div>` : ``} ${obj.subtitle ? `<div class="subtitle">${obj.subtitle}</div>` : ``}
<div class="switches">${items}</div> <div class="switches">${items}</div>
@ -130,8 +131,8 @@ export function popupWithBottomButtons(obj) {
export function backdropLink(link, text) { export function backdropLink(link, text) {
return `<a class="text-backdrop italic" href="${link}" target="_blank">${text}</a>` return `<a class="text-backdrop italic" href="${link}" target="_blank">${text}</a>`
} }
export function socialLink(emoji, name, handle, url) { export function socialLink(emji, name, handle, url) {
return `<div class="cobalt-support-link">${emoji} ${name}: <a class="text-backdrop italic" href="${url}" target="_blank">${handle}</a></div>` return `<div class="cobalt-support-link">${emji} ${name}: <a class="text-backdrop italic" href="${url}" target="_blank">${handle}</a></div>`
} }
export function settingsCategory(obj) { export function settingsCategory(obj) {
return `<div id="settings-${obj.name}" class="settings-category"> return `<div id="settings-${obj.name}" class="settings-category">
@ -151,12 +152,20 @@ export function footerButtons(obj) {
items += `<button id="${obj[i]["name"]}-footer" class="switch footer-button" onclick="${obj[i]["action"]}()" aria-label="${obj[i]["aria"]}">${obj[i]["text"]}</button>`; items += `<button id="${obj[i]["name"]}-footer" class="switch footer-button" onclick="${obj[i]["action"]}()" aria-label="${obj[i]["aria"]}">${obj[i]["text"]}</button>`;
break; break;
case "popup": case "popup":
let context = obj[i]["context"] ? `, '${obj[i]["context"]}'` : '' let buttonName = obj[i]["context"] ? `${obj[i]["name"]}-${obj[i]["context"]}` : obj[i]["name"],
let context2 = obj[i+1] && obj[i+1]["context"] ? `, '${obj[i+1]["context"]}'` : '' context = obj[i]["context"] ? `, '${obj[i]["context"]}'` : '',
buttonName2,
context2;
if (obj[i+1]) {
buttonName2 = obj[i+1]["context"] ? `${obj[i+1]["name"]}-${obj[i+1]["context"]}` : obj[i+1]["name"];
context2 = obj[i+1]["context"] ? `, '${obj[i+1]["context"]}'` : '';
}
items += ` items += `
<div class="footer-pair"> <div class="footer-pair">
<button id="${obj[i]["name"]}-footer" class="switch footer-button" onclick="popup('${obj[i]["name"]}', 1${context})" aria-label="${obj[i]["aria"]}">${obj[i]["text"]}</button> <button id="${buttonName}-footer" class="switch footer-button" onclick="popup('${obj[i]["name"]}', 1${context})" aria-label="${obj[i]["aria"]}">${obj[i]["text"]}</button>
${obj[i+1] ? `<button id="${obj[i+1]["name"]}-footer" class="switch footer-button" onclick="popup('${obj[i+1]["name"]}', 1${context2})" aria-label="${obj[i+1]["aria"]}">${obj[i+1]["text"]}</button>`: ''} ${obj[i+1] ? `<button id="${buttonName2}-footer" class="switch footer-button" onclick="popup('${obj[i+1]["name"]}', 1${context2})" aria-label="${obj[i+1]["aria"]}">${obj[i+1]["text"]}</button>`: ''}
</div>`; </div>`;
i++; i++;
break; break;
@ -169,7 +178,12 @@ export function explanation(text) {
return `<div class="explanation">${text}</div>` return `<div class="explanation">${text}</div>`
} }
export function celebrationsEmoji() { export function celebrationsEmoji() {
try {
let n = new Date().toISOString().split('T')[0].split('-'); let n = new Date().toISOString().split('T')[0].split('-');
let dm = `${n[1]}-${n[2]}`; let dm = `${n[1]}-${n[2]}`;
return Object.keys(celebrations).includes(dm) ? celebrations[dm] : "🐲"; let f = Object.keys(celebrations).includes(dm) ? celebrations[dm] : "🐲";
return f != "🐲" ? emoji(f, 22) : false;
} catch (e) {
return false
}
} }

8
src/modules/pageRender/page.js
View file

@ -1,4 +1,4 @@
import { backdropLink, celebrationsEmoji, checkbox, collapsibleList, explanation, footerButtons, multiPagePopup, popup, popupWithBottomButtons, sep, settingsCategory, switcher, socialLink } from "./elements.js"; import { backdropLink, checkbox, collapsibleList, explanation, footerButtons, multiPagePopup, popup, popupWithBottomButtons, sep, settingsCategory, switcher, socialLink } from "./elements.js";
import { services as s, appName, authorInfo, version, repo, donations, supportedAudio } from "../config.js"; import { services as s, appName, authorInfo, version, repo, donations, supportedAudio } from "../config.js";
import { getCommitInfo } from "../sub/currentCommit.js"; import { getCommitInfo } from "../sub/currentCommit.js";
import loc from "../../localization/manager.js"; import loc from "../../localization/manager.js";
@ -149,7 +149,7 @@ export default function(obj) {
}) })
}, { }, {
name: "donate", name: "donate",
title: `${emoji("💰")} ${t('DonationsTab')}`, title: `${emoji("💖")} ${t('DonationsTab')}`,
content: popup({ content: popup({
name: "donate", name: "donate",
header: { header: {
@ -392,13 +392,13 @@ export default function(obj) {
footerButtons([{ footerButtons([{
name: "about", name: "about",
type: "popup", type: "popup",
text: `${emoji(celebrationsEmoji() , 22)} ${t('AboutTab')}`, text: `${emoji("🐲" , 22)} ${t('AboutTab')}`,
aria: t('AccessibilityOpenAbout') aria: t('AccessibilityOpenAbout')
}, { }, {
name: "about", name: "about",
type: "popup", type: "popup",
context: "donate", context: "donate",
text: `${emoji("💰", 22)} ${t('Donate')}`, text: `${emoji("💖", 22)} ${t('Donate')}`,
aria: t('AccessibilityOpenDonate') aria: t('AccessibilityOpenDonate')
}, { }, {
name: "settings", name: "settings",

3
src/modules/processing/services/soundcloud.js
View file

@ -36,8 +36,7 @@ async function findClientID() {
export default async function(obj) { export default async function(obj) {
let html; let html;
if (!obj.author && !obj.song && obj.shortLink) { if (!obj.author && !obj.song && obj.shortLink) {
html = await fetch(`https://soundcloud.app.goo.gl/${obj.shortLink}/`).then((r) => { return r.status === 404 ? false : r.text() }).catch(() => { return false }); html = await fetch(`https://on.soundcloud.com/${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) { 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 }); html = await fetch(`https://soundcloud.com/${obj.author}/${obj.song}${obj.accessKey ? `/s-${obj.accessKey}` : ''}`).then((r) => { return r.text() }).catch(() => { return false });

2
src/modules/processing/services/vk.js
View file

@ -44,7 +44,7 @@ export default async function(o) {
if (Number(bestQuality._attributes.id) > Number(quality)) bestQuality = repr[quality]; if (Number(bestQuality._attributes.id) > Number(quality)) bestQuality = repr[quality];
url = js.player.params[0][`url${resolutionMatch[bestQuality._attributes[resolutionPick]]}`]; url = js.player.params[0][`url${resolutionMatch[bestQuality._attributes[resolutionPick]]}`];
filename = `${bestQuality._attributes.width}x${bestQuality._attributes.height}.mp4` filename += `${bestQuality._attributes.width}x${bestQuality._attributes.height}.mp4`
} else if (js.player.params[0]["url240"]) { // fallback for when video is too old } else if (js.player.params[0]["url240"]) { // fallback for when video is too old
url = js.player.params[0]["url240"]; url = js.player.params[0]["url240"];

4
src/modules/setup.js
View file

@ -1,6 +1,6 @@
import { existsSync, unlinkSync, appendFileSync } from "fs"; import { existsSync, unlinkSync, appendFileSync } from "fs";
import { createInterface } from "readline"; import { createInterface } from "readline";
import { Cyan, Bright, Green } from "./sub/consoleText.js"; import { Cyan, Bright } from "./sub/consoleText.js";
import { execSync } from "child_process"; import { execSync } from "child_process";
let envPath = './.env'; let envPath = './.env';
@ -42,7 +42,7 @@ rl.question(q, r1 => {
if (r2) ob['port'] = r2 if (r2) ob['port'] = r2
if (!r1 && r2) ob['selfURL'] = `http://localhost:${r2}/` if (!r1 && r2) ob['selfURL'] = `http://localhost:${r2}/`
console.log(Bright("\nWould you like to enable CORS? It allows other websites and extensions to use your instance's API.\n y/n (n)")) console.log(Bright("\nWould you like to enable CORS? It allows other websites and extensions to use your instance's API.\ny/n (n)"))
rl.question(q, r3 => { rl.question(q, r3 => {
if (r3.toLowerCase() !== 'y') ob['cors'] = '0' if (r3.toLowerCase() !== 'y') ob['cors'] = '0'

6
src/modules/stream/types.js
View file

@ -2,7 +2,7 @@ import { spawn } from "child_process";
import ffmpeg from "ffmpeg-static"; import ffmpeg from "ffmpeg-static";
import got from "got"; import got from "got";
import { ffmpegArgs, genericUserAgent } from "../config.js"; import { ffmpegArgs, genericUserAgent } from "../config.js";
import { metadataManager, msToTime } from "../sub/utils.js"; import { getThreads, metadataManager, msToTime } from "../sub/utils.js";
export function streamDefault(streamInfo, res) { export function streamDefault(streamInfo, res) {
try { try {
@ -35,9 +35,9 @@ export function streamLiveRender(streamInfo, res) {
return; return;
} }
let audio = got.get(streamInfo.urls[1], { isStream: true }); let audio = got.get(streamInfo.urls[1], { isStream: true });
let format = streamInfo.filename.split('.')[streamInfo.filename.split('.').length - 1], args = [ let format = streamInfo.filename.split('.')[streamInfo.filename.split('.').length - 1], args = [
'-loglevel', '-8', '-loglevel', '-8',
'-threads', `${getThreads()}`,
'-i', streamInfo.urls[0], '-i', streamInfo.urls[0],
'-i', 'pipe:3', '-i', 'pipe:3',
'-map', '0:v', '-map', '0:v',
@ -95,6 +95,7 @@ export function streamAudioOnly(streamInfo, res) {
try { try {
let args = [ let args = [
'-loglevel', '-8', '-loglevel', '-8',
'-threads', `${getThreads()}`,
'-i', streamInfo.urls '-i', streamInfo.urls
] ]
if (streamInfo.metadata) { if (streamInfo.metadata) {
@ -141,6 +142,7 @@ export function streamVideoOnly(streamInfo, res) {
try { try {
let format = streamInfo.filename.split('.')[streamInfo.filename.split('.').length - 1], args = [ let format = streamInfo.filename.split('.')[streamInfo.filename.split('.').length - 1], args = [
'-loglevel', '-8', '-loglevel', '-8',
'-threads', `${getThreads()}`,
'-i', streamInfo.urls, '-i', streamInfo.urls,
'-c', 'copy' '-c', 'copy'
] ]

12
src/modules/sub/utils.js
View file

@ -142,3 +142,15 @@ export function checkJSONPost(obj) {
export function getIP(req) { export function getIP(req) {
return req.header('cf-connecting-ip') ? req.header('cf-connecting-ip') : req.ip; return req.header('cf-connecting-ip') ? req.header('cf-connecting-ip') : req.ip;
} }
export function getThreads() {
try {
if (process.env.ffmpegThreads && process.env.ffmpegThreads.length <= 3
&& (Number(process.env.ffmpegThreads) >= 0 && Number(process.env.ffmpegThreads) <= 256)) {
return process.env.ffmpegThreads
} else {
return '0'
}
} catch (e) {
return '0'
}
}

30
src/test/tests.json
View file

@ -36,8 +36,8 @@
"status": "redirect" "status": "redirect"
} }
}, { }, {
"name": "picker: mixed media (3 gifs + image)", "name": "picker: mixed media (2 videos)",
"url": "https://twitter.com/emerald_pedrod/status/1582418163521581063?s=20", "url": "https://twitter.com/taehyungsflow/status/1583411488433516544",
"params": { "params": {
"aFormat": "mp3", "aFormat": "mp3",
"isAudioOnly": false, "isAudioOnly": false,
@ -280,6 +280,22 @@
"code": 200, "code": 200,
"status": "stream" "status": "stream"
} }
}, {
"name": "on.soundcloud link",
"url": "https://on.soundcloud.com/wLZre",
"params": {},
"expected": {
"code": 200,
"status": "stream"
}
}, {
"name": "on.soundcloud link, different stream type",
"url": "https://on.soundcloud.com/AG4c",
"params": {},
"expected": {
"code": 200,
"status": "stream"
}
}], }],
"youtube": [{ "youtube": [{
"name": "4k video (h264, 1440)", "name": "4k video (h264, 1440)",
@ -617,7 +633,7 @@
} }
}, { }, {
"name": "images", "name": "images",
"url": "https://vt.tiktok.com/ZS8JP89eB/", "url": "https://www.tiktok.com/@matryoshk4/video/7231234675476532526",
"params": {}, "params": {},
"expected": { "expected": {
"code": 200, "code": 200,
@ -804,6 +820,14 @@
"code": 200, "code": 200,
"status": "redirect" "status": "redirect"
} }
}, {
"name": "regular video",
"url": "https://www.instagram.com/p/CmCVWoIr9OH/",
"params": {},
"expected": {
"code": 200,
"status": "redirect"
}
}, { }, {
"name": "reel (isAudioOnly)", "name": "reel (isAudioOnly)",
"url": "https://www.instagram.com/reel/CoEBV3eM4QR/", "url": "https://www.instagram.com/reel/CoEBV3eM4QR/",