@kronos-integration/service-mqtt 1.0.0 → 1.0.1

package/.github/workflows/ci.yml

@@ -17,12 +17,12 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - macos-latest
-          - windows-latest
         node-version:
           - 22.17.0
           - 24.3.0
     steps:
+      - name: install
+        run: sudo apt-get -y install mosquitto
       - name: checkout
         uses: actions/checkout@v4.2.2
       - name: prepare node

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kronos-integration/service-mqtt",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "publishConfig": {
     "access": "public",
     "provenance": true

package/src/service-mqtt.mjs

@@ -23,16 +23,16 @@ 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"
+        },
+        username: {
+          type: "string"
+        },
+        password: {
+          type: "string"
         }
       }),
       Service.configurationAttributes
@@ -46,6 +46,14 @@ export class ServiceMQTT extends Service {
     return `${this.name}(${this.url})`;
   }
 
+  get options() {
+    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 +61,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 +71,24 @@ export class ServiceMQTT extends Service {
   async _start() {
     await super._start();
 
-    this.client = connect(this.url);
+    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,11 @@ export { TopicEndpoint };
  * MQTT client.
  */
 export class ServiceMQTT extends Service {
+    get options(): {
+        username: any;
+        password: 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";