@kronos-integration/service-mqtt 2.0.2 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kronos-integration/service-mqtt",
-  "version": "2.0.2",
+  "version": "3.0.0",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -36,9 +36,9 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib es2024 -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "dependencies": {
-    "@kronos-integration/service": "^12.0.4",
+    "@kronos-integration/service": "^13.0.0",
     "mqtt": "^5.13.3",
-    "pacc": "^3.6.7"
+    "pacc": "^3.8.0"
   },
   "devDependencies": {
     "@types/node": "^24.0.15",

package/src/service-mqtt.mjs

@@ -1,10 +1,35 @@
-import { mergeAttributeDefinitions, prepareAttributesDefinitions } from "pacc";
+import {
+  prepareAttributesDefinitions,
+  default_attribute,
+  url_attribute,
+  boolean_attribute,
+  secret_attribute
+} from "pacc";
 import { Service } from "@kronos-integration/service";
 import { connect } from "mqtt";
 import { TopicEndpoint } from "./topic-endpoint.mjs";
 
 export { TopicEndpoint };
 
+const ATTRIBUTES = prepareAttributesDefinitions({
+  url: {
+    ...url_attribute,
+    description: "url of the mqtt server",
+    needsRestart: true
+  },
+  clean: boolean_attribute,
+  clientId: default_attribute,
+  connectTimeout: {
+    type: "integer"
+  },
+  reconnectPeriod: {
+    type: "integer"
+  },
+  username: secret_attribute,
+  password: secret_attribute,
+  ...Service.attributes
+});
+
 /**
  * MQTT client.
  */
@@ -20,37 +45,8 @@ export class ServiceMQTT extends Service {
     return "mqtt client";
   }
 
-  static get configurationAttributes() {
-    return mergeAttributeDefinitions(
-      prepareAttributesDefinitions({
-        url: {
-          description: "url of the mqtt server",
-          needsRestart: true,
-          type: "url"
-        },
-        clean: {
-          type: "boolean"
-        },
-        clientId: {
-          type: "string"
-        },
-        connectTimeout: {
-          type: "integer"
-        },
-        reconnectPeriod: {
-          type: "integer"
-        },
-        username: {
-          type: "string",
-          private: true
-        },
-        password: {
-          type: "string",
-          private: true
-        }
-      }),
-      Service.configurationAttributes
-    );
+  static get attributes() {
+    return ATTRIBUTES;
   }
 
   /**

package/tests/mqtt-ava.mjs

@@ -4,19 +4,27 @@ import { ReceiveEndpoint } from "@kronos-integration/endpoint";
 import { StandaloneServiceProvider } from "@kronos-integration/service";
 import { ServiceMQTT, TopicEndpoint } from "@kronos-integration/service-mqtt";
 
-test("endpoint factory", async t => {
+test("factory", async t => {
   const sp = new StandaloneServiceProvider();
   const r1 = new ReceiveEndpoint("r1", sp);
   r1.receive = async () => "OK R1";
 
   const mqtt = await sp.declareService({
     type: ServiceMQTT,
+    clean: true,
+    clientId: "test",
+    url: "mqtt://localhost",
     endpoints: {
       s1: { topic: true, connected: r1 },
       s2: { topic: "s2b", connected: r1 }
     }
   });
 
+  t.deepEqual(mqtt.options, {
+    clean: true,
+    clientId: "test"
+  });
+  t.is(mqtt.url, "mqtt://localhost");
   t.is(mqtt.endpoints["s1"].name, "s1");
   t.is(mqtt.endpoints["s2"].name, "s2");
   t.true(mqtt.endpoints["s1"] instanceof TopicEndpoint);
@@ -30,7 +38,7 @@ test("start / stop", async t => {
 
   const received = [];
 
-  r1.receive = async (message) => received.push(message);
+  r1.receive = async message => received.push(message);
 
   const mqtt = await sp.declareService({
     type: ServiceMQTT,