From b1a54fd1ff1ba679117bb1502db5aed4ec2b326f Mon Sep 17 00:00:00 2001 From: dumbmoron Date: Thu, 15 Feb 2024 14:51:50 +0000 Subject: [PATCH] all: move api into its own directory --- api/assets/favicon.ico | Bin 0 -> 9662 bytes {src => api}/config.json | 0 {src/modules => api/core}/config.js | 3 ++- src/core/api.js => api/core/endpoints.js | 8 ++++---- {src => api}/modules/build.js | 0 {src => api}/modules/buildStatic.js | 0 {src => api}/modules/changelog/changelog.json | 0 .../modules/changelog/changelogManager.js | 0 {src => api}/modules/emoji.js | 0 {src => api}/modules/pageRender/elements.js | 0 {src => api}/modules/pageRender/findRendered.js | 0 {src => api}/modules/pageRender/onDemand.js | 0 {src => api}/modules/pageRender/page.js | 0 {src => api}/modules/processing/cookie/cookie.js | 0 .../modules/processing/cookie/manager.js | 0 .../modules/processing/createFilename.js | 0 {src => api}/modules/processing/match.js | 0 .../modules/processing/matchActionDecider.js | 0 .../modules/processing/services/bilibili.js | 0 .../modules/processing/services/dailymotion.js | 0 .../modules/processing/services/instagram.js | 0 {src => api}/modules/processing/services/ok.js | 0 .../modules/processing/services/pinterest.js | 0 .../modules/processing/services/reddit.js | 0 .../modules/processing/services/rutube.js | 0 .../modules/processing/services/soundcloud.js | 0 .../modules/processing/services/streamable.js | 0 .../modules/processing/services/tiktok.js | 0 .../modules/processing/services/tumblr.js | 0 .../modules/processing/services/twitch.js | 0 .../modules/processing/services/twitter.js | 0 .../modules/processing/services/vimeo.js | 0 {src => api}/modules/processing/services/vine.js | 0 {src => api}/modules/processing/services/vk.js | 0 .../modules/processing/services/youtube.js | 0 .../modules/processing/servicesConfig.json | 0 .../modules/processing/servicesPatternTesters.js | 0 {src => api}/modules/processing/url.js | 0 {src => api}/modules/setup.js | 0 {src => api}/modules/stream/manage.js | 0 {src => api}/modules/stream/stream.js | 0 {src => api}/modules/stream/types.js | 0 .../sub => api/modules/util}/alias-envs.js | 0 .../sub => api/modules/util}/consoleText.js | 0 {src/modules/sub => api/modules/util}/crypto.js | 0 .../sub => api/modules/util}/currentCommit.js | 0 {src/modules/sub => api/modules/util}/errors.js | 0 .../sub => api/modules/util}/loadFromFs.js | 0 .../sub/utils.js => api/modules/util/misc.js | 0 src/modules/api.js => api/modules/util/preApi.js | 0 package.json => api/package.json | 0 src/cobalt.js => api/server.js | 0 52 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 api/assets/favicon.ico rename {src => api}/config.json (100%) rename {src/modules => api/core}/config.js (94%) rename src/core/api.js => api/core/endpoints.js (97%) rename {src => api}/modules/build.js (100%) rename {src => api}/modules/buildStatic.js (100%) rename {src => api}/modules/changelog/changelog.json (100%) rename {src => api}/modules/changelog/changelogManager.js (100%) rename {src => api}/modules/emoji.js (100%) rename {src => api}/modules/pageRender/elements.js (100%) rename {src => api}/modules/pageRender/findRendered.js (100%) rename {src => api}/modules/pageRender/onDemand.js (100%) rename {src => api}/modules/pageRender/page.js (100%) rename {src => api}/modules/processing/cookie/cookie.js (100%) rename {src => api}/modules/processing/cookie/manager.js (100%) rename {src => api}/modules/processing/createFilename.js (100%) rename {src => api}/modules/processing/match.js (100%) rename {src => api}/modules/processing/matchActionDecider.js (100%) rename {src => api}/modules/processing/services/bilibili.js (100%) rename {src => api}/modules/processing/services/dailymotion.js (100%) rename {src => api}/modules/processing/services/instagram.js (100%) rename {src => api}/modules/processing/services/ok.js (100%) rename {src => api}/modules/processing/services/pinterest.js (100%) rename {src => api}/modules/processing/services/reddit.js (100%) rename {src => api}/modules/processing/services/rutube.js (100%) rename {src => api}/modules/processing/services/soundcloud.js (100%) rename {src => api}/modules/processing/services/streamable.js (100%) rename {src => api}/modules/processing/services/tiktok.js (100%) rename {src => api}/modules/processing/services/tumblr.js (100%) rename {src => api}/modules/processing/services/twitch.js (100%) rename {src => api}/modules/processing/services/twitter.js (100%) rename {src => api}/modules/processing/services/vimeo.js (100%) rename {src => api}/modules/processing/services/vine.js (100%) rename {src => api}/modules/processing/services/vk.js (100%) rename {src => api}/modules/processing/services/youtube.js (100%) rename {src => api}/modules/processing/servicesConfig.json (100%) rename {src => api}/modules/processing/servicesPatternTesters.js (100%) rename {src => api}/modules/processing/url.js (100%) rename {src => api}/modules/setup.js (100%) rename {src => api}/modules/stream/manage.js (100%) rename {src => api}/modules/stream/stream.js (100%) rename {src => api}/modules/stream/types.js (100%) rename {src/modules/sub => api/modules/util}/alias-envs.js (100%) rename {src/modules/sub => api/modules/util}/consoleText.js (100%) rename {src/modules/sub => api/modules/util}/crypto.js (100%) rename {src/modules/sub => api/modules/util}/currentCommit.js (100%) rename {src/modules/sub => api/modules/util}/errors.js (100%) rename {src/modules/sub => api/modules/util}/loadFromFs.js (100%) rename src/modules/sub/utils.js => api/modules/util/misc.js (100%) rename src/modules/api.js => api/modules/util/preApi.js (100%) rename package.json => api/package.json (100%) rename src/cobalt.js => api/server.js (100%) diff --git a/api/assets/favicon.ico b/api/assets/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..1b08e4bb950906a1ac5b144997ccb290d21b1e8b GIT binary patch literal 9662 zcmeHKODJ|*7~bwlxr8I+eh!DC4`Cu@ppcMT2Fh`n8JWqLnNlWZGU8;wKvI-M2IMZ6 zC<7w~QX+Tn`JVNkXSIC)r_S%&=RbAY>uc||+iN}Rectzd-nG|fS$^)H%VoLmsn(yr zS=KL>W&Q5H+^?)Z+!x-f_N!&BhJU-hy-;^?-<`{efujLO1C9n94LBNbG~j69Zw>hS z`%6GTz?b6T3)YS^8F&W<1}g49$^|(3{i9f4xx*gTNJ~qTm6a8#t*zDZ#~6L`W{22< zf&y7xU6u0k@()=0&U0Yj|s;VmS^Yc@_VD7(> z53U~>87aHFyUI5Bzr4I?E_-`>(%jsvwFEBkgZz_{lH~mS+$(l{eO+p5YCia3#=tHe zVV$6$AZcxFm7Sd(#Rai6{Wv%{P~(_~`Sb(Np`oGD+1V+_$H!i=o12?bUth0tKrG|u zs~=d0Yhi7~3>siFb#-)fByDYN5*!??{D3Z~4fxj5(jr@1TiOp`sVl^$si{fNx6=>s zH+6xSU{6_CSkU%OKTb|gq`kdeLPA26A0`&Os;jG2J)1G0AN%|JDwouf89!fh0X*Uf z4qU6axL9UpW(54vP$T4WdU`5dU0q)N0KTlOOy=k3^?Vb1czF0Bm$YYBPd})w+}vE5 zn3&LYVb%w96&o9?YlB#FDJ(3M>FH_ZJA5#8g}p8!B0^zli#R)aaDld&6MXLwJ2dQ@ zPft%OzFApWnm_G&VsmnG^nL{#@z}$Gp$+1F?Xey>a2?hJ>>`HL)Ya9MBqSt!;NXd^ ztgMvfEG{l8 zEO5j=JUqzo@UYe$Z826~>9K~nm!zhq%J}%WiWvx)nnz7%XJ>!P8+w|Wn$moMMFaoI z$w|q`$k5oYa5XWWyklZwWN2te?(grFP1r`=q2b$5T3V`Y!(Y?~oy2>)hn@PoJ?4a*p|7VPVqO*C*H4*V;BUjy=Dzu~E&#T-Y}4M@2=+z`%gq z-rjzP#W@7u1adNQeCJD#_;q)83u*}soSE;-%S-9$>G|%P%Xs7b(A(Q9s9`kVh{bvx z9Uc1oM4x@(N-XV%hllHLzRCOU?oI{=2Li|2vU4$GzF(7|sRQk4j2P zG;h0W)0=(s9pdEeJZ#SS>=|{B3*$eVx5)|d{Azvqf;Blf&-U$YPAr{RIvQ{^;Ap_n SfTMx`g$CSdblQIvfxiHiNSp`& literal 0 HcmV?d00001 diff --git a/src/config.json b/api/config.json similarity index 100% rename from src/config.json rename to api/config.json diff --git a/src/modules/config.js b/api/core/config.js similarity index 94% rename from src/modules/config.js rename to api/core/config.js index 5e079536..0c3904e9 100644 --- a/src/modules/config.js +++ b/api/core/config.js @@ -1,5 +1,6 @@ import UrlPattern from "url-pattern"; -import { loadJSON } from "./sub/loadFromFs.js"; +import { loadJSON } from "../modules/util/loadFromFs.js"; + const config = loadJSON("./src/config.json"); const packageJson = loadJSON("./package.json"); const servicesConfigJson = loadJSON("./src/modules/processing/servicesConfig.json"); diff --git a/src/core/api.js b/api/core/endpoints.js similarity index 97% rename from src/core/api.js rename to api/core/endpoints.js index eda3c014..b08f4e4b 100644 --- a/src/core/api.js +++ b/api/core/endpoints.js @@ -4,10 +4,10 @@ import { randomBytes } from "crypto"; const ipSalt = randomBytes(64).toString('hex'); -import { version } from "../modules/config.js"; -import { getJSON } from "../modules/api.js"; -import { apiJSON, checkJSONPost, getIP, languageCode } from "../modules/sub/utils.js"; -import { Bright, Cyan } from "../modules/sub/consoleText.js"; +import { version } from "./config.js"; +import { getJSON } from "../modules/util/preApi.js"; +import { apiJSON, checkJSONPost, getIP, languageCode } from "../modules/util/misc.js"; +import { Bright, Cyan } from "../modules/util/consoleText.js"; import stream from "../modules/stream/stream.js"; import loc from "../localization/manager.js"; import { generateHmac } from "../modules/sub/crypto.js"; diff --git a/src/modules/build.js b/api/modules/build.js similarity index 100% rename from src/modules/build.js rename to api/modules/build.js diff --git a/src/modules/buildStatic.js b/api/modules/buildStatic.js similarity index 100% rename from src/modules/buildStatic.js rename to api/modules/buildStatic.js diff --git a/src/modules/changelog/changelog.json b/api/modules/changelog/changelog.json similarity index 100% rename from src/modules/changelog/changelog.json rename to api/modules/changelog/changelog.json diff --git a/src/modules/changelog/changelogManager.js b/api/modules/changelog/changelogManager.js similarity index 100% rename from src/modules/changelog/changelogManager.js rename to api/modules/changelog/changelogManager.js diff --git a/src/modules/emoji.js b/api/modules/emoji.js similarity index 100% rename from src/modules/emoji.js rename to api/modules/emoji.js diff --git a/src/modules/pageRender/elements.js b/api/modules/pageRender/elements.js similarity index 100% rename from src/modules/pageRender/elements.js rename to api/modules/pageRender/elements.js diff --git a/src/modules/pageRender/findRendered.js b/api/modules/pageRender/findRendered.js similarity index 100% rename from src/modules/pageRender/findRendered.js rename to api/modules/pageRender/findRendered.js diff --git a/src/modules/pageRender/onDemand.js b/api/modules/pageRender/onDemand.js similarity index 100% rename from src/modules/pageRender/onDemand.js rename to api/modules/pageRender/onDemand.js diff --git a/src/modules/pageRender/page.js b/api/modules/pageRender/page.js similarity index 100% rename from src/modules/pageRender/page.js rename to api/modules/pageRender/page.js diff --git a/src/modules/processing/cookie/cookie.js b/api/modules/processing/cookie/cookie.js similarity index 100% rename from src/modules/processing/cookie/cookie.js rename to api/modules/processing/cookie/cookie.js diff --git a/src/modules/processing/cookie/manager.js b/api/modules/processing/cookie/manager.js similarity index 100% rename from src/modules/processing/cookie/manager.js rename to api/modules/processing/cookie/manager.js diff --git a/src/modules/processing/createFilename.js b/api/modules/processing/createFilename.js similarity index 100% rename from src/modules/processing/createFilename.js rename to api/modules/processing/createFilename.js diff --git a/src/modules/processing/match.js b/api/modules/processing/match.js similarity index 100% rename from src/modules/processing/match.js rename to api/modules/processing/match.js diff --git a/src/modules/processing/matchActionDecider.js b/api/modules/processing/matchActionDecider.js similarity index 100% rename from src/modules/processing/matchActionDecider.js rename to api/modules/processing/matchActionDecider.js diff --git a/src/modules/processing/services/bilibili.js b/api/modules/processing/services/bilibili.js similarity index 100% rename from src/modules/processing/services/bilibili.js rename to api/modules/processing/services/bilibili.js diff --git a/src/modules/processing/services/dailymotion.js b/api/modules/processing/services/dailymotion.js similarity index 100% rename from src/modules/processing/services/dailymotion.js rename to api/modules/processing/services/dailymotion.js diff --git a/src/modules/processing/services/instagram.js b/api/modules/processing/services/instagram.js similarity index 100% rename from src/modules/processing/services/instagram.js rename to api/modules/processing/services/instagram.js diff --git a/src/modules/processing/services/ok.js b/api/modules/processing/services/ok.js similarity index 100% rename from src/modules/processing/services/ok.js rename to api/modules/processing/services/ok.js diff --git a/src/modules/processing/services/pinterest.js b/api/modules/processing/services/pinterest.js similarity index 100% rename from src/modules/processing/services/pinterest.js rename to api/modules/processing/services/pinterest.js diff --git a/src/modules/processing/services/reddit.js b/api/modules/processing/services/reddit.js similarity index 100% rename from src/modules/processing/services/reddit.js rename to api/modules/processing/services/reddit.js diff --git a/src/modules/processing/services/rutube.js b/api/modules/processing/services/rutube.js similarity index 100% rename from src/modules/processing/services/rutube.js rename to api/modules/processing/services/rutube.js diff --git a/src/modules/processing/services/soundcloud.js b/api/modules/processing/services/soundcloud.js similarity index 100% rename from src/modules/processing/services/soundcloud.js rename to api/modules/processing/services/soundcloud.js diff --git a/src/modules/processing/services/streamable.js b/api/modules/processing/services/streamable.js similarity index 100% rename from src/modules/processing/services/streamable.js rename to api/modules/processing/services/streamable.js diff --git a/src/modules/processing/services/tiktok.js b/api/modules/processing/services/tiktok.js similarity index 100% rename from src/modules/processing/services/tiktok.js rename to api/modules/processing/services/tiktok.js diff --git a/src/modules/processing/services/tumblr.js b/api/modules/processing/services/tumblr.js similarity index 100% rename from src/modules/processing/services/tumblr.js rename to api/modules/processing/services/tumblr.js diff --git a/src/modules/processing/services/twitch.js b/api/modules/processing/services/twitch.js similarity index 100% rename from src/modules/processing/services/twitch.js rename to api/modules/processing/services/twitch.js diff --git a/src/modules/processing/services/twitter.js b/api/modules/processing/services/twitter.js similarity index 100% rename from src/modules/processing/services/twitter.js rename to api/modules/processing/services/twitter.js diff --git a/src/modules/processing/services/vimeo.js b/api/modules/processing/services/vimeo.js similarity index 100% rename from src/modules/processing/services/vimeo.js rename to api/modules/processing/services/vimeo.js diff --git a/src/modules/processing/services/vine.js b/api/modules/processing/services/vine.js similarity index 100% rename from src/modules/processing/services/vine.js rename to api/modules/processing/services/vine.js diff --git a/src/modules/processing/services/vk.js b/api/modules/processing/services/vk.js similarity index 100% rename from src/modules/processing/services/vk.js rename to api/modules/processing/services/vk.js diff --git a/src/modules/processing/services/youtube.js b/api/modules/processing/services/youtube.js similarity index 100% rename from src/modules/processing/services/youtube.js rename to api/modules/processing/services/youtube.js diff --git a/src/modules/processing/servicesConfig.json b/api/modules/processing/servicesConfig.json similarity index 100% rename from src/modules/processing/servicesConfig.json rename to api/modules/processing/servicesConfig.json diff --git a/src/modules/processing/servicesPatternTesters.js b/api/modules/processing/servicesPatternTesters.js similarity index 100% rename from src/modules/processing/servicesPatternTesters.js rename to api/modules/processing/servicesPatternTesters.js diff --git a/src/modules/processing/url.js b/api/modules/processing/url.js similarity index 100% rename from src/modules/processing/url.js rename to api/modules/processing/url.js diff --git a/src/modules/setup.js b/api/modules/setup.js similarity index 100% rename from src/modules/setup.js rename to api/modules/setup.js diff --git a/src/modules/stream/manage.js b/api/modules/stream/manage.js similarity index 100% rename from src/modules/stream/manage.js rename to api/modules/stream/manage.js diff --git a/src/modules/stream/stream.js b/api/modules/stream/stream.js similarity index 100% rename from src/modules/stream/stream.js rename to api/modules/stream/stream.js diff --git a/src/modules/stream/types.js b/api/modules/stream/types.js similarity index 100% rename from src/modules/stream/types.js rename to api/modules/stream/types.js diff --git a/src/modules/sub/alias-envs.js b/api/modules/util/alias-envs.js similarity index 100% rename from src/modules/sub/alias-envs.js rename to api/modules/util/alias-envs.js diff --git a/src/modules/sub/consoleText.js b/api/modules/util/consoleText.js similarity index 100% rename from src/modules/sub/consoleText.js rename to api/modules/util/consoleText.js diff --git a/src/modules/sub/crypto.js b/api/modules/util/crypto.js similarity index 100% rename from src/modules/sub/crypto.js rename to api/modules/util/crypto.js diff --git a/src/modules/sub/currentCommit.js b/api/modules/util/currentCommit.js similarity index 100% rename from src/modules/sub/currentCommit.js rename to api/modules/util/currentCommit.js diff --git a/src/modules/sub/errors.js b/api/modules/util/errors.js similarity index 100% rename from src/modules/sub/errors.js rename to api/modules/util/errors.js diff --git a/src/modules/sub/loadFromFs.js b/api/modules/util/loadFromFs.js similarity index 100% rename from src/modules/sub/loadFromFs.js rename to api/modules/util/loadFromFs.js diff --git a/src/modules/sub/utils.js b/api/modules/util/misc.js similarity index 100% rename from src/modules/sub/utils.js rename to api/modules/util/misc.js diff --git a/src/modules/api.js b/api/modules/util/preApi.js similarity index 100% rename from src/modules/api.js rename to api/modules/util/preApi.js diff --git a/package.json b/api/package.json similarity index 100% rename from package.json rename to api/package.json diff --git a/src/cobalt.js b/api/server.js similarity index 100% rename from src/cobalt.js rename to api/server.js