Merge pull request #2357 from asgothian/master

Bug and device fix
ioBroker · Jan 12, 2025 · 99e52f0 · 99e52f0
2 parents 2f5bb8d + 375cdcf
commit 99e52f0
Show file tree

Hide file tree

Showing 7 changed files with 235 additions and 167 deletions.
diff --git a/lib/binding.js b/lib/binding.js
@@ -238,7 +238,7 @@ class Binding {
                     await this.doBindUnbind(type, bind_source, bind_source_ep, 'coordinator', '1');
                     this.debug('Successfully ' + (type === 'bind' ? 'bound' : 'unbound') + ' Coordinator from ' + bind_source);
                 } catch (e) {
-                    this.error(`Could not ${type} Coordinator from ${bind_source}: ${JSON.stringify(e)}`);
+                    this.error(`Could not ${type} Coordinator from ${bind_source}: ${(e && e.message ? e.message : 'no error message')} ${(e && e.stack ? e.stack : 'no call stack')}`);
                 }
             }
         } catch (error) {

diff --git a/lib/commands.js b/lib/commands.js
@@ -150,8 +150,8 @@ class Commands {
                             return;
                         }
                     }
-                    catch (e) {
-                        this.error(JSON.stringify(e));
+                    catch (error) {
+                        this.error(`Pairing with code failed with: ${(error && error.message ? error.message : 'no error message')} ${(error && error.stack ? error.stack : 'no call stack')}`);
                         this.adapter.sendTo(
                             from, command,
                             {error: 'Exception when trying to add QR code'},

diff --git a/lib/groups.js b/lib/groups.js
@@ -85,7 +85,7 @@ class Groups {
             }
 
         } catch (error) {
-            if (error) this.error(`getGroupMembersFromController: error is  ${JSON.stringify(error)} ${JSON.stringify(new Error().stack)}`);
+            if (error) this.error(`getGroupMembersFromController: error is  ${(error && error.message ? error.message : 'no error message')} ${(error && error.stack ? error.stack : 'no call stack')}`);
             else this.error('unidentifed error in getGroupMembersFromController');
         }
         return members;
@@ -138,15 +138,15 @@ class Groups {
                 for (const gpid of groups[epid]) {
                     const gpidn = parseInt(gpid);
                     if (gpidn < 0) {
-                        this.warn(`calling removeDevFromGroup with ${sysid}, ${-gpidn}, ${epid}` );
+                        this.debug(`calling removeDevFromGroup with ${sysid}, ${-gpidn}, ${epid}` );
                         const response = await this.zbController.removeDevFromGroup(sysid, (-gpidn), epid);
                         if (response && response.error) {
                             errors.push(response.error);
                             this.error(`remove dev from group Error: ${JSON.stringify(response.error)}`);
                         }
 
                     } else if (gpidn > 0) {
-                        this.warn(`calling addDevToGroup with ${sysid}, ${gpidn}, ${epid}` );
+                        this.debug(`calling addDevToGroup with ${sysid}, ${gpidn}, ${epid}` );
                         const response = await this.zbController.addDevToGroup(sysid, (gpidn), epid);
                         if (response && response.error) {
                             errors.push(response.error);
@@ -158,7 +158,7 @@ class Groups {
                 }
             }
         } catch (e) {
-            this.warn('caught error ' + JSON.stringify(e) + ' in updateGroupMembership');
+            this.warn('caught error ' + (e && e.message ? e.message : 'no error message') + ' in updateGroupMembership');
             this.adapter.sendTo(from, command, {error: e}, callback);
             return;
         }

diff --git a/lib/statescontroller.js b/lib/statescontroller.js
@@ -54,9 +54,9 @@ class StatesController extends EventEmitter {
     retainDeviceNames() {
         clearTimeout(this.retTimeoutHandle);
         this.retTimeoutHanlde = setTimeout(() => {
-            fs.writeFile(this.dev_names_fn, JSON.stringify(savedDeviceNamesDB, null, 2), err => {
-                if (err) {
-                    this.error(`error saving device names: ${JSON.stringify(err)}`);
+            fs.writeFile(this.dev_names_fn, JSON.stringify(savedDeviceNamesDB, null, 2), error => {
+                if (error) {
+                    this.error(`error saving device names: ${(error && error.message ? error.message : 'no error message')} ${(error && error.stack ? error.stack : 'no call stack')}`);
                 } else {
                     this.debug('saved device names');
                 }
@@ -109,7 +109,7 @@ class StatesController extends EventEmitter {
             }
 
             if (this.checkDebugDevice(id))
-                this.warn(`ELEVATED O1: User state change of state ${id} with value ${state.val} (ack: ${state.ack}) from ${state.from}`);
+                this.warn(`ELEVATED O01: User state change of state ${id} with value ${state.val} (ack: ${state.ack}) from ${state.from}`);
 
             this.debug(`User stateChange ${id} ${JSON.stringify(state)}`);
             const devId = getAdId(this.adapter, id); // iobroker device id
@@ -211,7 +211,7 @@ class StatesController extends EventEmitter {
         this.debug(`Change state '${stateKey}' at device ${deviceId} type '${model}'`);
         const elevated = this.checkDebugDevice(deviceId);
 
-        if (elevated) this.warn(`ELEVATED O2: Change state '${stateKey}' at device ${deviceId} type '${model}'`);
+        if (elevated) this.warn(`ELEVATED O02: Change state '${stateKey}' at device ${deviceId} type '${model}'`);
 
         const devStates = await this.getDevStates(deviceId, model);
         if (!devStates) {

diff --git a/lib/zbDeviceAvailability.js b/lib/zbDeviceAvailability.js
@@ -181,7 +181,7 @@ class DeviceAvailability extends BaseExtension {
                 }
             } catch (error) {
                 this.sendError(error);
-                this.debug(`Exception in readState of '${device.ieeeAddr}' - error : '${error}'`);
+                this.debug(`Exception in readState of '${device.ieeeAddr}' - error : '${(error && error.message ? error.message : 'no error message')}'`);
                 // intentionally empty: Just present to ensure we cause no harm
                 // when reading the state fails. => fall back on standard Ping function
             }