@kronos-integration/service-mqtt 1.0.6 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kronos-integration/service-mqtt",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -38,7 +38,7 @@
   "dependencies": {
     "@kronos-integration/service": "^11.2.15",
     "model-attributes": "^4.3.0",
-    "mqtt": "^5.13.2"
+    "mqtt": "^5.13.3"
   },
   "devDependencies": {
     "@kronos-integration/test-interceptor": "^7.0.29",

package/src/service-mqtt.mjs

@@ -1,4 +1,7 @@
-import { mergeAttributeDefinitions, prepareAttributesDefinitions } from "model-attributes";
+import {
+  mergeAttributeDefinitions,
+  prepareAttributesDefinitions
+} from "model-attributes";
 import { Service } from "@kronos-integration/service";
 import { connect } from "mqtt";
 import { TopicEndpoint } from "./topic-endpoint.mjs";
@@ -76,7 +79,9 @@ export class ServiceMQTT extends Service {
   }
 
   get topics() {
-    return Object.keys(this.endpoints).filter(e => e.topic);
+    return Object.values(this.endpoints)
+      .filter(e => e.topic)
+      .map(e => e.name);
   }
 
   /**
@@ -117,6 +122,7 @@ export class ServiceMQTT extends Service {
   }
 
   async _stop() {
+    await this.client.endAsync();
     return super._stop();
   }
 }

package/src/topic-endpoint.mjs

@@ -1,5 +1,4 @@
 import { SendReceiveEndpoint } from "@kronos-integration/endpoint";
-import { Service } from "@kronos-integration/service";
 
 export class TopicEndpoint extends SendReceiveEndpoint {
   constructor(name, owner, options) {

package/tests/mqtt-ava.mjs

@@ -19,6 +19,5 @@ test("endpoint factory", async t => {
 
   t.is(mqtt.endpoints["s1"].name, "s1");
   t.true(mqtt.endpoints["s1"] instanceof TopicEndpoint);
-
- // t.deepEqual(mqtt.topics, ["s1"]);
+  t.deepEqual(mqtt.topics, ["s1"]);
 });

package/types/service-mqtt.d.mts

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