diff --git a/app/Dockerfile b/app/Dockerfile index 1699fc5..723aacb 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -10,4 +10,4 @@ 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"] +CMD ["npm", "run", "start"] diff --git a/app/package.json b/app/package.json index df3f589..3399ecd 100644 --- a/app/package.json +++ b/app/package.json @@ -3,9 +3,9 @@ "private": true, "type": "module", "scripts": { - "dev": "tsx watch --env-file=.env src/index.ts", + "dev": "tsx watch src/index.ts", "build": "tsc", - "start": "node --env-file=.env dist/index.js" + "start": "tsx src/index.ts" }, "dependencies": { "@types/node": "^25.9.1", diff --git a/app/src/cloud-ingest.ts b/app/src/cloud-ingest.ts index 120c53c..abd18bc 100644 --- a/app/src/cloud-ingest.ts +++ b/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 { return fetch(cloudIngestUrl, { diff --git a/app/src/handlers/edge5-modbus-v2.ts b/app/src/handlers/edge5-modbus-v2.ts index 2167fe4..ee6d67a 100644 --- a/app/src/handlers/edge5-modbus-v2.ts +++ b/app/src/handlers/edge5-modbus-v2.ts @@ -5,9 +5,7 @@ import type { TopicHandler } from '../types.js' export const TOPIC = 'data/edge5/modbus/v2' 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 diff --git a/app/src/http/server.ts b/app/src/http/server.ts index 42ec1de..edf9d15 100644 --- a/app/src/http/server.ts +++ b/app/src/http/server.ts @@ -3,7 +3,7 @@ import { createServer } from 'node:http' import { dirname, join } from 'node:path' import { fileURLToPath } from 'node:url' -const httpPort = Number(process.env.HTTP_PORT ?? 80) +const httpPort = Number(process.env.HTTP_PORT) const publicDir = join(dirname(fileURLToPath(import.meta.url)), '../../public') const indexPath = join(publicDir, 'index.html') diff --git a/app/src/mqtt.ts b/app/src/mqtt.ts index a178558..994ef29 100644 --- a/app/src/mqtt.ts +++ b/app/src/mqtt.ts @@ -3,7 +3,7 @@ import mqtt from 'mqtt' 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) diff --git a/app/src/stream/edge-chunk-relay.ts b/app/src/stream/edge-chunk-relay.ts index 040ae55..c61ad32 100644 --- a/app/src/stream/edge-chunk-relay.ts +++ b/app/src/stream/edge-chunk-relay.ts @@ -1,7 +1,7 @@ import type { IncomingMessage } from 'http' import { WebSocket, WebSocketServer } from 'ws' -const wsPort = Number(process.env.WS_PORT ?? 9090) +const wsPort = Number(process.env.WS_PORT) const wss = new WebSocketServer({ port: wsPort, perMessageDeflate: false }) const clients = new Set()