• vimeo module has been revamped, all sorts of videos should now be supported.\n• vimeo audio downloads! you now can download audios from more recent videos.\n• {appName} now supports all sorts of tumblr links. (even those scary ones from the mobile app)\n• vk clips support has been fixed. they rolled back the separation of videos and clips, so i had to do the same.\n• youtube videos with community warnings should now be possible to download.
\nuser interface improvements:\n• list of supported services is now MUCH easier to read.\n• banners in changelog history should no longer overlap each other.\n• bullet points! they have a bit of extra padding, so it makes them stand out of the rest of text.
\ninternal improvements:\n• cobalt will now match the link to regex when using ?u= query for autopasting it into input area.\n• better rate limiting: limiting now is done per minute, not per 20 minutes. this ensures less waiting and less attack area for request spammers.\n• moved to my own fork of ytdl-core, cause main project seems to have been abandoned. go check it out on
github or
npm!\n• ALL user inputs are now properly sanitized on the server. that includes variables for POST api method, too.\n• \"got\" package has been (mostly) replaced by native fetch api. this should greately reduce ram usage.\n• all unnecessary duplications of module imports have been gotten rid of. no more error passing strings from inside of service modules. you don't make mistakes only if you don't do anything, right?\n• other code optimizations. there's less clutter overall.
${enabledServices}.
`
+ }, {
+ text: obj.lang !== "ru" ? loc(obj.lang, 'FollowTwitter') : "",
+ classes: ["desc-padding"]
}, {
text: backdropLink(repo, loc(obj.lang, 'LinkGitHubIssues')),
classes: ["bottom-link"]
diff --git a/src/modules/processing/match.js b/src/modules/processing/match.js
index e5ebbb63..a7cc5868 100644
--- a/src/modules/processing/match.js
+++ b/src/modules/processing/match.js
@@ -1,6 +1,8 @@
import { apiJSON } from "../sub/utils.js";
import { errorUnsupported, genericError } from "../sub/errors.js";
+import loc from "../../localization/manager.js";
+
import { testers } from "./servicesPatternTesters.js";
import bilibili from "../services/bilibili.js";
@@ -105,7 +107,9 @@ export default async function (host, patternMatch, url, lang, obj) {
default:
return apiJSON(0, { t: errorUnsupported(lang) });
}
- return matchActionDecider(r, host, obj.ip, obj.aFormat, obj.isAudioOnly)
+ return !r.error ? matchActionDecider(r, host, obj.ip, obj.aFormat, obj.isAudioOnly, lang) : apiJSON(0, {
+ t: Array.isArray(r.error) ? loc(lang, r.error[0], r.error[1]) : loc(lang, r.error)
+ });
} catch (e) {
return apiJSON(0, { t: genericError(lang, host) })
}
diff --git a/src/modules/processing/matchActionDecider.js b/src/modules/processing/matchActionDecider.js
index 04d5900e..7f03b8c2 100644
--- a/src/modules/processing/matchActionDecider.js
+++ b/src/modules/processing/matchActionDecider.js
@@ -1,105 +1,109 @@
import { audioIgnore, services, supportedAudio } from "../config.js"
import { apiJSON } from "../sub/utils.js"
+import loc from "../../localization/manager.js";
-export default function(r, host, ip, audioFormat, isAudioOnly) {
- if (!r.error) {
- if (!isAudioOnly && !r.picker) {
- switch (host) {
- case "twitter":
- return apiJSON(1, { u: r.urls });
- case "vk":
- return apiJSON(2, {
- type: "bridge", u: r.urls, service: host, ip: ip,
- filename: r.filename,
- });
- case "bilibili":
+export default function(r, host, ip, audioFormat, isAudioOnly, lang) {
+ if (!isAudioOnly && !r.picker) {
+ switch (host) {
+ case "twitter":
+ return apiJSON(1, { u: r.urls });
+ case "vk":
+ return apiJSON(2, {
+ type: "bridge", u: r.urls, service: host, ip: ip,
+ filename: r.filename,
+ });
+ case "bilibili":
+ return apiJSON(2, {
+ type: "render", u: r.urls, service: host, ip: ip,
+ filename: r.filename,
+ time: r.time
+ });
+ case "youtube":
+ return apiJSON(2, {
+ type: r.type, u: r.urls, service: host, ip: ip,
+ filename: r.filename,
+ time: r.time,
+ });
+ case "reddit":
+ return apiJSON(r.typeId, {
+ type: r.type, u: r.urls, service: host, ip: ip,
+ filename: r.filename,
+ });
+ case "tiktok":
+ return apiJSON(2, {
+ type: "bridge", u: r.urls, service: host, ip: ip,
+ filename: r.filename,
+ });
+ case "douyin":
+ return apiJSON(2, {
+ type: "bridge", u: r.urls, service: host, ip: ip,
+ filename: r.filename,
+ });
+ case "tumblr":
+ return apiJSON(1, { u: r.urls });
+ case "vimeo":
+ if (r.filename) {
return apiJSON(2, {
type: "render", u: r.urls, service: host, ip: ip,
- filename: r.filename,
- time: r.time
+ filename: r.filename
});
- case "youtube":
- return apiJSON(2, {
- type: r.type, u: r.urls, service: host, ip: ip,
- filename: r.filename,
- time: r.time,
- });
- case "reddit":
- return apiJSON(r.typeId, {
- type: r.type, u: r.urls, service: host, ip: ip,
- filename: r.filename,
- });
- case "tiktok":
- return apiJSON(2, {
- type: "bridge", u: r.urls, service: host, ip: ip,
- filename: r.filename,
- });
- case "douyin":
- return apiJSON(2, {
- type: "bridge", u: r.urls, service: host, ip: ip,
- filename: r.filename,
- });
- case "tumblr":
+ } else {
return apiJSON(1, { u: r.urls });
- case "vimeo":
- return apiJSON(1, { u: r.urls });
- }
- } else if (r.picker) {
- switch (host) {
- case "douyin":
- case "tiktok":
- let type = "render";
- if (audioFormat === "mp3" || audioFormat === "best") {
- audioFormat = "mp3"
- type = "bridge"
- }
- return apiJSON(5, {
- type: type,
- picker: r.picker,
- u: Array.isArray(r.urls) ? r.urls[1] : r.urls, service: host, ip: ip,
- filename: r.audioFilename, isAudioOnly: true, audioFormat: audioFormat, copy: audioFormat === "best" ? true : false,
- })
- case "twitter":
- return apiJSON(5, {
- picker: r.picker, service: host
- })
- }
- } else {
- if (host === "reddit" && r.typeId === 1 || audioIgnore.includes(host)) return apiJSON(0, { t: r.audioFilename });
- let type = "render";
- let copy = false;
-
- if (!supportedAudio.includes(audioFormat)) audioFormat = "best";
- if ((host == "tiktok" || host == "douyin") && isAudioOnly && services.tiktok.audioFormats.includes(audioFormat)) {
- if (r.isMp3) {
- if (audioFormat === "mp3" || audioFormat === "best") {
- audioFormat = "mp3"
- type = "bridge"
- }
- } else if (audioFormat === "best") {
- audioFormat = "m4a"
+ }
+ }
+ } else if (r.picker) {
+ switch (host) {
+ case "douyin":
+ case "tiktok":
+ let type = "render";
+ if (audioFormat === "mp3" || audioFormat === "best") {
+ audioFormat = "mp3"
type = "bridge"
}
- }
- if ((audioFormat === "best" && services[host]["bestAudio"]) || services[host]["bestAudio"] && (audioFormat === services[host]["bestAudio"])) {
- audioFormat = services[host]["bestAudio"]
- type = "bridge"
- } else if (audioFormat === "best") {
- audioFormat = "m4a"
- copy = true
- if (r.audioFilename.includes("twitterspaces")) {
- audioFormat = "mp3"
- copy = false
- }
- }
- return apiJSON(2, {
- type: type,
- u: Array.isArray(r.urls) ? r.urls[1] : r.urls, service: host, ip: ip,
- filename: r.audioFilename, isAudioOnly: true,
- audioFormat: audioFormat, copy: copy, fileMetadata: r.fileMetadata ? r.fileMetadata : false
- })
+ return apiJSON(5, {
+ type: type,
+ picker: r.picker,
+ u: Array.isArray(r.urls) ? r.urls[1] : r.urls, service: host, ip: ip,
+ filename: r.audioFilename, isAudioOnly: true, audioFormat: audioFormat, copy: audioFormat === "best" ? true : false,
+ })
+ case "twitter":
+ return apiJSON(5, {
+ picker: r.picker, service: host
+ })
}
} else {
- return apiJSON(0, { t: r.error });
+ if ((host === "reddit" && r.typeId === 1) || (host === "vimeo" && !r.filename) || audioIgnore.includes(host)) return apiJSON(0, { t: loc(lang, 'ErrorEmptyDownload') });
+ let type = "render";
+ let copy = false;
+
+ if (!supportedAudio.includes(audioFormat)) audioFormat = "best";
+ if ((host == "tiktok" || host == "douyin") && isAudioOnly && services.tiktok.audioFormats.includes(audioFormat)) {
+ if (r.isMp3) {
+ if (audioFormat === "mp3" || audioFormat === "best") {
+ audioFormat = "mp3"
+ type = "bridge"
+ }
+ } else if (audioFormat === "best") {
+ audioFormat = "m4a"
+ type = "bridge"
+ }
+ }
+ if ((audioFormat === "best" && services[host]["bestAudio"]) || services[host]["bestAudio"] && (audioFormat === services[host]["bestAudio"])) {
+ audioFormat = services[host]["bestAudio"]
+ type = "bridge"
+ } else if (audioFormat === "best") {
+ audioFormat = "m4a"
+ copy = true
+ if (r.audioFilename.includes("twitterspaces")) {
+ audioFormat = "mp3"
+ copy = false
+ }
+ }
+ return apiJSON(2, {
+ type: type,
+ u: Array.isArray(r.urls) ? r.urls[1] : r.urls, service: host, ip: ip,
+ filename: r.audioFilename, isAudioOnly: true,
+ audioFormat: audioFormat, copy: copy, fileMetadata: r.fileMetadata ? r.fileMetadata : false
+ })
}
}
diff --git a/src/modules/processing/servicesConfig.json b/src/modules/processing/servicesConfig.json
index 9678c8ff..c0cd70a2 100644
--- a/src/modules/processing/servicesConfig.json
+++ b/src/modules/processing/servicesConfig.json
@@ -1,5 +1,5 @@
{
- "audioIgnore": ["vk", "vimeo"],
+ "audioIgnore": ["vk"],
"config": {
"bilibili": {
"alias": "bilibili.com",
@@ -12,12 +12,12 @@
"enabled": true
},
"twitter": {
- "alias": "twitter, twitter spaces",
+ "alias": "twitter posts & spaces",
"patterns": [":user/status/:id", ":user/status/:id/video/:v", "i/spaces/:spaceId"],
"enabled": true
},
"vk": {
- "alias": "vk clips, vk video",
+ "alias": "vk video & clips",
"patterns": ["video-:userId_:videoId", "clip-:userId_:videoId", "clips-:userId?z=clip-:userId_:videoId"],
"quality_match": {
"2160": 7,
@@ -47,7 +47,7 @@
"enabled": true
},
"youtube": {
- "alias": "youtube, youtube music, youtube shorts",
+ "alias": "youtube videos & shorts & music",
"patterns": ["watch?v=:id"],
"quality_match": ["2160", "1440", "1080", "720", "480", "360", "240", "144"],
"bestAudio": "opus",
@@ -59,26 +59,34 @@
"enabled": true
},
"tumblr": {
- "patterns": ["post/:id", "blog/view/:user/:id"],
+ "patterns": ["post/:id", "blog/view/:user/:id", ":user/:id", ":user/:id/:trackingId"],
"enabled": true
},
"tiktok": {
+ "alias": "tiktok videos & slideshow & audio",
"patterns": [":user/video/:postId", ":id", "t/:id"],
"audioFormats": ["best", "m4a", "mp3"],
"enabled": true
},
"douyin": {
+ "alias": "douyin videos & slideshow & audio",
"patterns": ["video/:postId", ":id"],
"enabled": true
},
"vimeo": {
"patterns": [":id"],
+ "resolutionMatch": {
+ "3840": "2160",
+ "1920": "1080",
+ "1280": "720",
+ "960": "480"
+ },
"enabled": true
},
"soundcloud": {
"patterns": [":author/:song", ":shortLink"],
"bestAudio": "none",
- "clientid": "1TLciEOiKE0PThutYu5Xj0kc8R4twD9p",
+ "clientid": "YeTcsotswIIc4sse5WZsXszVxMtP6eLc",
"enabled": true
}
}
diff --git a/src/modules/services/bilibili.js b/src/modules/services/bilibili.js
index 554f2f7f..d8311326 100644
--- a/src/modules/services/bilibili.js
+++ b/src/modules/services/bilibili.js
@@ -1,16 +1,12 @@
-import got from "got";
-import loc from "../../localization/manager.js";
import { genericUserAgent, maxVideoDuration } from "../config.js";
export default async function(obj) {
try {
- let html = await got.get(`https://bilibili.com/video/${obj.id}`, {
- headers: { "user-agent": genericUserAgent }
- });
- html.on('error', (err) => {
- return { error: loc(obj.lang, 'ErrorCantConnectToServiceAPI', 'bilibili') };
- });
- html = html.body;
+ let html = await fetch(`https://bilibili.com/video/${obj.id}`, {
+ headers: {"user-agent": genericUserAgent}
+ }).then(async (r) => {return await r.text()}).catch(() => {return false});
+ if (!html) return { error: 'ErrorCouldntFetch' };
+
if (html.includes('')[0]);
if (streamData.data.timelength <= maxVideoDuration) {
@@ -22,12 +18,12 @@ export default async function(obj) {
}).sort((a, b) => Number(b.bandwidth) - Number(a.bandwidth));
return { urls: [video[0]["baseUrl"], audio[0]["baseUrl"]], time: streamData.data.timelength, audioFilename: `bilibili_${obj.id}_audio`, filename: `bilibili_${obj.id}_${video[0]["width"]}x${video[0]["height"]}.mp4` };
} else {
- return { error: loc(obj.lang, 'ErrorLengthLimit', maxVideoDuration / 60000) };
+ return { error: ['ErrorLengthLimit', maxVideoDuration / 60000] };
}
} else {
- return { error: loc(obj.lang, 'ErrorEmptyDownload') };
+ return { error: 'ErrorEmptyDownload' };
}
} catch (e) {
- return { error: loc(obj.lang, 'ErrorBadFetch') };
+ return { error: 'ErrorBadFetch' };
}
}
diff --git a/src/modules/services/reddit.js b/src/modules/services/reddit.js
index 28e068e8..4feee5a9 100644
--- a/src/modules/services/reddit.js
+++ b/src/modules/services/reddit.js
@@ -1,29 +1,27 @@
-import got from "got";
-import loc from "../../localization/manager.js";
-import { genericUserAgent, maxVideoDuration } from "../config.js";
+import { maxVideoDuration } from "../config.js";
export default async function(obj) {
try {
- let req = await got.get(`https://www.reddit.com/r/${obj.sub}/comments/${obj.id}/${obj.name}.json`, { headers: { "user-agent": genericUserAgent } });
- let data = (JSON.parse(req.body))[0]["data"]["children"][0]["data"];
+ let data = await fetch(`https://www.reddit.com/r/${obj.sub}/comments/${obj.id}/${obj.name}.json`).then(async (r) => {return await r.json()}).catch(() => {return false});
+ if (!data) return { error: 'ErrorCouldntFetch' };
+ data = data[0]["data"]["children"][0]["data"];
+
if ("reddit_video" in data["secure_media"] && data["secure_media"]["reddit_video"]["duration"] * 1000 < maxVideoDuration) {
let video = data["secure_media"]["reddit_video"]["fallback_url"].split('?')[0],
audio = video.match('.mp4') ? `${video.split('_')[0]}_audio.mp4` : `${data["secure_media"]["reddit_video"]["fallback_url"].split('DASH')[0]}audio`;
- try {
- await got.head(audio, { headers: { "user-agent": genericUserAgent } });
- } catch (err) {
- audio = ''
- }
+
+ await fetch(audio, {method: "HEAD"}).then((r) => {if (r.status != 200) audio = ''}).catch(() => {audio = ''});
+
let id = data["secure_media"]["reddit_video"]["fallback_url"].split('/')[3]
if (audio.length > 0) {
return { typeId: 2, type: "render", urls: [video, audio], audioFilename: `reddit_${id}_audio`, filename: `reddit_${id}.mp4` };
} else {
- return { typeId: 1, urls: video, audioFilename: loc(obj.lang, 'ErrorEmptyDownload') };
+ return { typeId: 1, urls: video };
}
} else {
- return { error: loc(obj.lang, 'ErrorEmptyDownload') };
+ return { error: 'ErrorEmptyDownload' };
}
} catch (err) {
- return { error: loc(obj.lang, 'ErrorBadFetch') };
+ return { error: 'ErrorBadFetch' };
}
}
diff --git a/src/modules/services/soundcloud.js b/src/modules/services/soundcloud.js
index b2d476b7..08cbc7fd 100644
--- a/src/modules/services/soundcloud.js
+++ b/src/modules/services/soundcloud.js
@@ -1,26 +1,27 @@
-import got from "got";
-import loc from "../../localization/manager.js";
import { genericUserAgent, maxAudioDuration, services } from "../config.js";
export default async function(obj) {
try {
let html;
if (!obj.author && !obj.song && obj.shortLink) {
- html = await got.get(`https://soundcloud.app.goo.gl/${obj.shortLink}/`, { headers: { "user-agent": genericUserAgent } });
- html = html.body
+ html = await fetch(`https://soundcloud.app.goo.gl/${obj.shortLink}/`, {
+ headers: {"user-agent": genericUserAgent}
+ }).then(async (r) => {return await r.text()}).catch(() => {return false});
}
if (obj.author && obj.song) {
- html = await got.get(`https://soundcloud.com/${obj.author}/${obj.song}`, { headers: { "user-agent": genericUserAgent } });
- html = html.body
+ html = await fetch(`https://soundcloud.com/${obj.author}/${obj.song}`, {
+ headers: {"user-agent": genericUserAgent}
+ }).then(async (r) => {return await r.text()}).catch(() => {return false});
}
+ if (!html) return { error: 'ErrorCouldntFetch'};
if (html.includes('')[0])
if (json["media"]["transcodings"]) {
let fileUrl = `${json.media.transcodings[0]["url"].replace("/hls", "/progressive")}?client_id=${services["soundcloud"]["clientid"]}&track_authorization=${json.track_authorization}`;
if (fileUrl.substring(0, 54) === "https://api-v2.soundcloud.com/media/soundcloud:tracks:") {
if (json.duration < maxAudioDuration) {
- let file = await got.get(fileUrl, { headers: { "user-agent": genericUserAgent } });
- file = JSON.parse(file.body).url
+ let file = await fetch(fileUrl).then(async (r) => {return (await r.json()).url}).catch(() => {return false});
+ if (!file) return { error: 'ErrorCouldntFetch' };
return {
urls: file,
audioFilename: `soundcloud_${json.id}`,
@@ -29,11 +30,11 @@ export default async function(obj) {
artist: json.user.username,
}
}
- } else return { error: loc(obj.lang, 'ErrorLengthAudioConvert', maxAudioDuration / 60000) }
+ } else return { error: ['ErrorLengthAudioConvert', maxAudioDuration / 60000] }
}
- } else return { error: loc(obj.lang, 'ErrorEmptyDownload') }
- } else return { error: loc(obj.lang, 'ErrorBrokenLink', 'soundcloud') }
+ } else return { error: 'ErrorEmptyDownload' }
+ } else return { error: ['ErrorBrokenLink', 'soundcloud'] }
} catch (e) {
- return { error: loc(obj.lang, 'ErrorBadFetch') };
+ return { error: 'ErrorBadFetch' };
}
}
diff --git a/src/modules/services/tiktok.js b/src/modules/services/tiktok.js
index ff851372..d38b8c5c 100644
--- a/src/modules/services/tiktok.js
+++ b/src/modules/services/tiktok.js
@@ -1,12 +1,10 @@
-import got from "got";
-import loc from "../../localization/manager.js";
import { genericUserAgent } from "../config.js";
let userAgent = genericUserAgent.split(' Chrome/1')[0]
let config = {
tiktok: {
short: "https://vt.tiktok.com/",
- api: "https://api2.musical.ly/aweme/v1/feed/?aweme_id={postId}&version_code=262&app_name=musical_ly&channel=App&device_id=null&os_version=14.4.2&device_platform=iphone&device_type=iPhone9®ion=US&carrier_region=US", // ill always find more endpoints lmfao
+ api: "https://api2.musical.ly/aweme/v1/feed/?aweme_id={postId}&version_code=262&app_name=musical_ly&channel=App&device_id=null&os_version=14.4.2&device_platform=iphone&device_type=iPhone9®ion=US&carrier_region=US",
},
douyin: {
short: "https://v.douyin.com/",
@@ -14,34 +12,46 @@ let config = {
}
}
function selector(j, h, id) {
- let t;
- switch (h) {
- case "tiktok":
- t = j["aweme_list"].filter((v) => { if (v["aweme_id"] == id) return true })
- break;
- case "douyin":
- t = j['item_list'].filter((v) => { if (v["aweme_id"] == id) return true })
- break;
- }
- if (t.length > 0) { return t[0] } else return false
+ if (j) {
+ let t;
+ switch (h) {
+ case "tiktok":
+ t = j["aweme_list"].filter((v) => { if (v["aweme_id"] == id) return true })
+ break;
+ case "douyin":
+ t = j['item_list'].filter((v) => { if (v["aweme_id"] == id) return true })
+ break;
+ }
+ if (t.length > 0) { return t[0] } else return false
+ } else return false
}
export default async function(obj) {
try {
if (!obj.postId) {
- let html = await got.get(`${config[obj.host]["short"]}${obj.id}`, { followRedirect: false, headers: { "user-agent": userAgent } });
- html = html.body;
- if (html.slice(0, 17) === '