remove enum, replace with string-only method

This commit is contained in:
ppc
2024-09-03 17:06:19 +01:00
parent 9fe0dcc35c
commit 153d3ff7ad
7 changed files with 50 additions and 110 deletions
+6 -19
View File
@@ -41,23 +41,10 @@ declare function generateCardNumber(): string;
*/
declare function validateCardId(id: string): boolean;
declare enum GameId {
/**
* Initial D The Arcade
*/
IDAC = "SDGT",
/**
* Chunithm (Paradise Lost)
*/
Chuni = "SDBT",
/**
* Chunithm NEW onwards
*/
Chusan = "SDHD",
ONGEKI = "SDDT",
maimaiDX = "SDEZ",
DivaFT = "SBZV"
}
declare function getGameName(id: GameId): "Initial D The Arcade" | "CHUNITHM" | "CHUNITHM (Paradise Lost)" | "O.N.G.E.K.I" | "maimai DX" | "Project DIVA Future Tone";
/**
* Get the game name from the game identifier (4-letter code)
* @param id
*/
declare function getGameName(id: string): string | null;
export { type AMCardInRequest, AMNET_API_VERSION, type AMServerConnectionInfo, type AMServerInfoResponse, CARD_ID_REGEX, GameId, fetchServerInfo, generateCardNumber, getGameName, performCardIn, validateCardId };
export { type AMCardInRequest, AMNET_API_VERSION, type AMServerConnectionInfo, type AMServerInfoResponse, CARD_ID_REGEX, fetchServerInfo, generateCardNumber, getGameName, performCardIn, validateCardId };
+6 -19
View File
@@ -41,23 +41,10 @@ declare function generateCardNumber(): string;
*/
declare function validateCardId(id: string): boolean;
declare enum GameId {
/**
* Initial D The Arcade
*/
IDAC = "SDGT",
/**
* Chunithm (Paradise Lost)
*/
Chuni = "SDBT",
/**
* Chunithm NEW onwards
*/
Chusan = "SDHD",
ONGEKI = "SDDT",
maimaiDX = "SDEZ",
DivaFT = "SBZV"
}
declare function getGameName(id: GameId): "Initial D The Arcade" | "CHUNITHM" | "CHUNITHM (Paradise Lost)" | "O.N.G.E.K.I" | "maimai DX" | "Project DIVA Future Tone";
/**
* Get the game name from the game identifier (4-letter code)
* @param id
*/
declare function getGameName(id: string): string | null;
export { type AMCardInRequest, AMNET_API_VERSION, type AMServerConnectionInfo, type AMServerInfoResponse, CARD_ID_REGEX, GameId, fetchServerInfo, generateCardNumber, getGameName, performCardIn, validateCardId };
export { type AMCardInRequest, AMNET_API_VERSION, type AMServerConnectionInfo, type AMServerInfoResponse, CARD_ID_REGEX, fetchServerInfo, generateCardNumber, getGameName, performCardIn, validateCardId };
+10 -20
View File
@@ -59,7 +59,6 @@ var src_exports = {};
__export(src_exports, {
AMNET_API_VERSION: () => AMNET_API_VERSION,
CARD_ID_REGEX: () => CARD_ID_REGEX,
GameId: () => GameId,
fetchServerInfo: () => fetchServerInfo,
generateCardNumber: () => generateCardNumber,
getGameName: () => getGameName,
@@ -123,36 +122,27 @@ function validateCardId(id) {
}
// src/gameIds.ts
var GameId = /* @__PURE__ */ ((GameId2) => {
GameId2["IDAC"] = "SDGT";
GameId2["Chuni"] = "SDBT";
GameId2["Chusan"] = "SDHD";
GameId2["ONGEKI"] = "SDDT";
GameId2["maimaiDX"] = "SDEZ";
GameId2["DivaFT"] = "SBZV";
return GameId2;
})(GameId || {});
function getGameName(id) {
switch (id) {
case "SDGT" /* IDAC */:
switch (id == null ? void 0 : id.toUpperCase()) {
case "SDGT":
return "Initial D The Arcade";
case "SDBT" /* Chuni */:
case "SDHD":
case "SDBT":
return "CHUNITHM";
case "SDHD" /* Chusan */:
return "CHUNITHM (Paradise Lost)";
case "SDDT" /* ONGEKI */:
return "O.N.G.E.K.I";
case "SDEZ" /* maimaiDX */:
case "SDDT":
return "O.N.G.E.K.I.";
case "SDEZ":
return "maimai DX";
case "SBZV" /* DivaFT */:
case "SBZV":
return "Project DIVA Future Tone";
default:
return null;
}
}
// Annotate the CommonJS export names for ESM import in node:
0 && (module.exports = {
AMNET_API_VERSION,
CARD_ID_REGEX,
GameId,
fetchServerInfo,
generateCardNumber,
getGameName,
+1 -1
View File
File diff suppressed because one or more lines are too long
+10 -19
View File
@@ -93,35 +93,26 @@ function validateCardId(id) {
}
// src/gameIds.ts
var GameId = /* @__PURE__ */ ((GameId2) => {
GameId2["IDAC"] = "SDGT";
GameId2["Chuni"] = "SDBT";
GameId2["Chusan"] = "SDHD";
GameId2["ONGEKI"] = "SDDT";
GameId2["maimaiDX"] = "SDEZ";
GameId2["DivaFT"] = "SBZV";
return GameId2;
})(GameId || {});
function getGameName(id) {
switch (id) {
case "SDGT" /* IDAC */:
switch (id == null ? void 0 : id.toUpperCase()) {
case "SDGT":
return "Initial D The Arcade";
case "SDBT" /* Chuni */:
case "SDHD":
case "SDBT":
return "CHUNITHM";
case "SDHD" /* Chusan */:
return "CHUNITHM (Paradise Lost)";
case "SDDT" /* ONGEKI */:
return "O.N.G.E.K.I";
case "SDEZ" /* maimaiDX */:
case "SDDT":
return "O.N.G.E.K.I.";
case "SDEZ":
return "maimai DX";
case "SBZV" /* DivaFT */:
case "SBZV":
return "Project DIVA Future Tone";
default:
return null;
}
}
export {
AMNET_API_VERSION,
CARD_ID_REGEX,
GameId,
fetchServerInfo,
generateCardNumber,
getGameName,
+1 -1
View File
@@ -1 +1 @@
{"version":3,"sources":["../src/api.ts","../src/card.ts","../src/gameIds.ts"],"sourcesContent":["/**\n * The latest version of the AMNet API this library supports\n */\nexport const AMNET_API_VERSION = 1;\n\nexport interface AMCardInRequest {\n cardId: string;\n}\n\n/**\n * Information needed to perform a request against an AMNet server\n */\nexport interface AMServerConnectionInfo {\n apiVersion: number;\n serverAddress: string;\n}\n\n/**\n * Received metadata from an AMNet server \n */\nexport interface AMServerInfoResponse extends AMServerConnectionInfo {\n serverName: string;\n gameId?: string | null | undefined;\n}\n\n/**\n * Performs the card-in request to the specified server\n * @param server The server to perform the request against\n * @param request The card-in request to send\n * @param signal The abort signal to use for the request\n */\nexport async function performCardIn(server: AMServerConnectionInfo, request: AMCardInRequest, signal: AbortSignal) {\n try {\n const response = await fetch(`${new URL(server.serverAddress).origin}/amnet/signin`, {\n method: \"POST\",\n headers: {\n \"Content-Type\": \"application/json\"\n },\n body: JSON.stringify(request),\n signal: signal\n });\n\n return response.ok;\n } catch {\n return false;\n }\n}\n\n/**\n * Attempts to connect to the specified server and fetch its info\n * @param serverAddress The origin address of the server to connect to\n * @param abort The abort signal to use for the request (for cancellation)\n */\nexport async function fetchServerInfo(serverAddress: string, abort: AbortSignal): Promise<AMServerInfoResponse | null> {\n try {\n const response = await fetch(`${new URL(serverAddress).origin}/amnet/info`, {\n signal: abort\n });\n\n return {\n ...await response.json(),\n serverAddress: serverAddress\n } satisfies AMServerInfoResponse;\n } catch {\n return null;\n }\n}\n","export const CARD_ID_REGEX = /^(?:[0-9]{4} ?){5}$/i;\n\nexport function generateCardNumber(): string {\n let cardId = '';\n\n while (true) {\n // don't start with a 3\n const firstDigit = Math.floor(Math.random() * 10);\n\n if (firstDigit !== 3) {\n cardId = firstDigit.toString();\n break;\n }\n }\n\n for (let i = 0; i < 19; i++) {\n cardId += Math.floor(Math.random() * 10).toString();\n }\n\n return cardId;\n}\n\n/**\n * Validates the provided card id by known parameters\n * @param id The card id to validate\n */\nexport function validateCardId(id: string): boolean {\n return id[0] !== '3' && CARD_ID_REGEX.test(id);\n}\n","export enum GameId {\n /**\n * Initial D The Arcade\n */\n IDAC = \"SDGT\",\n\n /**\n * Chunithm (Paradise Lost)\n */\n Chuni = \"SDBT\",\n\n /**\n * Chunithm NEW onwards\n */\n Chusan = \"SDHD\",\n\n ONGEKI = \"SDDT\",\n maimaiDX = \"SDEZ\",\n DivaFT = \"SBZV\"\n}\n\nexport function getGameName(id: GameId) {\n switch (id) {\n case GameId.IDAC:\n return \"Initial D The Arcade\";\n case GameId.Chuni:\n return \"CHUNITHM\";\n case GameId.Chusan:\n return \"CHUNITHM (Paradise Lost)\";\n case GameId.ONGEKI:\n return \"O.N.G.E.K.I\";\n case GameId.maimaiDX:\n return \"maimai DX\";\n case GameId.DivaFT:\n return \"Project DIVA Future Tone\";\n }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGO,IAAM,oBAAoB;AA4BjC,SAAsB,cAAc,QAAgC,SAA0B,QAAqB;AAAA;AAC/G,QAAI;AACA,YAAM,WAAW,MAAM,MAAM,GAAG,IAAI,IAAI,OAAO,aAAa,EAAE,MAAM,iBAAiB;AAAA,QACjF,QAAQ;AAAA,QACR,SAAS;AAAA,UACL,gBAAgB;AAAA,QACpB;AAAA,QACA,MAAM,KAAK,UAAU,OAAO;AAAA,QAC5B;AAAA,MACJ,CAAC;AAED,aAAO,SAAS;AAAA,IACpB,SAAQ;AACJ,aAAO;AAAA,IACX;AAAA,EACJ;AAAA;AAOA,SAAsB,gBAAgB,eAAuB,OAA0D;AAAA;AACnH,QAAI;AACA,YAAM,WAAW,MAAM,MAAM,GAAG,IAAI,IAAI,aAAa,EAAE,MAAM,eAAe;AAAA,QACxE,QAAQ;AAAA,MACZ,CAAC;AAED,aAAO,iCACA,MAAM,SAAS,KAAK,IADpB;AAAA,QAEH;AAAA,MACJ;AAAA,IACJ,SAAQ;AACJ,aAAO;AAAA,IACX;AAAA,EACJ;AAAA;;;AClEO,IAAM,gBAAgB;AAEtB,SAAS,qBAA6B;AACzC,MAAI,SAAS;AAEb,SAAO,MAAM;AAET,UAAM,aAAa,KAAK,MAAM,KAAK,OAAO,IAAI,EAAE;AAEhD,QAAI,eAAe,GAAG;AAClB,eAAS,WAAW,SAAS;AAC7B;AAAA,IACJ;AAAA,EACJ;AAEA,WAAS,IAAI,GAAG,IAAI,IAAI,KAAK;AACzB,cAAU,KAAK,MAAM,KAAK,OAAO,IAAI,EAAE,EAAE,SAAS;AAAA,EACtD;AAEA,SAAO;AACX;AAMO,SAAS,eAAe,IAAqB;AAChD,SAAO,GAAG,CAAC,MAAM,OAAO,cAAc,KAAK,EAAE;AACjD;;;AC5BO,IAAK,SAAL,kBAAKA,YAAL;AAIH,EAAAA,QAAA,UAAO;AAKP,EAAAA,QAAA,WAAQ;AAKR,EAAAA,QAAA,YAAS;AAET,EAAAA,QAAA,YAAS;AACT,EAAAA,QAAA,cAAW;AACX,EAAAA,QAAA,YAAS;AAlBD,SAAAA;AAAA,GAAA;AAqBL,SAAS,YAAY,IAAY;AACpC,UAAQ,IAAI;AAAA,IACR,KAAK;AACD,aAAO;AAAA,IACX,KAAK;AACD,aAAO;AAAA,IACX,KAAK;AACD,aAAO;AAAA,IACX,KAAK;AACD,aAAO;AAAA,IACX,KAAK;AACD,aAAO;AAAA,IACX,KAAK;AACD,aAAO;AAAA,EACf;AACJ;","names":["GameId"]}
{"version":3,"sources":["../src/api.ts","../src/card.ts","../src/gameIds.ts"],"sourcesContent":["/**\n * The latest version of the AMNet API this library supports\n */\nexport const AMNET_API_VERSION = 1;\n\nexport interface AMCardInRequest {\n cardId: string;\n}\n\n/**\n * Information needed to perform a request against an AMNet server\n */\nexport interface AMServerConnectionInfo {\n apiVersion: number;\n serverAddress: string;\n}\n\n/**\n * Received metadata from an AMNet server \n */\nexport interface AMServerInfoResponse extends AMServerConnectionInfo {\n serverName: string;\n gameId?: string | null | undefined;\n}\n\n/**\n * Performs the card-in request to the specified server\n * @param server The server to perform the request against\n * @param request The card-in request to send\n * @param signal The abort signal to use for the request\n */\nexport async function performCardIn(server: AMServerConnectionInfo, request: AMCardInRequest, signal: AbortSignal) {\n try {\n const response = await fetch(`${new URL(server.serverAddress).origin}/amnet/signin`, {\n method: \"POST\",\n headers: {\n \"Content-Type\": \"application/json\"\n },\n body: JSON.stringify(request),\n signal: signal\n });\n\n return response.ok;\n } catch {\n return false;\n }\n}\n\n/**\n * Attempts to connect to the specified server and fetch its info\n * @param serverAddress The origin address of the server to connect to\n * @param abort The abort signal to use for the request (for cancellation)\n */\nexport async function fetchServerInfo(serverAddress: string, abort: AbortSignal): Promise<AMServerInfoResponse | null> {\n try {\n const response = await fetch(`${new URL(serverAddress).origin}/amnet/info`, {\n signal: abort\n });\n\n return {\n ...await response.json(),\n serverAddress: serverAddress\n } satisfies AMServerInfoResponse;\n } catch {\n return null;\n }\n}\n","export const CARD_ID_REGEX = /^(?:[0-9]{4} ?){5}$/i;\n\nexport function generateCardNumber(): string {\n let cardId = '';\n\n while (true) {\n // don't start with a 3\n const firstDigit = Math.floor(Math.random() * 10);\n\n if (firstDigit !== 3) {\n cardId = firstDigit.toString();\n break;\n }\n }\n\n for (let i = 0; i < 19; i++) {\n cardId += Math.floor(Math.random() * 10).toString();\n }\n\n return cardId;\n}\n\n/**\n * Validates the provided card id by known parameters\n * @param id The card id to validate\n */\nexport function validateCardId(id: string): boolean {\n return id[0] !== '3' && CARD_ID_REGEX.test(id);\n}\n","/**\n * Get the game name from the game identifier (4-letter code)\n * @param id\n */\nexport function getGameName(id: string): string | null {\n switch (id?.toUpperCase()) {\n case \"SDGT\":\n return \"Initial D The Arcade\";\n case \"SDHD\":\n case \"SDBT\":\n return \"CHUNITHM\";\n case \"SDDT\":\n return \"O.N.G.E.K.I.\";\n case \"SDEZ\":\n return \"maimai DX\";\n case \"SBZV\":\n return \"Project DIVA Future Tone\";\n \n default:\n return null;\n }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGO,IAAM,oBAAoB;AA4BjC,SAAsB,cAAc,QAAgC,SAA0B,QAAqB;AAAA;AAC/G,QAAI;AACA,YAAM,WAAW,MAAM,MAAM,GAAG,IAAI,IAAI,OAAO,aAAa,EAAE,MAAM,iBAAiB;AAAA,QACjF,QAAQ;AAAA,QACR,SAAS;AAAA,UACL,gBAAgB;AAAA,QACpB;AAAA,QACA,MAAM,KAAK,UAAU,OAAO;AAAA,QAC5B;AAAA,MACJ,CAAC;AAED,aAAO,SAAS;AAAA,IACpB,SAAQ;AACJ,aAAO;AAAA,IACX;AAAA,EACJ;AAAA;AAOA,SAAsB,gBAAgB,eAAuB,OAA0D;AAAA;AACnH,QAAI;AACA,YAAM,WAAW,MAAM,MAAM,GAAG,IAAI,IAAI,aAAa,EAAE,MAAM,eAAe;AAAA,QACxE,QAAQ;AAAA,MACZ,CAAC;AAED,aAAO,iCACA,MAAM,SAAS,KAAK,IADpB;AAAA,QAEH;AAAA,MACJ;AAAA,IACJ,SAAQ;AACJ,aAAO;AAAA,IACX;AAAA,EACJ;AAAA;;;AClEO,IAAM,gBAAgB;AAEtB,SAAS,qBAA6B;AACzC,MAAI,SAAS;AAEb,SAAO,MAAM;AAET,UAAM,aAAa,KAAK,MAAM,KAAK,OAAO,IAAI,EAAE;AAEhD,QAAI,eAAe,GAAG;AAClB,eAAS,WAAW,SAAS;AAC7B;AAAA,IACJ;AAAA,EACJ;AAEA,WAAS,IAAI,GAAG,IAAI,IAAI,KAAK;AACzB,cAAU,KAAK,MAAM,KAAK,OAAO,IAAI,EAAE,EAAE,SAAS;AAAA,EACtD;AAEA,SAAO;AACX;AAMO,SAAS,eAAe,IAAqB;AAChD,SAAO,GAAG,CAAC,MAAM,OAAO,cAAc,KAAK,EAAE;AACjD;;;ACxBO,SAAS,YAAY,IAA2B;AACnD,UAAQ,yBAAI,eAAe;AAAA,IACvB,KAAK;AACD,aAAO;AAAA,IACX,KAAK;AAAA,IACL,KAAK;AACD,aAAO;AAAA,IACX,KAAK;AACD,aAAO;AAAA,IACX,KAAK;AACD,aAAO;AAAA,IACX,KAAK;AACD,aAAO;AAAA,IAEX;AACI,aAAO;AAAA,EACf;AACJ;","names":[]}
+16 -31
View File
@@ -1,37 +1,22 @@
export enum GameId {
/**
* Initial D The Arcade
*/
IDAC = "SDGT",
/**
* Chunithm (Paradise Lost)
*/
Chuni = "SDBT",
/**
* Chunithm NEW onwards
*/
Chusan = "SDHD",
ONGEKI = "SDDT",
maimaiDX = "SDEZ",
DivaFT = "SBZV"
}
export function getGameName(id: GameId) {
switch (id) {
case GameId.IDAC:
/**
* Get the game name from the game identifier (4-letter code)
* @param id
*/
export function getGameName(id: string): string | null {
switch (id?.toUpperCase()) {
case "SDGT":
return "Initial D The Arcade";
case GameId.Chuni:
case "SDHD":
case "SDBT":
return "CHUNITHM";
case GameId.Chusan:
return "CHUNITHM (Paradise Lost)";
case GameId.ONGEKI:
return "O.N.G.E.K.I";
case GameId.maimaiDX:
case "SDDT":
return "O.N.G.E.K.I.";
case "SDEZ":
return "maimai DX";
case GameId.DivaFT:
case "SBZV":
return "Project DIVA Future Tone";
default:
return null;
}
}