Updates

docker-compose-swarm.yaml

@@ -19,7 +19,9 @@ services:
         - "traefik.constraint-label=traefik-public"
         - "traefik.http.routers.${STACK_NAME?err}-http.rule=Host(`${TRAEFIK_HOST?err}`)"
         - "traefik.http.routers.${STACK_NAME}-http.entrypoints=http"
-        - "traefik.http.routers.${STACK_NAME}-http.middlewares=https-redirect"
+        - "traefik.http.routers.${STACK_NAME}-http.middlewares=${STACK_NAME}-http-redirect"
+        - "traefik.http.middlewares.${STACK_NAME}-http-redirect.redirectscheme.scheme=https"
+        - "traefik.http.middlewares.${STACK_NAME}-http-redirect.redirectscheme.permanent=true"
         - "traefik.http.routers.${STACK_NAME}-https.rule=Host(`${TRAEFIK_HOST}`)"
         - "traefik.http.routers.${STACK_NAME}-https.entrypoints=https"
         - "traefik.http.routers.${STACK_NAME}-https.tls=true"

package.json

@@ -22,7 +22,7 @@
     "cors": "^2.8.5",
     "express": "^5.1.0",
     "jsonpath": "^1.1.1",
-    "lucide-static": "^0.545.0",
+    "lucide-static": "^0.546.0",
     "node-schedule": "^2.1.1",
     "nodemon": "^3.1.10",
     "pug": "^3.0.3",
@@ -32,8 +32,8 @@
     "yaml": "^2.8.1"
   },
   "devDependencies": {
-    "@eslint/js": "^9.37.0",
-    "eslint": "^9.37.0",
+    "@eslint/js": "^9.38.0",
+    "eslint": "^9.38.0",
     "prettier": "^3.6.2"
   }
 }

src/api.js

@@ -10,7 +10,8 @@ import { InfluxDB, Point } from '@influxdata/influxdb-client'
 
 const redisUrl = process.env.REDIS_URL || 'redis://redis:6379'
 console.log(`REDIS_URL: ${redisUrl}`)
-const client = createClient({ url: redisUrl })
+// NOTE: Increase connectTimeout for Render, consider using reconnectStrategy...
+const client = createClient({ url: redisUrl, socket: { connectTimeout: 10000 } })
 await client.connect()
 
 let influxClient
@@ -274,15 +275,23 @@ export async function sendInflux() {
     if (!influxClient) return console.log('InfluxDB Not Configured.')
     console.log(`Processing Influx: ${new Date().toLocaleString()}`)
 
-    const value = await cacheGet('badges_total', 0)
-    console.log('badges_total: value:', value)
-
     const org = process.env.INFLUX_ORG || 'cssnr'
     const bucket = process.env.INFLUX_BUCKET || 'general'
     const writeApi = influxClient.getWriteApi(org, bucket)
 
-    const point = new Point('node_badges').intField('badges_total', value)
-    console.log('point:', point)
-    writeApi.writePoint(point)
+    const measurementName = 'node_badges'
+
+    const badgesTotal = await cacheGet('badges_total', 0)
+    // console.log('badgesTotal:', badgesTotal, typeof badgesTotal)
+    writeApi.writePoint(new Point(measurementName).intField('badges_total', badgesTotal))
+
+    const appUptime = Math.floor(process.uptime())
+    // console.log('appUptime:', appUptime, typeof appUptime)
+    writeApi.writePoint(new Point(measurementName).intField('app_uptime', appUptime))
+
+    const redisKeys = await client.dbSize()
+    // console.log('redisKeys:', redisKeys, typeof redisKeys)
+    writeApi.writePoint(new Point(measurementName).intField('redis_keys', redisKeys))
+
     await writeApi.close()
 }

src/app.js

@@ -42,8 +42,8 @@ console.log(`APP_VERSION: ${process.env.APP_VERSION}`)
 console.log(`GITHUB_TOKEN: ${process.env.GITHUB_TOKEN ? 'Loaded' : 'MISSING'}`)
 console.log(`VT_API_KEY: ${process.env.VT_API_KEY ? 'Loaded' : 'MISSING'}`)
 
-schedule.scheduleJob('0 * * * *', function () {
-    sendInflux().catch((e) => console.error(e))
+schedule.scheduleJob('*/5 * * * *', function () {
+    sendInflux().catch(console.error)
 })
 
 const server = app.listen(port, () => {
@@ -94,7 +94,7 @@ app.get('/', async (req, res) => {
 //
 //     if (req.params.extra) {
 //         console.log('req.params.extra:', req.params.extra)
-//         sendInflux().catch((e) => console.error(e))
+//         sendInflux().catch(console.error)
 //     }
 // })
 
@@ -153,7 +153,7 @@ app.get(
         const stats = await getVTStats(hash)
         // console.log('stats:', stats)
         const message = `${stats.malicious}/${stats.suspicious}/${stats.undetected}`
-        console.log('message:', message)
+        // console.log('message:', message)
         const color = getRangedColor(req, stats.malicious + stats.suspicious)
         const options = { label: hash.slice(0, 6), icon: 'virustotal', color }
         getBadge(message, req.query, options, res)
@@ -178,7 +178,7 @@ app.get(
         const stats = await getVTReleaseStats(req)
         // console.log('stats:', stats)
         const message = `${stats.malicious}/${stats.suspicious}/${stats.undetected}`
-        console.log('message:', message)
+        // console.log('message:', message)
         const color = getRangedColor(req, stats.malicious + stats.suspicious)
         const options = { label: req.params.asset, icon: 'virustotal', color }
         getBadge(message, req.query, options, res)
@@ -218,7 +218,7 @@ app.get(
 
         if (req.params.latest) {
             const message = tags.at(-1)
-            console.log('latest - message:', message)
+            // console.log('latest - message:', message)
             return getBadge(message, req.query, { label: 'latest', lucide: 'tag' }, res)
         }
 
@@ -227,7 +227,7 @@ app.get(
         }
 
         const message = tags.join(` ${req.query.sep || '|'} `)
-        console.log('tags - message:', message)
+        // console.log('tags - message:', message)
         getBadge(message, req.query, { label: 'tags', lucide: 'tags' }, res)
     })
 )
@@ -253,7 +253,7 @@ app.get(
         // console.log('getImageSize - total:', total)
 
         const message = formatSize(total)
-        console.log('message:', message)
+        // console.log('message:', message)
         getBadge(message, req.query, { label: 'size', lucide: 'container' }, res)
     })
 )
@@ -262,7 +262,7 @@ app.get(
     '/static/:message{/:label}',
     errorBadgeHandler(async (req, res) => {
         console.log(req.originalUrl)
-        console.log(`message/label: ${req.params.message} / ${req.params.label}`)
+        // console.log(`message/label: ${req.params.message} / ${req.params.label}`)
         // NOTE: This endpoint uses custom logic to make a "static" badge
         //  This needs to be fixed, the icon does not show up like shields
         const query = structuredClone(req.query)
@@ -291,7 +291,7 @@ app.get(
         if (!['yaml', 'json'].includes(req.params.type)) return res.sendStatus(404)
 
         const message = await getJSONPath(req)
-        console.log('message:', message)
+        // console.log('message:', message)
         getBadge(message, req.query, { label: 'result', lucide: 'code-xml' }, res)
     })
 )
@@ -301,34 +301,35 @@ app.get(
     errorBadgeHandler(async (req, res) => {
         console.log(req.originalUrl)
         const message = getUptime()
-        console.log('message:', message)
+        // console.log('message:', message)
         getBadge(message, req.query, { label: 'uptime', lucide: 'clock-arrow-up' }, res)
     })
 )
 
 // Handler 404
 app.use((req, res) => {
-    // res.status(404).send("Sorry can't find that!")
+    console.log('404:', req.originalUrl)
     const data = {
         message: '404 - URL Not Found',
         color: 'red',
         style: req.query.style || 'flat',
     }
-    console.log('data:', data)
+    // console.log('404 data:', data)
     // noinspection JSCheckFunctionSignatures
     const badge = makeBadge(data)
     sendBadge(res, badge, 404)
 })
 
 if (Sentry) Sentry.setupExpressErrorHandler(app)
 
+// TODO: Move to express error handler...
 function errorBadgeHandler(handler) {
     return async (req, res) => {
         try {
             await handler(req, res)
         } catch (error) {
             console.error(error)
-            console.log('errorBadgeHandler - error.message:', error.message)
+            console.log('errorBadgeHandler:', error.message)
             const data = {
                 message: error.message || 'Unknown Error',
                 color: 'red',
@@ -387,7 +388,7 @@ function getBadge(message, query = {}, options = {}, res = null) {
     // console.log('data:', data)
     const badge = makeBadge(data)
     if (res) sendBadge(res, badge)
-    incrBadge().catch((e) => console.error(e))
+    incrBadge().catch(console.error)
     return badge
 }