Compare commits
3 Commits
3c94cd92c1
...
dev-artem
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
85658225a3 | ||
|
|
fc8bfb6691 | ||
| fe9e7b5438 |
@@ -36,10 +36,10 @@ type Edge5ModbusV3Metric = {
|
||||
edge: string
|
||||
timestamp: string
|
||||
tag: string
|
||||
value: number
|
||||
value: number | null
|
||||
}
|
||||
|
||||
function toFloatCDAB(reg0: number, reg1: number): number {
|
||||
function toFloatCDAB(reg0: number, reg1: number): number | null {
|
||||
const buf = Buffer.allocUnsafe(4)
|
||||
buf.writeUInt16BE(reg1, 0)
|
||||
buf.writeUInt16BE(reg0, 2)
|
||||
@@ -63,16 +63,7 @@ function toMetrics(values: number[], timestamp: string): 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
|
||||
}
|
||||
const value = toFloatCDAB(values[i], values[i + 1]); // null is possible to send
|
||||
|
||||
metrics.push({
|
||||
edge: EDGE,
|
||||
@@ -98,7 +89,12 @@ async function postMetrics(metrics: Edge5ModbusV3Metric[]): Promise<void> {
|
||||
throw new Error(text || `${response.status} ${response.statusText}`)
|
||||
}
|
||||
|
||||
void postDemoCloudIngest(metric); // для демо-системы
|
||||
const demoResponse = await postDemoCloudIngest(metric); // для демо-системы
|
||||
|
||||
if (!demoResponse.ok) {
|
||||
const text = await demoResponse.text()
|
||||
throw new Error(text || `${demoResponse.status} ${demoResponse.statusText}`)
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : String(error)
|
||||
|
||||
@@ -9,10 +9,10 @@ type Edge5iiModbusMetric = {
|
||||
edge: string
|
||||
timestamp: string
|
||||
tag: string
|
||||
value: number
|
||||
value: number | null
|
||||
};
|
||||
|
||||
function toFloatCDAB(reg0: number, reg1: number): number {
|
||||
function toFloatCDAB(reg0: number, reg1: number): number | null {
|
||||
const buf = Buffer.allocUnsafe(4)
|
||||
buf.writeUInt16BE(reg1, 0)
|
||||
buf.writeUInt16BE(reg0, 2)
|
||||
@@ -36,14 +36,7 @@ function toMetrics(values: number[], timestamp: string): 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
|
||||
};
|
||||
const value = toFloatCDAB(values[i], values[i + 1]); // null is possible to send
|
||||
|
||||
metrics.push({
|
||||
edge: EDGE,
|
||||
|
||||
@@ -1,9 +1,42 @@
|
||||
import { resolveHandler } from './registry.js'
|
||||
|
||||
type ErrorWithCause = Error & {
|
||||
cause?: unknown
|
||||
}
|
||||
|
||||
type NodeError = Error & {
|
||||
code?: string
|
||||
address?: string
|
||||
port?: number
|
||||
}
|
||||
|
||||
function getErrorCause(error: Error): NodeError | null {
|
||||
const cause = (error as ErrorWithCause).cause
|
||||
return cause instanceof Error ? (cause as NodeError) : null
|
||||
}
|
||||
|
||||
function formatHandlerError(error: unknown): object {
|
||||
if (!(error instanceof Error)) {
|
||||
return { message: String(error) }
|
||||
}
|
||||
|
||||
const cause = getErrorCause(error)
|
||||
|
||||
return {
|
||||
message: error.message,
|
||||
cause: cause?.message,
|
||||
code: cause?.code,
|
||||
address: cause?.address,
|
||||
port: cause?.port,
|
||||
stack: error.stack,
|
||||
}
|
||||
}
|
||||
|
||||
export async function routeMessage(
|
||||
topic: string,
|
||||
payload: Buffer,
|
||||
): Promise<void> {
|
||||
try {
|
||||
const handler = resolveHandler(topic)
|
||||
|
||||
if (!handler) {
|
||||
@@ -11,9 +44,8 @@ export async function routeMessage(
|
||||
return
|
||||
}
|
||||
|
||||
try {
|
||||
await handler(topic, payload)
|
||||
} catch (err) {
|
||||
console.error('mqtt.handler_error', { topic, err })
|
||||
console.error('mqtt.handler_error', { topic, error: formatHandlerError(err) })
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user