(simatec) Fix Zigbee Backup

Author: simatec

lib/scripts/34-zigbee.js

@@ -2,56 +2,76 @@
 const fs = require('node:fs');
 const getDate = require('../tools').getDate;
 const path = require('node:path');
+const compress = require('../targz').compress;
 
-function command(options, log, callback) {
-    let zigbeeInst = [];
+async function command(options, log, callback) {
+    const zigbeeInst = [];
 
-    const compress = require('../targz').compress;
+    try {
+        for (let i = 0; i <= 10; i++) {
+            // Check if zigbee adapter instance exists
+            const obj = await options.adapter.getForeignObjectAsync(`system.adapter.zigbee.${i}`);
+            if (!obj) continue;
 
-    for (let i = 0; i <= 5; i++) {
-        let pth = path.join(options.path, `zigbee_${i}`);
+            // Check if corresponding folder exists
+            const pth = path.join(options.path, `zigbee_${i}`);
+            if (!fs.existsSync(pth)) continue;
 
-        if (fs.existsSync(pth)) {
-            let nameSuffix;
+            // Determine suffix for the filename
+            let nameSuffix = '';
             if (options.hostType === 'Slave') {
-                nameSuffix = options.slaveSuffix ? options.slaveSuffix : '';
+                nameSuffix = options.slaveSuffix || '';
             } else {
-                nameSuffix = options.nameSuffix ? options.nameSuffix : '';
+                nameSuffix = options.nameSuffix || '';
             }
 
-            const fileName = path.join(options.backupDir, `zigbee.${i}_${getDate()}${nameSuffix ? `_${nameSuffix}` : ''}_backupiobroker.tar.gz`);
+            // Construct backup filename
+            const fileName = path.join(
+                options.backupDir,
+                `zigbee.${i}_${getDate()}${nameSuffix ? `_${nameSuffix}` : ''}_backupiobroker.tar.gz`
+            );
 
             options.context.fileNames.push(fileName);
 
-            compress({
-                src: pth,
-                dest: fileName,
-                tar: {
-                    ignore: function (name) {
-                        return path.extname(name) === '.gz' // ignore .tar.gz files when packing
+            // Run compression and wait for it to finish
+            await new Promise((resolve) => {
+                compress({
+                    src: pth,
+                    dest: fileName,
+                    tar: {
+                        ignore: (name) => path.extname(name) === '.gz'
                     }
-                }
-            }, (err, stdout, stderr) => {
-                if (err) {
-                    options.context.errors.zigbee = err.toString();
-                    stderr && log.error(stderr);
-                    if (callback) {
-                        callback(err, stderr);
-                        callback = null;
+                }, (err, stdout, stderr) => {
+                    if (err) {
+                        options.context.errors.zigbee = err.toString();
+                        if (stderr) log.error(stderr);
+                        if (callback) {
+                            callback(err, stderr);
+                            callback = null;
+                        }
+                    } else {
+                        options.context.types.push(`zigbee.${i}`);
+                        options.context.done.push(`zigbee.${i}`);
                     }
-                } else {
-                    options.context.types.push(`zigbee.${i}`);
-                    options.context.done.push(`zigbee.${i}`);
-                }
+                    resolve();
+                });
             });
+
             zigbeeInst.push(`zigbee.${i}`);
-            if (i === 5) {
-                zigbeeInst.length ? log.debug(`found zigbee database: ${zigbeeInst}`) : log.warn('no zigbee database found!!');
-            }
-        } else if (!fs.existsSync(pth) && i === 5) {
-            zigbeeInst.length ? log.debug(`found zigbee database: ${zigbeeInst}`) : log.warn('no zigbee database found!!');
-            callback && callback(null, 'done');
         }
+
+        // Log summary
+        if (zigbeeInst.length) {
+            log.debug(`Found zigbee databases: ${zigbeeInst.join(', ')}`);
+        } else {
+            log.warn('No zigbee databases found!');
+        }
+
+        // Final callback
+        if (callback) callback(null, 'done');
+    } catch (err) {
+        log.error(`Error during zigbee backup: ${err.message}`);
+        if (callback) callback(err);
     }
 }