prevent crash case on invalid subscribe

iobroker-community-adapters · Sep 28, 2023 · a84907e · a84907e
1 parent 40eed3c
commit a84907e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
@@ -25,7 +25,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
 
     steps:
       - uses: actions/checkout@v3
@@ -93,7 +93,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [18.x]
 
     steps:
       - name: Checkout code

diff --git a/README.md b/README.md
@@ -71,6 +71,9 @@ default: state-ID converted to a mqtt topic.
 -->
 
 ## Changelog
+### __WORK IN PROGRESS__
+* (foxriver76) prevent crash cases on invalid subscribe
+
 ### 1.6.4 (2023-07-26)
 * (DutchmanNL) Option to allow self-signed certificates in adapter settings added.
 

diff --git a/main.js b/main.js
@@ -321,11 +321,18 @@ class MqttClient extends utils.Adapter {
         this.client && this.client.unsubscribe(this.topicAddPrefixIn(topic), callback);
     }
 
-    iobSubscribe(id, callback) {
+    async iobSubscribe(id, callback) {
         if (!this._subscribes.includes(id)) {
             this._subscribes.push(id);
             this._subscribes.sort();
-            this.subscribeForeignStates(id, callback);
+            try {
+                await this.subscribeForeignStatesAsync(id);
+            } catch (e) {
+                this.log.error(`Cannot subscribe to "${id}": ${e.message}`);
+            }
+            if (typeof callback === 'function') {
+                callback();
+            }
         }
     }
 
@@ -465,7 +472,7 @@ class MqttClient extends utils.Adapter {
 
                 this.getObjectView('system', 'custom', {}, (err, doc) => {
                     const ids = [];
-                    if (doc && doc.rows) {
+                    if (doc?.rows) {
                         for (let i = 0, l = doc.rows.length; i < l; i++) {
                             const cust = doc.rows[i].value;
                             if (cust && cust[this.namespace] && cust[this.namespace].enabled) {
@@ -663,7 +670,6 @@ class MqttClient extends utils.Adapter {
             }
 
             if (custom[id].enabled) {
-                //@todo should this be .subscribe?
                 //subscribe to state changes
                 this.iobSubscribe(id, err => {
                     //publish state once