v2.21.0

Bump cross-spawn from 7.0.3 to 7.0.6

.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

.gitignore

@@ -1,3 +1,4 @@
 .idea/
 node_modules
 /lib
+.vscode

README.md

@@ -3,24 +3,26 @@
 [![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/workflow/status/maxswa/osrs-json-hiscores/CI?style=flat-square)](https://github.com/maxswa/osrs-json-hiscores/actions/workflows/main.yml?query=branch%3Amain)
+[![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!**
+**The Old School RuneScape API wrapper that does more!**
 
 ## What it does
 
-The official hiscores API for Old School Runescape (OSRS) returns CSV.
+The official hiscores API for Old School RuneScape (OSRS) can return CSV or a simple JSON array.
-This wrapper converts it to json and provides extra information about the given player. By comparing player info it infers the player's game mode, as well as any previous modes (de-ultimated, de-ironed and/or died as a hardcore ironman).
+This wrapper converts the hiscores data into a more usable JSON object and provides extra information about the given player. By comparing player info it infers the player's game mode, as well as any previous modes (de-ultimated, de-ironed and/or died as a hardcore ironman).
 
-Additional functions are provided that screen-scrape the OSRS leaderboards and return a list of players as json.
+Additional functions are provided that screen-scrape the OSRS leaderboards and return a list of players as json. Also simple utility functions are provided to fetch the raw responses from Jagex's APIs, if desired.
 
 `osrs-json-hiscores` has TypeScript support, with full definitions for all functions and custom data types.
 
 ---
 
-### Disclaimer
+### ⚠ Disclaimer ⚠
 
-Jagex does not provide `Access-Control-Allow-Origin` headers in their responses. This means that [CORS](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS) will block all browser requests to their hiscores API. In order to get around this, osrs-json-hiscores should be installed on the server side and exposed to the front end via a simple API. Here is an example of this in use: [codesandbox.io/s/osrs-json-hiscores-demo](https://codesandbox.io/s/osrs-json-hiscores-demo-qz656)
+Jagex does not provide `Access-Control-Allow-Origin` headers in their responses. This means that [CORS](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS) will block all browser requests to their hiscores API. In order to get around this, osrs-json-hiscores needs to be installed on the server side and exposed to the front end via a simple API. Here is an example of this in use: [codesandbox.io/s/osrs-json-hiscores-demo](https://codesandbox.io/s/osrs-json-hiscores-demo-qz656)
+
+TLDR: You cannot use this library directly in your client side app e.g. React or Vue, you must set up a server which uses this lib internally and have your client fetch data from your server.
 
 ---
 
@@ -42,27 +44,14 @@ $ yarn add osrs-json-hiscores
 
 Install the package and then import it into your project:
 
-```javascript
+```typescript
-const hiscores = require('osrs-json-hiscores');
+import { getStatsByGamemode, getSkillPage } from 'osrs-json-hiscores';
 ```
 
 Once you import it you can call the functions asynchronously:
 
-```javascript
+```typescript
-hiscores
+const stats = await getStatsByGamemode('Lynx Titan');
-  .getStats('Lynx Titan')
-  .then((res) => console.log(res))
-  .catch((err) => console.error(err));
-```
-
-If you are using TypeScript or transpiling your JS you can use ES6 syntax:
-
-```javascript
-import hiscores, { getSkillPage } from 'osrs-json-hiscores';
-
-// ...
-
-const stats = await hiscores.getStats('Lynx Titan');
 const topPage = await getSkillPage('overall');
 ```
 
@@ -81,9 +70,8 @@ const topPage = await getSkillPage('overall');
 
 `getSkillPage` and `getActivityPage` require a skill / activity and optionally a gamemode and page:
 
-```javascript
+```typescript
-hiscores
+getSkillPage('attack', 'main', 1)
-  .getSkillPage('attack', 'main', 1)
   .then((res) => console.log(res))
   .catch((err) => console.error(err));
 ```
@@ -105,19 +93,24 @@ Activities consist of all levels of clue scrolls as well as minigames and bosses
 ### Minigames
 
 | Minigame                        |        Param        |
-| ---------------------- | :---------------: |
+| ------------------------------- | :-----------------: |
-| Bounty Hunter (Rogue)  |     `rogueBH`     |
+| Bounty Hunter (Legacy - Rogue)  |      `rogueBH`      |
-| Bounty Hunter (Hunter) |    `hunterBH`     |
+| Bounty Hunter (Legacy - Hunter) |     `hunterBH`      |
-| Last Man Standing      | `lastManStanding` |
+| Bounty Hunter (Rogue)           |     `rogueBHV2`     |
-| PvP Arena              |    `pvpArena`     |
+| Bounty Hunter (Hunter)          |    `hunterBHV2`     |
+| LMS - Rank                      |  `lastManStanding`  |
+| PvP Arena - Rank                |     `pvpArena`      |
 | Soul Wars Zeal                  |   `soulWarsZeal`    |
-| Rifts Closed           |   `riftsClosed`   |
+| Rifts closed                    |    `riftsClosed`    |
+| Colosseum Glory                 |  `colosseumGlory`   |
+| Collections Logged              | `collectionsLogged` |
 
-### Leagues
+### Points
 
 | Activity       |      Param      |
-| ------------- | :------------: |
+| -------------- | :-------------: |
 | League Points  | `leaguePoints`  |
+| Deadman Points | `deadmanPoints` |
 
 ### Bosses
 
@@ -125,9 +118,13 @@ Activities consist of all levels of clue scrolls as well as minigames and bosses
 | --------------------------------- | :----------------------------: |
 | Abyssal Sire                      |         `abyssalSire`          |
 | Alchemical Hydra                  |       `alchemicalHydra`        |
+| Amoxliatl                         |          `amoxliatl`           |
+| Araxxor                           |           `araxxor`            |
+| Artio                             |            `artio`             |
 | Barrows Chests                    |           `barrows`            |
 | Bryophyta                         |          `bryophyta`           |
 | Callisto                          |           `callisto`           |
+| Calvar'ion                        |          `calvarion`           |
 | Cerberus                          |           `cerberus`           |
 | Chambers Of Xeric                 |       `chambersOfXeric`        |
 | Chambers Of Xeric: Challenge Mode | `chambersOfXericChallengeMode` |
@@ -140,6 +137,7 @@ Activities consist of all levels of clue scrolls as well as minigames and bosses
 | Dagannoth Rex                     |         `dagannothRex`         |
 | Dagannoth Supreme                 |       `dagannothSupreme`       |
 | Deranged Archaeologist            |    `derangedArchaeologist`     |
+| Duke Sucellus                     |         `dukeSucellus`         |
 | General Graardor                  |       `generalGraardor`        |
 | Giant Mole                        |          `giantMole`           |
 | Grotesque Guardians               |      `grotesqueGuardians`      |
@@ -149,22 +147,34 @@ Activities consist of all levels of clue scrolls as well as minigames and bosses
 | Kraken                            |            `kraken`            |
 | Kreearra                          |           `kreeArra`           |
 | K'ril Tsutsaroth                  |        `krilTsutsaroth`        |
+| Lunar Chests                      |         `lunarChests`          |
 | Mimic                             |            `mimic`             |
 | Nex                               |             `nex`              |
-| The Nightmare of Ashihama         |          `nightmare`           |
+| Nightmare                         |          `nightmare`           |
 | Phosani's Nightmare               |      `phosanisNightmare`       |
 | Obor                              |             `obor`             |
+| Phantom Muspah                    |        `phantomMuspah`         |
 | Sarachnis                         |          `sarachnis`           |
 | Scorpia                           |           `scorpia`            |
+| Scurrius                          |           `scurrius`           |
 | Skotizo                           |           `skotizo`            |
+| Sol Heredit                       |          `solHeredit`          |
+| Spindel                           |           `spindel`            |
 | Tempoross                         |          `tempoross`           |
 | The Gauntlet                      |           `gauntlet`           |
 | The Corrupted Gauntlet            |      `corruptedGauntlet`       |
+| The Hueycoatl                     |          `hueycoatl`           |
+| The Leviathan                     |          `leviathan`           |
+| The Royal Titans                  |         `royalTitans`          |
+| The Whisperer                     |          `whisperer`           |
 | Theatre Of Blood                  |        `theatreOfBlood`        |
 | Theatre Of Blood: Hard Mode       |    `theatreOfBloodHardMode`    |
 | Thermonuclear Smoke Devil         |   `thermonuclearSmokeDevil`    |
+| Tombs of Amascut                  |        `tombsOfAmascut`        |
+| Tombs of Amascut: Expert Mode     |   `tombsOfAmascutExpertMode`   |
 | TzKal-Zuk                         |           `tzKalZuk`           |
 | TzTok-Jad                         |           `tzTokJad`           |
+| Vardorvis                         |          `vardorvis`           |
 | Venenatis                         |          `venenatis`           |
 | Vetion                            |            `vetion`            |
 | Vorkath                           |           `vorkath`            |
@@ -176,7 +186,7 @@ Activities consist of all levels of clue scrolls as well as minigames and bosses
 
 `getStats` returns a player object that looks like this:
 
-```javascript
+```typescript
 {
   name: 'Lynx Titan',
   mode: 'main',
@@ -197,6 +207,8 @@ Activities consist of all levels of clue scrolls as well as minigames and bosses
     pvpArena: {},
     soulWarsZeal: {},
     riftsClosed: {},
+    colosseumGlory: {},
+    collectionsLogged: {},
     bosses: {}
   }
 }
@@ -204,7 +216,7 @@ Activities consist of all levels of clue scrolls as well as minigames and bosses
 
 `getSkillPage` returns and array of 25 players (This represents a page on the hiscores):
 
-```javascript
+```typescript
 [
   { rank: 1, name: 'Lynx Titan', level: 2277, xp: 4600000000, dead: false },
   {},
@@ -217,7 +229,7 @@ Activities consist of all levels of clue scrolls as well as minigames and bosses
 
 Get the properly formatted name of any skill, boss, clue or other activity:
 
-```javascript
+```typescript
 // kril === "K'ril Tsutsaroth"
 const kril = FORMATTED_BOSS_NAMES['krilTsutsaroth'];
 ```

__tests__/attackTopPage.html

@@ -1,41 +1,87 @@
-<!DOCTYPE html>
+<!doctype html>
-<!-- saved from url=(0079)https://secure.runescape.com/m=hiscore_oldschool/overall?table=1#headerHiscores -->
+<!--[if lt IE 7]><html class="no-js lt-ie10 lt-ie9 lt-ie8 lt-ie7" lang="en"><![endif]-->
-<html class="js svg websockets localstorage websocketsbinary sharedworkers webworkers classlist canvas video webgl csspointerevents progressbar meter fileinput inlinesvg supports datalistelem no-touchevents details indexeddb indexeddb-deletedatabase appearance backgroundcliptext borderimage boxsizing cssfilters flexbox flexboxlegacy no-flexboxtweener webp webp-alpha webp-animation webp-lossless videoautoplay dataworkers blobworkers" lang="en" data-whatinput="mouse" data-whatintent="mouse"><!--<![endif]--><head><meta http-equiv="Content-Type" content="text/html; charset=windows-1252"><script src="./attackTopPage_files/sdk.js" async="" crossorigin="anonymous"></script><script async="" src="./attackTopPage_files/gtm.js"></script><script src="./attackTopPage_files/Criciousand-meth-shake-Exit-be-till-in-ches-Shad" async=""></script>
+<!--[if (IE 7)&!(IEMobile)]><html class="no-js lt-ie10 lt-ie9 lt-ie8" lang="en"><![endif]-->
-<link href="./attackTopPage_files/rsp777_basic-101.css" rel="stylesheet" type="text/css" media="all">
+<!--[if (IE 8)&!(IEMobile)]><html class="no-js lt-ie10 lt-ie9" lang="en"><![endif]-->
+<!--[if (IE 9)&!(IEMobile)]><html class="no-js lt-ie10" lang="en"><![endif]-->
+<!--[if gt IE 9]><!--><!-- x -->
+<html class="no-js" lang="en"> <!--<![endif]-->
 
-<script src="./attackTopPage_files/vendor-1.js"></script>
+<head>
+  <link href="https://www.runescape.com/css/rsp777_basic-119.css" rel="stylesheet" type="text/css" media="all">
+  <script data-cookieconsent="ignore">
+    window.dataLayer = window.dataLayer || [];
+    function gtag() {
+      dataLayer.push(arguments);
+    }
+    gtag("consent", "default", {
+      ad_storage: "denied",
+      analytics_storage: "denied",
+      functionality_storage: "denied",
+      personalization_storage: "denied",
+      security_storage: "granted",
+      wait_for_update: 500,
+    });
+    gtag("set", "ads_data_redaction", true);
+  </script>
+  <script data-cookieconsent="ignore">
+    window.dataLayer = window.dataLayer || [];
+    function gtag() {
+      dataLayer.push(arguments);
+    }
+    gtag("consent", "default", {
+      ad_storage: "denied",
+      analytics_storage: "denied",
+      functionality_storage: "denied",
+      personalization_storage: "denied",
+      security_storage: "granted",
+      wait_for_update: 500,
+    });
+    gtag("set", "ads_data_redaction", true);
+  </script>
+  <script id="Cookiebot" src="https://consent.cookiebot.com/uc.js" data-cbid="9147fcf2-a466-4a5d-82ab-43e528833d80"
+    data-blockingmode="auto"></script>
+  <script src="https://www.runescape.com/js/c/responsive/vendor-151.js" data-cookieconsent="ignore"></script>
   <title>Old School Hiscores</title>
-<meta name="keywords" content="MMORPG, free RPG games online, online multiplayer, role-playing, massively multiplayer games, mmo, RuneScape, Jagex">
+  <meta name="keywords"
-<meta name="description" content="If you&#39;re a RuneScape veteran hungry for nostalgia, get stuck right in to Old School RuneScape. Sign up for membership and re-live the adventure.">
+    content="MMORPG, free RPG games online, online multiplayer, role-playing, massively multiplayer games, mmo, RuneScape, Jagex" />
+  <meta name="description"
+    content="If you're a RuneScape veteran hungry for nostalgia, get stuck right in to Old School RuneScape. Sign up for membership and re-live the adventure." />
 
-<link rel="icon" type="image/vnd.microsoft.icon" href="https://www.runescape.com/img/global/favicon.ico">
+  <link rel="icon" type="image/vnd.microsoft.icon" href="https://www.runescape.com/img/global/favicon.ico" />
-<link rel="SHORTCUT ICON" href="https://www.runescape.com/img/global/favicon.ico">
+  <link rel="SHORTCUT ICON" href="https://www.runescape.com/img/global/favicon.ico" />
   <link rel="apple-touch-icon" href="https://www.runescape.com/img/global/mobile.png">
-<meta property="fb:app_id" content="174823375888281">
+  <meta property="fb:app_id" content="174823375888281" />
 
-<meta property="og:title" content="Old School  Hiscores">
+  <meta property="og:title" content="Old School  Hiscores" />
-<meta property="og:type" content="website">
+  <meta property="og:type" content="website" />
-<meta property="og:site_name" content="Old School RuneScape">
+  <meta property="og:site_name" content="Old School RuneScape" />
-<meta property="og:image" content="https://www.runescape.com/img/rsp777/social-share-fb.jpg?1">
+  <meta property="og:image" content="https://www.runescape.com/img/rsp777/social-share-fb.jpg?1" />
-<meta property="og:url" content="https://www.runescape.com">
+  <meta property="og:url" content="https://www.runescape.com" />
-<meta property="og:description" content="If you&#39;re a RuneScape veteran hungry for nostalgia, get stuck right in to Old School RuneScape. Sign up for membership and re-live the adventure.">
+  <meta property="og:description"
+    content="If you're a RuneScape veteran hungry for nostalgia, get stuck right in to Old School RuneScape. Sign up for membership and re-live the adventure." />
   <meta name="google-site-verification" content="RFtGg-G07XweT7nQe032HocvnRPhJAsdZqrq4NX_Op8">
   <meta itemprop="name" content="RuneScape">
-<meta itemprop="description" content="If you&#39;re a RuneScape veteran hungry for nostalgia, get stuck right in to Old School RuneScape. Sign up for membership and re-live the adventure.">
+  <meta itemprop="description"
+    content="If you're a RuneScape veteran hungry for nostalgia, get stuck right in to Old School RuneScape. Sign up for membership and re-live the adventure.">
+  <meta name="twitter:card" content="summary_large_image" />
   <meta name="twitter:domain" content="Oldschool.RuneScape.com">
   <meta name="twitter:url" content="https://www.runescape.com">
   <meta name="twitter:title" content="Old School  Hiscores">
-<meta name="twitter:description" content="If you&#39;re a RuneScape veteran hungry for nostalgia, get stuck right in to Old School RuneScape. Sign up for membership and re-live the adventure.">
+  <meta name="twitter:description"
+    content="If you're a RuneScape veteran hungry for nostalgia, get stuck right in to Old School RuneScape. Sign up for membership and re-live the adventure.">
   <meta name="twitter:image:src" content="https://www.runescape.com/img/rsp777/social-share.jpg?1">
   <meta name="twitter:site" content="@OldSchoolRS">
-<meta name="google-site-verification" content="pUwl5KYHKSZ6tbbgsR2wYNv1kbVmsYral3iFmijHTWM">
+  <meta name='google-site-verification' content='pUwl5KYHKSZ6tbbgsR2wYNv1kbVmsYral3iFmijHTWM' />
-<link href="./attackTopPage_files/rsp777_hiscore-105.css" rel="stylesheet" type="text/css" media="all">
+  <link href="https://www.runescape.com/css/rsp777_hiscore-119.css" rel="stylesheet" type="text/css" media="all">
   <style>
-    
     .leaguepoints:before {
       content: url('https://www.runescape.com/img/rsp777/game_icon_leaguepoints.png?2');
     }
 
+    .deadmanpoints:before {
+      content: url('https://www.runescape.com/img/rsp777/game_icon_deadmanpoints.png?2');
+    }
+
     .bountyhunterhunter:before {
       content: url('https://www.runescape.com/img/rsp777/game_icon_bountyhunterhunter.png?2');
     }
@@ -44,6 +90,14 @@
       content: url('https://www.runescape.com/img/rsp777/game_icon_bountyhunterrogue.png?2');
     }
 
+    .bountyhunterlegacyhunter:before {
+      content: url('https://www.runescape.com/img/rsp777/game_icon_bountyhunterlegacyhunter.png?2');
+    }
+
+    .bountyhunterlegacyrogue:before {
+      content: url('https://www.runescape.com/img/rsp777/game_icon_bountyhunterlegacyrogue.png?2');
+    }
+
     .cluescrollsall:before {
       content: url('https://www.runescape.com/img/rsp777/game_icon_cluescrollsall.png?2');
     }
@@ -76,10 +130,18 @@
       content: url('https://www.runescape.com/img/rsp777/game_icon_lmsrank.png?2');
     }
 
+    .pvparenarank:before {
+      content: url('https://www.runescape.com/img/rsp777/game_icon_pvparenarank.png?2');
+    }
+
     .soulwarszeal:before {
       content: url('https://www.runescape.com/img/rsp777/game_icon_soulwarszeal.png?2');
     }
 
+    .riftsclosed:before {
+      content: url('https://www.runescape.com/img/rsp777/game_icon_riftsclosed.png?2');
+    }
+
     .abyssalsire:before {
       content: url('https://www.runescape.com/img/rsp777/game_icon_abyssalsire.png?2');
     }
@@ -88,6 +150,10 @@
       content: url('https://www.runescape.com/img/rsp777/game_icon_alchemicalhydra.png?2');
     }
 
+    .artio:before {
+      content: url('https://www.runescape.com/img/rsp777/game_icon_artio.png?2');
+    }
+
     .barrowschests:before {
       content: url('https://www.runescape.com/img/rsp777/game_icon_barrowschests.png?2');
     }
@@ -100,6 +166,10 @@
       content: url('https://www.runescape.com/img/rsp777/game_icon_callisto.png?2');
     }
 
+    .calvarion:before {
+      content: url('https://www.runescape.com/img/rsp777/game_icon_calvarion.png?2');
+    }
+
     .cerberus:before {
       content: url('https://www.runescape.com/img/rsp777/game_icon_cerberus.png?2');
     }
@@ -148,6 +218,10 @@
       content: url('https://www.runescape.com/img/rsp777/game_icon_derangedarchaeologist.png?2');
     }
 
+    .dukesucellus:before {
+      content: url('https://www.runescape.com/img/rsp777/game_icon_dukesucellus.png?2');
+    }
+
     .generalgraardor:before {
       content: url('https://www.runescape.com/img/rsp777/game_icon_generalgraardor.png?2');
     }
@@ -188,14 +262,26 @@
       content: url('https://www.runescape.com/img/rsp777/game_icon_mimic.png?2');
     }
 
+    .nex:before {
+      content: url('https://www.runescape.com/img/rsp777/game_icon_nex.png?2');
+    }
+
     .nightmare:before {
       content: url('https://www.runescape.com/img/rsp777/game_icon_nightmare.png?2');
     }
 
+    .phosanisnightmare:before {
+      content: url('https://www.runescape.com/img/rsp777/game_icon_phosanisnightmare.png?2');
+    }
+
     .obor:before {
       content: url('https://www.runescape.com/img/rsp777/game_icon_obor.png?2');
     }
 
+    .phantommuspah:before {
+      content: url('https://www.runescape.com/img/rsp777/game_icon_phantommuspah.png?2');
+    }
+
     .sarachnis:before {
       content: url('https://www.runescape.com/img/rsp777/game_icon_sarachnis.png?2');
     }
@@ -208,6 +294,10 @@
       content: url('https://www.runescape.com/img/rsp777/game_icon_skotizo.png?2');
     }
 
+    .spindel:before {
+      content: url('https://www.runescape.com/img/rsp777/game_icon_spindel.png?2');
+    }
+
     .tempoross:before {
       content: url('https://www.runescape.com/img/rsp777/game_icon_tempoross.png?2');
     }
@@ -220,14 +310,34 @@
       content: url('https://www.runescape.com/img/rsp777/game_icon_thecorruptedgauntlet.png?2');
     }
 
+    .theleviathan:before {
+      content: url('https://www.runescape.com/img/rsp777/game_icon_theleviathan.png?2');
+    }
+
+    .thewhisperer:before {
+      content: url('https://www.runescape.com/img/rsp777/game_icon_thewhisperer.png?2');
+    }
+
     .theatreofblood:before {
       content: url('https://www.runescape.com/img/rsp777/game_icon_theatreofblood.png?2');
     }
 
+    .theatreofbloodhardmode:before {
+      content: url('https://www.runescape.com/img/rsp777/game_icon_theatreofbloodhardmode.png?2');
+    }
+
     .thermonuclearsmokedevil:before {
       content: url('https://www.runescape.com/img/rsp777/game_icon_thermonuclearsmokedevil.png?2');
     }
 
+    .tombsofamascut:before {
+      content: url('https://www.runescape.com/img/rsp777/game_icon_tombsofamascut.png?2');
+    }
+
+    .tombsofamascutexpertmode:before {
+      content: url('https://www.runescape.com/img/rsp777/game_icon_tombsofamascutexpertmode.png?2');
+    }
+
     .tzkalzuk:before {
       content: url('https://www.runescape.com/img/rsp777/game_icon_tzkalzuk.png?2');
     }
@@ -236,6 +346,10 @@
       content: url('https://www.runescape.com/img/rsp777/game_icon_tztokjad.png?2');
     }
 
+    .vardorvis:before {
+      content: url('https://www.runescape.com/img/rsp777/game_icon_vardorvis.png?2');
+    }
+
     .venenatis:before {
       content: url('https://www.runescape.com/img/rsp777/game_icon_venenatis.png?2');
     }
@@ -259,174 +373,282 @@
     .zulrah:before {
       content: url('https://www.runescape.com/img/rsp777/game_icon_zulrah.png?2');
     }
-    
   </style>
-<style type="text/css" data-fbcssmodules="css:fb.css.base css:fb.css.dialog css:fb.css.iframewidget css:fb.css.customer_chat_plugin_iframe">.fb_hidden{position:absolute;top:-10000px;z-index:10001}.fb_reposition{overflow:hidden;position:relative}.fb_invisible{display:none}.fb_reset{background:none;border:0;border-spacing:0;color:#000;cursor:auto;direction:ltr;font-family:"lucida grande", tahoma, verdana, arial, sans-serif;font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:1;margin:0;overflow:visible;padding:0;text-align:left;text-decoration:none;text-indent:0;text-shadow:none;text-transform:none;visibility:visible;white-space:normal;word-spacing:normal}.fb_reset>div{overflow:hidden}@keyframes fb_transform{from{opacity:0;transform:scale(.95)}to{opacity:1;transform:scale(1)}}.fb_animate{animation:fb_transform .3s forwards}
+</head>
-.fb_dialog{background:rgba(82, 82, 82, .7);position:absolute;top:-10000px;z-index:10001}.fb_dialog_advanced{border-radius:8px;padding:10px}.fb_dialog_content{background:#fff;color:#373737}.fb_dialog_close_icon{background:url(https://static.xx.fbcdn.net/rsrc.php/v3/yq/r/IE9JII6Z1Ys.png) no-repeat scroll 0 0 transparent;cursor:pointer;display:block;height:15px;position:absolute;right:18px;top:17px;width:15px}.fb_dialog_mobile .fb_dialog_close_icon{left:5px;right:auto;top:5px}.fb_dialog_padding{background-color:transparent;position:absolute;width:1px;z-index:-1}.fb_dialog_close_icon:hover{background:url(https://static.xx.fbcdn.net/rsrc.php/v3/yq/r/IE9JII6Z1Ys.png) no-repeat scroll 0 -15px transparent}.fb_dialog_close_icon:active{background:url(https://static.xx.fbcdn.net/rsrc.php/v3/yq/r/IE9JII6Z1Ys.png) no-repeat scroll 0 -30px transparent}.fb_dialog_iframe{line-height:0}.fb_dialog_content .dialog_title{background:#6d84b4;border:1px solid #365899;color:#fff;font-size:14px;font-weight:bold;margin:0}.fb_dialog_content .dialog_title>span{background:url(https://static.xx.fbcdn.net/rsrc.php/v3/yd/r/Cou7n-nqK52.gif) no-repeat 5px 50%;float:left;padding:5px 0 7px 26px}body.fb_hidden{height:100%;left:0;margin:0;overflow:visible;position:absolute;top:-10000px;transform:none;width:100%}.fb_dialog.fb_dialog_mobile.loading{background:url(https://static.xx.fbcdn.net/rsrc.php/v3/ya/r/3rhSv5V8j3o.gif) white no-repeat 50% 50%;min-height:100%;min-width:100%;overflow:hidden;position:absolute;top:0;z-index:10001}.fb_dialog.fb_dialog_mobile.loading.centered{background:none;height:auto;min-height:initial;min-width:initial;width:auto}.fb_dialog.fb_dialog_mobile.loading.centered #fb_dialog_loader_spinner{width:100%}.fb_dialog.fb_dialog_mobile.loading.centered .fb_dialog_content{background:none}.loading.centered #fb_dialog_loader_close{clear:both;color:#fff;display:block;font-size:18px;padding-top:20px}#fb-root #fb_dialog_ipad_overlay{background:rgba(0, 0, 0, .4);bottom:0;left:0;min-height:100%;position:absolute;right:0;top:0;width:100%;z-index:10000}#fb-root #fb_dialog_ipad_overlay.hidden{display:none}.fb_dialog.fb_dialog_mobile.loading iframe{visibility:hidden}.fb_dialog_mobile .fb_dialog_iframe{position:sticky;top:0}.fb_dialog_content .dialog_header{background:linear-gradient(from(#738aba), to(#2c4987));border-bottom:1px solid;border-color:#043b87;box-shadow:white 0 1px 1px -1px inset;color:#fff;font:bold 14px Helvetica, sans-serif;text-overflow:ellipsis;text-shadow:rgba(0, 30, 84, .296875) 0 -1px 0;vertical-align:middle;white-space:nowrap}.fb_dialog_content .dialog_header table{height:43px;width:100%}.fb_dialog_content .dialog_header td.header_left{font-size:12px;padding-left:5px;vertical-align:middle;width:60px}.fb_dialog_content .dialog_header td.header_right{font-size:12px;padding-right:5px;vertical-align:middle;width:60px}.fb_dialog_content .touchable_button{background:linear-gradient(from(#4267B2), to(#2a4887));background-clip:padding-box;border:1px solid #29487d;border-radius:3px;display:inline-block;line-height:18px;margin-top:3px;max-width:85px;padding:4px 12px;position:relative}.fb_dialog_content .dialog_header .touchable_button input{background:none;border:none;color:#fff;font:bold 12px Helvetica, sans-serif;margin:2px -12px;padding:2px 6px 3px 6px;text-shadow:rgba(0, 30, 84, .296875) 0 -1px 0}.fb_dialog_content .dialog_header .header_center{color:#fff;font-size:16px;font-weight:bold;line-height:18px;text-align:center;vertical-align:middle}.fb_dialog_content .dialog_content{background:url(https://static.xx.fbcdn.net/rsrc.php/v3/y9/r/jKEcVPZFk-2.gif) no-repeat 50% 50%;border:1px solid #4a4a4a;border-bottom:0;border-top:0;height:150px}.fb_dialog_content .dialog_footer{background:#f5f6f7;border:1px solid #4a4a4a;border-top-color:#ccc;height:40px}#fb_dialog_loader_close{float:left}.fb_dialog.fb_dialog_mobile .fb_dialog_close_icon{visibility:hidden}#fb_dialog_loader_spinner{animation:rotateSpinner 1.2s linear infinite;background-color:transparent;background-image:url(https://static.xx.fbcdn.net/rsrc.php/v3/yD/r/t-wz8gw1xG1.png);background-position:50% 50%;background-repeat:no-repeat;height:24px;width:24px}@keyframes rotateSpinner{0%{transform:rotate(0deg)}100%{transform:rotate(360deg)}}
+
-.fb_iframe_widget{display:inline-block;position:relative}.fb_iframe_widget span{display:inline-block;position:relative;text-align:justify}.fb_iframe_widget iframe{position:absolute}.fb_iframe_widget_fluid_desktop,.fb_iframe_widget_fluid_desktop span,.fb_iframe_widget_fluid_desktop iframe{max-width:100%}.fb_iframe_widget_fluid_desktop iframe{min-width:220px;position:relative}.fb_iframe_widget_lift{z-index:1}.fb_iframe_widget_fluid{display:inline}.fb_iframe_widget_fluid span{width:100%}
+<body id="body">
-.fb_mpn_mobile_landing_page_slide_out{animation-duration:200ms;animation-name:fb_mpn_landing_page_slide_out;transition-timing-function:ease-in}.fb_mpn_mobile_landing_page_slide_out_from_left{animation-duration:200ms;animation-name:fb_mpn_landing_page_slide_out_from_left;transition-timing-function:ease-in}.fb_mpn_mobile_landing_page_slide_up{animation-duration:500ms;animation-name:fb_mpn_landing_page_slide_up;transition-timing-function:ease-in}.fb_mpn_mobile_bounce_in{animation-duration:300ms;animation-name:fb_mpn_bounce_in;transition-timing-function:ease-in}.fb_mpn_mobile_bounce_out{animation-duration:300ms;animation-name:fb_mpn_bounce_out;transition-timing-function:ease-in}.fb_mpn_mobile_bounce_out_v2{animation-duration:300ms;animation-name:fb_mpn_fade_out;transition-timing-function:ease-in}.fb_customer_chat_bounce_in_v2{animation-duration:300ms;animation-name:fb_bounce_in_v2;transition-timing-function:ease-in}.fb_customer_chat_bounce_in_from_left{animation-duration:300ms;animation-name:fb_bounce_in_from_left;transition-timing-function:ease-in}.fb_customer_chat_bounce_out_v2{animation-duration:300ms;animation-name:fb_bounce_out_v2;transition-timing-function:ease-in}.fb_customer_chat_bounce_out_from_left{animation-duration:300ms;animation-name:fb_bounce_out_from_left;transition-timing-function:ease-in}.fb_customer_chat_bubble_animated_no_badge{box-shadow:0 3px 12px rgba(0, 0, 0, .15);transition:box-shadow 150ms linear}.fb_customer_chat_bubble_animated_no_badge:hover{box-shadow:0 5px 24px rgba(0, 0, 0, .3)}.fb_customer_chat_bubble_animated_with_badge{box-shadow:-5px 4px 14px rgba(0, 0, 0, .15);transition:box-shadow 150ms linear}.fb_customer_chat_bubble_animated_with_badge:hover{box-shadow:-5px 8px 24px rgba(0, 0, 0, .2)}.fb_invisible_flow{display:inherit;height:0;overflow-x:hidden;width:0}.fb_new_ui_mobile_overlay_active{overflow:hidden}@keyframes fb_mpn_landing_page_slide_in{0%{border-radius:50%;margin:0 24px;width:60px}40%{border-radius:18px}100%{margin:0 12px;width:100% - 24px}}@keyframes fb_mpn_landing_page_slide_in_from_left{0%{border-radius:50%;left:12px;margin:0 24px;width:60px}40%{border-radius:18px}100%{left:12px;margin:0 12px;width:100% - 24px}}@keyframes fb_mpn_landing_page_slide_out{0%{margin:0 12px;width:100% - 24px}60%{border-radius:18px}100%{border-radius:50%;margin:0 24px;width:60px}}@keyframes fb_mpn_landing_page_slide_out_from_left{0%{left:12px;width:100% - 24px}60%{border-radius:18px}100%{border-radius:50%;left:12px;width:60px}}@keyframes fb_mpn_landing_page_slide_up{0%{bottom:0;opacity:0}100%{bottom:24px;opacity:1}}@keyframes fb_mpn_bounce_in{0%{opacity:.5;top:100%}100%{opacity:1;top:0}}@keyframes fb_mpn_fade_out{0%{bottom:30px;opacity:1}100%{bottom:0;opacity:0}}@keyframes fb_mpn_bounce_out{0%{opacity:1;top:0}100%{opacity:.5;top:100%}}@keyframes fb_bounce_in_v2{0%{opacity:0;transform:scale(0, 0);transform-origin:bottom right}50%{transform:scale(1.03, 1.03);transform-origin:bottom right}100%{opacity:1;transform:scale(1, 1);transform-origin:bottom right}}@keyframes fb_bounce_in_from_left{0%{opacity:0;transform:scale(0, 0);transform-origin:bottom left}50%{transform:scale(1.03, 1.03);transform-origin:bottom left}100%{opacity:1;transform:scale(1, 1);transform-origin:bottom left}}@keyframes fb_bounce_out_v2{0%{opacity:1;transform:scale(1, 1);transform-origin:bottom right}100%{opacity:0;transform:scale(0, 0);transform-origin:bottom right}}@keyframes fb_bounce_out_from_left{0%{opacity:1;transform:scale(1, 1);transform-origin:bottom left}100%{opacity:0;transform:scale(0, 0);transform-origin:bottom left}}@keyframes fb_bounce_out_v2_mobile_chat_started{0%{opacity:1;top:0}100%{opacity:0;top:20px}}@keyframes fb_customer_chat_bubble_bounce_in_animation{0%{bottom:6pt;opacity:0;transform:scale(0, 0);transform-origin:center}70%{bottom:18pt;opacity:1;transform:scale(1.2, 1.2)}100%{transform:scale(1, 1)}}@keyframes slideInFromBottom{0%{opacity:.1;transform:translateY(100%)}100%{opacity:1;transform:translateY(0)}}@keyframes slideInFromBottomDelay{0%{opacity:0;transform:translateY(100%)}97%{opacity:0;transform:translateY(100%)}100%{opacity:1;transform:translateY(0)}}</style></head>
-<body id="body"><div id="fb-root" class="174823375888281 fb_reset"><script async="" src="./attackTopPage_files/sdk(1).js"></script><div style="position: absolute; top: -10000px; width: 0px; height: 0px;"><div></div></div></div>
   <div class="centerDiv">
     <div class="frame wide_e">
-<span style="float:right;"><a id="loginLink" href="https://secure.runescape.com/m=weblogin/loginform?theme=oldschool&amp;mod=hiscore_oldschool&amp;ssl=1&amp;dest=overall?table=1">Log in</a></span>
+      <span style="float:right;"><a id="loginLink"
+          href="https://secure.runescape.com/m=weblogin/loginform?theme=oldschool&mod=hiscore_oldschool&amp;ssl=1&amp;dest=overall?table=1">Log
+          in</a></span>
     </div>
     <br>
     <div class="hiscoretitlebground">
       <div class="hiscoretitleframe">
 
-<strong>Old School  Hiscores</strong><br>
+        <strong>Old School Hiscores</strong><br />
         <a href="https://oldschool.runescape.com/">Home</a>
       </div>
     </div>
-<br>
+    <br />
     <div align="center">
 
       <div class="ironman-nav">
         <span class="ironman-nav__option ironman-nav__option--current">Hiscores</span>
+        <div class="ironman-nav__group">
+          <a class="ironman-nav__option ironman-nav__option--parent">
+            Ironman
+          </a>
+          <div class="ironman-nav__submenu">
             <a class="ironman-nav__option" href="https://secure.runescape.com/m=hiscore_oldschool_ironman/">Ironman</a>
-<a class="ironman-nav__option" href="https://secure.runescape.com/m=hiscore_oldschool_ultimate/">Ultimate Ironman</a>
+            <a class="ironman-nav__option" href="https://secure.runescape.com/m=hiscore_oldschool_ultimate/">Ultimate
-<a class="ironman-nav__option" href="https://secure.runescape.com/m=hiscore_oldschool_hardcore_ironman/">Hardcore Ironman</a>
+              Ironman</a>
-<a class="ironman-nav__option" href="https://secure.runescape.com/m=hiscore_oldschool_deadman/">Deadman Mode</a>
+            <a class="ironman-nav__option"
+              href="https://secure.runescape.com/m=hiscore_oldschool_hardcore_ironman/">Hardcore Ironman</a>
+          </div>
+        </div>
+        <div class="ironman-nav__group">
+          <a class="ironman-nav__option ironman-nav__option--parent">
+            Seasonal
+          </a>
+          <div class="ironman-nav__submenu">
+            <a class="ironman-nav__option" href="https://secure.runescape.com/m=hiscore_oldschool_deadman/">Deadman
+              Mode</a>
             <a class="ironman-nav__option" href="https://secure.runescape.com/m=hiscore_oldschool_seasonal/">Leagues</a>
-<a class="ironman-nav__option" href="https://secure.runescape.com/m=hiscore_oldschool_tournament/">Tournament</a>
+            <a class="ironman-nav__option"
+              href="https://secure.runescape.com/m=hiscore_oldschool_tournament/">Tournament</a>
+          </div>
+        </div>
+        <div class="ironman-nav__group">
+          <a class="ironman-nav__option ironman-nav__option--parent">
+            Group Ironman
+          </a>
+          <div class="ironman-nav__submenu">
+            <a class="ironman-nav__option"
+              href="https://secure.runescape.com/m=hiscore_oldschool_ironman/group-ironman/">Group Ironman</a>
+            <a class="ironman-nav__option"
+              href="https://secure.runescape.com/m=hiscore_oldschool_hardcore_ironman/group-ironman/">Hardcore Group
+              Ironman</a>
+          </div>
+        </div>
+        <div class="ironman-nav__group">
+          <a class="ironman-nav__option" href="https://secure.runescape.com/m=hiscore_oldschool_fresh_start/">
+            Fresh Start Worlds
+          </a>
+        </div>
+        <div class="ironman-nav__group">
+          <a class="ironman-nav__option ironman-nav__option--parent">
+            Account Builds
+          </a>
+          <div class="ironman-nav__submenu">
+            <a class="ironman-nav__option" href="https://secure.runescape.com/m=hiscore_oldschool_skiller/">Skillers</a>
+            <a class="ironman-nav__option" href="https://secure.runescape.com/m=hiscore_oldschool_skiller_defence/">1
+              Defence</a>
+          </div>
+        </div>
       </div>
       <div class="personal-hiscores">
         <nav class="personal-hiscores__side-banner">
           <div id="col1">
             <div id="headerCategory"></div>
-<a class="personal-hiscores__scroll-arrow personal-hiscores__scroll-arrow--up personal-hiscores__scroll-arrow--disabled" href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=1#" data-js-scroll="up">Up</a>
+            <a class="personal-hiscores__scroll-arrow personal-hiscores__scroll-arrow--up" href="#"
+              data-js-scroll="up">Up</a>
             <div id="contentCategory">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=0#headerHiscores" class="    Overall    ">
+              <a href="overall?table=0#headerHiscores" class="    Overall    ">
                 Overall
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=1#headerHiscores" class="    Attack    ">
+              <a href="overall?table=1#headerHiscores" class="    Attack    ">
                 Attack
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=2#headerHiscores" class="    Defence    ">
+              <a href="overall?table=2#headerHiscores" class="    Defence    ">
                 Defence
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=3#headerHiscores" class="    Strength    ">
+              <a href="overall?table=3#headerHiscores" class="    Strength    ">
                 Strength
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=4#headerHiscores" class="    Hitpoints    ">
+              <a href="overall?table=4#headerHiscores" class="    Hitpoints    ">
                 Hitpoints
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=5#headerHiscores" class="    Ranged    ">
+              <a href="overall?table=5#headerHiscores" class="    Ranged    ">
                 Ranged
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=6#headerHiscores" class="    Prayer    ">
+              <a href="overall?table=6#headerHiscores" class="    Prayer    ">
                 Prayer
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=7#headerHiscores" class="    Magic    ">
+              <a href="overall?table=7#headerHiscores" class="    Magic    ">
                 Magic
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=8#headerHiscores" class="    Cooking    ">
+              <a href="overall?table=8#headerHiscores" class="    Cooking    ">
                 Cooking
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=9#headerHiscores" class="    Woodcutting    ">
+              <a href="overall?table=9#headerHiscores" class="    Woodcutting    ">
                 Woodcutting
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=10#headerHiscores" class="    Fletching    ">
+              <a href="overall?table=10#headerHiscores" class="    Fletching    ">
                 Fletching
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=11#headerHiscores" class="    Fishing    ">
+              <a href="overall?table=11#headerHiscores" class="    Fishing    ">
                 Fishing
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=12#headerHiscores" class="    Firemaking    ">
+              <a href="overall?table=12#headerHiscores" class="    Firemaking    ">
                 Firemaking
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=13#headerHiscores" class="    Crafting    ">
+              <a href="overall?table=13#headerHiscores" class="    Crafting    ">
                 Crafting
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=14#headerHiscores" class="    Smithing    ">
+              <a href="overall?table=14#headerHiscores" class="    Smithing    ">
                 Smithing
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=15#headerHiscores" class="    Mining    ">
+              <a href="overall?table=15#headerHiscores" class="    Mining    ">
                 Mining
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=16#headerHiscores" class="    Herblore    ">
+              <a href="overall?table=16#headerHiscores" class="    Herblore    ">
                 Herblore
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=17#headerHiscores" class="    Agility    ">
+              <a href="overall?table=17#headerHiscores" class="    Agility    ">
                 Agility
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=18#headerHiscores" class="    Thieving    ">
+              <a href="overall?table=18#headerHiscores" class="    Thieving    ">
                 Thieving
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=19#headerHiscores" class="    Slayer    ">
+              <a href="overall?table=19#headerHiscores" class="    Slayer    ">
                 Slayer
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=20#headerHiscores" class="    Farming    ">
+              <a href="overall?table=20#headerHiscores" class="    Farming    ">
                 Farming
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=21#headerHiscores" class="    Runecraft    ">
+              <a href="overall?table=21#headerHiscores" class="    Runecraft    ">
                 Runecraft
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=22#headerHiscores" class="    Hunter    ">
+              <a href="overall?table=22#headerHiscores" class="    Hunter    ">
                 Hunter
               </a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=23#headerHiscores" class="    Construction    ">
+              <a href="overall?table=23#headerHiscores" class="    Construction    ">
                 Construction
               </a>
               <span style="color: #d9c27e;display: block;text-align: center;">----</span>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=1#headerHiscores" class="activity-link bountyhunterhunter">Bounty Hunter - Hunter</a>
+              <a href="overall?category_type=1&table=2#headerHiscores" class="activity-link bountyhunterhunter">Bounty
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=2#headerHiscores" class="activity-link bountyhunterrogue">Bounty Hunter - Rogue</a>
+                Hunter - Hunter</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=3#headerHiscores" class="activity-link cluescrollsall">Clue Scrolls (all)</a>
+              <a href="overall?category_type=1&table=3#headerHiscores" class="activity-link bountyhunterrogue">Bounty
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=4#headerHiscores" class="activity-link cluescrollsbeginner">Clue Scrolls (beginner)</a>
+                Hunter - Rogue</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=5#headerHiscores" class="activity-link cluescrollseasy">Clue Scrolls (easy)</a>
+              <a href="overall?category_type=1&table=4#headerHiscores"
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=6#headerHiscores" class="activity-link cluescrollsmedium">Clue Scrolls (medium)</a>
+                class="activity-link bountyhunterlegacyhunter">Bounty Hunter (Legacy) - Hunter</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=7#headerHiscores" class="activity-link cluescrollshard">Clue Scrolls (hard)</a>
+              <a href="overall?category_type=1&table=5#headerHiscores"
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=8#headerHiscores" class="activity-link cluescrollselite">Clue Scrolls (elite)</a>
+                class="activity-link bountyhunterlegacyrogue">Bounty Hunter (Legacy) - Rogue</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=9#headerHiscores" class="activity-link cluescrollsmaster">Clue Scrolls (master)</a>
+              <a href="overall?category_type=1&table=6#headerHiscores" class="activity-link cluescrollsall">Clue Scrolls
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=10#headerHiscores" class="activity-link lmsrank">LMS - Rank</a>
+                (all)</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=11#headerHiscores" class="activity-link soulwarszeal">Soul Wars Zeal</a>
+              <a href="overall?category_type=1&table=7#headerHiscores" class="activity-link cluescrollsbeginner">Clue
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=12#headerHiscores" class="activity-link abyssalsire">Abyssal Sire</a>
+                Scrolls (beginner)</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=13#headerHiscores" class="activity-link alchemicalhydra">Alchemical Hydra</a>
+              <a href="overall?category_type=1&table=8#headerHiscores" class="activity-link cluescrollseasy">Clue
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=14#headerHiscores" class="activity-link barrowschests">Barrows Chests</a>
+                Scrolls (easy)</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=15#headerHiscores" class="activity-link bryophyta">Bryophyta</a>
+              <a href="overall?category_type=1&table=9#headerHiscores" class="activity-link cluescrollsmedium">Clue
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=16#headerHiscores" class="activity-link callisto">Callisto</a>
+                Scrolls (medium)</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=17#headerHiscores" class="activity-link cerberus">Cerberus</a>
+              <a href="overall?category_type=1&table=10#headerHiscores" class="activity-link cluescrollshard">Clue
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=18#headerHiscores" class="activity-link chambersofxeric">Chambers of Xeric</a>
+                Scrolls (hard)</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=19#headerHiscores" class="activity-link chambersofxericchallengemode">Chambers of Xeric: Challenge Mode</a>
+              <a href="overall?category_type=1&table=11#headerHiscores" class="activity-link cluescrollselite">Clue
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=20#headerHiscores" class="activity-link chaoselemental">Chaos Elemental</a>
+                Scrolls (elite)</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=21#headerHiscores" class="activity-link chaosfanatic">Chaos Fanatic</a>
+              <a href="overall?category_type=1&table=12#headerHiscores" class="activity-link cluescrollsmaster">Clue
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=22#headerHiscores" class="activity-link commanderzilyana">Commander Zilyana</a>
+                Scrolls (master)</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=23#headerHiscores" class="activity-link corporealbeast">Corporeal Beast</a>
+              <a href="overall?category_type=1&table=13#headerHiscores" class="activity-link lmsrank">LMS - Rank</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=24#headerHiscores" class="activity-link crazyarchaeologist">Crazy Archaeologist</a>
+              <a href="overall?category_type=1&table=14#headerHiscores" class="activity-link pvparenarank">PvP Arena -
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=25#headerHiscores" class="activity-link dagannothprime">Dagannoth Prime</a>
+                Rank</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=26#headerHiscores" class="activity-link dagannothrex">Dagannoth Rex</a>
+              <a href="overall?category_type=1&table=15#headerHiscores" class="activity-link soulwarszeal">Soul Wars
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=27#headerHiscores" class="activity-link dagannothsupreme">Dagannoth Supreme</a>
+                Zeal</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=28#headerHiscores" class="activity-link derangedarchaeologist">Deranged Archaeologist</a>
+              <a href="overall?category_type=1&table=16#headerHiscores" class="activity-link riftsclosed">Rifts
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=29#headerHiscores" class="activity-link generalgraardor">General Graardor</a>
+                closed</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=30#headerHiscores" class="activity-link giantmole">Giant Mole</a>
+              <a href="overall?category_type=1&table=17#headerHiscores" class="activity-link abyssalsire">Abyssal
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=31#headerHiscores" class="activity-link grotesqueguardians">Grotesque Guardians</a>
+                Sire</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=32#headerHiscores" class="activity-link hespori">Hespori</a>
+              <a href="overall?category_type=1&table=18#headerHiscores" class="activity-link alchemicalhydra">Alchemical
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=33#headerHiscores" class="activity-link kalphitequeen">Kalphite Queen</a>
+                Hydra</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=34#headerHiscores" class="activity-link kingblackdragon">King Black Dragon</a>
+              <a href="overall?category_type=1&table=19#headerHiscores" class="activity-link artio">Artio</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=35#headerHiscores" class="activity-link kraken">Kraken</a>
+              <a href="overall?category_type=1&table=20#headerHiscores" class="activity-link barrowschests">Barrows
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=36#headerHiscores" class="activity-link kreearra">Kree'Arra</a>
+                Chests</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=37#headerHiscores" class="activity-link kriltsutsaroth">K'ril Tsutsaroth</a>
+              <a href="overall?category_type=1&table=21#headerHiscores" class="activity-link bryophyta">Bryophyta</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=38#headerHiscores" class="activity-link mimic">Mimic</a>
+              <a href="overall?category_type=1&table=22#headerHiscores" class="activity-link callisto">Callisto</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=39#headerHiscores" class="activity-link nightmare">Nightmare</a>
+              <a href="overall?category_type=1&table=23#headerHiscores" class="activity-link calvarion">Calvar'ion</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=40#headerHiscores" class="activity-link obor">Obor</a>
+              <a href="overall?category_type=1&table=24#headerHiscores" class="activity-link cerberus">Cerberus</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=41#headerHiscores" class="activity-link sarachnis">Sarachnis</a>
+              <a href="overall?category_type=1&table=25#headerHiscores" class="activity-link chambersofxeric">Chambers
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=42#headerHiscores" class="activity-link scorpia">Scorpia</a>
+                of Xeric</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=43#headerHiscores" class="activity-link skotizo">Skotizo</a>
+              <a href="overall?category_type=1&table=26#headerHiscores"
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=44#headerHiscores" class="activity-link tempoross">Tempoross</a>
+                class="activity-link chambersofxericchallengemode">Chambers of Xeric: Challenge Mode</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=45#headerHiscores" class="activity-link thegauntlet">The Gauntlet</a>
+              <a href="overall?category_type=1&table=27#headerHiscores" class="activity-link chaoselemental">Chaos
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=46#headerHiscores" class="activity-link thecorruptedgauntlet">The Corrupted Gauntlet</a>
+                Elemental</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=47#headerHiscores" class="activity-link theatreofblood">Theatre of Blood</a>
+              <a href="overall?category_type=1&table=28#headerHiscores" class="activity-link chaosfanatic">Chaos
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=48#headerHiscores" class="activity-link thermonuclearsmokedevil">Thermonuclear Smoke Devil</a>
+                Fanatic</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=49#headerHiscores" class="activity-link tzkalzuk">TzKal-Zuk</a>
+              <a href="overall?category_type=1&table=29#headerHiscores" class="activity-link commanderzilyana">Commander
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=50#headerHiscores" class="activity-link tztokjad">TzTok-Jad</a>
+                Zilyana</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=51#headerHiscores" class="activity-link venenatis">Venenatis</a>
+              <a href="overall?category_type=1&table=30#headerHiscores" class="activity-link corporealbeast">Corporeal
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=52#headerHiscores" class="activity-link vetion">Vet'ion</a>
+                Beast</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=53#headerHiscores" class="activity-link vorkath">Vorkath</a>
+              <a href="overall?category_type=1&table=31#headerHiscores" class="activity-link crazyarchaeologist">Crazy
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=54#headerHiscores" class="activity-link wintertodt">Wintertodt</a>
+                Archaeologist</a>
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=55#headerHiscores" class="activity-link zalcano">Zalcano</a>
+              <a href="overall?category_type=1&table=32#headerHiscores" class="activity-link dagannothprime">Dagannoth
-<a href="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=1&amp;table=56#headerHiscores" class="activity-link zulrah">Zulrah</a>
+                Prime</a>
+              <a href="overall?category_type=1&table=33#headerHiscores" class="activity-link dagannothrex">Dagannoth
+                Rex</a>
+              <a href="overall?category_type=1&table=34#headerHiscores" class="activity-link dagannothsupreme">Dagannoth
+                Supreme</a>
+              <a href="overall?category_type=1&table=35#headerHiscores"
+                class="activity-link derangedarchaeologist">Deranged Archaeologist</a>
+              <a href="overall?category_type=1&table=36#headerHiscores" class="activity-link dukesucellus">Duke
+                Sucellus</a>
+              <a href="overall?category_type=1&table=37#headerHiscores" class="activity-link generalgraardor">General
+                Graardor</a>
+              <a href="overall?category_type=1&table=38#headerHiscores" class="activity-link giantmole">Giant Mole</a>
+              <a href="overall?category_type=1&table=39#headerHiscores"
+                class="activity-link grotesqueguardians">Grotesque Guardians</a>
+              <a href="overall?category_type=1&table=40#headerHiscores" class="activity-link hespori">Hespori</a>
+              <a href="overall?category_type=1&table=41#headerHiscores" class="activity-link kalphitequeen">Kalphite
+                Queen</a>
+              <a href="overall?category_type=1&table=42#headerHiscores" class="activity-link kingblackdragon">King Black
+                Dragon</a>
+              <a href="overall?category_type=1&table=43#headerHiscores" class="activity-link kraken">Kraken</a>
+              <a href="overall?category_type=1&table=44#headerHiscores" class="activity-link kreearra">Kree'Arra</a>
+              <a href="overall?category_type=1&table=45#headerHiscores" class="activity-link kriltsutsaroth">K'ril
+                Tsutsaroth</a>
+              <a href="overall?category_type=1&table=46#headerHiscores" class="activity-link mimic">Mimic</a>
+              <a href="overall?category_type=1&table=47#headerHiscores" class="activity-link nex">Nex</a>
+              <a href="overall?category_type=1&table=48#headerHiscores" class="activity-link nightmare">Nightmare</a>
+              <a href="overall?category_type=1&table=49#headerHiscores"
+                class="activity-link phosanisnightmare">Phosani's Nightmare</a>
+              <a href="overall?category_type=1&table=50#headerHiscores" class="activity-link obor">Obor</a>
+              <a href="overall?category_type=1&table=51#headerHiscores" class="activity-link phantommuspah">Phantom
+                Muspah</a>
+              <a href="overall?category_type=1&table=52#headerHiscores" class="activity-link sarachnis">Sarachnis</a>
+              <a href="overall?category_type=1&table=53#headerHiscores" class="activity-link scorpia">Scorpia</a>
+              <a href="overall?category_type=1&table=54#headerHiscores" class="activity-link skotizo">Skotizo</a>
+              <a href="overall?category_type=1&table=55#headerHiscores" class="activity-link spindel">Spindel</a>
+              <a href="overall?category_type=1&table=56#headerHiscores" class="activity-link tempoross">Tempoross</a>
+              <a href="overall?category_type=1&table=57#headerHiscores" class="activity-link thegauntlet">The
+                Gauntlet</a>
+              <a href="overall?category_type=1&table=58#headerHiscores" class="activity-link thecorruptedgauntlet">The
+                Corrupted Gauntlet</a>
+              <a href="overall?category_type=1&table=59#headerHiscores" class="activity-link theleviathan">The
+                Leviathan</a>
+              <a href="overall?category_type=1&table=60#headerHiscores" class="activity-link thewhisperer">The
+                Whisperer</a>
+              <a href="overall?category_type=1&table=61#headerHiscores" class="activity-link theatreofblood">Theatre of
+                Blood</a>
+              <a href="overall?category_type=1&table=62#headerHiscores"
+                class="activity-link theatreofbloodhardmode">Theatre of Blood: Hard Mode</a>
+              <a href="overall?category_type=1&table=63#headerHiscores"
+                class="activity-link thermonuclearsmokedevil">Thermonuclear Smoke Devil</a>
+              <a href="overall?category_type=1&table=64#headerHiscores" class="activity-link tombsofamascut">Tombs of
+                Amascut</a>
+              <a href="overall?category_type=1&table=65#headerHiscores"
+                class="activity-link tombsofamascutexpertmode">Tombs of Amascut: Expert Mode</a>
+              <a href="overall?category_type=1&table=66#headerHiscores" class="activity-link tzkalzuk">TzKal-Zuk</a>
+              <a href="overall?category_type=1&table=67#headerHiscores" class="activity-link tztokjad">TzTok-Jad</a>
+              <a href="overall?category_type=1&table=68#headerHiscores" class="activity-link vardorvis">Vardorvis</a>
+              <a href="overall?category_type=1&table=69#headerHiscores" class="activity-link venenatis">Venenatis</a>
+              <a href="overall?category_type=1&table=70#headerHiscores" class="activity-link vetion">Vet'ion</a>
+              <a href="overall?category_type=1&table=71#headerHiscores" class="activity-link vorkath">Vorkath</a>
+              <a href="overall?category_type=1&table=72#headerHiscores" class="activity-link wintertodt">Wintertodt</a>
+              <a href="overall?category_type=1&table=73#headerHiscores" class="activity-link zalcano">Zalcano</a>
+              <a href="overall?category_type=1&table=74#headerHiscores" class="activity-link zulrah">Zulrah</a>
             </div>
-<a class="personal-hiscores__scroll-arrow personal-hiscores__scroll-arrow--down" href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=1#" data-js-scroll="down">Down</a>
+            <a class="personal-hiscores__scroll-arrow personal-hiscores__scroll-arrow--down" href="#"
+              data-js-scroll="down">Down</a>
             <div id="footerCategory"></div>
           </div>
         </nav>
@@ -437,7 +659,7 @@ Construction
               <div id="contentHiscores">
                 <table>
                   <caption>
-<img class="miniimg" src="./attackTopPage_files/skill_icon_attack1.gif">
+                    <img class="miniimg" src="https://www.runescape.com/img/rsp777/hiscores/skill_icon_attack1.gif" />
                     &nbsp;
 
                     Attack
@@ -447,21 +669,23 @@ Hiscores
                     <tr>
                       <th class="right">Rank</th>
                       <th class="left">Name</th>
-<th>Level</th><th class="right">XP</th>
+                      <th>Level</th>
+                      <th class="right">XP</th>
                     </tr>
                   </thead>
                   <tbody>
                     <tr>
                       <td width="60"></td>
                       <td width="120"></td>
-<td width="70"></td><td width="100"></td>
+                      <td width="70"></td>
+                      <td width="100"></td>
                     </tr>
                     <tr class="personal-hiscores__row">
                       <td class="right">
                         1
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=Heur">Heur</a>
+                        <a href="hiscorepersonal?user1=Tai">Tai</a>
                       </td>
                       <td>
                         99
@@ -475,7 +699,7 @@ Hiscores
                         2
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=Unohdettu2">Unohdettu2</a>
+                        <a href="hiscorepersonal?user1=Unohdettu2">Unohdettu2</a>
                       </td>
                       <td>
                         99
@@ -489,7 +713,7 @@ Hiscores
                         3
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=Drakon">Drakon</a>
+                        <a href="hiscorepersonal?user1=Drakon">Drakon</a>
                       </td>
                       <td>
                         99
@@ -503,7 +727,7 @@ Hiscores
                         4
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=Ame%A0Umehara">Ame&nbsp;Umehara</a>
+                        <a href="hiscorepersonal?user1=Ame Hara">Ame Hara</a>
                       </td>
                       <td>
                         99
@@ -517,7 +741,7 @@ Hiscores
                         5
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=Jakee">Jakee</a>
+                        <a href="hiscorepersonal?user1=Jakee">Jakee</a>
                       </td>
                       <td>
                         99
@@ -531,7 +755,7 @@ Hiscores
                         6
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=L00OO00OO00l">L00OO00OO00l</a>
+                        <a href="hiscorepersonal?user1=Aravt">Aravt</a>
                       </td>
                       <td>
                         99
@@ -545,7 +769,7 @@ Hiscores
                         7
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=Howson">Howson</a>
+                        <a href="hiscorepersonal?user1=Howson">Howson</a>
                       </td>
                       <td>
                         99
@@ -559,7 +783,7 @@ Hiscores
                         8
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=Dr%A0PFAFF">Dr&nbsp;PFAFF</a>
+                        <a href="hiscorepersonal?user1=Dr PFAFF">Dr PFAFF</a>
                       </td>
                       <td>
                         99
@@ -573,7 +797,7 @@ Hiscores
                         9
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=Malt%A0Lickeys">Malt&nbsp;Lickeys</a>
+                        <a href="hiscorepersonal?user1=Lickeys">Lickeys</a>
                       </td>
                       <td>
                         99
@@ -587,7 +811,7 @@ Hiscores
                         10
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=Burned">Burned</a>
+                        <a href="hiscorepersonal?user1=Burned">Burned</a>
                       </td>
                       <td>
                         99
@@ -601,7 +825,7 @@ Hiscores
                         11
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=Blue%A0Limes">Blue&nbsp;Limes</a>
+                        <a href="hiscorepersonal?user1=Blue Limes">Blue Limes</a>
                       </td>
                       <td>
                         99
@@ -615,7 +839,7 @@ Hiscores
                         12
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=Mini%A0Finbarr">Mini&nbsp;Finbarr</a>
+                        <a href="hiscorepersonal?user1=Mini Aurelia">Mini Aurelia</a>
                       </td>
                       <td>
                         99
@@ -629,7 +853,7 @@ Hiscores
                         13
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=Unohdettu3">Unohdettu3</a>
+                        <a href="hiscorepersonal?user1=Unohdettu3">Unohdettu3</a>
                       </td>
                       <td>
                         99
@@ -643,7 +867,7 @@ Hiscores
                         14
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=Eslihero">Eslihero</a>
+                        <a href="hiscorepersonal?user1=Eslihero">Eslihero</a>
                       </td>
                       <td>
                         99
@@ -657,7 +881,7 @@ Hiscores
                         15
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=Lynx%A0Titan">Lynx&nbsp;Titan</a>
+                        <a href="hiscorepersonal?user1=Lynx Titan">Lynx Titan</a>
                       </td>
                       <td>
                         99
@@ -671,7 +895,7 @@ Hiscores
                         16
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=AndrewWigins">AndrewWigins</a>
+                        <a href="hiscorepersonal?user1=AndrewWigins">AndrewWigins</a>
                       </td>
                       <td>
                         99
@@ -685,7 +909,7 @@ Hiscores
                         17
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=iMelee">iMelee</a>
+                        <a href="hiscorepersonal?user1=iMelee">iMelee</a>
                       </td>
                       <td>
                         99
@@ -699,7 +923,7 @@ Hiscores
                         18
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=Portuguese">Portuguese</a>
+                        <a href="hiscorepersonal?user1=Portuguese">Portuguese</a>
                       </td>
                       <td>
                         99
@@ -713,7 +937,7 @@ Hiscores
                         19
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=MarkoOSRS">MarkoOSRS</a>
+                        <a href="hiscorepersonal?user1=MarkoOSRS">MarkoOSRS</a>
                       </td>
                       <td>
                         99
@@ -727,7 +951,7 @@ Hiscores
                         20
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=Cairo">Cairo</a>
+                        <a href="hiscorepersonal?user1=Cairo">Cairo</a>
                       </td>
                       <td>
                         99
@@ -741,7 +965,7 @@ Hiscores
                         21
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=Hey%A0Jase">Hey&nbsp;Jase</a>
+                        <a href="hiscorepersonal?user1=Hey Jase">Hey Jase</a>
                       </td>
                       <td>
                         99
@@ -755,7 +979,7 @@ Hiscores
                         22
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=H%A0D%A0M%A0P">H&nbsp;D&nbsp;M&nbsp;P</a>
+                        <a href="hiscorepersonal?user1=H D M P">H D M P</a>
                       </td>
                       <td>
                         99
@@ -769,7 +993,7 @@ Hiscores
                         23
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=Yumemi">Yumemi</a>
+                        <a href="hiscorepersonal?user1=Yumemi">Yumemi</a>
                       </td>
                       <td>
                         99
@@ -783,7 +1007,7 @@ Hiscores
                         24
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=Fiiggy">Fiiggy</a>
+                        <a href="hiscorepersonal?user1=Fiiggy">Fiiggy</a>
                       </td>
                       <td>
                         99
@@ -797,7 +1021,7 @@ Hiscores
                         25
                       </td>
                       <td class="left">
-<a href="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal?user1=Edgecrusher">Edgecrusher</a>
+                        <a href="hiscorepersonal?user1=Edgecrusher">Edgecrusher</a>
                       </td>
                       <td>
                         99
@@ -809,8 +1033,9 @@ Hiscores
                   </tbody>
                 </table>
                 <nav class="personal-hiscores__pagination">
-<a class="personal-hiscores__pagination-arrow personal-hiscores__pagination-arrow--down" href="https://secure.runescape.com/m=hiscore_oldschool/overall?table=1&amp;page=2" title="Scroll down table">
+                  <a class="personal-hiscores__pagination-arrow personal-hiscores__pagination-arrow--down"
-<img src="./attackTopPage_files/arrow_down.gif" alt="Scroll Down">
+                    href="overall?table=1&page=2" title="Scroll down table">
+                    <img src="https://www.runescape.com/img/rsp777/hiscores/arrow_down.gif" alt="Scroll Down" />
                   </a>
                 </nav>
               </div>
@@ -820,21 +1045,21 @@ Hiscores
         </div>
         <div class="personal-hiscores__side-input">
 
-
+          <td valign="top">
-<form action="https://secure.runescape.com/m=hiscore_oldschool/hiscorepersonal" method="post">
+            <form action="hiscorepersonal" method="post">
               <div class="smallBox">
                 <p>
                   <b>Search by name</b>
-<input class="text" maxlength="12" type="text" name="user1" value="" autocomplete="off" style="background-image: url(&quot;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAkCAYAAADo6zjiAAAAAXNSR0IArs4c6QAAAr1JREFUWAndVzuLIkEQrhmVVUHROwPvzkTWDRbF28BgjW7xVxwY+gfEYCNBA6PL/AsGx8UbLQayZqKJayIILshytyiogbIY+LiquelGx3F80INwDUNXV1V/9fWrukcCLIVC4ct8Pv+B4t1qtfpMOlFFkqQ/iPVktVrvs9nsby2upAZ/xsAftUaRbSQyRBJftSRkGrnZwWkgFEOd5Y1xydi629CY29iKJYtecyP+erFoBs5a/m8C19fXkMlkgOpdxdQZCIfD4Ha7gepdxVQCePaVuKzWI2EqAb2AWt0GgYuLC7i8vASv16v1g1NtW0AahZW1PR4PpFIpcLlcsFwu4eHhAZrNpmI+1cawjWo+A7e3t0pwcpZlGRKJBO93qo0DGAicgIGPqSZOoFarwWQyUYLRElQqFR74VBsHMBCkXC63YnbaaIFAAEajEYzHY6ZWaiPbhuOeBh7JN3Spqu+D1w0Ce/oKNSOREZK44UsgFP0AMLwZP9D74GwEVI7feB44gLShSz6fN7STsVQqwcvLC/fDWfh07hkAYTOgPTU0TLvdDg6HQxnxYrGAwWDAR88EYQSKxSLD5HUymYSrqyul3W63YTqdchsTZDwO9G4XXnw+H4RCIY7baDS4vC7QHnhaV4iS4/E4sHdAv9+HXq+nCy1TRkLHoa71RKXT6YRoNMp71+t1LmsFmf5U6I8FSfwUtRyxWAxsNpsSazabQavV0sbl7X9vJt7cL6zfHXreFosF0uk0v9rpInt8fNRzVXTC80AkEuHBMdHArs3HGAknQJuPlW63C8Oh8fYSSiAYDILf72fx946eHI9ORLhR3yiH8yhrAiUdlu3e39+h0+msWbdFwjqaAMJU8fu+DQdQLpeVT8+2Q1c9egnUvDHaAXiwGkdPD5L7owlg3njFjjcI8Ium8OCIqiP1ob6EQVh/AVA3+XEhdOWMAAAAAElFTkSuQmCC&quot;); background-repeat: no-repeat; background-attachment: scroll; background-size: 16px 18px; background-position: 98% 50%;">
+                  <input class="text" maxlength="12" type="text" name="user1" value="">
                   <input maxlength="12" type="submit" name="submit" value="Search">
                 </p>
               </div>
             </form>
-<form action="https://secure.runescape.com/m=hiscore_oldschool/overall?category_type=0" method="post">
+            <form action="overall?category_type=0" method="post">
               <div class="smallBox">
                 <p>
                   <b>Search by rank</b>
-<input class="text" maxlength="12" type="text" name="rank" value="" autocomplete="off" style="background-image: url(&quot;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAkCAYAAADo6zjiAAAAAXNSR0IArs4c6QAAAr1JREFUWAndVzuLIkEQrhmVVUHROwPvzkTWDRbF28BgjW7xVxwY+gfEYCNBA6PL/AsGx8UbLQayZqKJayIILshytyiogbIY+LiquelGx3F80INwDUNXV1V/9fWrukcCLIVC4ct8Pv+B4t1qtfpMOlFFkqQ/iPVktVrvs9nsby2upAZ/xsAftUaRbSQyRBJftSRkGrnZwWkgFEOd5Y1xydi629CY29iKJYtecyP+erFoBs5a/m8C19fXkMlkgOpdxdQZCIfD4Ha7gepdxVQCePaVuKzWI2EqAb2AWt0GgYuLC7i8vASv16v1g1NtW0AahZW1PR4PpFIpcLlcsFwu4eHhAZrNpmI+1cawjWo+A7e3t0pwcpZlGRKJBO93qo0DGAicgIGPqSZOoFarwWQyUYLRElQqFR74VBsHMBCkXC63YnbaaIFAAEajEYzHY6ZWaiPbhuOeBh7JN3Spqu+D1w0Ce/oKNSOREZK44UsgFP0AMLwZP9D74GwEVI7feB44gLShSz6fN7STsVQqwcvLC/fDWfh07hkAYTOgPTU0TLvdDg6HQxnxYrGAwWDAR88EYQSKxSLD5HUymYSrqyul3W63YTqdchsTZDwO9G4XXnw+H4RCIY7baDS4vC7QHnhaV4iS4/E4sHdAv9+HXq+nCy1TRkLHoa71RKXT6YRoNMp71+t1LmsFmf5U6I8FSfwUtRyxWAxsNpsSazabQavV0sbl7X9vJt7cL6zfHXreFosF0uk0v9rpInt8fNRzVXTC80AkEuHBMdHArs3HGAknQJuPlW63C8Oh8fYSSiAYDILf72fx946eHI9ORLhR3yiH8yhrAiUdlu3e39+h0+msWbdFwjqaAMJU8fu+DQdQLpeVT8+2Q1c9egnUvDHaAXiwGkdPD5L7owlg3njFjjcI8Ium8OCIqiP1ob6EQVh/AVA3+XEhdOWMAAAAAElFTkSuQmCC&quot;); background-repeat: no-repeat; background-attachment: scroll; background-size: 16px 18px; background-position: 98% 50%; cursor: auto;">
+                  <input class="text" maxlength="12" type="text" name="rank" value="">
                   <input type="hidden" name="table" value="1">
                   <input type="submit" name="submit" value="Search">
                 </p>
@@ -844,8 +1069,10 @@ Hiscores
               <div class="largeBox">
                 <p>
                   <b>Compare Users</b>
-<input class="text" maxlength="12" type="text" name="user1" value="" pattern="^[a-zA-Z0-9]+([ _-&amp;nbsp;]{0,10}[0-9a-zA-Z]+)*$" title="player name" required="" autocomplete="off" style="background-image: url(&quot;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAkCAYAAADo6zjiAAAAAXNSR0IArs4c6QAAAr1JREFUWAndVzuLIkEQrhmVVUHROwPvzkTWDRbF28BgjW7xVxwY+gfEYCNBA6PL/AsGx8UbLQayZqKJayIILshytyiogbIY+LiquelGx3F80INwDUNXV1V/9fWrukcCLIVC4ct8Pv+B4t1qtfpMOlFFkqQ/iPVktVrvs9nsby2upAZ/xsAftUaRbSQyRBJftSRkGrnZwWkgFEOd5Y1xydi629CY29iKJYtecyP+erFoBs5a/m8C19fXkMlkgOpdxdQZCIfD4Ha7gepdxVQCePaVuKzWI2EqAb2AWt0GgYuLC7i8vASv16v1g1NtW0AahZW1PR4PpFIpcLlcsFwu4eHhAZrNpmI+1cawjWo+A7e3t0pwcpZlGRKJBO93qo0DGAicgIGPqSZOoFarwWQyUYLRElQqFR74VBsHMBCkXC63YnbaaIFAAEajEYzHY6ZWaiPbhuOeBh7JN3Spqu+D1w0Ce/oKNSOREZK44UsgFP0AMLwZP9D74GwEVI7feB44gLShSz6fN7STsVQqwcvLC/fDWfh07hkAYTOgPTU0TLvdDg6HQxnxYrGAwWDAR88EYQSKxSLD5HUymYSrqyul3W63YTqdchsTZDwO9G4XXnw+H4RCIY7baDS4vC7QHnhaV4iS4/E4sHdAv9+HXq+nCy1TRkLHoa71RKXT6YRoNMp71+t1LmsFmf5U6I8FSfwUtRyxWAxsNpsSazabQavV0sbl7X9vJt7cL6zfHXreFosF0uk0v9rpInt8fNRzVXTC80AkEuHBMdHArs3HGAknQJuPlW63C8Oh8fYSSiAYDILf72fx946eHI9ORLhR3yiH8yhrAiUdlu3e39+h0+msWbdFwjqaAMJU8fu+DQdQLpeVT8+2Q1c9egnUvDHaAXiwGkdPD5L7owlg3njFjjcI8Ium8OCIqiP1ob6EQVh/AVA3+XEhdOWMAAAAAElFTkSuQmCC&quot;); background-repeat: no-repeat; background-attachment: scroll; background-size: 16px 18px; background-position: 98% 50%;">
+                  <input class="text" maxlength="12" type="text" name="user1" value=""
-<input class="text" maxlength="12" type="text" name="user2" value="" pattern="^[a-zA-Z0-9]+([ _-&amp;nbsp;]{0,10}[0-9a-zA-Z]+)*$" title="player name" required="" autocomplete="off" style="background-image: url(&quot;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAkCAYAAADo6zjiAAAAAXNSR0IArs4c6QAAAr1JREFUWAndVzuLIkEQrhmVVUHROwPvzkTWDRbF28BgjW7xVxwY+gfEYCNBA6PL/AsGx8UbLQayZqKJayIILshytyiogbIY+LiquelGx3F80INwDUNXV1V/9fWrukcCLIVC4ct8Pv+B4t1qtfpMOlFFkqQ/iPVktVrvs9nsby2upAZ/xsAftUaRbSQyRBJftSRkGrnZwWkgFEOd5Y1xydi629CY29iKJYtecyP+erFoBs5a/m8C19fXkMlkgOpdxdQZCIfD4Ha7gepdxVQCePaVuKzWI2EqAb2AWt0GgYuLC7i8vASv16v1g1NtW0AahZW1PR4PpFIpcLlcsFwu4eHhAZrNpmI+1cawjWo+A7e3t0pwcpZlGRKJBO93qo0DGAicgIGPqSZOoFarwWQyUYLRElQqFR74VBsHMBCkXC63YnbaaIFAAEajEYzHY6ZWaiPbhuOeBh7JN3Spqu+D1w0Ce/oKNSOREZK44UsgFP0AMLwZP9D74GwEVI7feB44gLShSz6fN7STsVQqwcvLC/fDWfh07hkAYTOgPTU0TLvdDg6HQxnxYrGAwWDAR88EYQSKxSLD5HUymYSrqyul3W63YTqdchsTZDwO9G4XXnw+H4RCIY7baDS4vC7QHnhaV4iS4/E4sHdAv9+HXq+nCy1TRkLHoa71RKXT6YRoNMp71+t1LmsFmf5U6I8FSfwUtRyxWAxsNpsSazabQavV0sbl7X9vJt7cL6zfHXreFosF0uk0v9rpInt8fNRzVXTC80AkEuHBMdHArs3HGAknQJuPlW63C8Oh8fYSSiAYDILf72fx946eHI9ORLhR3yiH8yhrAiUdlu3e39+h0+msWbdFwjqaAMJU8fu+DQdQLpeVT8+2Q1c9egnUvDHaAXiwGkdPD5L7owlg3njFjjcI8Ium8OCIqiP1ob6EQVh/AVA3+XEhdOWMAAAAAElFTkSuQmCC&quot;); background-repeat: no-repeat; background-attachment: scroll; background-size: 16px 18px; background-position: 98% 50%;">
+                    pattern="^[a-zA-Z0-9]+([ _-&amp;nbsp;]{0,10}[0-9a-zA-Z]+)*$" title="player name" required>
+                  <input class="text" maxlength="12" type="text" name="user2" value=""
+                    pattern="^[a-zA-Z0-9]+([ _-&amp;nbsp;]{0,10}[0-9a-zA-Z]+)*$" title="player name" required>
                   <input type="submit" name="submit" value="Compare">
                 </p>
               </div>
@@ -857,19 +1084,28 @@ To view personal<br>
                 hiscores and compare<br>
                 yourself to your friends<br>
               </div>
-<a href="https://secure.runescape.com/m=weblogin/oldschool_login?mod=hiscore_oldschool&amp;ssl=0&amp;dest=hiscorefriends_all" class="linkToFriends">Click here</a>
+              <a href="https://secure.runescape.com/m=weblogin/oldschool_login?mod=hiscore_oldschool&amp;ssl=0&amp;dest=hiscorefriends_all"
+                class="linkToFriends">Click here</a>
             </div>
-
+          </td>
         </div>
       </div>
     </div>
     <div class="tandc">
-<a href="http://www.jagex.com/" target="_top"><img class="footer__jagex-img" src="./attackTopPage_files/jagex-logo-landscape.svg" alt="Jagex Software"></a>
+      <a href="http://www.jagex.com" target="_top"><img class="footer__jagex-img"
-<p class="tandc__copy">This website and its contents are copyright <20> 1999 - 2021 Jagex Ltd, 220 Science Park, Cambridge, CB4 0WA, United Kingdom.<br>Use of this website is subject to our <a href="https://www.jagex.com/terms/terms.ws" target="_blank">Terms &amp; Conditions</a> and <a href="https://www.jagex.com/privacy/privacy.ws" target="_blank">Privacy Policy</a>. <br><a href="https://www.jagex.com/terms/rules-of-old-school-runescape">Rules of Old School RuneScape</a> | <a href="https://www.jagex.com/terms/cookies.ws">Change Cookie Settings</a></p>
+          src="https://www.runescape.com/img/rsp777/jagex-logo-landscape.svg" alt="Jagex Software"></a>
-<a class="osrsRSS" target="_BLANK" href="https://secure.runescape.com/m=news/latest_news.rss?oldschool=true"><img src="./attackTopPage_files/rss.png" title="OSRS RSS Feed" alt="OSRS RSS Feed"></a>
+      <p class="tandc__copy">This website and its contents are copyright &copy; 1999 - 2023 Jagex Ltd, 220 Science Park,
-</div> <script src="./attackTopPage_files/modernizr_3_0_0_min-100.js"></script>
+        Cambridge, CB4 0WA, United Kingdom.<br />Use of this website is subject to our <a
-<script src="./attackTopPage_files/rsp777_basic-105.js"></script>
+          href="https://www.jagex.com/en-GB/terms/terms.ws" target="_blank">Terms &amp; Conditions</a> and <a
-<script src="./attackTopPage_files/rsp777_twitter-100.js"></script>
+          href="https://www.jagex.com/en-GB/privacy/privacy.ws" target="_blank">Privacy Policy</a>. <br><a
+          href="https://www.jagex.com/en-GB/terms/rules-of-old-school-runescape">Rules of Old School RuneScape</a> | <a
+          href="https://www.jagex.com/en-GB/terms/cookies">Change Cookie Settings</a></p>
+      <a class="osrsRSS" target="_BLANK" href="https://secure.runescape.com/m=news/latest_news.rss?oldschool=true"><img
+          src="https://www.runescape.com/img/rsp777/rss.png" title="OSRS RSS Feed" alt="OSRS RSS Feed"></a>
+    </div>
+    <script src="https://www.runescape.com/js/c/rs3/modernizr_3_0_0_min-100.js"></script>
+    <script src="https://www.runescape.com/js/rsp777_basic-105.js"></script>
+    <script src="https://www.runescape.com/js/rsp777_twitter-100.js"></script>
 
     <script type="text/javascript">
       if ($("#fb-root").length == 0) {
@@ -935,7 +1171,8 @@ document.getElementById('fb-root').appendChild(e);
         return false;
       }
     </script>
-<script type="text/javascript" src="./attackTopPage_files/plugins-100.js"></script>
+    <script type="text/javascript" src="https://www.runescape.com/js/rs3/plugins-100.js"
+      data-cookieconsent="ignore"></script>
     <script>
       var RESPONSIVE = RESPONSIVE || {};
       RESPONSIVE.constant = RESPONSIVE.constant || {};
@@ -947,7 +1184,9 @@ document.getElementById('fb-root').appendChild(e);
       };
 
     </script>
-<script type="text/javascript" src="./attackTopPage_files/gtm-100.js"></script>
+    <script type="text/javascript" src="https://www.runescape.com/js/osrs/gtm-100.js"
+      data-cookieconsent="ignore"></script>
   </div>
+</body>
 
-</body></html>
+</html>

__tests__/b0atyStats.csv

@@ -0,0 +1,108 @@
+2210,2277,1150073045
+23988,99,33320012
+3114,99,51215128
+1203,99,200000000
+1372,99,196290925
+3458,99,159426771
+2746,99,17744970
+2031,99,91566360
+161852,99,13386665
+25801,99,19461878
+64826,99,13473417
+26528,99,16672481
+20829,99,19483653
+58378,99,14103220
+13188,99,16573909
+36283,99,15061037
+17137,99,14670565
+8751,99,16169665
+60803,99,14390315
+1718,99,57850681
+2117,99,110369178
+5540,99,22739567
+22326,99,18052465
+1467,99,18050183
+-1,-1
+-1,-1
+38135,10
+19368,3
+146220,8
+100923,7
+433,9802
+1542,825
+158,6000
+2572,1606
+47979,311
+1081,460
+880,600
+4258,6785
+-1,-1
+7596,14780
+8124,1060
+10438,43487
+1114,1155
+3497,2192
+3204,4796
+1087,984
+2230,2328
+51533,143
+4243,1830
+256985,5
+54424,293
+114691,58
+11700,2657
+211708,34
+1779,736
+24958,215
+46504,116
+66096,287
+3133,2000
+26682,198
+19337,1078
+25021,1062
+19290,1088
+89474,25
+7535,1320
+23251,1228
+82016,477
+876,3642
+7073,310
+2476,2046
+55411,580
+68801,2899
+4608,1740
+3079,1444
+8344,324
+540,53
+38395,626
+4176,749
+5519,500
+1394,217
+26127,379
+49730,249
+57206,91
+6106,1245
+185920,29
+3232,49
+4276,1569
+57314,273
+256794,7
+113862,201
+1969,538
+12346,671
+5606,149
+550,2450
+25557,310
+1391,538
+9325,3066
+131996,37
+214,1720
+8902,7
+148385,8
+6120,2113
+287,7096
+97368,51
+15591,2780
+1000405,67
+213696,25
+240082,340

__tests__/b0atyStats.json

@@ -0,0 +1,678 @@
+{
+  "skills": [
+    {
+      "id": 0,
+      "name": "Overall",
+      "rank": 2210,
+      "level": 2277,
+      "xp": 1150073045
+    },
+    {
+      "id": 1,
+      "name": "Attack",
+      "rank": 23988,
+      "level": 99,
+      "xp": 33320012
+    },
+    {
+      "id": 2,
+      "name": "Defence",
+      "rank": 3114,
+      "level": 99,
+      "xp": 51215128
+    },
+    {
+      "id": 3,
+      "name": "Strength",
+      "rank": 1203,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 4,
+      "name": "Hitpoints",
+      "rank": 1372,
+      "level": 99,
+      "xp": 196290925
+    },
+    {
+      "id": 5,
+      "name": "Ranged",
+      "rank": 3458,
+      "level": 99,
+      "xp": 159426771
+    },
+    {
+      "id": 6,
+      "name": "Prayer",
+      "rank": 2746,
+      "level": 99,
+      "xp": 17744970
+    },
+    {
+      "id": 7,
+      "name": "Magic",
+      "rank": 2031,
+      "level": 99,
+      "xp": 91566360
+    },
+    {
+      "id": 8,
+      "name": "Cooking",
+      "rank": 161852,
+      "level": 99,
+      "xp": 13386665
+    },
+    {
+      "id": 9,
+      "name": "Woodcutting",
+      "rank": 25801,
+      "level": 99,
+      "xp": 19461878
+    },
+    {
+      "id": 10,
+      "name": "Fletching",
+      "rank": 64826,
+      "level": 99,
+      "xp": 13473417
+    },
+    {
+      "id": 11,
+      "name": "Fishing",
+      "rank": 26528,
+      "level": 99,
+      "xp": 16672481
+    },
+    {
+      "id": 12,
+      "name": "Firemaking",
+      "rank": 20829,
+      "level": 99,
+      "xp": 19483653
+    },
+    {
+      "id": 13,
+      "name": "Crafting",
+      "rank": 58378,
+      "level": 99,
+      "xp": 14103220
+    },
+    {
+      "id": 14,
+      "name": "Smithing",
+      "rank": 13188,
+      "level": 99,
+      "xp": 16573909
+    },
+    {
+      "id": 15,
+      "name": "Mining",
+      "rank": 36283,
+      "level": 99,
+      "xp": 15061037
+    },
+    {
+      "id": 16,
+      "name": "Herblore",
+      "rank": 17137,
+      "level": 99,
+      "xp": 14670565
+    },
+    {
+      "id": 17,
+      "name": "Agility",
+      "rank": 8751,
+      "level": 99,
+      "xp": 16169665
+    },
+    {
+      "id": 18,
+      "name": "Thieving",
+      "rank": 60803,
+      "level": 99,
+      "xp": 14390315
+    },
+    {
+      "id": 19,
+      "name": "Slayer",
+      "rank": 1718,
+      "level": 99,
+      "xp": 57850681
+    },
+    {
+      "id": 20,
+      "name": "Farming",
+      "rank": 2117,
+      "level": 99,
+      "xp": 110369178
+    },
+    {
+      "id": 21,
+      "name": "Runecraft",
+      "rank": 5540,
+      "level": 99,
+      "xp": 22739567
+    },
+    {
+      "id": 22,
+      "name": "Hunter",
+      "rank": 22326,
+      "level": 99,
+      "xp": 18052465
+    },
+    {
+      "id": 23,
+      "name": "Construction",
+      "rank": 1467,
+      "level": 99,
+      "xp": 18050183
+    }
+  ],
+  "activities": [
+    {
+      "id": 0,
+      "name": "League Points",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 1,
+      "name": "Deadman Points",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 2,
+      "name": "Bounty Hunter - Hunter",
+      "rank": 38135,
+      "score": 10
+    },
+    {
+      "id": 3,
+      "name": "Bounty Hunter - Rogue",
+      "rank": 19368,
+      "score": 3
+    },
+    {
+      "id": 4,
+      "name": "Bounty Hunter (Legacy) - Hunter",
+      "rank": 146220,
+      "score": 8
+    },
+    {
+      "id": 5,
+      "name": "Bounty Hunter (Legacy) - Rogue",
+      "rank": 100923,
+      "score": 7
+    },
+    {
+      "id": 6,
+      "name": "Clue Scrolls (all)",
+      "rank": 433,
+      "score": 9802
+    },
+    {
+      "id": 7,
+      "name": "Clue Scrolls (beginner)",
+      "rank": 1542,
+      "score": 825
+    },
+    {
+      "id": 8,
+      "name": "Clue Scrolls (easy)",
+      "rank": 158,
+      "score": 6000
+    },
+    {
+      "id": 9,
+      "name": "Clue Scrolls (medium)",
+      "rank": 2572,
+      "score": 1606
+    },
+    {
+      "id": 10,
+      "name": "Clue Scrolls (hard)",
+      "rank": 47979,
+      "score": 311
+    },
+    {
+      "id": 11,
+      "name": "Clue Scrolls (elite)",
+      "rank": 1081,
+      "score": 460
+    },
+    {
+      "id": 12,
+      "name": "Clue Scrolls (master)",
+      "rank": 880,
+      "score": 600
+    },
+    {
+      "id": 13,
+      "name": "LMS - Rank",
+      "rank": 4258,
+      "score": 6785
+    },
+    {
+      "id": 14,
+      "name": "PvP Arena - Rank",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 15,
+      "name": "Soul Wars Zeal",
+      "rank": 7596,
+      "score": 14780
+    },
+    {
+      "id": 16,
+      "name": "Rifts closed",
+      "rank": 8124,
+      "score": 1060
+    },
+    {
+      "id": 17,
+      "name": "Colosseum Glory",
+      "rank": 10438,
+      "score": 43487
+    },
+    {
+      "id": 18,
+      "name": "Collections Logged",
+      "rank": 1114,
+      "score": 1155
+    },
+    {
+      "id": 19,
+      "name": "Abyssal Sire",
+      "rank": 3497,
+      "score": 2192
+    },
+    {
+      "id": 20,
+      "name": "Alchemical Hydra",
+      "rank": 3204,
+      "score": 4796
+    },
+    {
+      "id": 21,
+      "name": "Amoxliatl",
+      "rank": 1087,
+      "score": 984
+    },
+    {
+      "id": 22,
+      "name": "Araxxor",
+      "rank": 2230,
+      "score": 2328
+    },
+    {
+      "id": 23,
+      "name": "Artio",
+      "rank": 51533,
+      "score": 143
+    },
+    {
+      "id": 24,
+      "name": "Barrows Chests",
+      "rank": 4243,
+      "score": 1830
+    },
+    {
+      "id": 25,
+      "name": "Bryophyta",
+      "rank": 256985,
+      "score": 5
+    },
+    {
+      "id": 26,
+      "name": "Callisto",
+      "rank": 54424,
+      "score": 293
+    },
+    {
+      "id": 27,
+      "name": "Calvar'ion",
+      "rank": 114691,
+      "score": 58
+    },
+    {
+      "id": 28,
+      "name": "Cerberus",
+      "rank": 11700,
+      "score": 2657
+    },
+    {
+      "id": 29,
+      "name": "Chambers of Xeric",
+      "rank": 211708,
+      "score": 34
+    },
+    {
+      "id": 30,
+      "name": "Chambers of Xeric: Challenge Mode",
+      "rank": 1779,
+      "score": 736
+    },
+    {
+      "id": 31,
+      "name": "Chaos Elemental",
+      "rank": 24958,
+      "score": 215
+    },
+    {
+      "id": 32,
+      "name": "Chaos Fanatic",
+      "rank": 46504,
+      "score": 116
+    },
+    {
+      "id": 33,
+      "name": "Commander Zilyana",
+      "rank": 66096,
+      "score": 287
+    },
+    {
+      "id": 34,
+      "name": "Corporeal Beast",
+      "rank": 3133,
+      "score": 2000
+    },
+    {
+      "id": 35,
+      "name": "Crazy Archaeologist",
+      "rank": 26682,
+      "score": 198
+    },
+    {
+      "id": 36,
+      "name": "Dagannoth Prime",
+      "rank": 19337,
+      "score": 1078
+    },
+    {
+      "id": 37,
+      "name": "Dagannoth Rex",
+      "rank": 25021,
+      "score": 1062
+    },
+    {
+      "id": 38,
+      "name": "Dagannoth Supreme",
+      "rank": 19290,
+      "score": 1088
+    },
+    {
+      "id": 39,
+      "name": "Deranged Archaeologist",
+      "rank": 89474,
+      "score": 25
+    },
+    {
+      "id": 40,
+      "name": "Duke Sucellus",
+      "rank": 7535,
+      "score": 1320
+    },
+    {
+      "id": 41,
+      "name": "General Graardor",
+      "rank": 23251,
+      "score": 1228
+    },
+    {
+      "id": 42,
+      "name": "Giant Mole",
+      "rank": 82016,
+      "score": 477
+    },
+    {
+      "id": 43,
+      "name": "Grotesque Guardians",
+      "rank": 876,
+      "score": 3642
+    },
+    {
+      "id": 44,
+      "name": "Hespori",
+      "rank": 7073,
+      "score": 310
+    },
+    {
+      "id": 45,
+      "name": "Kalphite Queen",
+      "rank": 2476,
+      "score": 2046
+    },
+    {
+      "id": 46,
+      "name": "King Black Dragon",
+      "rank": 55411,
+      "score": 580
+    },
+    {
+      "id": 47,
+      "name": "Kraken",
+      "rank": 68801,
+      "score": 2899
+    },
+    {
+      "id": 48,
+      "name": "Kree'Arra",
+      "rank": 4608,
+      "score": 1740
+    },
+    {
+      "id": 49,
+      "name": "K'ril Tsutsaroth",
+      "rank": 3079,
+      "score": 1444
+    },
+    {
+      "id": 50,
+      "name": "Lunar Chests",
+      "rank": 8344,
+      "score": 324
+    },
+    {
+      "id": 51,
+      "name": "Mimic",
+      "rank": 540,
+      "score": 53
+    },
+    {
+      "id": 52,
+      "name": "Nex",
+      "rank": 38395,
+      "score": 626
+    },
+    {
+      "id": 53,
+      "name": "Nightmare",
+      "rank": 4176,
+      "score": 749
+    },
+    {
+      "id": 54,
+      "name": "Phosani's Nightmare",
+      "rank": 5519,
+      "score": 500
+    },
+    {
+      "id": 55,
+      "name": "Obor",
+      "rank": 1394,
+      "score": 217
+    },
+    {
+      "id": 56,
+      "name": "Phantom Muspah",
+      "rank": 26127,
+      "score": 379
+    },
+    {
+      "id": 57,
+      "name": "Sarachnis",
+      "rank": 49730,
+      "score": 249
+    },
+    {
+      "id": 58,
+      "name": "Scorpia",
+      "rank": 57206,
+      "score": 91
+    },
+    {
+      "id": 59,
+      "name": "Scurrius",
+      "rank": 6106,
+      "score": 1245
+    },
+    {
+      "id": 60,
+      "name": "Skotizo",
+      "rank": 185920,
+      "score": 29
+    },
+    {
+      "id": 61,
+      "name": "Sol Heredit",
+      "rank": 3232,
+      "score": 49
+    },
+    {
+      "id": 62,
+      "name": "Spindel",
+      "rank": 4276,
+      "score": 1569
+    },
+    {
+      "id": 63,
+      "name": "Tempoross",
+      "rank": 57314,
+      "score": 273
+    },
+    {
+      "id": 64,
+      "name": "The Gauntlet",
+      "rank": 256794,
+      "score": 7
+    },
+    {
+      "id": 65,
+      "name": "The Corrupted Gauntlet",
+      "rank": 113862,
+      "score": 201
+    },
+    {
+      "id": 66,
+      "name": "The Hueycoatl",
+      "rank": 1969,
+      "score": 538
+    },
+    {
+      "id": 67,
+      "name": "The Leviathan",
+      "rank": 12346,
+      "score": 671
+    },
+    {
+      "id": 68,
+      "name": "The Royal Titans",
+      "rank": 5606,
+      "score": 149
+    },
+    {
+      "id": 69,
+      "name": "The Whisperer",
+      "rank": 550,
+      "score": 2450
+    },
+    {
+      "id": 70,
+      "name": "Theatre of Blood",
+      "rank": 25557,
+      "score": 310
+    },
+    {
+      "id": 71,
+      "name": "Theatre of Blood: Hard Mode",
+      "rank": 1391,
+      "score": 538
+    },
+    {
+      "id": 72,
+      "name": "Thermonuclear Smoke Devil",
+      "rank": 9325,
+      "score": 3066
+    },
+    {
+      "id": 73,
+      "name": "Tombs of Amascut",
+      "rank": 131996,
+      "score": 37
+    },
+    {
+      "id": 74,
+      "name": "Tombs of Amascut: Expert Mode",
+      "rank": 214,
+      "score": 1720
+    },
+    {
+      "id": 75,
+      "name": "TzKal-Zuk",
+      "rank": 8902,
+      "score": 7
+    },
+    {
+      "id": 76,
+      "name": "TzTok-Jad",
+      "rank": 148385,
+      "score": 8
+    },
+    {
+      "id": 77,
+      "name": "Vardorvis",
+      "rank": 6120,
+      "score": 2113
+    },
+    {
+      "id": 78,
+      "name": "Venenatis",
+      "rank": 287,
+      "score": 7096
+    },
+    {
+      "id": 79,
+      "name": "Vet'ion",
+      "rank": 97368,
+      "score": 51
+    },
+    {
+      "id": 80,
+      "name": "Vorkath",
+      "rank": 15591,
+      "score": 2780
+    },
+    {
+      "id": 81,
+      "name": "Wintertodt",
+      "rank": 1000405,
+      "score": 67
+    },
+    {
+      "id": 82,
+      "name": "Zalcano",
+      "rank": 213696,
+      "score": 25
+    },
+    {
+      "id": 83,
+      "name": "Zulrah",
+      "rank": 240082,
+      "score": 340
+    }
+  ]
+}

__tests__/hiscores.test.ts

@@ -12,7 +12,10 @@ import {
   getSkillPageURL,
   getStatsURL,
   BOSSES,
-  INVALID_FORMAT_ERROR
+  InvalidFormatError,
+  BH_MODES,
+  parseJsonStats,
+  HiscoresResponse
 } from '../src/index';
 
 const B0ATY_NAME = 'B0ATY';
@@ -24,7 +27,13 @@ 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 b0atyStatsCsv = readFileSync(`${__dirname}/b0atyStats.csv`, 'utf8');
+const b0atyStatsJson: HiscoresResponse = JSON.parse(
+  readFileSync(`${__dirname}/b0atyStats.json`, 'utf8')
+);
+const lynxTitanStats = JSON.parse(
+  readFileSync(`${__dirname}/lynxTitanStats.json`, 'utf8')
+);
 const lynxTitanNamePage = readFileSync(
   `${__dirname}/lynxTitanNamePage.html`,
   'utf8'
@@ -45,7 +54,7 @@ jest.spyOn(axios, 'get').mockImplementation((url) => {
   if (getSkillPageURL('main', 'attack', 1) === url) {
     return Promise.resolve({ data: attackTopPage });
   }
-  if (getStatsURL('main', LYNX_TITAN_FORMATTED_NAME) === url) {
+  if (getStatsURL('main', LYNX_TITAN_FORMATTED_NAME, true) === url) {
     return Promise.resolve({ status: 200, data: lynxTitanStats });
   }
   throw new Error(`No mock response for URL: ${url}`);
@@ -77,6 +86,9 @@ test('Parse CSV to json', () => {
   810,99,37688883
   92,99,32005622
   23423,478
+  89554,301
+  89914,35
+  99834,25
   99831,23
   89912,37
   32,12148
@@ -90,11 +102,17 @@ test('Parse CSV to json', () => {
   13,4057
   37,225
   25,1110
+  7827,43249
+  1114,1155
   382,2780
   944,3000
+  561,398429
+  37,111
+  704,892
   1981,1452
   4981,23
   888,1046
+  444,792
   613,4856
   102,4038
   156,334
@@ -107,6 +125,7 @@ test('Parse CSV to json', () => {
   4342,1655
   966,2951
   10151,1
+  1289,2477
   1288,2407
   377,4669
   545,1567
@@ -116,22 +135,34 @@ test('Parse CSV to json', () => {
   41643,1477
   625,2391
   120,2981
+  54,2958
   1,109
   99,39002
   3,22666
   2,84
   26,323
+  44,6233
   201,1101
   82,3404
+  555,7079
   5085,61
+  8731,1423
+  678,903
   18823,23
   63,375
   2870,6
+  891,9102
+  2871,7
+  5606,149
+  2872,8
   6984,138
   23,923141
   4043,2000
+  4073,1020
+  289,13070
   489,8
   967,47
+  968,48
   11155,223
   1940,272
   8623,1340
@@ -167,7 +198,10 @@ test('Parse CSV to json', () => {
       construction: { rank: 92, level: 99, xp: 32005622 }
     },
     leaguePoints: { rank: 23423, score: 478 },
+    deadmanPoints: { rank: 89554, score: 301 },
     bountyHunter: {
+      hunterV2: { rank: 89914, score: 35 },
+      rogueV2: { rank: 99834, score: 25 },
       hunter: { rank: 99831, score: 23 },
       rogue: { rank: 89912, score: 37 }
     },
@@ -175,6 +209,8 @@ test('Parse CSV to json', () => {
     pvpArena: { rank: 13, score: 4057 },
     soulWarsZeal: { rank: 37, score: 225 },
     riftsClosed: { rank: 25, score: 1110 },
+    colosseumGlory: { rank: 7827, score: 43249 },
+    collectionsLogged: { rank: 1114, score: 1155 },
     clues: {
       all: { rank: 32, score: 12148 },
       beginner: { rank: 3105, score: 76 },
@@ -187,9 +223,13 @@ test('Parse CSV to json', () => {
     bosses: {
       abyssalSire: { rank: 382, score: 2780 },
       alchemicalHydra: { rank: 944, score: 3000 },
+      amoxliatl: { rank: 561, score: 398429 },
+      araxxor: { rank: 37, score: 111 },
+      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 },
@@ -202,6 +242,7 @@ test('Parse CSV to json', () => {
       dagannothRex: { rank: 4342, score: 1655 },
       dagannothSupreme: { rank: 966, score: 2951 },
       derangedArchaeologist: { rank: 10151, score: 1 },
+      dukeSucellus: { rank: 1289, score: 2477 },
       generalGraardor: { rank: 1288, score: 2407 },
       giantMole: { rank: 377, score: 4669 },
       grotesqueGuardians: { rank: 545, score: 1567 },
@@ -211,22 +252,34 @@ test('Parse CSV to json', () => {
       kraken: { rank: 41643, score: 1477 },
       kreeArra: { rank: 625, score: 2391 },
       krilTsutsaroth: { rank: 120, score: 2981 },
+      lunarChests: { rank: 54, score: 2958 },
       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 },
+      scurrius: { rank: 555, score: 7079 },
       skotizo: { rank: 5085, score: 61 },
+      solHeredit: { rank: 8731, score: 1423 },
+      spindel: { rank: 678, score: 903 },
       tempoross: { rank: 18823, score: 23 },
       gauntlet: { rank: 63, score: 375 },
       corruptedGauntlet: { rank: 2870, score: 6 },
+      hueycoatl: { rank: 891, score: 9102 },
+      leviathan: { rank: 2871, score: 7 },
+      royalTitans: { rank: 5606, score: 149 },
+      whisperer: { rank: 2872, score: 8 },
       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 },
+      vardorvis: { rank: 968, score: 48 },
       venenatis: { rank: 11155, score: 223 },
       vetion: { rank: 1940, score: 272 },
       vorkath: { rank: 8623, score: 1340 },
@@ -240,13 +293,15 @@ test('Parse CSV to json', () => {
 });
 
 test('Parse CSV with unknown activity', () => {
-  const statsWithUnknownActivity = lynxTitanStats + `
+  const statsWithUnknownActivity = `${lynxTitanStats}
     -1,-1`;
-  expect(() => parseStats(statsWithUnknownActivity)).toThrow(INVALID_FORMAT_ERROR);
+  expect(() => parseStats(statsWithUnknownActivity)).toThrow(
+    InvalidFormatError
+  );
 });
 
 test('Parse invalid CSV', () => {
-  expect(() => parseStats('invalid')).toThrow(INVALID_FORMAT_ERROR);
+  expect(() => parseStats('invalid')).toThrow(InvalidFormatError);
 });
 
 describe('Get name format', () => {
@@ -461,7 +516,7 @@ test('Get non-existent player', async () => {
 });
 
 test('Get stats by gamemode', async () => {
-  const { skills, bosses } = await getStatsByGamemode(
+  const { skills, bosses, bountyHunter } = await getStatsByGamemode(
     LYNX_TITAN_FORMATTED_NAME
   );
 
@@ -494,6 +549,67 @@ test('Get stats by gamemode', async () => {
 
   const bossKeys = Object.keys(bosses);
   expect(bossKeys).toStrictEqual(BOSSES);
+  const bountyHunterKeys = Object.keys(bountyHunter);
+  expect(bountyHunterKeys).toStrictEqual(BH_MODES);
 
-  expect.assertions(2);
+  expect.assertions(3);
+});
+
+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, true),
+      getPlayerTableURL('main', rsn),
+      getStatsURL('ironman', rsn, true),
+      getStatsURL('hardcore', rsn, true),
+      getStatsURL('ultimate', rsn, true)
+    ]);
+  });
+  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();
+  });
+  it('omits excluded gamemodes', async () => {
+    const response = await getStats(rsn, {
+      otherGamemodes: ['ironman', 'ultimate']
+    });
+    expect(response.hardcore).toBeUndefined();
+  });
+});
+
+test('CSV and JSON parsing outputs identical object', async () => {
+  const csvOutput = parseStats(b0atyStatsCsv);
+  const jsonOutput = parseJsonStats(b0atyStatsJson);
+  expect(csvOutput).toEqual(jsonOutput);
 });

__tests__/lynxTitanStats.csv

@@ -1,86 +0,0 @@
-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

__tests__/lynxTitanStats.json

@@ -0,0 +1,678 @@
+{
+  "skills": [
+    {
+      "id": 0,
+      "name": "Overall",
+      "rank": 1,
+      "level": 2277,
+      "xp": 4600000000
+    },
+    {
+      "id": 1,
+      "name": "Attack",
+      "rank": 15,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 2,
+      "name": "Defence",
+      "rank": 28,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 3,
+      "name": "Strength",
+      "rank": 18,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 4,
+      "name": "Hitpoints",
+      "rank": 7,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 5,
+      "name": "Ranged",
+      "rank": 8,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 6,
+      "name": "Prayer",
+      "rank": 11,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 7,
+      "name": "Magic",
+      "rank": 30,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 8,
+      "name": "Cooking",
+      "rank": 149,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 9,
+      "name": "Woodcutting",
+      "rank": 15,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 10,
+      "name": "Fletching",
+      "rank": 12,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 11,
+      "name": "Fishing",
+      "rank": 9,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 12,
+      "name": "Firemaking",
+      "rank": 48,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 13,
+      "name": "Crafting",
+      "rank": 4,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 14,
+      "name": "Smithing",
+      "rank": 3,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 15,
+      "name": "Mining",
+      "rank": 23,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 16,
+      "name": "Herblore",
+      "rank": 5,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 17,
+      "name": "Agility",
+      "rank": 24,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 18,
+      "name": "Thieving",
+      "rank": 12,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 19,
+      "name": "Slayer",
+      "rank": 2,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 20,
+      "name": "Farming",
+      "rank": 19,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 21,
+      "name": "Runecraft",
+      "rank": 6,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 22,
+      "name": "Hunter",
+      "rank": 3,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 23,
+      "name": "Construction",
+      "rank": 4,
+      "level": 99,
+      "xp": 200000000
+    }
+  ],
+  "activities": [
+    {
+      "id": 0,
+      "name": "League Points",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 1,
+      "name": "Deadman Points",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 2,
+      "name": "Bounty Hunter - Hunter",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 3,
+      "name": "Bounty Hunter - Rogue",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 4,
+      "name": "Bounty Hunter (Legacy) - Hunter",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 5,
+      "name": "Bounty Hunter (Legacy) - Rogue",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 6,
+      "name": "Clue Scrolls (all)",
+      "rank": 937868,
+      "score": 22
+    },
+    {
+      "id": 7,
+      "name": "Clue Scrolls (beginner)",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 8,
+      "name": "Clue Scrolls (easy)",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 9,
+      "name": "Clue Scrolls (medium)",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 10,
+      "name": "Clue Scrolls (hard)",
+      "rank": 578038,
+      "score": 22
+    },
+    {
+      "id": 11,
+      "name": "Clue Scrolls (elite)",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 12,
+      "name": "Clue Scrolls (master)",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 13,
+      "name": "LMS - Rank",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 14,
+      "name": "PvP Arena - Rank",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 15,
+      "name": "Soul Wars Zeal",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 16,
+      "name": "Rifts closed",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 17,
+      "name": "Colosseum Glory",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 18,
+      "name": "Collections Logged",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 19,
+      "name": "Abyssal Sire",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 20,
+      "name": "Alchemical Hydra",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 21,
+      "name": "Amoxliatl",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 22,
+      "name": "Araxxor",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 23,
+      "name": "Artio",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 24,
+      "name": "Barrows Chests",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 25,
+      "name": "Bryophyta",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 26,
+      "name": "Callisto",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 27,
+      "name": "Calvar'ion",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 28,
+      "name": "Cerberus",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 29,
+      "name": "Chambers of Xeric",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 30,
+      "name": "Chambers of Xeric: Challenge Mode",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 31,
+      "name": "Chaos Elemental",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 32,
+      "name": "Chaos Fanatic",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 33,
+      "name": "Commander Zilyana",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 34,
+      "name": "Corporeal Beast",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 35,
+      "name": "Crazy Archaeologist",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 36,
+      "name": "Dagannoth Prime",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 37,
+      "name": "Dagannoth Rex",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 38,
+      "name": "Dagannoth Supreme",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 39,
+      "name": "Deranged Archaeologist",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 40,
+      "name": "Duke Sucellus",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 41,
+      "name": "General Graardor",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 42,
+      "name": "Giant Mole",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 43,
+      "name": "Grotesque Guardians",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 44,
+      "name": "Hespori",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 45,
+      "name": "Kalphite Queen",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 46,
+      "name": "King Black Dragon",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 47,
+      "name": "Kraken",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 48,
+      "name": "Kree'Arra",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 49,
+      "name": "K'ril Tsutsaroth",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 50,
+      "name": "Lunar Chests",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 51,
+      "name": "Mimic",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 52,
+      "name": "Nex",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 53,
+      "name": "Nightmare",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 54,
+      "name": "Phosani's Nightmare",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 55,
+      "name": "Obor",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 56,
+      "name": "Phantom Muspah",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 57,
+      "name": "Sarachnis",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 58,
+      "name": "Scorpia",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 59,
+      "name": "Scurrius",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 60,
+      "name": "Skotizo",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 61,
+      "name": "Sol Heredit",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 62,
+      "name": "Spindel",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 63,
+      "name": "Tempoross",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 64,
+      "name": "The Gauntlet",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 65,
+      "name": "The Corrupted Gauntlet",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 66,
+      "name": "The Hueycoatl",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 67,
+      "name": "The Leviathan",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 68,
+      "name": "The Royal Titans",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 69,
+      "name": "The Whisperer",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 70,
+      "name": "Theatre of Blood",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 71,
+      "name": "Theatre of Blood: Hard Mode",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 72,
+      "name": "Thermonuclear Smoke Devil",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 73,
+      "name": "Tombs of Amascut",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 74,
+      "name": "Tombs of Amascut: Expert Mode",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 75,
+      "name": "TzKal-Zuk",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 76,
+      "name": "TzTok-Jad",
+      "rank": 317,
+      "score": 186
+    },
+    {
+      "id": 77,
+      "name": "Vardorvis",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 78,
+      "name": "Venenatis",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 79,
+      "name": "Vet'ion",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 80,
+      "name": "Vorkath",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 81,
+      "name": "Wintertodt",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 82,
+      "name": "Zalcano",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 83,
+      "name": "Zulrah",
+      "rank": -1,
+      "score": -1
+    }
+  ]
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "osrs-json-hiscores",
-  "version": "2.9.0",
+  "version": "2.21.0",
   "description": "The Old School Runescape API wrapper that does more!",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -30,6 +30,9 @@
     "stats",
     "skills"
   ],
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org"
+  },
   "author": "maxswa",
   "license": "ISC",
   "bugs": {
@@ -58,18 +61,23 @@
       "@typescript-eslint"
     ],
     "extends": [
-      "eslint-config-airbnb-typescript",
+      "airbnb-base",
+      "airbnb-typescript/base",
       "prettier"
     ],
     "ignorePatterns": [
       "**/@types/*"
-    ]
+    ],
+    "rules": {
+      "max-classes-per-file": "off"
+    }
   },
   "prettier": {
     "trailingComma": "none",
     "tabWidth": 2,
     "semi": true,
-    "singleQuote": true
+    "singleQuote": true,
+    "endOfLine": "auto"
   },
   "jest": {
     "transform": {
@@ -87,28 +95,25 @@
     "testEnvironment": "node"
   },
   "dependencies": {
-    "axios": "^0.21.1",
+    "axios": "^1.6.2",
-    "jsdom": "^16.3.0",
+    "jsdom": "^22.1.0",
     "useragent-generator": "^1.1.0"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.21",
+    "@types/jest": "^29.5.3",
-    "@types/jsdom": "^16.2.3",
+    "@types/jsdom": "^21.1.1",
-    "@typescript-eslint/eslint-plugin": "^4.19.0",
+    "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^4.19.0",
+    "@typescript-eslint/parser": "^6.0.0",
-    "eslint": "^7.22.0",
+    "eslint": "^8.44.0",
-    "eslint-config-airbnb-typescript": "^12.3.1",
+    "eslint-config-airbnb-typescript": "^17.1.0",
-    "eslint-config-prettier": "^8.1.0",
+    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-react": "^7.23.1",
-    "eslint-plugin-react-hooks": "^4.2.0",
     "husky": "^5.2.0",
-    "jest": "^26.6.3",
+    "jest": "^29.6.1",
-    "lint-staged": "^10.5.4",
+    "lint-staged": "^13.2.3",
-    "np": "6.5.0",
+    "np": "^7.7.0",
-    "prettier": "^2.2.1",
+    "prettier": "^3.0.0",
-    "ts-jest": "^26.5.4",
+    "ts-jest": "^29.1.1",
-    "typescript": "^4.2.3"
+    "typescript": "^5.1.6"
   }
 }

src/hiscores.ts

@@ -1,4 +1,5 @@
-import { JSDOM } from 'jsdom';
+import axios, { AxiosRequestConfig } from 'axios';
+import { BinaryData, JSDOM } from 'jsdom';
 import {
   Player,
   Activity,
@@ -12,7 +13,9 @@ import {
   PlayerSkillRow,
   ActivityName,
   PlayerActivityRow,
-  Bosses
+  Bosses,
+  GetStatsOptions,
+  HiscoresResponse
 } from './types';
 import {
   getStatsURL,
@@ -28,41 +31,160 @@ import {
   getActivityPageURL,
   httpGet,
   BOSSES,
-  INVALID_FORMAT_ERROR
+  InvalidFormatError,
+  PlayerNotFoundError,
+  HiScoresError,
+  validateRSN,
+  FORMATTED_SKILL_NAMES,
+  FORMATTED_BH_NAMES,
+  FORMATTED_CLUE_NAMES,
+  FORMATTED_BOSS_NAMES,
+  FORMATTED_LEAGUE_POINTS,
+  FORMATTED_LMS,
+  FORMATTED_PVP_ARENA,
+  FORMATTED_SOUL_WARS,
+  FORMATTED_RIFTS_CLOSED,
+  FORMATTED_DEADMAN_POINTS,
+  FORMATTED_COLOSSEUM_GLORY,
+  FORMATTED_COLLECTIONS_LOGGED
 } from './utils';
 
+/**
+ * Gets a player's stats from the official OSRS JSON endpoint.
+ *
+ * @param rsn Username of the player.
+ * @param mode Gamemode to fetch ranks for.
+ * @param config Optional axios request config object.
+ * @returns Official JSON stats object.
+ */
+export async function getOfficialStats(
+  rsn: string,
+  mode: Gamemode = 'main',
+  config?: AxiosRequestConfig
+): Promise<HiscoresResponse> {
+  validateRSN(rsn);
+
+  const url = getStatsURL(mode, rsn, true);
+  try {
+    const response = await httpGet<HiscoresResponse>(url, config);
+    return response.data;
+  } catch (err) {
+    if (!axios.isAxiosError(err)) throw err;
+
+    if (err.response?.status === 404) throw new PlayerNotFoundError();
+
+    throw new HiScoresError();
+  }
+}
+
 /**
  * Screen scrapes the hiscores to get the formatted rsn of a player.
  *
  * @param rsn Username of the player.
+ * @param config Optional axios request config object.
  * @returns Formatted version of the rsn.
  */
-export async function getRSNFormat(rsn: string): Promise<string> {
+export async function getRSNFormat(
-  if (typeof rsn !== 'string') {
+  rsn: string,
-    throw Error('RSN must be a string');
+  config?: AxiosRequestConfig
-  } else if (!/^[a-zA-Z0-9 _-]+$/.test(rsn)) {
+): Promise<string> {
-    throw Error('RSN contains invalid character');
+  validateRSN(rsn);
-  } 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(
+      config
-      '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');
+    throw new PlayerNotFoundError();
   } catch {
-    throw Error('Player not found');
+    throw new HiScoresError();
   }
 }
 
+/**
+ * Parses official JSON object of raw stats and returns a stats object.
+ *
+ * @param csv Raw JSON from the official OSRS API.
+ * @returns Parsed stats object.
+ */
+export function parseJsonStats(json: HiscoresResponse): Stats {
+  const getActivity = (formattedName: string): Activity => {
+    const hiscoresActivity = json.activities.find(
+      // We must match on name here since id is not guaranteed to be the same between updates
+      ({ name }) => name.toLowerCase() === formattedName.toLowerCase()
+    );
+    return {
+      rank: hiscoresActivity?.rank ?? -1,
+      score: hiscoresActivity?.score ?? -1
+    };
+  };
+  const reduceActivity = <Key extends string, Reduced = Record<Key, Activity>>(
+    keys: Key[],
+    formattedNames: Record<Key, string>
+  ): Reduced =>
+    keys.reduce<Reduced>(
+      (reducer, key) => ({
+        ...reducer,
+        [key]: getActivity(formattedNames[key])
+      }),
+      {} as Reduced
+    );
+
+  const skills = SKILLS.reduce<Skills>((skillsObject, skillName) => {
+    const hiscoresSkill = json.skills.find(
+      // We must match on name here since id is not guaranteed to be the same between updates
+      ({ name }) =>
+        name.toLowerCase() === FORMATTED_SKILL_NAMES[skillName].toLowerCase()
+    );
+    return {
+      ...skillsObject,
+      [skillName]: {
+        rank: hiscoresSkill?.rank ?? -1,
+        level: hiscoresSkill?.level ?? -1,
+        xp: hiscoresSkill?.xp ?? -1
+      }
+    };
+  }, {} as Skills);
+
+  const bountyHunter = reduceActivity(BH_MODES, FORMATTED_BH_NAMES);
+  const clues = reduceActivity(CLUES, FORMATTED_CLUE_NAMES);
+  const bosses = reduceActivity(BOSSES, FORMATTED_BOSS_NAMES);
+
+  const leaguePoints = getActivity(FORMATTED_LEAGUE_POINTS);
+  const deadmanPoints = getActivity(FORMATTED_DEADMAN_POINTS);
+  const lastManStanding = getActivity(FORMATTED_LMS);
+  const pvpArena = getActivity(FORMATTED_PVP_ARENA);
+  const soulWarsZeal = getActivity(FORMATTED_SOUL_WARS);
+  const riftsClosed = getActivity(FORMATTED_RIFTS_CLOSED);
+  const colosseumGlory = getActivity(FORMATTED_COLOSSEUM_GLORY);
+  const collectionsLogged = getActivity(FORMATTED_COLLECTIONS_LOGGED);
+
+  const stats: Stats = {
+    skills,
+    leaguePoints,
+    deadmanPoints,
+    bountyHunter,
+    lastManStanding,
+    pvpArena,
+    soulWarsZeal,
+    riftsClosed,
+    colosseumGlory,
+    collectionsLogged,
+    clues,
+    bosses
+  };
+
+  return stats;
+}
+
 /**
  * Parses CSV string of raw stats and returns a stats object.
  *
@@ -75,8 +197,8 @@ 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) {
+  if (splitCSV.length !== SKILLS.length + ACTIVITIES.length) {
-    throw Error(INVALID_FORMAT_ERROR);
+    throw new InvalidFormatError();
   }
 
   const skillObjects: Skill[] = splitCSV
@@ -102,10 +224,17 @@ export function parseStats(csv: string): Stats {
       return activity;
     });
 
-  const [leaguePoints] = activityObjects.splice(0, 1);
+  const [leaguePoints, deadmanPoints] = activityObjects.splice(0, 2);
   const bhObjects = activityObjects.splice(0, BH_MODES.length);
   const clueObjects = activityObjects.splice(0, CLUES.length);
-  const [lastManStanding, pvpArena, soulWarsZeal, riftsClosed] = activityObjects.splice(0, 4);
+  const [
+    lastManStanding,
+    pvpArena,
+    soulWarsZeal,
+    riftsClosed,
+    colosseumGlory,
+    collectionsLogged
+  ] = activityObjects.splice(0, 6);
   const bossObjects = activityObjects.splice(0, BOSSES.length);
 
   const skills: Skills = skillObjects.reduce<Skills>((prev, curr, index) => {
@@ -135,11 +264,14 @@ export function parseStats(csv: string): Stats {
   const stats: Stats = {
     skills,
     leaguePoints,
+    deadmanPoints,
     bountyHunter,
     lastManStanding,
     pvpArena,
     soulWarsZeal,
     riftsClosed,
+    colosseumGlory,
+    collectionsLogged,
     clues,
     bosses
   };
@@ -156,25 +288,31 @@ 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 main = await getOfficialStats(rsn, 'main', options?.axiosConfigs?.main);
-  if (mainRes.status === 200) {
-    const otherResponses = await Promise.all([
-      httpGet(getStatsURL('ironman', rsn)).catch((err) => err),
-      httpGet(getStatsURL('hardcore', rsn)).catch((err) => err),
-      httpGet(getStatsURL('ultimate', rsn)).catch((err) => err),
-      getRSNFormat(rsn).catch(() => undefined)
-    ]);
 
-    const [ironRes, hcRes, ultRes, formattedName] = otherResponses;
+  const getModeStats = async (
+    mode: Extract<Gamemode, 'ironman' | 'hardcore' | 'ultimate'>
+  ): Promise<HiscoresResponse | undefined> =>
+    otherGamemodes.includes(mode)
+      ? getOfficialStats(rsn, mode, options?.axiosConfigs?.[mode]).catch(
+          () => undefined
+        )
+      : undefined;
+  const formattedName = shouldGetFormattedRsn
+    ? await getRSNFormat(rsn, options?.axiosConfigs?.rsn).catch(() => undefined)
+    : undefined;
 
   const player: Player = {
     name: formattedName ?? rsn,
@@ -183,45 +321,42 @@ export async function getStats(rsn: string): Promise<Player> {
     deulted: false,
     deironed: false
   };
-    player.main = parseStats(mainRes.data);
+  player.main = parseJsonStats(main);
 
-    if (ironRes.status === 200) {
+  const iron = await getModeStats('ironman');
-      player.ironman = parseStats(ironRes.data);
+  if (iron) {
-      if (hcRes.status === 200) {
+    player.ironman = parseJsonStats(iron);
+    const hc = await getModeStats('hardcore');
+    const ult = await getModeStats('ultimate');
+    if (hc) {
       player.mode = 'hardcore';
-        player.hardcore = parseStats(hcRes.data);
+      player.hardcore = parseJsonStats(hc);
       if (
         player.ironman.skills.overall.xp !== player.hardcore.skills.overall.xp
       ) {
         player.dead = true;
         player.mode = 'ironman';
       }
-        if (
+      if (player.main.skills.overall.xp !== player.ironman.skills.overall.xp) {
-          player.main.skills.overall.xp !== player.ironman.skills.overall.xp
-        ) {
         player.deironed = true;
         player.mode = 'main';
       }
-      } else if (ultRes.status === 200) {
+    } else if (ult) {
       player.mode = 'ultimate';
-        player.ultimate = parseStats(ultRes.data);
+      player.ultimate = parseJsonStats(ult);
       if (
         player.ironman.skills.overall.xp !== player.ultimate.skills.overall.xp
       ) {
         player.deulted = true;
         player.mode = 'ironman';
       }
-        if (
+      if (player.main.skills.overall.xp !== player.ironman.skills.overall.xp) {
-          player.main.skills.overall.xp !== player.ironman.skills.overall.xp
-        ) {
         player.deironed = true;
         player.mode = 'main';
       }
     } else {
       player.mode = 'ironman';
-        if (
+      if (player.main.skills.overall.xp !== player.ironman.skills.overall.xp) {
-          player.main.skills.overall.xp !== player.ironman.skills.overall.xp
-        ) {
         player.deironed = true;
         player.mode = 'main';
       }
@@ -230,34 +365,26 @@ export async function getStats(rsn: string): Promise<Player> {
 
   return player;
 }
-  throw Error('Player not found');
-}
 
 /**
  * Fetches stats from the OSRS API and returns them as an object.
  *
  * @param rsn Username of the player.
  * @param mode Gamemode to fetch ranks for.
+ * @param config Optional axios request config object.
  * @returns Stats object.
  */
 export async function getStatsByGamemode(
   rsn: string,
-  mode: Gamemode = 'main'
+  mode: Gamemode = 'main',
+  config?: AxiosRequestConfig
 ): 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 getOfficialStats(rsn, mode, config);
-  if (response.status !== 200) {
+  const stats = parseJsonStats(response);
-    throw Error('Player not found');
-  }
-  const stats = parseStats(response.data);
 
   return stats;
 }
@@ -265,7 +392,8 @@ export async function getStatsByGamemode(
 export async function getSkillPage(
   skill: SkillName,
   mode: Gamemode = 'main',
-  page: number = 1
+  page: number = 1,
+  config?: AxiosRequestConfig
 ): Promise<PlayerSkillRow[]> {
   if (!GAMEMODES.includes(mode)) {
     throw Error('Invalid game mode');
@@ -276,7 +404,10 @@ export async function getSkillPage(
   }
   const url = getSkillPageURL(mode, skill, page);
 
-  const response = await httpGet(url);
+  const response = await httpGet<string | Buffer | BinaryData | undefined>(
+    url,
+    config
+  );
   const dom = new JSDOM(response.data);
   const playersHTML = dom.window.document.querySelectorAll(
     '.personal-hiscores__row'
@@ -308,12 +439,14 @@ export async function getSkillPage(
  * @param activity Name of the activity or boss to fetch hiscores for.
  * @param mode Gamemode to fetch ranks for.
  * @param page Page number.
+ * @param config Optional axios request config object.
  * @returns Array of `PlayerActivityRow` objects.
  */
 export async function getActivityPage(
   activity: ActivityName,
   mode: Gamemode = 'main',
-  page: number = 1
+  page: number = 1,
+  config?: AxiosRequestConfig
 ): Promise<PlayerActivityRow[]> {
   if (!GAMEMODES.includes(mode)) {
     throw Error('Invalid game mode');
@@ -324,7 +457,10 @@ export async function getActivityPage(
   }
   const url = getActivityPageURL(mode, activity, page);
 
-  const response = await httpGet(url);
+  const response = await httpGet<string | Buffer | BinaryData | undefined>(
+    url,
+    config
+  );
   const dom = new JSDOM(response.data);
   const playersHTML = dom.window.document.querySelectorAll(
     '.personal-hiscores__row'

src/types.ts

@@ -1,3 +1,5 @@
+import { AxiosRequestConfig } from 'axios';
+
 export type Gamemode =
   | 'main'
   | 'ironman'
@@ -5,7 +7,10 @@ export type Gamemode =
   | 'hardcore'
   | 'deadman'
   | 'seasonal'
-  | 'tournament';
+  | 'tournament'
+  | 'skiller'
+  | 'oneDefence'
+  | 'freshStart';
 
 export interface Skill {
   rank: number;
@@ -57,16 +62,20 @@ export type ClueType =
 
 export type Clues = { [Type in ClueType]: Activity };
 
-export type BHType = 'rogue' | 'hunter';
+export type BHType = 'rogue' | 'hunter' | 'rogueV2' | 'hunterV2';
 
 export type BH = { [Type in BHType]: Activity };
 
 export type Boss =
   | 'abyssalSire'
   | 'alchemicalHydra'
+  | 'amoxliatl'
+  | 'araxxor'
+  | 'artio'
   | 'barrows'
   | 'bryophyta'
   | 'callisto'
+  | 'calvarion'
   | 'cerberus'
   | 'chambersOfXeric'
   | 'chambersOfXericChallengeMode'
@@ -79,6 +88,7 @@ export type Boss =
   | 'dagannothRex'
   | 'dagannothSupreme'
   | 'derangedArchaeologist'
+  | 'dukeSucellus'
   | 'generalGraardor'
   | 'giantMole'
   | 'grotesqueGuardians'
@@ -88,22 +98,34 @@ export type Boss =
   | 'kraken'
   | 'kreeArra'
   | 'krilTsutsaroth'
+  | 'lunarChests'
   | 'mimic'
   | 'nex'
   | 'nightmare'
   | 'phosanisNightmare'
   | 'obor'
+  | 'phantomMuspah'
   | 'sarachnis'
   | 'scorpia'
+  | 'scurrius'
   | 'skotizo'
+  | 'solHeredit'
+  | 'spindel'
   | 'tempoross'
   | 'gauntlet'
   | 'corruptedGauntlet'
+  | 'hueycoatl'
+  | 'leviathan'
+  | 'royalTitans'
+  | 'whisperer'
   | 'theatreOfBlood'
   | 'theatreOfBloodHardMode'
   | 'thermonuclearSmokeDevil'
+  | 'tombsOfAmascut'
+  | 'tombsOfAmascutExpertMode'
   | 'tzKalZuk'
   | 'tzTokJad'
+  | 'vardorvis'
   | 'venenatis'
   | 'vetion'
   | 'vorkath'
@@ -115,6 +137,9 @@ export type Bosses = { [Type in Boss]: Activity };
 
 export type ActivityName =
   | 'leaguePoints'
+  | 'deadmanPoints'
+  | 'hunterBHV2'
+  | 'rogueBHV2'
   | 'hunterBH'
   | 'rogueBH'
   | 'lastManStanding'
@@ -128,17 +153,28 @@ export type ActivityName =
   | 'hardClues'
   | 'eliteClues'
   | 'masterClues'
+  | 'colosseumGlory'
+  | 'collectionsLogged'
   | Boss;
 
 export interface Stats {
   skills: Skills;
   clues: Clues;
+  /**
+   * Will only contain rank and score data for the `seasonal` gamemode.
+   */
   leaguePoints: Activity;
+  /**
+   * Will only contain rank and score data for the `tournament` gamemode.
+   */
+  deadmanPoints: Activity;
   bountyHunter: BH;
   lastManStanding: Activity;
   pvpArena: Activity;
   soulWarsZeal: Activity;
   riftsClosed: Activity;
+  colosseumGlory: Activity;
+  collectionsLogged: Activity;
   bosses: Bosses;
 }
 export type Modes = { [M in Gamemode]?: Stats };
@@ -160,3 +196,63 @@ 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;
+  /**
+   * Map of configs for each requests that can take place in the `getStats` function.
+   */
+  axiosConfigs?: Partial<Record<Gamemode, AxiosRequestConfig>> & {
+    /**
+     * The axios request config object to use for the RSN format request.
+     */
+    rsn?: AxiosRequestConfig;
+  };
+}
+
+export interface HiscoresCommon {
+  /**
+   * This field behaves more like an index than a true unique ID.
+   */
+  id: number;
+  /**
+   * The display name of this skill / activity.
+   */
+  name: string;
+  /**
+   * The player's official hiscores rank in this skill / activity.
+   */
+  rank: number;
+}
+
+export interface HiscoresSkill extends HiscoresCommon {
+  /**
+   * The player's current level in this skill.
+   */
+  level: number;
+  /**
+   * The player's current experience in this skill.
+   */
+  xp: number;
+}
+
+export interface HiscoresActivity extends HiscoresCommon {
+  /**
+   * The player's current score in this activity.
+   */
+  score: number;
+}
+
+export interface HiscoresResponse {
+  skills: HiscoresSkill[];
+  activities: HiscoresActivity[];
+}

src/utils/constants.ts

@@ -9,6 +9,7 @@ import {
 
 export const BASE_URL = 'https://secure.runescape.com/m=hiscore_oldschool';
 export const STATS_URL = 'index_lite.ws?player=';
+export const JSON_STATS_URL = 'index_lite.json?player=';
 export const SCORES_URL = 'overall.ws?';
 
 export type GamemodeUrl = {
@@ -22,7 +23,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',
@@ -59,7 +63,7 @@ export const CLUES: ClueType[] = [
   'elite',
   'master'
 ];
-export const BH_MODES: BHType[] = ['hunter', 'rogue'];
+export const BH_MODES: BHType[] = ['hunterV2', 'rogueV2', 'hunter', 'rogue'];
 export const GAMEMODES: Gamemode[] = [
   'main',
   'ironman',
@@ -72,9 +76,13 @@ export const GAMEMODES: Gamemode[] = [
 export const BOSSES: Boss[] = [
   'abyssalSire',
   'alchemicalHydra',
+  'amoxliatl',
+  'araxxor',
+  'artio',
   'barrows',
   'bryophyta',
   'callisto',
+  'calvarion',
   'cerberus',
   'chambersOfXeric',
   'chambersOfXericChallengeMode',
@@ -87,6 +95,7 @@ export const BOSSES: Boss[] = [
   'dagannothRex',
   'dagannothSupreme',
   'derangedArchaeologist',
+  'dukeSucellus',
   'generalGraardor',
   'giantMole',
   'grotesqueGuardians',
@@ -96,22 +105,34 @@ export const BOSSES: Boss[] = [
   'kraken',
   'kreeArra',
   'krilTsutsaroth',
+  'lunarChests',
   'mimic',
   'nex',
   'nightmare',
   'phosanisNightmare',
   'obor',
+  'phantomMuspah',
   'sarachnis',
   'scorpia',
+  'scurrius',
   'skotizo',
+  'solHeredit',
+  'spindel',
   'tempoross',
   'gauntlet',
   'corruptedGauntlet',
+  'hueycoatl',
+  'leviathan',
+  'royalTitans',
+  'whisperer',
   'theatreOfBlood',
   'theatreOfBloodHardMode',
   'thermonuclearSmokeDevil',
+  'tombsOfAmascut',
+  'tombsOfAmascutExpertMode',
   'tzKalZuk',
   'tzTokJad',
+  'vardorvis',
   'venenatis',
   'vetion',
   'vorkath',
@@ -121,6 +142,9 @@ export const BOSSES: Boss[] = [
 ];
 export const ACTIVITIES: ActivityName[] = [
   'leaguePoints',
+  'deadmanPoints',
+  'hunterBHV2',
+  'rogueBHV2',
   'hunterBH',
   'rogueBH',
   'allClues',
@@ -134,6 +158,8 @@ export const ACTIVITIES: ActivityName[] = [
   'pvpArena',
   'soulWarsZeal',
   'riftsClosed',
+  'colosseumGlory',
+  'collectionsLogged',
   ...BOSSES
 ];
 
@@ -144,9 +170,13 @@ export type FormattedBossNames = {
 export const FORMATTED_BOSS_NAMES: FormattedBossNames = {
   abyssalSire: 'Abyssal Sire',
   alchemicalHydra: 'Alchemical Hydra',
+  amoxliatl: 'Amoxliatl',
+  araxxor: 'Araxxor',
+  artio: 'Artio',
   barrows: 'Barrows Chests',
   bryophyta: 'Bryophyta',
   callisto: 'Callisto',
+  calvarion: "Calvar'ion",
   cerberus: 'Cerberus',
   chambersOfXeric: 'Chambers of Xeric',
   chambersOfXericChallengeMode: 'Chambers of Xeric: Challenge Mode',
@@ -159,6 +189,7 @@ export const FORMATTED_BOSS_NAMES: FormattedBossNames = {
   dagannothRex: 'Dagannoth Rex',
   dagannothSupreme: 'Dagannoth Supreme',
   derangedArchaeologist: 'Deranged Archaeologist',
+  dukeSucellus: 'Duke Sucellus',
   generalGraardor: 'General Graardor',
   giantMole: 'Giant Mole',
   grotesqueGuardians: 'Grotesque Guardians',
@@ -168,22 +199,34 @@ export const FORMATTED_BOSS_NAMES: FormattedBossNames = {
   kraken: 'Kraken',
   kreeArra: "Kree'Arra",
   krilTsutsaroth: "K'ril Tsutsaroth",
+  lunarChests: 'Lunar Chests',
   mimic: 'Mimic',
   nex: 'Nex',
-  nightmare: 'The Nightmare of Ashihama',
+  nightmare: 'Nightmare',
   phosanisNightmare: "Phosani's Nightmare",
   obor: 'Obor',
+  phantomMuspah: 'Phantom Muspah',
   sarachnis: 'Sarachnis',
   scorpia: 'Scorpia',
+  scurrius: 'Scurrius',
   skotizo: 'Skotizo',
+  solHeredit: 'Sol Heredit',
+  spindel: 'Spindel',
   tempoross: 'Tempoross',
   gauntlet: 'The Gauntlet',
   corruptedGauntlet: 'The Corrupted Gauntlet',
+  hueycoatl: 'The Hueycoatl',
+  leviathan: 'The Leviathan',
+  royalTitans: 'The Royal Titans',
+  whisperer: 'The Whisperer',
   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',
+  vardorvis: 'Vardorvis',
   venenatis: 'Venenatis',
   vetion: "Vet'ion",
   vorkath: 'Vorkath',
@@ -242,14 +285,57 @@ export type FormattedBHNames = {
 };
 
 export const FORMATTED_BH_NAMES: FormattedBHNames = {
-  rogue: 'Bounty Hunter - Rogue',
+  rogue: 'Bounty Hunter (Legacy) - Rogue',
-  hunter: 'Bounty Hunter - Hunter'
+  hunter: 'Bounty Hunter (Legacy) - Hunter',
+  rogueV2: 'Bounty Hunter - Rogue',
+  hunterV2: 'Bounty Hunter - Hunter'
 };
 
-export const FORMATTED_LMS = 'Last Man Standing';
+export const FORMATTED_LMS = 'LMS - Rank';
-export const FORMATTED_PVP_ARENA = 'PvP Arena';
+export const FORMATTED_PVP_ARENA = 'PvP Arena - Rank';
 export const FORMATTED_SOUL_WARS = 'Soul Wars Zeal';
 export const FORMATTED_LEAGUE_POINTS = 'League Points';
-export const FORMATTED_RIFTS_CLOSED = 'Rifts Closed';
+export const FORMATTED_DEADMAN_POINTS = 'Deadman Points';
+export const FORMATTED_RIFTS_CLOSED = 'Rifts closed';
+export const FORMATTED_COLOSSEUM_GLORY = 'Colosseum Glory';
+export const FORMATTED_COLLECTIONS_LOGGED = 'Collections Logged';
 
 export const INVALID_FORMAT_ERROR = 'Invalid hiscores format';
+export const PLAYER_NOT_FOUND_ERROR = 'Player not found';
+export const HISCORES_ERROR = 'HiScores not responding';
+
+export class InvalidFormatError extends Error {
+  __proto__ = Error;
+
+  constructor() {
+    super(INVALID_FORMAT_ERROR);
+    Object.setPrototypeOf(this, InvalidFormatError.prototype);
+  }
+}
+
+export class InvalidRSNError extends Error {
+  __proto__ = Error;
+
+  constructor(message: string) {
+    super(message);
+    Object.setPrototypeOf(this, InvalidRSNError.prototype);
+  }
+}
+
+export class PlayerNotFoundError extends Error {
+  __proto__ = Error;
+
+  constructor() {
+    super(PLAYER_NOT_FOUND_ERROR);
+    Object.setPrototypeOf(this, PlayerNotFoundError.prototype);
+  }
+}
+
+export class HiScoresError extends Error {
+  __proto__ = Error;
+
+  constructor() {
+    super(HISCORES_ERROR);
+    Object.setPrototypeOf(this, HiScoresError.prototype);
+  }
+}

src/utils/helpers.ts

@@ -1,4 +1,4 @@
-import axios from 'axios';
+import axios, { AxiosRequestConfig } from 'axios';
 import * as ua from 'useragent-generator';
 import { Gamemode, SkillName, ActivityName } from '../types';
 import {
@@ -6,7 +6,9 @@ import {
   STATS_URL,
   SCORES_URL,
   SKILLS,
-  ACTIVITIES
+  ACTIVITIES,
+  JSON_STATS_URL,
+  InvalidRSNError
 } from './constants';
 
 /**
@@ -14,10 +16,13 @@ import {
  *
  * @param gamemode Gamemode to fetch ranks for.
  * @param rsn Username of the player.
+ * @param json If the JSON endpoint is desired instead of CSV.
  * @returns Encoded stats URL.
  */
-export const getStatsURL = (gamemode: Gamemode, rsn: string) =>
+export const getStatsURL = (gamemode: Gamemode, rsn: string, json = false) =>
-  `${GAMEMODE_URL[gamemode]}${STATS_URL}${encodeURIComponent(rsn)}`;
+  `${GAMEMODE_URL[gamemode]}${
+    json ? JSON_STATS_URL : STATS_URL
+  }${encodeURIComponent(rsn)}`;
 
 /**
  * Will generate a player table URL for the official OSRS hiscores website.
@@ -96,10 +101,29 @@ 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>(
-  axios.get(url, {
+  url: string,
+  config: AxiosRequestConfig = {}
+) =>
+  axios.get<Response>(url, {
     headers: {
       // without User-Agent header requests may be rejected by DDoS protection mechanism
       'User-Agent': ua.firefox(80)
-    }
+    },
+    ...config
   });
+
+/**
+ * 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 new InvalidRSNError('RSN must be a string');
+  } else if (!/^[a-zA-Z0-9 _-]+$/.test(rsn)) {
+    throw new InvalidRSNError('RSN contains invalid character');
+  } else if (rsn.length > 12 || rsn.length < 1) {
+    throw new InvalidRSNError('RSN must be between 1 and 12 characters');
+  }
+};

tsconfig.json

@@ -6,10 +6,7 @@
     "outDir": "./lib",
     "strict": true,
     "lib": ["ES2015", "DOM", "DOM.Iterable"],
-    "typeRoots": [
+    "typeRoots": ["./node_modules/@types", "./src/@types"]
-      "./node_modules/@types",
-      "./src/@types"
-    ]
   },
   "include": ["src"],
   "exclude": ["node_modules", "**/__tests__/*"]