From 7779ce96e5a8fcfdf489eaa7f9383b1edee7166f Mon Sep 17 00:00:00 2001
From: Sergey Yarkov <serzh.yarkov@gmail.com>
Date: Tue, 14 Nov 2023 16:24:42 +0300
Subject: [PATCH] progress

---
 controllers/app.controller.js | 253 +++++++++++++++++-----------------
 data.db                       | Bin 20480 -> 20480 bytes
 public/index.html             |   6 +-
 3 files changed, 129 insertions(+), 130 deletions(-)

diff --git a/controllers/app.controller.js b/controllers/app.controller.js
index 6035e37..a966f4b 100644
--- a/controllers/app.controller.js
+++ b/controllers/app.controller.js
@@ -4,134 +4,133 @@ import cp from 'child_process'
 /**
  * Services
  */
- import { appService } from "#root/services/index.js";
+import { appService } from "#root/services/index.js";
 
 export const appController = {
-    /**
-     * Get application config from database
-     * @param {import('express').Request} req 
-     * @param {import('express').Response} res 
-     * @param {import('express').NextFunction} next 
-     */
-    async getConfig(req, res, next) {
-        try {
-            const data = await appService.getConfig();
-            if (!data) return res.status(200).json({ config: null });
-            return res.status(200).json({ config: data });
-        } catch (error) {
-            next(error);
-        }
-    },
-
-    /**
-     * Update application config
-     * @param {import('express').Request} req 
-     * @param {import('express').Response} res 
-     * @param {import('express').NextFunction} next 
-     */
-    async updateConfig(req, res, next) {
-        try {
-            const config = await appService.getConfig();
-            const payload = req.body;
-        
-            if (!config) await db.run(`INSERT INTO "app_config" (id) VALUES (?)`, [0]);
-        
-            /* Update TCP configuration */
-            if (payload.mb_connection_type === "TCP") {
-            const { mb_tcp_ip, mb_tcp_port } = payload;
-            await db.run(
-                `
-                UPDATE "app_config" SET id = 0, mb_connection_type = "TCP", mb_tcp_ip = ?, mb_tcp_port = ?, log_interval_ms = ?
-                `,
-                [mb_tcp_ip, mb_tcp_port, payload.log_interval_ms],
-            );
-        
-            return res.status(200).json({ message: "Config Updated." });
-            }
-        
-            /* Update RTU configuration */
-            if (payload.mb_connection_type === "RTU") {
-            const { mb_rtu_path, mb_rtu_baud, mb_rtu_parity, mb_rtu_data_bits, mb_rtu_stop_bits } = payload;
-            await db.run(
-                `
-                UPDATE "app_config" SET id = 0, 
-                                        mb_connection_type = "RTU", 
-                                        mb_rtu_path = ?, 
-                                        mb_rtu_baud = ?, 
-                                        mb_rtu_parity = ?, 
-                                        mb_rtu_data_bits = ?, 
-                                        mb_rtu_stop_bits = ?,
-                                        log_interval_ms = ?
-                `,
-                [mb_rtu_path, mb_rtu_baud, mb_rtu_parity, mb_rtu_data_bits, mb_rtu_stop_bits, payload.log_interval_ms],
-            );
-            return res.status(200).json({ message: "Config updated." });
-            }
-        
-            return res.status(400).json({ message: "Undefined Modbus connection type." });
-        } catch (error) {
-            next(error);
-        }
-    },
-
-    /**
-     * Check whether the application is configured or not
-     * @param {import('express').Request} req 
-     * @param {import('express').Response} res 
-     * @param {import('express').NextFunction} next 
-     */
-    async isConfigured(req, res, next) {
-        try {
-            const config = await appService.getConfig();
-            if (!config) return res.status(200).json({ is_configured: false });
-
-            for (const colPrefix of ['mb_tcp', 'mb_rtu']) {
-                if (config.mb_connection_type.toLocaleLowerCase() !== colPrefix.substring(3))
-                    continue;
-                const keys = Object.keys(config).filter((k) => k.includes(colPrefix));
-                for (const k of keys) {
-                    if (!config[k])
-                        return res.status(200).json({ is_configured: false });
-                }
-            }
-        
-            return res.status(200).json({ is_configured: true });
-        } catch (error) {
-            next(error);
-        }
-    },
-
-    /**
-     * Application memory usage
-     * @param {import('express').Request} req 
-     * @param {import('express').Response} res 
-     * @param {import('express').NextFunction} next 
-     */
-    memoryUsage(req, res, next) {
-    	const memoryUsage = process.memoryUsage();
-			const bytesToMB = (bytes) => bytes / 10**6;
-			Object.keys(memoryUsage).forEach(k => (memoryUsage[k] = `${bytesToMB(memoryUsage[k])}MB`));
-    	return res.status(200).json({ data: memoryUsage });
-    },
-		
-		/**
-     * Ping
-     * @param {import('express').Request} req 
-     * @param {import('express').Response} res 
-     * @param {import('express').NextFunction} next 
-     */
-		ping(req, res, next) {
-			return res.status(200).send('pong');
-		},
-
-		/**
-     * Send info about latest commit hash
-     * @param {import('express').Request} req 
-     * @param {import('express').Response} res 
-     * @param {import('express').NextFunction} next 
-     */
-		commitHash(req, res, next) {
-			const hash = cp.execSync('git rev-parse HEAD').toString().trim();
-  		return res.status(200).json({ hash })
+	/**
+	 * Get application config from database
+	 * @param {import('express').Request} req 
+	 * @param {import('express').Response} res 
+	 * @param {import('express').NextFunction} next 
+	 */
+	async getConfig(req, res, next) {
+		try {
+			const data = await appService.getConfig();
+			if (!data) return res.status(200).json({ config: null });
+			return res.status(200).json({ config: data });
+		} catch (error) {
+			next(error);
 		}
+	},
+
+	/**
+	 * Update application config
+	 * @param {import('express').Request} req 
+	 * @param {import('express').Response} res 
+	 * @param {import('express').NextFunction} next 
+	 */
+	async updateConfig(req, res, next) {
+		try {
+			const config = await appService.getConfig();
+			const payload = req.body;
+	
+			if (!config) await db.run(`INSERT INTO "app_config" (id) VALUES (?)`, [0]);
+		
+			/* Update TCP configuration */
+			if (payload.mb_connection_type === "TCP") {
+				const { mb_tcp_ip, mb_tcp_port } = payload;
+				await db.run(
+						`
+						UPDATE "app_config" SET id = 0, mb_connection_type = "TCP", mb_tcp_ip = ?, mb_tcp_port = ?, log_interval_ms = ?
+						`,
+						[mb_tcp_ip, mb_tcp_port, payload.log_interval_ms],
+				);
+				return res.status(200).json({ message: "Config Updated." });
+			}
+		
+			/* Update RTU configuration */
+			if (payload.mb_connection_type === "RTU") {
+				const { mb_rtu_path, mb_rtu_baud, mb_rtu_parity, mb_rtu_data_bits, mb_rtu_stop_bits } = payload;
+				await db.run(
+						`
+						UPDATE "app_config" SET id = 0, 
+																		mb_connection_type = "RTU", 
+																		mb_rtu_path = ?, 
+																		mb_rtu_baud = ?, 
+																		mb_rtu_parity = ?, 
+																		mb_rtu_data_bits = ?, 
+																		mb_rtu_stop_bits = ?,
+																		log_interval_ms = ?
+						`,
+						[mb_rtu_path, mb_rtu_baud, mb_rtu_parity, mb_rtu_data_bits, mb_rtu_stop_bits, payload.log_interval_ms],
+				);
+				return res.status(200).json({ message: "Config updated." });
+			}
+		
+			return res.status(400).json({ message: "Undefined Modbus connection type." });
+		} catch (error) {
+			next(error);
+		}
+	},
+
+	/**
+	 * Check whether the application is configured or not
+	 * @param {import('express').Request} req 
+	 * @param {import('express').Response} res 
+	 * @param {import('express').NextFunction} next 
+	 */
+	async isConfigured(req, res, next) {
+		try {
+			const config = await appService.getConfig();
+			if (!config) return res.status(200).json({ is_configured: false });
+
+			for (const colPrefix of ['mb_tcp', 'mb_rtu']) {
+				if (config.mb_connection_type.toLocaleLowerCase() !== colPrefix.substring(3))
+					continue;
+				const keys = Object.keys(config).filter((k) => k.includes(colPrefix));
+				for (const k of keys) {
+					if (!config[k])
+						return res.status(200).json({ is_configured: false });
+				}
+			}
+		
+			return res.status(200).json({ is_configured: true });
+		} catch (error) {
+			next(error);
+		}
+	},
+
+	/**
+	 * Application memory usage
+	 * @param {import('express').Request} req 
+	 * @param {import('express').Response} res 
+	 * @param {import('express').NextFunction} next 
+	 */
+	memoryUsage(req, res, next) {
+		const memoryUsage = process.memoryUsage();
+		const bytesToMB = (bytes) => bytes / 10**6;
+		Object.keys(memoryUsage).forEach(k => (memoryUsage[k] = `${bytesToMB(memoryUsage[k])}MB`));
+		return res.status(200).json({ data: memoryUsage });
+	},
+			
+	/**
+	 * Ping
+	 * @param {import('express').Request} req 
+	 * @param {import('express').Response} res 
+	 * @param {import('express').NextFunction} next 
+	 */
+	ping(req, res, next) {
+		return res.status(200).send('pong');
+	},
+
+	/**
+	 * Send info about latest commit hash
+	 * @param {import('express').Request} req 
+	 * @param {import('express').Response} res 
+	 * @param {import('express').NextFunction} next 
+	 */
+	commitHash(req, res, next) {
+		const hash = cp.execSync('git rev-parse HEAD').toString().trim();
+		return res.status(200).json({ hash })
+	}
 }
\ No newline at end of file
diff --git a/data.db b/data.db
index 1b85cb7b614eca155a8ae5c5dfe7c6d9d2d63467..b3f199e2839a0feea5af4001b54e30e999a35a00 100644
GIT binary patch
delta 65
zcmZozz}T>Wae_4Cu8A_vjJq}_9Mxyu$+u#&ph7dByb?bnhoEQ(i)T=%ry&Cn2!aI)
NAOdEaPuZCX0swWL5as{?

delta 50
zcmZozz}T>Wae_4CiitALj4L)K9Mxysx>-<R5}%N$C?lhwXs}DLi!ZB3kXwMU(dJWj
GW`Y2jGY;wi

diff --git a/public/index.html b/public/index.html
index 82145bc..b650810 100644
--- a/public/index.html
+++ b/public/index.html
@@ -70,7 +70,7 @@
                           class="flex flex-col space-y-2"
                         >
                           <div>
-                            <label :for="$id('id')"><span class="text-red-500">*</span>Slave ID:</label>
+                            <label :for="$id('id')"><span class="text-red-500">*</span>ID устройства:</label>
                             <input
                               x-model.number="data.id"
                               :id="$id('id')"
@@ -305,8 +305,8 @@
                               <!-- Remove display value -->
                               <button
                                 @click="$dispatch('dialog', { 
-                                  title: 'Remove display value', 
-                                  body: `Remove display value ${value.name}?`,
+                                  title: 'Удалить отображаемое значение', 
+                                  body: `Удалить ${value.name}?`,
                                   isOpen: true,
                                   onConfirm: async () => await removeDisplayValue(value.id)
                                 });"