worldstate-emitter 2.2.8 → 2.2.10

package/.eslintignore

@@ -1,4 +1,5 @@
 .github/**
 docs/**
 resources/**
+!resources/config.js
 types/**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "worldstate-emitter",
-  "version": "2.2.8",
+  "version": "2.2.10",
   "description": "Event emitter for worldstate & other warframe events",
   "keywords": [
     "warframe",

package/resources/config.js

@@ -1,6 +1,7 @@
 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 PROXY_URL = process.env.PROXY_URL ?? undefined;
 
-export const FEATURES = process.env.WS_EMITTER_FEATURES ? process.env.WS_EMITTER_FEATURES.split(',') : ['rss', 'twitter', 'worldstate'];
+export const FEATURES = process.env.WS_EMITTER_FEATURES
+  ? process.env.WS_EMITTER_FEATURES.split(',')
+  : ['rss', 'twitter', 'worldstate'];

package/utilities/Cache.js

@@ -1,10 +1,7 @@
 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 {
@@ -44,10 +41,7 @@ export default class CronCache extends EventEmitter {
 
   async #fetch() {
     logger.silly(`fetching... ${this.#url}`);
-    const updated = await fetch(this.#url, {
-      session: `emitter-session-${randomUUID()}`,
-      contentType: 'text/html',
-    });
+    const updated = await fetch(this.#url);
     this.#data = await updated.text();
     return this.#data;
   }

package/utilities/WSCache.js

@@ -43,7 +43,7 @@ export default class WSCache {
     try {
       deps.kuvaData = JSON.parse(await this.#kuvaCache.get());
     } catch (err) {
-      logger.warn(`Error parsing kuva data for ${this.#language}: ${err}`);
+      logger.debug(`Error parsing kuva data for ${this.#language}: ${err}`);
     }
     try {
       deps.sentientData = JSON.parse(await this.#sentientCache.get());
@@ -51,8 +51,14 @@ export default class WSCache {
       logger.warn(`Error parsing sentient data for ${this.#language}: ${err}`);
     }
 
-    const t = await WorldState.build(newData, deps);
-    if (!t.timestamp) return;
+    let t;
+    try {
+      t = await WorldState.build(newData, deps);
+      if (!t.timestamp) return;
+    } catch (err) {
+      this.#logger.warn(`Error parsing worldstate data for ${this.#language}: ${err}`);
+      return;
+    }
 
     this.#inner = t;
     this.#emitter.emit('ws:update:parsed', {

package/utilities/FetchProxy.js

@@ -1,73 +0,0 @@
-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);
-};