ws-pipe-relay

Reviewed-on: #10

app/.dockerignore

@@ -1,2 +1,4 @@
 node_modules
 dist
+.env
+.env.*

app/Dockerfile

@@ -6,8 +6,13 @@ COPY package.json package-lock.json ./
 RUN npm ci
 
 COPY tsconfig.json ./
-COPY public ./public
-# Runtime mappers read JSON files from src/mappings, so they must be copied into the image.
 COPY src ./src
 
-CMD ["npm", "run", "dev"]
+RUN npm run build && npm prune --omit=dev
+
+# app/public/index.html has content for video preview
+# TODO move all static files (html, mappers) to a separate folder "assets"
+COPY public ./public 
+
+ENV NODE_ENV=production
+CMD ["node", "dist/index.js"]

app/package-lock.json

@@ -6,11 +6,13 @@
     "": {
       "name": "mqtt-worker",
       "dependencies": {
-        "@types/node": "^25.9.1",
         "mqtt": "^5.15.1",
-        "tsx": "^4.22.4",
-        "typescript": "^6.0.3",
         "ws": "^8.21.0"
+      },
+      "devDependencies": {
+        "@types/node": "^25.9.1",
+        "tsx": "^4.22.4",
+        "typescript": "^6.0.3"
       }
     },
     "node_modules/@babel/runtime": {
@@ -29,6 +31,7 @@
       "cpu": [
         "ppc64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -45,6 +48,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -61,6 +65,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -77,6 +82,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -93,6 +99,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -109,6 +116,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -125,6 +133,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -141,6 +150,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -157,6 +167,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -173,6 +184,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -189,6 +201,7 @@
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -205,6 +218,7 @@
       "cpu": [
         "loong64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -221,6 +235,7 @@
       "cpu": [
         "mips64el"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -237,6 +252,7 @@
       "cpu": [
         "ppc64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -253,6 +269,7 @@
       "cpu": [
         "riscv64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -269,6 +286,7 @@
       "cpu": [
         "s390x"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -285,6 +303,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -301,6 +320,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -317,6 +337,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -333,6 +354,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -349,6 +371,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -365,6 +388,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -381,6 +405,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -397,6 +422,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -413,6 +439,7 @@
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -429,6 +456,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -607,6 +635,7 @@
       "version": "0.28.0",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.0.tgz",
       "integrity": "sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw==",
+      "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "bin": {
@@ -679,6 +708,7 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
@@ -923,6 +953,7 @@
       "version": "4.22.4",
       "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.22.4.tgz",
       "integrity": "sha512-X8EX+XV4QR5xCsrgxaED954zTDfY8KqlDtskKEL0cHhyS/P8b4IFOvGDQpsC9Q1XnLq915wEfwwY/zzskCtmhg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "esbuild": "~0.28.0"
@@ -947,6 +978,7 @@
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz",
       "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
+      "dev": true,
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",

app/package.json

@@ -3,15 +3,17 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "dev":   "tsx watch --env-file=.env src/index.ts",
+    "dev": "tsx watch --env-file=.env src/index.ts",
     "build": "tsc",
     "start": "node --env-file=.env dist/index.js"
   },
   "dependencies": {
-    "@types/node": "^25.9.1",
     "mqtt": "^5.15.1",
-    "tsx": "^4.22.4",
-    "typescript": "^6.0.3",
     "ws": "^8.21.0"
+  },
+  "devDependencies": {
+    "@types/node": "^25.9.1",
+    "tsx": "^4.22.4",
+    "typescript": "^6.0.3"
   }
 }

app/public/index.html

@@ -4,15 +4,39 @@
   <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 style="width:100%"></video>
+  <video id="v" controls autoplay muted></video>
   <script>
-    const wsUrl = `ws://${location.hostname}:9090`
+    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 },
-      { liveBufferLatencyChasing: true, liveBufferLatencyMaxLatency: 1.5 }
-    )
+      { type: 'mpegts', isLive: true, url: wsUrl, hasAudio: false },
+      {
+        enableWorker: true,             // transmuxing в отдельном треде
+        enableStashBuffer: true,        // включить stash
+        stashInitialSize: 384,
+
+        autoCleanupSourceBuffer: true,  // не копить старые буферы в MSE
+        autoCleanupMaxBackwardDuration: 10,
+        autoCleanupMinBackwardDuration: 5,
+
+        // liveSync — плавное догоняние через playbackRate, а не жёсткий seek
+        liveSync: true,
+        liveSyncTargetLatency: 4.0,    // target после выравнивания ← дать буферу вырасти
+        liveSyncMaxLatency: 10.0,      // при плохом интернете даём 10с ← не трогать буфер до 10s
+        liveSyncPlaybackRate: 1.05,    // ускорение не более 1.2x ← очень мягкое догоняние
+
+        liveBufferLatencyChasing: false,  // включить stash ← убрать конфликтующий механизм
+
+        lazyLoad: false,
+        deferLoadAfterSourceOpen: false,
+      }
+    );
     player.attachMediaElement(document.getElementById('v'))
     player.load()
     player.play()

app/src/cloud-ingest.ts

@@ -1,7 +1,4 @@
-const DEFAULT_CLOUD_INGEST_URL = 'http://localhost:3101/ingest'
-
-export const cloudIngestUrl =
-  process.env.CLOUD_INGEST_URL ?? DEFAULT_CLOUD_INGEST_URL
+export const cloudIngestUrl = process.env.CLOUD_INGEST_URL as string
 
 export function postCloudIngest(body: unknown): Promise<Response> {
   return fetch(cloudIngestUrl, {

app/src/handlers/demo-modbus.ts

@@ -0,0 +1,62 @@
+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
+  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: `register-${index}`,
+    value,
+  }))
+}
+
+async function postMetrics(metrics: DemoModbusMetric[]): Promise<void> {
+  for (const metric of metrics) {
+    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()
+      throw new Error(text)
+    }
+  }
+
+  log(`${EDGE}.modbus.posted ${metrics.length} metrics`)
+}
+
+export const handleDemoModbus: TopicHandler = async (topic, payload) => {
+  log(`${EDGE}.modbus.received ${topic} ${payload.length} bytes`)
+
+  const values = parseValues(payload)
+  const metrics = toMetrics(values, new Date().toISOString())
+  await postMetrics(metrics)
+}

app/src/handlers/demo-plc.ts

@@ -1,10 +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'
 
-export const TOPIC = 'data/demo/plc/v1'
-
 const EDGE = 'demo'
+const DEMO_CLOUD_INGEST_URL = process.env.DEMO_CLOUD_INGEST_URL as string
 
 type DemoPlcPayload = {
   tag: string
@@ -13,12 +12,12 @@ type DemoPlcPayload = {
 
 type DemoPlcMetric = {
   edge: string
-  timestamp: number
+  timestamp: string
   tag: string
   value: number
 }
 
-function toMetric(payload: DemoPlcPayload, timestamp: number): DemoPlcMetric {
+function toMetric(payload: DemoPlcPayload, timestamp: string): DemoPlcMetric {
   return {
     edge: EDGE,
     timestamp,
@@ -28,20 +27,27 @@ function toMetric(payload: DemoPlcPayload, timestamp: number): DemoPlcMetric {
 }
 
 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) {
     const text = await response.text()
     throw new Error(text)
   }
 
-  console.log('demo.plc.posted', { tag: metric.tag })
+  log('demo.plc.posted', { tag: metric.tag })
 }
 
 export const handleDemoPlc: TopicHandler = async (topic, payload) => {
-  console.log('demo.plc.received', { topic, bytes: payload.length })
+  log('demo.plc.received', { topic, bytes: payload.length })
 
   const value = parseJson<DemoPlcPayload>(payload)
-  const metric = toMetric(value, Date.now())
+  const metric = toMetric(value, new Date().toISOString())
   await postMetric(metric)
 }

app/src/handlers/edge5-modbus-v2.ts

@@ -1,45 +1,59 @@
 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 mapper = createMetricMapper({
-  filePath:
-    process.env.EDGE5_MODBUS_V2_MAPPING_FILE ??
-    new URL('../mappings/edge5-modbus.json', import.meta.url),
+  filePath: process.env.EDGE5_MODBUS_V2_MAPPING_FILE as string,
 })
-const REGISTER_COUNT = mapper.tagCount
 
 function parseValues(payload: Buffer): number[] {
-  const value = JSON.parse(payload.toString('utf8')) as unknown
+  const values = JSON.parse(payload.toString('utf8')) as number[]
+  assertRegisterCount(values)
+  return values
+}
 
-  if (
-    Array.isArray(value) &&
-    value.length === REGISTER_COUNT &&
-    value.every((item) => typeof item === 'number' && Number.isFinite(item))
-  ) {
-    return value
+function assertRegisterCount(values: number[]): void {
+  if (values.length !== REGISTER_COUNT) {
+    throw new Error(`Expected ${REGISTER_COUNT} modbus values, got ${values.length}`)
   }
-
-  throw new Error(`Expected JSON number[${REGISTER_COUNT}]`)
 }
 
 async function postMetrics(metrics: MappedMetric[]): Promise<void> {
-  const response = await postCloudIngest(metrics)
+  const errors: Error[] = []
 
-  if (!response.ok) {
-    const text = await response.text()
-    throw new Error(text)
+  for (const metric of metrics) {
+    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.v2.metric.failed', metric.tag, message)
+    }
   }
 
-  console.log('edge5.modbus.v2.posted', { count: metrics.length })
+  log('edge5.modbus.v2.posted', {
+    total: metrics.length,
+    succeeded: metrics.length - errors.length,
+    failed: errors.length,
+  })
+
+  if (errors.length) {
+    throw new Error(`Failed to post ${errors.length}/${metrics.length} edge5 modbus v2 metrics`)
+  }
 }
 
 export const handleEdge5ModbusV2: TopicHandler = async (topic, payload) => {
-  console.log('edge5.modbus.v2.received', { topic, bytes: payload.length })
+  log('edge5.modbus.v2.received', { topic, bytes: payload.length })
 
   const values = parseValues(payload)
-  const metrics = mapper.mapValues(values, Date.now())
+  const metrics = mapper.mapValues(values, new Date().toISOString())
   await postMetrics(metrics)
 }

app/src/handlers/edge5-modbus.ts

@@ -1,75 +0,0 @@
-import { postCloudIngest } from '../cloud-ingest.js'
-import type { TopicHandler } from '../types.js'
-
-export const TOPIC = 'data/edge5/modbus/v1'
-
-const EDGE = 'edge5'
-const REGISTER_COUNT = 125
-
-type Edge5ModbusMetric = {
-  edge: string
-  timestamp: number
-  tag: string
-  value: number
-}
-
-function parseValues(payload: Buffer): number[] {
-  let value: unknown
-
-  try {
-    value = JSON.parse(payload.toString('utf8')) as unknown
-  } catch {
-    throw new Error(`Expected JSON number[${REGISTER_COUNT}]`)
-  }
-
-  if (
-    Array.isArray(value) &&
-    value.length === REGISTER_COUNT &&
-    value.every((item) => typeof item === 'number' && Number.isFinite(item))
-  ) {
-    return value
-  }
-
-  throw new Error(`Expected JSON number[${REGISTER_COUNT}]`)
-}
-
-function toMetrics(values: number[], timestamp: number): Edge5ModbusMetric[] {
-  return values.map((value, index) => ({
-    edge: EDGE,
-    timestamp,
-    tag: `${EDGE}.modbus.${index + 1}`,
-    value,
-  }))
-}
-
-async function postMetrics(metrics: Edge5ModbusMetric[]): Promise<void> {
-  const response = await postCloudIngest(metrics)
-
-  if (!response.ok) {
-    const text = await response.text()
-    console.error('edge5.modbus.post_error', {
-      status: response.status,
-      statusText: response.statusText,
-      body: text.slice(0, 500),
-    })
-    return
-  }
-
-  console.log('edge5.modbus.posted', { count: metrics.length })
-}
-
-export const handleEdge5Modbus: TopicHandler = async (topic, payload) => {
-  console.log('edge5.modbus.received', { topic, bytes: payload.length })
-
-  let values: number[]
-
-  try {
-    values = parseValues(payload)
-  } catch (err) {
-    console.warn('edge5.modbus.invalid_payload', { topic, err })
-    return
-  }
-
-  const metrics = toMetrics(values, Date.now())
-  await postMetrics(metrics)
-}

app/src/handlers/edge5-video-v2.ts

@@ -0,0 +1,21 @@
+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);
+}

app/src/handlers/edge5-video.ts

@@ -1,16 +1,15 @@
+import { log } from '../helpers/log.js'
 import { onEdgeChunk } from '../stream/edge-chunk-relay.js'
 import type { TopicHandler } from '../types.js'
 
-export const TOPIC = 'data/edge5/video/v1'
-
-const BEACON_MS = 3000
-let lastBeacon = 0
+const LOG_INTERVAL_MS = 10_000
+let lastLog = 0
 
 export const handleEdge5Video: TopicHandler = async (_topic, payload) => {
   const now = Date.now()
-  if (now - lastBeacon >= BEACON_MS) {
-    console.log(`edge5.video ↑ ${payload.length}B`)
-    lastBeacon = now
+  if (now - lastLog >= LOG_INTERVAL_MS) {
+    log(`edge5.video ↑ ${payload.length}B`)
+    lastLog = now
   }
-  onEdgeChunk(payload)
-}
+  onEdgeChunk('v1', payload);
+}

app/src/handlers/edge5cdab-modbus.ts

@@ -0,0 +1,79 @@
+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)
+}

app/src/handlers/edge5i-modbus.ts

@@ -0,0 +1,55 @@
+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
+
+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: `register-${String(index).padStart(3, '0')}`,
+    value,
+  }))
+}
+
+async function postMetrics(metrics: DemoModbusMetric[]): 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) => {
+  log(`${EDGE}.modbus.received ${topic} ${payload.length} bytes`)
+
+  const values = parseValues(payload)
+  const metrics = toMetrics(values, new Date().toISOString())
+  await postMetrics(metrics)
+}

app/src/handlers/index.ts

@@ -1,13 +1,24 @@
-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'
+import { register } from '../registry.js';
 
-register(demoPlc, handleDemoPlc)
-register(edge5Modbus, handleEdge5Modbus)
-register(edge5ModbusV2, handleEdge5ModbusV2)
-register(edge5Video, handleEdge5Video)
+import { handleDemoPlc } from './demo-plc.js';
+import { handleDemoModbus } from './demo-modbus.js';
+import { handleEdge5ModbusV2 } from './edge5-modbus-v2.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);

app/src/helpers/log.ts

@@ -0,0 +1,3 @@
+export function log(...args: unknown[]): void {
+  console.log(`[${new Date().toISOString()}]`, ...args)
+}

app/src/helpers/parse.ts

@@ -7,14 +7,6 @@ export function parseJson<T = unknown>(payload: Buffer): T {
   return JSON.parse(text) as T
 }
 
-export function parseJsonArray(payload: Buffer): unknown[] {
-  const value = parseJson(payload)
-  if (!Array.isArray(value)) {
-    throw new Error('Expected JSON array')
-  }
-  return value
-}
-
 export function decodeBase64(payload: Buffer): Buffer {
   return Buffer.from(payload.toString('utf8'), 'base64')
 }

app/src/helpers/topic-match.ts

@@ -0,0 +1,38 @@
+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) ?? ''
+}

app/src/helpers/validate.ts

@@ -1,39 +0,0 @@
-const EXPECTED_CHUNK_LENGTH = 125
-
-export function isNonEmptyString(value: unknown): value is string {
-  return typeof value === 'string' && value.length > 0
-}
-
-export function isFiniteNumber(value: unknown): value is number {
-  return typeof value === 'number' && Number.isFinite(value)
-}
-
-export function isArrayOfLength(
-  value: unknown,
-  length: number,
-): value is unknown[] {
-  return Array.isArray(value) && value.length === length
-}
-
-export function isArrayOfLength125(value: unknown): value is unknown[] {
-  return isArrayOfLength(value, EXPECTED_CHUNK_LENGTH)
-}
-
-export function isArrayOfChunks125(
-  value: unknown,
-): value is unknown[][] {
-  if (!Array.isArray(value)) {
-    return false
-  }
-  return value.every((chunk) => isArrayOfLength125(chunk))
-}
-
-export function assertValid<T>(
-  value: unknown,
-  guard: (v: unknown) => v is T,
-  label: string,
-): asserts value is T {
-  if (!guard(value)) {
-    throw new Error(`Invalid payload: ${label}`)
-  }
-}

app/src/http/server.ts

@@ -3,7 +3,9 @@ import { createServer } from 'node:http'
 import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
-const httpPort = Number(process.env.HTTP_PORT ?? 80)
+import { log } from '../helpers/log.js'
+
+const httpPort = Number(process.env.HTTP_PORT)
 const publicDir = join(dirname(fileURLToPath(import.meta.url)), '../../public')
 const indexPath = join(publicDir, 'index.html')
 
@@ -24,5 +26,5 @@ createServer(async (req, res) => {
 
   res.writeHead(404).end('Not Found')
 }).listen(httpPort, () => {
-  console.log('http.server_started', { port: httpPort })
+  log('http.server_started', { port: httpPort })
 })

app/src/index.ts

@@ -2,5 +2,8 @@ import './handlers/index.js'
 import './http/server.js'
 import './mqtt.js'
 import './stream/edge-chunk-relay.js'
+import './stream/ws-pipe-relay.js'
 
-console.log('mqtt-worker.started')
+import { log } from './helpers/log.js'
+
+log('mqtt-worker.started')

app/src/mapping.ts

@@ -2,7 +2,7 @@ import { readFileSync } from 'node:fs'
 
 export type MappedMetric = {
   edge: string
-  timestamp: number
+  timestamp: string
   tag: string
   value: number
 }
@@ -14,8 +14,7 @@ type MappingConfig = {
 
 export type MetricMapper = {
   edge: string
-  tagCount: number
-  mapValues: (values: number[], timestamp: number) => MappedMetric[]
+  mapValues: (values: number[], timestamp: string) => MappedMetric[]
 }
 
 type MetricMapperOptions = {
@@ -34,7 +33,6 @@ export function createMetricMapper(options: MetricMapperOptions): MetricMapper {
 
   return {
     edge: config.edge,
-    tagCount: config.tags.length,
     mapValues: (values, timestamp) =>
       values.map((value, index) => ({
         edge: config.edge,

app/src/mqtt.ts

@@ -1,14 +1,15 @@
 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 ?? 'mqtt://localhost:1883'
+const mqttUrl = process.env.MQTT_URL as string
 
 export const mqttClient = mqtt.connect(mqttUrl)
 
 mqttClient.on('connect', () => {
-  console.log('mqtt.connected', { url: mqttUrl })
+  log('mqtt.connected', { url: mqttUrl })
 
   const topics = getRegisteredTopics()
   if (topics.length === 0) {
@@ -21,7 +22,7 @@ mqttClient.on('connect', () => {
       console.error('mqtt.subscribe_error', err)
       return
     }
-    console.log('mqtt.subscribed', { topics })
+    log('mqtt.subscribed', { topics })
   })
 })
 
@@ -34,5 +35,5 @@ mqttClient.on('error', (err) => {
 })
 
 mqttClient.on('reconnect', () => {
-  console.log('mqtt.reconnect')
+  log('mqtt.reconnect')
 })

app/src/registry.ts

@@ -1,18 +1,37 @@
+import { topicMatchesFilter } from './helpers/topic-match.js'
 import type { TopicHandler } from './types.js'
 
-const handlers = new Map<string, TopicHandler>()
+const exactHandlers = new Map<string, TopicHandler>()
+const patternHandlers = new Map<string, TopicHandler>()
+
+function isPatternTopic(topic: string): boolean {
+  return topic.includes('+') || topic.includes('#')
+}
 
 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 getHandler(topic: string): TopicHandler | undefined {
-  return handlers.get(topic)
+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 getRegisteredTopics(): string[] {
-  return [...handlers.keys()]
+  return [...exactHandlers.keys(), ...patternHandlers.keys()]
 }

app/src/router.ts

@@ -1,10 +1,10 @@
-import { getHandler } from './registry.js'
+import { resolveHandler } from './registry.js'
 
 export async function routeMessage(
   topic: string,
   payload: Buffer,
 ): Promise<void> {
-  const handler = getHandler(topic)
+  const handler = resolveHandler(topic)
 
   if (!handler) {
     console.warn('mqtt.unhandled_topic', { topic })

app/src/stream/edge-chunk-relay.ts

@@ -1,29 +1,41 @@
 import type { IncomingMessage } from 'http'
 import { WebSocket, WebSocketServer } from 'ws'
 
-const wsPort = Number(process.env.WS_PORT ?? 9090)
+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 clients = new Set<WebSocket>()
+
+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
+}
 
 wss.on('connection', (ws: WebSocket, req: IncomingMessage) => {
-  clients.add(ws)
-  console.log('ws.client_connected', {
-    clients: clients.size,
-    ip: req.socket.remoteAddress,
-  })
+  log(`ws.connection ${req.url}`);
+  const cameraId = req.url ? lastTopicSegment(req.url) : 'v1';
+
+  const clients = getClients(cameraId);
+  clients.add(ws);
 
   ws.on('close', () => {
     clients.delete(ws)
-    console.log('ws.client_closed', { clients: clients.size })
-  })
+    if (clients.size === 0) clientsByCamera.delete(cameraId)
+  });
+
 })
 
-wss.on('listening', () => {
-  console.log('ws.server_started', { port: wsPort })
-})
-
-export function onEdgeChunk(chunk: Buffer): void {
+export function onEdgeChunk(cameraId: string, chunk: Buffer): void {
+  const clients = clientsByCamera.get(cameraId)
+  if (!clients) return
   for (const client of clients) {
     if (client.readyState === WebSocket.OPEN) {
       client.send(chunk)

app/src/stream/ws-pipe-relay.ts

@@ -0,0 +1,94 @@
+import type { IncomingMessage } from 'http'
+import { WebSocket, WebSocketServer } from 'ws'
+
+import { log } from '../helpers/log.js'
+import { lastTopicSegment } from '../helpers/topic-match.js'
+
+const wsPipePort = Number(process.env.WS_PIPE_PORT)
+const LOG_INTERVAL_MS = 10_000
+
+const wss = new WebSocketServer({ port: wsPipePort, perMessageDeflate: false })
+
+const producersByChannel = new Map<string, WebSocket>()
+const viewersByChannel = new Map<string, Set<WebSocket>>()
+const lastLogByChannel = new Map<string, number>()
+
+function getViewers(channel: string): Set<WebSocket> {
+  let viewers = viewersByChannel.get(channel)
+  if (!viewers) {
+    viewers = new Set()
+    viewersByChannel.set(channel, viewers)
+  }
+  return viewers
+}
+
+function broadcast(channel: string, chunk: Buffer): void {
+  const clients = viewersByChannel.get(channel)
+  if (!clients) return
+  for (const client of clients) {
+    if (client.readyState === WebSocket.OPEN) {
+      client.send(chunk)
+    }
+  }
+}
+
+function logThroughput(channel: string, bytes: number): void {
+  const now = Date.now()
+  const lastLog = lastLogByChannel.get(channel) ?? 0
+  if (now - lastLog >= LOG_INTERVAL_MS) {
+    log(`pipe.in [${channel}] ↑ ${bytes}B`)
+    lastLogByChannel.set(channel, now)
+  }
+}
+
+function handleProducer(ws: WebSocket, channel: string): void {
+  const existing = producersByChannel.get(channel)
+  if (existing?.readyState === WebSocket.OPEN) {
+    existing.close(1000, 'replaced')
+  }
+  producersByChannel.set(channel, ws)
+
+  ws.on('message', (data, isBinary) => {
+    if (!isBinary) return
+    const chunk = Buffer.isBuffer(data) ? data : Buffer.from(data as ArrayBuffer)
+    logThroughput(channel, chunk.length)
+    broadcast(channel, chunk)
+  })
+
+  ws.on('close', () => {
+    if (producersByChannel.get(channel) === ws) {
+      producersByChannel.delete(channel)
+    }
+  })
+}
+
+function handleViewer(ws: WebSocket, channel: string, path: string): void {
+  log(`pipe.out.connection ${path}`)
+  const viewers = getViewers(channel)
+  viewers.add(ws)
+
+  ws.on('close', () => {
+    viewers.delete(ws)
+    if (viewers.size === 0) viewersByChannel.delete(channel)
+  })
+}
+
+wss.on('connection', (ws: WebSocket, req: IncomingMessage) => {
+  const path = req.url?.split('?')[0] ?? ''
+
+  if (path.startsWith('/in/')) {
+    handleProducer(ws, lastTopicSegment(path))
+    return
+  }
+
+  if (path.startsWith('/out/')) {
+    handleViewer(ws, lastTopicSegment(path), path)
+    return
+  }
+
+  ws.close(1008, 'unknown path')
+})
+
+wss.on('listening', () => {
+  log('pipe.server_started', { port: wsPipePort })
+})

app/tsconfig.json

@@ -7,8 +7,7 @@
     "esModuleInterop": true,
     "skipLibCheck": true,
     "outDir": "dist",
-    "rootDir": "src",
-    "noEmit": true
+    "rootDir": "src"
   },
   "include": ["src/**/*.ts"]
 }

docker-compose.yml

@@ -3,25 +3,37 @@ services:
     build: ./mosquitto
     container_name: mosquitto
     ports:
-      - "1883:1883"
+      - "1883:1883" # external MQTT port for receiving data
     volumes:
       - mosquitto_data:/mosquitto/data
+    networks:
+      - default
 
   app:
     build: ./app
     container_name: mqtt-worker
     depends_on:
       - mosquitto
-    ports:
-      # - "80:80"
-      - "9090:9090"
+    expose:
+      - 80 
+      - 9090 
+      - 9091
     environment:
       MQTT_URL: mqtt://mosquitto:1883
-      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:-}
+      HTTP_PORT: 80 # http port for video previewiong page
+      WS_PORT: 9090 # WebSocket port for video streaming
+      WS_PIPE_PORT: 9091 # WebSocket port for incoming and outgoing binary data
+      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/src/mappings/edge5-modbus.json}
+    networks:
+      - default
+      - proxy
 
 volumes:
   mosquitto_data:
+
+networks:
+  proxy:
+    external: true

package-lock.json

@@ -0,0 +1,6 @@
+{
+  "name": "mqtt-ingest",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}