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

2026-07-02 22:27:06 +03:00
28 changed files with 111 additions and 569 deletions
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -10,7 +10,5 @@ COPY src ./src

 RUN npm run build && npm prune --omit=dev

-COPY assets ./assets
-
 ENV NODE_ENV=production
 CMD ["node", "dist/index.js"]
--- a/app/VIDEO.md
+++ b/app/VIDEO.md
@@ -1,96 +0,0 @@
-Финальные требования и настройки у нас сейчас такие.
-
-## Финальный пресет чанкования ffmpeg (RTSP → MPEG‑TS → stdout)
-
-Мы остановились на сценарии, где ffmpeg:
-
- тянет RTSP **по TCP** с камер,  
- минимизирует внутреннюю буферизацию и время старта,  
- не перекодирует видео (копирует H.264 как есть); если возникнут проблемы с нагрузкой на сеть, можно поискать варианты снизить; но на данном этапе важнее "накормить" видеобуфер воспроизведения хоть чем-нибудь;
- выдаёт результат в **stdout (`pipe:1`)**, откуда его забирает mqtt транспорт.
-
-Финальный набор аргументов:
-
-```js
-[
-  '-hide_banner',
-  '-fflags', 'nobuffer',          // не буферировать при probe stream info
-  '-flags', 'low_delay',          // включить low-delay на уровне декодера
-  '-analyzeduration', '100000',   // ограничить анализ потока 100 ms (уменьшить стартовую задержку)
-  '-probesize', '32768',          // зондировать только 32 KB (быстрее старт, меньше буфера)
-  '-flush_packets', '1',          // сразу сбрасывать пакеты, не копить их внутри muxer'а
-
-  '-rtsp_transport', 'tcp',       // тянуть RTSP по TCP (надёжнее на плохой сети)
-  '-i', 'rtsp://admin:admin@192.168.0.11:554/live/sub', // sub-поток камеры
-
-  '-an',                          // отключить аудио — нужен только видеофрейм
-  '-c:v', 'copy',                 // не перекодировать видео, просто копировать кадры
-  '-f', 'mpegts',                 // контейнер MPEG-TS для дальнейшего трансмультиплексирования
-  '-mpegts_flags', 'resend_headers', // периодически повторять заголовки для надёжного декода
-  'pipe:1'                        // выводить поток в stdout (дальше забирает твой транспорт)
-]
-```
-
-Ключевые моменты:
-
- `-c:v copy` сохраняет оригинальный кадр и GOP камеры — минимум задержки и вычислительной нагрузки.  
- `-fflags nobuffer + -flags low_delay + -flush_packets 1` минимизируют буферизацию и увеличивают «прозрачность» для твоего транспорта.  
- `-rtsp_transport tcp` это про **вход** (камера → ffmpeg), а `pipe:1` — про **выход** (ffmpeg → mqtt).
-
-***
-
-## Финальный пресет воспроизведения (mpegts.js + HTML5 video)
-
-На клиенте мы на данном этапе определяемся работать как с «live‑видео с буфером», а не как с чистым real‑time:
-
- формат источника: **MPEG‑TS/H.264** по WebSocket;  
- плеер: `mpegts.js`, режим `type: 'mpegts', isLive: true`;  
- буфер: небольшой stash + несколько секунд latency для сглаживания провалов.
-
-Финальные параметры инициализации:
-
-```js
-const wsUrl = 'wss://...';
-
-const player = mpegts.createPlayer(
-  {
-    type: 'mpegts',         // MPEG-TS поток по WS
-    isLive: true,
-    url: wsUrl,
-    hasAudio: false,        // видео без аудио
-  },
-  {
-    enableWorker: true,
-
-    // Включаем stash, чтобы сглаживать редкий / рваный поток
-    enableStashBuffer: true,
-    stashInitialSize: 512,              // немного увеличенный stash для накопления
-
-    autoCleanupSourceBuffer: true,
-    autoCleanupMaxBackwardDuration: 10, // держим минимум истории
-    autoCleanupMinBackwardDuration: 5,
-
-    // Разрешаем latency-chasing с «комфортной» задержкой
-    liveBufferLatencyChasing: true,
-    liveBufferLatencyMaxLatency: 5.0,   // целевая задержка до ~5 секунд
-    liveBufferLatencyMinRemain: 2.0,    // оставляем ~2 секунды буфера после сброса
-
-    liveSync: false,                    // не пытаемся мягко догонять — приоритет стабильности
-    lazyLoad: false,
-    deferLoadAfterSourceOpen: false,
-  }
-);
-
-player.attachMediaElement(document.getElementById('v'));
-player.load();
-player.play();
-```
-
-Смысл этих настроек:
-
- **Stash‑buffer включён**: mpegts.js может аккумулировать некоторое количество данных, прежде чем кормить MSE (браузеру), что хорошо при «дырявом» канале.  
- **Latency‑chasing с MaxLatency ≈ 5 s**: браузер допускает несколько секунд отставания, но не позволяет задержке расти бесконечно; при накоплении лишнего буфера он «подпрыгивает» ближе к live‑позиции, сохраняя `MinRemain` ~2 секунды запаса.  
- `liveSync: false` — мы не гонимся за минимально возможной задержкой любой ценой, а принимаем небольшой «запас» как разумный компромисс.  
-
-При улучшении канала или выполнениии работ по снижению нагрузки на сеть (уменьшения битрейта, fps) 
-нужно грамотно управлять буфером на стороне клиента (stash + latency).
--- a/app/assets/index.html
+++ b/app/assets/index.html
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8" />
-  <title>edge5 video relay</title>
-  <script src="https://cdn.jsdelivr.net/npm/mpegts.js/dist/mpegts.js"></script>
-  <style>
-    body { margin: 0; background: #000; }
-    #v { display: block; width: 100vw; height: 100vh; object-fit: contain; }
-  </style>
-</head>
-<body>
-  <video id="v" controls autoplay muted></video>
-  <script>
-    const cameraId = new URLSearchParams(location.search).get('camera') ?? 'v1';
-    const wsUrl = `${location.protocol === 'https:' ? 'wss' : 'ws'}://${location.host}/ws/${cameraId}`;
-    const player = mpegts.createPlayer(
-      { type: 'mpegts', isLive: true, url: wsUrl, hasAudio: false },
-      {
-        enableWorker: true,
-
-        // Включаем stash, чтобы сглаживать редкий / рваный поток
-        enableStashBuffer: true,
-        stashInitialSize: 512,              // немного увеличенный stash для накопления
-
-        autoCleanupSourceBuffer: true,
-        autoCleanupMaxBackwardDuration: 10, // держим минимум истории
-        autoCleanupMinBackwardDuration: 5,
-
-        // Разрешаем latency-chasing с «комфортной» задержкой
-        liveBufferLatencyChasing: true,
-        liveBufferLatencyMaxLatency: 5.0,   // целевая задержка до ~5 секунд
-        liveBufferLatencyMinRemain: 2.0,    // оставляем ~2 секунды буфера после сброса
-
-        liveSync: false,                    // не пытаемся мягко догонять — приоритет стабильности
-        lazyLoad: false,
-        deferLoadAfterSourceOpen: false,
-      }
-    );
-    player.attachMediaElement(document.getElementById('v'))
-    player.load()
-    player.play()
-  </script>
-</body>
-</html>
--- a/app/public/index.html
+++ b/app/public/index.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8" />
+  <title>edge5 video relay</title>
+  <script src="https://cdn.jsdelivr.net/npm/mpegts.js/dist/mpegts.js"></script>
+</head>
+<body>
+  <video id="v" controls autoplay muted style="width:100%"></video>
+  <script>
+    const wsUrl = `ws://${location.hostname}:9090`
+    const player = mpegts.createPlayer(
+      { type: 'mpegts', isLive: true, url: wsUrl },
+      { liveBufferLatencyChasing: true, liveBufferLatencyMaxLatency: 1.5 }
+    )
+    player.attachMediaElement(document.getElementById('v'))
+    player.load()
+    player.play()
+  </script>
+</body>
+</html>
--- a/app/src/handlers/demo-modbus.ts
+++ b/app/src/handlers/demo-modbus.ts
@@ -1,9 +1,10 @@
-import { log } from '../helpers/log.js'
 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 as string
+const DEMO_CLOUD_INGEST_URL = process.env.DEMO_CLOUD_INGEST_URL

 type DemoModbusMetric = {
  edge: string
@@ -28,14 +29,14 @@ function toMetrics(values: number[], timestamp: string): DemoModbusMetric[] {
  return values.map((value, index) => ({
    edge: EDGE,
    timestamp,
-    tag: `register-${index}`,
+    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, {
+    const response = await fetch(DEMO_CLOUD_INGEST_URL as string, {
      method: 'POST',
      headers: {
        'content-type': 'application/json',
@@ -50,11 +51,11 @@ async function postMetrics(metrics: DemoModbusMetric[]): Promise<void> {
    }
  }

-  log(`${EDGE}.modbus.posted ${metrics.length} metrics`)
+  console.log('demo.modbus.posted', { count: metrics.length })
 }

 export const handleDemoModbus: TopicHandler = async (topic, payload) => {
-  log(`${EDGE}.modbus.received ${topic} ${payload.length} bytes`)
+  console.log('demo.modbus.received', { topic, bytes: payload.length })

  const values = parseValues(payload)
  const metrics = toMetrics(values, new Date().toISOString())
--- a/app/src/handlers/demo-plc.ts
+++ b/app/src/handlers/demo-plc.ts
@@ -1,9 +1,10 @@
-import { log } from '../helpers/log.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 as string
+const DEMO_CLOUD_INGEST_URL = process.env.DEMO_CLOUD_INGEST_URL

 type DemoPlcPayload = {
  tag: string
@@ -27,7 +28,7 @@ function toMetric(payload: DemoPlcPayload, timestamp: string): DemoPlcMetric {
 }

 async function postMetric(metric: DemoPlcMetric): Promise<void> {
-  const response = await fetch(DEMO_CLOUD_INGEST_URL, {
+  const response = await fetch(DEMO_CLOUD_INGEST_URL as string, {
    method: 'POST',
    headers: {
      'content-type': 'application/json',
@@ -41,11 +42,11 @@ async function postMetric(metric: DemoPlcMetric): Promise<void> {
    throw new Error(text)
  }

-  log('demo.plc.posted', { tag: metric.tag })
+  console.log('demo.plc.posted', { tag: metric.tag })
 }

 export const handleDemoPlc: TopicHandler = async (topic, payload) => {
-  log('demo.plc.received', { topic, bytes: payload.length })
+  console.log('demo.plc.received', { topic, bytes: payload.length })

  const value = parseJson<DemoPlcPayload>(payload)
  const metric = toMetric(value, new Date().toISOString())
--- a/app/src/handlers/edge5-modbus-v2.ts
+++ b/app/src/handlers/edge5-modbus-v2.ts
@@ -1,20 +1,12 @@
-import { dirname, join } from 'node:path'
-import { fileURLToPath } from 'node:url'
-
 import { postCloudIngest } from '../cloud-ingest.js'
-import { log } from '../helpers/log.js'
 import { createMetricMapper, type MappedMetric } from '../mapping.js'
 import type { TopicHandler } from '../types.js'

+export const TOPIC = 'data/edge5/modbus/v2'
+
 const REGISTER_COUNT = 125
-
-const defaultMappingFile = join(
-  dirname(fileURLToPath(import.meta.url)),
-  '../../assets/edge5-modbus.json',
-)
-
 const mapper = createMetricMapper({
-  filePath: process.env.EDGE5_MODBUS_V2_MAPPING_FILE ?? defaultMappingFile,
+  filePath: process.env.EDGE5_MODBUS_V2_MAPPING_FILE as string,
 })

 function parseValues(payload: Buffer): number[] {
@@ -47,7 +39,7 @@ async function postMetrics(metrics: MappedMetric[]): Promise<void> {
    }
  }

-  log('edge5.modbus.v2.posted', {
+  console.log('edge5.modbus.v2.posted', {
    total: metrics.length,
    succeeded: metrics.length - errors.length,
    failed: errors.length,
@@ -59,7 +51,7 @@ async function postMetrics(metrics: MappedMetric[]): Promise<void> {
 }

 export const handleEdge5ModbusV2: TopicHandler = async (topic, payload) => {
-  log('edge5.modbus.v2.received', { topic, bytes: payload.length })
+  console.log('edge5.modbus.v2.received', { topic, bytes: payload.length })

  const values = parseValues(payload)
  const metrics = mapper.mapValues(values, new Date().toISOString())
--- a/app/src/handlers/edge5-modbus-v3.ts
+++ b/app/src/handlers/edge5-modbus-v3.ts
@@ -1,121 +0,0 @@
-import { postCloudIngest } from '../cloud-ingest.js'
-import { log } from '../helpers/log.js'
-import type { TopicHandler } from '../types.js'
-
-const EDGE = 'edge5-v3'
-const REGISTER_COUNT = 24
-
-// Фиксируем интерпретацию
-const TAGS = [
-  'edge5-v3-wk',
-  'edge5-v3-pin',
-  'edge5-v3-hk',
-  'edge5-v3-mk',
-  'edge5-v3-mrot',
-  'edge5-v3-h',
-  'edge5-v3-vw',
-  'edge5-v3-pdk',
-  'edge5-v3-h2s',
-  'edge5-v3-t',
-  'edge5-v3-nrot',
-  'edge5-v3-vsp',
-] as const
-
-// из них выводим на дашборд семь виджетов
-const CLOUD_INGEST_TAGS = new Set<string>([
-  'edge5-v3-wk',
-  'edge5-v3-hk',
-  'edge5-v3-vw',
-  'edge5-v3-pdk',
-  'edge5-v3-h2s',
-  'edge5-v3-nrot',
-  'edge5-v3-vsp',
-])
-
-type Edge5ModbusV3Metric = {
-  edge: string
-  timestamp: string
-  tag: string
-  value: number
-}
-
-function toFloatCDAB(reg0: number, reg1: number): number {
-  const buf = Buffer.allocUnsafe(4)
-  buf.writeUInt16BE(reg1, 0)
-  buf.writeUInt16BE(reg0, 2)
-  return buf.readFloatBE(0)
-}
-
-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): Edge5ModbusV3Metric[] {
-  const metrics: Edge5ModbusV3Metric[] = []
-
-  for (let i = 0; i < values.length; i += 2) {
-    const tag = TAGS[i / 2]
-    const value = toFloatCDAB(values[i], values[i + 1])
-    if (isNaN(value)) {
-      if (CLOUD_INGEST_TAGS.has(tag)) {
-        log(
-          `edge5.modbus.v3: не удалось собрать число для ${tag}, ` +
-            `исходные values[${i}]=${values[i]}, values[${i + 1}]=${values[i + 1]}, пропуск`,
-        )
-      }
-      continue
-    }
-
-    metrics.push({
-      edge: EDGE,
-      timestamp,
-      tag,
-      value,
-    })
-  }
-
-  return metrics
-}
-
-async function postMetrics(metrics: Edge5ModbusV3Metric[]): Promise<void> {
-  const toPost = metrics.filter((metric) => CLOUD_INGEST_TAGS.has(metric.tag))
-  const errors: Error[] = []
-
-  for (const metric of toPost) {
-    try {
-      const response = await postCloudIngest(metric)
-
-      if (!response.ok) {
-        const text = await response.text()
-        throw new Error(text || `${response.status} ${response.statusText}`)
-      }
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error)
-      errors.push(new Error(`${metric.tag}: ${message}`))
-      console.error('edge5.modbus.v3.metric.failed', metric.tag, message)
-    }
-  }
-
-  log('edge5.modbus.v3.posted', { total: toPost.length });
-
-  if (errors.length) {
-    throw new Error(`Failed to post ${errors.length}/${toPost.length} edge5 modbus v3 metrics`)
-  }
-}
-
-export const handleEdge5ModbusV3: TopicHandler = async (topic, payload) => {
-  const timestamp = new Date().toISOString();
-  log('edge5.modbus.v3.received', { topic, bytes: payload.length, timestamp })
-
-  const values = parseValues(payload);
-  const metrics = toMetrics(values, timestamp);
-  await postMetrics(metrics);
-}
--- a/app/src/handlers/edge5i-modbus.ts
+++ b/app/src/handlers/edge5i-modbus.ts
@@ -1,11 +1,12 @@
 import { postCloudIngest } from '../cloud-ingest.js'
-import { log } from '../helpers/log.js'
 import type { TopicHandler } from '../types.js'

-const EDGE = 'edge5i'
-const REGISTER_COUNT = 100
+export const TOPIC = 'data/edge5/modbus/v1'

-type DemoModbusMetric = {
+const EDGE = 'edge5'
+const REGISTER_COUNT = 125
+
+type Edge5ModbusMetric = {
  edge: string
  timestamp: string
  tag: string
@@ -24,16 +25,16 @@ function assertRegisterCount(values: number[]): void {
  }
 }

-function toMetrics(values: number[], timestamp: string): DemoModbusMetric[] {
+function toMetrics(values: number[], timestamp: string): Edge5ModbusMetric[] {
  return values.map((value, index) => ({
    edge: EDGE,
    timestamp,
-    tag: `register-${String(index).padStart(3, '0')}`,
+    tag: `${EDGE}.modbus.${index + 1}`,
    value,
  }))
 }

-async function postMetrics(metrics: DemoModbusMetric[]): Promise<void> {
+async function postMetrics(metrics: Edge5ModbusMetric[]): Promise<void> {
  for (const metric of metrics) {
    const response = await postCloudIngest(metric)

@@ -43,11 +44,11 @@ async function postMetrics(metrics: DemoModbusMetric[]): Promise<void> {
    }
  }

-  log(`${EDGE}.modbus.posted ${metrics.length} metrics`)
+  console.log('edge5.modbus.posted', { count: metrics.length })
 }

-export const handle: TopicHandler = async (topic, payload) => {
-  log(`${EDGE}.modbus.received ${topic} ${payload.length} bytes`)
+export const handleEdge5Modbus: TopicHandler = async (topic, payload) => {
+  console.log('edge5.modbus.received', { topic, bytes: payload.length })

  const values = parseValues(payload)
  const metrics = toMetrics(values, new Date().toISOString())
--- a/app/src/handlers/edge5-video-v2.ts
+++ b/app/src/handlers/edge5-video-v2.ts
@@ -1,21 +0,0 @@
-import { log } from '../helpers/log.js'
-import { lastTopicSegment } from '../helpers/topic-match.js'
-import { onEdgeChunk } from '../stream/edge-chunk-relay.js'
-import type { TopicHandler } from '../types.js'
-
-const LOG_INTERVAL_MS = 10_000
-
-const lastLogByCamera = new Map<string, number>()
-
-export const handleEdge5VideoV2: TopicHandler = async (topic, payload) => {
-  const cameraId = lastTopicSegment(topic)
-
-  const now = Date.now()
-  const lastLog = lastLogByCamera.get(cameraId) ?? 0
-  if (now - lastLog >= LOG_INTERVAL_MS) {
-    log(`edge5.video.v2 [${cameraId}] ↑ ${payload.length}B`)
-    lastLogByCamera.set(cameraId, now)
-  }
-
-  onEdgeChunk(cameraId, payload);
-}
--- a/app/src/handlers/edge5-video.ts
+++ b/app/src/handlers/edge5-video.ts
@@ -1,15 +1,16 @@
-import { log } from '../helpers/log.js'
 import { onEdgeChunk } from '../stream/edge-chunk-relay.js'
 import type { TopicHandler } from '../types.js'

-const LOG_INTERVAL_MS = 10_000
-let lastLog = 0
+export const TOPIC = 'data/edge5/video/v1'
+
+const BEACON_MS = 3000
+let lastBeacon = 0

 export const handleEdge5Video: TopicHandler = async (_topic, payload) => {
  const now = Date.now()
-  if (now - lastLog >= LOG_INTERVAL_MS) {
-    log(`edge5.video ↑ ${payload.length}B`)
-    lastLog = now
+  if (now - lastBeacon >= BEACON_MS) {
+    console.log(`edge5.video ↑ ${payload.length}B`)
+    lastBeacon = now
  }
-  onEdgeChunk('v1', payload);
-}
+  onEdgeChunk(payload)
+}
--- a/app/src/handlers/edge5cdab-modbus.ts
+++ b/app/src/handlers/edge5cdab-modbus.ts
@@ -1,79 +0,0 @@
-import { postCloudIngest } from '../cloud-ingest.js'
-import { log } from '../helpers/log.js'
-import type { TopicHandler } from '../types.js'
-
-const EDGE = 'edge5cdab'
-const REGISTER_COUNT = 100
-
-type Edge5iiModbusMetric = {
-  edge: string
-  timestamp: string
-  tag: string
-  value: number
-};
-
-function toFloatCDAB(reg0: number, reg1: number): number {
-  const buf = Buffer.allocUnsafe(4)
-  buf.writeUInt16BE(reg1, 0)
-  buf.writeUInt16BE(reg0, 2)
-  return buf.readFloatBE(0)
-}
-
-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): Edge5iiModbusMetric[] {
-  const metrics: Edge5iiModbusMetric[] = []
-
-  for (let i = 0; i < values.length; i += 2) {
-    const tag = `register-${String(i).padStart(3, '0')}`
-    const value = toFloatCDAB(values[i], values[i + 1])
-    if (isNaN(value)) {
-      log(
-        `${EDGE}.modbus: не удалось собрать число для ${tag}, ` +
-          `исходные values[${i}]=${values[i]}, values[${i + 1}]=${values[i + 1]}, пропуск`,
-      )
-      continue
-    };
-
-    metrics.push({
-      edge: EDGE,
-      timestamp,
-      tag,
-      value,
-    })
-  }
-
-  return metrics
-}
-
-async function postMetrics(metrics: Edge5iiModbusMetric[]): Promise<void> {
-  for (const metric of metrics) {
-    const response = await postCloudIngest(metric)
-
-    if (!response.ok) {
-      const text = await response.text()
-      throw new Error(text)
-    }
-  }
-
-  log(`${EDGE}.modbus.posted ${metrics.length} metrics`)
-}
-
-export const handle: TopicHandler = async (topic, payload) => {
-  const timestamp = new Date().toISOString()
-  log(`${EDGE}.modbus.received ${topic} ${payload.length} bytes`)
-
-  const values = parseValues(payload)
-  const metrics = toMetrics(values, timestamp);
-  await postMetrics(metrics)
-}
--- a/app/src/handlers/index.ts
+++ b/app/src/handlers/index.ts
@@ -1,26 +1,15 @@
-import { register } from '../registry.js';
+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 {
+  handleEdge5ModbusV2,
+  TOPIC as edge5ModbusV2,
+} from './edge5-modbus-v2.js'
+import { handleEdge5Video, TOPIC as edge5Video } from './edge5-video.js'

-import { handleDemoPlc } from './demo-plc.js';
-import { handleDemoModbus } from './demo-modbus.js';
-import { handleEdge5ModbusV2 } from './edge5-modbus-v2.js';
-import { handleEdge5ModbusV3 } from './edge5-modbus-v3.js';
-import { handleEdge5Video } from './edge5-video.js';
-import { handleEdge5VideoV2 } from './edge5-video-v2.js';
-
-import { handle as interpretation } from './edge5i-modbus.js';
-import { handle as cdab} from './edge5cdab-modbus.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);
-
-register('data/edge5i/modbus', interpretation);
-register('data/edge5cdab/modbus', cdab);
-register('data/edge5/video/v2/+', handleEdge5VideoV2);
-register('data/edge5/modbus/v3', handleEdge5ModbusV3);
+register(demoModbus, handleDemoModbus)
+register(demoPlc, handleDemoPlc)
+register(edge5Modbus, handleEdge5Modbus)
+register(edge5ModbusV2, handleEdge5ModbusV2)
+register(edge5Video, handleEdge5Video)
--- a/app/src/helpers/log.ts
+++ b/app/src/helpers/log.ts
@@ -1,3 +0,0 @@
-export function log(...args: unknown[]): void {
-  console.log(`[${new Date().toISOString()}]`, ...args)
-}
--- a/app/src/helpers/topic-match.ts
+++ b/app/src/helpers/topic-match.ts
@@ -1,38 +0,0 @@
-export function topicMatchesFilter(filter: string, topic: string): boolean {
-  const filterParts = filter.split('/')
-  const topicParts = topic.split('/')
-
-  let fi = 0
-  let ti = 0
-
-  while (fi < filterParts.length) {
-    const segment = filterParts[fi]
-
-    if (segment === '#') {
-      return fi === filterParts.length - 1
-    }
-
-    if (ti >= topicParts.length) {
-      return false
-    }
-
-    if (segment === '+') {
-      fi++
-      ti++
-      continue
-    }
-
-    if (segment !== topicParts[ti]) {
-      return false
-    }
-
-    fi++
-    ti++
-  }
-
-  return ti === topicParts.length
-}
-
-export function lastTopicSegment(topic: string): string {
-  return topic.split('/').at(-1) ?? ''
-}
--- a/app/src/http/server.ts
+++ b/app/src/http/server.ts
@@ -3,11 +3,9 @@ import { createServer } from 'node:http'
 import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'

-import { log } from '../helpers/log.js'
-
 const httpPort = Number(process.env.HTTP_PORT)
-const assetsDir = join(dirname(fileURLToPath(import.meta.url)), '../../assets')
-const indexPath = join(assetsDir, 'index.html')
+const publicDir = join(dirname(fileURLToPath(import.meta.url)), '../../public')
+const indexPath = join(publicDir, 'index.html')

 createServer(async (req, res) => {
  const path = req.url?.split('?')[0]
@@ -26,5 +24,5 @@ createServer(async (req, res) => {

  res.writeHead(404).end('Not Found')
 }).listen(httpPort, () => {
-  log('http.server_started', { port: httpPort })
+  console.log('http.server_started', { port: httpPort })
 })
--- a/app/src/index.ts
+++ b/app/src/index.ts
@@ -3,6 +3,4 @@ import './http/server.js'
 import './mqtt.js'
 import './stream/edge-chunk-relay.js'

-import { log } from './helpers/log.js'
-
-log('mqtt-worker.started')
+console.log('mqtt-worker.started')
--- a/app/src/mapping.ts
+++ b/app/src/mapping.ts
@@ -19,7 +19,7 @@ export type MetricMapper = {

 type MetricMapperOptions = {
  // filePath contract:
-  // - built-in mappings live in app/assets/*.json (resolved relative to dist/ at runtime);
+  // - built-in mappings are passed as URL via new URL('../mappings/*.json', import.meta.url);
  // - env overrides are expected as absolute paths inside the runtime container.
  filePath: string | URL
 }
--- a/app/src/mappings/edge5-modbus.json
+++ b/app/src/mappings/edge5-modbus.json
--- a/app/src/mappings/edge5-modbus_rus.json
+++ b/app/src/mappings/edge5-modbus_rus.json
--- a/app/src/mappings/edge5-modbus_unit.json
+++ b/app/src/mappings/edge5-modbus_unit.json
--- a/app/src/mqtt.ts
+++ b/app/src/mqtt.ts
@@ -1,20 +1,14 @@
 import mqtt from 'mqtt'

-import { log } from './helpers/log.js'
 import { getRegisteredTopics } from './registry.js'
 import { routeMessage } from './router.js'

 const mqttUrl = process.env.MQTT_URL as string

-export const mqttClient = mqtt.connect(mqttUrl, {
-  clean: true,
-  queueQoSZero: false,
-  reconnectPeriod: 1000,
-  connectTimeout: 10000,
-});
+export const mqttClient = mqtt.connect(mqttUrl)

 mqttClient.on('connect', () => {
-  log('mqtt.connected', { url: mqttUrl })
+  console.log('mqtt.connected', { url: mqttUrl })

  const topics = getRegisteredTopics()
  if (topics.length === 0) {
@@ -27,7 +21,7 @@ mqttClient.on('connect', () => {
      console.error('mqtt.subscribe_error', err)
      return
    }
-    log('mqtt.subscribed', { topics })
+    console.log('mqtt.subscribed', { topics })
  })
 })

@@ -40,5 +34,5 @@ mqttClient.on('error', (err) => {
 })

 mqttClient.on('reconnect', () => {
-  log('mqtt.reconnect')
+  console.log('mqtt.reconnect')
 })
--- a/app/src/registry.ts
+++ b/app/src/registry.ts
@@ -1,37 +1,18 @@
-import { topicMatchesFilter } from './helpers/topic-match.js'
 import type { TopicHandler } from './types.js'

-const exactHandlers = new Map<string, TopicHandler>()
-const patternHandlers = new Map<string, TopicHandler>()
-
-function isPatternTopic(topic: string): boolean {
-  return topic.includes('+') || topic.includes('#')
-}
+const handlers = new Map<string, TopicHandler>()

 export function register(topic: string, handler: TopicHandler): void {
-  const handlers = isPatternTopic(topic) ? patternHandlers : exactHandlers
-
  if (handlers.has(topic)) {
    throw new Error(`Handler already registered for topic: ${topic}`)
  }
  handlers.set(topic, handler)
 }

-export function resolveHandler(topic: string): TopicHandler | undefined {
-  const exact = exactHandlers.get(topic)
-  if (exact) {
-    return exact
-  }
-
-  for (const [filter, handler] of patternHandlers) {
-    if (topicMatchesFilter(filter, topic)) {
-      return handler
-    }
-  }
-
-  return undefined
+export function getHandler(topic: string): TopicHandler | undefined {
+  return handlers.get(topic)
 }

 export function getRegisteredTopics(): string[] {
-  return [...exactHandlers.keys(), ...patternHandlers.keys()]
+  return [...handlers.keys()]
 }
--- a/app/src/router.ts
+++ b/app/src/router.ts
@@ -1,10 +1,10 @@
-import { resolveHandler } from './registry.js'
+import { getHandler } from './registry.js'

 export async function routeMessage(
  topic: string,
  payload: Buffer,
 ): Promise<void> {
-  const handler = resolveHandler(topic)
+  const handler = getHandler(topic)

  if (!handler) {
    console.warn('mqtt.unhandled_topic', { topic })
--- a/app/src/stream/edge-chunk-relay.ts
+++ b/app/src/stream/edge-chunk-relay.ts
@@ -1,42 +1,29 @@
 import type { IncomingMessage } from 'http'
 import { WebSocket, WebSocketServer } from 'ws'

-import { log } from '../helpers/log.js'
-import { lastTopicSegment } from '../helpers/topic-match.js'
-
 const wsPort = Number(process.env.WS_PORT)

 const wss = new WebSocketServer({ port: wsPort, perMessageDeflate: false })
-
-const clientsByCamera = new Map<string, Set<WebSocket>>()
-
-function getClients(cameraId: string): Set<WebSocket> {
-  let clients = clientsByCamera.get(cameraId)
-  if (!clients) {
-    clients = new Set()
-    clientsByCamera.set(cameraId, clients)
-  }
-  return clients
-}
+const clients = new Set<WebSocket>()

 wss.on('connection', (ws: WebSocket, req: IncomingMessage) => {
-  log(`ws.connection ${req.url}`);
-  req.socket.setNoDelay(true)
-  const cameraId = req.url ? lastTopicSegment(req.url) : 'v1';
-
-  const clients = getClients(cameraId);
-  clients.add(ws);
+  clients.add(ws)
+  console.log('ws.client_connected', {
+    clients: clients.size,
+    ip: req.socket.remoteAddress,
+  })

  ws.on('close', () => {
    clients.delete(ws)
-    if (clients.size === 0) clientsByCamera.delete(cameraId)
-  });
-
+    console.log('ws.client_closed', { clients: clients.size })
+  })
 })

-export function onEdgeChunk(cameraId: string, chunk: Buffer): void {
-  const clients = clientsByCamera.get(cameraId)
-  if (!clients) return
+wss.on('listening', () => {
+  console.log('ws.server_started', { port: wsPort })
+})
+
+export function onEdgeChunk(chunk: Buffer): void {
  for (const client of clients) {
    if (client.readyState === WebSocket.OPEN) {
      client.send(chunk)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,35 +3,26 @@ services:
    build: ./mosquitto
    container_name: mosquitto
    ports:
-      - "1883:1883" # external MQTT port for receiving data
+      - "1883:1883"
    volumes:
      - mosquitto_data:/mosquitto/data
-    networks:
-      - default

  app:
    build: ./app
    container_name: mqtt-worker
    depends_on:
      - mosquitto
-    expose:
-      - 80 
-      - 9090 
+    ports:
+      - "80:80"
+      - "9090:9090"
    environment:
      MQTT_URL: mqtt://mosquitto:1883
-      HTTP_PORT: 80 # http port for video previewing page
-      WS_PORT: 9090 # WebSocket port for video streaming
-      CLOUD_INGEST_URL: ${CLOUD_INGEST_URL}
-      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/assets/edge5-modbus.json}
-    networks:
-      - default
-      - proxy
+      HTTP_PORT: "80"
+      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:
  mosquitto_data:
-
-networks:
-  proxy:
-    external: true
--- a/mosquitto/config/mosquitto.conf
+++ b/mosquitto/config/mosquitto.conf
@@ -1,8 +1,6 @@
 listener 1883
 allow_anonymous true

-set_tcp_nodelay true          # выключает Nagle на всех сокетах брокера
-
 persistence true
 persistence_location /mosquitto/data/

--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +0,0 @@
-{
-  "name": "mqtt-ingest",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}