api: clean url upon entry, not down the road

src/core/api.js

@@ -97,7 +97,7 @@ export function runAPI(express, app, gitCommit, gitBranch, __dirname) {
                     let chck = checkJSONPost(request);
                     if (!chck) throw new Error();
     
-                    j = await getJSON(chck["url"], lang, chck);
+                    j = await getJSON(chck.url, lang, chck);
                 } else {
                     j = apiJSON(0, {
                         t: !contentCon ? "invalid content type header" : loc(lang, 'ErrorNoLink')

src/modules/api.js

@@ -4,11 +4,10 @@ import { apiJSON } from "./sub/utils.js";
 import { errorUnsupported } from "./sub/errors.js";
 import loc from "../localization/manager.js";
 import match from "./processing/match.js";
-import { getHostIfValid, normalizeURL } from "./processing/url.js";
+import { getHostIfValid } from "./processing/url.js";
 
-export async function getJSON(originalURL, lang, obj) {
+export async function getJSON(url, lang, obj) {
     try {
-        const url = normalizeURL(decodeURIComponent(originalURL));
         const host = getHostIfValid(url);
 
         if (!host || !services[host].enabled) {

src/modules/processing/url.js

@@ -93,4 +93,4 @@ export function getHostIfValid(url) {
     if (!validSubdomain && !anySubdomainAllowed) return;
 
     return host.sld;
-}
+}

src/modules/sub/utils.js

@@ -1,3 +1,4 @@
+import { normalizeURL } from "../processing/url.js";
 import { createStream } from "../stream/manage.js";
 
 const apiVar = {
@@ -72,6 +73,7 @@ export function unicodeDecode(str) {
 }
 export function checkJSONPost(obj) {
     let def = {
+        url: normalizeURL(decodeURIComponent(obj.url)),
         vCodec: "h264",
         vQuality: "720",
         aFormat: "mp3",
@@ -101,7 +103,7 @@ export function checkJSONPost(obj) {
 
         if (def.dubLang)
             def.dubLang = verifyLanguageCode(obj.dubLang);
-        def.url = obj.url;
+
         return def
     } catch (e) {
         return false