@eso-status/forum-message 2.0.0-dev.17 → 2.0.0-dev.19

package/lib/connector.js

@@ -6,6 +6,16 @@ const raw_1 = require("./raw");
  * Class for retrieving information from announcements
  */
 class Connector {
+    url;
+    remoteContent;
+    /**
+     * List of raw data from announcements
+     */
+    raw = [];
+    /**
+     * List of information from announcements
+     */
+    rawEsoStatus = [];
     /**
      * @param url URL used as the source to retrieve announcements
      * @param remoteContent Content of the source retrieved via URL
@@ -13,14 +23,6 @@ class Connector {
     constructor(url, remoteContent) {
         this.url = url;
         this.remoteContent = remoteContent;
-        /**
-         * List of raw data from announcements
-         */
-        this.raw = [];
-        /**
-         * List of information from announcements
-         */
-        this.rawEsoStatus = [];
         this.getMessages();
         this.replace();
         this.split();
@@ -41,16 +43,16 @@ class Connector {
      */
     static async getRemoteContent(url) {
         const response = await axios_1.default.get(url);
-        return response?.status === 200 && !!response?.data
-            ? String(response?.data)
-            : '';
+        return response.status === 200 && !!response.data ? response.data : '';
     }
     /**
      * Method for retrieving raw announcements for all announcement levels
      * @private
      */
     getMessages() {
-        ['AlertMessage', 'WarningMessage'].forEach((type) => this.getMessagesByType(type));
+        ['AlertMessage', 'WarningMessage'].forEach((type) => {
+            this.getMessagesByType(type);
+        });
     }
     /**
      * Method for retrieving raw announcements based on the announcement level
@@ -87,6 +89,7 @@ class Connector {
             initialRaw = initialRaw.replace(' Thank you for your patience.', '');
             initialRaw = initialRaw.replace(' We will update as new information becomes available.', '');
             initialRaw = initialRaw.replace(' If you continue to experience difficulties at login, please restart your client. Thank you for your patience!', '');
+            initialRaw = initialRaw.replace('  ', ' ');
             if (initialRaw.includes('\t')) {
                 const split = initialRaw.split('\t');
                 if (split[0] === ' ') {
@@ -140,7 +143,9 @@ class Connector {
      * @private
      */
     fetch() {
-        this.raw.forEach((raw) => this.fetchEach(raw));
+        this.raw.forEach((raw) => {
+            this.fetchEach(raw);
+        });
     }
     /**
      * Method for retrieving the information contained in an announcement

package/lib/formatter/date.formatter.js

@@ -5,6 +5,15 @@ const moment = require("moment");
  * Class for identifying and formatting the date contained in an announcement
  */
 class DateFormatter {
+    raw;
+    /**
+     * Raw date data contained in the announcement
+     */
+    rawDate;
+    /**
+     * List of dates formatted correctly contained in the announcement (ISO 8601)
+     */
+    dates;
     /**
      * @param raw Raw data of the announcement
      */

package/lib/identifier/slug.identifier.js

@@ -6,112 +6,121 @@ const slug_match_1 = require("./slug.match");
  * Class for identifying the list of slugs contained in an announcement
  */
 class SlugIdentifier {
+    raw;
+    /**
+     * List of slug information found in the announcement
+     */
+    slugMatches;
+    /**
+     * List of slugs to check for presence in the announcement
+     * @private
+     */
+    slugList = [
+        types_1.ServerPcEuSlug,
+        types_1.ServerPcNaSlug,
+        types_1.ServerPcPtsSlug,
+        types_1.ServerPsEuSlug,
+        types_1.ServerPsNaSlug,
+        types_1.ServerXboxEuSlug,
+        types_1.ServerXboxNaSlug,
+        types_1.ServiceStoreEsoSlug,
+        types_1.ServiceSystemAccountSlug,
+        types_1.ServiceWebSiteSlug,
+    ];
+    /**
+     * List of indicators proving that the announcement pertains to the slug server_pc_eu
+     * @private
+     */
+    ServerPcEuMatchesList = [
+        'PC/Mac: EU megaserver for',
+        'PC/Mac: NA and EU megaservers for',
+        '] EU megaservers for',
+        '• EU megaservers for',
+    ];
+    /**
+     * List of indicators proving that the announcement pertains to the slug server_pc_na
+     * @private
+     */
+    ServerPcNaMatchesList = [
+        'PC/Mac: NA megaserver for',
+        'PC/Mac: NA and EU megaservers for',
+        '] NA megaservers for',
+        '• NA megaservers for',
+        'North American PC/Mac megaserver',
+    ];
+    /**
+     * List of indicators proving that the announcement pertains to the slug server_pc_pts
+     * @private
+     */
+    ServerPcPtsMatchesList = ['PTS'];
+    /**
+     * List of indicators proving that the announcement pertains to the slug server_ps_eu
+     * @private
+     */
+    ServerPsEuMatchesList = [
+        'PlayStation®: NA and EU megaservers for',
+        'The PlayStation™ Network',
+        '] EU megaservers for',
+        '• EU megaservers for',
+    ];
+    /**
+     * List of indicators proving that the announcement pertains to the slug server_ps_na
+     * @private
+     */
+    ServerPsNaMatchesList = [
+        'PlayStation®: NA and EU megaservers for',
+        'The PlayStation™ Network',
+        '] NA megaservers for',
+        '• NA megaservers for',
+        'North American PlayStation® megaserver',
+    ];
+    /**
+     * List of indicators proving that the announcement pertains to the slug server_xbox_eu
+     * @private
+     */
+    ServerXboxEuMatchesList = [
+        'Xbox: NA and EU megaservers for',
+        'Xbox: EU megaserver for',
+        '] EU megaservers for',
+        '• EU megaservers for',
+        'Xbox Live™',
+    ];
+    /**
+     * List of indicators proving that the announcement pertains to the slug server_xbox_na
+     * @private
+     */
+    ServerXboxNaMatchesList = [
+        'Xbox: NA and EU megaservers for',
+        '] NA megaservers for',
+        '• NA megaservers for',
+        'Xbox Live™',
+    ];
+    /**
+     * List of indicators proving that the announcement pertains to the slug service_store_eso
+     * @private
+     */
+    ServiceStoreEsoMatchesList = ['ESO Store and Account System for'];
+    /**
+     * List of indicators proving that the announcement pertains to the slug service_system_account
+     * @private
+     */
+    ServiceSystemAccountMatchesList = ['ESO Store and Account System for'];
+    /**
+     * List of indicators proving that the announcement pertains to the slug service_web_site
+     * @private
+     */
+    ServiceWebSiteMatchesList = [
+        'ESO Website for',
+    ];
     /**
      * @param raw Raw data of the announcement
      */
     constructor(raw) {
         this.raw = raw;
-        /**
-         * List of slugs to check for presence in the announcement
-         * @private
-         */
-        this.slugList = [
-            types_1.ServerPcEuSlug,
-            types_1.ServerPcNaSlug,
-            types_1.ServerPcPtsSlug,
-            types_1.ServerPsEuSlug,
-            types_1.ServerPsNaSlug,
-            types_1.ServerXboxEuSlug,
-            types_1.ServerXboxNaSlug,
-            types_1.ServiceStoreEsoSlug,
-            types_1.ServiceSystemAccountSlug,
-            types_1.ServiceWebSiteSlug,
-        ];
-        /**
-         * List of indicators proving that the announcement pertains to the slug server_pc_eu
-         * @private
-         */
-        this.ServerPcEuMatchesList = [
-            'PC/Mac: EU megaserver for',
-            'PC/Mac: NA and EU megaservers for',
-            '] EU megaservers for',
-            '• EU megaservers for',
-        ];
-        /**
-         * List of indicators proving that the announcement pertains to the slug server_pc_na
-         * @private
-         */
-        this.ServerPcNaMatchesList = [
-            'PC/Mac: NA megaserver for',
-            'PC/Mac: NA and EU megaservers for',
-            '] NA megaservers for',
-            '• NA megaservers for',
-            'North American PC/Mac megaserver',
-        ];
-        /**
-         * List of indicators proving that the announcement pertains to the slug server_pc_pts
-         * @private
-         */
-        this.ServerPcPtsMatchesList = ['PTS'];
-        /**
-         * List of indicators proving that the announcement pertains to the slug server_ps_eu
-         * @private
-         */
-        this.ServerPsEuMatchesList = [
-            'PlayStation®: NA and EU megaservers for',
-            'The PlayStation™ Network',
-            '] EU megaservers for',
-            '• EU megaservers for',
-        ];
-        /**
-         * List of indicators proving that the announcement pertains to the slug server_ps_na
-         * @private
-         */
-        this.ServerPsNaMatchesList = [
-            'PlayStation®: NA and EU megaservers for',
-            'The PlayStation™ Network',
-            '] NA megaservers for',
-            '• NA megaservers for',
-            'North American PlayStation® megaserver',
-        ];
-        /**
-         * List of indicators proving that the announcement pertains to the slug server_xbox_eu
-         * @private
-         */
-        this.ServerXboxEuMatchesList = [
-            'Xbox: NA and EU megaservers for',
-            'Xbox: EU megaserver for',
-            '] EU megaservers for',
-            '• EU megaservers for',
-        ];
-        /**
-         * List of indicators proving that the announcement pertains to the slug server_xbox_na
-         * @private
-         */
-        this.ServerXboxNaMatchesList = [
-            'Xbox: NA and EU megaservers for',
-            '] NA megaservers for',
-            '• NA megaservers for',
-        ];
-        /**
-         * List of indicators proving that the announcement pertains to the slug service_store_eso
-         * @private
-         */
-        this.ServiceStoreEsoMatchesList = ['ESO Store and Account System for'];
-        /**
-         * List of indicators proving that the announcement pertains to the slug service_system_account
-         * @private
-         */
-        this.ServiceSystemAccountMatchesList = ['ESO Store and Account System for'];
-        /**
-         * List of indicators proving that the announcement pertains to the slug service_web_site
-         * @private
-         */
-        this.ServiceWebSiteMatchesList = [
-            'ESO Website for',
-        ];
         this.slugMatches = [];
-        this.slugList.forEach((slug) => this.identify(slug));
+        this.slugList.forEach((slug) => {
+            this.identify(slug);
+        });
     }
     /**
      * Method for retrieving the list of indicators for a slug to test
@@ -119,7 +128,8 @@ class SlugIdentifier {
      * @private
      */
     getMatchList(slug) {
-        return this[SlugIdentifier.getMatchListName(slug)];
+        const key = SlugIdentifier.getMatchListName(slug);
+        return this[key];
     }
     /**
      * Method for retrieving the name of the list of indicators for a slug to test

package/lib/identifier/slug.match.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * Class for retrieving information about a slug found in an announcement
  */
 class SlugMatch {
+    rawSlug;
+    slug;
     /**
      * @param rawSlug Data used to identify the presence of the slug in the announcement
      * @param slug Slug found in the announcement

package/lib/identifier/status.identifier.d.ts

@@ -8,11 +8,11 @@ export default class StatusIdentifier {
     /**
      * Data used to identify the presence of the status in the announcement
      */
-    rawStatus: RemoteRawStatus;
+    rawStatus: RemoteRawStatus | null;
     /**
      * Status found in the announcement
      */
-    status: Status;
+    status: Status | null;
     /**
      * List of statuses to check for presence in the announcement
      * @private

package/lib/identifier/status.identifier.js

@@ -5,57 +5,68 @@ const types_1 = require("@eso-status/types");
  * Class for identifying the status contained in an announcement
  */
 class StatusIdentifier {
+    raw;
+    /**
+     * Data used to identify the presence of the status in the announcement
+     */
+    rawStatus;
+    /**
+     * Status found in the announcement
+     */
+    status;
+    /**
+     * List of statuses to check for presence in the announcement
+     * @private
+     */
+    statusList = [
+        types_1.UpStatus,
+        types_1.DownStatus,
+        types_1.PlannedStatus,
+        types_1.IssuesStatus,
+    ];
+    /**
+     * List of indicators proving that the announcement pertains to the status up
+     * @private
+     */
+    upMatchesList = [
+        '[COMPLETE]',
+        'now available',
+        'complete',
+        'been resolved',
+    ];
+    /**
+     * List of indicators proving that the announcement pertains to the status down
+     * @private
+     */
+    downMatchesList = [
+        '[EXTENDED]',
+        '[IN PROGRESS]',
+        'unavailable',
+    ];
+    /**
+     * List of indicators proving that the announcement pertains to the status planned
+     * @private
+     */
+    plannedMatchesList = [
+        'We will be performing maintenance',
+        'will be taken offline for maintenance',
+    ];
+    /**
+     * List of indicators proving that the announcement pertains to the status issues
+     * @private
+     */
+    issuesMatchesList = [
+        'is currently experiencing a service interruption',
+        'currently investigating',
+    ];
     /**
      * @param raw Raw data of the announcement
      */
     constructor(raw) {
         this.raw = raw;
-        /**
-         * List of statuses to check for presence in the announcement
-         * @private
-         */
-        this.statusList = [
-            types_1.UpStatus,
-            types_1.DownStatus,
-            types_1.PlannedStatus,
-            types_1.IssuesStatus,
-        ];
-        /**
-         * List of indicators proving that the announcement pertains to the status up
-         * @private
-         */
-        this.upMatchesList = [
-            '[COMPLETE]',
-            'now available',
-            'complete',
-            'been resolved',
-        ];
-        /**
-         * List of indicators proving that the announcement pertains to the status down
-         * @private
-         */
-        this.downMatchesList = [
-            '[EXTENDED]',
-            '[IN PROGRESS]',
-            'unavailable',
-        ];
-        /**
-         * List of indicators proving that the announcement pertains to the status planned
-         * @private
-         */
-        this.plannedMatchesList = [
-            'We will be performing maintenance',
-            'will be taken offline for maintenance',
-        ];
-        /**
-         * List of indicators proving that the announcement pertains to the status issues
-         * @private
-         */
-        this.issuesMatchesList = [
-            'is currently experiencing a service interruption',
-            'currently investigating',
-        ];
-        this.statusList.forEach((status) => this.identify(status));
+        this.statusList.forEach((status) => {
+            this.identify(status);
+        });
         this.default();
     }
     /**
@@ -92,9 +103,7 @@ class StatusIdentifier {
      * @private
      */
     default() {
-        if (!this.status) {
-            this.status = types_1.PlannedStatus;
-        }
+        this.status ??= types_1.PlannedStatus;
     }
 }
 exports.default = StatusIdentifier;

package/lib/index.js

@@ -5,6 +5,8 @@ const connector_1 = require("./connector");
 /**
  * Class for retrieving announcement information
  */
+/* eslint-disable @typescript-eslint/no-extraneous-class */
+/* eslint-disable @typescript-eslint/unified-signatures */
 class ForumMessage {
     /**
      * Method for retrieving announcement information
@@ -16,4 +18,6 @@ class ForumMessage {
     }
 }
 exports.default = ForumMessage;
+/* eslint-enable @typescript-eslint/no-extraneous-class */
+/* eslint-enable @typescript-eslint/unified-signatures */
 //# sourceMappingURL=index.js.map

package/lib/raw.js

@@ -7,6 +7,27 @@ const slug_identifier_1 = require("./identifier/slug.identifier");
  * Class containing announcement information
  */
 class Raw {
+    url;
+    raw;
+    /**
+     * Status identification class
+     * @private
+     */
+    statusIdentifier;
+    /**
+     * Class for identifying and formatting the date(s)
+     * @private
+     */
+    dateFormatter;
+    /**
+     * Class for identifying the list of slugs
+     * @private
+     */
+    slugsIdentifier;
+    /**
+     * List of information about slugs found in the announcement
+     */
+    matches = [];
     /**
      * @param url URL used as the source to retrieve announcements
      * @param raw Raw data of the announcement
@@ -14,10 +35,6 @@ class Raw {
     constructor(url, raw) {
         this.url = url;
         this.raw = raw;
-        /**
-         * List of information about slugs found in the announcement
-         */
-        this.matches = [];
         this.statusIdentifier = new status_identifier_1.default(this.raw);
         this.dateFormatter = new date_formatter_1.default(this.raw);
         this.slugsIdentifier = new slug_identifier_1.default(this.raw);

package/lib/type/remoteServerXboxEuRawSlug.type.d.ts

@@ -1,4 +1,4 @@
 /**
  * Different slugs of announcements concerning the European Xbox Megaserver
  */
-export type RemoteServerXboxEuRawSlug = 'Xbox: NA and EU megaservers for' | 'Xbox: EU megaserver for' | '] EU megaservers for' | '• EU megaservers for';
+export type RemoteServerXboxEuRawSlug = 'Xbox: NA and EU megaservers for' | 'Xbox: EU megaserver for' | '] EU megaservers for' | '• EU megaservers for' | 'Xbox Live™';

package/lib/type/remoteServerXboxNaRawSlug.type.d.ts

@@ -1,4 +1,4 @@
 /**
  * Different slugs of announcements concerning the North American Xbox Megaserver
  */
-export type RemoteServerXboxNaRawSlug = 'Xbox: NA and EU megaservers for' | '] NA megaservers for' | '• NA megaservers for';
+export type RemoteServerXboxNaRawSlug = 'Xbox: NA and EU megaservers for' | '] NA megaservers for' | '• NA megaservers for' | 'Xbox Live™';

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@eso-status/forum-message",
-  "version": "2.0.0-dev.17",
+  "version": "2.0.0-dev.19",
   "description": "Library for retrieving and formatting data, available at https://forums.elderscrollsonline.com or https://forums.elderscrollsonline.com/en/categories/pts",
-  "author": "@dov118 <contact@dov118.dev> (https://dov118.dev)",
+  "author": "@dov118 <contact.dov118.dev@gmail.com> (https://dov118.dev)",
   "main": "lib/index.js",
   "license": "MIT",
   "engineStrict": true,
@@ -65,7 +65,7 @@
     "README.md"
   ],
   "engines": {
-    "node": "^18.18.0 || ^20.0.0"
+    "node": "^20.19.0 || ^22.13.0 || >=24"
   },
   "bugs": {
     "url": "https://github.com/eso-status/forum-message/issues"
@@ -82,32 +82,42 @@
     "build": "rm -R -f lib/* && tsc --project tsconfig.build.json",
     "dev": "npm run build && node .",
     "watch": "nodemon --exec npm run dev",
-    "test": "npm run build && jest --runInBand --setupFiles",
-    "test:watch": "jest --runInBand --watch --setupFiles",
-    "test:cov": "jest --runInBand --coverage --setupFiles",
+    "test": "npm run build && jest --runInBand",
+    "test:watch": "jest --runInBand --watch",
+    "test:cov": "jest --runInBand --coverage",
     "prepare": "husky"
   },
   "dependencies": {
-    "@eso-status/types": "2.0.0-dev.13",
-    "axios": "1.7.7",
+    "@eso-status/types": "2.0.0-dev.17",
+    "axios": "1.13.6",
     "moment": "2.30.1"
   },
+  "lint-staged": {
+    "*.ts": [
+      "eslint --fix",
+      "prettier --write"
+    ],
+    "*.{json,md,yml,yaml}": [
+      "prettier --write"
+    ]
+  },
   "devDependencies": {
-    "@types/jest": "29.5.14",
-    "eslint": "8.57.1",
-    "eslint-config-airbnb-base": "15.0.0",
-    "eslint-config-airbnb-typescript": "18.0.0",
-    "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-jest": "28.8.3",
-    "eslint-plugin-prettier": "5.2.1",
-    "eslint-plugin-sonarjs": "2.0.4",
-    "eslint-plugin-unused-imports": "4.1.4",
-    "husky": "9.1.6",
-    "jest": "29.7.0",
-    "nodemon": "3.1.7",
-    "prettier": "3.3.3",
-    "ts-jest": "29.2.5",
-    "typescript": "5.5.4"
+    "@eslint/js": "10.0.1",
+    "@types/jest": "30.0.0",
+    "eslint": "10.0.3",
+    "eslint-config-prettier": "10.1.8",
+    "eslint-plugin-jest": "29.15.0",
+    "eslint-plugin-sonarjs": "4.0.2",
+    "eslint-plugin-unused-imports": "4.4.1",
+    "globals": "17.4.0",
+    "husky": "9.1.7",
+    "jest": "30.3.0",
+    "lint-staged": "16.3.3",
+    "nodemon": "3.1.14",
+    "prettier": "3.8.1",
+    "ts-jest": "29.4.6",
+    "typescript": "5.9.3",
+    "typescript-eslint": "8.57.0"
   },
   "jest": {
     "moduleFileExtensions": [
@@ -125,9 +135,6 @@
     ],
     "coverageDirectory": "./coverage",
     "testEnvironment": "node",
-    "setupFiles": [
-      "dotenv/config"
-    ],
     "moduleDirectories": [
       "node_modules",
       "src"