kol.js 0.1.5 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kol.js",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "main": "src/index.ts",
   "type": "module",
   "files": [
@@ -13,12 +13,12 @@
     "format": "prettier --write ."
   },
   "devDependencies": {
-    "prettier": "^3.3.2",
-    "typescript": "^5.5.3",
-    "vitest": "^1.6.0"
+    "prettier": "^3.3.3",
+    "typescript": "^5.6.2",
+    "vitest": "^2.1.0"
   },
   "dependencies": {
-    "@xmldom/xmldom": "^0.8.10",
+    "@xmldom/xmldom": "^0.9.2",
     "async-mutex": "^0.5.0",
     "date-fns": "^3.6.0",
     "got": "^14.4.2",
@@ -29,7 +29,6 @@
     "tough-cookie": "^5.0.0",
     "ts-dedent": "^2.2.0",
     "typed-emitter": "^2.1.0",
-    "typescript-memoize": "^1.1.1",
     "xpath": "^0.0.34"
   }
 }

package/src/Client.ts

@@ -16,7 +16,6 @@ import {
 import { PlayerCache } from "./Cache.js";
 import { CookieJar } from "tough-cookie";
 import got, { OptionsOfJSONResponseBody, OptionsOfTextResponseBody } from "got";
-import { Memoize } from "typescript-memoize";
 
 type TypedEmitter<T extends EventMap> = TypedEventEmitter.default<T>;
 
@@ -356,9 +355,9 @@ export class Client extends (EventEmitter as unknown as new () => TypedEmitter<E
         : minPrice
       : minPrice;
     const formattedMinPrice = minPrice
-      ? (minPrice === unlimitedPrice
+      ? ((minPrice === unlimitedPrice
           ? unlimitedMatch?.[1]
-          : limitedMatch?.[1]) ?? ""
+          : limitedMatch?.[1]) ?? "")
       : "";
     return {
       mallPrice: unlimitedPrice,
@@ -512,14 +511,18 @@ export class Client extends (EventEmitter as unknown as new () => TypedEmitter<E
     return familiars;
   }
 
-  @Memoize()
+  static #descIdToIdCache: Map<number, number> = new Map();
+
   async descIdToId(descId: number): Promise<number> {
+    if (Client.#descIdToIdCache.has(descId)) return Client.#descIdToIdCache.get(descId)!;
     const page = await this.fetchText("desc_item.php", {
       searchParams: {
         whichitem: descId,
       },
     });
-    return Number(page.match(/<!-- itemid: (\d+) -->/)?.[1] ?? -1);
+    const id = Number(page.match(/<!-- itemid: (\d+) -->/)?.[1] ?? -1);
+    Client.#descIdToIdCache.set(descId, id);
+    return id;
   }
 
   async getRaffle() {

package/src/utils/leaderboard.ts

@@ -1,5 +1,5 @@
 import xpath, { select } from "xpath";
-import { DOMParser } from "@xmldom/xmldom";
+import { DOMParser, MIME_TYPE } from "@xmldom/xmldom";
 
 export type LeaderboardInfo = {
   name: string;
@@ -19,11 +19,8 @@ type RunInfo = {
 };
 
 const parser = new DOMParser({
-  locator: {},
-  errorHandler: {
-    warning: () => {},
-    error: () => {},
-    fatalError: console.error,
+  onError: (level, message) => {
+    if (level === "fatalError") console.error(message);
   },
 });
 
@@ -34,8 +31,9 @@ const selectMulti = (expression: string, node: Node) => {
 };
 
 export function parseLeaderboard(page: string): LeaderboardInfo {
-  const document = parser.parseFromString(page);
-  const [board, ...boards] = selectMulti("//table", document);
+  const doc = parser.parseFromString(page, MIME_TYPE.HTML);
+  // @ts-expect-error see https://github.com/xmldom/xmldom/issues/724
+  const [board, ...boards] = selectMulti("//table", doc);
 
   return {
     name: selectMulti(".//text()", board.firstChild!)