From 64dde77f7b08dc52699cb1dfabf5a3baef8d47b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B2=D0=BE=D0=B2=20=D0=90=D1=80=D1=82?= =?UTF-8?q?=D0=B5=D0=BC?= Date: Thu, 2 Jul 2026 22:39:59 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA?= =?UTF-8?q?=D0=B0=20dev=20=D0=BE=D0=BA=D1=80=D1=83=D0=B6=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/handlers/demo-modbus.ts | 11 +++++++++-- app/src/handlers/demo-plc.ts | 11 +++++++++-- docker-compose.yml | 1 + 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app/src/handlers/demo-modbus.ts b/app/src/handlers/demo-modbus.ts index 3ba719b..a9bfdea 100644 --- a/app/src/handlers/demo-modbus.ts +++ b/app/src/handlers/demo-modbus.ts @@ -1,9 +1,9 @@ -import { postCloudIngest } from '../cloud-ingest.js' import { log } from '../helpers/log.js' import type { TopicHandler } from '../types.js' const EDGE = 'demo' const REGISTER_COUNT = 125 +const DEMO_CLOUD_INGEST_URL = process.env.DEMO_CLOUD_INGEST_URL as string type DemoModbusMetric = { edge: string @@ -35,7 +35,14 @@ function toMetrics(values: number[], timestamp: string): DemoModbusMetric[] { async function postMetrics(metrics: DemoModbusMetric[]): Promise { for (const metric of metrics) { - const response = await postCloudIngest(metric) + const response = await fetch(DEMO_CLOUD_INGEST_URL, { + 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() diff --git a/app/src/handlers/demo-plc.ts b/app/src/handlers/demo-plc.ts index efd49f0..fc16310 100644 --- a/app/src/handlers/demo-plc.ts +++ b/app/src/handlers/demo-plc.ts @@ -1,9 +1,9 @@ -import { postCloudIngest } from '../cloud-ingest.js' import { log } from '../helpers/log.js' import { parseJson } from '../helpers/parse.js' import type { TopicHandler } from '../types.js' const EDGE = 'demo' +const DEMO_CLOUD_INGEST_URL = process.env.DEMO_CLOUD_INGEST_URL as string type DemoPlcPayload = { tag: string @@ -27,7 +27,14 @@ function toMetric(payload: DemoPlcPayload, timestamp: string): DemoPlcMetric { } async function postMetric(metric: DemoPlcMetric): Promise { - const response = await postCloudIngest(metric) + const response = await fetch(DEMO_CLOUD_INGEST_URL, { + 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() diff --git a/docker-compose.yml b/docker-compose.yml index 0dde8b5..b3d0946 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,6 +21,7 @@ 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: -- 2.49.1