NBizyaev/mqtt-ingest
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

data/edge5/modbus/v1 to demo refactoring

Browse Source
This commit is contained in:
Никита Бизяев
2026-07-01 13:34:28 +05:00
parent ac4e0d68c3
commit 16c1712752
5 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/handlers/edge5-modbus.ts → app/src/handlers/demo-modbus.ts
View File

@@ -1,12 +1,10 @@
import { postCloudIngest } from '../cloud-ingest.js' import { postCloudIngest } from '../cloud-ingest.js'
import type { TopicHandler } from '../types.js' import type { TopicHandler } from '../types.js'
export const TOPIC = 'data/edge5/modbus/v1' const EDGE = 'demo'
const EDGE = 'edge5'
const REGISTER_COUNT = 125 const REGISTER_COUNT = 125
type Edge5ModbusMetric = { type DemoModbusMetric = {
edge: string edge: string
timestamp: string timestamp: string
tag: string tag: string
@@ -25,7 +23,7 @@ function assertRegisterCount(values: number[]): void {
} }
} }
function toMetrics(values: number[], timestamp: string): Edge5ModbusMetric[] { function toMetrics(values: number[], timestamp: string): DemoModbusMetric[] {
return values.map((value, index) => ({ return values.map((value, index) => ({
edge: EDGE, edge: EDGE,
timestamp, timestamp,
@@ -34,7 +32,7 @@ function toMetrics(values: number[], timestamp: string): Edge5ModbusMetric[] {
})) }))
} }
async function postMetrics(metrics: Edge5ModbusMetric[]): Promise<void> { async function postMetrics(metrics: DemoModbusMetric[]): Promise<void> {
for (const metric of metrics) { for (const metric of metrics) {
const response = await postCloudIngest(metric) const response = await postCloudIngest(metric)
@@ -47,7 +45,7 @@ async function postMetrics(metrics: Edge5ModbusMetric[]): Promise<void> {
console.log('edge5.modbus.posted', { count: metrics.length }) console.log('edge5.modbus.posted', { count: metrics.length })
} }
export const handleEdge5Modbus: TopicHandler = async (topic, payload) => { export const handleDemoModbus: TopicHandler = async (topic, payload) => {
console.log('edge5.modbus.received', { topic, bytes: payload.length }) console.log('edge5.modbus.received', { topic, bytes: payload.length })
const values = parseValues(payload) const values = parseValues(payload)

2
app/src/handlers/demo-plc.ts
View File

@@ -2,8 +2,6 @@ import { postCloudIngest } from '../cloud-ingest.js'
import { parseJson } from '../helpers/parse.js' import { parseJson } from '../helpers/parse.js'
import type { TopicHandler } from '../types.js' import type { TopicHandler } from '../types.js'
export const TOPIC = 'data/demo/plc/v1'
const EDGE = 'demo' const EDGE = 'demo'
type DemoPlcPayload = { type DemoPlcPayload = {

3
app/src/handlers/edge5-modbus-v2.ts
View File

@@ -2,9 +2,8 @@ import { postCloudIngest } from '../cloud-ingest.js'
import { createMetricMapper, type MappedMetric } from '../mapping.js' import { createMetricMapper, type MappedMetric } from '../mapping.js'
import type { TopicHandler } from '../types.js' import type { TopicHandler } from '../types.js'
export const TOPIC = 'data/edge5/modbus/v2'
const REGISTER_COUNT = 125 const REGISTER_COUNT = 125
const mapper = createMetricMapper({ const mapper = createMetricMapper({
filePath: process.env.EDGE5_MODBUS_V2_MAPPING_FILE as string, filePath: process.env.EDGE5_MODBUS_V2_MAPPING_FILE as string,
}) })

2
app/src/handlers/edge5-video.ts
View File

@@ -1,8 +1,6 @@
import { onEdgeChunk } from '../stream/edge-chunk-relay.js' import { onEdgeChunk } from '../stream/edge-chunk-relay.js'
import type { TopicHandler } from '../types.js' import type { TopicHandler } from '../types.js'
export const TOPIC = 'data/edge5/video/v1'
const BEACON_MS = 3000 const BEACON_MS = 3000
let lastBeacon = 0 let lastBeacon = 0

25
app/src/handlers/index.ts
View File

@@ -1,13 +1,16 @@
import { register } from '../registry.js' import { register } from '../registry.js'
import { handleDemoPlc, TOPIC as demoPlc } from './demo-plc.js'
import { handleEdge5Modbus, TOPIC as edge5Modbus } from './edge5-modbus.js'
import {
handleEdge5ModbusV2,
TOPIC as edge5ModbusV2,
} from './edge5-modbus-v2.js'
import { handleEdge5Video, TOPIC as edge5Video } from './edge5-video.js'
register(demoPlc, handleDemoPlc) import { handleDemoPlc } from './demo-plc.js'
register(edge5Modbus, handleEdge5Modbus) import { handleDemoModbus } from './demo-modbus.js'
register(edge5ModbusV2, handleEdge5ModbusV2) import { handleEdge5ModbusV2 } from './edge5-modbus-v2.js'
register(edge5Video, handleEdge5Video) import { handleEdge5Video } from './edge5-video.js'
const DEMO_PLC_TOPIC = 'data/demo/plc/v1'
const DEMO_MODBUS_TOPIC = 'data/demo/modbus/v1'
const EDGE5_MODBUS_TOPIC = 'data/edge5/modbus/v2'
const EDGE5_VIDEO_TOPIC = 'data/edge5/video/v1'
register(DEMO_PLC_TOPIC, handleDemoPlc)
register(DEMO_MODBUS_TOPIC, handleDemoModbus)
register(EDGE5_MODBUS_TOPIC, handleEdge5ModbusV2)
register(EDGE5_VIDEO_TOPIC, handleEdge5Video)