v2.13.1

Fix spelling of Calvar'ion

.gitattributes

@@ -0,0 +1 @@
+*.html linguist-vendored

.github/workflows/main.yml

@@ -10,19 +10,19 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3.3.0
-      - uses: borales/actions-yarn@v2.0.0
+      - uses: borales/actions-yarn@v4.2.0
         with:
           cmd: install
-      - uses: borales/actions-yarn@v2.0.0
+      - uses: borales/actions-yarn@v4.2.0
         with:
           cmd: lint
-      - uses: borales/actions-yarn@v2.0.0
+      - uses: borales/actions-yarn@v4.2.0
         with:
           cmd: format
-      - uses: borales/actions-yarn@v2.0.0
+      - uses: borales/actions-yarn@v4.2.0
         with:
           cmd: build
-      - uses: borales/actions-yarn@v2.0.0
+      - uses: borales/actions-yarn@v4.2.0
         with:
           cmd: test

README.md

@@ -3,6 +3,7 @@
 [![npm](https://img.shields.io/npm/v/osrs-json-hiscores.svg?style=flat-square)](https://www.npmjs.com/package/osrs-json-hiscores)
 [![downloads](https://img.shields.io/npm/dm/osrs-json-hiscores.svg?style=flat-square)](https://npm-stat.com/charts.html?package=osrs-json-hiscores)
 [![types](https://img.shields.io/npm/types/osrs-json-hiscores.svg?style=flat-square)](https://github.com/maxswa/osrs-json-hiscores/blob/master/src/types.ts)
+[![build](https://img.shields.io/github/actions/workflow/status/maxswa/osrs-json-hiscores/main.yml?style=flat-square&branch=main)](https://github.com/maxswa/osrs-json-hiscores/actions/workflows/main.yml?query=branch%3Amain)
 
 **The Old School Runescape API wrapper that does more!**
 
@@ -108,7 +109,9 @@ Activities consist of all levels of clue scrolls as well as minigames and bosses
 | Bounty Hunter (Rogue)  |     `rogueBH`     |
 | Bounty Hunter (Hunter) |    `hunterBH`     |
 | Last Man Standing      | `lastManStanding` |
+| PvP Arena              |    `pvpArena`     |
 | Soul Wars Zeal         |  `soulWarsZeal`   |
+| Rifts Closed           |   `riftsClosed`   |
 
 ### Leagues
 
@@ -118,53 +121,62 @@ Activities consist of all levels of clue scrolls as well as minigames and bosses
 
 ### Bosses
 
-| Boss Name                        |             Param              |
+| Boss Name                         |             Param              |
-| -------------------------------- | :----------------------------: |
+| --------------------------------- | :----------------------------: |
-| Abyssal Sire                     |         `abyssalSire`          |
+| Abyssal Sire                      |         `abyssalSire`          |
-| Alchemical Hydra                 |       `alchemicalHydra`        |
+| Alchemical Hydra                  |       `alchemicalHydra`        |
-| Barrows Chests                   |           `barrows`            |
+| Artio                             |            `artio`             |
-| Bryophyta                        |          `bryophyta`           |
+| Barrows Chests                    |           `barrows`            |
-| Callisto                         |           `callisto`           |
+| Bryophyta                         |          `bryophyta`           |
-| Cerberus                         |           `cerberus`           |
+| Callisto                          |           `callisto`           |
-| Chambers Of Xeric                |       `chambersOfXeric`        |
+| Calvar'ion                        |          `calvarion`           |
-| Chambers Of Xeric Challenge Mode | `chambersOfXericChallengeMode` |
+| Cerberus                          |           `cerberus`           |
-| Chaos Elemental                  |        `chaosElemental`        |
+| Chambers Of Xeric                 |       `chambersOfXeric`        |
-| Chaos Fanatic                    |         `chaosFanatic`         |
+| Chambers Of Xeric: Challenge Mode | `chambersOfXericChallengeMode` |
-| Commander Zilyana                |       `commanderZilyana`       |
+| Chaos Elemental                   |        `chaosElemental`        |
-| Corporeal Beast                  |        `corporealBeast`        |
+| Chaos Fanatic                     |         `chaosFanatic`         |
-| Crazy Archaeologist              |      `crazyArchaeologist`      |
+| Commander Zilyana                 |       `commanderZilyana`       |
-| Dagannoth Prime                  |        `dagannothPrime`        |
+| Corporeal Beast                   |        `corporealBeast`        |
-| Dagannoth Rex                    |         `dagannothRex`         |
+| Crazy Archaeologist               |      `crazyArchaeologist`      |
-| Dagannoth Supreme                |       `dagannothSupreme`       |
+| Dagannoth Prime                   |        `dagannothPrime`        |
-| Deranged Archaeologist           |    `derangedArchaeologist`     |
+| Dagannoth Rex                     |         `dagannothRex`         |
-| General Graardor                 |       `generalGraardor`        |
+| Dagannoth Supreme                 |       `dagannothSupreme`       |
-| Giant Mole                       |          `giantMole`           |
+| Deranged Archaeologist            |    `derangedArchaeologist`     |
-| Grotesque Guardians              |      `grotesqueGuardians`      |
+| General Graardor                  |       `generalGraardor`        |
-| Hespori                          |           `hespori`            |
+| Giant Mole                        |          `giantMole`           |
-| Kalphite Queen                   |        `kalphiteQueen`         |
+| Grotesque Guardians               |      `grotesqueGuardians`      |
-| King Black Dragon                |       `kingBlackDragon`        |
+| Hespori                           |           `hespori`            |
-| Kraken                           |            `kraken`            |
+| Kalphite Queen                    |        `kalphiteQueen`         |
-| Kreearra                         |           `kreeArra`           |
+| King Black Dragon                 |       `kingBlackDragon`        |
-| K'ril Tsutsaroth                 |        `krilTsutsaroth`        |
+| Kraken                            |            `kraken`            |
-| Mimic                            |            `mimic`             |
+| Kreearra                          |           `kreeArra`           |
-| The Nightmare of Ashihama        |          `nightmare`           |
+| K'ril Tsutsaroth                  |        `krilTsutsaroth`        |
-| Obor                             |             `obor`             |
+| Mimic                             |            `mimic`             |
-| Sarachnis                        |          `sarachnis`           |
+| Nex                               |             `nex`              |
-| Scorpia                          |           `scorpia`            |
+| The Nightmare of Ashihama         |          `nightmare`           |
-| Skotizo                          |           `skotizo`            |
+| Phosani's Nightmare               |      `phosanisNightmare`       |
-| Tempoross                        |          `tempoross`           |
+| Obor                              |             `obor`             |
-| Gauntlet                         |           `gauntlet`           |
+| Phantom Muspah                    |        `phantomMuspah`         |
-| Corrupted Gauntlet               |      `corruptedGauntlet`       |
+| Sarachnis                         |          `sarachnis`           |
-| Theatre Of Blood                 |        `theatreOfBlood`        |
+| Scorpia                           |           `scorpia`            |
-| Thermonuclear Smoke Devil        |   `thermonuclearSmokeDevil`    |
+| Skotizo                           |           `skotizo`            |
-| TzKal-Zuk                        |           `tzKalZuk`           |
+| Spindel                           |           `spindel`            |
-| TzTok-Jad                        |           `tzTokJad`           |
+| Tempoross                         |          `tempoross`           |
-| Venenatis                        |          `venenatis`           |
+| The Gauntlet                      |           `gauntlet`           |
-| Vetion                           |            `vetion`            |
+| The Corrupted Gauntlet            |      `corruptedGauntlet`       |
-| Vorkath                          |           `vorkath`            |
+| Theatre Of Blood                  |        `theatreOfBlood`        |
-| Wintertodt                       |          `wintertodt`          |
+| Theatre Of Blood: Hard Mode       |    `theatreOfBloodHardMode`    |
-| Zalcano                          |           `zalcano`            |
+| Thermonuclear Smoke Devil         |   `thermonuclearSmokeDevil`    |
-| Zulrah                           |            `zulrah`            |
+| Tombs of Amascut                  |        `tombsOfAmascut`        |
+| Tombs of Amascut: Expert Mode     |   `tombsOfAmascutExpertMode`   |
+| TzKal-Zuk                         |           `tzKalZuk`           |
+| TzTok-Jad                         |           `tzTokJad`           |
+| Venenatis                         |          `venenatis`           |
+| Vetion                            |            `vetion`            |
+| Vorkath                           |           `vorkath`            |
+| Wintertodt                        |          `wintertodt`          |
+| Zalcano                           |           `zalcano`            |
+| Zulrah                            |            `zulrah`            |
 
 ## What you'll get
 
@@ -188,7 +200,9 @@ Activities consist of all levels of clue scrolls as well as minigames and bosses
     leaguePoints: {},
     bountyHunter: {},
     lastManStanding: {},
+    pvpArena: {},
     soulWarsZeal: {},
+    riftsClosed: {},
     bosses: {}
   }
 }

__tests__/hiscores.test.ts

@@ -1,12 +1,56 @@
+import axios from 'axios';
+import { readFileSync } from 'fs';
+
 import {
   parseStats,
   getSkillPage,
   getStats,
   getStatsByGamemode,
   getRSNFormat,
-  Stats
+  Stats,
+  getPlayerTableURL,
+  getSkillPageURL,
+  getStatsURL,
+  BOSSES,
+  INVALID_FORMAT_ERROR
 } from '../src/index';
 
+const B0ATY_NAME = 'B0ATY';
+const B0ATY_FORMATTED_NAME = 'B0aty';
+const LYNX_TITAN_SPACE_NAME = 'lYnX tiTaN';
+const LYNX_TITAN_UNDERSCORE_NAME = 'lYnX_tiTaN';
+const LYNX_TITAN_HYPHEN_NAME = 'lYnX-tiTaN';
+const LYNX_TITAN_FORMATTED_NAME = 'Lynx Titan';
+
+const attackTopPage = readFileSync(`${__dirname}/attackTopPage.html`, 'utf8');
+const b0atyNamePage = readFileSync(`${__dirname}/b0atyNamePage.html`, 'utf8');
+const lynxTitanStats = readFileSync(`${__dirname}/lynxTitanStats.csv`, 'utf8');
+const lynxTitanNamePage = readFileSync(
+  `${__dirname}/lynxTitanNamePage.html`,
+  'utf8'
+);
+
+jest.spyOn(axios, 'get').mockImplementation((url) => {
+  const lynxUrls = [
+    getPlayerTableURL('main', LYNX_TITAN_SPACE_NAME),
+    getPlayerTableURL('main', LYNX_TITAN_UNDERSCORE_NAME),
+    getPlayerTableURL('main', LYNX_TITAN_HYPHEN_NAME)
+  ];
+  if (lynxUrls.includes(url)) {
+    return Promise.resolve({ data: lynxTitanNamePage });
+  }
+  if (getPlayerTableURL('main', B0ATY_NAME) === url) {
+    return Promise.resolve({ data: b0atyNamePage });
+  }
+  if (getSkillPageURL('main', 'attack', 1) === url) {
+    return Promise.resolve({ data: attackTopPage });
+  }
+  if (getStatsURL('main', LYNX_TITAN_FORMATTED_NAME) === url) {
+    return Promise.resolve({ status: 200, data: lynxTitanStats });
+  }
+  throw new Error(`No mock response for URL: ${url}`);
+});
+
 test('Parse CSV to json', () => {
   const csv = `246,2277,1338203419
   615,99,77438259
@@ -43,12 +87,16 @@ test('Parse CSV to json', () => {
   392,250
   1,6143
   4814,898
+  13,4057
   37,225
+  25,1110
   382,2780
   944,3000
+  704,892
   1981,1452
   4981,23
   888,1046
+  444,792
   613,4856
   102,4038
   156,334
@@ -71,16 +119,23 @@ test('Parse CSV to json', () => {
   625,2391
   120,2981
   1,109
+  99,39002
   3,22666
+  2,84
   26,323
+  44,6233
   201,1101
   82,3404
   5085,61
+  678,903
   18823,23
   63,375
   2870,6
   6984,138
+  23,923141
   4043,2000
+  4073,1020
+  289,13070
   489,8
   967,47
   11155,223
@@ -123,7 +178,9 @@ test('Parse CSV to json', () => {
       rogue: { rank: 89912, score: 37 }
     },
     lastManStanding: { rank: 4814, score: 898 },
+    pvpArena: { rank: 13, score: 4057 },
     soulWarsZeal: { rank: 37, score: 225 },
+    riftsClosed: { rank: 25, score: 1110 },
     clues: {
       all: { rank: 32, score: 12148 },
       beginner: { rank: 3105, score: 76 },
@@ -136,9 +193,11 @@ test('Parse CSV to json', () => {
     bosses: {
       abyssalSire: { rank: 382, score: 2780 },
       alchemicalHydra: { rank: 944, score: 3000 },
+      artio: { rank: 704, score: 892 },
       barrows: { rank: 1981, score: 1452 },
       bryophyta: { rank: 4981, score: 23 },
       callisto: { rank: 888, score: 1046 },
+      calvarion: { rank: 444, score: 792 },
       cerberus: { rank: 613, score: 4856 },
       chambersOfXeric: { rank: 102, score: 4038 },
       chambersOfXericChallengeMode: { rank: 156, score: 334 },
@@ -161,16 +220,23 @@ test('Parse CSV to json', () => {
       kreeArra: { rank: 625, score: 2391 },
       krilTsutsaroth: { rank: 120, score: 2981 },
       mimic: { rank: 1, score: 109 },
+      nex: { rank: 99, score: 39002 },
       nightmare: { rank: 3, score: 22666 },
+      phosanisNightmare: { rank: 2, score: 84 },
       obor: { rank: 26, score: 323 },
+      phantomMuspah: { rank: 44, score: 6233 },
       sarachnis: { rank: 201, score: 1101 },
       scorpia: { rank: 82, score: 3404 },
       skotizo: { rank: 5085, score: 61 },
+      spindel: { rank: 678, score: 903 },
       tempoross: { rank: 18823, score: 23 },
       gauntlet: { rank: 63, score: 375 },
       corruptedGauntlet: { rank: 2870, score: 6 },
       theatreOfBlood: { rank: 6984, score: 138 },
+      theatreOfBloodHardMode: { rank: 23, score: 923141 },
       thermonuclearSmokeDevil: { rank: 4043, score: 2000 },
+      tombsOfAmascut: { rank: 4073, score: 1020 },
+      tombsOfAmascutExpertMode: { rank: 289, score: 13070 },
       tzKalZuk: { rank: 489, score: 8 },
       tzTokJad: { rank: 967, score: 47 },
       venenatis: { rank: 11155, score: 223 },
@@ -185,35 +251,41 @@ test('Parse CSV to json', () => {
   expect(parseStats(csv)).toStrictEqual(expectedOutput);
 });
 
+test('Parse CSV with unknown activity', () => {
+  const statsWithUnknownActivity = `${lynxTitanStats}
+    -1,-1`;
+  expect(() => parseStats(statsWithUnknownActivity)).toThrow(
+    INVALID_FORMAT_ERROR
+  );
+});
+
+test('Parse invalid CSV', () => {
+  expect(() => parseStats('invalid')).toThrow(INVALID_FORMAT_ERROR);
+});
+
 describe('Get name format', () => {
   it('gets a name with a space', async () => {
-    jest.setTimeout(30000);
+    const data = await getRSNFormat(LYNX_TITAN_SPACE_NAME);
-    const data = await getRSNFormat('lYnX tiTaN');
+    expect(data).toBe(LYNX_TITAN_FORMATTED_NAME);
-    expect(data).toBe('Lynx Titan');
   });
   it('gets a name with an underscore', async () => {
-    jest.setTimeout(30000);
+    const data = await getRSNFormat(LYNX_TITAN_UNDERSCORE_NAME);
-    const data = await getRSNFormat('lYnX_tiTaN');
+    expect(data).toBe(LYNX_TITAN_FORMATTED_NAME);
-    expect(data).toBe('Lynx Titan');
   });
   it('gets a name with a hyphen', async () => {
-    jest.setTimeout(30000);
+    const data = await getRSNFormat(LYNX_TITAN_HYPHEN_NAME);
-    const data = await getRSNFormat('lYnX-tiTaN');
+    expect(data).toBe(LYNX_TITAN_FORMATTED_NAME);
-    expect(data).toBe('Lynx Titan');
   });
   it('gets a name with a number', async () => {
-    jest.setTimeout(30000);
+    const data = await getRSNFormat(B0ATY_NAME);
-    const data = await getRSNFormat('B0ATY');
+    expect(data).toBe(B0ATY_FORMATTED_NAME);
-    expect(data).toBe('B0aty');
   });
   it('throws an error for a name with invalid characters', async () => {
-    jest.setTimeout(30000);
     await expect(getRSNFormat('b&aty')).rejects.toBeTruthy();
   });
 });
 
 test('Get attack top page', async () => {
-  jest.setTimeout(30000);
   const data = await getSkillPage('attack');
   expect(data).toMatchObject([
     {
@@ -395,7 +467,6 @@ test('Get attack top page', async () => {
 });
 
 test('Get non-existent player', async () => {
-  jest.setTimeout(30000);
   getStats('fishy').catch((err) => {
     if (err.response) {
       expect(err.response.status).toBe(404);
@@ -404,8 +475,10 @@ test('Get non-existent player', async () => {
 });
 
 test('Get stats by gamemode', async () => {
-  jest.setTimeout(30000);
+  const { skills, bosses } = await getStatsByGamemode(
-  const { skills } = await getStatsByGamemode('Lynx Titan');
+    LYNX_TITAN_FORMATTED_NAME
+  );
+
   expect(skills).toMatchObject({
     overall: { rank: expect.any(Number), level: 2277, xp: 4600000000 },
     attack: { rank: expect.any(Number), level: 99, xp: 200000000 },
@@ -432,4 +505,56 @@ test('Get stats by gamemode', async () => {
     hunter: { rank: expect.any(Number), level: 99, xp: 200000000 },
     construction: { rank: expect.any(Number), level: 99, xp: 200000000 }
   });
+
+  const bossKeys = Object.keys(bosses);
+  expect(bossKeys).toStrictEqual(BOSSES);
+
+  expect.assertions(2);
+});
+
+describe('Get stats options', () => {
+  const rsn = 'player';
+  let axiosMock: jest.Mock;
+  beforeEach(() => {
+    axios.get = jest.fn(
+      (url) =>
+        new Promise<any>((resolve) =>
+          resolve(
+            url === getPlayerTableURL('main', rsn)
+              ? { data: lynxTitanNamePage }
+              : { status: 200, data: lynxTitanStats }
+          )
+        )
+    );
+    axiosMock = axios.get as any;
+    axiosMock.mockClear();
+  });
+  it('fetches all gamemodes and formatted RSN when no options provided', async () => {
+    await getStats(rsn);
+    expect(axiosMock.mock.calls.map((val) => val[0])).toEqual([
+      getStatsURL('main', rsn),
+      getPlayerTableURL('main', rsn),
+      getStatsURL('ironman', rsn),
+      getStatsURL('hardcore', rsn),
+      getStatsURL('ultimate', rsn)
+    ]);
+  });
+  it('skips fetching formatted RSN when option is provided', async () => {
+    await getStats(rsn, { shouldGetFormattedRsn: false });
+    expect(
+      axiosMock.mock.calls.some(
+        (val) => val[0] === getPlayerTableURL('main', rsn)
+      )
+    ).toBeFalsy();
+  });
+  it('skips fetching game mode when option is provided', async () => {
+    await getStats(rsn, {
+      otherGamemodes: ['ironman', 'ultimate']
+    });
+    expect(
+      axiosMock.mock.calls.some(
+        (val) => val[0] === getStatsURL('hardcore', rsn)
+      )
+    ).toBeFalsy();
+  });
 });

__tests__/lynxTitanStats.csv

@@ -0,0 +1,92 @@
+1,2277,4600000000
+15,99,200000000
+28,99,200000000
+18,99,200000000
+7,99,200000000
+8,99,200000000
+11,99,200000000
+32,99,200000000
+159,99,200000000
+15,99,200000000
+12,99,200000000
+9,99,200000000
+48,99,200000000
+4,99,200000000
+3,99,200000000
+25,99,200000000
+5,99,200000000
+23,99,200000000
+12,99,200000000
+2,99,200000000
+19,99,200000000
+7,99,200000000
+4,99,200000000
+4,99,200000000
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+347584,22
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1
+-1,-1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "osrs-json-hiscores",
-  "version": "2.4.1",
+  "version": "2.13.1",
   "description": "The Old School Runescape API wrapper that does more!",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -8,7 +8,7 @@
     "lib/**/*"
   ],
   "scripts": {
-    "dev": "watch 'yarn run build' src",
+    "dev": "yarn build --watch",
     "build": "tsc",
     "format": "prettier --write \"src/**/*.ts\"",
     "lint": "eslint --fix \"src/**/*.ts\"",
@@ -30,6 +30,9 @@
     "stats",
     "skills"
   ],
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org"
+  },
   "author": "maxswa",
   "license": "ISC",
   "bugs": {
@@ -52,7 +55,7 @@
     "root": true,
     "parser": "@typescript-eslint/parser",
     "parserOptions": {
-      "project": "./tsconfig.json"
+      "project": "./tsconfig.eslint.json"
     },
     "plugins": [
       "@typescript-eslint"
@@ -106,10 +109,9 @@
     "husky": "^5.2.0",
     "jest": "^26.6.3",
     "lint-staged": "^10.5.4",
-    "np": "6.5.0",
+    "np": "^7.7.0",
     "prettier": "^2.2.1",
     "ts-jest": "^26.5.4",
-    "typescript": "^4.2.3",
+    "typescript": "^4.2.3"
-    "watch": "^1.0.2"
   }
 }

src/hiscores.ts

@@ -1,4 +1,5 @@
-import { JSDOM } from 'jsdom';
+import { AxiosResponse } from 'axios';
+import { BinaryData, JSDOM } from 'jsdom';
 import {
   Player,
   Activity,
@@ -12,7 +13,8 @@ import {
   PlayerSkillRow,
   ActivityName,
   PlayerActivityRow,
-  Bosses
+  Bosses,
+  GetStatsOptions
 } from './types';
 import {
   getStatsURL,
@@ -27,7 +29,9 @@ import {
   rsnFromElement,
   getActivityPageURL,
   httpGet,
-  BOSSES
+  BOSSES,
+  INVALID_FORMAT_ERROR,
+  validateRSN
 } from './utils';
 
 /**
@@ -37,24 +41,19 @@ import {
  * @returns Formatted version of the rsn.
  */
 export async function getRSNFormat(rsn: string): Promise<string> {
-  if (typeof rsn !== 'string') {
+  validateRSN(rsn);
-    throw Error('RSN must be a string');
-  } else if (!/^[a-zA-Z0-9 _-]+$/.test(rsn)) {
-    throw Error('RSN contains invalid character');
-  } else if (rsn.length > 12 || rsn.length < 1) {
-    throw Error('RSN must be between 1 and 12 characters');
-  }
 
   const url = getPlayerTableURL('main', rsn);
   try {
-    const response = await httpGet(url);
+    const response = await httpGet<string | Buffer | BinaryData | undefined>(
-    const dom = new JSDOM(response.data);
+      url
-    const spans = dom.window.document.querySelectorAll(
-      'span[style="color:#AA0022;"]'
     );
-    if (spans.length >= 2) {
+    const dom = new JSDOM(response.data);
-      const nameSpan = spans[1];
+    const anchor = dom.window.document.querySelector(
-      return rsnFromElement(nameSpan);
+      '.personal-hiscores__row.personal-hiscores__row--type-highlight a'
+    );
+    if (anchor) {
+      return rsnFromElement(anchor);
     }
     throw Error('Player not found');
   } catch {
@@ -74,6 +73,13 @@ export function parseStats(csv: string): Stats {
     .filter((entry) => !!entry)
     .map((stat) => stat.split(','));
 
+  if (
+    splitCSV.length !==
+    SKILLS.length + BH_MODES.length + CLUES.length + BOSSES.length + 5
+  ) {
+    throw Error(INVALID_FORMAT_ERROR);
+  }
+
   const skillObjects: Skill[] = splitCSV
     .filter((stat) => stat.length === 3)
     .map((stat) => {
@@ -100,7 +106,12 @@ export function parseStats(csv: string): Stats {
   const [leaguePoints] = activityObjects.splice(0, 1);
   const bhObjects = activityObjects.splice(0, BH_MODES.length);
   const clueObjects = activityObjects.splice(0, CLUES.length);
-  const [lastManStanding, soulWarsZeal] = activityObjects.splice(0, 2);
+  const [
+    lastManStanding,
+    pvpArena,
+    soulWarsZeal,
+    riftsClosed
+  ] = activityObjects.splice(0, 4);
   const bossObjects = activityObjects.splice(0, BOSSES.length);
 
   const skills: Skills = skillObjects.reduce<Skills>((prev, curr, index) => {
@@ -132,7 +143,9 @@ export function parseStats(csv: string): Stats {
     leaguePoints,
     bountyHunter,
     lastManStanding,
+    pvpArena,
     soulWarsZeal,
+    riftsClosed,
     clues,
     bosses
   };
@@ -149,25 +162,36 @@ export function parseStats(csv: string): Stats {
  * @param rsn Username of the player.
  * @returns Player object.
  */
-export async function getStats(rsn: string): Promise<Player> {
+export async function getStats(
-  if (typeof rsn !== 'string') {
+  rsn: string,
-    throw Error('RSN must be a string');
+  options?: GetStatsOptions
-  } else if (!/^[a-zA-Z0-9 _]+$/.test(rsn)) {
+): Promise<Player> {
-    throw Error('RSN contains invalid character');
+  validateRSN(rsn);
-  } else if (rsn.length > 12 || rsn.length < 1) {
+  const otherGamemodes = options?.otherGamemodes ?? [
-    throw Error('RSN must be between 1 and 12 characters');
+    'ironman',
-  }
+    'hardcore',
+    'ultimate'
+  ];
+  const shouldGetFormattedRsn = options?.shouldGetFormattedRsn ?? true;
 
-  const mainRes = await httpGet(getStatsURL('main', rsn));
+  const mainRes = await httpGet<string>(getStatsURL('main', rsn));
   if (mainRes.status === 200) {
-    const otherResponses = await Promise.all([
+    const emptyResponse: AxiosResponse<string> = {
-      httpGet(getStatsURL('ironman', rsn)).catch((err) => err),
+      status: 404,
-      httpGet(getStatsURL('hardcore', rsn)).catch((err) => err),
+      data: '',
-      httpGet(getStatsURL('ultimate', rsn)).catch((err) => err),
+      statusText: '',
-      getRSNFormat(rsn).catch(() => undefined)
+      headers: {},
-    ]);
+      config: {}
-
+    };
-    const [ironRes, hcRes, ultRes, formattedName] = otherResponses;
+    const getModeStats = async (
+      mode: Extract<Gamemode, 'ironman' | 'hardcore' | 'ultimate'>
+    ): Promise<AxiosResponse<string>> =>
+      otherGamemodes.includes(mode)
+        ? httpGet<string>(getStatsURL(mode, rsn)).catch((err) => err)
+        : emptyResponse;
+    const formattedName = shouldGetFormattedRsn
+      ? await getRSNFormat(rsn).catch(() => undefined)
+      : undefined;
 
     const player: Player = {
       name: formattedName ?? rsn,
@@ -178,8 +202,11 @@ export async function getStats(rsn: string): Promise<Player> {
     };
     player.main = parseStats(mainRes.data);
 
+    const ironRes = await getModeStats('ironman');
     if (ironRes.status === 200) {
       player.ironman = parseStats(ironRes.data);
+      const hcRes = await getModeStats('hardcore');
+      const ultRes = await getModeStats('ultimate');
       if (hcRes.status === 200) {
         player.mode = 'hardcore';
         player.hardcore = parseStats(hcRes.data);
@@ -237,16 +264,11 @@ export async function getStatsByGamemode(
   rsn: string,
   mode: Gamemode = 'main'
 ): Promise<Stats> {
-  if (typeof rsn !== 'string') {
+  validateRSN(rsn);
-    throw Error('RSN must be a string');
+  if (!GAMEMODES.includes(mode)) {
-  } else if (!/^[a-zA-Z0-9 _]+$/.test(rsn)) {
-    throw Error('RSN contains invalid character');
-  } else if (rsn.length > 12 || rsn.length < 1) {
-    throw Error('RSN must be between 1 and 12 characters');
-  } else if (!GAMEMODES.includes(mode)) {
     throw Error('Invalid game mode');
   }
-  const response = await httpGet(getStatsURL(mode, rsn));
+  const response = await httpGet<string>(getStatsURL(mode, rsn));
   if (response.status !== 200) {
     throw Error('Player not found');
   }
@@ -269,7 +291,7 @@ export async function getSkillPage(
   }
   const url = getSkillPageURL(mode, skill, page);
 
-  const response = await httpGet(url);
+  const response = await httpGet<string | Buffer | BinaryData | undefined>(url);
   const dom = new JSDOM(response.data);
   const playersHTML = dom.window.document.querySelectorAll(
     '.personal-hiscores__row'
@@ -317,7 +339,7 @@ export async function getActivityPage(
   }
   const url = getActivityPageURL(mode, activity, page);
 
-  const response = await httpGet(url);
+  const response = await httpGet<string | Buffer | BinaryData | undefined>(url);
   const dom = new JSDOM(response.data);
   const playersHTML = dom.window.document.querySelectorAll(
     '.personal-hiscores__row'

src/types.ts

@@ -5,7 +5,10 @@ export type Gamemode =
   | 'hardcore'
   | 'deadman'
   | 'seasonal'
-  | 'tournament';
+  | 'tournament'
+  | 'skiller'
+  | 'oneDefence'
+  | 'freshStart';
 
 export interface Skill {
   rank: number;
@@ -64,9 +67,11 @@ export type BH = { [Type in BHType]: Activity };
 export type Boss =
   | 'abyssalSire'
   | 'alchemicalHydra'
+  | 'artio'
   | 'barrows'
   | 'bryophyta'
   | 'callisto'
+  | 'calvarion'
   | 'cerberus'
   | 'chambersOfXeric'
   | 'chambersOfXericChallengeMode'
@@ -89,16 +94,23 @@ export type Boss =
   | 'kreeArra'
   | 'krilTsutsaroth'
   | 'mimic'
+  | 'nex'
   | 'nightmare'
+  | 'phosanisNightmare'
   | 'obor'
+  | 'phantomMuspah'
   | 'sarachnis'
   | 'scorpia'
   | 'skotizo'
+  | 'spindel'
   | 'tempoross'
   | 'gauntlet'
   | 'corruptedGauntlet'
   | 'theatreOfBlood'
+  | 'theatreOfBloodHardMode'
   | 'thermonuclearSmokeDevil'
+  | 'tombsOfAmascut'
+  | 'tombsOfAmascutExpertMode'
   | 'tzKalZuk'
   | 'tzTokJad'
   | 'venenatis'
@@ -115,7 +127,9 @@ export type ActivityName =
   | 'hunterBH'
   | 'rogueBH'
   | 'lastManStanding'
+  | 'pvpArena'
   | 'soulWarsZeal'
+  | 'riftsClosed'
   | 'allClues'
   | 'beginnerClues'
   | 'easyClues'
@@ -131,7 +145,9 @@ export interface Stats {
   leaguePoints: Activity;
   bountyHunter: BH;
   lastManStanding: Activity;
+  pvpArena: Activity;
   soulWarsZeal: Activity;
+  riftsClosed: Activity;
   bosses: Bosses;
 }
 export type Modes = { [M in Gamemode]?: Stats };
@@ -153,3 +169,16 @@ export interface PlayerActivityRow extends Activity {
   name: string;
   dead: boolean;
 }
+
+export interface GetStatsOptions {
+  /**
+   * Other game modes to fetch ranks for.
+   * @defaultvalue `['ironman', 'hardcore', 'ultimate']`
+   */
+  otherGamemodes?: Extract<Gamemode, 'ironman' | 'hardcore' | 'ultimate'>[];
+  /**
+   * If true, the formatted RSN will be fetched. Otherwise it will return the provided, unformatted RSN.
+   * @defaultvalue `true`
+   */
+  shouldGetFormattedRsn?: boolean;
+}

src/utils/constants.ts

@@ -22,7 +22,10 @@ export const GAMEMODE_URL: GamemodeUrl = {
   ultimate: `${BASE_URL}_ultimate/`,
   deadman: `${BASE_URL}_deadman/`,
   seasonal: `${BASE_URL}_seasonal/`,
-  tournament: `${BASE_URL}_tournament/`
+  tournament: `${BASE_URL}_tournament/`,
+  skiller: `${BASE_URL}_skiller/`,
+  oneDefence: `${BASE_URL}_skiller_defence/`,
+  freshStart: `${BASE_URL}_fresh_start/`
 };
 export const SKILLS: SkillName[] = [
   'overall',
@@ -72,9 +75,11 @@ export const GAMEMODES: Gamemode[] = [
 export const BOSSES: Boss[] = [
   'abyssalSire',
   'alchemicalHydra',
+  'artio',
   'barrows',
   'bryophyta',
   'callisto',
+  'calvarion',
   'cerberus',
   'chambersOfXeric',
   'chambersOfXericChallengeMode',
@@ -97,16 +102,23 @@ export const BOSSES: Boss[] = [
   'kreeArra',
   'krilTsutsaroth',
   'mimic',
+  'nex',
   'nightmare',
+  'phosanisNightmare',
   'obor',
+  'phantomMuspah',
   'sarachnis',
   'scorpia',
   'skotizo',
+  'spindel',
   'tempoross',
   'gauntlet',
   'corruptedGauntlet',
   'theatreOfBlood',
+  'theatreOfBloodHardMode',
   'thermonuclearSmokeDevil',
+  'tombsOfAmascut',
+  'tombsOfAmascutExpertMode',
   'tzKalZuk',
   'tzTokJad',
   'venenatis',
@@ -128,7 +140,9 @@ export const ACTIVITIES: ActivityName[] = [
   'eliteClues',
   'masterClues',
   'lastManStanding',
+  'pvpArena',
   'soulWarsZeal',
+  'riftsClosed',
   ...BOSSES
 ];
 
@@ -139,9 +153,11 @@ export type FormattedBossNames = {
 export const FORMATTED_BOSS_NAMES: FormattedBossNames = {
   abyssalSire: 'Abyssal Sire',
   alchemicalHydra: 'Alchemical Hydra',
+  artio: 'Artio',
   barrows: 'Barrows Chests',
   bryophyta: 'Bryophyta',
   callisto: 'Callisto',
+  calvarion: "Calvar'ion",
   cerberus: 'Cerberus',
   chambersOfXeric: 'Chambers of Xeric',
   chambersOfXericChallengeMode: 'Chambers of Xeric: Challenge Mode',
@@ -164,16 +180,23 @@ export const FORMATTED_BOSS_NAMES: FormattedBossNames = {
   kreeArra: "Kree'Arra",
   krilTsutsaroth: "K'ril Tsutsaroth",
   mimic: 'Mimic',
+  nex: 'Nex',
   nightmare: 'The Nightmare of Ashihama',
+  phosanisNightmare: "Phosani's Nightmare",
   obor: 'Obor',
+  phantomMuspah: 'Phantom Muspah',
   sarachnis: 'Sarachnis',
   scorpia: 'Scorpia',
   skotizo: 'Skotizo',
+  spindel: 'Spindel',
   tempoross: 'Tempoross',
   gauntlet: 'The Gauntlet',
   corruptedGauntlet: 'The Corrupted Gauntlet',
   theatreOfBlood: 'Theatre of Blood',
+  theatreOfBloodHardMode: 'Theatre of Blood: Hard Mode',
   thermonuclearSmokeDevil: 'Thermonuclear Smoke Devil',
+  tombsOfAmascut: 'Tombs of Amascut',
+  tombsOfAmascutExpertMode: 'Tombs of Amascut: Expert Mode',
   tzKalZuk: 'TzKal-Zuk',
   tzTokJad: 'TzTok-Jad',
   venenatis: 'Venenatis',
@@ -239,5 +262,9 @@ export const FORMATTED_BH_NAMES: FormattedBHNames = {
 };
 
 export const FORMATTED_LMS = 'Last Man Standing';
+export const FORMATTED_PVP_ARENA = 'PvP Arena';
 export const FORMATTED_SOUL_WARS = 'Soul Wars Zeal';
 export const FORMATTED_LEAGUE_POINTS = 'League Points';
+export const FORMATTED_RIFTS_CLOSED = 'Rifts Closed';
+
+export const INVALID_FORMAT_ERROR = 'Invalid hiscores format';

src/utils/helpers.ts

@@ -96,10 +96,25 @@ export const rsnFromElement = (el: Element | null) => {
  * @param url URL to run a `GET` request against.
  * @returns Axios response.
  */
-export const httpGet = (url: string) =>
+export const httpGet = <Response>(url: string) =>
-  axios.get(url, {
+  axios.get<Response>(url, {
     headers: {
       // without User-Agent header requests may be rejected by DDoS protection mechanism
       'User-Agent': ua.firefox(80)
     }
   });
+
+/**
+ * Validates that a provided RSN has the same username restrictions as Jagex.
+ * @param rsn Username to validate.
+ * @throws Error if the RSN fails validation.
+ */
+export const validateRSN = (rsn: string) => {
+  if (typeof rsn !== 'string') {
+    throw Error('RSN must be a string');
+  } else if (!/^[a-zA-Z0-9 _-]+$/.test(rsn)) {
+    throw Error('RSN contains invalid character');
+  } else if (rsn.length > 12 || rsn.length < 1) {
+    throw Error('RSN must be between 1 and 12 characters');
+  }
+};

tsconfig.eslint.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "module": "commonjs",
+    "declaration": true,
+    "outDir": "./lib",
+    "strict": true
+  },
+  "include": ["src", "**/__tests__/*"],
+  "exclude": ["node_modules"]
+}

tsconfig.json

@@ -4,7 +4,12 @@
     "module": "commonjs",
     "declaration": true,
     "outDir": "./lib",
-    "strict": true
+    "strict": true,
+    "lib": ["ES2015", "DOM", "DOM.Iterable"],
+    "typeRoots": [
+      "./node_modules/@types",
+      "./src/@types"
+    ]
   },
   "include": ["src"],
   "exclude": ["node_modules", "**/__tests__/*"]