@kronos-integration/service-mqtt 4.0.11 → 4.0.13

package/README.md

@@ -1,10 +1,12 @@
+[![npm](https://img.shields.io/npm/v/@kronos-integration/service-mqtt.svg)](https://www.npmjs.com/package/@kronos-integration/service-mqtt)
 [![License](https://img.shields.io/badge/License-0BSD-blue.svg)](https://spdx.org/licenses/0BSD.html)
+[![bundlejs](https://deno.bundlejs.com/?q=@kronos-integration/service-mqtt\&badge=detailed)](https://bundlejs.com/?q=@kronos-integration/service-mqtt)
+[![downloads](http://img.shields.io/npm/dm/@kronos-integration/service-mqtt.svg?style=flat-square)](https://npmjs.org/package/@kronos-integration/service-mqtt)
 [![GitHub Issues](https://img.shields.io/github/issues/Kronos-Integration/service-mqtt.svg?style=flat-square)](https://github.com/Kronos-Integration/service-mqtt/issues)
 [![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2FKronos-Integration%2Fservice-mqtt%2Fbadge\&style=flat)](https://actions-badge.atrox.dev/Kronos-Integration/service-mqtt/goto)
 [![Styled with prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 [![Known Vulnerabilities](https://snyk.io/test/github/Kronos-Integration/service-mqtt/badge.svg)](https://snyk.io/test/github/Kronos-Integration/service-mqtt)
-[![Coverage Status](https://coveralls.io/repos/Kronos-Integration/service-mqtt/badge.svg)](https://coveralls.io/github/Kronos-Integration/service-mqtt)
 
 # @kronos-integration/service-mqtt
 

package/package.json

@@ -1,21 +1,22 @@
 {
   "name": "@kronos-integration/service-mqtt",
-  "version": "4.0.11",
+  "version": "4.0.13",
   "publishConfig": {
     "access": "public",
     "provenance": true
   },
+  "packageManager": "npm@11.6.4+sha512.1118cab46a05a50aee6bff5b1b4fa1df18afff89d57465620a3518035026955db87c5bdf9d207b07b7487d99f2490d450cb774655ad63ec2cba7bf1d0ad25d45",
   "types": "./types/service-mqtt.d.mts",
   "exports": {
     ".": {
-      "default": "./src/service-mqtt.mjs",
-      "types": "./types/service-mqtt.d.mts"
+      "types": "./types/service-mqtt.d.mts",
+      "default": "./src/service-mqtt.mjs"
     }
   },
   "description": "MQTT service",
   "keywords": [
-    "mqtt",
-    "kronos-service"
+    "kronos-service",
+    "mqtt"
   ],
   "contributors": [
     {
@@ -23,19 +24,19 @@
       "email": "markus.felten@gmx.de"
     }
   ],
-  "license": "BSD-2-Clause",
+  "license": "0BSD",
   "scripts": {
     "test": "node --run test:ava",
     "test:ava": "ava --timeout 4m tests/*-ava.mjs tests/*-ava-node.mjs",
     "cover": "c8 -x 'tests/**/*' --temp-directory build/tmp ava --timeout 4m tests/*-ava.mjs tests/*-ava-node.mjs && c8 report -r lcov -o build/coverage --temp-directory build/tmp",
-    "docs": "documentation readme --section=API ./src/**/*.mjs",
+    "docs": "documentation readme --section=API ./src**/*.mjs",
     "lint": "node --run lint:docs",
-    "lint:docs": "documentation lint ./src/**/*.mjs"
+    "lint:docs": "documentation lint ./src**/*.mjs"
   },
   "dependencies": {
-    "@kronos-integration/service": "^15.1.1",
+    "@kronos-integration/service": "^15.1.2",
     "mqtt": "^5.14.1",
-    "pacc": "^5.1.0"
+    "pacc": "^5.2.0"
   },
   "devDependencies": {
     "ava": "^6.4.1",
@@ -50,11 +51,14 @@
     "type": "git",
     "url": "git+https://github.com/Kronos-Integration/service-mqtt.git"
   },
+  "bugs": {
+    "url": "https://github.com/Kronos-Integration/service-mqtt/issues"
+  },
+  "homepage": "https://github.com/Kronos-Integration/service-mqtt#readme",
   "template": {
     "inheritFrom": [
       "arlac77/template-arlac77-github",
       "arlac77/template-kronos-component"
     ]
-  },
-  "packageManager": "npm@11.6.4+sha512.1118cab46a05a50aee6bff5b1b4fa1df18afff89d57465620a3518035026955db87c5bdf9d207b07b7487d99f2490d450cb774655ad63ec2cba7bf1d0ad25d45"
+  }
 }

package/src/service-mqtt.mjs

@@ -50,8 +50,8 @@ export class ServiceMQTT extends Service {
         ...integer_attribute_writable,
         connectionOption: true
       },
-      username: { ...username_attribute, credential: true },
-      password: { ...password_attribute, credential: true }
+      username: username_attribute,
+      password: password_attribute
     },
     Service.attributes
   );
@@ -86,16 +86,14 @@ export class ServiceMQTT extends Service {
   async _start() {
     await super._start();
 
-    const options = getAttributesJSON(
-      this,
-      this.attributes,
-      (name, attribute) => attribute.connectionOption
-    );
-
-    options.username = await this.getCredential("username");
-    options.password = await this.getCredential("password");
-
-    const client = connect(this.url, options);
+    const client = connect(this.url, {
+      ...getAttributesJSON(
+        this,
+        this.attributes,
+        (name, attribute) => attribute.connectionOption
+      ),
+      ...(await this.getCredentials())
+    });
 
     this.client = client;
 

package/.github/dependabot.yml

@@ -1,19 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: npm
-    directory: /
-    schedule:
-      interval: daily
-    commit-message:
-      prefix: "fix(deps):"
-      prefix-development: "chore(deps):"
-    labels:
-      - npm dependencies
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      interval: daily
-    commit-message:
-      prefix: "chore(action):"
-    labels:
-      - dependencies

package/.github/mosquitto/mosquitto.conf

@@ -1,3 +0,0 @@
-listener 1883
-log_timestamp false
-allow_anonymous true

package/.github/pr_labeler.yml

@@ -1,61 +0,0 @@
-ci:
-  - changed-files:
-      - any-glob-to-any-file:
-          - .github/workflows/*
-          - .travis.yml
-dependencies:
-  - changed-files:
-      - any-glob-to-any-file:
-          - package-lock.json
-          - yarn.lockfile
-deployment:
-  - changed-files:
-      - any-glob-to-any-file:
-          - netlify.toml
-          - _redirects
-documentation:
-  - changed-files:
-      - any-glob-to-any-file:
-          - docs/**/*
-          - "**/*.md"
-github:
-  - changed-files:
-      - any-glob-to-any-file:
-          - .github/**/*
-git:
-  - changed-files:
-      - any-glob-to-any-file:
-          - .gitignore
-labels:
-  - changed-files:
-      - any-glob-to-any-file:
-          - .github/pr_labeler.yml
-lint:
-  - changed-files:
-      - any-glob-to-any-file:
-          - .stylelintrc.json
-npm:
-  - changed-files:
-      - any-glob-to-any-file:
-          - .npmignore
-          - package.json
-          - package-lock.json
-openapi:
-  - changed-files:
-      - any-glob-to-any-file:
-          - openapi/*
-rollup:
-  - changed-files:
-      - any-glob-to-any-file:
-          - rollup.config.mjs
-styling:
-  - changed-files:
-      - any-glob-to-any-file:
-          - "**/*.css"
-test:
-  - changed-files:
-      - any-glob-to-any-file: tests/**/*
-vscode:
-  - changed-files:
-      - any-glob-to-any-file:
-          - .vscode/*

package/.github/workflows/auto_approve.yml

@@ -1,13 +0,0 @@
-name: Auto approve
-on: pull_request_target
-jobs:
-  auto-approve:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: hmarr/auto-approve-action@v4.0.0
-        if: github.actor == 'dependabot[bot]'
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          review-message: Auto approved automated PR
-    permissions:
-      pull-requests: write

package/.github/workflows/ci.yml

@@ -1,82 +0,0 @@
-name: CI
-on:
-  push:
-    branches:
-      - master
-      - next
-  pull_request:
-    branches:
-      - master
-      - next
-permissions:
-  contents: read
-  id-token: write
-jobs:
-  test-node:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-        node-version:
-          - 24.11.1
-    steps:
-      - name: checkout
-        uses: actions/checkout@v6.0.1
-      - name: Start Mosquitto
-        uses: namoshek/mosquitto-github-action@v1
-        with:
-          version: 2.0.22
-          ports: 1883:1883 8883:8883
-          config: ${{ github.workspace }}/.github/mosquitto/mosquitto.conf
-          container-name: mqtt
-      - name: prepare node
-        uses: actions/setup-node@v6.1.0
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: install
-        run: npm ci
-      - name: test and coverage
-        run: npm run cover --if-present
-      - name: coveralls
-        uses: coverallsapp/github-action@v2
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          flag-name: run-${{ matrix.test_number }}
-          path-to-lcov: build/coverage/lcov.info
-          parallel: true
-        continue-on-error: true
-  release:
-    needs:
-      - test-node
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      issues: write
-      pull-requests: write
-      id-token: write
-    steps:
-      - name: checkout
-        uses: actions/checkout@v6.0.1
-      - name: prepare node
-        uses: actions/setup-node@v6.1.0
-        with:
-          node-version: 24.11.1
-      - name: install
-        run: npm ci
-      - name: release
-        run: npx semantic-release
-        env:
-          CI: "true"
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  finish:
-    needs:
-      - test-node
-    runs-on: ubuntu-latest
-    steps:
-      - name: finish coveralls
-        uses: coverallsapp/github-action@v2
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          path-to-lcov: build/coverage/lcov.info
-          parallel-finished: true

package/.github/workflows/codeql_analysis.yml

@@ -1,30 +0,0 @@
-name: CodeQL
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v6.0.1
-      - name: git checkout
-        run: git checkout
-        if: ${{ github.event_name == 'pull_request' }}
-      - name: initialize CodeQL
-        uses: github/codeql-action/init@v4
-        with:
-          languages: javascript
-      - name: prepare node
-        uses: actions/setup-node@v6.1.0
-        with:
-          node-version: 24.11.1
-      - name: install
-        run: npm ci
-      - name: perform CodeQL analysis
-        uses: github/codeql-action/analyze@v4

package/.github/workflows/pr_labeler.yml

@@ -1,14 +0,0 @@
-name: Pull Request Labeler
-on: pull_request_target
-jobs:
-  triage:
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/labeler@v6
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          configuration-path: .github/pr_labeler.yml
-          sync-labels: false

package/.github/workflows/update_package_lock.yml

@@ -1,36 +0,0 @@
-name: Update package lock
-on:
-  push:
-    paths:
-      - package.json
-  schedule:
-    - cron: 13 8 * * 6
-jobs:
-  update_package_lock:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v6.0.1
-      - name: prepare node
-        uses: actions/setup-node@v6.1.0
-        with:
-          node-version: 24.11.1
-      - name: remove lock
-        run: rm package-lock.json
-      - name: install playwright
-        run: npx playwright install
-      - name: test
-        run: npm install-test
-        env:
-          BROWSER: chrome
-      - name: create pull request
-        uses: gr2m/create-or-update-pull-request-action@v1.10.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          path: package-lock.json
-          title: Regenerate package lock
-          body: bring lock in sync
-          branch: package-lock
-          labels: npm
-          commit-message: "chore(deps): lock"

package/.github/workflows/update_readme_api.yml

@@ -1,32 +0,0 @@
-name: API to readme
-on:
-  schedule:
-    - cron: 31 14 * * 6
-  push:
-    paths:
-      - src/*
-jobs:
-  update_readme_api:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v6.0.1
-      - name: prepare node
-        uses: actions/setup-node@v6.1.0
-        with:
-          node-version: 24.11.1
-      - name: install
-        run: npm ci
-      - name: run docs
-        run: npm run docs
-      - uses: gr2m/create-or-update-pull-request-action@v1.10.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          path: README.md
-          title: Sync API into README
-          branch: readme-api
-          commit-message: "docs(README): sync API"
-    permissions:
-      contents: write
-      pull-requests: write

package/tests/mqtt-ava.mjs

@@ -1,60 +0,0 @@
-import test from "ava";
-
-import { ReceiveEndpoint } from "@kronos-integration/endpoint";
-import { StandaloneServiceProvider } from "@kronos-integration/service";
-import { ServiceMQTT, TopicEndpoint } from "@kronos-integration/service-mqtt";
-
-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 },
-      "s2/*/a": { topic: true, connected: r1 }
-    }
-  });
-
-  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);
-  t.deepEqual(mqtt.topics, ["s1", "s2b", "s2/*/a"]);
-});
-
-test("start / stop", async t => {
-  const sp = new StandaloneServiceProvider();
-
-  const r1 = new ReceiveEndpoint("r1", sp);
-
-  const received = [];
-
-  r1.receive = async message => received.push(message);
-
-  const mqtt = await sp.declareService({
-    type: ServiceMQTT,
-    url: "mqtt://localhost",
-    clientId: "test",
-    clean: true,
-    connectTimeout: 4000,
-    reconnectPeriod: 1000,
-    endpoints: {
-      s1: { topic: true, connected: r1 }
-    }
-  });
-
-  t.is(mqtt.endpoints["s1"].name, "s1");
-
-  await mqtt.start();
-  t.is(mqtt.state, "running");
-
-  await mqtt.stop();
-  t.is(mqtt.state, "stopped");
-});