homebridge-openwrt-control 0.3.1-beta.9 → 0.3.2

package/CHANGELOG.md

@@ -9,6 +9,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - After update to v0.1.0 the plugin need to be reconfigured!
 
+## [0.3.2] - (18.02.2026)
+
+## Changes
+
+- MQTT refactor
+- add funding
+- bump deependencies
+- readme updated
+- cleanup
+
 ## [0.3.1] - (25.01.2026)
 
 ## Changes

package/README.md

@@ -13,7 +13,9 @@
 [![GitHub pull requests](https://img.shields.io/github/issues-pr/grzegorz914/homebridge-openwrt-control.svg)](https://github.com/grzegorz914/homebridge-openwrt-control/pulls)
 [![GitHub issues](https://img.shields.io/github/issues/grzegorz914/homebridge-openwrt-control.svg)](https://github.com/grzegorz914/homebridge-openwrt-control/issues)
 
- Homebridge plugin for OpenWrt devices.
+Homebridge plugin for OpenWrt devices.
+
+<a href="https://buycoffee.to/grzegorz914" target="_blank"><img src="https://buycoffee.to/static/img/share/share-button-primary.png" style="width: 234px; height: 61px" alt="Postaw mi kawę na buycoffee.to"></a>
   
 </span>
 
@@ -24,11 +26,11 @@
 | [Homebridge](https://github.com/homebridge/homebridge) | [Homebridge Wiki](https://github.com/homebridge/homebridge/wiki) | HomeKit Bridge | Required |
 | [Homebridge UI](https://github.com/homebridge/homebridge-config-ui-x) | [Homebridge UI Wiki](https://github.com/homebridge/homebridge-config-ui-x/wiki) | Homebridge User Interface | Recommended |
 | [OpenWrt Control](https://www.npmjs.com/package/homebridge-openwrt-control) | [Plug-In Wiki](https://github.com/grzegorz914/homebridge-openwrt-control/wiki) | Homebridge Plug-In | Required |
-| [OpenWrt ACL File](https://github.com/grzegorz914/homebridge-openwrt-control/blob/94bc6af8693999a48e7a75e5ed64428c52480312/homebridge-acl.json) | `/usr/share/rpcd/acl.d/` | Access Control | Recommended |
+| [OpenWrt ACL File](https://github.com/grzegorz914/homebridge-openwrt-control/blob/main/homebridge-acl.json) | `/usr/share/rpcd/acl.d/` | Access Control | Recommended |
 
 ## Note
 
-* To use all of functions need to download [ACL File](https://github.com/grzegorz914/homebridge-openwrt-control/blob/94bc6af8693999a48e7a75e5ed64428c52480312/homebridge-acl.json) and put in to `/usr/share/rpcd/acl.d/` folder on your router.
+* To use all of functions use [ACL File](https://github.com/grzegorz914/homebridge-openwrt-control/blob/main/homebridge-acl.json) and put in to `/usr/share/rpcd/acl.d/` folder on your router.
 * After put it restart OpenWrt or RPCD service.
 
 ## About The Plugin

package/package.json

@@ -1,7 +1,7 @@
 {
     "displayName": "OpenWrt Control",
     "name": "homebridge-openwrt-control",
-    "version": "0.3.1-beta.9",
+    "version": "0.3.2",
     "description": "Homebridge plugin to control OpenWrt flashed devices.",
     "license": "MIT",
     "author": "grzegorz914",
@@ -34,8 +34,8 @@
         "node": "^20 || ^22 || ^24 || ^25"
     },
     "dependencies": {
-        "mqtt": "^5.14.1",
-        "axios": "^1.13.2",
+        "mqtt": "^5.15.0",
+        "axios": "^1.13.5",
         "express": "^5.2.1"
     },
     "keywords": [
@@ -47,6 +47,10 @@
         "wireless",
         "router"
     ],
+    "funding": {
+        "type": "Buy Coffee To",
+        "url": "https://buycoffee.to/grzegorz914"
+    },
     "contributors": [],
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1"

package/src/mqtt.js

@@ -4,6 +4,7 @@ import EventEmitter from 'events';
 class Mqtt extends EventEmitter {
     constructor(config) {
         super();
+        this.config = config;
 
         const url = `mqtt://${config.host}:${config.port}`;
         const subscribeTopic = `${config.prefix}/Set`;
@@ -15,60 +16,70 @@ class Mqtt extends EventEmitter {
             protocolVersion: 5,
             clean: false,
             properties: {
-                sessionExpiryInterval: 60 * 60, // 1 hour
+                sessionExpiryInterval: 60 * 60,
                 userProperties: {
                     source: 'node-client'
                 }
             }
         };
 
-        this.mqttClient = connect(url, options);
-
-        // === CONNECTED ===
-        this.mqttClient.on('connect', async (packet) => {
-            this.emit('connected', 'MQTT Connected.');
-            this.emit('connected', `MQTT Subscribe topic: ${subscribeTopic}`);
-
-            try {
-                const result = await this.mqttClient.subscribeAsync(subscribeTopic, {
-                    qos: 1,
-                    properties: {
-                        userProperties: {
-                            type: 'subscription'
-                        }
+        this.mqttClient = connect(url, options)
+            .on('connect', async () => {
+                this.emit('connected', 'MQTT v5 connected.');
+
+                try {
+                    await new Promise((resolve, reject) => {
+                        this.mqttClient.subscribe(subscribeTopic,
+                            {
+                                qos: 1,
+                                properties: {
+                                    userProperties: {
+                                        type: 'subscription'
+                                    }
+                                }
+                            },
+                            (error) => {
+                                if (error) return reject(error);
+                                resolve();
+                            }
+                        );
+                    });
+
+                    this.emit('connected', `MQTT Subscribe topic: ${subscribeTopic}`);
+                } catch (error) {
+                    if (config.logWarn) this.emit('warn', `MQTT Subscribe error: ${error.message}`);
+                }
+            })
+            .on('message', (topic, payload, packet) => {
+                try {
+                    const parsedMessage = JSON.parse(payload.toString());
+                    if (config.logDebug) this.emit('debug', `MQTT Received Topic: ${topic}, Payload: ${JSON.stringify(parsedMessage, null, 2)}`);
+
+                    for (const [key, value] of Object.entries(parsedMessage)) {
+                        this.emit('set', key, value);
                     }
-                });
-
-                // MQTT v5 subscription results contain reason codes
-                if (config.logDebug) this.emit('debug', `Subscribed to ${subscribeTopic}, reason codes: ${JSON.stringify(result)}`);
-
-            } catch (error) {
-                if (config.logWarn) this.emit('warn', `MQTT Subscribe error: ${error}`);
-            }
-        });
-
-        // === MESSAGE ===
-        this.mqttClient.on('message', (topic, payload, packet) => {
-            try {
-                const obj = JSON.parse(payload.toString());
-                if (config.logDebug) this.emit('debug', `MQTT Received:\nTopic: ${topic}\nPayload: ${JSON.stringify(obj, null, 2)}\nProperties: ${JSON.stringify(packet.properties, null, 2)}`);
-
-                const key = Object.keys(obj)[0];
-                const value = Object.values(obj)[0];
-                this.emit('set', key, value);
-
-            } catch (error) {
-                if (config.logWarn) this.emit('warn', `MQTT Parse error: ${error}`);
-            }
-        });
+                } catch (error) {
+                    if (config.logWarn) this.emit('warn', `MQTT Parse error: ${error.message}`);
+                }
+            })
+            .on('error', (error) => {
+                this.emit('warn', `MQTT Error: ${error.message}`);
+            })
+            .on('reconnect', () => {
+                if (config.logDebug) this.emit('debug', 'MQTT Reconnecting...');
+            })
+            .on('close', () => {
+                if (config.logDebug) this.emit('debug', 'MQTT Connection closed.');
+            });
+    }
 
-        // === PUBLISH EVENT ===
-        this.on('publish', async (topic, message) => {
-            try {
-                const fullTopic = `${config.prefix}/${topic}`;
-                const publishMessage = JSON.stringify(message);
+    publish(topic, message) {
+        return new Promise((resolve, reject) => {
+            const fullTopic = `${this.config.prefix}/${topic}`;
+            const publishMessage = JSON.stringify(message);
 
-                await this.mqttClient.publishAsync(fullTopic, publishMessage, {
+            this.mqttClient.publish(fullTopic, publishMessage,
+                {
                     qos: 1,
                     properties: {
                         contentType: 'application/json',
@@ -77,25 +88,17 @@ class Mqtt extends EventEmitter {
                             action: 'set'
                         }
                     }
-                });
-
-                if (config.logDebug) this.emit('debug', `MQTT Publish:\nTopic: ${fullTopic}\nPayload: ${publishMessage}`);
-            } catch (error) {
-                if (config.logWarn) this.emit('warn', `MQTT Publish error: ${error}`);
-            }
-        });
-
-        // === ERRORS / STATE ===
-        this.mqttClient.on('error', (err) => {
-            if (config.logWarn) this.emit('warn', `MQTT Error: ${err.message}`);
-        });
-
-        this.mqttClient.on('reconnect', () => {
-            if (config.logDebug) this.emit('debug', 'MQTT Reconnecting...');
-        });
+                },
+                (error) => {
+                    if (error) {
+                        if (this.config.logWarn) this.emit('warn', `MQTT Publish error: ${error.message}`);
+                        return reject(error);
+                    }
 
-        this.mqttClient.on('close', () => {
-            if (config.logDebug) this.emit('debug', 'MQTT Connection closed.');
+                    if (this.config.logDebug) this.emit('debug', `MQTT Publish Topic: ${fullTopic}, Payload: ${publishMessage}`);
+                    resolve();
+                }
+            );
         });
     }
 }

package/src/router.js

@@ -176,7 +176,7 @@ class Router extends EventEmitter {
 
             // External integrations
             if (this.restFulConnected) this.restFul1.update('info', openWrtInfo);
-            if (this.mqttConnected) this.mqtt1.emit('publish', 'Info', openWrtInfo);
+            if (this.mqttConnected) await this.mqtt1.publish('Info', openWrtInfo);
         });
     }