Skip to content

Added itemdb, init cleanup #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ebm5025 merged 1 commit into from
Jan 23, 2026
Merged

Added itemdb, init cleanup #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions items.json
View file
Open in desktop

Large diffs are not rendered by default.

107 changes: 70 additions & 37 deletions src/services/openDkpService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,25 +160,33 @@ export const odkpCharacterCache = new LRUCache<string, ODKPCharacterData>({
ttl: 10 * MINUTES,
});

export let odkpItemDb: ODKPItemDbItem[] = [];

let accessTokens: IAccessTokenResult;

export const openDkpService = {
authenticate: async () => {
if (openDkpUsername && openDkpPassword && openDkpAuthClientId) {
openDkpService
.doUserPasswordAuth(
try {
await openDkpService.doUserPasswordAuth(
openDkpUsername,
openDkpPassword,
openDkpAuthClientId
)
.then(async () => {
console.log("Authenticated with OpenDKP");
await openDkpService.getCharacters();
await openDkpService.importData();
})
.catch((reason) => {
console.log("Failed to authenticate with OpenDKP: " + reason);
});
);
console.log("Authenticated with OpenDKP");
} catch (reason) {
console.log("Failed to authenticate OpenDKP: " + reason);
}
}
try {
console.log(`Loading OpenDKP data`);
await openDkpService.getCharacters();
await openDkpService.loadItemDb();
await openDkpService.importData();
console.log(`Done loading OpenDKP data`);
} catch (err: unknown) {
console.log(`Failed to load OpenDKP data`);
console.log(err);
}
},
doUserPasswordAuth: async (
Expand Down Expand Up @@ -212,6 +220,21 @@ export const openDkpService = {
console.log(JSON.stringify(error, null, 2));
}
},
loadItemDb: async (): Promise<void> => {
console.log(`Reading OpenDKP item database`);
try {
if (fs.existsSync("./items.json")) {
const data = await fs.readFileSync("./items.json", "utf-8");
odkpItemDb = JSON.parse(data);
console.log(`Loaded ${odkpItemDb.length} items`);
} else {
console.log(`No item file present`);
}
} catch (err: unknown) {
console.log("Failed to load item database");
console.log(err);
}
},
getCharacters: async (): Promise<ODKPCharacterData[]> => {
const config = {
method: "get",
Expand Down Expand Up @@ -261,6 +284,15 @@ export const openDkpService = {
},

getItemId: async (itemName: string): Promise<ODKPItemResponse> => {
const item = odkpItemDb.find((i) => i.Name === itemName);
if (item) {
return {
GameItemId: item.GameItemId,
ItemID: item.ItemId,
ItemName: item.Name,
};
}
console.log(`Item not in database, searching for ${itemName}`);
const config = {
method: "get",
url: `https://api.opendkp.com/items/autocomplete?item=${itemName}`,
Expand Down Expand Up @@ -610,33 +642,34 @@ export const openDkpService = {
throw err;
}
},
searchItem: async (itemName: string): Promise<ODKPItemResponse> => {
const getItem = {
method: "get",
url: "https://api.opendkp.com/items/autocomplete",
headers: {
Authorization: `${accessTokens.TokenType} ${accessTokens.IdToken}`,
},
params: {
item: encodeURIComponent(itemName),
game: 0,
},
} as AxiosRequestConfig;
// searchItem: async (itemName: string): Promise<ODKPItemResponse> => {
// const cleanItemName = decodeHtmlEntities(itemName);
// const getItem = {
// method: "get",
// url: "https://api.opendkp.com/items/autocomplete",
// headers: {
// Authorization: `${accessTokens.TokenType} ${accessTokens.IdToken}`,
// },
// params: {
// item: cleanItemName,
// game: 0,
// },
// } as AxiosRequestConfig;

try {
const resp = await axios(getItem);
const itemResp = resp.data as ODKPItemResponse[];
if (itemResp.length > 0) {
console.log(JSON.stringify(itemResp));
return itemResp[0];
} else {
throw new Error("No item found");
}
} catch (err: unknown) {
console.log(err);
throw err;
}
},
// try {
// const resp = await axios(getItem);
// const itemResp = resp.data as ODKPItemResponse[];
// if (itemResp.length > 0) {
// console.log(JSON.stringify(itemResp));
// return itemResp[0];
// } else {
// throw new Error("No item found");
// }
// } catch (err: unknown) {
// console.log(err);
// throw err;
// }
// },
getRaid: async (raidId: number): Promise<ODKPRaidData> => {
const getRaid = {
method: "get",
Expand Down