diff --git a/amnet-native/app/ServerCardIn.tsx b/amnet-native/app/ServerCardIn.tsx index f60b69e..9eebe84 100644 --- a/amnet-native/app/ServerCardIn.tsx +++ b/amnet-native/app/ServerCardIn.tsx @@ -147,10 +147,9 @@ export default function ServerCardIn({route, navigation}) { const cardInCallback = useCallback(() => { setCardInCompleted(false); - const cardId = selectedCard.physicalCardData && server.preferredCardIdFormat === "idm" ? icCard0008Number(selectedCard.physicalCardData.cardIDm) : selectedCard.code; const abortController = new AbortController(); - performCardIn(server, {cardId}, abortController.signal).then(r => { + performCardIn(server, {cardId: selectedCard.code, physicalCardIDm: selectedCard.physicalCardData?.cardIDm ?? undefined}, abortController.signal).then(r => { const now = new Date(); realm.write(() => { server.lastUsed = now; @@ -178,10 +177,10 @@ export default function ServerCardIn({route, navigation}) { setCardInCompleted(false); - const cardId = server.preferredCardIdFormat === "idm" || card.type !== ICType.Amusement ? icCard0008Number(card.idm) : card.accessCode; + const cardId = card.type !== ICType.Amusement ? icCard0008Number(card.idm) : card.accessCode; const abortController = new AbortController(); - performCardIn(server, {cardId}, abortController.signal).then(r => { + performCardIn(server, {cardId, physicalCardIDm: card.idm}, abortController.signal).then(r => { setCardInCompleted(r); }).catch(() => { setCardInCompleted(false); diff --git a/amnet-shared/dist/index.d.mts b/amnet-shared/dist/index.d.mts index 167d216..b6fea5e 100644 --- a/amnet-shared/dist/index.d.mts +++ b/amnet-shared/dist/index.d.mts @@ -8,6 +8,7 @@ declare const AMNET_API_VERSION = 1; declare const MIN_AMNET_API_VERSION = 1; interface AMCardInRequest { cardId: string; + physicalCardIDm?: string; } /** * Server connection info (api version, address, etc.) @@ -30,13 +31,10 @@ interface AMServerInstanceMetrics { timeSinceLastPoll?: number; sessionUptime?: number; } -interface AMServerPhysicalCardPreferences { - preferredCardIdFormat?: "idm" | "access" | null; -} /** * The response from an AMNet server's info endpoint */ -type AMServerInfo = AMServerMetadata & AMServerConnectionInfo & AMServerInstanceMetrics & AMServerPhysicalCardPreferences; +type AMServerInfo = AMServerMetadata & AMServerConnectionInfo & AMServerInstanceMetrics; /** * Performs the card-in request to the specified server * @param server The server to perform the request against @@ -65,4 +63,4 @@ declare function validateCardId(id: string): boolean; */ declare function getGameName(id: string): string | null; -export { type AMCardInRequest, AMNET_API_VERSION, type AMServerConnectionInfo, type AMServerInfo, type AMServerInstanceMetrics, type AMServerMetadata, type AMServerPhysicalCardPreferences, CARD_ID_REGEX, MIN_AMNET_API_VERSION, fetchServerInfo, generateCardNumber, getGameName, performCardIn, validateCardId }; +export { type AMCardInRequest, AMNET_API_VERSION, type AMServerConnectionInfo, type AMServerInfo, type AMServerInstanceMetrics, type AMServerMetadata, CARD_ID_REGEX, MIN_AMNET_API_VERSION, fetchServerInfo, generateCardNumber, getGameName, performCardIn, validateCardId }; diff --git a/amnet-shared/dist/index.d.ts b/amnet-shared/dist/index.d.ts index 167d216..b6fea5e 100644 --- a/amnet-shared/dist/index.d.ts +++ b/amnet-shared/dist/index.d.ts @@ -8,6 +8,7 @@ declare const AMNET_API_VERSION = 1; declare const MIN_AMNET_API_VERSION = 1; interface AMCardInRequest { cardId: string; + physicalCardIDm?: string; } /** * Server connection info (api version, address, etc.) @@ -30,13 +31,10 @@ interface AMServerInstanceMetrics { timeSinceLastPoll?: number; sessionUptime?: number; } -interface AMServerPhysicalCardPreferences { - preferredCardIdFormat?: "idm" | "access" | null; -} /** * The response from an AMNet server's info endpoint */ -type AMServerInfo = AMServerMetadata & AMServerConnectionInfo & AMServerInstanceMetrics & AMServerPhysicalCardPreferences; +type AMServerInfo = AMServerMetadata & AMServerConnectionInfo & AMServerInstanceMetrics; /** * Performs the card-in request to the specified server * @param server The server to perform the request against @@ -65,4 +63,4 @@ declare function validateCardId(id: string): boolean; */ declare function getGameName(id: string): string | null; -export { type AMCardInRequest, AMNET_API_VERSION, type AMServerConnectionInfo, type AMServerInfo, type AMServerInstanceMetrics, type AMServerMetadata, type AMServerPhysicalCardPreferences, CARD_ID_REGEX, MIN_AMNET_API_VERSION, fetchServerInfo, generateCardNumber, getGameName, performCardIn, validateCardId }; +export { type AMCardInRequest, AMNET_API_VERSION, type AMServerConnectionInfo, type AMServerInfo, type AMServerInstanceMetrics, type AMServerMetadata, CARD_ID_REGEX, MIN_AMNET_API_VERSION, fetchServerInfo, generateCardNumber, getGameName, performCardIn, validateCardId }; diff --git a/amnet-shared/dist/index.js.map b/amnet-shared/dist/index.js.map index 9359f8f..1827b1f 100644 --- a/amnet-shared/dist/index.js.map +++ b/amnet-shared/dist/index.js.map @@ -1 +1 @@ -{"version":3,"sources":["../src/index.ts","../src/api.ts","../src/card.ts","../src/gameIds.ts"],"sourcesContent":["export * from './api';\nexport * from './card';\nexport * from './gameIds';","/**\n * The latest version of the AMNet API this library supports\n */\nexport const AMNET_API_VERSION = 1;\n\n/**\n * The minimum version of the AMNet API this library supports\n */\nexport const MIN_AMNET_API_VERSION = 1;\n\nexport interface AMCardInRequest {\n cardId: string;\n}\n\n/**\n * Server connection info (api version, address, etc.)\n */\nexport interface AMServerConnectionInfo {\n apiVersion: number;\n serverAddress: string;\n}\n\n/**\n * User-definable server metadata\n */\nexport interface AMServerMetadata {\n serverName: string;\n gameId?: string | null | undefined;\n}\n\n/**\n * Metrics about the current game session\n */\nexport interface AMServerInstanceMetrics {\n timeSinceLastPoll?: number;\n sessionUptime?: number;\n}\n\nexport interface AMServerPhysicalCardPreferences {\n preferredCardIdFormat?: \"idm\" | \"access\" | null;\n}\n\n/**\n * The response from an AMNet server's info endpoint\n */\nexport type AMServerInfo = AMServerMetadata & AMServerConnectionInfo & AMServerInstanceMetrics & AMServerPhysicalCardPreferences;\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): Promise {\n if (server.apiVersion < MIN_AMNET_API_VERSION || server.apiVersion > AMNET_API_VERSION) {\n throw new Error(\"Unsupported server API version\");\n }\n \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 {\n try {\n const response = await fetch(`${new URL(serverAddress).origin}/amnet/info`, {\n signal: abort\n });\n \n if (!response.ok) {\n return null;\n }\n\n return {\n ...await response.json(),\n serverAddress: serverAddress\n } satisfies AMServerMetadata;\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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACGO,IAAM,oBAAoB;AAK1B,IAAM,wBAAwB;AA6CrC,SAAsB,cAAc,QAAgC,SAA0B,QAAuC;AAAA;AACjI,QAAI,OAAO,aAAa,yBAAyB,OAAO,aAAa,mBAAmB;AACpF,YAAM,IAAI,MAAM,gCAAgC;AAAA,IACpD;AAEA,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,OAAkD;AAAA;AAC3G,QAAI;AACA,YAAM,WAAW,MAAM,MAAM,GAAG,IAAI,IAAI,aAAa,EAAE,MAAM,eAAe;AAAA,QACxE,QAAQ;AAAA,MACZ,CAAC;AAED,UAAI,CAAC,SAAS,IAAI;AACd,eAAO;AAAA,MACX;AAEA,aAAO,iCACA,MAAM,SAAS,KAAK,IADpB;AAAA,QAEH;AAAA,MACJ;AAAA,IACJ,SAAQ;AACJ,aAAO;AAAA,IACX;AAAA,EACJ;AAAA;;;AChGO,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":[]} \ No newline at end of file +{"version":3,"sources":["../src/index.ts","../src/api.ts","../src/card.ts","../src/gameIds.ts"],"sourcesContent":["export * from './api';\r\nexport * from './card';\r\nexport * from './gameIds';","/**\r\n * The latest version of the AMNet API this library supports\r\n */\r\nexport const AMNET_API_VERSION = 1;\r\n\r\n/**\r\n * The minimum version of the AMNet API this library supports\r\n */\r\nexport const MIN_AMNET_API_VERSION = 1;\r\n\r\nexport interface AMCardInRequest {\r\n cardId: string;\r\n physicalCardIDm?: string;\r\n}\r\n\r\n/**\r\n * Server connection info (api version, address, etc.)\r\n */\r\nexport interface AMServerConnectionInfo {\r\n apiVersion: number;\r\n serverAddress: string;\r\n}\r\n\r\n/**\r\n * User-definable server metadata\r\n */\r\nexport interface AMServerMetadata {\r\n serverName: string;\r\n gameId?: string | null | undefined;\r\n}\r\n\r\n/**\r\n * Metrics about the current game session\r\n */\r\nexport interface AMServerInstanceMetrics {\r\n timeSinceLastPoll?: number;\r\n sessionUptime?: number;\r\n}\r\n\r\n/**\r\n * The response from an AMNet server's info endpoint\r\n */\r\nexport type AMServerInfo = AMServerMetadata & AMServerConnectionInfo & AMServerInstanceMetrics;\r\n\r\n/**\r\n * Performs the card-in request to the specified server\r\n * @param server The server to perform the request against\r\n * @param request The card-in request to send\r\n * @param signal The abort signal to use for the request\r\n */\r\nexport async function performCardIn(server: AMServerConnectionInfo, request: AMCardInRequest, signal: AbortSignal): Promise {\r\n if (server.apiVersion < MIN_AMNET_API_VERSION || server.apiVersion > AMNET_API_VERSION) {\r\n throw new Error(\"Unsupported server API version\");\r\n }\r\n\r\n try {\r\n const response = await fetch(`${new URL(server.serverAddress).origin}/amnet/signin`, {\r\n method: \"POST\",\r\n headers: {\r\n \"Content-Type\": \"application/json\"\r\n },\r\n body: JSON.stringify(request),\r\n signal: signal\r\n });\r\n\r\n return response.ok;\r\n } catch {\r\n return false;\r\n }\r\n}\r\n\r\n/**\r\n * Attempts to connect to the specified server and fetch its info\r\n * @param serverAddress The origin address of the server to connect to\r\n * @param abort The abort signal to use for the request (for cancellation)\r\n */\r\nexport async function fetchServerInfo(serverAddress: string, abort: AbortSignal): Promise {\r\n try {\r\n const response = await fetch(`${new URL(serverAddress).origin}/amnet/info`, {\r\n signal: abort\r\n });\r\n\r\n if (!response.ok) {\r\n return null;\r\n }\r\n\r\n return {\r\n ...await response.json(),\r\n serverAddress: serverAddress\r\n } satisfies AMServerMetadata;\r\n } catch {\r\n return null;\r\n }\r\n}\r\n","export const CARD_ID_REGEX = /^(?:[0-9]{4} ?){5}$/i;\r\n\r\nexport function generateCardNumber(): string {\r\n let cardId = '';\r\n\r\n while (true) {\r\n // don't start with a 3\r\n const firstDigit = Math.floor(Math.random() * 10);\r\n\r\n if (firstDigit !== 3) {\r\n cardId = firstDigit.toString();\r\n break;\r\n }\r\n }\r\n\r\n for (let i = 0; i < 19; i++) {\r\n cardId += Math.floor(Math.random() * 10).toString();\r\n }\r\n\r\n return cardId;\r\n}\r\n\r\n/**\r\n * Validates the provided card id by known parameters\r\n * @param id The card id to validate\r\n */\r\nexport function validateCardId(id: string): boolean {\r\n return id[0] !== '3' && CARD_ID_REGEX.test(id);\r\n}\r\n","/**\r\n * Get the game name from the game identifier (4-letter code)\r\n * @param id\r\n */\r\nexport function getGameName(id: string): string | null {\r\n switch (id?.toUpperCase()) {\r\n case \"SDGT\":\r\n return \"Initial D The Arcade\";\r\n case \"SDHD\":\r\n case \"SDBT\":\r\n return \"CHUNITHM\";\r\n case \"SDDT\":\r\n return \"O.N.G.E.K.I.\";\r\n case \"SDEZ\":\r\n return \"maimai DX\";\r\n case \"SBZV\":\r\n return \"Project DIVA Future Tone\";\r\n \r\n default:\r\n return null;\r\n }\r\n}\r\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACGO,IAAM,oBAAoB;AAK1B,IAAM,wBAAwB;AA0CrC,SAAsB,cAAc,QAAgC,SAA0B,QAAuC;AAAA;AACjI,QAAI,OAAO,aAAa,yBAAyB,OAAO,aAAa,mBAAmB;AACpF,YAAM,IAAI,MAAM,gCAAgC;AAAA,IACpD;AAEA,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,OAAkD;AAAA;AAC3G,QAAI;AACA,YAAM,WAAW,MAAM,MAAM,GAAG,IAAI,IAAI,aAAa,EAAE,MAAM,eAAe;AAAA,QACxE,QAAQ;AAAA,MACZ,CAAC;AAED,UAAI,CAAC,SAAS,IAAI;AACd,eAAO;AAAA,MACX;AAEA,aAAO,iCACA,MAAM,SAAS,KAAK,IADpB;AAAA,QAEH;AAAA,MACJ;AAAA,IACJ,SAAQ;AACJ,aAAO;AAAA,IACX;AAAA,EACJ;AAAA;;;AC7FO,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":[]} \ No newline at end of file diff --git a/amnet-shared/dist/index.mjs.map b/amnet-shared/dist/index.mjs.map index 697ec06..a316ce2 100644 --- a/amnet-shared/dist/index.mjs.map +++ b/amnet-shared/dist/index.mjs.map @@ -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\n/**\n * The minimum version of the AMNet API this library supports\n */\nexport const MIN_AMNET_API_VERSION = 1;\n\nexport interface AMCardInRequest {\n cardId: string;\n}\n\n/**\n * Server connection info (api version, address, etc.)\n */\nexport interface AMServerConnectionInfo {\n apiVersion: number;\n serverAddress: string;\n}\n\n/**\n * User-definable server metadata\n */\nexport interface AMServerMetadata {\n serverName: string;\n gameId?: string | null | undefined;\n}\n\n/**\n * Metrics about the current game session\n */\nexport interface AMServerInstanceMetrics {\n timeSinceLastPoll?: number;\n sessionUptime?: number;\n}\n\nexport interface AMServerPhysicalCardPreferences {\n preferredCardIdFormat?: \"idm\" | \"access\" | null;\n}\n\n/**\n * The response from an AMNet server's info endpoint\n */\nexport type AMServerInfo = AMServerMetadata & AMServerConnectionInfo & AMServerInstanceMetrics & AMServerPhysicalCardPreferences;\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): Promise {\n if (server.apiVersion < MIN_AMNET_API_VERSION || server.apiVersion > AMNET_API_VERSION) {\n throw new Error(\"Unsupported server API version\");\n }\n \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 {\n try {\n const response = await fetch(`${new URL(serverAddress).origin}/amnet/info`, {\n signal: abort\n });\n \n if (!response.ok) {\n return null;\n }\n\n return {\n ...await response.json(),\n serverAddress: serverAddress\n } satisfies AMServerMetadata;\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;AAK1B,IAAM,wBAAwB;AA6CrC,SAAsB,cAAc,QAAgC,SAA0B,QAAuC;AAAA;AACjI,QAAI,OAAO,aAAa,yBAAyB,OAAO,aAAa,mBAAmB;AACpF,YAAM,IAAI,MAAM,gCAAgC;AAAA,IACpD;AAEA,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,OAAkD;AAAA;AAC3G,QAAI;AACA,YAAM,WAAW,MAAM,MAAM,GAAG,IAAI,IAAI,aAAa,EAAE,MAAM,eAAe;AAAA,QACxE,QAAQ;AAAA,MACZ,CAAC;AAED,UAAI,CAAC,SAAS,IAAI;AACd,eAAO;AAAA,MACX;AAEA,aAAO,iCACA,MAAM,SAAS,KAAK,IADpB;AAAA,QAEH;AAAA,MACJ;AAAA,IACJ,SAAQ;AACJ,aAAO;AAAA,IACX;AAAA,EACJ;AAAA;;;AChGO,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":[]} \ No newline at end of file +{"version":3,"sources":["../src/api.ts","../src/card.ts","../src/gameIds.ts"],"sourcesContent":["/**\r\n * The latest version of the AMNet API this library supports\r\n */\r\nexport const AMNET_API_VERSION = 1;\r\n\r\n/**\r\n * The minimum version of the AMNet API this library supports\r\n */\r\nexport const MIN_AMNET_API_VERSION = 1;\r\n\r\nexport interface AMCardInRequest {\r\n cardId: string;\r\n physicalCardIDm?: string;\r\n}\r\n\r\n/**\r\n * Server connection info (api version, address, etc.)\r\n */\r\nexport interface AMServerConnectionInfo {\r\n apiVersion: number;\r\n serverAddress: string;\r\n}\r\n\r\n/**\r\n * User-definable server metadata\r\n */\r\nexport interface AMServerMetadata {\r\n serverName: string;\r\n gameId?: string | null | undefined;\r\n}\r\n\r\n/**\r\n * Metrics about the current game session\r\n */\r\nexport interface AMServerInstanceMetrics {\r\n timeSinceLastPoll?: number;\r\n sessionUptime?: number;\r\n}\r\n\r\n/**\r\n * The response from an AMNet server's info endpoint\r\n */\r\nexport type AMServerInfo = AMServerMetadata & AMServerConnectionInfo & AMServerInstanceMetrics;\r\n\r\n/**\r\n * Performs the card-in request to the specified server\r\n * @param server The server to perform the request against\r\n * @param request The card-in request to send\r\n * @param signal The abort signal to use for the request\r\n */\r\nexport async function performCardIn(server: AMServerConnectionInfo, request: AMCardInRequest, signal: AbortSignal): Promise {\r\n if (server.apiVersion < MIN_AMNET_API_VERSION || server.apiVersion > AMNET_API_VERSION) {\r\n throw new Error(\"Unsupported server API version\");\r\n }\r\n\r\n try {\r\n const response = await fetch(`${new URL(server.serverAddress).origin}/amnet/signin`, {\r\n method: \"POST\",\r\n headers: {\r\n \"Content-Type\": \"application/json\"\r\n },\r\n body: JSON.stringify(request),\r\n signal: signal\r\n });\r\n\r\n return response.ok;\r\n } catch {\r\n return false;\r\n }\r\n}\r\n\r\n/**\r\n * Attempts to connect to the specified server and fetch its info\r\n * @param serverAddress The origin address of the server to connect to\r\n * @param abort The abort signal to use for the request (for cancellation)\r\n */\r\nexport async function fetchServerInfo(serverAddress: string, abort: AbortSignal): Promise {\r\n try {\r\n const response = await fetch(`${new URL(serverAddress).origin}/amnet/info`, {\r\n signal: abort\r\n });\r\n\r\n if (!response.ok) {\r\n return null;\r\n }\r\n\r\n return {\r\n ...await response.json(),\r\n serverAddress: serverAddress\r\n } satisfies AMServerMetadata;\r\n } catch {\r\n return null;\r\n }\r\n}\r\n","export const CARD_ID_REGEX = /^(?:[0-9]{4} ?){5}$/i;\r\n\r\nexport function generateCardNumber(): string {\r\n let cardId = '';\r\n\r\n while (true) {\r\n // don't start with a 3\r\n const firstDigit = Math.floor(Math.random() * 10);\r\n\r\n if (firstDigit !== 3) {\r\n cardId = firstDigit.toString();\r\n break;\r\n }\r\n }\r\n\r\n for (let i = 0; i < 19; i++) {\r\n cardId += Math.floor(Math.random() * 10).toString();\r\n }\r\n\r\n return cardId;\r\n}\r\n\r\n/**\r\n * Validates the provided card id by known parameters\r\n * @param id The card id to validate\r\n */\r\nexport function validateCardId(id: string): boolean {\r\n return id[0] !== '3' && CARD_ID_REGEX.test(id);\r\n}\r\n","/**\r\n * Get the game name from the game identifier (4-letter code)\r\n * @param id\r\n */\r\nexport function getGameName(id: string): string | null {\r\n switch (id?.toUpperCase()) {\r\n case \"SDGT\":\r\n return \"Initial D The Arcade\";\r\n case \"SDHD\":\r\n case \"SDBT\":\r\n return \"CHUNITHM\";\r\n case \"SDDT\":\r\n return \"O.N.G.E.K.I.\";\r\n case \"SDEZ\":\r\n return \"maimai DX\";\r\n case \"SBZV\":\r\n return \"Project DIVA Future Tone\";\r\n \r\n default:\r\n return null;\r\n }\r\n}\r\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGO,IAAM,oBAAoB;AAK1B,IAAM,wBAAwB;AA0CrC,SAAsB,cAAc,QAAgC,SAA0B,QAAuC;AAAA;AACjI,QAAI,OAAO,aAAa,yBAAyB,OAAO,aAAa,mBAAmB;AACpF,YAAM,IAAI,MAAM,gCAAgC;AAAA,IACpD;AAEA,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,OAAkD;AAAA;AAC3G,QAAI;AACA,YAAM,WAAW,MAAM,MAAM,GAAG,IAAI,IAAI,aAAa,EAAE,MAAM,eAAe;AAAA,QACxE,QAAQ;AAAA,MACZ,CAAC;AAED,UAAI,CAAC,SAAS,IAAI;AACd,eAAO;AAAA,MACX;AAEA,aAAO,iCACA,MAAM,SAAS,KAAK,IADpB;AAAA,QAEH;AAAA,MACJ;AAAA,IACJ,SAAQ;AACJ,aAAO;AAAA,IACX;AAAA,EACJ;AAAA;;;AC7FO,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":[]} \ No newline at end of file diff --git a/amnet-shared/src/api.ts b/amnet-shared/src/api.ts index acfb88c..5a2a64e 100644 --- a/amnet-shared/src/api.ts +++ b/amnet-shared/src/api.ts @@ -10,6 +10,7 @@ export const MIN_AMNET_API_VERSION = 1; export interface AMCardInRequest { cardId: string; + physicalCardIDm?: string; } /** @@ -36,14 +37,10 @@ export interface AMServerInstanceMetrics { sessionUptime?: number; } -export interface AMServerPhysicalCardPreferences { - preferredCardIdFormat?: "idm" | "access" | null; -} - /** * The response from an AMNet server's info endpoint */ -export type AMServerInfo = AMServerMetadata & AMServerConnectionInfo & AMServerInstanceMetrics & AMServerPhysicalCardPreferences; +export type AMServerInfo = AMServerMetadata & AMServerConnectionInfo & AMServerInstanceMetrics; /** * Performs the card-in request to the specified server @@ -55,7 +52,7 @@ export async function performCardIn(server: AMServerConnectionInfo, request: AMC if (server.apiVersion < MIN_AMNET_API_VERSION || server.apiVersion > AMNET_API_VERSION) { throw new Error("Unsupported server API version"); } - + try { const response = await fetch(`${new URL(server.serverAddress).origin}/amnet/signin`, { method: "POST", @@ -82,7 +79,7 @@ export async function fetchServerInfo(serverAddress: string, abort: AbortSignal) const response = await fetch(`${new URL(serverAddress).origin}/amnet/info`, { signal: abort }); - + if (!response.ok) { return null; }