@wise-old-man/utils 3.3.12 → 3.3.14

package/dist/cjs/index.cjs

@@ -1,11 +1,5 @@
 'use strict';
 
-var axios = require('axios');
-var prometheus = require('prom-client');
-var zod = require('zod');
-require('dotenv/config');
-var fetchable = require('@attio/fetchable');
-
 var config = {
     defaultUserAgent: `WiseOldMan JS Client v${process.env.npm_package_version}`,
     baseAPIUrl: 'https://api.wiseoldman.net/v2'
@@ -75,7 +69,7 @@ function handleError(status, path, data) {
         throw new BadRequestError(path, data.message, data.data);
     }
     if (status === 403) {
-        throw new ForbiddenError(path, data.message);
+        throw new ForbiddenError(path, data.message, data.data);
     }
     if (status === 404) {
         throw new NotFoundError(path, data.message);
@@ -97,11 +91,12 @@ class BadRequestError extends Error {
     }
 }
 class ForbiddenError extends Error {
-    constructor(resource, message) {
+    constructor(resource, message, data) {
         super(message);
         this.name = 'ForbiddenError';
         this.resource = resource;
         this.statusCode = 403;
+        this.data = data;
     }
 }
 class NotFoundError extends Error {
@@ -2067,226 +2062,6 @@ function getParentEfficiencyMetric(metric) {
     return null;
 }
 
-/**
- * This file has been created as a way to force any usage
- * of process.env to go through a dotenv.config first.
- */
-/**
- * This ensures that an env var is required in prod but optional in dev/test.
- */
-function prodOnly(varSchema) {
-    if (process.env.NODE_ENV === 'production') {
-        return varSchema;
-    }
-    return zod.z.optional(varSchema);
-}
-const envVariablesSchema = zod.z.object({
-    // Prisma Database URL
-    CORE_DATABASE_URL: zod.z.string().trim().min(1),
-    // Redis Configs
-    REDIS_HOST: zod.z.string().trim().min(1),
-    REDIS_PORT: zod.z.coerce.number().positive().int(),
-    // Node Environment
-    NODE_ENV: zod.z.enum(['development', 'production', 'test']),
-    // Port for the API to run on
-    API_PORT: zod.z.optional(zod.z.coerce.number().positive().int()),
-    // Admin Password (For mod+ operations)
-    ADMIN_PASSWORD: prodOnly(zod.z.string().trim().min(1)),
-    // Sentry (for error tracking)
-    API_SENTRY_DSN: prodOnly(zod.z.string().trim().min(1)),
-    // Patreon Token (to access their API)
-    PATREON_BEARER_TOKEN: prodOnly(zod.z.string().trim().min(1)),
-    // Discord Bot API URL (to send events to)
-    DISCORD_BOT_API_URL: prodOnly(zod.z.string().trim().min(1).url()),
-    // Our Prometheus metrics aggregator service URL
-    PROMETHEUS_METRICS_SERVICE_URL: prodOnly(zod.z.string().trim().min(1).url()),
-    // Discord Monitoring Webhooks
-    DISCORD_PATREON_WEBHOOK_URL: prodOnly(zod.z.string().trim().min(1).url()),
-    DISCORD_MONITORING_WEBHOOK_URL: prodOnly(zod.z.string().trim().min(1).url()),
-    // Proxy Configs
-    PROXY_LIST: prodOnly(zod.z.string().trim().min(1)),
-    PROXY_USER: prodOnly(zod.z.string().trim().min(1)),
-    PROXY_PASSWORD: prodOnly(zod.z.string().trim().min(1)),
-    PROXY_PORT: prodOnly(zod.z.coerce.number().positive().int()),
-    CPU_COUNT: prodOnly(zod.z.coerce.number().positive().int()),
-    // Openai API Key
-    OPENAI_API_KEY: prodOnly(zod.z.string().trim().min(1).startsWith('sk-'))
-});
-// This will load env vars from a .env file, type check them,and throw an error
-// (interrupting the process) if they're required and missing, or of an invalid type.
-try {
-    envVariablesSchema.parse(process.env);
-}
-catch (error) {
-    const errorPayload = JSON.stringify(error, null, 2);
-    throw new Error(`Invalid environment variables. Please check env.ts for more info.\n${errorPayload}`);
-}
-function getThreadIndex() {
-    if (process.env.pm_id === undefined) {
-        return null;
-    }
-    return parseInt(process.env.pm_id, 10);
-}
-
-class PrometheusService {
-    constructor() {
-        this.pushInterval = null;
-        this.registry = new prometheus.Registry();
-        this.registry.setDefaultLabels({ app: 'wise-old-man', threadIndex: getThreadIndex() });
-        prometheus.collectDefaultMetrics({ register: this.registry });
-        this.effectHistogram = new prometheus.Histogram({
-            name: 'effect_duration_seconds',
-            help: 'Duration of effects in microseconds',
-            labelNames: ['effectName', 'status'],
-            buckets: [0.1, 0.3, 0.5, 0.7, 1, 3, 5, 7, 10, 30]
-        });
-        this.httpHistogram = new prometheus.Histogram({
-            name: 'http_request_duration_seconds',
-            help: 'Duration of HTTP requests in microseconds',
-            labelNames: ['method', 'route', 'status', 'userAgent'],
-            buckets: [0.1, 0.3, 0.5, 0.7, 1, 3, 5, 7, 10, 30]
-        });
-        this.jobHistogram = new prometheus.Histogram({
-            name: 'job_duration_seconds',
-            help: 'Duration of jobs in microseconds',
-            labelNames: ['jobName', 'status'],
-            buckets: [0.1, 0.5, 1, 5, 10, 30, 60]
-        });
-        this.jobQueueGauge = new prometheus.Gauge({
-            name: 'job_queue_size',
-            help: 'Number of jobs in different states for each queue',
-            labelNames: ['queueName', 'state']
-        });
-        this.eventCounter = new prometheus.Counter({
-            name: 'event_counter',
-            help: 'Count of events emitted',
-            labelNames: ['eventType']
-        });
-        this.customPeriodCounter = new prometheus.Counter({
-            name: 'custom_period_counter',
-            help: 'Count of custom period expressions used',
-            labelNames: ['customPeriod']
-        });
-        this.updatePlayerJobSourceCounter = new prometheus.Counter({
-            name: 'update_player_job_source_counter',
-            help: 'Count of update player jobs dispatched',
-            labelNames: ['source']
-        });
-        this.runeMetricsHistogram = new prometheus.Histogram({
-            name: 'runemetrics_duration_seconds',
-            help: 'Duration of RuneMetrics requests in microseconds',
-            labelNames: ['status'],
-            buckets: [0.1, 0.3, 0.5, 1, 5, 10, 30]
-        });
-        this.hiscoresHistogram = new prometheus.Histogram({
-            name: 'hiscores_duration_seconds',
-            help: 'Duration of hiscores requests in microseconds',
-            labelNames: ['status'],
-            buckets: [0.1, 0.3, 0.5, 1, 5, 10, 30]
-        });
-        this.registry.registerMetric(this.jobHistogram);
-        this.registry.registerMetric(this.jobQueueGauge);
-        this.registry.registerMetric(this.httpHistogram);
-        this.registry.registerMetric(this.effectHistogram);
-        this.registry.registerMetric(this.eventCounter);
-        this.registry.registerMetric(this.customPeriodCounter);
-        this.registry.registerMetric(this.updatePlayerJobSourceCounter);
-        this.registry.registerMetric(this.runeMetricsHistogram);
-        this.registry.registerMetric(this.hiscoresHistogram);
-    }
-    init() {
-        this.pushInterval = setInterval(() => {
-            this.pushMetrics();
-        }, 60000);
-    }
-    shutdown() {
-        if (this.pushInterval !== null) {
-            clearInterval(this.pushInterval);
-        }
-    }
-    pushMetrics() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (process.env.NODE_ENV === 'test') {
-                return fetchable.errored({ code: 'NOT_ALLOWED_IN_TEST_ENV' });
-            }
-            if (!process.env.PROMETHEUS_METRICS_SERVICE_URL) {
-                return fetchable.errored({ code: 'MISSING_METRICS_URL' });
-            }
-            const metricsResult = yield fetchable.fromPromise(this.registry.getMetricsAsJSON());
-            if (fetchable.isErrored(metricsResult)) {
-                return fetchable.errored({
-                    code: 'FAILED_TO_GET_PROMETHEUS_METRICS',
-                    subError: metricsResult.error
-                });
-            }
-            const requestResult = yield fetchable.fromPromise(axios.post(process.env.PROMETHEUS_METRICS_SERVICE_URL, {
-                source: 'api',
-                data: metricsResult.value,
-                threadIndex: getThreadIndex()
-            }));
-            if (fetchable.isErrored(requestResult)) {
-                return fetchable.errored({
-                    code: 'FAILED_TO_PUSH_PROMETHEUS_METRICS',
-                    subError: requestResult.error
-                });
-            }
-            return fetchable.complete(true);
-        });
-    }
-    trackHttpRequest() {
-        return this.httpHistogram.startTimer();
-    }
-    trackRuneMetricsRequest() {
-        return this.runeMetricsHistogram.startTimer();
-    }
-    trackHiscoresRequest() {
-        return this.hiscoresHistogram.startTimer();
-    }
-    trackEffect(effectName, fn) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const endTimer = this.effectHistogram.startTimer();
-            try {
-                yield fn();
-                endTimer({ effectName, status: 1 });
-            }
-            catch (error) {
-                endTimer({ effectName, status: 0 });
-                throw error;
-            }
-        });
-    }
-    trackJob(jobName, handler) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const endTimer = this.jobHistogram.startTimer();
-            try {
-                yield handler();
-                endTimer({ jobName, status: 1 });
-            }
-            catch (error) {
-                endTimer({ jobName, status: 0 });
-                throw error;
-            }
-        });
-    }
-    trackEventEmitted(eventType) {
-        this.eventCounter.inc({ eventType });
-    }
-    trackCustomPeriodExpression(customPeriod) {
-        this.customPeriodCounter.inc({ customPeriod });
-    }
-    trackUpdatePlayerJobSource(source) {
-        this.updatePlayerJobSourceCounter.inc({ source });
-    }
-    updateQueueMetrics(queueName, counts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            for (const [state, count] of Object.entries(counts)) {
-                this.jobQueueGauge.set({ queueName, state }, count);
-            }
-        });
-    }
-}
-var prometheusService = new PrometheusService();
-
 const CUSTOM_PERIOD_REGEX = /(\d+y)?(\d+m)?(\d+w)?(\d+d)?(\d+h)?/;
 const PeriodProps = {
     [Period.FIVE_MIN]: { name: '5 Min', milliseconds: 300000 },
@@ -2314,7 +2089,6 @@ function parsePeriodExpression(periodExpression) {
             durationMs: PeriodProps[fixed].milliseconds
         };
     }
-    prometheusService.trackCustomPeriodExpression(fixed);
     const result = fixed.match(CUSTOM_PERIOD_REGEX);
     if (!result || result.length === 0 || result[0] !== fixed)
         return null;

package/dist/es/index.js

@@ -1,9 +1,3 @@
-import axios from 'axios';
-import prometheus from 'prom-client';
-import { z } from 'zod';
-import 'dotenv/config';
-import { errored, fromPromise, isErrored, complete } from '@attio/fetchable';
-
 var config = {
     defaultUserAgent: `WiseOldMan JS Client v${process.env.npm_package_version}`,
     baseAPIUrl: 'https://api.wiseoldman.net/v2'
@@ -73,7 +67,7 @@ function handleError(status, path, data) {
         throw new BadRequestError(path, data.message, data.data);
     }
     if (status === 403) {
-        throw new ForbiddenError(path, data.message);
+        throw new ForbiddenError(path, data.message, data.data);
     }
     if (status === 404) {
         throw new NotFoundError(path, data.message);
@@ -95,11 +89,12 @@ class BadRequestError extends Error {
     }
 }
 class ForbiddenError extends Error {
-    constructor(resource, message) {
+    constructor(resource, message, data) {
         super(message);
         this.name = 'ForbiddenError';
         this.resource = resource;
         this.statusCode = 403;
+        this.data = data;
     }
 }
 class NotFoundError extends Error {
@@ -2065,226 +2060,6 @@ function getParentEfficiencyMetric(metric) {
     return null;
 }
 
-/**
- * This file has been created as a way to force any usage
- * of process.env to go through a dotenv.config first.
- */
-/**
- * This ensures that an env var is required in prod but optional in dev/test.
- */
-function prodOnly(varSchema) {
-    if (process.env.NODE_ENV === 'production') {
-        return varSchema;
-    }
-    return z.optional(varSchema);
-}
-const envVariablesSchema = z.object({
-    // Prisma Database URL
-    CORE_DATABASE_URL: z.string().trim().min(1),
-    // Redis Configs
-    REDIS_HOST: z.string().trim().min(1),
-    REDIS_PORT: z.coerce.number().positive().int(),
-    // Node Environment
-    NODE_ENV: z.enum(['development', 'production', 'test']),
-    // Port for the API to run on
-    API_PORT: z.optional(z.coerce.number().positive().int()),
-    // Admin Password (For mod+ operations)
-    ADMIN_PASSWORD: prodOnly(z.string().trim().min(1)),
-    // Sentry (for error tracking)
-    API_SENTRY_DSN: prodOnly(z.string().trim().min(1)),
-    // Patreon Token (to access their API)
-    PATREON_BEARER_TOKEN: prodOnly(z.string().trim().min(1)),
-    // Discord Bot API URL (to send events to)
-    DISCORD_BOT_API_URL: prodOnly(z.string().trim().min(1).url()),
-    // Our Prometheus metrics aggregator service URL
-    PROMETHEUS_METRICS_SERVICE_URL: prodOnly(z.string().trim().min(1).url()),
-    // Discord Monitoring Webhooks
-    DISCORD_PATREON_WEBHOOK_URL: prodOnly(z.string().trim().min(1).url()),
-    DISCORD_MONITORING_WEBHOOK_URL: prodOnly(z.string().trim().min(1).url()),
-    // Proxy Configs
-    PROXY_LIST: prodOnly(z.string().trim().min(1)),
-    PROXY_USER: prodOnly(z.string().trim().min(1)),
-    PROXY_PASSWORD: prodOnly(z.string().trim().min(1)),
-    PROXY_PORT: prodOnly(z.coerce.number().positive().int()),
-    CPU_COUNT: prodOnly(z.coerce.number().positive().int()),
-    // Openai API Key
-    OPENAI_API_KEY: prodOnly(z.string().trim().min(1).startsWith('sk-'))
-});
-// This will load env vars from a .env file, type check them,and throw an error
-// (interrupting the process) if they're required and missing, or of an invalid type.
-try {
-    envVariablesSchema.parse(process.env);
-}
-catch (error) {
-    const errorPayload = JSON.stringify(error, null, 2);
-    throw new Error(`Invalid environment variables. Please check env.ts for more info.\n${errorPayload}`);
-}
-function getThreadIndex() {
-    if (process.env.pm_id === undefined) {
-        return null;
-    }
-    return parseInt(process.env.pm_id, 10);
-}
-
-class PrometheusService {
-    constructor() {
-        this.pushInterval = null;
-        this.registry = new prometheus.Registry();
-        this.registry.setDefaultLabels({ app: 'wise-old-man', threadIndex: getThreadIndex() });
-        prometheus.collectDefaultMetrics({ register: this.registry });
-        this.effectHistogram = new prometheus.Histogram({
-            name: 'effect_duration_seconds',
-            help: 'Duration of effects in microseconds',
-            labelNames: ['effectName', 'status'],
-            buckets: [0.1, 0.3, 0.5, 0.7, 1, 3, 5, 7, 10, 30]
-        });
-        this.httpHistogram = new prometheus.Histogram({
-            name: 'http_request_duration_seconds',
-            help: 'Duration of HTTP requests in microseconds',
-            labelNames: ['method', 'route', 'status', 'userAgent'],
-            buckets: [0.1, 0.3, 0.5, 0.7, 1, 3, 5, 7, 10, 30]
-        });
-        this.jobHistogram = new prometheus.Histogram({
-            name: 'job_duration_seconds',
-            help: 'Duration of jobs in microseconds',
-            labelNames: ['jobName', 'status'],
-            buckets: [0.1, 0.5, 1, 5, 10, 30, 60]
-        });
-        this.jobQueueGauge = new prometheus.Gauge({
-            name: 'job_queue_size',
-            help: 'Number of jobs in different states for each queue',
-            labelNames: ['queueName', 'state']
-        });
-        this.eventCounter = new prometheus.Counter({
-            name: 'event_counter',
-            help: 'Count of events emitted',
-            labelNames: ['eventType']
-        });
-        this.customPeriodCounter = new prometheus.Counter({
-            name: 'custom_period_counter',
-            help: 'Count of custom period expressions used',
-            labelNames: ['customPeriod']
-        });
-        this.updatePlayerJobSourceCounter = new prometheus.Counter({
-            name: 'update_player_job_source_counter',
-            help: 'Count of update player jobs dispatched',
-            labelNames: ['source']
-        });
-        this.runeMetricsHistogram = new prometheus.Histogram({
-            name: 'runemetrics_duration_seconds',
-            help: 'Duration of RuneMetrics requests in microseconds',
-            labelNames: ['status'],
-            buckets: [0.1, 0.3, 0.5, 1, 5, 10, 30]
-        });
-        this.hiscoresHistogram = new prometheus.Histogram({
-            name: 'hiscores_duration_seconds',
-            help: 'Duration of hiscores requests in microseconds',
-            labelNames: ['status'],
-            buckets: [0.1, 0.3, 0.5, 1, 5, 10, 30]
-        });
-        this.registry.registerMetric(this.jobHistogram);
-        this.registry.registerMetric(this.jobQueueGauge);
-        this.registry.registerMetric(this.httpHistogram);
-        this.registry.registerMetric(this.effectHistogram);
-        this.registry.registerMetric(this.eventCounter);
-        this.registry.registerMetric(this.customPeriodCounter);
-        this.registry.registerMetric(this.updatePlayerJobSourceCounter);
-        this.registry.registerMetric(this.runeMetricsHistogram);
-        this.registry.registerMetric(this.hiscoresHistogram);
-    }
-    init() {
-        this.pushInterval = setInterval(() => {
-            this.pushMetrics();
-        }, 60000);
-    }
-    shutdown() {
-        if (this.pushInterval !== null) {
-            clearInterval(this.pushInterval);
-        }
-    }
-    pushMetrics() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (process.env.NODE_ENV === 'test') {
-                return errored({ code: 'NOT_ALLOWED_IN_TEST_ENV' });
-            }
-            if (!process.env.PROMETHEUS_METRICS_SERVICE_URL) {
-                return errored({ code: 'MISSING_METRICS_URL' });
-            }
-            const metricsResult = yield fromPromise(this.registry.getMetricsAsJSON());
-            if (isErrored(metricsResult)) {
-                return errored({
-                    code: 'FAILED_TO_GET_PROMETHEUS_METRICS',
-                    subError: metricsResult.error
-                });
-            }
-            const requestResult = yield fromPromise(axios.post(process.env.PROMETHEUS_METRICS_SERVICE_URL, {
-                source: 'api',
-                data: metricsResult.value,
-                threadIndex: getThreadIndex()
-            }));
-            if (isErrored(requestResult)) {
-                return errored({
-                    code: 'FAILED_TO_PUSH_PROMETHEUS_METRICS',
-                    subError: requestResult.error
-                });
-            }
-            return complete(true);
-        });
-    }
-    trackHttpRequest() {
-        return this.httpHistogram.startTimer();
-    }
-    trackRuneMetricsRequest() {
-        return this.runeMetricsHistogram.startTimer();
-    }
-    trackHiscoresRequest() {
-        return this.hiscoresHistogram.startTimer();
-    }
-    trackEffect(effectName, fn) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const endTimer = this.effectHistogram.startTimer();
-            try {
-                yield fn();
-                endTimer({ effectName, status: 1 });
-            }
-            catch (error) {
-                endTimer({ effectName, status: 0 });
-                throw error;
-            }
-        });
-    }
-    trackJob(jobName, handler) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const endTimer = this.jobHistogram.startTimer();
-            try {
-                yield handler();
-                endTimer({ jobName, status: 1 });
-            }
-            catch (error) {
-                endTimer({ jobName, status: 0 });
-                throw error;
-            }
-        });
-    }
-    trackEventEmitted(eventType) {
-        this.eventCounter.inc({ eventType });
-    }
-    trackCustomPeriodExpression(customPeriod) {
-        this.customPeriodCounter.inc({ customPeriod });
-    }
-    trackUpdatePlayerJobSource(source) {
-        this.updatePlayerJobSourceCounter.inc({ source });
-    }
-    updateQueueMetrics(queueName, counts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            for (const [state, count] of Object.entries(counts)) {
-                this.jobQueueGauge.set({ queueName, state }, count);
-            }
-        });
-    }
-}
-var prometheusService = new PrometheusService();
-
 const CUSTOM_PERIOD_REGEX = /(\d+y)?(\d+m)?(\d+w)?(\d+d)?(\d+h)?/;
 const PeriodProps = {
     [Period.FIVE_MIN]: { name: '5 Min', milliseconds: 300000 },
@@ -2312,7 +2087,6 @@ function parsePeriodExpression(periodExpression) {
             durationMs: PeriodProps[fixed].milliseconds
         };
     }
-    prometheusService.trackCustomPeriodExpression(fixed);
     const result = fixed.match(CUSTOM_PERIOD_REGEX);
     if (!result || result.length === 0 || result[0] !== fixed)
         return null;

package/dist/es/index.mjs

@@ -1,9 +1,3 @@
-import axios from 'axios';
-import prometheus from 'prom-client';
-import { z } from 'zod';
-import 'dotenv/config';
-import { errored, fromPromise, isErrored, complete } from '@attio/fetchable';
-
 var config = {
     defaultUserAgent: `WiseOldMan JS Client v${process.env.npm_package_version}`,
     baseAPIUrl: 'https://api.wiseoldman.net/v2'
@@ -73,7 +67,7 @@ function handleError(status, path, data) {
         throw new BadRequestError(path, data.message, data.data);
     }
     if (status === 403) {
-        throw new ForbiddenError(path, data.message);
+        throw new ForbiddenError(path, data.message, data.data);
     }
     if (status === 404) {
         throw new NotFoundError(path, data.message);
@@ -95,11 +89,12 @@ class BadRequestError extends Error {
     }
 }
 class ForbiddenError extends Error {
-    constructor(resource, message) {
+    constructor(resource, message, data) {
         super(message);
         this.name = 'ForbiddenError';
         this.resource = resource;
         this.statusCode = 403;
+        this.data = data;
     }
 }
 class NotFoundError extends Error {
@@ -2065,226 +2060,6 @@ function getParentEfficiencyMetric(metric) {
     return null;
 }
 
-/**
- * This file has been created as a way to force any usage
- * of process.env to go through a dotenv.config first.
- */
-/**
- * This ensures that an env var is required in prod but optional in dev/test.
- */
-function prodOnly(varSchema) {
-    if (process.env.NODE_ENV === 'production') {
-        return varSchema;
-    }
-    return z.optional(varSchema);
-}
-const envVariablesSchema = z.object({
-    // Prisma Database URL
-    CORE_DATABASE_URL: z.string().trim().min(1),
-    // Redis Configs
-    REDIS_HOST: z.string().trim().min(1),
-    REDIS_PORT: z.coerce.number().positive().int(),
-    // Node Environment
-    NODE_ENV: z.enum(['development', 'production', 'test']),
-    // Port for the API to run on
-    API_PORT: z.optional(z.coerce.number().positive().int()),
-    // Admin Password (For mod+ operations)
-    ADMIN_PASSWORD: prodOnly(z.string().trim().min(1)),
-    // Sentry (for error tracking)
-    API_SENTRY_DSN: prodOnly(z.string().trim().min(1)),
-    // Patreon Token (to access their API)
-    PATREON_BEARER_TOKEN: prodOnly(z.string().trim().min(1)),
-    // Discord Bot API URL (to send events to)
-    DISCORD_BOT_API_URL: prodOnly(z.string().trim().min(1).url()),
-    // Our Prometheus metrics aggregator service URL
-    PROMETHEUS_METRICS_SERVICE_URL: prodOnly(z.string().trim().min(1).url()),
-    // Discord Monitoring Webhooks
-    DISCORD_PATREON_WEBHOOK_URL: prodOnly(z.string().trim().min(1).url()),
-    DISCORD_MONITORING_WEBHOOK_URL: prodOnly(z.string().trim().min(1).url()),
-    // Proxy Configs
-    PROXY_LIST: prodOnly(z.string().trim().min(1)),
-    PROXY_USER: prodOnly(z.string().trim().min(1)),
-    PROXY_PASSWORD: prodOnly(z.string().trim().min(1)),
-    PROXY_PORT: prodOnly(z.coerce.number().positive().int()),
-    CPU_COUNT: prodOnly(z.coerce.number().positive().int()),
-    // Openai API Key
-    OPENAI_API_KEY: prodOnly(z.string().trim().min(1).startsWith('sk-'))
-});
-// This will load env vars from a .env file, type check them,and throw an error
-// (interrupting the process) if they're required and missing, or of an invalid type.
-try {
-    envVariablesSchema.parse(process.env);
-}
-catch (error) {
-    const errorPayload = JSON.stringify(error, null, 2);
-    throw new Error(`Invalid environment variables. Please check env.ts for more info.\n${errorPayload}`);
-}
-function getThreadIndex() {
-    if (process.env.pm_id === undefined) {
-        return null;
-    }
-    return parseInt(process.env.pm_id, 10);
-}
-
-class PrometheusService {
-    constructor() {
-        this.pushInterval = null;
-        this.registry = new prometheus.Registry();
-        this.registry.setDefaultLabels({ app: 'wise-old-man', threadIndex: getThreadIndex() });
-        prometheus.collectDefaultMetrics({ register: this.registry });
-        this.effectHistogram = new prometheus.Histogram({
-            name: 'effect_duration_seconds',
-            help: 'Duration of effects in microseconds',
-            labelNames: ['effectName', 'status'],
-            buckets: [0.1, 0.3, 0.5, 0.7, 1, 3, 5, 7, 10, 30]
-        });
-        this.httpHistogram = new prometheus.Histogram({
-            name: 'http_request_duration_seconds',
-            help: 'Duration of HTTP requests in microseconds',
-            labelNames: ['method', 'route', 'status', 'userAgent'],
-            buckets: [0.1, 0.3, 0.5, 0.7, 1, 3, 5, 7, 10, 30]
-        });
-        this.jobHistogram = new prometheus.Histogram({
-            name: 'job_duration_seconds',
-            help: 'Duration of jobs in microseconds',
-            labelNames: ['jobName', 'status'],
-            buckets: [0.1, 0.5, 1, 5, 10, 30, 60]
-        });
-        this.jobQueueGauge = new prometheus.Gauge({
-            name: 'job_queue_size',
-            help: 'Number of jobs in different states for each queue',
-            labelNames: ['queueName', 'state']
-        });
-        this.eventCounter = new prometheus.Counter({
-            name: 'event_counter',
-            help: 'Count of events emitted',
-            labelNames: ['eventType']
-        });
-        this.customPeriodCounter = new prometheus.Counter({
-            name: 'custom_period_counter',
-            help: 'Count of custom period expressions used',
-            labelNames: ['customPeriod']
-        });
-        this.updatePlayerJobSourceCounter = new prometheus.Counter({
-            name: 'update_player_job_source_counter',
-            help: 'Count of update player jobs dispatched',
-            labelNames: ['source']
-        });
-        this.runeMetricsHistogram = new prometheus.Histogram({
-            name: 'runemetrics_duration_seconds',
-            help: 'Duration of RuneMetrics requests in microseconds',
-            labelNames: ['status'],
-            buckets: [0.1, 0.3, 0.5, 1, 5, 10, 30]
-        });
-        this.hiscoresHistogram = new prometheus.Histogram({
-            name: 'hiscores_duration_seconds',
-            help: 'Duration of hiscores requests in microseconds',
-            labelNames: ['status'],
-            buckets: [0.1, 0.3, 0.5, 1, 5, 10, 30]
-        });
-        this.registry.registerMetric(this.jobHistogram);
-        this.registry.registerMetric(this.jobQueueGauge);
-        this.registry.registerMetric(this.httpHistogram);
-        this.registry.registerMetric(this.effectHistogram);
-        this.registry.registerMetric(this.eventCounter);
-        this.registry.registerMetric(this.customPeriodCounter);
-        this.registry.registerMetric(this.updatePlayerJobSourceCounter);
-        this.registry.registerMetric(this.runeMetricsHistogram);
-        this.registry.registerMetric(this.hiscoresHistogram);
-    }
-    init() {
-        this.pushInterval = setInterval(() => {
-            this.pushMetrics();
-        }, 60000);
-    }
-    shutdown() {
-        if (this.pushInterval !== null) {
-            clearInterval(this.pushInterval);
-        }
-    }
-    pushMetrics() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (process.env.NODE_ENV === 'test') {
-                return errored({ code: 'NOT_ALLOWED_IN_TEST_ENV' });
-            }
-            if (!process.env.PROMETHEUS_METRICS_SERVICE_URL) {
-                return errored({ code: 'MISSING_METRICS_URL' });
-            }
-            const metricsResult = yield fromPromise(this.registry.getMetricsAsJSON());
-            if (isErrored(metricsResult)) {
-                return errored({
-                    code: 'FAILED_TO_GET_PROMETHEUS_METRICS',
-                    subError: metricsResult.error
-                });
-            }
-            const requestResult = yield fromPromise(axios.post(process.env.PROMETHEUS_METRICS_SERVICE_URL, {
-                source: 'api',
-                data: metricsResult.value,
-                threadIndex: getThreadIndex()
-            }));
-            if (isErrored(requestResult)) {
-                return errored({
-                    code: 'FAILED_TO_PUSH_PROMETHEUS_METRICS',
-                    subError: requestResult.error
-                });
-            }
-            return complete(true);
-        });
-    }
-    trackHttpRequest() {
-        return this.httpHistogram.startTimer();
-    }
-    trackRuneMetricsRequest() {
-        return this.runeMetricsHistogram.startTimer();
-    }
-    trackHiscoresRequest() {
-        return this.hiscoresHistogram.startTimer();
-    }
-    trackEffect(effectName, fn) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const endTimer = this.effectHistogram.startTimer();
-            try {
-                yield fn();
-                endTimer({ effectName, status: 1 });
-            }
-            catch (error) {
-                endTimer({ effectName, status: 0 });
-                throw error;
-            }
-        });
-    }
-    trackJob(jobName, handler) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const endTimer = this.jobHistogram.startTimer();
-            try {
-                yield handler();
-                endTimer({ jobName, status: 1 });
-            }
-            catch (error) {
-                endTimer({ jobName, status: 0 });
-                throw error;
-            }
-        });
-    }
-    trackEventEmitted(eventType) {
-        this.eventCounter.inc({ eventType });
-    }
-    trackCustomPeriodExpression(customPeriod) {
-        this.customPeriodCounter.inc({ customPeriod });
-    }
-    trackUpdatePlayerJobSource(source) {
-        this.updatePlayerJobSourceCounter.inc({ source });
-    }
-    updateQueueMetrics(queueName, counts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            for (const [state, count] of Object.entries(counts)) {
-                this.jobQueueGauge.set({ queueName, state }, count);
-            }
-        });
-    }
-}
-var prometheusService = new PrometheusService();
-
 const CUSTOM_PERIOD_REGEX = /(\d+y)?(\d+m)?(\d+w)?(\d+d)?(\d+h)?/;
 const PeriodProps = {
     [Period.FIVE_MIN]: { name: '5 Min', milliseconds: 300000 },
@@ -2312,7 +2087,6 @@ function parsePeriodExpression(periodExpression) {
             durationMs: PeriodProps[fixed].milliseconds
         };
     }
-    prometheusService.trackCustomPeriodExpression(fixed);
     const result = fixed.match(CUSTOM_PERIOD_REGEX);
     if (!result || result.length === 0 || result[0] !== fixed)
         return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wise-old-man/utils",
-  "version": "3.3.12",
+  "version": "3.3.14",
   "description": "A JavaScript/TypeScript client that interfaces and consumes the Wise Old Man API, an API that tracks and measures players' progress in Old School Runescape.",
   "keywords": [
     "wiseoldman",