Bump eslint from 8.50.0 to 8.51.0 (#408)

Closes #96

.envrc

@@ -0,0 +1 @@
+use flake

.eslintrc.js

@@ -19,6 +19,7 @@ module.exports = {
         'import/no-default-export': 'error',
         'import/no-namespace': 'error',
         'import/no-useless-path-segments': 'error',
+        'import/no-named-as-default': 0,
         'no-duplicate-imports': 'error',
     },
     overrides: [

.github/FUNDING.yml

@@ -1 +1,2 @@
 github: lstrojny
+custom: ["https://paypal.me/larsstrojny"]

.github/dependabot.yml

@@ -3,4 +3,11 @@ updates:
   - package-ecosystem: npm
     directory: /
     schedule:
-      interval: weekly
+      interval: daily
+    open-pull-requests-limit: 30
+
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 30

.github/workflows/build.yml

@@ -4,16 +4,12 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     strategy:
       fail-fast: false
       matrix:
         include:
-          - { node-version: 10.x, lint: false, tests: false }
-          - { node-version: 11.x, lint: false, tests: false }
-          - { node-version: 12.x, lint: false, tests: false }
-          - { node-version: 13.x, lint: false, tests: false }
           - { node-version: 14.x, lint: true, tests: true }
           - { node-version: 15.x, lint: false, tests: true }
           - { node-version: 16.x, lint: true, tests: true }
@@ -24,16 +20,16 @@ jobs:
     name: nodejs ${{ matrix.node-version }} (${{ matrix.lint && 'lint → ' || '' }}${{ matrix.tests && 'test → ' || '' }}build)
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.0
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v3.8.1
         with:
           node-version: ${{ matrix.node-version }}
 
       - name: Cache node modules
         id: cache-npm
-        uses: actions/cache@v3
+        uses: actions/cache@v3.3.2
         env:
           cache-name: cache-node-modules
         with:
@@ -42,7 +38,7 @@ jobs:
 
       - name: Cache eslint
         id: cache-eslint
-        uses: actions/cache@v3
+        uses: actions/cache@v3.3.2
         env:
           cache-name: cache-eslint
         with:
@@ -51,7 +47,7 @@ jobs:
 
       - name: Cache TypeScript
         id: cache-typescript
-        uses: actions/cache@v3
+        uses: actions/cache@v3.3.2
         env:
           cache-name: cache-typescript
         with:
@@ -60,7 +56,7 @@ jobs:
 
       - name: Cache prettier
         id: cache-prettier
-        uses: actions/cache@v3
+        uses: actions/cache@v3.3.2
         env:
           cache-name: cache-prettier
         with:
@@ -80,7 +76,7 @@ jobs:
         if: ${{ matrix.tests }}
 
       - name: Upload code coverage
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v3.1.3
         with:
           name: code-coverage
           path: coverage/lcov.info

.github/workflows/dependabot-automerge.yml

@@ -0,0 +1,28 @@
+name: Dependabot auto merge
+on:
+  workflow_run:
+    workflows: [CI]
+    types:
+      - completed
+
+jobs:
+  automerge:
+    name: Auto merge "${{ github.event.workflow_run.head_branch }}"
+    runs-on: ubuntu-22.04
+    if: >
+      github.event.workflow_run.event == 'pull_request'
+        && github.event.workflow_run.conclusion == 'success'
+        && github.actor == 'dependabot[bot]'
+        && startsWith(github.event.workflow_run.head_branch, 'dependabot/')
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v4.1.0
+        with:
+          ref: ${{ github.event.workflow_run.head_commit.id }}
+
+      - name: Instruct @dependabot to merge
+        run: "gh issue comment $ISSUE_ID --body \"(This is an automated comment from workflow $WORKFLOW_URL)\n\n@dependabot squash and merge\""
+        env:
+          GITHUB_TOKEN: ${{ secrets.DEPENDABOT_COMMENT_TOKEN }}
+          ISSUE_ID: ${{ github.event.workflow_run.pull_requests[0].number  }}
+          WORKFLOW_URL: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}

.github/workflows/sonar.yml

@@ -1,4 +1,4 @@
-name: Sonar
+name: Sonar scan
 
 on:
   workflow_run:
@@ -7,12 +7,12 @@ on:
 
 jobs:
   sonar:
-    name: Sonar
+    name: Sonar scan on "${{ github.event.workflow_run.head_branch }}"
     runs-on: ubuntu-latest
     if: github.event.workflow_run.conclusion == 'success'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.0
         with:
           repository: ${{ github.event.workflow_run.head_repository.full_name }}
           ref: ${{ github.event.workflow_run.head_branch }}

README.md

@@ -133,16 +133,22 @@ Once *Prometheus* is restarted, metrics with the `homebridge_` prefix should sta
 
 
       // Debug
+      //
+      // Default: false
       "debug": "<boolean>",
 
 
       // Metrics prefix
+      //
+      // Default: "homebridge"
       "prefix": "<string>",
 
 
       // Metrics server port
       //
       // TCP port where the Prometheus metrics server listens
+      //
+      // Default: 36123
       "port": "<integer>",
 
 
@@ -151,24 +157,32 @@ Once *Prometheus* is restarted, metrics with the `homebridge_` prefix should sta
       // Interface where the Prometheus metrics server listens. Can be an IP, a
       // hostname, "0.0.0.0" for all IPv4 interfaces, "::1" for all IPv6 interfaces.
       // Default is "::" which means "any interface"
+      //
+      // Default: "::"
       "interface": "<string>",
 
 
       // Service refresh interval
       //
       // Discover new services every <interval> seconds
+      //
+      // Default: 60
       "refresh_interval": "<integer>",
 
 
       // Request timeout
       //
       // Request timeout when interacting with homebridge instances
+      //
+      // Default: 10
       "request_timeout": "<integer>",
 
 
       // Service discovery timeout
       //
       // Discovery timeout after which the current discovery is considered failed
+      //
+      // Default: 20
       "discovery_timeout": "<integer>",
 
 

code-generation/config-scheme-gen.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const { parseSchema } = require('json-schema-to-zod-with-defaults')
+const { parseSchema } = require('json-schema-to-zod')
 const { schema } = require('../config.schema.json')
 const { format } = require('prettier')
 const { join, basename } = require('path')
@@ -11,7 +11,7 @@ const file = join(__dirname, '../src/generated/config_boundary.ts')
 
 console.log(`Starting code generation for ${file}`)
 
-const zodSchema = parseSchema(schema, true)
+const zodSchema = parseSchema(schema, false)
 
 const code = format(
     `
@@ -56,6 +56,9 @@ function generateDocs(schema) {
                 if (definition.description) {
                     lines.push(`//\n// ${wordwrap(definition.description, 80, '\n// ')}`)
                 }
+                if (definition.default !== undefined) {
+                    lines.push(`//\n// Default: ${JSON.stringify(definition.default)}`)
+                }
 
                 lines.push(`${JSON.stringify(property)}: ${JSON.stringify('<' + definition.type + '>')}`)
 

code-generation/hap-gen.js

@@ -24,9 +24,9 @@ for (const [name, service] of Object.entries(hap.Service)) {
 const code = format(
     `
 // Auto-generated by "${join(basename(__dirname), basename(__filename))}", don’t manually edit
-export const Uuids: Record<string,string> = ${JSON.stringify(uuidToServiceMap)} as const
+export const Uuids = ${JSON.stringify(uuidToServiceMap)} as const
 
-export const Services: Record<string,string> = ${JSON.stringify(serviceToUuidMap)} as const
+export const Services = ${JSON.stringify(serviceToUuidMap)} as const
 `,
     { filepath: 'codegen.ts', ...prettierConfig },
 )

flake.nix

@@ -1,5 +1,5 @@
 {
-  description = "Ansible environment";
+  description = "homebridge-prometheus-exporter";
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";

package.json

@@ -1,6 +1,6 @@
 {
     "name": "homebridge-prometheus-exporter",
-    "version": "0.0.15",
+    "version": "1.0.5",
     "description": "Prometheus exporter for homebridge accessories.",
     "license": "Apache-2.0",
     "repository": {
@@ -16,9 +16,10 @@
     },
     "main": "dist/src/index.js",
     "scripts": {
-        "lint": "ifNotCi() { test \"$CI\" && echo \"$2\" || echo \"$1\"; }; `npm bin`/tsc --noEmit && `npm bin`/prettier --ignore-path=.gitignore `ifNotCi --write \"--check --cache --cache-strategy content\"` '**/**.{ts,js,json}' && `npm bin`/eslint `ifNotCi --fix \"--cache --cache-strategy content\"` --ignore-path=.gitignore '**/**.{ts,js,json}'",
+        "_portable_exec": "npmPortableExec() { `npm root`/.bin/$@; }; npmPortableExec",
+        "lint": "ifNotCi() { test \"$CI\" && echo \"$2\" || echo \"$1\"; }; npm run _portable_exec -- tsc --noEmit && npm run _portable_exec -- prettier --ignore-path=.gitignore `ifNotCi --write \"--check --cache --cache-strategy content\"` '**/**.{ts,js,json}' && npm run _portable_exec -- eslint `ifNotCi --fix \"--cache --cache-strategy content\"` --ignore-path=.gitignore '**/**.{ts,js,json}'",
         "start": "npm run build && npm run link && nodemon",
-        "test": "ifNotCi() { test \"$CI\" && echo \"$2\" || echo \"$1\"; }; npm run code-generation && `npm bin`/jest `ifNotCi --watchAll --collect-coverage`",
+        "test": "ifNotCi() { test \"$CI\" && echo \"$2\" || echo \"$1\"; }; npm run code-generation && npm run _portable_exec -- jest `ifNotCi --watchAll --collect-coverage`",
         "link": "npm install --no-save file:///$PWD/",
         "build": "rimraf ./dist .tsbuildinfo && npm run code-generation && tsc",
         "code-generation": "./code-generation/hap-gen.js && ./code-generation/config-scheme-gen.js",
@@ -34,10 +35,11 @@
     "devDependencies": {
         "@jest/globals": "^29.3.0",
         "@types/bcrypt": "^5.0.0",
-        "@types/node": "^18.11.9",
+        "@types/node": "^20.2.3",
         "@types/supertest": "^2.0.12",
         "@typescript-eslint/eslint-plugin": "^5.42.0",
         "@typescript-eslint/parser": "^5.42.0",
+        "array.prototype.flatmap": "^1.3.1",
         "eslint": "^8.0.1",
         "eslint-import-resolver-typescript": "^3.5.2",
         "eslint-plugin-import": "^2.26.0",
@@ -46,22 +48,23 @@
         "homebridge": "^1.3.5",
         "homebridge-cmdswitch2": "^0.2.10",
         "jest": "^29.3.0",
-        "json-schema-to-zod-with-defaults": "^0.2.1",
-        "nodemon": "^2.0.13",
+        "json-schema-to-zod": "^0.6.0",
+        "nodemon": "^3.0.1",
         "prettier": "^2.7.1",
-        "release-it": "^15.5.0",
-        "rimraf": "^3.0.2",
+        "release-it": "^16.0.0",
+        "rimraf": "^5.0.0",
         "supertest": "^6.3.1",
         "ts-jest": "^29.0.3",
         "ts-node": "^10.3.0",
-        "typescript": "^4.4.4"
+        "typescript": "^5.0.2"
     },
     "dependencies": {
         "@fastify/auth": "^4.1.0",
-        "@fastify/basic-auth": "^4.0.0",
+        "@fastify/basic-auth": "^5.0.0",
+        "array.prototype.group": "^1.1.2",
         "bcrypt": "^5.1.0",
         "fastify": "^4.9.2",
-        "hap-node-client": "^0.1.25",
+        "hap-node-client": "^0.2.1",
         "zod": "^3.19.1"
     }
 }

sonar-project.properties

@@ -4,3 +4,4 @@ sonar.sources=.
 sonar.exclusions=tests/**
 sonar.tests=tests
 sonar.javascript.lcov.reportPaths=./coverage/lcov.info
+sonar.coverage.exclusions=code-generation/**,*.config.js,src/generated/**

src/adapters/http/api.ts

@@ -21,10 +21,10 @@ export type HttpConfig = Pick<
 >
 
 export interface HttpServer {
-    log?: Logger
+    log: Logger | null
     config: HttpConfig
     serverFactory?: (requestListener: RequestListener) => Server
-    onRequest(): HttpResponse | undefined
+    onRequest(): HttpResponse | null
     onMetrics(): HttpResponse
     onNotFound(): HttpResponse
     onError(error: Error): HttpResponse

src/ambient.d.ts

@@ -13,3 +13,12 @@ declare module 'hap-node-client' {
         on(event: 'Ready', callback: (v: unknown) => void): void
     }
 }
+
+declare module 'array.prototype.group' {
+    function shim(): void
+}
+
+interface Array<T> {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    group<U>(fn: (value: T, index: number, array: T[]) => U, thisArg?: any): { U: T[] }
+}

src/generated/services.ts

@@ -1,5 +1,5 @@
 // Auto-generated by "code-generation/hap-gen.js", don’t manually edit
-export const Uuids: Record<string, string> = {
+export const Uuids = {
     '00000260-0000-1000-8000-0026BB765291': 'AccessCode',
     '000000DA-0000-1000-8000-0026BB765291': 'AccessControl',
     '0000003E-0000-1000-8000-0026BB765291': 'AccessoryInformation',
@@ -78,7 +78,7 @@ export const Uuids: Record<string, string> = {
     '0000008C-0000-1000-8000-0026BB765291': 'WindowCovering',
 } as const
 
-export const Services: Record<string, string> = {
+export const Services = {
     AccessCode: '00000260-0000-1000-8000-0026BB765291',
     AccessControl: '000000DA-0000-1000-8000-0026BB765291',
     AccessoryInformation: '0000003E-0000-1000-8000-0026BB765291',

src/metrics.ts

@@ -1,13 +1,15 @@
 import type { Accessory, Device, Service } from './boundaries'
-import { Uuids } from './generated/services'
-import { assertTypeExhausted, isType } from './std'
+import { Services, Uuids } from './generated/services'
+import { assertTypeExhausted, isKeyOfConstObject, isType, strCamelCaseToSnakeCase } from './std'
+
+type Labels = Record<string, string>
 
 export class Metric {
     constructor(
         public readonly name: string,
         public readonly value: number,
         public readonly timestamp: Date | null = null,
-        public readonly labels: Record<string, string> = {},
+        public readonly labels: Labels = {},
     ) {}
 }
 
@@ -35,7 +37,7 @@ export function aggregate(devices: Device[], timestamp: Date): Metric[] {
     return metrics.flat()
 }
 
-function extractMetrics(service: Service, timestamp: Date, labels: Record<string, string>) {
+function extractMetrics(service: Service, timestamp: Date, labels: Labels): Metric[] {
     const metrics: Metric[] = []
 
     for (const characteristic of service.characteristics) {
@@ -63,7 +65,7 @@ function extractMetrics(service: Service, timestamp: Date, labels: Record<string
             case 'uint64':
                 {
                     const name = formatName(
-                        Uuids[service.type] || 'custom',
+                        isKeyOfConstObject(service.type, Uuids) ? Uuids[service.type] : 'custom',
                         characteristic.description,
                         characteristic.unit,
                     )
@@ -79,45 +81,35 @@ function extractMetrics(service: Service, timestamp: Date, labels: Record<string
     return metrics
 }
 
-export function formatName(serviceName: string, description: string, unit: string | undefined = undefined): string {
+export function formatName(serviceName: string, description: string, unit: string | null = null): string {
     return (
         [serviceName, description, typeof unit === 'string' ? unit.toLowerCase() : undefined]
             .filter(isType('string'))
-            .map((v) => camelCaseToSnakeCase(v))
+            .map((val) => strCamelCaseToSnakeCase(val))
             // Remove duplicate prefix
-            .reduce((carry, value) => (value.startsWith(carry) ? value : `${carry}_${value}`))
+            .reduce((carry, val) => (val.startsWith(carry) ? val : `${carry}_${val}`))
     )
 }
 
-function camelCaseToSnakeCase(str: string): string {
-    return str
-        .replace(/\B([A-Z][a-z])/g, ' $1')
-        .toLowerCase()
-        .trim()
-        .replace(/\s+/g, '_')
-}
-
-function getDeviceLabels(device: Device): Record<string, string> {
+function getDeviceLabels(device: Device): Labels {
     return {
         bridge: device.instance.name,
         device_id: device.instance.deviceID,
     }
 }
 
-function getAccessoryLabels(accessory: Accessory): Record<string, string> {
-    const labels: Record<string, string> = {}
-
+function getAccessoryLabels(accessory: Accessory): Labels {
     for (const service of accessory.services) {
-        if (service.type === '0000003E-0000-1000-8000-0026BB765291') {
+        if (service.type === Services.AccessoryInformation) {
             return getServiceLabels(service)
         }
     }
 
-    return labels
+    return {}
 }
 
-function getServiceLabels(service: Service): Record<string, string> {
-    const labels: Record<string, string> = {}
+function getServiceLabels(service: Service): Labels {
+    const labels: Labels = {}
 
     for (const characteristic of service.characteristics) {
         if (
@@ -134,7 +126,7 @@ function getServiceLabels(service: Service): Record<string, string> {
                 'Hardware Revision',
             ].includes(characteristic.description)
         ) {
-            labels[camelCaseToSnakeCase(characteristic.description)] = characteristic.value
+            labels[strCamelCaseToSnakeCase(characteristic.description)] = characteristic.value
         }
     }
 

src/platform.ts

@@ -8,7 +8,7 @@ import { type Config, ConfigBoundary, checkBoundary } from './boundaries'
 
 export class PrometheusExporterPlatform implements IndependentPlatformPlugin {
     private readonly httpServer: PrometheusServer
-    private httpServerController: HttpServerController | undefined = undefined
+    private httpServerController: HttpServerController | null = null
     private readonly config: Config
 
     constructor(public readonly log: Logger, config: PlatformConfig, public readonly api: API) {

src/prometheus.ts

@@ -1,27 +1,39 @@
-import type { Metric } from './metrics'
 import type { Logger } from 'homebridge'
 import type { HttpConfig, HttpResponse, HttpServer } from './adapters/http'
+import type { Metric } from './metrics'
+import { strTrimRight } from './std'
+import { shim } from 'array.prototype.group'
+shim()
 
 export class MetricsRenderer {
     private readonly prefix: string
 
     constructor(prefix: string) {
-        this.prefix = trimRight(prefix, '_')
+        this.prefix = strTrimRight(prefix, '_')
     }
 
-    render(metric: Metric): string {
-        const name = this.metricName(metric.name)
-        return [
-            `# TYPE ${name} ${name.endsWith('_total') ? 'counter' : 'gauge'}`,
-            `${name}${this.renderLabels(metric.labels)} ${metric.value}${
-                metric.timestamp !== null ? ' ' + String(metric.timestamp.getTime()) : ''
-            }`,
-        ].join('\n')
+    render(metrics: Metric[]): string {
+        return (
+            Object.entries(metrics.sort().group((metric) => this.metricName(metric.name)))
+                .map(([name, metrics]) => {
+                    return [
+                        `# TYPE ${name} ${name.endsWith('_total') ? 'counter' : 'gauge'}`,
+                        metrics.map((metric) => this.formatMetric(metric)).join('\n'),
+                    ].join('\n')
+                })
+                .join('\n\n') + '\n'
+        )
     }
 
-    private renderLabels(labels: Metric['labels']): string {
+    private formatMetric(metric: Metric): string {
+        return `${this.metricName(metric.name)}${MetricsRenderer.renderLabels(metric.labels)} ${metric.value}${
+            metric.timestamp !== null ? ' ' + String(metric.timestamp.getTime()) : ''
+        }`
+    }
+
+    private static renderLabels(labels: Metric['labels']): string {
         const rendered = Object.entries(labels)
-            .map(([key, value]) => `${sanitizePrometheusMetricName(key)}="${escapeAttributeValue(value)}"`)
+            .map(([label, val]) => `${sanitizePrometheusMetricName(label)}="${escapeAttributeValue(val)}"`)
             .join(',')
 
         return rendered !== '' ? '{' + rendered + '}' : ''
@@ -34,14 +46,6 @@ export class MetricsRenderer {
     }
 }
 
-function trimRight(str: string, char: string): string {
-    return stringReverse(stringReverse(str).replace(new RegExp(`^[${char}]+`), ''))
-}
-
-function stringReverse(str: string): string {
-    return str.split('').reverse().join('')
-}
-
 const retryAfterWhileDiscovery = 15
 const textContentType = 'text/plain; charset=utf-8'
 const prometheusSpecVersion = '0.0.4'
@@ -57,17 +61,19 @@ export class PrometheusServer implements HttpServer {
 
     constructor(
         public readonly config: HttpConfig,
-        public readonly log: Logger | undefined = undefined,
+        public readonly log: Logger | null = null,
         private readonly renderer: MetricsRenderer = new MetricsRenderer(config.prefix),
     ) {}
 
-    onRequest(): HttpResponse | undefined {
-        if (!this.metricsDiscovered) {
-            return {
-                statusCode: 503,
-                headers: withHeaders(textContentType, { 'Retry-After': String(retryAfterWhileDiscovery) }),
-                body: 'Metrics discovery pending',
-            }
+    onRequest(): HttpResponse | null {
+        if (this.metricsDiscovered) {
+            return null
+        }
+
+        return {
+            statusCode: 503,
+            headers: withHeaders(textContentType, { 'Retry-After': String(retryAfterWhileDiscovery) }),
+            body: 'Metrics discovery pending',
         }
     }
 
@@ -96,7 +102,7 @@ export class PrometheusServer implements HttpServer {
     }
 
     onMetricsDiscovery(metrics: Metric[]): void {
-        this.metricsResponse = metrics.map((metric) => this.renderer.render(metric)).join('\n')
+        this.metricsResponse = this.renderer.render(metrics)
         this.metricsDiscovered = true
     }
 }
@@ -113,7 +119,7 @@ function escapeString(str: string) {
  *
  * `undefined` is converted to an empty string.
  */
-function escapeAttributeValue(str: string) {
+function escapeAttributeValue(str: Metric['labels'][keyof Metric['labels']]) {
     if (typeof str !== 'string') {
         str = JSON.stringify(str)
     }

src/std.ts

@@ -1,15 +1,41 @@
-type Types = 'string' | 'number' | 'boolean' | 'object'
 interface TypeMap {
     string: string
     number: number
+    bigint: bigint
     boolean: boolean
     object: object
+    symbol: symbol
+    undefined: undefined
 }
 
-export function isType<T extends Types>(type: T): (v: unknown) => v is TypeMap[T] {
+// Type predicate higher order function for use with e.g. filter or map
+export function isType<T extends keyof TypeMap>(type: T): (v: unknown) => v is TypeMap[T] {
     return (v: unknown): v is TypeMap[T] => typeof v === type
 }
 
+// Type predicate for object keys
+// Only safe for const objects, as other objects might carry additional, undeclared properties
+export function isKeyOfConstObject<T extends object>(key: string | number | symbol, obj: T): key is keyof T {
+    return key in obj
+}
+
+// Use for exhaustiveness checks in switch/case
 export function assertTypeExhausted(v: never): never {
     throw new Error(`Type should be exhausted but is not. Value "${JSON.stringify(v)}`)
 }
+
+export function strCamelCaseToSnakeCase(str: string): string {
+    return str
+        .replace(/\B([A-Z][a-z])/g, ' $1')
+        .toLowerCase()
+        .trim()
+        .replace(/\s+/g, '_')
+}
+
+export function strReverse(str: string): string {
+    return str.split('').reverse().join('')
+}
+
+export function strTrimRight(str: string, char: string): string {
+    return strReverse(strReverse(str).replace(new RegExp(`^[${char}]+`), ''))
+}

tests/adapters/http/fastify.test.ts

@@ -71,8 +71,10 @@ describe('Fastify HTTP adapter', () => {
                 [
                     '# TYPE homebridge_metric gauge',
                     'homebridge_metric{name="metric"} 0.1 1577836800000',
+                    '',
                     '# TYPE homebridge_something_total counter',
                     'homebridge_something_total{name="counter"} 100 1577836800000',
+                    '',
                 ].join('\n'),
             )
     })
@@ -117,8 +119,10 @@ describe('Fastify HTTP adapter', () => {
                 [
                     '# TYPE homebridge_metric gauge',
                     'homebridge_metric{name="metric"} 0.1 1577836800000',
+                    '',
                     '# TYPE homebridge_something_total counter',
                     'homebridge_something_total{name="counter"} 100 1577836800000',
+                    '',
                 ].join('\n'),
             )
     })

tests/prometheus.test.ts

@@ -6,68 +6,94 @@ describe('Render prometheus metrics', () => {
     const renderer = new MetricsRenderer('prefix')
 
     test('Renders simple metric', () => {
-        expect(renderer.render(new Metric('metric', 0.000001))).toEqual(
+        expect(renderer.render([new Metric('metric', 0.000001)])).toEqual(
             `# TYPE prefix_metric gauge
-prefix_metric 0.000001`,
+prefix_metric 0.000001
+`,
         )
     })
 
     test('Renders simple metric with timestamp', () => {
-        expect(renderer.render(new Metric('metric', 0.000001, new Date('2000-01-01 00:00:00 UTC')))).toEqual(
+        expect(renderer.render([new Metric('metric', 0.000001, new Date('2000-01-01 00:00:00 UTC'))])).toEqual(
             `# TYPE prefix_metric gauge
-prefix_metric 0.000001 946684800000`,
+prefix_metric 0.000001 946684800000
+`,
         )
     })
 
     test('Renders simple metric with labels', () => {
         expect(
-            renderer.render(
+            renderer.render([
                 new Metric('metric', 0.000001, new Date('2000-01-01 00:00:00 UTC'), { label: 'Some Label' }),
-            ),
+            ]),
         ).toEqual(
             `# TYPE prefix_metric gauge
-prefix_metric{label="Some Label"} 0.000001 946684800000`,
+prefix_metric{label="Some Label"} 0.000001 946684800000
+`,
         )
     })
 
     test('Renders total as counter', () => {
         for (const metricName of ['some_total_metric', 'some_metric_total', 'total_some_metric']) {
             expect(
-                renderer.render(
+                renderer.render([
                     new Metric(metricName, 42, new Date('2000-01-01 00:00:00 UTC'), { label: 'Some Label' }),
-                ),
+                ]),
             ).toEqual(
                 `# TYPE prefix_some_metric_total counter
-prefix_some_metric_total{label="Some Label"} 42 946684800000`,
+prefix_some_metric_total{label="Some Label"} 42 946684800000
+`,
             )
         }
     })
 
+    test('Renders multiple metrics correctly', () => {
+        expect(
+            renderer.render([
+                new Metric('some_gauge', 10, new Date('2000-01-01 00:00:00 UTC')),
+                new Metric('another_gauge', 30, new Date('2000-01-01 00:00:00 UTC')),
+                new Metric('some_gauge', 20, new Date('2000-01-01 00:00:00 UTC')),
+            ]),
+        ).toEqual(
+            `# TYPE prefix_some_gauge gauge
+prefix_some_gauge 10 946684800000
+prefix_some_gauge 20 946684800000
+
+# TYPE prefix_another_gauge gauge
+prefix_another_gauge 30 946684800000
+`,
+        )
+    })
+
     test('Sanitizes metric names', () => {
-        expect(renderer.render(new Metric('mätric name', 0))).toEqual(
+        expect(renderer.render([new Metric('mätric name', 0)])).toEqual(
             `# TYPE prefix_m_tric_name gauge
-prefix_m_tric_name 0`,
+prefix_m_tric_name 0
+`,
         )
     })
 
     test('Sanitizes label names', () => {
-        expect(renderer.render(new Metric('metric', 0, null, { 'yet another label': 'foo' }))).toEqual(
+        expect(renderer.render([new Metric('metric', 0, null, { 'yet another label': 'foo' })])).toEqual(
             `# TYPE prefix_metric gauge
-prefix_metric{yet_another_label="foo"} 0`,
+prefix_metric{yet_another_label="foo"} 0
+`,
         )
     })
 
     test('Escapes newlines in attribute value', () => {
-        expect(renderer.render(new Metric('metric', 0, null, { label: 'foo\nbar' }))).toEqual(
+        expect(renderer.render([new Metric('metric', 0, null, { label: 'foo\nbar' })])).toEqual(
             `# TYPE prefix_metric gauge
-prefix_metric{label="foo\\nbar"} 0`,
+prefix_metric{label="foo\\nbar"} 0
+`,
         )
     })
 
     test('Escapes quotes in attribute value', () => {
-        expect(renderer.render(new Metric('metric', 0, null, { label: 'foo"bar' }))).toEqual(
+        expect(renderer.render([new Metric('metric', 0, null, { label: 'foo"bar' })])).toEqual(
             `# TYPE prefix_metric gauge
-prefix_metric{label="foo\\"bar"} 0`,
+prefix_metric{label="foo\\"bar"} 0
+`,
         )
     })
 })

tsconfig.json

@@ -10,7 +10,7 @@
         "rootDir": "./",
         "strict": true,
         "esModuleInterop": true,
-        "importsNotUsedAsValues": "error",
+        "verbatimModuleSyntax": false,
         "noImplicitAny": true,
         "resolveJsonModule": true,
         "tsBuildInfoFile": ".tsbuildinfo",