warframe-worldstate-parser 2.24.0 → 2.24.1

package/lib/WorldState.js

@@ -242,11 +242,14 @@ module.exports = class WorldState {
      */
     this.cambionCycle = new CambionCycle(this.cetusCycle, deps);
 
+    const zarimanSynd = safeArray(data.SyndicateMissions).filter((syndicate) => syndicate.Tag === 'ZarimanSyndicate');
+    const zarimanBountyEnd = timeDate.parseDate(zarimanSynd.length > 0 ? zarimanSynd[0].Expiry : { $date: 0 });
+
     /**
      * The current Zariman cycle based off current time
      * @type {ZarimanCycle}
      */
-    this.zarimanCycle = new ZarimanCycle(Date.now(), deps);
+    this.zarimanCycle = new ZarimanCycle(zarimanBountyEnd, deps);
 
     /**
      * Weekly challenges

package/lib/ZarimanCycle.js

@@ -5,9 +5,9 @@ const WorldstateObject = require('./WorldstateObject');
 // This is a confirmed starting time for Corpus (in millis)
 // All faction operation should use this as a calculation point
 // Unless there's a better logic
-const corpusTimeMillis = 1654725600000;
-const fullCycle = 28800000;
-const stateMaximum = 14400000;
+const corpusTimeMillis = 1655182800000;
+const fullCycle = 18000000;
+const stateMaximum = 9000000;
 
 /**
  * Represents the current Zariman Corpus/Grineer Cycle
@@ -15,12 +15,12 @@ const stateMaximum = 14400000;
  */
 module.exports = class ZarimanCycle extends WorldstateObject {
   /**
-   * @param   {Date}              currentTime     The current time to calculate Zariman cycle for
+   * @param   {Date}              bountiesEndDate The current zariman cycle expiry
    * @param   {Object}            deps            The dependencies object
    * @param   {MarkdownSettings}  deps.mdConfig   The markdown settings
    * @param   {TimeDateFunctions} deps.timeDate   The time and date functions
    */
-  constructor(currentTime, { mdConfig, timeDate }) {
+  constructor(bountiesEndDate, { mdConfig, timeDate }) {
     super({ _id: { $oid: 'zarimanCycle0' } }, { timeDate });
 
     /**
@@ -36,7 +36,7 @@ module.exports = class ZarimanCycle extends WorldstateObject {
      * @type {Date}
      * @private
      */
-    this.currentTime = currentTime;
+    this.bountiesEndDate = bountiesEndDate;
     Object.defineProperty(this, 'currentTime', { enumerable: false, configurable: false });
 
     /**
@@ -68,10 +68,10 @@ module.exports = class ZarimanCycle extends WorldstateObject {
     this.activation = new Date(ec.start);
 
     /**
-     * Whether or not this it's daytime
+     * Whether or not this it's corpus or grineer
      * @type {boolean}
      */
-    this.isCorpus = ec.corpusTime;
+    this.isCorpus = ec.isCorpus;
 
     /**
      * Current cycle state. One of `corpus`, `grineer`
@@ -95,24 +95,29 @@ module.exports = class ZarimanCycle extends WorldstateObject {
    * @returns {boolean}
    */
   getExpired() {
-    return this.timeDate.fromNow(this.expiry) < 0;
+    return this.expiry ? this.timeDate.fromNow(this.expiry) < 0 : true;
   }
 
   getCurrentZarimanCycle() {
-    // determine if it is corpus cycle or grineer cycle
-    const timeInCycle = (this.currentTime - corpusTimeMillis) % fullCycle;
-    // if timeInCycle is less than 4 hours, it is corpus, otherwise it is grineer
-    const corpusTime = timeInCycle <= stateMaximum;
-
-    // cycles are offset by 2 hours from bounties
-    const millisLeft = fullCycle - timeInCycle;
+    const now = Date.now();
+    // determine if it is corpus cycle or grineer cycle based on bounty end time
+    // we subtract 5000 millis (5 seconds) to ensure the corpus/grineer calculation is correct
+    const bountiesClone = this.bountiesEndDate.getTime() - 5000;
+    const millisLeft = this.timeDate.fromNow(new Date(bountiesClone));
+    // the following line is a modulus operation
+    // this ensures that our calculation is correct if bountiesClone is before corpusTimeMillis
+    // if you really care, read https://torstencurdt.com/tech/posts/modulo-of-negative-numbers/
+    const cycleTimeElapsed = (((bountiesClone - corpusTimeMillis) % fullCycle) + fullCycle) % fullCycle;
+    const cycleTimeLeft = fullCycle - cycleTimeElapsed;
+    // if timeInCycle is more than 2.5 hours, it is corpus, otherwise it is grineer
+    const isCorpus = cycleTimeLeft > stateMaximum;
 
     const minutesCoef = 1000 * 60;
-    const expiry = new Date(Math.round((this.currentTime + millisLeft) / minutesCoef) * minutesCoef);
-    const state = corpusTime ? 'corpus' : 'grineer';
+    const expiry = new Date(Math.round((now + millisLeft) / minutesCoef) * minutesCoef);
+    const state = isCorpus ? 'corpus' : 'grineer';
 
     return {
-      corpusTime,
+      isCorpus,
       timeLeft: this.timeDate.timeDeltaToString(millisLeft),
       expiry,
       expiresIn: millisLeft,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "warframe-worldstate-parser",
-  "version": "2.24.0",
+  "version": "2.24.1",
   "description": "An Open parser for Warframe's Worldstate in Javascript",
   "types": "./types/main.d.ts",
   "main": "main.js",

package/types/lib/ZarimanCycle.d.ts

@@ -1,12 +1,12 @@
 export = ZarimanCycle;
 declare class ZarimanCycle extends WorldstateObject {
     /**
-     * @param   {Date}              currentTime     The current time to calculate Zariman cycle for
+     * @param   {Date}              bountiesEndDate The current zariman cycle expiry
      * @param   {Object}            deps            The dependencies object
      * @param   {MarkdownSettings}  deps.mdConfig   The markdown settings
      * @param   {TimeDateFunctions} deps.timeDate   The time and date functions
      */
-    constructor(currentTime: Date, { mdConfig, timeDate }: {
+    constructor(bountiesEndDate: Date, { mdConfig, timeDate }: {
         mdConfig: MarkdownSettings;
         timeDate: TimeDateFunctions;
     });
@@ -21,9 +21,9 @@ declare class ZarimanCycle extends WorldstateObject {
      * @type {Date}
      * @private
      */
-    private currentTime;
+    private bountiesEndDate;
     /**
-     * Whether or not this it's daytime
+     * Whether or not this it's corpus or grineer
      * @type {boolean}
      */
     isCorpus: boolean;
@@ -44,10 +44,10 @@ declare class ZarimanCycle extends WorldstateObject {
      */
     getExpired(): boolean;
     getCurrentZarimanCycle(): {
-        corpusTime: boolean;
+        isCorpus: boolean;
         timeLeft: any;
         expiry: Date;
-        expiresIn: number;
+        expiresIn: any;
         state: string;
         start: number;
     };