OpenNeo/impress-2020
OpenNeo/impress-2020
1
0
Fork 0
Code Pull requests Activity

Fix pet loading

Browse source 
Needed to add some headers to satisfy StackPath etc!

(Also, latest Prettier ran on this file for the first time, so a few
changes there too!)
This commit is contained in:
Emi Matchu 2023-11-06 13:23:41 -08:00
parent 74f6d112ee
commit c3a9c24d22
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/server/load-pet-data.js
View file

@ -7,10 +7,15 @@ async function neopetsAmfphpCall(methodName, args) {
"/" + "/" +
args.map(encodeURIComponent).join("/"); args.map(encodeURIComponent).join("/");
const res = await fetch(url); const res = await fetch(url, {
headers: {
"X-Requested-With": "XMLHttpRequest",
"User-Agent": "impress-2020 (https://impress-2020.openneo.net/)",
},
});
if (!res.ok) { if (!res.ok) {
throw new Error( throw new Error(
`[AMFPHP] HTTP request failed, got status ${res.status} ${res.statusText}` `[AMFPHP] HTTP request failed, got status ${res.status} ${res.statusText}`,
); );
} }
@ -31,7 +36,7 @@ export async function loadCustomPetData(petName) {
if (petName.match(/^[0-9]/)) { if (petName.match(/^[0-9]/)) {
const imageHash = await loadImageHashFromPetName(petName); const imageHash = await loadImageHashFromPetName(petName);
console.debug( console.debug(
`[loadCustomPetData] Converted pet name ${petName} to @${imageHash}` `[loadCustomPetData] Converted pet name ${petName} to @${imageHash}`,
); );
petName = "@" + imageHash; petName = "@" + imageHash;
} }
@ -51,7 +56,8 @@ export async function loadCustomPetData(petName) {
} }
} }
const PETS_CP_URL_PATTERN = /https?:\/\/pets\.neopets\.com\/cp\/([a-z0-9]+)\/[0-9]+\/[0-9]+\.png/; const PETS_CP_URL_PATTERN =
/https?:\/\/pets\.neopets\.com\/cp\/([a-z0-9]+)\/[0-9]+\/[0-9]+\.png/;
async function loadImageHashFromPetName(petName) { async function loadImageHashFromPetName(petName) {
const res = await fetch(`https://pets.neopets.com/cpn/${petName}/1/1.png`, { const res = await fetch(`https://pets.neopets.com/cpn/${petName}/1/1.png`, {
redirect: "manual", redirect: "manual",
@ -59,7 +65,7 @@ async function loadImageHashFromPetName(petName) {
if (res.status !== 302) { if (res.status !== 302) {
throw new Error( throw new Error(
`[loadImageHashFromPetName] expected /cpn/ URL to redirect with status ` + `[loadImageHashFromPetName] expected /cpn/ URL to redirect with status ` +
`302, but instead got status ${res.status} ${res.statusText}` `302, but instead got status ${res.status} ${res.statusText}`,
); );
} }
@ -68,7 +74,7 @@ async function loadImageHashFromPetName(petName) {
if (newUrlMatch == null) { if (newUrlMatch == null) {
throw new Error( throw new Error(
`[loadImageHashFromPetName] expected /cpn/ URL to redirect to a /cp/ ` + `[loadImageHashFromPetName] expected /cpn/ URL to redirect to a /cp/ ` +
`URL matching ${PETS_CP_URL_PATTERN}, but got ${newUrl}` `URL matching ${PETS_CP_URL_PATTERN}, but got ${newUrl}`,
); );
} }
@ -92,16 +98,16 @@ export async function loadNCMallPreviewImageHash(basicImageHash, itemIds) {
try { try {
console.error( console.error(
`[loadNCMallPreviewImageHash] ${res.status} ${res.statusText}:\n` + `[loadNCMallPreviewImageHash] ${res.status} ${res.statusText}:\n` +
(await res.text()) (await res.text()),
); );
} catch (error) { } catch (error) {
console.error( console.error(
`[loadNCMallPreviewImageHash] could not load response text for ` + `[loadNCMallPreviewImageHash] could not load response text for ` +
`NC Mall preview failed request: ${error.message}` `NC Mall preview failed request: ${error.message}`,
); );
} }
throw new Error( throw new Error(
`could not load NC Mall preview image hash: ${res.status} ${res.statusText}` `could not load NC Mall preview image hash: ${res.status} ${res.statusText}`,
); );
} }
@ -112,12 +118,12 @@ export async function loadNCMallPreviewImageHash(basicImageHash, itemIds) {
const data = JSON.parse(dataText); const data = JSON.parse(dataText);
if (data.success !== true) { if (data.success !== true) {
throw new Error( throw new Error(
`NC Mall preview returned non-success data: ${JSON.stringify(data)}` `NC Mall preview returned non-success data: ${JSON.stringify(data)}`,
); );
} }
if (!data.newsci) { if (!data.newsci) {
throw new Error( throw new Error(
`NC Mall preview returned no newsci field: ${JSON.stringify(data)}` `NC Mall preview returned no newsci field: ${JSON.stringify(data)}`,
); );
} }
return data.newsci; return data.newsci;