Merge pull request #2915 from bluewave-labs/develop

develop->master

client/package-lock.json

@@ -21,7 +21,7 @@
 				"dayjs": "1.11.13",
 				"flag-icons": "7.3.2",
 				"html2canvas": "^1.4.1",
-				"i18next": "^24.2.2",
+				"i18next": "25.4.2",
 				"joi": "17.13.3",
 				"mui-color-input": "^6.0.0",
 				"react": "18.3.1",
@@ -46,9 +46,6 @@
 				"eslint-plugin-react-refresh": "^0.4.6",
 				"prettier": "^3.3.3",
 				"vite": "6.3.5"
-			},
-			"optionalDependencies": {
-				"@rollup/rollup-linux-arm64-musl": "4.41.0"
 			}
 		},
 		"node_modules/@ampproject/remapping": {
@@ -283,9 +280,9 @@
 			}
 		},
 		"node_modules/@babel/runtime": {
-			"version": "7.27.1",
-			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.1.tgz",
-			"integrity": "sha512-1x3D2xEk2fRo3PAhwQwu5UubzgiVWSXTBfWpVd2Mx2AzRqJuDJCsgaDVZ7HB5iGzDW1Hl1sWN2mFyKjmR9uAog==",
+			"version": "7.28.3",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.3.tgz",
+			"integrity": "sha512-9uIQ10o0WGdpP6GDhXcdOJPJuDgFtIDtN/9+ArJQ2NAfAmiuhTQdzkaTGR33v43GYS2UrSA0eX2pPPHoFVvpxA==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=6.9.0"
@@ -4072,9 +4069,9 @@
 			}
 		},
 		"node_modules/i18next": {
-			"version": "24.2.3",
-			"resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.3.tgz",
-			"integrity": "sha512-lfbf80OzkocvX7nmZtu7nSTNbrTYR52sLWxPtlXX1zAhVw8WEnFk4puUkCR4B1dNQwbSpEHHHemcZu//7EcB7A==",
+			"version": "25.4.2",
+			"resolved": "https://registry.npmjs.org/i18next/-/i18next-25.4.2.tgz",
+			"integrity": "sha512-gD4T25a6ovNXsfXY1TwHXXXLnD/K2t99jyYMCSimSCBnBRJVQr5j+VAaU83RJCPzrTGhVQ6dqIga66xO2rtd5g==",
 			"funding": [
 				{
 					"type": "individual",
@@ -4091,7 +4088,7 @@
 			],
 			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.26.10"
+				"@babel/runtime": "^7.27.6"
 			},
 			"peerDependencies": {
 				"typescript": "^5"

client/package.json

@@ -26,7 +26,7 @@
 		"dayjs": "1.11.13",
 		"flag-icons": "7.3.2",
 		"html2canvas": "^1.4.1",
-		"i18next": "^24.2.2",
+		"i18next": "25.4.2",
 		"joi": "17.13.3",
 		"mui-color-input": "^6.0.0",
 		"react": "18.3.1",
@@ -59,8 +59,5 @@
 		"eslint-plugin-react-refresh": "^0.4.6",
 		"prettier": "^3.3.3",
 		"vite": "6.3.5"
-	},
-	"optionalDependencies": {
-		"@rollup/rollup-linux-arm64-musl": "4.41.0"
 	}
 }

client/vite.config.js

@@ -5,7 +5,7 @@ import { execSync } from "child_process";
 
 export default defineConfig(({ mode }) => {
 	const env = loadEnv(mode, process.cwd(), "");
-	let version = "3.1.4";
+	let version = "3.1.5";
 
 	return {
 		base: "/",

docker/coolify/client.Dockerfile

@@ -1,18 +1,9 @@
-FROM node:20-alpine AS build
+FROM node:20-slim AS build
 
 ENV NODE_OPTIONS="--max-old-space-size=4096"
 
 WORKDIR /app
 
-RUN apk add --no-cache \
-    python3 \
-    make g++  \
-    gcc \
-    libc-dev \
-    linux-headers \
-    libusb-dev \
-    eudev-dev
-
 COPY ./client/package*.json ./
 
 RUN npm install

docker/coolify/server.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:20-slim
 
 WORKDIR /app
 

docker/dev/client.Dockerfile

@@ -1,19 +1,9 @@
-FROM node:20-alpine AS build
+FROM node:20-slim AS build
 
 ENV NODE_OPTIONS="--max-old-space-size=4096"
 
 WORKDIR /app
 
-RUN apk add --no-cache \
-    python3 \
-    make g++  \
-    gcc \
-    libc-dev \
-    linux-headers \
-    libusb-dev \
-    eudev-dev
-
-
 COPY ./client/package*.json ./
 
 RUN npm install

docker/dev/server.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:20-slim
 
 WORKDIR /app
 

docker/dist-arm/server.Dockerfile

@@ -1,25 +1,37 @@
-FROM node:20-alpine AS frontend-build
+# ---------------------
+# Frontend build stage
+# ---------------------
+FROM --platform=$BUILDPLATFORM node:24-slim AS frontend-build
 
 WORKDIR /app/client
 
 COPY client/package*.json ./
+
 RUN npm ci
 
 COPY client ./
+
+RUN npm rebuild esbuild
+
 RUN npm run build
 
-FROM node:20-alpine AS backend
+# ---------------------
+# Backend stage
+# ---------------------
+FROM --platform=$BUILDPLATFORM node:24-slim AS backend
 
 WORKDIR /app/server
 
+COPY server/package*.json ./
+
+RUN npm ci
+
 COPY server ./
 
 COPY --from=frontend-build /app/client/dist ./public
 
-RUN npm ci
-
 RUN chmod +x ./scripts/inject-vars.sh
 
 EXPOSE 52345
 
-CMD ./scripts/inject-vars.sh && node ./src/index.js
+CMD ["sh", "-c", "./scripts/inject-vars.sh && node ./src/index.js"]

docker/dist-mono/server.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20-alpine AS frontend-build
+FROM node:20-slim AS frontend-build
 
 WORKDIR /app/client
 
@@ -8,7 +8,7 @@ RUN npm install
 COPY client ./
 RUN npm run build
 
-FROM node:20-alpine AS app
+FROM node:20-slim AS app
 
 WORKDIR /app/server
 

docker/dist/client.Dockerfile

@@ -1,18 +1,9 @@
-FROM node:20-alpine AS build
+FROM node:20-slim AS build
 
 ENV NODE_OPTIONS="--max-old-space-size=4096"
 
 WORKDIR /app
 
-RUN apk add --no-cache \
-    python3 \
-    make g++  \
-    gcc \
-    libc-dev \
-    linux-headers \
-    libusb-dev \
-    eudev-dev
-
 COPY ./client/package*.json ./
 
 RUN npm install

docker/dist/server.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:20-slim
 
 WORKDIR /app
 

docker/prod/client.Dockerfile

@@ -1,18 +1,9 @@
-FROM node:20-alpine AS build
+FROM node:20-slim AS build
 
 ENV NODE_OPTIONS="--max-old-space-size=4096"
 
 WORKDIR /app
 
-RUN apk add --no-cache \
-    python3 \
-    make g++  \
-    gcc \
-    libc-dev \
-    linux-headers \
-    libusb-dev \
-    eudev-dev
-
 COPY ./client/package*.json ./
 
 RUN npm install

docker/prod/server.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:20-slim
 
 ENV NODE_OPTIONS="--max-old-space-size=2048"
 

docker/staging/client.Dockerfile

@@ -1,19 +1,9 @@
-FROM node:20-alpine AS build
+FROM node:20-slim AS build
 
 ENV NODE_OPTIONS="--max-old-space-size=4096"
 
 WORKDIR /app
 
-RUN apk add --no-cache \
-    python3 \
-    make g++  \
-    gcc \
-    libc-dev \
-    linux-headers \
-    libusb-dev \
-    eudev-dev
-
-
 COPY ./client/package*.json ./
 
 RUN npm install

docker/staging/server.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:20-slim
 
 ENV NODE_OPTIONS="--max-old-space-size=2048"
 

server/src/controllers/authController.js

@@ -94,7 +94,7 @@ class AuthController extends BaseController {
 			await registrationBodyValidation.validateAsync(req.body);
 			const { user, token } = await this.userService.registerUser(req.body, req.file);
 			res.success({
-				msg: this.stringService.get("authCreateUser"),
+				msg: this.stringService.authCreateUser,
 				data: { user, token },
 			});
 		},

server/src/controllers/statusPageController.js

@@ -26,7 +26,7 @@ class StatusPageController extends BaseController {
 				teamId,
 			});
 			return res.success({
-				msg: this.stringService.get("statusPageCreate"),
+				msg: this.stringService.statusPageCreate,
 				data: statusPage,
 			});
 		},
@@ -41,10 +41,10 @@ class StatusPageController extends BaseController {
 
 			const statusPage = await this.db.statusPageModule.updateStatusPage(req.body, req.file);
 			if (statusPage === null) {
-				throw this.errorService.createNotFoundError(this.stringService.get("statusPageNotFound"));
+				throw this.errorService.createNotFoundError(this.stringService.statusPageNotFound);
 			}
 			return res.success({
-				msg: this.stringService.get("statusPageUpdate"),
+				msg: this.stringService.statusPageUpdate,
 				data: statusPage,
 			});
 		},
@@ -56,7 +56,7 @@ class StatusPageController extends BaseController {
 		async (req, res) => {
 			const statusPage = await this.db.statusPageModule.getStatusPage();
 			return res.success({
-				msg: this.stringService.get("statusPageByUrl"),
+				msg: this.stringService.statusPageByUrl,
 				data: statusPage,
 			});
 		},
@@ -71,7 +71,7 @@ class StatusPageController extends BaseController {
 
 			const statusPage = await this.db.statusPageModule.getStatusPageByUrl(req.params.url);
 			return res.success({
-				msg: this.stringService.get("statusPageByUrl"),
+				msg: this.stringService.statusPageByUrl,
 				data: statusPage,
 			});
 		},
@@ -85,7 +85,7 @@ class StatusPageController extends BaseController {
 			const statusPages = await this.db.statusPageModule.getStatusPagesByTeamId(teamId);
 
 			return res.success({
-				msg: this.stringService.get("statusPageByTeamId"),
+				msg: this.stringService.statusPageByTeamId,
 				data: statusPages,
 			});
 		},
@@ -97,7 +97,7 @@ class StatusPageController extends BaseController {
 		async (req, res) => {
 			await this.db.statusPageModule.deleteStatusPage(req.params.url);
 			return res.success({
-				msg: this.stringService.get("statusPageDelete"),
+				msg: this.stringService.statusPageDelete,
 			});
 		},
 		SERVICE_NAME,

server/src/service/system/stringService.js

@@ -25,24 +25,423 @@ class StringService {
 		return this._language;
 	}
 
-	/**
-	 * Get translation by key with optional parameters
-	 * @param {string} key - Translation key
-	 * @param {Object} params - Optional parameters to replace in the translation
-	 * @returns {string} Translated string with replaced parameters
-	 */
-	get(key, params = {}) {
-		let translation = this.translationService.getTranslation(key);
-		
-		// Replace parameters in the translation
-		Object.keys(params).forEach(paramKey => {
-			const paramValue = params[paramKey];
-			// Support both {param} and ${param} syntax
-			translation = translation.replace(new RegExp(`\\{${paramKey}\\}`, 'g'), paramValue);
-			translation = translation.replace(new RegExp(`\\$\\{${paramKey}\\}`, 'g'), paramValue);
-		});
-		
-		return translation;
+	// Auth Messages
+	get dontHaveAccount() {
+		return this.translationService.getTranslation("dontHaveAccount");
+	}
+
+	get email() {
+		return this.translationService.getTranslation("email");
+	}
+
+	get forgotPassword() {
+		return this.translationService.getTranslation("forgotPassword");
+	}
+
+	get password() {
+		return this.translationService.getTranslation("password");
+	}
+
+	get signUp() {
+		return this.translationService.getTranslation("signUp");
+	}
+
+	get submit() {
+		return this.translationService.getTranslation("submit");
+	}
+
+	get title() {
+		return this.translationService.getTranslation("title");
+	}
+
+	get continue() {
+		return this.translationService.getTranslation("continue");
+	}
+
+	get enterEmail() {
+		return this.translationService.getTranslation("enterEmail");
+	}
+
+	get authLoginTitle() {
+		return this.translationService.getTranslation("authLoginTitle");
+	}
+
+	get authLoginEnterPassword() {
+		return this.translationService.getTranslation("authLoginEnterPassword");
+	}
+
+	get commonPassword() {
+		return this.translationService.getTranslation("commonPassword");
+	}
+
+	get commonBack() {
+		return this.translationService.getTranslation("commonBack");
+	}
+
+	get authForgotPasswordTitle() {
+		return this.translationService.getTranslation("authForgotPasswordTitle");
+	}
+
+	get authForgotPasswordResetPassword() {
+		return this.translationService.getTranslation("authForgotPasswordResetPassword");
+	}
+
+	get createPassword() {
+		return this.translationService.getTranslation("createPassword");
+	}
+
+	get createAPassword() {
+		return this.translationService.getTranslation("createAPassword");
+	}
+
+	get authRegisterAlreadyHaveAccount() {
+		return this.translationService.getTranslation("authRegisterAlreadyHaveAccount");
+	}
+
+	get commonAppName() {
+		return this.translationService.getTranslation("commonAppName");
+	}
+
+	get authLoginEnterEmail() {
+		return this.translationService.getTranslation("authLoginEnterEmail");
+	}
+
+	get authRegisterTitle() {
+		return this.translationService.getTranslation("authRegisterTitle");
+	}
+
+	get monitorGetAll() {
+		return this.translationService.getTranslation("monitorGetAll");
+	}
+
+	get monitorGetById() {
+		return this.translationService.getTranslation("monitorGetById");
+	}
+
+	get monitorGetByIdSuccess() {
+		return this.translationService.getTranslation("monitorGetByIdSuccess");
+	}
+
+	get monitorCreate() {
+		return this.translationService.getTranslation("monitorCreate");
+	}
+
+	get bulkMonitorsCreate() {
+		return this.translationService.getTranslation("bulkMonitorsCreate");
+	}
+
+	get monitorEdit() {
+		return this.translationService.getTranslation("monitorEdit");
+	}
+
+	get monitorDelete() {
+		return this.translationService.getTranslation("monitorDelete");
+	}
+
+	get monitorPause() {
+		return this.translationService.getTranslation("monitorPause");
+	}
+
+	get monitorResume() {
+		return this.translationService.getTranslation("monitorResume");
+	}
+
+	get monitorDemoAdded() {
+		return this.translationService.getTranslation("monitorDemoAdded");
+	}
+
+	get monitorStatsById() {
+		return this.translationService.getTranslation("monitorStatsById");
+	}
+
+	get monitorCertificate() {
+		return this.translationService.getTranslation("monitorCertificate");
+	}
+
+	// Maintenance Window Messages
+	get maintenanceWindowCreate() {
+		return this.translationService.getTranslation("maintenanceWindowCreate");
+	}
+
+	get maintenanceWindowGetById() {
+		return this.translationService.getTranslation("maintenanceWindowGetById");
+	}
+
+	get maintenanceWindowGetByTeam() {
+		return this.translationService.getTranslation("maintenanceWindowGetByTeam");
+	}
+
+	get maintenanceWindowDelete() {
+		return this.translationService.getTranslation("maintenanceWindowDelete");
+	}
+
+	get maintenanceWindowEdit() {
+		return this.translationService.getTranslation("maintenanceWindowEdit");
+	}
+
+	// Webhook Messages
+	get webhookUnsupportedPlatform() {
+		return this.translationService.getTranslation("webhookUnsupportedPlatform");
+	}
+
+	get webhookSendError() {
+		return this.translationService.getTranslation("webhookSendError");
+	}
+
+	get webhookSendSuccess() {
+		return this.translationService.getTranslation("webhookSendSuccess");
+	}
+
+	get telegramRequiresBotTokenAndChatId() {
+		return this.translationService.getTranslation("telegramRequiresBotTokenAndChatId");
+	}
+
+	get webhookUrlRequired() {
+		return this.translationService.getTranslation("webhookUrlRequired");
+	}
+
+	get platformRequired() {
+		return this.translationService.getTranslation("platformRequired");
+	}
+
+	get testNotificationFailed() {
+		return this.translationService.getTranslation("testNotificationFailed");
+	}
+
+	get monitorUpAlert() {
+		return this.translationService.getTranslation("monitorUpAlert");
+	}
+
+	get monitorDownAlert() {
+		return this.translationService.getTranslation("monitorDownAlert");
+	}
+
+	getWebhookUnsupportedPlatform(platform) {
+		return this.translationService.getTranslation("webhookUnsupportedPlatform").replace("{platform}", platform);
+	}
+
+	getWebhookSendError(platform) {
+		return this.translationService.getTranslation("webhookSendError").replace("{platform}", platform);
+	}
+
+	getMonitorStatus(name, status, url) {
+		const translationKey = status === true ? "monitorStatusUp" : "monitorStatusDown";
+		return this.translationService.getTranslation(translationKey).replace("{name}", name).replace("{url}", url);
+	}
+
+	// Error Messages
+	get unknownError() {
+		return this.translationService.getTranslation("unknownError");
+	}
+
+	get friendlyError() {
+		return this.translationService.getTranslation("friendlyError");
+	}
+
+	get authIncorrectPassword() {
+		return this.translationService.getTranslation("authIncorrectPassword");
+	}
+
+	get unauthorized() {
+		return this.translationService.getTranslation("unauthorized");
+	}
+
+	get authAdminExists() {
+		return this.translationService.getTranslation("authAdminExists");
+	}
+
+	get authInviteNotFound() {
+		return this.translationService.getTranslation("authInviteNotFound");
+	}
+
+	get unknownService() {
+		return this.translationService.getTranslation("unknownService");
+	}
+
+	get noAuthToken() {
+		return this.translationService.getTranslation("noAuthToken");
+	}
+
+	get invalidAuthToken() {
+		return this.translationService.getTranslation("invalidAuthToken");
+	}
+
+	get expiredAuthToken() {
+		return this.translationService.getTranslation("expiredAuthToken");
+	}
+
+	// Queue Messages
+	get queueGetMetrics() {
+		return this.translationService.getTranslation("queueGetMetrics");
+	}
+
+	get queueGetJobs() {
+		return this.translationService.getTranslation("queueGetJobs");
+	}
+
+	get queueAddJob() {
+		return this.translationService.getTranslation("queueAddJob");
+	}
+
+	get queueObliterate() {
+		return this.translationService.getTranslation("queueObliterate");
+	}
+
+	// Job Queue Messages
+	get jobQueueDeleteJobSuccess() {
+		return this.translationService.getTranslation("jobQueueDeleteJobSuccess");
+	}
+
+	get jobQueuePauseJob() {
+		return this.translationService.getTranslation("jobQueuePauseJob");
+	}
+
+	get jobQueueResumeJob() {
+		return this.translationService.getTranslation("jobQueueResumeJob");
+	}
+
+	// Status Page Messages
+	get statusPageByUrl() {
+		return this.translationService.getTranslation("statusPageByUrl");
+	}
+
+	get statusPageCreate() {
+		return this.translationService.getTranslation("statusPageCreate");
+	}
+
+	get statusPageDelete() {
+		return this.translationService.getTranslation("statusPageDelete");
+	}
+
+	get statusPageUpdate() {
+		return this.translationService.getTranslation("statusPageUpdate");
+	}
+
+	get statusPageNotFound() {
+		return this.translationService.getTranslation("statusPageNotFound");
+	}
+
+	get statusPageByTeamId() {
+		return this.translationService.getTranslation("statusPageByTeamId");
+	}
+
+	get statusPageUrlNotUnique() {
+		return this.translationService.getTranslation("statusPageUrlNotUnique");
+	}
+
+	// Docker Messages
+	get dockerFail() {
+		return this.translationService.getTranslation("dockerFail");
+	}
+
+	get dockerNotFound() {
+		return this.translationService.getTranslation("dockerNotFound");
+	}
+
+	get dockerSuccess() {
+		return this.translationService.getTranslation("dockerSuccess");
+	}
+
+	// Port Messages
+	get portFail() {
+		return this.translationService.getTranslation("portFail");
+	}
+
+	get portSuccess() {
+		return this.translationService.getTranslation("portSuccess");
+	}
+
+	// Alert Messages
+	get alertCreate() {
+		return this.translationService.getTranslation("alertCreate");
+	}
+
+	get alertGetByUser() {
+		return this.translationService.getTranslation("alertGetByUser");
+	}
+
+	get alertGetByMonitor() {
+		return this.translationService.getTranslation("alertGetByMonitor");
+	}
+
+	get alertGetById() {
+		return this.translationService.getTranslation("alertGetById");
+	}
+
+	get alertEdit() {
+		return this.translationService.getTranslation("alertEdit");
+	}
+
+	get alertDelete() {
+		return this.translationService.getTranslation("alertDelete");
+	}
+
+	getDeletedCount(count) {
+		return this.translationService.getTranslation("deletedCount").replace("{count}", count);
+	}
+
+	get pingSuccess() {
+		return this.translationService.getTranslation("pingSuccess");
+	}
+
+	get getAppSettings() {
+		return this.translationService.getTranslation("getAppSettings");
+	}
+
+	get httpNetworkError() {
+		return this.translationService.getTranslation("httpNetworkError");
+	}
+
+	get httpNotJson() {
+		return this.translationService.getTranslation("httpNotJson");
+	}
+
+	get httpJsonPathError() {
+		return this.translationService.getTranslation("httpJsonPathError");
+	}
+
+	get httpEmptyResult() {
+		return this.translationService.getTranslation("httpEmptyResult");
+	}
+
+	get httpMatchSuccess() {
+		return this.translationService.getTranslation("httpMatchSuccess");
+	}
+
+	get httpMatchFail() {
+		return this.translationService.getTranslation("httpMatchFail");
+	}
+
+	get updateAppSettings() {
+		return this.translationService.getTranslation("updateAppSettings");
+	}
+
+	get insufficientPermissions() {
+		return this.translationService.getTranslation("insufficientPermissions");
+	}
+
+	getDbFindMonitorById(monitorId) {
+		return this.translationService.getTranslation("dbFindMonitorById").replace("${monitorId}", monitorId);
+	}
+
+	get dbUserExists() {
+		return this.translationService.getTranslation("dbUserExists");
+	}
+
+	get testEmailSubject() {
+		return this.translationService.getTranslation("testEmailSubject");
+	}
+
+	get verifyOwnerNotFound() {
+		return this.translationService.getTranslation("verifyOwnerNotFound");
+	}
+
+	get verifyOwnerUnauthorized() {
+		return this.translationService.getTranslation("verifyOwnerUnauthorized");
+	}
+
+	get dbUserNotFound() {
+		return this.translationService.getTranslation("dbUserNotFound");
 	}
 }