improve resource management and security update

Author: KTNG-3

package.json

@@ -16,17 +16,17 @@
   "author": "ing3kth (https://github.com/KTNG-3)",
   "license": "MIT",
   "devDependencies": {
-    "@types/jest": "^29.5.11",
-    "@types/node": "^20.10.5",
-    "@typescript-eslint/eslint-plugin": "^6.16.0",
-    "@typescript-eslint/parser": "^6.16.0",
-    "dotenv": "^16.3.1",
-    "eslint": "^8.56.0",
+    "@types/jest": "^29.5.12",
+    "@types/node": "^20.12.2",
+    "@typescript-eslint/eslint-plugin": "^7.5.0",
+    "@typescript-eslint/parser": "^7.5.0",
+    "dotenv": "^16.4.5",
+    "eslint": "^8.57.0",
     "jest": "29.7.0",
     "rimraf": "^5.0.5",
-    "ts-jest": "^29.1.1",
-    "typedoc": "^0.25.6",
-    "typescript": "^5.3.3"
+    "ts-jest": "^29.1.2",
+    "typedoc": "^0.25.12",
+    "typescript": "^5.4.3"
   },
   "scripts": {
     "test": "jest --detectOpenHandles",

packages/@valapi/auth/package.json

@@ -30,7 +30,7 @@
   "homepage": "https://github.com/valapi/node-valapi/tree/master/packages/@valapi/auth#readme",
   "dependencies": {
     "@valapi/lib": "^4.0.0",
-    "http-cookie-agent": "^5.0.4",
+    "http-cookie-agent": "^6.0.1",
     "tough-cookie": "^4.1.3"
   },
   "devDependencies": {

packages/@valapi/lib/CHANGELOG.md

@@ -10,6 +10,18 @@
 -   ~~`ValError.fromError`~~ **-->** `ValError.parse`
 -   ~~`ValBase64`~~ **-->** `ValEncryption`
 
+-   ~~`[Resources].fromString()`~~ **-->** `[Resources].fromID()`
+
+**Remove**
+
+-   `[Resources].Data`
+
+### Typescript
+
+**Change**
+
+-   ~~`[Resources].Identify`~~ **-->** `[Resources].ID`
+
 # 3.1.0
 
 **Remove**

packages/@valapi/lib/package.json

@@ -26,7 +26,7 @@
   },
   "homepage": "https://github.com/valapi/node-valapi/tree/master/packages/@valapi/lib#readme",
   "dependencies": {
-    "axios": "^1.6.3",
+    "axios": "^1.6.8",
     "tslib": "^2.6.2"
   },
   "directories": {

packages/@valapi/lib/src/__tests__/resource.ts

@@ -3,21 +3,21 @@ import { CrosshairColor, ItemTypeId, Locale, QueueId, Region } from "../index";
 describe("lib.resource", () => {
     test("resources", () => {
         expect(CrosshairColor.fromColor("White")).toBe("0");
-        expect(CrosshairColor.fromString("1")).toBe("Green");
+        expect(CrosshairColor.fromID("1")).toBe("Green");
 
-        expect(CrosshairColor.fromColorHex("FF00FF")).toBe("6");
-        expect(CrosshairColor.fromStringHex("5")).toBe("00FFFF");
+        expect(CrosshairColor.fromColorHex("Pink")).toBe("FF00FF");
+        expect(CrosshairColor.fromIdHex("00FFFF")).toBe("Cyan");
 
         expect(ItemTypeId.fromName("Agents")).toBe("01bb38e1-da47-4e6a-9b3d-945fe4655707");
-        expect(ItemTypeId.fromString("e7c63390-eda7-46e0-bb7a-a6abdacd2433")).toBe("Skins");
+        expect(ItemTypeId.fromID("e7c63390-eda7-46e0-bb7a-a6abdacd2433")).toBe("Skins");
 
         expect(Locale.fromName("German_Germany")).toBe("de-DE");
-        expect(Locale.fromString("zh-TW")).toBe("Chinese_Taiwan");
+        expect(Locale.fromID("zh-TW")).toBe("Chinese_Taiwan");
 
         expect(QueueId.fromName("Escalation")).toBe("ggteam");
-        expect(QueueId.fromString("onefa")).toBe("Replication");
+        expect(QueueId.fromID("onefa")).toBe("Replication");
 
         expect(Region.fromName("Brazil")).toBe("br");
-        expect(Region.fromString("pbe")).toBe("Public_Beta_Environment");
+        expect(Region.fromID("pbe")).toBe("Public_Beta_Environment");
     });
 });

packages/@valapi/lib/src/__tests__/util.ts

@@ -2,7 +2,7 @@ import { ValEncryption } from "../index";
 
 describe("lib.util", () => {
     test("base64", () => {
-        expect(ValEncryption.decryptJson("eyJ2YWxvcmFudC50cyI6ICJ0aGUgYmVzdCBOb2RlLmpzIGxpYnJhcnkgdG8gdXNpbmcgVmFsb3JhbnQgQVBJIn0=")).toBe({
+        expect(ValEncryption.decryptJson("eyJ2YWxvcmFudC50cyI6ICJ0aGUgYmVzdCBOb2RlLmpzIGxpYnJhcnkgdG8gdXNpbmcgVmFsb3JhbnQgQVBJIn0=")).toStrictEqual({
             "valorant.ts": "the best Node.js library to using Valorant API"
         });
         expect(ValEncryption.encryptJson({ 1: "2kov83v4yj1v8y09", ":)": "18ny9c8ny91c8ny9cn9" })).toBe("eyIxIjoiMmtvdjgzdjR5ajF2OHkwOSIsIjopIjoiMThueTljOG55OTFjOG55OWNuOSJ9");

packages/@valapi/lib/src/client/ValRegion.ts

@@ -4,13 +4,13 @@ export class ValRegion {
     /**
      * Region ID
      */
-    public readonly id: Region.Identify;
+    public readonly id: Region.ID;
 
     /**
      *
-     * @param {Region.Identify} region Region (default: na)
+     * @param {Region.ID} region Region (default: na)
      */
-    public constructor(region: Region.Identify = Region.Default.North_America) {
+    public constructor(region: Region.ID = Region.Default.North_America) {
         this.id = "na";
         switch (region) {
             case "na": {

packages/@valapi/lib/src/resources/CrosshairColor.ts

@@ -1,112 +1,76 @@
-export default class Data {
-    public static readonly from = {
-        "0": "White",
-        "1": "Green",
-        "2": "Yellow_Green",
-        "3": "Green_Yellow",
-        "4": "Yellow",
-        "5": "Cyan",
-        "6": "Pink",
-        "7": "Red",
-        "8": "Custom"
-    };
+export const Default = <const>{
+    White: "0",
+    Green: "1",
+    Yellow_Green: "2",
+    Green_Yellow: "3",
+    Yellow: "4",
+    Cyan: "5",
+    Pink: "6",
+    Red: "7",
+    Custom: "8"
+};
 
-    public static readonly fromHex = {
-        "0": "FFFFFF",
-        "1": "00FF00",
-        "2": "7FFF00",
-        "3": "DFFF00",
-        "4": "FFFF00",
-        "5": "00FFFF",
-        "6": "FF00FF",
-        "7": "FF0000"
-    };
+export type Color = keyof typeof Default;
+export type ID = (typeof Default)[Color];
 
-    public static readonly to = {
-        White: "0",
-        Green: "1",
-        Yellow_Green: "2",
-        Green_Yellow: "3",
-        Yellow: "4",
-        Cyan: "5",
-        Pink: "6",
-        Red: "7",
-        Custom: "8"
-    };
-
-    public static readonly toHex = {
-        FFFFFF: "0",
-        "00FF00": "1",
-        "7FFF00": "2",
-        DFFF00: "3",
-        FFFF00: "4",
-        "00FFFF": "5",
-        FF00FF: "6",
-        FF0000: "7"
-    };
+/**
+ * Change from {@link Color} to {@link ID}
+ * @param {Color} x Color
+ * @returns {ID} ID
+ */
+export function fromColor(x: Color): ID | undefined {
+    return <ID>Default[x];
 }
 
-export enum Default {
-    White = "0",
-    Green = "1",
-    Yellow_Green = "2",
-    Green_Yellow = "3",
-    Yellow = "4",
-    Cyan = "5",
-    Pink = "6",
-    Red = "7",
-    Custom = "8"
-}
+/**
+ * Change from {@link ID} to {@link Color}
+ * @param {ID} x ID
+ * @returns {Color} Color
+ */
+export function fromID(x: ID): Color | undefined {
+    for (const data of Object.entries(Default)) {
+        if (data[1] == x) {
+            return <Color>data[0];
+        }
+    }
 
-export enum DefaultColor {
-    White = "FFFFFF",
-    Green = "00FF00",
-    Yellow_Green = "7FFF00",
-    Green_Yellow = "DFFF00",
-    Yellow = "FFFF00",
-    Cyan = "00FFFF",
-    Pink = "FF00FF",
-    Red = "FF0000"
+    return undefined;
 }
 
-export type Identify = keyof typeof Data.from;
-export type Color = keyof typeof Data.to;
+export const DefaultHex = <const>{
+    White: "FFFFFF",
+    Green: "00FF00",
+    Yellow_Green: "7FFF00",
+    Green_Yellow: "DFFF00",
+    Yellow: "FFFF00",
+    Cyan: "00FFFF",
+    Pink: "FF00FF",
+    Red: "FF0000"
+};
 
-export type IdentifyHex = keyof typeof Data.fromHex;
-export type ColorHex = keyof typeof Data.toHex;
+type ColorHex = keyof typeof DefaultHex;
+export type IdHex = (typeof DefaultHex)[ColorHex];
 
 /**
- * Change from {@link Color} to {@link Identify String}
+ * Change from {@link Color} to {@link IdHex}
  * @param {Color} x Color
- * @returns {Identify} String
+ * @returns {IdHex} IdHex
  */
-export function fromColor(x: Color): Identify {
-    return <Identify>Data.to[x];
+export function fromColorHex(x: Color): IdHex | undefined {
+    return <IdHex>DefaultHex[<ColorHex>x];
 }
 
 /**
- * **(Hex)** Change from {@link ColorHex Color} to {@link IdentifyHex String}
- * @param {ColorHex} x Color
- * @returns {IdentifyHex} String
- */
-export function fromColorHex(x: ColorHex): IdentifyHex {
-    return <IdentifyHex>Data.toHex[x];
-}
-
-/**
- * Change from {@link Identify String} to {@link Color}
- * @param {Identify} x String
+ * Change from {@link IdHex} to {@link Color}
+ * @param {IdHex} x IdHex
  * @returns {Color} Color
  */
-export function fromString(x: Identify): Color {
-    return <Color>Data.from[x];
-}
+export function fromIdHex(x: IdHex): Color | undefined {
+    for (const data of Object.entries(DefaultHex)) {
+        if (data[1] == x) {
+            return <Color>data[0];
+        }
+    }
 
-/**
- * **(Hex)** Change from {@link IdentifyHex String} to {@link ColorHex Color}
- * @param {IdentifyHex} x String
- * @returns {ColorHex} Color
- */
-export function fromStringHex(x: IdentifyHex): ColorHex {
-    return <ColorHex>Data.fromHex[x];
+    return undefined;
 }

packages/@valapi/lib/src/resources/ItemTypeId.ts

@@ -1,55 +1,37 @@
-export default class Data {
-    public static readonly from = {
-        "01bb38e1-da47-4e6a-9b3d-945fe4655707": "Agents",
-        "f85cb6f7-33e5-4dc8-b609-ec7212301948": "Contracts",
-        "d5f120f8-ff8c-4aac-92ea-f2b5acbe9475": "Sprays",
-        "dd3bf334-87f3-40bd-b043-682a57a8dc3a": "Gun_Buddies",
-        "3f296c07-64c3-494c-923b-fe692a4fa1bd": "Cards",
-        "e7c63390-eda7-46e0-bb7a-a6abdacd2433": "Skins",
-        "3ad1b2b2-acdb-4524-852f-954a76ddae0a": "Skin_Variants",
-        "de7caa6b-adf7-4588-bbd1-143831e786c6": "Titles"
-    };
+export const Default = <const>{
+    Agents: "01bb38e1-da47-4e6a-9b3d-945fe4655707",
+    Contracts: "f85cb6f7-33e5-4dc8-b609-ec7212301948",
+    Sprays: "d5f120f8-ff8c-4aac-92ea-f2b5acbe9475",
+    Gun_Buddies: "dd3bf334-87f3-40bd-b043-682a57a8dc3a",
+    Cards: "3f296c07-64c3-494c-923b-fe692a4fa1bd",
+    Skins: "e7c63390-eda7-46e0-bb7a-a6abdacd2433",
+    Skin_Variants: "3ad1b2b2-acdb-4524-852f-954a76ddae0a",
+    Titles: "de7caa6b-adf7-4588-bbd1-143831e786c6"
+};
 
-    public static readonly to = {
-        Agents: "01bb38e1-da47-4e6a-9b3d-945fe4655707",
-        Contracts: "f85cb6f7-33e5-4dc8-b609-ec7212301948",
-        Sprays: "d5f120f8-ff8c-4aac-92ea-f2b5acbe9475",
-        Gun_Buddies: "dd3bf334-87f3-40bd-b043-682a57a8dc3a",
-        Cards: "3f296c07-64c3-494c-923b-fe692a4fa1bd",
-        Skins: "e7c63390-eda7-46e0-bb7a-a6abdacd2433",
-        Skin_Variants: "3ad1b2b2-acdb-4524-852f-954a76ddae0a",
-        Titles: "de7caa6b-adf7-4588-bbd1-143831e786c6"
-    };
-}
-
-export enum Default {
-    Agents = "01bb38e1-da47-4e6a-9b3d-945fe4655707",
-    Contracts = "f85cb6f7-33e5-4dc8-b609-ec7212301948",
-    Sprays = "d5f120f8-ff8c-4aac-92ea-f2b5acbe9475",
-    Gun_Buddies = "dd3bf334-87f3-40bd-b043-682a57a8dc3a",
-    Cards = "3f296c07-64c3-494c-923b-fe692a4fa1bd",
-    Skins = "e7c63390-eda7-46e0-bb7a-a6abdacd2433",
-    Skin_Variants = "3ad1b2b2-acdb-4524-852f-954a76ddae0a",
-    Titles = "de7caa6b-adf7-4588-bbd1-143831e786c6"
-}
-
-export type Identify = keyof typeof Data.from;
-export type Name = keyof typeof Data.to;
+export type Name = keyof typeof Default;
+export type ID = (typeof Default)[Name];
 
 /**
- * Change from {@link Name} to {@link Identify String}
+ * Change from {@link Name} to {@link ID}
  * @param {Name} x Name
- * @returns {Identify} String
+ * @returns {ID} ID
  */
-export function fromName(x: Name): Identify {
-    return <Identify>Data.to[x];
+export function fromName(x: Name): ID | undefined {
+    return <ID>Default[x];
 }
 
 /**
- * Change from {@link Identify String} to {@link Name}
- * @param {Identify} x String
+ * Change from {@link ID} to {@link Name}
+ * @param {ID} x ID
  * @returns {Name} Name
  */
-export function fromString(x: Identify): Name {
-    return <Name>Data.from[x];
+export function fromID(x: ID): Name | undefined {
+    for (const data of Object.entries(Default)) {
+        if (data[1] == x) {
+            return <Name>data[0];
+        }
+    }
+
+    return undefined;
 }