A local-first personal finance app
Replacing Actuator with our own implementation (#4897)
Michael Clark2d0716233fec
diff --git a/packages/sync-server/package.json b/packages/sync-server/package.jsonindex 8af05634e9..8b09be93d9 100644--- a/packages/sync-server/package.json+++ b/packages/sync-server/package.json@@ -37,7 +37,6 @@"date-fns": "^2.30.0","debug": "^4.4.0","express": "4.21.2",- "express-actuator": "1.8.4","express-rate-limit": "^7.5.0","express-response-size": "^0.0.3","express-winston": "^4.2.0",diff --git a/packages/sync-server/src/app.ts b/packages/sync-server/src/app.tsindex 1321427f13..42f8370ddc 100644--- a/packages/sync-server/src/app.ts+++ b/packages/sync-server/src/app.ts@@ -1,9 +1,9 @@-import fs from 'node:fs';+import { createRequire } from 'module';+import fs, { readFileSync } from 'node:fs';import bodyParser from 'body-parser';import cors from 'cors';import express from 'express';-import actuator from 'express-actuator';import rateLimit from 'express-rate-limit';import { bootstrap } from './account-db.js';@@ -67,7 +67,32 @@ app.get('/mode', (req, res) => {res.send(config.get('mode'));});-app.use(actuator()); // Provides /health, /metrics, /info+app.get('/info', (_req, res) => {+ const require = createRequire(import.meta.url);+ const packageJsonPath = require.resolve(+ '@actual-app/sync-server/package.json',+ );+ const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf-8'));++ res.status(200).json({+ build: {+ name: packageJson.name,+ description: packageJson.description,+ version: packageJson.version,+ },+ });+});++app.get('/health', (_req, res) => {+ res.status(200).json({ status: 'UP' });+});++app.get('/metrics', (_req, res) => {+ res.status(200).json({+ mem: process.memoryUsage(),+ uptime: process.uptime(),+ });+});// The web frontendapp.use((req, res, next) => {diff --git a/upcoming-release-notes/4897.md b/upcoming-release-notes/4897.mdnew file mode 100644index 0000000000..c79670fd5c--- /dev/null+++ b/upcoming-release-notes/4897.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [MikesGlitch]+---++Replace Actuator dependency with our own implementation to ensure the Server version displays properly in all scenariosdiff --git a/yarn.lock b/yarn.lockindex 604885a390..f027b88c88 100644--- a/yarn.lock+++ b/yarn.lock@@ -104,7 +104,6 @@ __metadata:date-fns: "npm:^2.30.0"debug: "npm:^4.4.0"express: "npm:4.21.2"- express-actuator: "npm:1.8.4"express-rate-limit: "npm:^7.5.0"express-response-size: "npm:^0.0.3"express-winston: "npm:^4.2.0"@@ -8827,13 +8826,6 @@ __metadata:languageName: nodelinkType: hard-"dayjs@npm:^1.11.3":- version: 1.11.13- resolution: "dayjs@npm:1.11.13"- checksum: 10/7374d63ab179b8d909a95e74790def25c8986e329ae989840bacb8b1888be116d20e1c4eee75a69ea0dfbae13172efc50ef85619d304ee7ca3c01d5878b704f5- languageName: node- linkType: hard-"debounce@npm:^1.2.1":version: 1.2.1resolution: "debounce@npm:1.2.1"@@ -10481,16 +10473,6 @@ __metadata:languageName: nodelinkType: hard-"express-actuator@npm:1.8.4":- version: 1.8.4- resolution: "express-actuator@npm:1.8.4"- dependencies:- dayjs: "npm:^1.11.3"- properties-reader: "npm:^2.2.0"- checksum: 10/5f55418bfd660e8781a777bf48c7eeda2d0a38fa11b2f4670555123380f522eed5bb884df297fb420904663bd2057834227c0eea68d6f852432ac3bc77842c09- languageName: node- linkType: hard-"express-rate-limit@npm:^7.5.0":version: 7.5.0resolution: "express-rate-limit@npm:7.5.0"@@ -16180,15 +16162,6 @@ __metadata:languageName: nodelinkType: hard-"properties-reader@npm:^2.2.0":- version: 2.3.0- resolution: "properties-reader@npm:2.3.0"- dependencies:- mkdirp: "npm:^1.0.4"- checksum: 10/0b41eb4136dc278ae0d97968ccce8de2d48d321655b319192e31f2424f1c6e052182204671e65aa8967216360cb3e7cbd9129830062e058fe9d6a1d74964c29a- languageName: node- linkType: hard-"property-information@npm:^7.0.0":version: 7.0.0resolution: "property-information@npm:7.0.0"