diff --git a/src/cobalt.js b/src/cobalt.js
index fe3179af..c5cd68e3 100644
--- a/src/cobalt.js
+++ b/src/cobalt.js
@@ -12,7 +12,7 @@ import renderPage from "./modules/pageRender.js";
import { apiJSON, languageCode } from "./modules/sub/utils.js";
import { Bright, Cyan } from "./modules/sub/consoleText.js";
import stream from "./modules/stream/stream.js";
-import loc from "./localization/manager.js";
+import loc, { loadLoc } from "./localization/manager.js";
import { buildFront } from "./modules/build.js";
const commitHash = shortCommit();
diff --git a/src/front/cobalt.css b/src/front/cobalt.css
index 0eb55e34..36f6ece4 100644
--- a/src/front/cobalt.css
+++ b/src/front/cobalt.css
@@ -2,6 +2,7 @@
--transparent: rgba(0, 0, 0, 0);
--without-padding: calc(100% - 4rem);
--border-15: 0.15rem solid var(--accent);
+ --font-mono: 'Noto Sans Mono', 'Consolas', 'SF Mono', monospace;
}
@media (prefers-color-scheme: dark) {
:root {
@@ -44,7 +45,7 @@ body {
margin: 0;
background: var(--background);
color: var(--accent);
- font-family: 'Noto Sans Mono', 'Consolas', 'SF Mono', monospace;
+ font-family: var(--font-mono);
user-select: none;
-webkit-tap-highlight-color: var(--transparent);
overflow: hidden;
@@ -89,7 +90,7 @@ a {
button {
background: none;
border: none;
- font-family: 'Noto Sans Mono', 'Consolas', 'SF Mono', monospace;
+ font-family: var(--font-mono);
color: var(--accent);
font-size: 0.9rem;
}
@@ -130,7 +131,7 @@ input[type="checkbox"] {
font-size: 1rem;
}
.mono {
- font-family: 'Noto Sans Mono', 'Consolas', 'SF Mono', monospace;
+ font-family: var(--font-mono);
}
.center {
top: 50%;
@@ -169,13 +170,13 @@ input[type="checkbox"] {
color: var(--accent);
border: 0;
float: right;
- border-bottom: 0.1rem solid var(--accent-unhover);
+ border-bottom: 0.15rem solid var(--accent-unhover);
transition: border-bottom 0.2s;
outline: none;
}
#url-input-area:focus {
outline: none;
- border-bottom: 0.1rem solid var(--accent);
+ border-bottom: var(--border-15);
}
#download-button {
height: 2.5rem;
@@ -334,7 +335,7 @@ input[type="checkbox"] {
align-content: center;
padding: 0.6rem;
padding-right: 1rem;
- border: 0.1rem solid;
+ border: var(--border-15);
width: auto;
margin: 0 0.5rem 0.5rem 0;
}
@@ -364,8 +365,8 @@ input[type="checkbox"] {
color: var(--accent-unhover-2);
}
.switch {
- border-top: solid 0.1rem var(--accent);
- border-bottom: solid 0.1rem var(--accent);
+ border-top: var(--border-15);
+ border-bottom: var(--border-15);
padding: 0.8rem;
width: 100%;
text-align: center;
@@ -376,13 +377,13 @@ input[type="checkbox"] {
cursor: pointer;
}
.switch.full {
- border: solid 0.1rem var(--accent);
+ border: var(--border-15);
}
.switch.left {
- border-left: solid 0.1rem var(--accent);
+ border-left: var(--border-15);
}
.switch.right {
- border-right: solid 0.1rem var(--accent);
+ border-right: var(--border-15);
}
.switch.space-right {
margin-right: 1rem
diff --git a/src/front/cobalt.js b/src/front/cobalt.js
index 682c13ca..45bdcd99 100644
--- a/src/front/cobalt.js
+++ b/src/front/cobalt.js
@@ -41,7 +41,7 @@ function changeDownloadButton(action, text) {
break;
}
}
-document.addEventListener("keydown", function(event) {
+document.addEventListener("keydown", function (event) {
if (event.key == "Tab") {
eid("download-button").value = '>>'
eid("download-button").style.padding = '0 1rem'
@@ -81,7 +81,7 @@ function popup(type, action, text) {
case "download":
if (action == 1) {
eid("pd-download").href = text;
- eid("pd-copy").setAttribute("onClick", `copy('pd-copy', '${text}')` );
+ eid("pd-copy").setAttribute("onClick", `copy('pd-copy', '${text}')`);
}
eid("popup-download").style.visibility = vis(action);
break;
@@ -200,4 +200,4 @@ eid("url-input-area").addEventListener("keyup", (event) => {
if (event.key === 'Enter') {
eid("download-button").click();
}
-})
+})
\ No newline at end of file
diff --git a/src/localization/languages/id.json b/src/localization/languages/id.json
index 61ce8ae7..e49c71cf 100644
--- a/src/localization/languages/id.json
+++ b/src/localization/languages/id.json
@@ -1,5 +1,5 @@
{
- "name": "bahasa indonesia",
+ "name": "indonesia",
"code": "id",
"substrings": {
"ContactLink": "beri tau saya"
diff --git a/src/localization/manager.js b/src/localization/manager.js
index 95b502dd..996be019 100644
--- a/src/localization/manager.js
+++ b/src/localization/manager.js
@@ -3,6 +3,7 @@ import { appName, repo } from "../modules/config.js";
import loadJson from "../modules/sub/loadJSON.js";
const locPath = './src/localization/languages'
+
let loc = {}
export async function loadLoc() {
diff --git a/src/modules/config.js b/src/modules/config.js
index 49c80071..b25e473f 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -3,7 +3,7 @@ const config = loadJson("./src/config.json");
const packageJson = loadJson("./package.json");
export const
-services = loadJson("./src/modules/services/_config.json"),
+services = loadJson("./src/modules/servicesConfig.json"),
appName = packageJson.name,
version = packageJson.version,
streamLifespan = config.streamLifespan,
diff --git a/src/modules/match.js b/src/modules/match.js
index c6cae0a5..e1836213 100644
--- a/src/modules/match.js
+++ b/src/modules/match.js
@@ -1,6 +1,8 @@
import { apiJSON } from "./sub/utils.js";
import { errorUnsupported, genericError } from "./sub/errors.js";
+import { testers } from "./servicesPatternTesters.js";
+
import bilibili from "./services/bilibili.js";
import reddit from "./services/reddit.js";
import twitter from "./services/twitter.js";
@@ -12,120 +14,108 @@ import tumblr from "./services/tumblr.js";
export default async function (host, patternMatch, url, ip, lang, format, quality) {
try {
+ if (!testers[host]) return apiJSON(0, { t: errorUnsupported(lang) });
+ if (!(testers[host](patternMatch))) throw Error();
+
+ let r;
switch (host) {
case "twitter":
- if (patternMatch["id"] && patternMatch["id"].length < 20) {
- let r = await twitter({
- id: patternMatch["id"],
- lang: lang
- });
- return (!r.error) ? apiJSON(1, { u: r.split('?')[0] }) : apiJSON(0, { t: r.error })
- } else throw Error()
+ r = await twitter({
+ id: patternMatch["id"],
+ lang: lang
+ });
+ return (!r.error) ? apiJSON(1, { u: r.split('?')[0] }) : apiJSON(0, { t: r.error });
+
case "vk":
- if (patternMatch["userId"] && patternMatch["videoId"] &&
- patternMatch["userId"].length <= 10 && patternMatch["videoId"].length == 9) {
- let r = await vk({
- userId: patternMatch["userId"],
- videoId: patternMatch["videoId"],
- lang: lang, quality: quality
- });
- return (!r.error) ? apiJSON(2,
- { type: "bridge", lang: lang, u: r.url, filename:
- r.filename, service: host, ip: ip, salt: process.env.streamSalt }) : apiJSON(0, { t: r.error });
- } else throw Error()
+ r = await vk({
+ userId: patternMatch["userId"],
+ videoId: patternMatch["videoId"],
+ lang: lang, quality: quality
+ });
+ return (!r.error) ? apiJSON(2, { type: "bridge", lang: lang, u: r.url, filename: r.filename,
+ service: host, ip: ip, salt: process.env.streamSalt }) : apiJSON(0, { t: r.error });
+
case "bilibili":
- if (patternMatch["id"] && patternMatch["id"].length >= 12) {
- let r = await bilibili({
- id: patternMatch["id"].slice(0, 12),
- lang: lang
- });
- return (!r.error) ? apiJSON(2, {
- type: "render", u: r.urls, lang: lang,
- service: host, ip: ip,
- filename: r.filename,
- salt: process.env.streamSalt, time: r.time
- }) : apiJSON(0, { t: r.error });
- } else throw Error()
+ r = await bilibili({
+ id: patternMatch["id"].slice(0, 12),
+ lang: lang
+ });
+ return (!r.error) ? apiJSON(2, {
+ type: "render", u: r.urls, lang: lang,
+ service: host, ip: ip,
+ filename: r.filename,
+ salt: process.env.streamSalt, time: r.time
+ }) : apiJSON(0, { t: r.error });
+
case "youtube":
- if (patternMatch["id"] && patternMatch["id"].length >= 11) {
- let fetchInfo = {
- id: patternMatch["id"].slice(0,11),
- lang: lang, quality: quality,
- format: "mp4"
- };
- if (url.match('music.youtube.com')) {
- format = "audio"
- }
- switch (format) {
- case "webm":
- fetchInfo["format"] = "webm";
- break;
- case "audio":
- fetchInfo["format"] = "webm";
- fetchInfo["isAudioOnly"] = true;
- fetchInfo["quality"] = "max";
- break;
- }
- let r = await youtube(fetchInfo);
- return (!r.error) ? apiJSON(2, {
- type: r.type, u: r.urls, lang: lang, service: host, ip: ip,
- filename: r.filename, salt: process.env.streamSalt,
- isAudioOnly: fetchInfo["isAudioOnly"] ? fetchInfo["isAudioOnly"] : false,
- time: r.time,
- }) : apiJSON(0, { t: r.error });
- } else throw Error()
+ let fetchInfo = {
+ id: patternMatch["id"].slice(0,11),
+ lang: lang, quality: quality,
+ format: "mp4"
+ };
+ if (url.match('music.youtube.com')) {
+ format = "audio"
+ }
+ switch (format) {
+ case "webm":
+ fetchInfo["format"] = "webm";
+ break;
+ case "audio":
+ fetchInfo["format"] = "webm";
+ fetchInfo["isAudioOnly"] = true;
+ fetchInfo["quality"] = "max";
+ break;
+ }
+ r = await youtube(fetchInfo);
+ return (!r.error) ? apiJSON(2, {
+ type: r.type, u: r.urls, lang: lang, service: host, ip: ip,
+ filename: r.filename, salt: process.env.streamSalt,
+ isAudioOnly: fetchInfo["isAudioOnly"] ? fetchInfo["isAudioOnly"] : false,
+ time: r.time,
+ }) : apiJSON(0, { t: r.error });
+
case "reddit":
- if (patternMatch["sub"] && patternMatch["id"] && patternMatch["title"] &&
- patternMatch["sub"].length <= 22 && patternMatch["id"].length <= 10 && patternMatch["title"].length <= 96) {
- let r = await reddit({
- sub: patternMatch["sub"],
- id: patternMatch["id"],
- title: patternMatch["title"], lang: lang,
- });
- return (!r.error) ? apiJSON(r.typeId, {
- type: r.type, u: r.urls, lang: lang,
- service: host, ip: ip,
- filename: r.filename, salt: process.env.streamSalt
- }) : apiJSON(0, { t: r.error });
- } else throw Error()
+ r = await reddit({
+ sub: patternMatch["sub"],
+ id: patternMatch["id"],
+ title: patternMatch["title"], lang: lang,
+ });
+ return (!r.error) ? apiJSON(r.typeId, {
+ type: r.type, u: r.urls, lang: lang,
+ service: host, ip: ip,
+ filename: r.filename, salt: process.env.streamSalt
+ }) : apiJSON(0, { t: r.error });
+
case "tiktok":
- if ((patternMatch["user"] && patternMatch["postId"] && patternMatch["postId"].length <= 21) ||
- (patternMatch["id"] && patternMatch["id"].length <= 13)) {
- let r = await tiktok({
- postId: patternMatch["postId"],
- id: patternMatch["id"], lang: lang,
- });
- return (!r.error) ? apiJSON(2, {
- type: "bridge", u: r.urls, lang: lang,
- service: host, ip: ip,
- filename: r.filename, salt: process.env.streamSalt
- }) : apiJSON(0, { t: r.error });
- } else throw Error()
+ r = await tiktok({
+ postId: patternMatch["postId"],
+ id: patternMatch["id"], lang: lang,
+ });
+ return (!r.error) ? apiJSON(2, {
+ type: "bridge", u: r.urls, lang: lang,
+ service: host, ip: ip,
+ filename: r.filename, salt: process.env.streamSalt
+ }) : apiJSON(0, { t: r.error });
+
case "douyin":
- if ((patternMatch["postId"] && patternMatch["postId"].length <= 21) ||
- (patternMatch["id"] && patternMatch["id"].length <= 13)) {
- let r = await douyin({
- postId: patternMatch["postId"],
- id: patternMatch["id"], lang: lang,
- });
- return (!r.error) ? apiJSON(2, {
- type: "bridge", u: r.urls, lang: lang,
- service: host, ip: ip,
- filename: r.filename, salt: process.env.streamSalt
- }) : apiJSON(0, { t: r.error });
- } else throw Error()
+ r = await douyin({
+ postId: patternMatch["postId"],
+ id: patternMatch["id"], lang: lang,
+ });
+ return (!r.error) ? apiJSON(2, {
+ type: "bridge", u: r.urls, lang: lang,
+ service: host, ip: ip,
+ filename: r.filename, salt: process.env.streamSalt
+ }) : apiJSON(0, { t: r.error });
+
case "tumblr":
- if ((patternMatch["id"] && patternMatch["id"].length < 21) ||
- (patternMatch["id"] && patternMatch["id"].length < 21 &&
- patternMatch["user"] && patternMatch["user"].length <= 32)) {
- let r = await tumblr({
- id: patternMatch["id"], url: url, user: patternMatch["user"] ? patternMatch["user"] : false,
- lang: lang
- });
- return (!r.error) ? apiJSON(1, { u: r.split('?')[0] }) : apiJSON(0, { t: r.error })
- } else throw Error()
+ r = await tumblr({
+ id: patternMatch["id"], url: url, user: patternMatch["user"] ? patternMatch["user"] : false,
+ lang: lang
+ });
+ return (!r.error) ? apiJSON(1, { u: r.split('?')[0] }) : apiJSON(0, { t: r.error });
default:
- return apiJSON(0, { t: errorUnsupported(lang) })
+ return apiJSON(0, { t: errorUnsupported(lang) });
}
} catch (e) {
return apiJSON(0, { t: genericError(lang, host) })
diff --git a/src/modules/pageRender.js b/src/modules/pageRender.js
index ec445503..25b78dcb 100644
--- a/src/modules/pageRender.js
+++ b/src/modules/pageRender.js
@@ -2,7 +2,9 @@ import { services, appName, authorInfo, version, quality, repo, donations } from
import { getCommitInfo } from "./sub/currentCommit.js";
import loc from "../localization/manager.js";
-let s = services
+let s = services;
+let com = getCommitInfo();
+
let enabledServices = Object.keys(s).filter((p) => {
if (s[p].enabled) {
return true
@@ -19,8 +21,6 @@ let donate = ``
for (let i in donations) {
donate += `${i} (REPLACEME)
${donations[i]}
`
}
-
-let com = getCommitInfo();
export default function(obj) {
let isIOS = obj.useragent.toLowerCase().match("iphone os")
try {
@@ -196,7 +196,7 @@ export default function(obj) {
-