worldstate-emitter 2.4.4 → 2.5.0

package/dist/index.d.cts

@@ -1,11 +1,13 @@
 import EventEmitter from "node:events";
 import { RSSItem } from "rss-feed-emitter";
 import WorldState from "warframe-worldstate-parser";
+import { Logger } from "winston";
 
 //#region index.d.ts
 interface WorldstateEmitterOptions {
   locale?: string;
   features?: string[];
+  logger?: Logger;
 }
 interface RssFeedItem {
   url: string;
@@ -20,14 +22,16 @@ declare class WorldstateEmitter extends EventEmitter {
   #private;
   static make({
     locale,
-    features
+    features,
+    logger: upLogger
   }?: WorldstateEmitterOptions): Promise<WorldstateEmitter>;
   /**
    * Pull in and instantiate emitters
    * @param options - Configuration options
    */
   constructor({
-    locale
+    locale,
+    logger: uLogger
   }?: WorldstateEmitterOptions);
   /**
    * Set up internal logging

package/dist/index.d.ts

@@ -1,11 +1,13 @@
 import EventEmitter from "node:events";
 import { RSSItem } from "rss-feed-emitter";
+import { Logger } from "winston";
 import WorldState from "warframe-worldstate-parser";
 
 //#region index.d.ts
 interface WorldstateEmitterOptions {
   locale?: string;
   features?: string[];
+  logger?: Logger;
 }
 interface RssFeedItem {
   url: string;
@@ -20,14 +22,16 @@ declare class WorldstateEmitter extends EventEmitter {
   #private;
   static make({
     locale,
-    features
+    features,
+    logger: upLogger
   }?: WorldstateEmitterOptions): Promise<WorldstateEmitter>;
   /**
    * Pull in and instantiate emitters
    * @param options - Configuration options
    */
   constructor({
-    locale
+    locale,
+    logger: uLogger
   }?: WorldstateEmitterOptions);
   /**
    * Set up internal logging

package/dist/index.js

@@ -21,17 +21,19 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 //#endregion
 let node_events = require("node:events");
-node_events = __toESM(node_events);
+node_events = __toESM(node_events, 1);
 let rss_feed_emitter = require("rss-feed-emitter");
-rss_feed_emitter = __toESM(rss_feed_emitter);
+rss_feed_emitter = __toESM(rss_feed_emitter, 1);
 let sanitize_html = require("sanitize-html");
-sanitize_html = __toESM(sanitize_html);
+sanitize_html = __toESM(sanitize_html, 1);
 let winston = require("winston");
 let twitter = require("twitter");
-twitter = __toESM(twitter);
+twitter = __toESM(twitter, 1);
 let warframe_worldstate_data = require("warframe-worldstate-data");
-warframe_worldstate_data = __toESM(warframe_worldstate_data);
+warframe_worldstate_data = __toESM(warframe_worldstate_data, 1);
 let cron = require("cron");
+let warframe_worldstate_parser = require("warframe-worldstate-parser");
+warframe_worldstate_parser = __toESM(warframe_worldstate_parser, 1);
 //#region resources/rssFeeds.json
 var rssFeeds_default = [
 	{
@@ -189,20 +191,51 @@ const twiClientInfo = {
 const TWITTER_TIMEOUT = Number(process?.env?.TWITTER_TIMEOUT) || 6e4;
 //#endregion
 //#region utilities/index.ts
-let tempLogger;
+const levels = {
+	["fatal"]: 0,
+	["error"]: 1,
+	["warn"]: 2,
+	["info"]: 3,
+	["debug"]: 4,
+	["silly"]: 5
+};
+let loggerInstance;
 try {
 	const { combine, label, printf, colorize } = winston.format;
 	const transport = new winston.transports.Console();
 	const logFormat = printf((info) => `[${info.label}] ${info.level}: ${info.message}`);
-	tempLogger = (0, winston.createLogger)({
+	loggerInstance = (0, winston.createLogger)({
 		format: combine(colorize(), label({ label: "WS" }), logFormat),
-		transports: [transport]
+		transports: [transport],
+		level: LOG_LEVEL,
+		levels
 	});
-	tempLogger.level = LOG_LEVEL;
+	loggerInstance.level = LOG_LEVEL;
 } catch (_e) {
-	tempLogger = (0, winston.createLogger)({ transports: [new winston.transports.Console()] });
+	loggerInstance = (0, winston.createLogger)({
+		transports: [new winston.transports.Console()],
+		level: LOG_LEVEL,
+		levels
+	});
 }
-const logger = tempLogger;
+/**
+* Replace the module-wide logger used by emitter internals.
+* Call before constructing handlers when injecting a host-provided logger.
+*/
+const setLogger = (uLogger) => {
+	loggerInstance = uLogger;
+};
+/** Global logger proxy so existing imports pick up setLogger() overrides. */
+const logger = new Proxy({}, {
+	get(_target, prop) {
+		const value = Reflect.get(loggerInstance, prop, loggerInstance);
+		return typeof value === "function" ? value.bind(loggerInstance) : value;
+	},
+	set(_target, prop, value) {
+		Reflect.set(loggerInstance, prop, value);
+		return true;
+	}
+});
 /**
 * Group an array by a field value
 * @param array - array of objects to group
@@ -470,6 +503,7 @@ const parseTweet = (tweets, watchable) => {
 */
 var TwitterCache = class {
 	emitter;
+	logger;
 	timeout;
 	clientInfoValid;
 	client;
@@ -487,9 +521,11 @@ var TwitterCache = class {
 	* @param options.clientInfo - Custom Twitter client credentials
 	* @param options.watchList - Custom list of Twitter accounts to watch
 	* @param options.timeout - Polling interval in milliseconds
+	* @param options.logger - Custom logger instance (default: uses global logger)
 	*/
 	constructor(eventEmitter, options = {}) {
 		this.emitter = eventEmitter;
+		this.logger = options.logger || logger;
 		this.timeout = options.timeout ?? TWITTER_TIMEOUT;
 		this.lastUpdated = Date.now() - 6e4;
 		this.disposed = false;
@@ -512,11 +548,11 @@ var TwitterCache = class {
 				this.updateInterval = setInterval(() => this.update(), this.timeout);
 				this.update();
 			} else {
-				logger.warn(`Twitter client not initialized... invalid token: ${clientInfo.bearer_token}`);
+				this.logger.warn(`Twitter client not initialized... invalid token: ${clientInfo.bearer_token}`);
 				this.dispose();
 			}
 		} catch (err) {
-			logger.error(err);
+			this.logger.error(err);
 			this.dispose();
 		}
 	}
@@ -536,11 +572,11 @@ var TwitterCache = class {
 	async update() {
 		if (this.disposed || !this.clientInfoValid) return void 0;
 		if (!this.toWatch || this.toWatch.length === 0) {
-			logger.verbose("Not processing twitter, no data to watch.");
+			this.logger.debug("Not processing twitter, no data to watch.");
 			return;
 		}
 		if (!this.client) {
-			logger.verbose("Not processing twitter, no client to connect.");
+			this.logger.debug("Not processing twitter, no client to connect.");
 			return;
 		}
 		this.updating = this.getParseableData();
@@ -551,7 +587,7 @@ var TwitterCache = class {
 	* @returns Tweets
 	*/
 	async getParseableData() {
-		logger.silly("Starting Twitter update...");
+		this.logger.debug("Starting Twitter update...");
 		const parsedData = [];
 		try {
 			await Promise.all((this.toWatch || []).map(async (watchable) => {
@@ -576,9 +612,9 @@ var TwitterCache = class {
 	*/
 	onError(error) {
 		if (Array.isArray(error) && error[0] && error[0].code === 32) {
-			logger.info("wiping twitter client data, could not authenticate...");
+			this.logger.info("wiping twitter client data, could not authenticate...");
 			this.dispose();
-		} else logger.debug(JSON.stringify(error));
+		} else this.logger.debug(JSON.stringify(error));
 	}
 	/**
 	* Get the current data or a promise with the current data
@@ -600,7 +636,7 @@ var TwitterCache = class {
 		}
 		this.client = void 0;
 		this.clientInfoValid = false;
-		logger.verbose("Twitter polling stopped and resources cleaned up");
+		this.logger.debug("Twitter polling stopped and resources cleaned up");
 	}
 };
 //#endregion
@@ -913,8 +949,8 @@ var CronCache = class CronCache extends node_events.EventEmitter {
 	* @param pattern - Optional cron pattern for update frequency
 	* @returns Initialized CronCache instance
 	*/
-	static async make(url, pattern) {
-		const cache = new CronCache(url, pattern);
+	static async make(url, pattern, uLogger) {
+		const cache = new CronCache(url, pattern, uLogger);
 		await cache.#update();
 		return cache;
 	}
@@ -922,11 +958,13 @@ var CronCache = class CronCache extends node_events.EventEmitter {
 	* Create a new CronCache
 	* @param url - The URL to fetch data from
 	* @param pattern - Optional cron pattern for update frequency
+	* @param uLogger - Optional logger instance
 	*/
-	constructor(url, pattern) {
+	constructor(url, pattern, uLogger) {
 		super();
 		this.#url = url;
 		if (pattern) this.#pattern = pattern;
+		if (uLogger) this.#logger = uLogger;
 		this.#job = new cron.CronJob(this.#pattern, () => void this.#update(), void 0, true);
 		this.#job.start();
 	}
@@ -957,12 +995,12 @@ var CronCache = class CronCache extends node_events.EventEmitter {
 	* @private
 	*/
 	async #fetch() {
-		logger.silly(`fetching... ${this.#url}`);
+		this.#logger.silly(`fetching... ${this.#url}`);
 		const response = await fetch(this.#url);
 		if (!response.ok) {
 			const responseText = await response.text();
 			const errorMessage = `Failed to fetch ${this.#url}: ${response.status} ${response.statusText}`;
-			logger.error(errorMessage, { responseText });
+			this.#logger.error(errorMessage, { responseText });
 			throw new Error(errorMessage);
 		}
 		this.#data = await response.text();
@@ -974,14 +1012,14 @@ var CronCache = class CronCache extends node_events.EventEmitter {
 	*/
 	async get() {
 		if (this.#updating) {
-			logger.silly("returning in-progress update promise");
+			this.#logger.silly("returning in-progress update promise");
 			return this.#updating;
 		}
 		if (!this.#data) {
-			logger.silly("returning new update promise");
+			this.#logger.silly("returning new update promise");
 			return this.#update();
 		}
-		logger.silly("returning cached data");
+		this.#logger.silly("returning cached data");
 		return this.#data;
 	}
 	/**
@@ -1013,12 +1051,13 @@ var WSCache = class {
 	* @param options.sentientCache - Cache of sentient outpost data, provided by Semlar
 	* @param options.eventEmitter - Emitter to push new worldstate updates to
 	*/
-	constructor({ language, kuvaCache, sentientCache, eventEmitter }) {
+	constructor({ language, kuvaCache, sentientCache, eventEmitter, logger: uLogger }) {
 		this.#inner = void 0;
 		this.#kuvaCache = kuvaCache;
 		this.#sentientCache = sentientCache;
 		this.#language = language;
 		this.#emitter = eventEmitter;
+		this.#logger = uLogger || logger;
 	}
 	/**
 	* Update the current data with new data
@@ -1028,24 +1067,25 @@ var WSCache = class {
 	#update = async (newData) => {
 		const deps = {
 			locale: this.#language,
-			kuvaData: {},
-			sentientData: {}
+			kuvaData: [],
+			sentientData: void 0,
+			logger: { debug: (message) => this.#logger.debug(message) }
 		};
 		try {
 			const kuvaRaw = await this.#kuvaCache.get();
 			if (kuvaRaw) deps.kuvaData = JSON.parse(kuvaRaw);
 		} catch (err) {
-			logger.debug(`Error parsing kuva data for ${this.#language}: ${err}`);
+			this.#logger.debug(`Error parsing kuva data for ${this.#language}: ${err}`);
 		}
 		try {
 			const sentientRaw = await this.#sentientCache.get();
 			if (sentientRaw) deps.sentientData = JSON.parse(sentientRaw);
 		} catch (err) {
-			logger.warn(`Error parsing sentient data for ${this.#language}: ${err}`);
+			this.#logger.warn(`Error parsing sentient data for ${this.#language}: ${err}`);
 		}
 		let t;
 		try {
-			t = await WorldState.build(newData, deps);
+			t = await warframe_worldstate_parser.default.build(newData, deps);
 			if (!t?.timestamp) return;
 		} catch (err) {
 			this.#logger.warn(`Error parsing worldstate data for ${this.#language}: ${err}`);
@@ -1070,7 +1110,7 @@ var WSCache = class {
 	* @param newData - New string data to parse
 	*/
 	set data(newData) {
-		logger.debug(`got new data for ${this.#language}, parsing...`);
+		this.#logger.debug(`got new data for ${this.#language}, parsing...`);
 		this.#update(newData);
 	}
 	/**
@@ -1096,6 +1136,7 @@ const debugEvents = [
 var Worldstate = class {
 	#emitter;
 	#locale;
+	#logger;
 	#worldStates = {};
 	#wsRawCache;
 	#kuvaCache;
@@ -1103,18 +1144,19 @@ var Worldstate = class {
 	/**
 	* Set up listening for specific platform and locale if provided.
 	* @param eventEmitter - Emitter to push new worldstate events to
-	* @param locale - Locale (actually just language) to watch
+	* @param options - Configuration options
 	*/
-	constructor(eventEmitter, locale) {
+	constructor(eventEmitter, options = {}) {
 		this.#emitter = eventEmitter;
-		this.#locale = locale;
-		logger.debug("starting up worldstate listener...");
-		if (locale) logger.debug(`only listening for ${locale}...`);
+		this.#locale = options.locale;
+		this.#logger = options.logger || logger;
+		this.#logger.debug("starting up worldstate listener...");
+		if (options.locale) this.#logger.debug(`only listening for ${options.locale}...`);
 	}
 	async init() {
-		this.#wsRawCache = await CronCache.make(worldstateUrl, worldstateCron);
-		this.#kuvaCache = await CronCache.make(kuvaUrl, externalCron);
-		this.#sentientCache = await CronCache.make(sentientUrl, externalCron);
+		this.#wsRawCache = await CronCache.make(worldstateUrl, worldstateCron, this.#logger);
+		this.#kuvaCache = await CronCache.make(kuvaUrl, externalCron, this.#logger);
+		this.#sentientCache = await CronCache.make(sentientUrl, externalCron, this.#logger);
 		await this.setUpRawEmitters();
 		this.setupParsedEvents();
 	}
@@ -1127,7 +1169,8 @@ var Worldstate = class {
 			language: locale,
 			kuvaCache: this.#kuvaCache,
 			sentientCache: this.#sentientCache,
-			eventEmitter: this.#emitter
+			eventEmitter: this.#emitter,
+			logger: this.#logger
 		});
 		this.#wsRawCache.on("update", (dataStr) => {
 			this.#emitter.emit("ws:update:raw", {
@@ -1136,7 +1179,7 @@ var Worldstate = class {
 			});
 		});
 		this.#emitter.on("ws:update:raw", ({ data }) => {
-			logger.debug("ws:update:raw - updating locales data");
+			this.#logger.debug("ws:update:raw - updating locales data");
 			locales.forEach((locale) => {
 				if (!this.#locale || this.#locale === locale) this.#worldStates[locale].data = data;
 			});
@@ -1188,8 +1231,8 @@ var Worldstate = class {
 	* @param packet - Data packet to emit
 	*/
 	emit(id, packet) {
-		if (debugEvents.includes(packet.key)) logger.warn(packet.key);
-		logger.debug(`ws:update:event - emitting ${packet.id}`);
+		if (debugEvents.includes(packet.key)) this.#logger.warn(packet.key);
+		this.#logger.debug(`ws:update:event - emitting ${packet.id}`);
 		delete packet.cycleStart;
 		this.#emitter.emit(id, packet);
 	}
@@ -1200,7 +1243,7 @@ var Worldstate = class {
 	* @throws When the platform or locale aren't tracked and aren't updated
 	*/
 	get(language = "en") {
-		logger.debug(`getting worldstate ${language}...`);
+		this.#logger.debug(`getting worldstate ${language}...`);
 		if (this.#worldStates?.[language]) return this.#worldStates?.[language]?.data;
 		throw new Error(`Language (${language}) not tracked.\nEnsure that the parameters passed are correct`);
 	}
@@ -1217,8 +1260,13 @@ var WorldstateEmitter = class WorldstateEmitter extends node_events.default {
 	#worldstate;
 	#twitter;
 	#rss;
-	static async make({ locale, features } = {}) {
-		const emitter = new WorldstateEmitter({ locale });
+	#logger;
+	static async make({ locale, features, logger: upLogger } = {}) {
+		if (upLogger) setLogger(upLogger);
+		const emitter = new WorldstateEmitter({
+			locale,
+			logger: upLogger
+		});
 		await emitter.#init(features?.length ? features : FEATURES);
 		return emitter;
 	}
@@ -1226,18 +1274,22 @@ var WorldstateEmitter = class WorldstateEmitter extends node_events.default {
 	* Pull in and instantiate emitters
 	* @param options - Configuration options
 	*/
-	constructor({ locale } = {}) {
+	constructor({ locale, logger: uLogger } = {}) {
 		super();
 		this.#locale = locale;
+		this.#logger = uLogger || logger;
 	}
 	async #init(features) {
-		if (features.includes("rss")) this.#rss = new RSS(this);
+		if (features.includes("rss")) this.#rss = new RSS(this, { logger: this.#logger });
 		if (features.includes("worldstate")) {
-			this.#worldstate = new Worldstate(this, this.#locale);
+			this.#worldstate = new Worldstate(this, {
+				locale: this.#locale,
+				logger: this.#logger
+			});
 			await this.#worldstate.init();
 		}
-		if (features.includes("twitter")) this.#twitter = new TwitterCache(this);
-		logger.silly("hey look, i started up...");
+		if (features.includes("twitter")) this.#twitter = new TwitterCache(this, { logger: this.#logger });
+		this.#logger.silly("hey look, i started up...");
 		this.setupLogging();
 	}
 	/**
@@ -1245,12 +1297,13 @@ var WorldstateEmitter = class WorldstateEmitter extends node_events.default {
 	* @private
 	*/
 	setupLogging() {
-		this.on("error", logger.error);
-		this.on("rss", (body) => logger.silly(`emitted: ${body.id}`));
-		this.on("ws:update:raw", (body) => logger.silly(`emitted raw: ${body.platform}`));
-		this.on("ws:update:parsed", (body) => logger.silly(`emitted parsed: ${body.platform} in ${body.language}`));
-		this.on("ws:update:event", (body) => logger.silly(`emitted event: ${body.id} ${body.platform} in ${body.language}`));
-		this.on("tweet", (body) => logger.silly(`emitted: ${body.id}`));
+		const log = this.#logger;
+		this.on("error", log.error.bind(log));
+		this.on("rss", (body) => log.silly(`emitted: ${body.id}`));
+		this.on("ws:update:raw", (body) => log.silly(`emitted raw: ${body.platform}`));
+		this.on("ws:update:parsed", (body) => log.silly(`emitted parsed: ${body.platform} in ${body.language}`));
+		this.on("ws:update:event", (body) => log.silly(`emitted event: ${body.id} ${body.platform} in ${body.language}`));
+		this.on("tweet", (body) => log.silly(`emitted: ${body.id}`));
 	}
 	/**
 	* Get current rss feed items
@@ -1299,6 +1352,7 @@ var WorldstateEmitter = class WorldstateEmitter extends node_events.default {
 			this.#twitter.dispose();
 			this.#twitter = void 0;
 		}
+		this.#logger.debug("Emitter destroyed");
 	}
 };
 //#endregion

package/dist/index.mjs

@@ -5,6 +5,7 @@ import { createLogger, format, transports } from "winston";
 import Twitter from "twitter";
 import wsData from "warframe-worldstate-data";
 import { CronJob } from "cron";
+import WorldState from "warframe-worldstate-parser";
 //#region resources/rssFeeds.json
 var rssFeeds_default = [
 	{
@@ -162,20 +163,51 @@ const twiClientInfo = {
 const TWITTER_TIMEOUT = Number(process?.env?.TWITTER_TIMEOUT) || 6e4;
 //#endregion
 //#region utilities/index.ts
-let tempLogger;
+const levels = {
+	["fatal"]: 0,
+	["error"]: 1,
+	["warn"]: 2,
+	["info"]: 3,
+	["debug"]: 4,
+	["silly"]: 5
+};
+let loggerInstance;
 try {
 	const { combine, label, printf, colorize } = format;
 	const transport = new transports.Console();
 	const logFormat = printf((info) => `[${info.label}] ${info.level}: ${info.message}`);
-	tempLogger = createLogger({
+	loggerInstance = createLogger({
 		format: combine(colorize(), label({ label: "WS" }), logFormat),
-		transports: [transport]
+		transports: [transport],
+		level: LOG_LEVEL,
+		levels
 	});
-	tempLogger.level = LOG_LEVEL;
+	loggerInstance.level = LOG_LEVEL;
 } catch (_e) {
-	tempLogger = createLogger({ transports: [new transports.Console()] });
+	loggerInstance = createLogger({
+		transports: [new transports.Console()],
+		level: LOG_LEVEL,
+		levels
+	});
 }
-const logger = tempLogger;
+/**
+* Replace the module-wide logger used by emitter internals.
+* Call before constructing handlers when injecting a host-provided logger.
+*/
+const setLogger = (uLogger) => {
+	loggerInstance = uLogger;
+};
+/** Global logger proxy so existing imports pick up setLogger() overrides. */
+const logger = new Proxy({}, {
+	get(_target, prop) {
+		const value = Reflect.get(loggerInstance, prop, loggerInstance);
+		return typeof value === "function" ? value.bind(loggerInstance) : value;
+	},
+	set(_target, prop, value) {
+		Reflect.set(loggerInstance, prop, value);
+		return true;
+	}
+});
 /**
 * Group an array by a field value
 * @param array - array of objects to group
@@ -443,6 +475,7 @@ const parseTweet = (tweets, watchable) => {
 */
 var TwitterCache = class {
 	emitter;
+	logger;
 	timeout;
 	clientInfoValid;
 	client;
@@ -460,9 +493,11 @@ var TwitterCache = class {
 	* @param options.clientInfo - Custom Twitter client credentials
 	* @param options.watchList - Custom list of Twitter accounts to watch
 	* @param options.timeout - Polling interval in milliseconds
+	* @param options.logger - Custom logger instance (default: uses global logger)
 	*/
 	constructor(eventEmitter, options = {}) {
 		this.emitter = eventEmitter;
+		this.logger = options.logger || logger;
 		this.timeout = options.timeout ?? TWITTER_TIMEOUT;
 		this.lastUpdated = Date.now() - 6e4;
 		this.disposed = false;
@@ -485,11 +520,11 @@ var TwitterCache = class {
 				this.updateInterval = setInterval(() => this.update(), this.timeout);
 				this.update();
 			} else {
-				logger.warn(`Twitter client not initialized... invalid token: ${clientInfo.bearer_token}`);
+				this.logger.warn(`Twitter client not initialized... invalid token: ${clientInfo.bearer_token}`);
 				this.dispose();
 			}
 		} catch (err) {
-			logger.error(err);
+			this.logger.error(err);
 			this.dispose();
 		}
 	}
@@ -509,11 +544,11 @@ var TwitterCache = class {
 	async update() {
 		if (this.disposed || !this.clientInfoValid) return void 0;
 		if (!this.toWatch || this.toWatch.length === 0) {
-			logger.verbose("Not processing twitter, no data to watch.");
+			this.logger.debug("Not processing twitter, no data to watch.");
 			return;
 		}
 		if (!this.client) {
-			logger.verbose("Not processing twitter, no client to connect.");
+			this.logger.debug("Not processing twitter, no client to connect.");
 			return;
 		}
 		this.updating = this.getParseableData();
@@ -524,7 +559,7 @@ var TwitterCache = class {
 	* @returns Tweets
 	*/
 	async getParseableData() {
-		logger.silly("Starting Twitter update...");
+		this.logger.debug("Starting Twitter update...");
 		const parsedData = [];
 		try {
 			await Promise.all((this.toWatch || []).map(async (watchable) => {
@@ -549,9 +584,9 @@ var TwitterCache = class {
 	*/
 	onError(error) {
 		if (Array.isArray(error) && error[0] && error[0].code === 32) {
-			logger.info("wiping twitter client data, could not authenticate...");
+			this.logger.info("wiping twitter client data, could not authenticate...");
 			this.dispose();
-		} else logger.debug(JSON.stringify(error));
+		} else this.logger.debug(JSON.stringify(error));
 	}
 	/**
 	* Get the current data or a promise with the current data
@@ -573,7 +608,7 @@ var TwitterCache = class {
 		}
 		this.client = void 0;
 		this.clientInfoValid = false;
-		logger.verbose("Twitter polling stopped and resources cleaned up");
+		this.logger.debug("Twitter polling stopped and resources cleaned up");
 	}
 };
 //#endregion
@@ -886,8 +921,8 @@ var CronCache = class CronCache extends EventEmitter$1 {
 	* @param pattern - Optional cron pattern for update frequency
 	* @returns Initialized CronCache instance
 	*/
-	static async make(url, pattern) {
-		const cache = new CronCache(url, pattern);
+	static async make(url, pattern, uLogger) {
+		const cache = new CronCache(url, pattern, uLogger);
 		await cache.#update();
 		return cache;
 	}
@@ -895,11 +930,13 @@ var CronCache = class CronCache extends EventEmitter$1 {
 	* Create a new CronCache
 	* @param url - The URL to fetch data from
 	* @param pattern - Optional cron pattern for update frequency
+	* @param uLogger - Optional logger instance
 	*/
-	constructor(url, pattern) {
+	constructor(url, pattern, uLogger) {
 		super();
 		this.#url = url;
 		if (pattern) this.#pattern = pattern;
+		if (uLogger) this.#logger = uLogger;
 		this.#job = new CronJob(this.#pattern, () => void this.#update(), void 0, true);
 		this.#job.start();
 	}
@@ -930,12 +967,12 @@ var CronCache = class CronCache extends EventEmitter$1 {
 	* @private
 	*/
 	async #fetch() {
-		logger.silly(`fetching... ${this.#url}`);
+		this.#logger.silly(`fetching... ${this.#url}`);
 		const response = await fetch(this.#url);
 		if (!response.ok) {
 			const responseText = await response.text();
 			const errorMessage = `Failed to fetch ${this.#url}: ${response.status} ${response.statusText}`;
-			logger.error(errorMessage, { responseText });
+			this.#logger.error(errorMessage, { responseText });
 			throw new Error(errorMessage);
 		}
 		this.#data = await response.text();
@@ -947,14 +984,14 @@ var CronCache = class CronCache extends EventEmitter$1 {
 	*/
 	async get() {
 		if (this.#updating) {
-			logger.silly("returning in-progress update promise");
+			this.#logger.silly("returning in-progress update promise");
 			return this.#updating;
 		}
 		if (!this.#data) {
-			logger.silly("returning new update promise");
+			this.#logger.silly("returning new update promise");
 			return this.#update();
 		}
-		logger.silly("returning cached data");
+		this.#logger.silly("returning cached data");
 		return this.#data;
 	}
 	/**
@@ -986,12 +1023,13 @@ var WSCache = class {
 	* @param options.sentientCache - Cache of sentient outpost data, provided by Semlar
 	* @param options.eventEmitter - Emitter to push new worldstate updates to
 	*/
-	constructor({ language, kuvaCache, sentientCache, eventEmitter }) {
+	constructor({ language, kuvaCache, sentientCache, eventEmitter, logger: uLogger }) {
 		this.#inner = void 0;
 		this.#kuvaCache = kuvaCache;
 		this.#sentientCache = sentientCache;
 		this.#language = language;
 		this.#emitter = eventEmitter;
+		this.#logger = uLogger || logger;
 	}
 	/**
 	* Update the current data with new data
@@ -1001,20 +1039,21 @@ var WSCache = class {
 	#update = async (newData) => {
 		const deps = {
 			locale: this.#language,
-			kuvaData: {},
-			sentientData: {}
+			kuvaData: [],
+			sentientData: void 0,
+			logger: { debug: (message) => this.#logger.debug(message) }
 		};
 		try {
 			const kuvaRaw = await this.#kuvaCache.get();
 			if (kuvaRaw) deps.kuvaData = JSON.parse(kuvaRaw);
 		} catch (err) {
-			logger.debug(`Error parsing kuva data for ${this.#language}: ${err}`);
+			this.#logger.debug(`Error parsing kuva data for ${this.#language}: ${err}`);
 		}
 		try {
 			const sentientRaw = await this.#sentientCache.get();
 			if (sentientRaw) deps.sentientData = JSON.parse(sentientRaw);
 		} catch (err) {
-			logger.warn(`Error parsing sentient data for ${this.#language}: ${err}`);
+			this.#logger.warn(`Error parsing sentient data for ${this.#language}: ${err}`);
 		}
 		let t;
 		try {
@@ -1043,7 +1082,7 @@ var WSCache = class {
 	* @param newData - New string data to parse
 	*/
 	set data(newData) {
-		logger.debug(`got new data for ${this.#language}, parsing...`);
+		this.#logger.debug(`got new data for ${this.#language}, parsing...`);
 		this.#update(newData);
 	}
 	/**
@@ -1069,6 +1108,7 @@ const debugEvents = [
 var Worldstate = class {
 	#emitter;
 	#locale;
+	#logger;
 	#worldStates = {};
 	#wsRawCache;
 	#kuvaCache;
@@ -1076,18 +1116,19 @@ var Worldstate = class {
 	/**
 	* Set up listening for specific platform and locale if provided.
 	* @param eventEmitter - Emitter to push new worldstate events to
-	* @param locale - Locale (actually just language) to watch
+	* @param options - Configuration options
 	*/
-	constructor(eventEmitter, locale) {
+	constructor(eventEmitter, options = {}) {
 		this.#emitter = eventEmitter;
-		this.#locale = locale;
-		logger.debug("starting up worldstate listener...");
-		if (locale) logger.debug(`only listening for ${locale}...`);
+		this.#locale = options.locale;
+		this.#logger = options.logger || logger;
+		this.#logger.debug("starting up worldstate listener...");
+		if (options.locale) this.#logger.debug(`only listening for ${options.locale}...`);
 	}
 	async init() {
-		this.#wsRawCache = await CronCache.make(worldstateUrl, worldstateCron);
-		this.#kuvaCache = await CronCache.make(kuvaUrl, externalCron);
-		this.#sentientCache = await CronCache.make(sentientUrl, externalCron);
+		this.#wsRawCache = await CronCache.make(worldstateUrl, worldstateCron, this.#logger);
+		this.#kuvaCache = await CronCache.make(kuvaUrl, externalCron, this.#logger);
+		this.#sentientCache = await CronCache.make(sentientUrl, externalCron, this.#logger);
 		await this.setUpRawEmitters();
 		this.setupParsedEvents();
 	}
@@ -1100,7 +1141,8 @@ var Worldstate = class {
 			language: locale,
 			kuvaCache: this.#kuvaCache,
 			sentientCache: this.#sentientCache,
-			eventEmitter: this.#emitter
+			eventEmitter: this.#emitter,
+			logger: this.#logger
 		});
 		this.#wsRawCache.on("update", (dataStr) => {
 			this.#emitter.emit("ws:update:raw", {
@@ -1109,7 +1151,7 @@ var Worldstate = class {
 			});
 		});
 		this.#emitter.on("ws:update:raw", ({ data }) => {
-			logger.debug("ws:update:raw - updating locales data");
+			this.#logger.debug("ws:update:raw - updating locales data");
 			locales.forEach((locale) => {
 				if (!this.#locale || this.#locale === locale) this.#worldStates[locale].data = data;
 			});
@@ -1161,8 +1203,8 @@ var Worldstate = class {
 	* @param packet - Data packet to emit
 	*/
 	emit(id, packet) {
-		if (debugEvents.includes(packet.key)) logger.warn(packet.key);
-		logger.debug(`ws:update:event - emitting ${packet.id}`);
+		if (debugEvents.includes(packet.key)) this.#logger.warn(packet.key);
+		this.#logger.debug(`ws:update:event - emitting ${packet.id}`);
 		delete packet.cycleStart;
 		this.#emitter.emit(id, packet);
 	}
@@ -1173,7 +1215,7 @@ var Worldstate = class {
 	* @throws When the platform or locale aren't tracked and aren't updated
 	*/
 	get(language = "en") {
-		logger.debug(`getting worldstate ${language}...`);
+		this.#logger.debug(`getting worldstate ${language}...`);
 		if (this.#worldStates?.[language]) return this.#worldStates?.[language]?.data;
 		throw new Error(`Language (${language}) not tracked.\nEnsure that the parameters passed are correct`);
 	}
@@ -1190,8 +1232,13 @@ var WorldstateEmitter = class WorldstateEmitter extends EventEmitter {
 	#worldstate;
 	#twitter;
 	#rss;
-	static async make({ locale, features } = {}) {
-		const emitter = new WorldstateEmitter({ locale });
+	#logger;
+	static async make({ locale, features, logger: upLogger } = {}) {
+		if (upLogger) setLogger(upLogger);
+		const emitter = new WorldstateEmitter({
+			locale,
+			logger: upLogger
+		});
 		await emitter.#init(features?.length ? features : FEATURES);
 		return emitter;
 	}
@@ -1199,18 +1246,22 @@ var WorldstateEmitter = class WorldstateEmitter extends EventEmitter {
 	* Pull in and instantiate emitters
 	* @param options - Configuration options
 	*/
-	constructor({ locale } = {}) {
+	constructor({ locale, logger: uLogger } = {}) {
 		super();
 		this.#locale = locale;
+		this.#logger = uLogger || logger;
 	}
 	async #init(features) {
-		if (features.includes("rss")) this.#rss = new RSS(this);
+		if (features.includes("rss")) this.#rss = new RSS(this, { logger: this.#logger });
 		if (features.includes("worldstate")) {
-			this.#worldstate = new Worldstate(this, this.#locale);
+			this.#worldstate = new Worldstate(this, {
+				locale: this.#locale,
+				logger: this.#logger
+			});
 			await this.#worldstate.init();
 		}
-		if (features.includes("twitter")) this.#twitter = new TwitterCache(this);
-		logger.silly("hey look, i started up...");
+		if (features.includes("twitter")) this.#twitter = new TwitterCache(this, { logger: this.#logger });
+		this.#logger.silly("hey look, i started up...");
 		this.setupLogging();
 	}
 	/**
@@ -1218,12 +1269,13 @@ var WorldstateEmitter = class WorldstateEmitter extends EventEmitter {
 	* @private
 	*/
 	setupLogging() {
-		this.on("error", logger.error);
-		this.on("rss", (body) => logger.silly(`emitted: ${body.id}`));
-		this.on("ws:update:raw", (body) => logger.silly(`emitted raw: ${body.platform}`));
-		this.on("ws:update:parsed", (body) => logger.silly(`emitted parsed: ${body.platform} in ${body.language}`));
-		this.on("ws:update:event", (body) => logger.silly(`emitted event: ${body.id} ${body.platform} in ${body.language}`));
-		this.on("tweet", (body) => logger.silly(`emitted: ${body.id}`));
+		const log = this.#logger;
+		this.on("error", log.error.bind(log));
+		this.on("rss", (body) => log.silly(`emitted: ${body.id}`));
+		this.on("ws:update:raw", (body) => log.silly(`emitted raw: ${body.platform}`));
+		this.on("ws:update:parsed", (body) => log.silly(`emitted parsed: ${body.platform} in ${body.language}`));
+		this.on("ws:update:event", (body) => log.silly(`emitted event: ${body.id} ${body.platform} in ${body.language}`));
+		this.on("tweet", (body) => log.silly(`emitted: ${body.id}`));
 	}
 	/**
 	* Get current rss feed items
@@ -1272,6 +1324,7 @@ var WorldstateEmitter = class WorldstateEmitter extends EventEmitter {
 			this.#twitter.dispose();
 			this.#twitter = void 0;
 		}
+		this.#logger.debug("Emitter destroyed");
 	}
 };
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "worldstate-emitter",
-  "version": "2.4.4",
+  "version": "2.5.0",
   "description": "Event emitter for Warframe worldstate & other events - TypeScript support included",
   "keywords": [
     "warframe",
@@ -62,8 +62,8 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^2.3.14",
-    "@commitlint/cli": "^20.4.1",
-    "@commitlint/config-conventional": "^20.4.1",
+    "@commitlint/cli": "^21.0.0",
+    "@commitlint/config-conventional": "^21.0.0",
     "@types/chai": "^5.2.3",
     "@types/mocha": "^10.0.10",
     "@types/node": "^25.2.2",
@@ -73,18 +73,19 @@
     "c8": "^11.0.0",
     "chai": "^6.2.2",
     "husky": "^9.1.7",
-    "lint-staged": "^16.2.7",
+    "lint-staged": "^17.0.3",
     "mocha": "^11.7.5",
     "nodemon": "^3.1.11",
-    "sinon": "^21.0.1",
-    "tsdown": "^0.21.0",
+    "reflect-metadata": "^0.2.2",
+    "sinon": "^22.0.0",
+    "tsdown": "^0.22.0",
     "tsx": "^4.21.0",
     "typedoc": "^0.28.16",
     "typescript": "^6.0.2"
   },
   "peerDependencies": {
     "warframe-worldstate-data": "^3.x",
-    "warframe-worldstate-parser": "^5.2.14",
+    "warframe-worldstate-parser": "^5.3.9",
     "winston": "^3.19.0"
   },
   "engines": {