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

добавлена поддержка dev окружения #10

Merged
NBizyaev merged 1 commits from dev into main 2026-07-03 06:38:42 +00:00
Conversation 0 Commits 1 Files Changed 3 +19 -4
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/handlers/demo-modbus.ts
View File

@@ -1,9 +1,9 @@
import { postCloudIngest } from '../cloud-ingest.js'
import { log } from '../helpers/log.js' import { log } from '../helpers/log.js'
import type { TopicHandler } from '../types.js' import type { TopicHandler } from '../types.js'
const EDGE = 'demo' const EDGE = 'demo'
const REGISTER_COUNT = 125 const REGISTER_COUNT = 125
const DEMO_CLOUD_INGEST_URL = process.env.DEMO_CLOUD_INGEST_URL as string
type DemoModbusMetric = { type DemoModbusMetric = {
edge: string edge: string
@@ -35,7 +35,14 @@ function toMetrics(values: number[], timestamp: string): DemoModbusMetric[] {
async function postMetrics(metrics: DemoModbusMetric[]): 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 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) { if (!response.ok) {
const text = await response.text() const text = await response.text()

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

@@ -1,9 +1,9 @@
import { postCloudIngest } from '../cloud-ingest.js'
import { log } from '../helpers/log.js' import { log } from '../helpers/log.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'
const EDGE = 'demo' const EDGE = 'demo'
const DEMO_CLOUD_INGEST_URL = process.env.DEMO_CLOUD_INGEST_URL as string
type DemoPlcPayload = { type DemoPlcPayload = {
tag: string tag: string
@@ -27,7 +27,14 @@ function toMetric(payload: DemoPlcPayload, timestamp: string): DemoPlcMetric {
} }
async function postMetric(metric: DemoPlcMetric): Promise<void> { async function postMetric(metric: DemoPlcMetric): Promise<void> {
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) { if (!response.ok) {
const text = await response.text() const text = await response.text()

1
docker-compose.yml
View File

@@ -21,6 +21,7 @@ services:
WS_PORT: "9090" WS_PORT: "9090"
CLOUD_INGEST_URL: ${CLOUD_INGEST_URL:-https://demo.backend.drill.greact.ru/ingest} CLOUD_INGEST_URL: ${CLOUD_INGEST_URL:-https://demo.backend.drill.greact.ru/ingest}
CLOUD_INGEST_API_KEY: ${CLOUD_INGEST_API_KEY:-} 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} EDGE5_MODBUS_V2_MAPPING_FILE: ${EDGE5_MODBUS_V2_MAPPING_FILE:-/app/src/mappings/edge5-modbus.json}
volumes: volumes: