worldstate-emitter 2.1.3 → 2.2.1

package/.babelrc.json

@@ -0,0 +1,4 @@
+{
+  "plugins": ["@babel/plugin-transform-class-properties", "@babel/plugin-transform-private-methods"],
+  "presets": ["@babel/preset-env"]
+}

package/.commitlintrc.yml

@@ -0,0 +1,5 @@
+extends:
+  - '@commitlint/config-conventional'
+rules:
+  body-max-line-length:
+    - 0

package/.eslintignore

@@ -0,0 +1,4 @@
+.github/**
+docs/**
+resources/**
+types/**

package/.eslintrc.yml

@@ -0,0 +1,9 @@
+parser: '@babel/eslint-parser'
+parserOptions:
+  ecmaFeatures:
+    modules: true
+  ecmaVersion: 6
+  sourceType: module
+extends: '@wfcd/eslint-config/esm'
+rules:
+  no-underscore-dangle: 'off'

package/.lintstagedrc.yml

@@ -0,0 +1,9 @@
+'*.js':
+  - eslint --cache --fix
+  - npm test
+package*.json:
+  - prettier --write
+  - npm dedupe
+  - npx sort-package-json
+'*.{json,yml,yaml}':
+  - prettier --write

package/.mocharc.yml

@@ -0,0 +1,3 @@
+exit: true
+spec: test/specs/**/*.spec.js
+timeout: 20000

package/.nycrc.yml

@@ -0,0 +1,4 @@
+reporter:
+  - lcov
+  - text
+skip-full: true

package/.prettierrc

@@ -0,0 +1 @@
+"@wfcd/eslint-config/prettier"

package/handlers/RSS.js

@@ -1,6 +1,6 @@
 import RssFeedEmitter from 'rss-feed-emitter';
 
-import feeds from '../resources/rssFeeds.json' assert { type: 'json' };
+import feeds from '../resources/rssFeeds.json' with { type: 'json' };
 import { logger } from '../utilities/index.js';
 
 /**

package/handlers/Twitter.js

@@ -1,6 +1,6 @@
 import Twitter from 'twitter';
 
-import toWatch from '../resources/tweeters.json' assert { type: 'json' };
+import toWatch from '../resources/tweeters.json' with { type: 'json' };
 import { logger } from '../utilities/index.js';
 import { twiClientInfo, TWITTER_TIMEOUT } from '../utilities/env.js';
 

package/index.js

@@ -70,6 +70,14 @@ export default class WorldstateEmitter extends EventEmitter {
     return this.#worldstate?.get(language);
   }
 
+  get debug() {
+    return {
+      rss: this.getRss(),
+      worldstate: this.#worldstate?.get(),
+      twitter: this.#twitter?.clientInfoValid ? this.#twitter.getData() : undefined,
+    };
+  }
+
   /**
    * Get Twitter data
    * @returns {Promise} promised twitter data

package/nodemon.json

@@ -0,0 +1,8 @@
+{
+  "delay": 5000,
+  "env": {
+    "LOG_LEVEL": "debug",
+    "CACHE_TIMEOUT": 60000,
+    "SEMLAR_TIMEOUT": 300000
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "worldstate-emitter",
-  "version": "2.1.3",
+  "version": "2.2.1",
   "description": "Event emitter for worldstate & other warframe events",
   "keywords": [
     "warframe",
@@ -19,6 +19,9 @@
   "license": "Apache-2.0",
   "author": "tobiah <tobiah@protonmail.com>",
   "type": "module",
+  "exports": {
+    ".": "./index.js"
+  },
   "main": "index.js",
   "directories": {
     "test": "test/specs"
@@ -29,92 +32,18 @@
     "dev": "nodemon test/tester.js",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "prepare": "husky && install-peerdeps @wfcd/eslint-config@latest -S",
+    "prepare": "husky && npx install-peerdeps @wfcd/eslint-config@latest -S",
     "report": "c8 report --reporter=text-lcov",
     "test": "c8 mocha",
     "validate": "npm ls"
   },
   "pre-commit": [
     "lint",
-    "test",
-    "validate"
+    "validate",
+    "test"
   ],
-  "commitlint": {
-    "extends": [
-      "@commitlint/config-conventional"
-    ],
-    "rules": {
-      "body-max-line-length": [
-        0
-      ]
-    }
-  },
-  "lint-staged": {
-    "*.js": [
-      "eslint --cache --fix",
-      "npm test"
-    ],
-    "package*.json": [
-      "prettier --write",
-      "npm dedupe",
-      "npx sort-package-json"
-    ],
-    "*.{json,yml,yaml}": [
-      "prettier --write"
-    ]
-  },
-  "nodemonConfig": {
-    "delay": 5000,
-    "env": {
-      "LOG_LEVEL": "debug",
-      "CACHE_TIMEOUT": 60000,
-      "SEMLAR_TIMEOUT": 300000
-    }
-  },
-  "babel": {
-    "plugins": [
-      "@babel/plugin-transform-class-properties",
-      "@babel/plugin-transform-private-methods"
-    ],
-    "presets": [
-      "@babel/preset-env"
-    ]
-  },
-  "prettier": "@wfcd/eslint-config/prettier",
-  "eslintConfig": {
-    "parser": "@babel/eslint-parser",
-    "parserOptions": {
-      "ecmaFeatures": {
-        "modules": true
-      },
-      "ecmaVersion": 6,
-      "sourceType": "module"
-    },
-    "extends": "@wfcd/eslint-config/esm",
-    "rules": {
-      "no-underscore-dangle": "off"
-    }
-  },
-  "eslintIgnore": [
-    ".github/**",
-    "docs/**",
-    "resources/**",
-    "types/**"
-  ],
-  "mocha": {
-    "exit": true,
-    "spec": "test/specs/**/*.spec.js",
-    "timeout": 20000
-  },
-  "c8": {
-    "reporter": [
-      "lcov",
-      "text"
-    ],
-    "skip-full": true
-  },
   "dependencies": {
-    "cron": "^3.1.6",
+    "cron": "^4.0.0",
     "rss-feed-emitter": "^3.2.2",
     "twitter": "^1.7.1"
   },
@@ -122,19 +51,19 @@
     "@commitlint/cli": "^19.2.1",
     "@commitlint/config-conventional": "^19.1.0",
     "@wfcd/eslint-config": "latest",
-    "c8": "^9.1.0",
-    "chai": "^4.3.4",
+    "c8": "^10.1.2",
+    "chai": "^5.1.2",
     "coveralls": "^3.1.0",
     "husky": "^9.0.11",
     "install-peerdeps": "^3.0.3",
     "lint-staged": "^15.2.2",
-    "mocha": "^10.0.0",
+    "mocha": "^11.0.1",
     "nodemon": "^3.0.3",
     "prettier": "^3.2.5"
   },
   "peerDependencies": {
     "warframe-worldstate-data": "^2.x",
-    "warframe-worldstate-parser": "^3.x"
+    "warframe-worldstate-parser": "^4.x"
   },
   "optionalDependencies": {
     "colors": "^1.4.0",

package/utilities/WSCache.js

@@ -1,4 +1,4 @@
-import Worldstate from 'warframe-worldstate-parser';
+import WorldState from 'warframe-worldstate-parser';
 
 import { logger } from './index.js';
 
@@ -16,7 +16,7 @@ export default class WSCache {
 
   /**
    * Set up a cache checking for data and updates to a specific worldstate set
-   * @param {string}        language      Langauge/translation to track
+   * @param {string}        language      Language/translation to track
    * @param {Cache}     kuvaCache     Cache of kuva data, provided by Semlar
    * @param {Cache}     sentientCache Cache of sentient outpost data, provided by Semlar
    * @param {EventEmitter}  eventEmitter  Emitter to push new worldstate updates to
@@ -29,6 +29,39 @@ export default class WSCache {
     this.#emitter = eventEmitter;
   }
 
+  /**
+   * Update the current data with new data
+   * @param {string} newData updated worldstate data
+   * @returns {Promise<void>}
+   */
+  #update = async (newData) => {
+    const deps = {
+      locale: this.#language,
+      kuvaData: {},
+      sentientData: {},
+    };
+    try {
+      deps.kuvaData = JSON.parse(await this.#kuvaCache.get());
+    } catch (err) {
+      logger.warn(`Error parsing kuva data for ${this.#language}: ${err}`);
+    }
+    try {
+      deps.sentientData = JSON.parse(await this.#sentientCache.get());
+    } catch (err) {
+      logger.warn(`Error parsing sentient data for ${this.#language}: ${err}`);
+    }
+
+    const t = await WorldState.build(newData, deps);
+    if (!t.timestamp) return;
+
+    this.#inner = t;
+    this.#emitter.emit('ws:update:parsed', {
+      language: this.#language,
+      platform: this.#platform,
+      data: t,
+    });
+  };
+
   /**
    * Get the latest worldstate data from this cache
    * @returns {Object} Current worldstate data
@@ -43,21 +76,7 @@ export default class WSCache {
    */
   set data(newData) {
     logger.debug(`got new data for ${this.#language}, parsing...`);
-    setTimeout(async () => {
-      const t = new Worldstate(newData, {
-        locale: this.#language,
-        kuvaData: JSON.parse(await this.#kuvaCache.get()),
-        sentientData: JSON.parse(await this.#sentientCache.get()),
-      });
-      if (!t.timestamp) return;
-
-      this.#inner = t;
-      this.#emitter.emit('ws:update:parsed', {
-        language: this.#language,
-        platform: this.#platform,
-        data: t,
-      });
-    }, 0);
+    this.#update(newData);
   }
 
   /**