@attraccess/plugin-wago 0.1.0-nightly.940.1 → 0.1.0-nightly.941.1

package/dist/index.js

@@ -42,6 +42,31 @@ var import_plugins_backend_sdk9 = require("@attraccess/plugins-backend-sdk");
 var import_node_crypto3 = require("node:crypto");
 var import_common = require("@nestjs/common");
 
+// measurement-contract.ts
+var UNITS = {
+  ampere: "milliampere",
+  volt: "millivolt",
+  watt: "milliwatt",
+  "watt-hour": "milliwatt-hour",
+  percent: "millipercent"
+};
+var MeasurementContractError = class extends Error {
+  constructor(code, message) {
+    super(message);
+    __publicField(this, "code", code);
+  }
+};
+function parseMeasurement(value) {
+  if (typeof value.channelId !== "string" || !value.channelId.trim() || !Object.values(UNITS).concat(Object.keys(UNITS)).includes(value.unit) || !Number.isSafeInteger(value.value) || !["live", "cumulative"].includes(value.kind))
+    throw new MeasurementContractError("invalid_measurement_message", "invalid integer measurement message");
+  return {
+    channelId: value.channelId,
+    unit: value.unit,
+    value: value.value,
+    kind: value.kind
+  };
+}
+
 // backend/protocol.ts
 var DISCOVERY_ROOT = "attraccess/wago/discovery";
 var CONFIGURATION_PROTOCOL_VERSION = 1;
@@ -122,38 +147,43 @@ function parseOperationalMessage(prefix, topic, payload) {
   const root = `${normalizeOperationalPrefix(prefix)}/v${CONFIGURATION_PROTOCOL_VERSION}/controllers/`;
   if (!topic.startsWith(root)) return null;
   const [hardwareId, suffix, extra] = topic.slice(root.length).split("/");
-  if (!hardwareId || extra || !["state", "measurements", "faults", "acknowledgements"].includes(suffix)) return null;
+  if (!hardwareId || /[+#]/.test(hardwareId) || extra !== void 0 || !["state", "measurements", "faults", "acknowledgements"].includes(suffix))
+    return null;
   const value = parseObject(payload, "operational message");
   const timestamp = requiredTimestamp(value.timestamp);
   const sequence = requiredSequence(value.sequence);
+  if (value.streamId !== void 0 && (typeof value.streamId !== "string" || !value.streamId.trim() || value.streamId.length > 128))
+    throw new Error("operational streamId is invalid");
+  const streamId = value.streamId;
   if (suffix === "state") {
-    if (typeof value.connected !== "boolean" || !isNullableInteger(value.revision) || !isNullableString(value.contentHash) || !isBooleanRecord(value.outputs))
+    if (typeof value.connected !== "boolean" || !isNullableInteger(value.revision) || !isNullableString(value.contentHash) || !isBooleanRecord(value.outputs) || value.inputs !== void 0 && !isBooleanRecord(value.inputs) || value.readiness !== void 0 && (!value.readiness || typeof value.readiness !== "object" || Array.isArray(value.readiness) || typeof value.readiness.hardwareAvailable !== "boolean"))
       throw new Error("invalid state message");
     return {
       hardwareId,
       message: {
         category: "state",
         timestamp,
+        ...streamId !== void 0 ? { streamId } : {},
         sequence,
         connected: value.connected,
         revision: value.revision,
         contentHash: value.contentHash,
-        outputs: value.outputs
+        outputs: value.outputs,
+        ...value.inputs !== void 0 ? { inputs: value.inputs } : {},
+        ...value.readiness !== void 0 ? { readiness: { hardwareAvailable: value.readiness.hardwareAvailable } } : {}
       }
     };
   }
   if (suffix === "measurements") {
-    if (typeof value.channelId !== "string" || typeof value.unit !== "string" || typeof value.value !== "number" || !Number.isFinite(value.value))
-      throw new Error("invalid measurement message");
+    if (streamId === void 0) throw new Error("operational streamId is required for measurements");
     return {
       hardwareId,
       message: {
         category: "measurement",
         timestamp,
+        streamId,
         sequence,
-        channelId: value.channelId,
-        unit: value.unit,
-        value: value.value
+        ...parseMeasurement(value)
       }
     };
   }
@@ -165,6 +195,7 @@ function parseOperationalMessage(prefix, topic, payload) {
       message: {
         category: "fault",
         timestamp,
+        ...streamId !== void 0 ? { streamId } : {},
         sequence,
         channelId: value.channelId,
         code: value.code,
@@ -179,6 +210,7 @@ function parseOperationalMessage(prefix, topic, payload) {
     message: {
       category: "acknowledgement",
       timestamp,
+      ...streamId !== void 0 ? { streamId } : {},
       sequence,
       id: value.id,
       status: value.status,
@@ -215,11 +247,12 @@ function parseObject(payload, label) {
   return value;
 }
 function requiredTimestamp(value) {
-  if (typeof value !== "string" || Number.isNaN(Date.parse(value))) throw new Error("operational timestamp is invalid");
+  if (typeof value !== "string" || !/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/.test(value) || Number.isNaN(Date.parse(value)) || new Date(value).toISOString() !== value)
+    throw new Error("operational timestamp is invalid");
   return value;
 }
 function requiredSequence(value) {
-  if (!Number.isSafeInteger(value) || value < 0) throw new Error("operational sequence is invalid");
+  if (!Number.isSafeInteger(value) || value < 1) throw new Error("operational sequence is invalid");
   return value;
 }
 function isNullableInteger(value) {
@@ -631,10 +664,12 @@ function validateGuard(value, path, capabilities, channelIds, errors) {
 function validateMeasurement(value, path, capabilities, errors) {
   if (value === void 0) return;
   if (!record(value, path, errors)) return;
-  exactKeys(value, path, ["unit", "scale", "offset"], errors);
-  enumValue(value.unit, `${path}.unit`, ["ampere", "volt", "watt", "percent"], errors);
+  exactKeys(value, path, ["unit", "scale", "offset", "kind"], errors, ["kind"]);
+  enumValue(value.unit, `${path}.unit`, ["ampere", "volt", "watt", "watt-hour", "percent"], errors);
   if (!Number.isFinite(value.scale) || !Number.isFinite(value.offset))
     errors.push({ path, code: "invalid_measurement", message: "scale and offset must be finite numbers" });
+  if (value.kind !== void 0 && !["live", "cumulative"].includes(value.kind))
+    errors.push({ path: `${path}.kind`, code: "unsupported_value", message: "kind must be live or cumulative" });
   if (!capabilities.has("measurement"))
     errors.push({ path, code: "unsupported_field", message: "measurement requires measurement capability" });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@attraccess/plugin-wago",
-  "version": "0.1.0-nightly.940.1",
+  "version": "0.1.0-nightly.941.1",
   "description": "Official Attraccess integration for WAGO CC100 controllers.",
   "keywords": [
     "attraccess-plugin",