Max/zkldi_Tachi
1
0
Fork 0
mirror of https://github.com/zkldi/Tachi.git synced 2026-10-08 14:58:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make all ARC/FLO/EAG/MIN properties optional.

Browse Source
This commit is contained in:
zkldi
2021-10-23 01:53:00 +01:00
parent 1b3cb091e8
commit efc2698bbd
4 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/lib/score-import/import-types/api/arc-iidx/parser.ts
+6
View File
@@ -15,6 +15,12 @@ export async function ParseArcIIDX(
): Promise<ParserFunctionReturns<unknown, EmptyObject>> {
const authDoc = await GetArcAuthGuaranteed(userID, "api/arc-iidx", logger);
if (!ServerConfig.ARC_AUTH_TOKEN || !ServerConfig.ARC_API_URL) {
throw new Error(
`Cannot parse ArcIIDX withouth ARC_API_URL and ARC_AUTH_TOKEN being defined.`
);
}
return {
iterable: TraverseKaiAPI(
ServerConfig.ARC_API_URL,
server/src/lib/score-import/import-types/api/arc-sdvx/parser.ts
+6
View File
@@ -14,6 +14,12 @@ export async function ParseArcSDVX(
): Promise<ParserFunctionReturns<unknown, EmptyObject>> {
const authDoc = await GetArcAuthGuaranteed(userID, "api/arc-sdvx", logger);
if (!ServerConfig.ARC_AUTH_TOKEN || !ServerConfig.ARC_API_URL) {
throw new Error(
`Cannot parse ArcSDVX withouth ARC_API_URL and ARC_AUTH_TOKEN being defined.`
);
}
return {
iterable: TraverseKaiAPI(
ServerConfig.ARC_API_URL,
server/src/lib/score-import/import-types/common/api-kai/utils.ts
+9
View File
@@ -2,10 +2,19 @@ import { ServerConfig } from "lib/setup/config";
export function KaiTypeToBaseURL(kaiType: "FLO" | "EAG" | "MIN") {
if (kaiType === "FLO") {
if (!ServerConfig.FLO_API_URL) {
throw new Error(`Got kaiType FLO, but no API_URL was defined?`);
}
return ServerConfig.FLO_API_URL;
} else if (kaiType === "EAG") {
if (!ServerConfig.EAG_API_URL) {
throw new Error(`Got kaiType EAG, but no API_URL was defined?`);
}
return ServerConfig.EAG_API_URL;
} else if (kaiType === "MIN") {
if (!ServerConfig.MIN_API_URL) {
throw new Error(`Got kaiType MIN, but no API_URL was defined?`);
}
return ServerConfig.MIN_API_URL;
}
server/src/lib/setup/config.ts
+10 -10
View File
@@ -48,14 +48,14 @@ export interface TachiConfig {
LOG_LEVEL: "debug" | "verbose" | "info" | "warn" | "error" | "severe" | "crit";
CAPTCHA_SECRET_KEY: string;
SESSION_SECRET: string;
FLO_API_URL: string;
EAG_API_URL: string;
MIN_API_URL: string;
ARC_API_URL: string;
FLO_API_URL?: string;
EAG_API_URL?: string;
MIN_API_URL?: string;
ARC_API_URL?: string;
FLO_OAUTH2_INFO?: OAuth2Info;
EAG_OAUTH2_INFO?: OAuth2Info;
MIN_OAUTH2_INFO?: OAuth2Info;
ARC_AUTH_TOKEN: string;
ARC_AUTH_TOKEN?: string;
TYPE: "ktchi" | "btchi" | "omni";
ENABLE_SERVER_HTTPS?: boolean;
RUN_OWN_CDN?: boolean;
@@ -87,14 +87,14 @@ const err = p(config, {
LOG_LEVEL: p.isIn("debug", "verbose", "info", "warn", "error", "severe", "crit"),
CAPTCHA_SECRET_KEY: "string",
SESSION_SECRET: "string",
FLO_API_URL: isValidURL,
EAG_API_URL: isValidURL,
MIN_API_URL: isValidURL,
ARC_API_URL: isValidURL,
FLO_API_URL: p.optional(isValidURL),
EAG_API_URL: p.optional(isValidURL),
MIN_API_URL: p.optional(isValidURL),
ARC_API_URL: p.optional(isValidURL),
FLO_OAUTH2_INFO: isValidOauth2,
EAG_OAUTH2_INFO: isValidOauth2,
MIN_OAUTH2_INFO: isValidOauth2,
ARC_AUTH_TOKEN: "string",
ARC_AUTH_TOKEN: "*string",
ENABLE_SERVER_HTTPS: "*boolean",
RUN_OWN_CDN: "*boolean",
CLIENT_DEV_SERVER: "*?string",