worldstate-emitter 2.2.6 → 2.2.7

package/.mocharc.yml

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

package/index.js

@@ -4,6 +4,7 @@ import RSS from './handlers/RSS.js';
 import Worldstate from './handlers/Worldstate.js';
 import Twitter from './handlers/Twitter.js';
 import { logger } from './utilities/index.js';
+import { FEATURES } from './resources/config.js';
 
 export default class WorldstateEmitter extends EventEmitter {
   #locale;
@@ -28,10 +29,16 @@ export default class WorldstateEmitter extends EventEmitter {
   }
 
   async #init() {
-    this.#rss = new RSS(this);
-    this.#worldstate = new Worldstate(this, this.#locale);
-    await this.#worldstate.init();
-    this.#twitter = new Twitter(this);
+    if (FEATURES.includes('rss')) {
+      this.#rss = new RSS(this);
+    }
+    if (FEATURES.includes('worldstate')) {
+      this.#worldstate = new Worldstate(this, this.#locale);
+      await this.#worldstate.init();
+    }
+    if (FEATURES.includes('twitter')) {
+      this.#twitter = new Twitter(this);
+    }
 
     logger.silly('hey look, i started up...');
     this.setupLogging();
@@ -58,6 +65,7 @@ export default class WorldstateEmitter extends EventEmitter {
    * @returns {Object} [description]
    */
   getRss() {
+    if (!this.#rss) return undefined;
     return this.#rss.feeder.list.map((i) => ({ url: i.url, items: i.items }));
   }
 
@@ -67,13 +75,14 @@ export default class WorldstateEmitter extends EventEmitter {
    * @returns {Object}                 Requested worldstate
    */
   getWorldstate(language = 'en') {
+    if (!this.#worldstate) return undefined;
     return this.#worldstate?.get(language);
   }
 
   get debug() {
     return {
-      rss: this.getRss(),
-      worldstate: this.#worldstate?.get(),
+      rss: FEATURES.includes('rss') ? this.getRss() : undefined,
+      worldstate: FEATURES.includes('worldstate') ? this.#worldstate?.get() : undefined,
       twitter: this.#twitter?.clientInfoValid ? this.#twitter.getData() : undefined,
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "worldstate-emitter",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "description": "Event emitter for worldstate & other warframe events",
   "keywords": [
     "warframe",
@@ -12,7 +12,10 @@
   "bugs": {
     "url": "https://github.com/wfcd/worldstate-emitter/issues"
   },
-  "repository": "https://github.com/WFCD/worldstate-emitter",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/WFCD/worldstate-emitter.git"
+  },
   "license": "Apache-2.0",
   "author": "tobiah <tobiah@protonmail.com>",
   "type": "module",

package/resources/config.js

@@ -1,3 +1,6 @@
 export const WORLDSTATE_URL = process.env.WORLDSTATE_URL ?? 'https://api.warframe.com/cdn/worldState.php';
 export const KUVA_URL = process.env.KUVA_URL ?? 'https://10o.io/arbitrations.json';
-export const SENTIENT_URL = process.env.SENTIENT_URL ?? 'https://semlar.com/anomaly.json';
+export const SENTIENT_URL = process.env.SENTIENT_URL ?? 'https://semlar.com/anomaly.json';
+export const PROXY_URL = process.env.PROXY_URL ?? undefined;
+
+export const FEATURES = process.env.FEATURES ? process.env.FEATURES.split(',') : ['rss', 'twitter', 'worldstate'];

package/utilities/Cache.js

@@ -1,7 +1,10 @@
 import { EventEmitter } from 'node:events';
+import { randomUUID } from 'node:crypto';
 
 import { CronJob } from 'cron';
 
+import fetch from './FetchProxy.js';
+
 import { logger } from './index.js';
 
 export default class CronCache extends EventEmitter {
@@ -41,7 +44,10 @@ export default class CronCache extends EventEmitter {
 
   async #fetch() {
     logger.silly(`fetching... ${this.#url}`);
-    const updated = await fetch(this.#url);
+    const updated = await fetch(this.#url, {
+      session: `emitter-session-${randomUUID()}`,
+      contentType: 'text/html',
+    });
     this.#data = await updated.text();
     return this.#data;
   }

package/utilities/FetchProxy.js

@@ -0,0 +1,73 @@
+import { PROXY_URL } from '../resources/config.js';
+
+const isCI = process.env.CI === 'true';
+const ciTimeout = process.env.CI_TIMEOUT ? parseInt(process.env.CI_TIMEOUT, 10) : 600000;
+const localTimeout = process.env.LOCAL_TIMEOUT ? parseInt(process.env.LOCAL_TIMEOUT, 10) : 12000000;
+
+export default async (
+  url,
+  { session = 'parser-session', contentType = 'application/json' } = {
+    session: 'parser-session',
+    contentType: 'application/json',
+  }
+) => {
+  if (PROXY_URL) {
+    const controller = new AbortController();
+    const timeout = setTimeout(
+      () => {
+        controller.abort();
+      },
+      isCI ? ciTimeout : localTimeout
+    );
+    let res;
+    try {
+      res = await fetch(`${PROXY_URL}/v1`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        signal: controller.signal,
+        body: JSON.stringify({
+          cmd: 'request.get',
+          url,
+          session,
+          maxTimeout: isCI ? ciTimeout : localTimeout,
+          returnOnlyCookies: false,
+          returnPageContent: true,
+        }),
+      });
+    } catch (error) {
+      if (error.name === 'AbortError') {
+        throw new Error(`Request timed out after ${isCI ? ciTimeout : localTimeout}ms`);
+      }
+      throw new Error(`Proxy request failed: ${error.message}`);
+    } finally {
+      clearTimeout(timeout);
+    }
+    const text = await res.text();
+    const { solution } = JSON.parse(text);
+    if (!solution?.response) {
+      throw solution;
+    }
+    if (contentType === 'application/json') {
+      return {
+        ok: solution.responseCode === 200,
+        status: solution.responseCode,
+        json: async () => {
+          try {
+            return JSON.parse(solution.response);
+          } catch (error) {
+            return {};
+          }
+        },
+      };
+    }
+    if (contentType === 'text/html') {
+      return {
+        ok: solution.responseCode === 200,
+        status: solution.responseCode,
+        text: async () => solution.response.replace(/<\/?[^>]+(>|$)/g, ''),
+      };
+    }
+    return solution.response;
+  }
+  return fetch(url);
+};