Fix publish

.github/workflows/npm-publish.yml

@@ -1,34 +1,45 @@
 # This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
 # For more information see: https://docs.github.com/en/actions/publishing-packages/publishing-nodejs-packages
 
-name: Node.js Package
+name: Publish Package to npmjs
 
 on:
   release:
-    types: [created]
+    types: [published]
   workflow_dispatch:
-
 jobs:
-  build:
+  build-cli:
+    name: Build and Publish CLI
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: packages/cli
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: '20.x'
+          registry-url: https://registry.npmjs.org
       - run: npm ci
       - run: npm test
+      - run: npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.npm_token}}
 
-  publish-npm:
-    needs: build
+  build-lib:
+    name: Build and Publish Lib
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: packages/lib
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18
-          registry-url: https://registry.npmjs.org/
+          node-version: '20.x'
+          registry-url: https://registry.npmjs.org
       - run: npm ci
-      - run: npm publish
+      - run: npm test
+      - run: npm publish --access public
         env:
           NODE_AUTH_TOKEN: ${{secrets.npm_token}}

.github/workflows/stale.yml

@@ -0,0 +1,3 @@
+- name: Close Stale Issues
+  uses: actions/stale@v9.0.0
+

.gitignore

@@ -1,4 +1,5 @@
-bin/src/node_modules
-cmd/
-dumps/
-old_certs/
+# directories
+node_modules/
+dist/
+
+#files

.npmignore

@@ -1,6 +1,4 @@
-certs/
-cmd/
-dumps/
 mosquito/
-old_certs/
 teardown/
+
+#Files

.prettierrc

@@ -3,5 +3,7 @@
   "useTabs": false,
   "semi": true,
   "arrowParens": "always",
-  "singleQuote": true
+  "singleQuote": true,
+  "trailingComma": "all",
+  "printWidth": 80
 }

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "editor.tabSize": 2,
+  "editor.defaultFormatter": "esbenp.prettier-vscode"
+}

Dockerfile

@@ -0,0 +1,16 @@
+FROM eclipse-mosquitto:1.6.15-openssl
+
+COPY mosquitto/basic.conf ./mosquitto/config/mosquitto.conf
+RUN apk add --update --no-cache openssl && \
+    mkdir /mosquitto/config/certs && \
+    cd /mosquitto/config/certs && \
+    openssl genrsa -out ca.key 2048 && \
+    openssl req -x509 -new -nodes -key ca.key -days 3650 -out ca.crt -subj '/CN=My Root' && \
+    openssl req -new -nodes -out server.csr -newkey rsa:2048 -keyout server.key -subj '/CN=Mosquitto' && \
+    openssl x509 -req -in server.csr -CA ca.crt -CAkey ca.key -CAcreateserial -out server.crt -days 3650 && \
+    c_rehash . && \
+    chown -R mosquitto:mosquitto /mosquitto && \
+    chmod 600 /mosquitto/config/certs/*
+
+EXPOSE 1883
+EXPOSE 8883

LICENSE.md

@@ -0,0 +1,15 @@
+ISC License
+
+Copyright (c) 2025 Rob Griffiths
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.

README.md

@@ -2,18 +2,24 @@
 
 [![Node.js Package](https://github.com/bytespider/Meross/actions/workflows/npm-ghr-publish.yml/badge.svg)](https://github.com/bytespider/Meross/actions/workflows/npm-ghr-publish.yml)
 
-Tools to help configure the Meross devices for purpose of utilising our <a href="https://github.com/bytespider/Meross/wiki/MQTT">own MQTT servers</a>.
+Tools to help configure the Meross devices to use private MQTT servers.
 
-Before you can use the tool to setup your device you need to put it into paring mode and connect to it's Access Point. It's IP address is known as the `--gateway` parameter and is typically `10.10.10.1`.
+## Requirements
 
-Requires `node` v18+.
+NodeJS: ^21.0.0, ^20.10.0, ^18.20.0
+NPM: ^10.0.0
+
+## Setup
+
+Requires `node` >=18  
+For Node.js >=21 you need to prepend commands with `NODE_OPTIONS='--insecure-http-parser'`. This is because the responses from some (if not all) versions of the Meross firmware incorrectly terminate headers with LF instead of CRLF. [CVE-2022-32214](https://nvd.nist.gov/vuln/detail/CVE-2022-32214)
 
 ## Home Assistant
 
 It's possible to get these devices to work with Home Assistant (HASSIO).
 <a href="https://github.com/bytespider/Meross/wiki/Home-Assistant-(HASSIO)">Setup Home Assistant MQTT</a>
 
-Once paired and linked to your broker, you can use the <a href="https://github.com/krahabb/meross_lan">Meross Lan</a> integration to control the devices.
+[Devices with Bluetooth pairing]()
 
 ## Tools