warframe-worldstate-parser 2.22.0 → 2.23.2

package/lib/Sortie.js

@@ -78,6 +78,12 @@ class Sortie extends WorldstateObject {
      */
     this.faction = translator.sortieFaction(data.Boss, locale);
 
+    /**
+     * The sortie's faction
+     * @type {string}
+     */
+    this.factionKey = translator.sortieFaction(data.boss, 'en');
+
     /**
      * Whether or not this is expired (at time of object creation)
      * @type {boolean}

package/lib/SyndicateJob.js

@@ -5,7 +5,7 @@ const fetch = require('node-fetch');
 const WorldstateObject = require('./WorldstateObject');
 
 const apiBase = process.env.API_BASE_URL || 'https://api.warframestat.us';
-const bountyRewardRegex = /Tier([ABCDE])Table([ABC])Rewards/i;
+const bountyRewardRegex = /(?:Tier([ABCDE])|Narmer)Table([ABC])Rewards/i;
 const ghoulRewardRegex = /GhoulBountyTable([AB])Rewards/i;
 
 /**
@@ -75,17 +75,20 @@ const getBountyRewards = async (i18n, isVault, raw) => {
   return [];
 };
 
+const FIFTY_MINUTES = 3000000;
+
 /**
  * Represents a syndicate daily mission
  * @extends {WorldstateObject}
  */
 class SyndicateJob extends WorldstateObject {
   /**
-   * @param   {Object}             data            The syndicate mission data
-   * @param   {Date}               expiry          The syndicate job expiration
-   * @param   {Object}             deps            The dependencies object
-   * @param   {Translator}         deps.translator The string translator
-   * @param   {string}             deps.locale     Locale to use for translations
+   * @param {Object} data The syndicate mission data
+   * @param {Date} expiry The syndicate job expiration
+   * @param {Object} deps The dependencies object
+   * @param {Object} timeDate Time/Date functions
+   * @param {Translator} translator The string translator
+   * @param {string} locale Locale to use for translations
    */
   constructor(data, expiry, { translator, timeDate, locale }) {
     super({ _id: { $oid: data.JobCurrentVersion ? data.JobCurrentVersion.$oid : `${(data.jobType || '').split('/').slice(-1)[0]}${expiry.getTime()}` } }, { timeDate });
@@ -141,6 +144,27 @@ class SyndicateJob extends WorldstateObject {
      * @type {string|null}
      */
     this.locationTag = data.locationTag;
+
+    /**
+     * End time for the syndicate mission.
+     * Should be inherited from the Syndicate, but some are timebound.
+     * @type {Date}
+     */
+    this.expiry = expiry;
+
+    /**
+     * What time phase this bounty is bound to
+     * @type {string}
+     */
+    this.timeBound = undefined;
+    if (data.jobType && data.jobType.toLowerCase().includes('narmer')) {
+      if (data.jobType.toLowerCase().includes('eidolon')) {
+        this.timeBound = 'day';
+        this.expiry = new Date(this.expiry.getTime() - FIFTY_MINUTES);
+      } else {
+        this.timeBoound = 'night';
+      }
+    }
   }
 }
 

package/lib/SyndicateMission.js

@@ -67,6 +67,12 @@ class SyndicateMission extends WorldstateObject {
      */
     this.syndicate = translator.syndicate(data.Tag, locale);
 
+    /**
+     * The syndicate that is offering the mission
+     * @type {string}
+     */
+    this.syndicateKey = translator.syndicate(data.Tag, 'en');
+
     /**
      * The nodes on which the missions are taking place
      * @type {Array.<string>}

package/lib/WorldEvent.js

@@ -307,7 +307,7 @@ class WorldEvent extends WorldstateObject {
       lines.push(`${this.health}% Remaining`);
     }
 
-    if (this.affiliatedWith) {
+    if (this.affiliatedWith && this.jobs) {
       lines.push(`${this.affiliatedWith} will reward you for performing `
         + `${this.jobs.map((job) => job.type).join(', ')} job${this.jobs.length > 1 ? 's' : ''}`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "warframe-worldstate-parser",
-  "version": "2.22.0",
+  "version": "2.23.2",
   "description": "An Open parser for Warframe's Worldstate in Javascript",
   "types": "./types/main.d.ts",
   "main": "main.js",
@@ -24,11 +24,11 @@
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.20.1",
     "greenkeeper-lockfile": "^1.15.1",
-    "mocha": "^9.0.2",
+    "mocha": "^10.0.0",
     "nyc": "^15.1.0",
     "precommit-hook": "^3.0.0",
-    "rewire": "^5.0.0",
-    "sinon": "^12.0.1",
+    "rewire": "^6.0.0",
+    "sinon": "^13.0.0",
     "sinon-chai": "^3.5.0",
     "typescript": "^4.0.5"
   },

package/types/lib/CambionCycle.d.ts

@@ -1,5 +1,6 @@
 export = CambionCycle;
 declare class CambionCycle extends WorldstateObject {
+    active: string;
     /**
      * Get whether or not the event has expired
      * @returns {boolean}

package/types/lib/Sortie.d.ts

@@ -48,6 +48,11 @@ declare class Sortie extends WorldstateObject {
      * @type {string}
      */
     faction: string;
+    /**
+     * The sortie's faction
+     * @type {string}
+     */
+    factionKey: string;
     /**
      * Whether or not this is expired (at time of object creation)
      * @type {boolean}

package/types/lib/SyndicateJob.d.ts

@@ -5,16 +5,14 @@ export = SyndicateJob;
  */
 declare class SyndicateJob extends WorldstateObject {
     /**
-     * @param   {Object}             data            The syndicate mission data
-     * @param   {Date}               expiry          The syndicate job expiration
-     * @param   {Object}             deps            The dependencies object
-     * @param   {Translator}         deps.translator The string translator
-     * @param   {string}             deps.locale     Locale to use for translations
+     * @param {Object} data The syndicate mission data
+     * @param {Date} expiry The syndicate job expiration
+     * @param {Object} deps The dependencies object
+     * @param {Object} timeDate Time/Date functions
+     * @param {Translator} translator The string translator
+     * @param {string} locale Locale to use for translations
      */
-    constructor(data: any, expiry: Date, { translator, timeDate, locale }: {
-        translator: Translator;
-        locale: string;
-    });
+    constructor(data: any, expiry: Date, { translator, timeDate, locale }: any);
     /**
      * Array of strings describing rewards
      * @type {Array.<String>}
@@ -51,5 +49,11 @@ declare class SyndicateJob extends WorldstateObject {
      * @type {string|null}
      */
     locationTag: string | null;
+    /**
+     * What time phase this bounty is bound to
+     * @type {string}
+     */
+    timeBound: string;
+    timeBoound: string;
 }
 import WorldstateObject = require("./WorldstateObject");

package/types/lib/SyndicateMission.d.ts

@@ -35,6 +35,11 @@ declare class SyndicateMission extends WorldstateObject {
      * @type {string}
      */
     syndicate: string;
+    /**
+     * The syndicate that is offering the mission
+     * @type {string}
+     */
+    syndicateKey: string;
     /**
      * The nodes on which the missions are taking place
      * @type {Array.<string>}