bubble/modbus-logger
1
0
Fork 0
mirror of https://github.com/sergeyyarkov/modbus-logger.git synced 2026-10-11 02:18:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

progress

Browse Source
This commit is contained in:
Sergey Yarkov 2023-10-30 21:22:54 +03:00
parent 90271dc45f
commit 6b9b15970d
No known key found for this signature in database
GPG Key ID: E91CE1FABC619B6F
3 changed files with 132 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
controllers/modbus.controller.js
View File

@ -3,12 +3,12 @@ import modbusClient from "#root/config/modbus-client.config.js";
import { appService } from "#root/services/index.js";
export const modbusController = {
/**
* Connect to modbus network using configuration from database
* @param {import('express').Request} req
* @param {import('express').Response} res
* @param {import('express').NextFunction} next
*/
/**
* Connect to modbus network using configuration from database
* @param {import('express').Request} req
* @param {import('express').Response} res
* @param {import('express').NextFunction} next
*/
async connect(req, res, next) {
try {
const config = await appService.getConfig(db);
@ -51,7 +51,7 @@ export const modbusController = {
if (!modbusClient.isOpen) return res.status(400).json({ message: "Already closed." });
modbusClient.close(undefined);
modbusClient.destroy(undefined);
return res.status(200).json({ message: 'Closed.' });
return res.status(200).json({ message: "Closed." });
} catch (error) {
next(error);
}
@ -81,10 +81,10 @@ export const modbusController = {
LEFT JOIN display_values AS dv ON dv.slave_id = ms.id
GROUP BY ms.id, ms.name;
`);
slaves.forEach(s => (s.display_values = JSON.parse(s.display_values)))
slaves.forEach((s) => (s.display_values = JSON.parse(s.display_values)));
return res.status(200).json(slaves);
} catch (error) {
next(error)
next(error);
}
},
@ -97,7 +97,8 @@ export const modbusController = {
async createDevice(req, res, next) {
try {
const { id, name, g_display_reg_addr, g_display_reg_format, g_y_label, is_logging } = req.body;
await db.run(`INSERT INTO "modbus_slaves" (
await db.run(
`INSERT INTO "modbus_slaves" (
"id",
"name",
"g_display_reg_addr",
@ -105,10 +106,11 @@ export const modbusController = {
"g_y_label",
"is_logging")
VALUES (?, ?, ?, ?, ?, ?)`,
[id, name, g_display_reg_addr, g_display_reg_format, g_y_label, is_logging]);
return res.status(200).json({ message: 'Device created.' });
[id, name, g_display_reg_addr, g_display_reg_format, g_y_label, is_logging],
);
return res.status(200).json({ message: "Device created." });
} catch (error) {
next(error)
next(error);
}
},
@ -120,7 +122,6 @@ export const modbusController = {
*/
async updateDevice(req, res, next) {
try {
} catch (error) {
next(error);
}
@ -135,9 +136,9 @@ export const modbusController = {
async removeDevice(req, res, next) {
try {
const device = await db.get(`SELECT id FROM "modbus_slaves" WHERE id = ?`, [req.body.id]);
if (!device) return res.status(404).json({ message: 'Device not found.' });
if (!device) return res.status(404).json({ message: "Device not found." });
await db.run(`DELETE FROM "modbus_slaves" WHERE id = ?`, [req.body.id]);
return res.status(200).json({ message: 'Device removed.' });
return res.status(200).json({ message: "Device removed." });
} catch (error) {
next(error);
}
@ -160,7 +161,7 @@ export const modbusController = {
async removeDisplayValue(req, res, next) {
try {
await db.run(`DELETE FROM "display_values" WHERE id = ?`, req.body.id);
return res.status(200).json({ message: 'Display value removed.' });
return res.status(200).json({ message: "Display value removed." });
} catch (error) {
next(error);
}
@ -188,7 +189,7 @@ export const modbusController = {
let intervalId = setInterval(() => {
res.write(`event: message\ndata: ${JSON.stringify(modbusClient.isOpen)}\n\n`);
}, 500);
req.on('close', () => clearInterval(intervalId));
req.on("close", () => clearInterval(intervalId));
} catch (error) {
next(error);
}
@ -202,21 +203,44 @@ export const modbusController = {
*/
async streamData(req, res, next) {
try {
if (!modbusClient.isOpen) return res.status(503).json({ message: "Modbus connection closed." });
if (!modbusClient.isOpen) return res.status(503).json({ error: { message: "Modbus connection closed." } });
if (!req.query.slave_id) return res.status(400).json({ error: { message: "'slave_id' parameter is required." } });
const device = await db.get(`SELECT * FROM "modbus_slaves" WHERE id = ?`, [req.query.slave_id]);
if (!device) return res.status(404).json({ error: { message: "Device not found." } });
res.setHeader("Cache-Control", "no-cache");
res.setHeader("Content-Type", "text/event-stream");
res.setHeader("Connection", "keep-alive");
let interval = setInterval(async () => {
const { data } = await modbusClient.readHoldingRegisters(0, 1);
res.write("event: messsage\n");
res.write(`data: ${JSON.stringify({ data })}`);
res.write("\n\n");
let value = 0;
let len = 1; // 16 bits default
if (device.g_display_reg_format === 32) len = 2;
// ...64, 128, 256...
const result = await modbusClient.readHoldingRegisters(device.g_display_reg_addr, len);
switch (device.g_display_reg_format) {
case 32:
value = Buffer.from(result.buffer).readUInt32BE();
break;
case 16:
value = Buffer.from(result.buffer).readUint16BE();
break;
default:
break;
}
res.write("event: message\n");
res.write(`data: ${JSON.stringify({ graph: { value, format: device.g_display_reg_format } })}\n\n`);
}, 1000);
req.on("close", () => clearInterval(interval));
} catch (error) {
next(error);
}
}
}
},
};

BIN
data.db
View File

Binary file not shown.

64
public/js/app.js
View File

@ -3,8 +3,10 @@ import "./alpine.js";
import api from "./api.js";
import * as utils from "./utils/index.js";
const pages = ["loading", "monitoring", "configuration", "404"];
let graphData = [[0, 0]];
var pages = ["loading", "monitoring", "configuration", "404"];
var dataStreamSource;
var graphData = [[0, 0]];
var g;
document.addEventListener("alpine:init", async () => {
Alpine.store("app", {
@ -56,38 +58,38 @@ document.addEventListener("alpine:init", async () => {
},
});
Alpine.data('deviceModal', () => ({
Alpine.data("deviceModal", () => ({
isOpen: false,
isLoading: false,
error: null,
data: {
id: null,
name: '',
name: "",
g_display_reg_addr: null,
g_display_reg_format: 16,
g_y_label: '',
is_logging: false
g_y_label: "",
is_logging: false,
},
resetDataFields() {
this.data.id = null;
this.data.name = '';
this.data.name = "";
this.data.g_display_reg_addr = null;
this.data.g_display_reg_format = 16;
this.data.g_y_label = '';
this.data.g_y_label = "";
this.data.is_logging = false;
},
async create(cb) {
try {
this.isLoading = true;
this.error = null;
await api.post('/modbus/create_device', utils.dellNullableKeys({...this.data}));
graphData = [] // todo: update graph data
this.$dispatch('add-device', {...this.data}); // add device to state
await api.post("/modbus/create_device", utils.dellNullableKeys({ ...this.data }));
graphData = []; // todo: update graph data
this.$dispatch("add-device", { ...this.data }); // add device to state
this.resetDataFields();
this.close();
cb && cb();
} catch (error) {
this.error = error
this.error = error;
console.error(error);
} finally {
this.isLoading = false;
@ -99,7 +101,7 @@ document.addEventListener("alpine:init", async () => {
close() {
this.isOpen = false;
},
}))
}));
Alpine.data("monitoringPage", () => ({
selectedDevice: null,
@ -107,18 +109,11 @@ document.addEventListener("alpine:init", async () => {
async init() {
try {
this.$store.app.currentPage = "loading";
var g = new Dygraph(document.getElementById("div_g"), graphData, {
drawPoints: false,
showRoller: false,
ylabel: "Y Label",
valueRange: [0.0, 1.8],
// labels: ["Time", "Random"],
});
this.devices = await api.get("/modbus/devices");
window.intervalId = setInterval(() => {
graphData.push([new Date(), Math.random()]);
g.updateOptions({ file: graphData });
}, 500);
// window.intervalId = setInterval(() => {
// graphData.push([new Date(), Math.random()]);
// g.updateOptions({ file: graphData });
// }, 500);
} catch (error) {
this.$store.app.error = error;
} finally {
@ -126,6 +121,21 @@ document.addEventListener("alpine:init", async () => {
}
},
selectDevice(device) {
dataStreamSource?.close();
dataStreamSource = new EventSource(`/api/modbus/data_stream?slave_id=${device.id}`);
g = new Dygraph(document.getElementById("div_g"), graphData, {
drawPoints: false,
showRoller: false,
ylabel: device.g_y_label,
// valueRange: [0, 1000],
// labels: ["Time", "Random"],
});
dataStreamSource.onmessage = (e) => {
const data = JSON.parse(e.data);
console.log(data);
graphData.push([new Date(), data.graph.value]);
g.updateOptions({ file: graphData });
};
if (device.id === this.selectedDevice?.id) return;
graphData = []; // todo: reset graph
this.selectedDevice = device;
@ -141,12 +151,12 @@ document.addEventListener("alpine:init", async () => {
},
async removeDisplayValue(id) {
try {
await api.post('/modbus/remove_display-value', { id });
this.selectedDevice.display_values = this.selectedDevice.display_values.filter(v => v.id != id);
await api.post("/modbus/remove_display-value", { id });
this.selectedDevice.display_values = this.selectedDevice.display_values.filter((v) => v.id != id);
} catch (error) {
console.error("Error while removing display value", error);
}
}
},
}));
Alpine.data("configAppPage", () => ({