Update Influx

Author: smashedr

package-lock.json

@@ -15,7 +15,7 @@
     "@influxdata/influxdb-client": "^1.35.0",
     "@octokit/rest": "^22.0.0",
     "@sentry/node": "^10.22.0",
-    "axios": "^1.12.2",
+    "axios": "^1.13.1",
     "badge-maker": "^5.0.2",
     "camelcase": "^8.0.0",
     "chroma-js": "^3.1.2",

package.json

@@ -271,8 +271,8 @@ async function cacheError(key, errorMessage, EX = 60 * 10) {
     throw new Error(errorMessage)
 }
 
-export async function incrBadge() {
-    await client.incr('badges_total')
+export async function incrKey(key) {
+    await client.incr(key)
 }
 
 export async function sendInflux() {
@@ -289,6 +289,14 @@ export async function sendInflux() {
     // debug('badgesTotal:', badgesTotal, typeof badgesTotal)
     writeApi.writePoint(new Point(measurementName).intField('badges_total', badgesTotal))
 
+    const badges404 = await cacheGet('badges_404', 0)
+    // debug('badges404:', badges404, typeof badges404)
+    writeApi.writePoint(new Point(measurementName).intField('badges_404', badges404))
+
+    const badgesError = await cacheGet('badges_error', 0)
+    // debug('badgesError:', badgesError, typeof badgesError)
+    writeApi.writePoint(new Point(measurementName).intField('badges_error', badgesError))
+
     const appUptime = Math.floor(process.uptime())
     // debug('appUptime:', appUptime, typeof appUptime)
     writeApi.writePoint(new Point(measurementName).intField('app_uptime', appUptime))

src/api.js

@@ -19,7 +19,7 @@ import {
     getVTReleaseStats,
     getVTStats,
     GHCRApi,
-    incrBadge,
+    incrKey,
     sendInflux,
 } from './api.js'
 
@@ -291,9 +291,9 @@ app.get('/uptime', async (req, res) => {
     getBadge(message, req.query, { label: 'uptime', lucide: 'clock-arrow-up' }, res)
 })
 
-// Handler 404
+// Handler - 404
 app.use((req, res) => {
-    debug('404:', req.originalUrl)
+    debug('404 - originalUrl:', req.originalUrl)
     const data = {
         message: '404 - URL Not Found',
         color: 'red',
@@ -303,25 +303,28 @@ app.use((req, res) => {
     // noinspection JSCheckFunctionSignatures
     const badge = makeBadge(data)
     sendBadge(res, badge, 404)
+    incrKey('badges_404').catch(console.error)
 })
 
+// Handler - Error
 app.use(errorHandler)
 
-// NOTE: Must determine which errors to pass to sentry.
-//  Defining it after the error handler only catches errors in the handler...
+// Handler - Sentry Error - NOTE: This only catches errorHandler errors currently...
 if (Sentry) Sentry.setupExpressErrorHandler(app)
 
 function errorHandler(err, req, res) {
     // console.log('errorHandler:', err)
-    debug('errorHandler:', err.message)
+    debug('errorHandler - originalUrl:', req.originalUrl)
+    debug('err.message:', err.message)
     const data = {
         message: err.message || 'Unknown Error',
         color: 'red',
         style: req.query.style || 'flat',
     }
     debug('data:', data)
     const badge = makeBadge(data)
-    if (res) sendBadge(res, badge)
+    sendBadge(res, badge)
+    incrKey('badges_error').catch(console.error)
 }
 
 /**
@@ -370,7 +373,7 @@ function getBadge(message, query = {}, options = {}, res = null) {
     // debug('data:', data)
     const badge = makeBadge(data)
     if (res) sendBadge(res, badge)
-    incrBadge().catch(console.error)
+    incrKey('badges_total').catch(console.error)
     return badge
 }