Merge pull request 'Обновил отправку тегов с массива на построчный формат' (#8) from edge5modbus into main

Reviewed-on: #8

app/src/handlers/demo-modbus.ts

@@ -1,63 +0,0 @@
-import type { TopicHandler } from '../types.js'
-
-export const TOPIC = 'data/demo/modbus/v1'
-
-const EDGE = 'demo'
-const REGISTER_COUNT = 125
-const DEMO_CLOUD_INGEST_URL = process.env.DEMO_CLOUD_INGEST_URL
-
-type DemoModbusMetric = {
-  edge: string
-  timestamp: string
-  tag: string
-  value: number
-}
-
-function parseValues(payload: Buffer): number[] {
-  const values = JSON.parse(payload.toString('utf8')) as number[]
-  assertRegisterCount(values)
-  return values
-}
-
-function assertRegisterCount(values: number[]): void {
-  if (values.length !== REGISTER_COUNT) {
-    throw new Error(`Expected ${REGISTER_COUNT} modbus values, got ${values.length}`)
-  }
-}
-
-function toMetrics(values: number[], timestamp: string): DemoModbusMetric[] {
-  return values.map((value, index) => ({
-    edge: EDGE,
-    timestamp,
-    tag: `${EDGE}.modbus.${index + 1}`,
-    value,
-  }))
-}
-
-async function postMetrics(metrics: DemoModbusMetric[]): Promise<void> {
-  for (const metric of metrics) {
-    const response = await fetch(DEMO_CLOUD_INGEST_URL as string, {
-      method: 'POST',
-      headers: {
-        'content-type': 'application/json',
-        'x-api-key': process.env.CLOUD_INGEST_API_KEY as string,
-      },
-      body: JSON.stringify(metric),
-    })
-
-    if (!response.ok) {
-      const text = await response.text()
-      throw new Error(text)
-    }
-  }
-
-  console.log('demo.modbus.posted', { count: metrics.length })
-}
-
-export const handleDemoModbus: TopicHandler = async (topic, payload) => {
-  console.log('demo.modbus.received', { topic, bytes: payload.length })
-
-  const values = parseValues(payload)
-  const metrics = toMetrics(values, new Date().toISOString())
-  await postMetrics(metrics)
-}

app/src/handlers/demo-plc.ts

@@ -1,10 +1,10 @@
+import { postCloudIngest } from '../cloud-ingest.js'
 import { parseJson } from '../helpers/parse.js'
 import type { TopicHandler } from '../types.js'
 
 export const TOPIC = 'data/demo/plc/v1'
 
 const EDGE = 'demo'
-const DEMO_CLOUD_INGEST_URL = process.env.DEMO_CLOUD_INGEST_URL
 
 type DemoPlcPayload = {
   tag: string
@@ -28,14 +28,7 @@ function toMetric(payload: DemoPlcPayload, timestamp: string): DemoPlcMetric {
 }
 
 async function postMetric(metric: DemoPlcMetric): Promise<void> {
-  const response = await fetch(DEMO_CLOUD_INGEST_URL as string, {
+  const response = await postCloudIngest(metric)
-    method: 'POST',
-    headers: {
-      'content-type': 'application/json',
-      'x-api-key': process.env.CLOUD_INGEST_API_KEY as string,
-    },
-    body: JSON.stringify(metric),
-  })
 
   if (!response.ok) {
     const text = await response.text()

app/src/handlers/index.ts

@@ -1,5 +1,4 @@
 import { register } from '../registry.js'
-import { handleDemoModbus, TOPIC as demoModbus } from './demo-modbus.js'
 import { handleDemoPlc, TOPIC as demoPlc } from './demo-plc.js'
 import { handleEdge5Modbus, TOPIC as edge5Modbus } from './edge5-modbus.js'
 import {
@@ -8,7 +7,6 @@ import {
 } from './edge5-modbus-v2.js'
 import { handleEdge5Video, TOPIC as edge5Video } from './edge5-video.js'
 
-register(demoModbus, handleDemoModbus)
 register(demoPlc, handleDemoPlc)
 register(edge5Modbus, handleEdge5Modbus)
 register(edge5ModbusV2, handleEdge5ModbusV2)

docker-compose.yml

@@ -13,7 +13,7 @@ services:
     depends_on:
       - mosquitto
     ports:
-      - "80:80"
+      # - "80:80"
       - "9090:9090"
     environment:
       MQTT_URL: mqtt://mosquitto:1883
@@ -21,7 +21,6 @@ services:
       WS_PORT: "9090"
       CLOUD_INGEST_URL: ${CLOUD_INGEST_URL:-https://demo.backend.drill.greact.ru/ingest}
       CLOUD_INGEST_API_KEY: ${CLOUD_INGEST_API_KEY:-}
-      DEMO_CLOUD_INGEST_URL: ${DEMO_CLOUD_INGEST_URL:-}
       EDGE5_MODBUS_V2_MAPPING_FILE: ${EDGE5_MODBUS_V2_MAPPING_FILE:-/app/src/mappings/edge5-modbus.json}
 
 volumes: