@uns-kit/cli 0.0.39 → 0.0.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uns-kit/cli",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "description": "Command line scaffolding tool for UNS applications",
   "type": "module",
   "license": "MIT",
@@ -26,7 +26,7 @@
   ],
   "dependencies": {
     "azure-devops-node-api": "^15.1.1",
-    "@uns-kit/core": "0.0.43"
+    "@uns-kit/core": "1.0.4"
   },
   "unsKitPackages": {
     "@uns-kit/core": "0.0.36",

package/templates/cron/src/examples/cron-example.ts

@@ -9,6 +9,8 @@ import { UnsTags } from "../uns/uns-tags.js";
 import { UnsTopics } from "../uns/uns-topics.js";
 import { PhysicalMeasurements } from "@uns-kit/core/uns/uns-measurements.js";
 import { UnsPacket } from "@uns-kit/core/uns/uns-packet.js";
+import { ObjectTypes } from "@uns-kit/core/uns/uns-object.js";
+import { EquipmentAttributes } from "@uns-kit/core/uns/uns-attributes.js";
 
 
 /**
@@ -35,9 +37,19 @@ cronInput.event.on("cronEvent", async (event: UnsEvents["cronEvent"]) => {
     const numberValue: number = 42;
     const message: IUnsMessage = { data: { time, value: numberValue, uom: PhysicalMeasurements.MiliVolt } };
     const topic: UnsTopics = "example/";
+    const objectType = ObjectTypes.Equipment;
+    const objectId = "main";
     const tags: UnsTags[] = [];
     const packet = await UnsPacket.unsPacketFromUnsMessage(message);
-    mqttOutput.publishMqttMessage({ topic, attribute: "data-number", packet, description: "Number value", tags });
+    mqttOutput.publishMqttMessage({
+      topic,
+      attribute: EquipmentAttributes.MeasuredTemperature,
+      packet,
+      description: "Number value",
+      objectType,
+      objectId,
+      tags
+    });
   } catch (error) {
     const reason = error instanceof Error ? error : new Error(String(error));
     logger.error(`Error publishing message to MQTT: ${reason.message}`);

package/templates/default/package.json

@@ -18,7 +18,7 @@
     }
   },
   "scripts": {
-    "clean": "rimraf dist",
+    "clean": "rimraf dist tsconfig.tsbuildinfo",
     "typecheck": "tsc --noEmit",
     "build": "pnpm run clean && tsc -p tsconfig.json",
     "dev": "tsx watch src/index.ts",

package/templates/default/src/examples/data-example.ts

@@ -6,6 +6,8 @@ import { DataSizeMeasurements, PhysicalMeasurements } from "@uns-kit/core/uns/un
 import { UnsPacket } from "@uns-kit/core/uns/uns-packet.js";
 import { UnsTags } from "@uns-kit/core/uns/uns-tags.js";
 import { UnsTopics } from "@uns-kit/core/uns/uns-topics.js";
+import { ObjectTypes } from "@uns-kit/core/uns/uns-object.js";
+import { EnergyResourceAttributes } from "@uns-kit/core/uns/uns-attributes.js";
 
 /**
  * Load the configuration from a file.
@@ -33,6 +35,10 @@ mqttInput.event.on("input", async (event) => {
     if (event.topic === "raw/data") {
       const values = event.message.split(",");
       const [countRaw, timestampRaw, sensorRaw] = values;
+      if (!countRaw || !timestampRaw || !sensorRaw) {
+        logger.warn(`Skipping malformed raw/data payload: ${event.message}`);
+        return;
+      }
       const numberValue = Number.parseFloat(countRaw);
       const eventDate = new Date(Number.parseInt(timestampRaw, 10));
       const sensorValue = Number.parseFloat(sensorRaw);
@@ -43,10 +49,20 @@ mqttInput.event.on("input", async (event) => {
       const message: IUnsMessage = {
         data: { dataGroup, time, value: numberValue, uom: PhysicalMeasurements.None },
       };
-      const topic: UnsTopics = "example/";
+      const topic: UnsTopics = "acme/plant-a/hot-end/line-1/furnace-1/";
+      const objectType = ObjectTypes.EnergyResource;
+      const objectId = "main";
       const tags: UnsTags[] = [];
       const packet = await UnsPacket.unsPacketFromUnsMessage(message);
-      mqttOutput.publishMqttMessage({ topic, attribute: "data-count", packet, description: "Counter", tags });
+      mqttOutput.publishMqttMessage({
+        topic,
+        attribute: EnergyResourceAttributes.Current,
+        packet,
+        description: "Counter",
+        objectType,
+        objectId,
+        tags
+      });
 
       const sensorMessage: IUnsMessage = {
         data: { dataGroup, time, value: sensorValue, uom: PhysicalMeasurements.Celsius },
@@ -54,9 +70,11 @@ mqttInput.event.on("input", async (event) => {
       const sensorPacket = await UnsPacket.unsPacketFromUnsMessage(sensorMessage);
       mqttOutput.publishMqttMessage({
         topic,
-        attribute: "data-sensor",
+        attribute: EnergyResourceAttributes.Voltage,
         packet: sensorPacket,
         description: "Simulated sensor value",
+        objectType,
+        objectId,
         tags,
       });
     }

package/templates/default/src/examples/table-example.ts

@@ -6,6 +6,8 @@ import { UnsProxyProcess, ConfigFile, logger, type IUnsMessage } from "@uns-kit/
 import { UnsPacket } from "@uns-kit/core/uns/uns-packet.js";
 import { UnsTags } from "@uns-kit/core/uns/uns-tags.js";
 import { UnsTopics } from "@uns-kit/core/uns/uns-topics.js";
+import { ObjectTypes } from "@uns-kit/core/uns/uns-object.js";
+import { LineAttributes } from "@uns-kit/core/uns/uns-attributes.js";
 
 /**
  * Load the configuration from a file.
@@ -53,10 +55,20 @@ mqttInput.event.on("input", async (event) => {
       const time = UnsPacket.formatToISO8601(new Date(timestamp));
       // const message: IUnsMessage = { table: {dataGroup:"demo_table", values:jsonObject, columnTypes, time}};
       const message: IUnsMessage = { table: {dataGroup:"demo_table", values:jsonObject, time}};
-      const topic: UnsTopics = "example/factory-a/line-1/";
+      const topic: UnsTopics = "acme/plant-a/hot-end/line-1/";
+      const objectType = ObjectTypes.Line;
+      const objectId = "line-1";
       const tags: UnsTags[] = [];
       const packet = await UnsPacket.unsPacketFromUnsMessage(message);
-      mqttOutput.publishMqttMessage({ topic, attribute: "table-sample", packet, description: "Table", tags });
+      mqttOutput.publishMqttMessage({
+        topic,
+        attribute: LineAttributes.Status,
+        packet,
+        description: "Table",
+        objectType,
+        objectId,
+        tags
+      });
     }
   } catch (error) {
     const reason = error instanceof Error ? error : new Error(String(error));

package/templates/vscode/.vscode/launch.json

@@ -9,10 +9,11 @@
         "--enable-source-maps"
       ],
       "program": "${workspaceFolder}/dist/index.js",
-      "console": "integratedTerminal",
+      "console": "internalConsole",
       "internalConsoleOptions": "openOnSessionStart",
+      "outputCapture": "std",
       "sourceMaps": true,
-      "stopOnEntry": true,
+      "stopOnEntry": false,
       "outFiles": [
         "${workspaceFolder}/dist/**/*.js",
         "!**/node_modules/**"