iobroker.zigbee 1.8.15 → 1.8.17

package/README.md

@@ -138,14 +138,16 @@ You can thank the authors by these links:
 
 
 ## Changelog
-### 1.8.15 (2023-07-11)
-* (arteck) corr battery status
+### 1.8.17 (2023-07-15)
+* (arteck) sentry corr
 
-### 1.8.13 (2023-07-09)
+### 1.8.16 (2023-07-11)
+* (arteck) battery corr
+
+### 1.8.13 
 * (arteck) ota corr
 * (arteck) devices are wrong with enum exposes
-* (arteck) select field for groups is larger 
-* (kirovilya) tuya.whitelabel corr
+* (arteck) select field for groups is larger
 
 ### 1.8.12 (2023-06-30)
 * (arteck) new Documentation (thx Stefan)

package/admin/index_m.html

@@ -972,7 +972,7 @@
         <div class="modal-content">
             <h3 class="translate">Config device</h3>
             <div class="row">
-                <div class="col">
+                <div class="co1l">
                     <div class="input-field">
                         <input id="d_name" type="text" class="value validate">
                         <label for="d_name" class="translate">Name</label>

package/io-package.json

@@ -1,24 +1,33 @@
 {
   "common": {
     "name": "zigbee",
-    "version": "1.8.15",
+    "version": "1.8.17",
     "news": {
-      "1.8.15": {
-        "en": "corr battery status",
-        "de": "corr batteriestatus",
-        "ru": "корр состояние батареи",
-        "pt": "status da bateria de corrimento",
-        "nl": "corr batterij status",
-        "fr": "état de la batterie",
-        "it": "stato della batteria",
-        "es": "estado de la batería",
-        "pl": "kor battery status",
-        "uk": "статус на сервери",
-        "zh-cn": "2. 电池身份"
+      "1.8.17": {
+        "en": "sentry corr",
+        "de": "versand",
+        "ru": "сендри корр",
+        "pt": "corante de sentinela",
+        "nl": "vertaling:",
+        "fr": "corr",
+        "it": "cor",
+        "es": "centry corr",
+        "pl": "kor",
+        "uk": "кофрів",
+        "zh-cn": "发信"
       },
-      "1.8.14": {
-        "en": "",
-        "de": ""
+      "1.8.16": {
+        "en": "battery corr",
+        "de": "batterie korrektor",
+        "ru": "аккумулятор корр",
+        "pt": "corante da bateria",
+        "nl": "batterij corr",
+        "fr": "batterie",
+        "it": "batteria corpo",
+        "es": "batería corrido",
+        "pl": "baterie",
+        "uk": "акумулятор",
+        "zh-cn": "电池组"
       },
       "1.8.13": {
         "en": "see Readme https://github.com/ioBroker/ioBroker.zigbee/blob/master/README.md",

package/main.js

@@ -109,33 +109,37 @@ class Zigbee extends utils.Adapter {
     }
 
     sendError(error, message) {
-        if (this.supportsFeature && this.supportsFeature('PLUGINS')) {
-            const sentryInstance = this.getPluginInstance('sentry');
-            if (sentryInstance) {
-                const Sentry = sentryInstance.getSentryObject();
-                if (Sentry) {
-                    if (message) {
-                        Sentry.configureScope(scope =>
-                            scope.addBreadcrumb({
-                                type: 'error', // predefined types
-                                category: 'error message',
-                                level: Sentry.Severity.Error,
-                                message
-                            }));
-                    }
-
-                    if (typeof error == 'string') {
-                        Sentry.captureException(new Error(error));
-                    } else {
-                        Sentry.captureException(error);
+        try {
+            if (this.supportsFeature && this.supportsFeature('PLUGINS')) {
+                const sentryInstance = this.getPluginInstance('sentry');
+                if (sentryInstance) {
+                    const Sentry = sentryInstance.getSentryObject();
+                    if (Sentry) {
+                        if (message) {
+                            Sentry.configureScope(scope =>
+                                scope.addBreadcrumb({
+                                    type: 'error', // predefined types
+                                    category: 'error message',
+                                    level: Sentry.Severity.Error,
+                                    message
+                                }));
+                        }
+    
+                        if (typeof error == 'string') {
+                            Sentry.captureException(new Error(error));
+                        } else {
+                            Sentry.captureException(error);
+                        }
                     }
                 }
             }
+        } catch (err) {
+            this.log.error(`SentryError : ${message} ${error} ${err} `);        
         }
     }
 
     filterError(errormessage, message, error) {
-        if (error.code === undefined) {
+        if (error != null && error.code == undefined) {
             let em = error.stack.match(/failed \((.+?)\) at/);
             em = em || error.stack.match(/failed \((.+?)\)/);
             this.log.error(`${message} no error code (${(em ? em[1] : 'undefined')})`);
@@ -515,29 +519,25 @@ class Zigbee extends utils.Adapter {
 
         if (!converters.length) {
             if (type !== 'readResponse') {
-                this.log.debug(
-                    `No converter available for '${mappedModel.model}' '${devId}' with cluster '${cluster}' and type '${type}'`
+                this.log.debug(`No converter available for '${mappedModel.model}' '${devId}' with cluster '${cluster}' and type '${type}'`
                 );
             }
             return;
         }
 
-        converters.forEach((converter) => {
-            const publish = (payload) => {
-                this.log.debug(`Publish ${safeJsonStringify(payload)} to ${safeJsonStringify(devId)}`);
-                if (payload) {
-                    this.publishToState(devId, model, payload);
-                }
-            };
+       const publish = (payload) => {
+            this.log.debug(`Publish '${safeJsonStringify(payload)}' devId '${devId}'`);
+            if (payload) {
+                this.publishToState(devId, model, payload);
+            }
+        };
 
-            this.stController.collectOptions(devId, model, (options) => {
-                const payload = converter.convert(mappedModel, message, publish, options, meta);
-                if (payload) {
-                    // Add device linkquality.
-                    publish(payload);
-                }
-            });
-        });
+        for (const converter of converters) {
+            let payload = await converter.convert(mappedModel, message, publish, mappedModel.options, meta);
+            if (payload) {
+                publish(payload);
+            }
+        }
     }
 
     publishToState(devId, model, payload) {
@@ -788,8 +788,8 @@ class Zigbee extends utils.Adapter {
                     await this.publishFromState(`0x${payload.device}`, '', undefined, stateList, payload.options);
                     return {success: true};
                 } catch (error) {
-                    this.filterError(`Error ${error.code} on send command to ${payload.device}.` +
-                        ` Error: ${error.stack}`, `Send command to ${payload.device} failed with`, error);
+                    this.log.error(`Error ${error.code} on send command to ${payload.device}.` + ` Error: ${error.stack} ` + `Send command to ${payload.device} failed with ` + error;
+                    this.filterError(`Error ${error.code} on send command to ${payload.device}.` + ` Error: ${error.stack}`, `Send command to ${payload.device} failed with`, error);
                     return {success: false, error};
                 }
             } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "1.8.15",
+  "version": "1.8.17",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -18,14 +18,14 @@
     "node": ">=10"
   },
   "optionalDependencies": {
-    "serialport": "^10.5.0"
+    "serialport": "^11.0.0"
   },
   "dependencies": {
     "@iobroker/adapter-core": "^2.6.8",
     "tar": "^6.1.15",
     "typescript": "^5.1.6",
-    "zigbee-herdsman": "0.16.0",
-    "zigbee-herdsman-converters": "15.38.0"
+    "zigbee-herdsman": "0.17.2",
+    "zigbee-herdsman-converters": "15.41.0"
   },
   "description": "Zigbee devices",
   "devDependencies": {