feat: use logger from useful-typescript-functions

jschirrmacher · May 5, 2024 · 9c17482 · 9c17482
1 parent b0cb8ad
commit 9c17482
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 49 deletions.
diff --git a/gateway/Config.ts b/gateway/Config.ts
@@ -1,9 +1,9 @@
 import { parse } from "yaml"
 import { resolve } from "path"
 import { readFile } from "fs/promises"
-import { MetricsConfiguration } from "./types"
+import { Configuration } from "./types"
 
 const defaultConfigFile = resolve(__dirname, "..", "config.yaml")
 export default async function readConfig(configFile = defaultConfigFile) {
-  return parse((await readFile(configFile)).toString()) as MetricsConfiguration
+  return parse((await readFile(configFile)).toString()) as Configuration
 }
diff --git a/gateway/MQTTClient.ts b/gateway/MQTTClient.ts
@@ -23,7 +23,7 @@ const dateTimeRegEx = new RegExp(regExStr)
 const invalidDateTimeRegEx = new RegExp('(?<!")(' + regExStr + ')(?!")', "g")
 
 export default function (
-  config: MetricsConfiguration,
+  config: MetricsConfiguration[],
   mqtt: MQTT = actualMqtt,
   logger: Logger = console
 ) {
@@ -34,7 +34,7 @@ export default function (
   const auth = user && pwd ? `${user}:${pwd}@` : ""
 
   const client = mqtt.connect(`mqtt://${auth}${brokerName}:${port}`)
-  const topics = unique(config.metrics.map((metric) => metric.topic))
+  const topics = unique(config.map((metric) => metric.topic))
 
   client.on("connect", () => {
     logger.info(`Connection to mqtt://${brokerName}:${port} established`)

diff --git a/gateway/MetricsGenerator.ts b/gateway/MetricsGenerator.ts
@@ -1,6 +1,5 @@
-import type { BaseType, LabelList, SingleConfiguration } from "./types"
+import type { BaseType, LabelList, MetricsConfiguration } from "./types"
 import { metrics } from "./MetricsModel"
-import { MetricsConfiguration } from "./types"
 
 function object2label(obj: LabelList) {
   return Object.entries(obj)
@@ -9,7 +8,7 @@ function object2label(obj: LabelList) {
 }
 
 function createMetric(
-  config: SingleConfiguration,
+  config: MetricsConfiguration,
   value: string | number,
   labels: Record<string, string | number> = {}
 ) {
@@ -22,7 +21,7 @@ function createMetric(
   )
 }
 
-function getLabels(config: SingleConfiguration) {
+function getLabels(config: MetricsConfiguration) {
   return Object.fromEntries(
     Object.entries(config.labels || {}).map(([key, path]) => [
       key,
@@ -31,17 +30,17 @@ function getLabels(config: SingleConfiguration) {
   ) as LabelList
 }
 
-function getValue(config: SingleConfiguration) {
+function getValue(config: MetricsConfiguration) {
   return metrics[config.topic][config.path as string] as BaseType
 }
 
-export default function getMetrics(config: MetricsConfiguration) {
-  config.metrics
+export default function getMetrics(config: MetricsConfiguration[]) {
+  config
     .map((config) => config.topic)
     .filter((topic) => !metrics[topic])
     .forEach((topic) => console.warn(`path '${topic}' not found in metrics`))
 
-  return config.metrics
+  return config
     .filter((config) => metrics[config.topic])
     .map((config) => createMetric(config, getValue(config), getLabels(config)))
     .join("")

diff --git a/gateway/index.ts b/gateway/index.ts
@@ -4,37 +4,16 @@ import * as actualMqtt from "mqtt"
 import readConfig from "./Config"
 import getMetrics from "./MetricsGenerator"
 import setupMQTTClient from "./MQTTClient"
-import {
-  setupServer,
-  defineRouter,
-  LogLevel,
-} from "useful-typescript-functions"
-
-const logPrintLevel = {
-  error: ["error"],
-  warn: ["error", "warn"],
-  info: ["error", "warn", "info"],
-  debug: ["error", "warn", "info", "debug"],
-}
-
-const printLog = (level: LogLevel) => (msg: string | object) =>
-  logPrintLevel[logger.logLevel].includes(level) && console.log(msg)
-
-const logger = {
-  logLevel: "info" as LogLevel,
-  debug: printLog("debug"),
-  info: printLog("info"),
-  warn: printLog("warn"),
-  error: printLog("error"),
-}
+import { setupServer, defineRouter, Logger } from "useful-typescript-functions"
 
 async function setup() {
   const config = await readConfig()
-  logger.logLevel = config.logLevel || "info"
-  setupMQTTClient(config, actualMqtt, logger)
+  const logger = Logger()
+  logger.setLogLevel(config.logLevel || "info")
+  setupMQTTClient(config.metrics, actualMqtt, logger)
   setupServer({
     routers: [
-      defineRouter("/metrics", "metrics").get("/", () => getMetrics(config)),
+      defineRouter("/metrics", "metrics").get("/", () => getMetrics(config.metrics)),
     ],
   })
 }

diff --git a/gateway/types.ts b/gateway/types.ts
@@ -7,7 +7,7 @@ export type BaseType = string | number
 
 export type LabelList = Record<string, BaseType>
 
-export type SingleConfiguration = {
+export type MetricsConfiguration = {
   name: string
   description: string
   type: MetricType
@@ -16,7 +16,7 @@ export type SingleConfiguration = {
   labels: LabelList
 }
 
-export type MetricsConfiguration = {
+export type Configuration = {
   logLevel?: LogLevel
-  metrics: SingleConfiguration[]
+  metrics: MetricsConfiguration[]
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "mqtt": "^5.5.5",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5",
-    "useful-typescript-functions": "^4.1.4",
+    "useful-typescript-functions": "4.2.0",
     "yaml": "^2.4.2"
   },
   "devDependencies": {