@kronos-integration/service-mqtt 1.0.0 → 1.0.2

package/.github/workflows/ci.yml

@@ -17,11 +17,8 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - macos-latest
-          - windows-latest
         node-version:
-          - 22.17.0
-          - 24.3.0
+          - 24.4.1
     steps:
       - name: checkout
         uses: actions/checkout@v4.2.2
@@ -58,7 +55,7 @@ jobs:
       - name: prepare node
         uses: actions/setup-node@v4.4.0
         with:
-          node-version: 22.17.0
+          node-version: 22.17.1
           cache: npm
           cache-dependency-path: package-lock.json
       - name: install

package/.github/workflows/codeql_analysis.yml

@@ -23,7 +23,7 @@ jobs:
       - name: prepare node
         uses: actions/setup-node@v4.4.0
         with:
-          node-version: 22.17.0
+          node-version: 22.17.1
           cache: npm
       - name: install
         run: npm ci

package/.github/workflows/update_package_lock.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - 22.17.0
+          - 22.17.1
         browser:
           - chrome
     steps:

package/.github/workflows/update_readme_api.yml

@@ -14,7 +14,7 @@ jobs:
       - name: prepare node
         uses: actions/setup-node@v4.4.0
         with:
-          node-version: 22.17.0
+          node-version: 22.17.1
       - name: install
         run: npm ci
       - name: run docs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kronos-integration/service-mqtt",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -12,7 +12,7 @@
       "types": "./types/service-mqtt.d.mts"
     }
   },
-  "description": "http server",
+  "description": "MQTT service",
   "keywords": [
     "mqtt",
     "kronos-service"
@@ -36,23 +36,23 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib es2024 -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "dependencies": {
-    "@kronos-integration/service": "^11.2.8",
-    "attributes": "^0.1.337",
-    "mqtt": "^5.13.1"
+    "@kronos-integration/service": "^11.2.13",
+    "model-attributes": "^4.2.6",
+    "mqtt": "^5.13.2"
   },
   "devDependencies": {
     "@kronos-integration/test-interceptor": "^7.0.29",
-    "@types/node": "^24.0.7",
-    "ava": "^6.4.0",
+    "@types/node": "^24.0.14",
+    "ava": "^6.4.1",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",
     "got": "^14.4.7",
     "network-address": "^1.1.2",
-    "semantic-release": "^24.2.5",
+    "semantic-release": "^24.2.7",
     "typescript": "^5.8.3"
   },
   "engines": {
-    "node": ">=22.16.0"
+    "node": ">=22.17.1"
   },
   "repository": {
     "type": "git",

package/src/service-mqtt.mjs

@@ -23,16 +23,29 @@ export class ServiceMQTT extends Service {
   static get configurationAttributes() {
     return mergeAttributes(
       createAttributes({
-        "url": {
-          description: "server listen definition",
-
-          attributes: {
-            url: {
-              description: "url of the mqtt server",
-              needsRestart: true,
-              type: "url"
-            }
-          }
+        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"
+        },
+        password: {
+          type: "string",
+          private: true
         }
       }),
       Service.configurationAttributes
@@ -46,6 +59,27 @@ 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]])
+    );
+
+    //return { username: this.username, password: this.password };
+  }
+
+  get topics() {
+    return Object.keys(this.endpoints).filter(e => e.topic);
+  }
+
   /**
    * On demand create TopicEndpoint.
    * @param {string} name
@@ -53,13 +87,7 @@ export class ServiceMQTT extends Service {
    * @return {Class} TopicEndpoint if path is present of name starts with '/'
    */
   endpointFactoryFromConfig(name, definition, ic) {
-
-    if (
-      definition.method ||
-      definition.path ||
-      name[0] === "/" ||
-      name.match(/^\w+:\//)
-    ) {
+    if (definition.topic) {
       return TopicEndpoint;
     }
 
@@ -69,7 +97,25 @@ export class ServiceMQTT extends Service {
   async _start() {
     await super._start();
 
-    this.client = connect(this.url);
+    console.log(this.options);
+    const client = connect(this.url, this.options);
+
+    this.client = client;
+
+    client.on("connect", err => {
+      client.subscribe(this.topics, (err, granted) => {
+        if (err) {
+          this.error(err);
+        }
+      });
+    });
+
+    client.on("message", (topic, message) => {
+      const ep = this.endpoints[topic];
+      if (ep) {
+        ep.receive(message);
+      }
+    });
   }
 
   async _stop() {

package/src/topic-endpoint.mjs

@@ -1,6 +1,16 @@
-
 import { SendReceiveEndpoint } from "@kronos-integration/endpoint";
 import { Service } from "@kronos-integration/service";
 
 export class TopicEndpoint extends SendReceiveEndpoint {
-}
+  constructor(name, owner, options) {
+    super(name, owner, options);
+
+    if (options.topic) {
+      this._topic = options.topic;
+    }
+  }
+
+  get topic() {
+    return this._topic || this.name;
+  }
+}

package/tests/mqtt-ava.mjs

@@ -1,13 +1,8 @@
 import test from "ava";
 
 import { ReceiveEndpoint } from "@kronos-integration/endpoint";
-import {
-  StandaloneServiceProvider,
-} from "@kronos-integration/service";
-import {
-  ServiceMQTT, TopicEndpoint
-} from "@kronos-integration/service-mqtt";
-
+import { StandaloneServiceProvider } from "@kronos-integration/service";
+import { ServiceMQTT, TopicEndpoint } from "@kronos-integration/service-mqtt";
 
 test("endpoint factory", async t => {
   const sp = new StandaloneServiceProvider();
@@ -17,14 +12,13 @@ test("endpoint factory", async t => {
 
   const mqtt = await sp.declareService({
     type: ServiceMQTT,
-    listen: {
-      socket: 1241
-    },
     endpoints: {
-      "/s1": { connected: r1,}
+      s1: { topic: "s1", connected: r1 }
     }
   });
 
-  t.is(mqtt.endpoints["/s1"].name, "/s1");
-  t.true(mqtt.endpoints["/s1"] instanceof TopicEndpoint);
+  t.is(mqtt.endpoints["s1"].name, "s1");
+  t.true(mqtt.endpoints["s1"] instanceof TopicEndpoint);
+
+ // t.deepEqual(mqtt.topics, ["s1"]);
 });

package/types/service-mqtt.d.mts

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

package/types/topic-endpoint.d.mts

@@ -1,3 +1,6 @@
 export class TopicEndpoint extends SendReceiveEndpoint {
+    constructor(name: any, owner: any, options: any);
+    _topic: any;
+    get topic(): any;
 }
 import { SendReceiveEndpoint } from "@kronos-integration/endpoint";