github/cobalt
1
0
Fork 0
mirror of https://github.com/imputnet/cobalt.git synced 2026-01-25 00:08:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: github:7a6977ec3551c244d23f6c657ce38d6e3719c433
Branches Tags
github:main
github:develop
github:temp-forced-yt-player
github:nicovideo
github:api-client
..
compare: github:d3ea80fdfe6eaa735220cf8d7975ed418adb5ffd
Branches Tags
github:develop
github:main
github:temp-forced-yt-player
github:nicovideo
github:api-client

No commits in common. "7a6977ec3551c244d23f6c657ce38d6e3719c433" and "d3ea80fdfe6eaa735220cf8d7975ed418adb5ffd" have entirely different histories.
7a6977ec35 ... d3ea80fdfe

6 changed files with 47 additions and 84 deletions
Show Stats Expand all files Collapse all files

2
api/src/processing/service-config.js
View File

@ -7,7 +7,6 @@ export const services = {
bilibili: {
patterns: [
"video/:comId",
"video/:comId?p=:partId",
"_shortLink/:comShortLink",
"_tv/:lang/video/:tvId",
"_tv/video/:tvId"
@ -166,7 +165,6 @@ export const services = {
twitch: {
patterns: [":channel/clip/:clip"],
tld: "tv",
subdomains: ["clips", "www", "m"],
},
twitter: {
patterns: [

87
api/src/processing/service-patterns.js
View File

@ -1,72 +1,53 @@
export const testers = {
"bilibili": pattern =>
(pattern.comId?.length <= 12 && pattern.partId?.length <= 3) ||
(pattern.comId?.length <= 12 && !pattern.partId) ||
pattern.comShortLink?.length <= 16 ||
pattern.tvId?.length <= 24,
"bsky": pattern =>
pattern.user?.length <= 128 && pattern.post?.length <= 128,
pattern.comId?.length <= 12 || pattern.comShortLink?.length <= 16
|| pattern.tvId?.length <= 24,
"dailymotion": pattern => pattern.id?.length <= 32,
"facebook": pattern =>
pattern.shortLink?.length <= 11 ||
pattern.username?.length <= 30 ||
pattern.caption?.length <= 255 ||
pattern.id?.length <= 20 && !pattern.shareType ||
pattern.id?.length <= 20 && pattern.shareType?.length === 1,
"instagram": pattern =>
pattern.postId?.length <= 48 ||
pattern.shareId?.length <= 16 ||
(pattern.username?.length <= 30 && pattern.storyId?.length <= 24),
pattern.postId?.length <= 48
|| pattern.shareId?.length <= 16
|| (pattern.username?.length <= 30 && pattern.storyId?.length <= 24),
"loom": pattern =>
pattern.id?.length <= 32,
"newgrounds": pattern =>
pattern.id?.length <= 12 ||
pattern.audioId?.length <= 12,
"ok": pattern =>
pattern.id?.length <= 16,
"pinterest": pattern =>
pattern.id?.length <= 128 ||
pattern.shortLink?.length <= 32,
pattern.id?.length <= 128 || pattern.shortLink?.length <= 32,
"reddit": pattern =>
pattern.id?.length <= 16 && !pattern.sub && !pattern.user ||
(pattern.sub?.length <= 22 && pattern.id?.length <= 16) ||
(pattern.user?.length <= 22 && pattern.id?.length <= 16) ||
(pattern.sub?.length <= 22 && pattern.shareId?.length <= 16) ||
(pattern.shortId?.length <= 16),
pattern.id?.length <= 16 && !pattern.sub && !pattern.user
|| (pattern.sub?.length <= 22 && pattern.id?.length <= 16)
|| (pattern.user?.length <= 22 && pattern.id?.length <= 16)
|| (pattern.sub?.length <= 22 && pattern.shareId?.length <= 16)
|| (pattern.shortId?.length <= 16),
"rutube": pattern =>
(pattern.id?.length === 32 && pattern.key?.length <= 32) ||
pattern.id?.length === 32 ||
pattern.yappyId?.length === 32,
"snapchat": pattern =>
(pattern.username?.length <= 32 && (!pattern.storyId || pattern.storyId?.length <= 255)) ||
pattern.spotlightId?.length <= 255 ||
pattern.shortLink?.length <= 16,
pattern.id?.length === 32 || pattern.yappyId?.length === 32,
"soundcloud": pattern =>
(pattern.author?.length <= 255 && pattern.song?.length <= 255) ||
pattern.shortLink?.length <= 32,
(pattern.author?.length <= 255 && pattern.song?.length <= 255)
|| pattern.shortLink?.length <= 32,
"snapchat": pattern =>
(pattern.username?.length <= 32 && (!pattern.storyId || pattern.storyId?.length <= 255))
|| pattern.spotlightId?.length <= 255
|| pattern.shortLink?.length <= 16,
"streamable": pattern =>
pattern.id?.length <= 6,
"tiktok": pattern =>
pattern.postId?.length <= 21 ||
pattern.shortLink?.length <= 21,
pattern.postId?.length <= 21 || pattern.shortLink?.length <= 21,
"tumblr": pattern =>
pattern.id?.length < 21 ||
(pattern.id?.length < 21 && pattern.user?.length <= 32),
pattern.id?.length < 21
|| (pattern.id?.length < 21 && pattern.user?.length <= 32),
"twitch": pattern =>
pattern.channel && pattern.clip?.length <= 100,
@ -75,16 +56,30 @@ export const testers = {
pattern.id?.length < 20,
"vimeo": pattern =>
pattern.id?.length <= 11 && (!pattern.password || pattern.password.length < 16),
pattern.id?.length <= 11
&& (!pattern.password || pattern.password.length < 16),
"vk": pattern =>
(pattern.ownerId?.length <= 10 && pattern.videoId?.length <= 10) ||
(pattern.ownerId?.length <= 10 && pattern.videoId?.length <= 10 && pattern.videoId?.accessKey <= 18),
"xiaohongshu": pattern =>
pattern.id?.length <= 24 && pattern.token?.length <= 64 ||
pattern.shareId?.length <= 24 && pattern.shareType?.length === 1,
"youtube": pattern =>
pattern.id?.length <= 11,
"facebook": pattern =>
pattern.shortLink?.length <= 11
|| pattern.username?.length <= 30
|| pattern.caption?.length <= 255
|| pattern.id?.length <= 20 && !pattern.shareType
|| pattern.id?.length <= 20 && pattern.shareType?.length === 1,
"bsky": pattern =>
pattern.user?.length <= 128 && pattern.post?.length <= 128,
"xiaohongshu": pattern =>
pattern.id?.length <= 24 && pattern.token?.length <= 64
|| pattern.shareId?.length <= 24 && pattern.shareType?.length === 1,
"newgrounds": pattern =>
pattern.id?.length <= 12 || pattern.audioId?.length <= 12,
}

23
api/src/processing/services/bilibili.js
View File

@ -17,14 +17,8 @@ function extractBestQuality(dashData) {
return [ bestVideo, bestAudio ];
}
async function com_download(id, partId) {
const url = new URL(`https://bilibili.com/video/${id}`);
if (partId) {
url.searchParams.set('p', partId);
}
const html = await fetch(url, {
async function com_download(id) {
const html = await fetch(`https://bilibili.com/video/${id}`, {
headers: {
"user-agent": genericUserAgent
}
@ -53,15 +47,10 @@ async function com_download(id, partId) {
return { error: "fetch.empty" };
}
let filenameBase = `bilibili_${id}`;
if (partId) {
filenameBase += `_${partId}`;
}
return {
urls: [video.baseUrl, audio.baseUrl],
audioFilename: `${filenameBase}_audio`,
filename: `${filenameBase}_${video.width}x${video.height}.mp4`,
audioFilename: `bilibili_${id}_audio`,
filename: `bilibili_${id}_${video.width}x${video.height}.mp4`,
};
}
@ -100,14 +89,14 @@ async function tv_download(id) {
};
}
export default async function({ comId, tvId, comShortLink, partId }) {
export default async function({ comId, tvId, comShortLink }) {
if (comShortLink) {
const patternMatch = await resolveRedirectingURL(`https://b23.tv/${comShortLink}`);
comId = patternMatch?.comId;
}
if (comId) {
return com_download(comId, partId);
return com_download(comId);
} else if (tvId) {
return tv_download(tvId);
}

1
api/src/processing/url.js
View File

@ -147,7 +147,6 @@ function cleanURL(url) {
limitQuery('v');
}
break;
case "bilibili":
case "rutube":
if (url.searchParams.get('p')) {
limitQuery('p');

9
api/src/util/tests/bilibili.json
View File

@ -56,14 +56,5 @@
"code": 200,
"status": "tunnel"
}
},
{
"name": "bilibili.com link with part id",
"url": "https://www.bilibili.com/video/BV1uo4y1K72s?spm_id_from=333.788.videopod.episodes&p=6",
"params": {},
"expected": {
"code": 200,
"status": "tunnel"
}
}
]

9
api/src/util/tests/twitch.json
View File

@ -29,14 +29,5 @@
"code": 200,
"status": "tunnel"
}
},
{
"name": "clip (mobile subdomain)",
"url": "https://m.twitch.tv/rtgame/clip/TubularInventiveSardineCorgiDerp-PM47mJQQ2vsL5B5G",
"params": {},
"expected": {
"code": 200,
"status": "redirect"
}
}
]