@kronos-integration/service-mqtt 3.0.0 → 3.1.0

package/.github/workflows/ci.yml

@@ -18,6 +18,7 @@ jobs:
         os:
           - ubuntu-latest
         node-version:
+          - 22.17.1
           - 24.4.1
     steps:
       - name: checkout
@@ -25,10 +26,10 @@ jobs:
       - name: Start Mosquitto
         uses: namoshek/mosquitto-github-action@v1
         with:
-          version: '2.0.22'
-          ports: '1883:1883 8883:8883'
+          version: 2.0.22
+          ports: 1883:1883 8883:8883
           config: ${{ github.workspace }}/.github/mosquitto/mosquitto.conf
-          container-name: 'mqtt'
+          container-name: mqtt
       - name: prepare node
         uses: actions/setup-node@v4.4.0
         with:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kronos-integration/service-mqtt",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -36,12 +36,11 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib es2024 -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "dependencies": {
-    "@kronos-integration/service": "^13.0.0",
+    "@kronos-integration/service": "^13.0.1",
     "mqtt": "^5.13.3",
-    "pacc": "^3.8.0"
+    "pacc": "^3.9.0"
   },
   "devDependencies": {
-    "@types/node": "^24.0.15",
     "ava": "^6.4.1",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/service-mqtt.mjs

@@ -11,25 +11,6 @@ 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.
  */
@@ -45,9 +26,26 @@ export class ServiceMQTT extends Service {
     return "mqtt client";
   }
 
-  static get attributes() {
-    return ATTRIBUTES;
-  }
+  static 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
+  );
 
   /**
    * @return {string} name with url
@@ -56,21 +54,6 @@ export class ServiceMQTT extends Service {
     return `${this.name}(${this.url})`;
   }
 
-  get options() {
-    return Object.fromEntries(
-      [
-        "username",
-        "password",
-        "clean",
-        "clientId",
-        "connectTimeout",
-        "reconnectPeriod"
-      ]
-        .filter(key => this[key] !== undefined)
-        .map(key => [key, this[key]])
-    );
-  }
-
   get topics() {
     return Object.values(this.endpoints)
       .filter(e => e.topic)
@@ -94,7 +77,16 @@ export class ServiceMQTT extends Service {
   async _start() {
     await super._start();
 
-    const client = connect(this.url, this.options);
+    const options = Object.fromEntries(
+      ["clean", "clientId", "connectTimeout", "reconnectPeriod"]
+        .filter(key => this[key] !== undefined)
+        .map(key => [key, this[key]])
+    );
+
+    options.password = await this.password;
+    options.username = await this.username;
+
+    const client = connect(this.url, options);
 
     this.client = client;
 

package/tests/mqtt-ava.mjs

@@ -20,11 +20,8 @@ test("factory", async t => {
     }
   });
 
-  t.deepEqual(mqtt.options, {
-    clean: true,
-    clientId: "test"
-  });
-  t.is(mqtt.url, "mqtt://localhost");
+  t.is(mqtt.clean, true);
+  t.is(mqtt.clientId, "test");
   t.is(mqtt.endpoints["s1"].name, "s1");
   t.is(mqtt.endpoints["s2"].name, "s2");
   t.true(mqtt.endpoints["s1"] instanceof TopicEndpoint);

package/types/service-mqtt.d.mts

@@ -3,9 +3,6 @@ export { TopicEndpoint };
  * MQTT client.
  */
 export class ServiceMQTT extends Service {
-    get options(): {
-        [k: string]: any;
-    };
     get topics(): any[];
     /**
      * On demand create TopicEndpoint.