Fixing typescript build

simatec · Jan 2, 2025 · 4abe557 · 4abe557
1 parent 5a7207d
commit 4abe557
Show file tree

Hide file tree

Showing 8 changed files with 129 additions and 200 deletions.
diff --git a/lib/config.ts b/lib/config.ts
@@ -45,6 +45,13 @@ export function decrypt(secret: string, value: string): string {
     return result;
 }
 
+function takeBoolean(value: boolean | string): boolean {
+    if (value === 'true') {
+        return true;
+    }
+    return value === true;
+}
+
 /**
  * Decode passwords in complex structures
  *
@@ -366,13 +373,13 @@ export function initConfig(options: {
         source: 'cifs',
         mount: options.config.cifsMount,
         advancedDelete: options.config.advancedDelete,
-        debugging: options.config.debugLevel,
+        debugging: takeBoolean(options.config.debugLevel),
         fileDir: options.bashDir,
-        wakeOnLAN: options.config.wakeOnLAN,
+        wakeOnLAN: takeBoolean(options.config.wakeOnLAN),
         macAd: options.config.macAd,
         wolTime: options.config.wolWait,
         wolPort: options.config.wolPort || 9,
-        wolExtra: options.config.wolExtra,
+        wolExtra: takeBoolean(options.config.wolExtra),
         smb: options.config.smbType,
         sudo: options.config.sudoMount,
         cifsDomain: options.config.cifsDomain,

diff --git a/lib/types.d.ts b/lib/types.d.ts
@@ -386,7 +386,7 @@ export interface BackItUpConfigComplexCreator extends BackItUpConfigSimpleCreato
     ownCron: boolean;
     debugging: boolean;
     everyXDays: number;
-    deleteBackupAfter: number; // delete old backupfiles after x days
+    deleteBackupAfter: number; // delete old backup files after x days
 
     historyHTML: BackItUpConfigMessageSimple;
     historyJSON: BackItUpConfigMessageSimple;
@@ -442,7 +442,7 @@ export interface BackItUpConfigComplexCreatorCCU extends BackItUpConfigComplexCr
 }
 
 export interface BackItUpConfigInternal {
-    iobroker: BackItUpConfigComplexCreator;
+    iobroker: BackItUpConfigComplexCreatorIoBroker;
     ccu: BackItUpConfigComplexCreatorCCU;
 }
 
@@ -742,3 +742,14 @@ export interface BackItUpAdapterOptions {
     zigbee2mqttPath: string;
     zigbeeEnabled: boolean;
 }
+
+export type BackItUpExecuteContext = {
+    fileNames: string[];
+    errors: Record<string, string>;
+    done: boolean[];
+    types: string[];
+};
+
+export interface BackItUpLog {
+
+}
diff --git a/main.js b/main.js
@@ -30,7 +30,7 @@ let http;
 let https;
 
 let systemLang = 'de'; // system language
-const backupConfig = {};
+let backupConfig = {};
 const backupTimeSchedules = []; // Array for Backup Times
 let taskRunning = false;
 
@@ -65,7 +65,7 @@ function startAdapter(options) {
 
                 const type = id.split('.').pop();
 
-                if ((sysCheck && sysCheck.ready && sysCheck.ready === true) || adapter.config.cifsEnabled === true) {
+                if (sysCheck?.ready === true || adapter.config.cifsEnabled === true) {
                     let config;
                     try {
                         config = JSON.parse(JSON.stringify(backupConfig[type]));
@@ -1500,22 +1500,26 @@ async function main(adapter) {
         }
     }, 10000);
 
-    adapter.getForeignObject('system.config', (err, obj) => {
-        if (obj && obj.common && obj.common.language) {
-            systemLang = obj.common.language;
-        }
-        //initConfig(obj?.native?.secret || 'Zgfr56gFe87jJOM');
-        initConfig(adapter);
+    const systemConfig = await adapter.getForeignObjectAsync('system.config');
+    if (systemConfig?.common?.language) {
+        systemLang = systemConfig.common.language;
+    }
+    backupConfig = initConfig({
+        config: adapter.config,
+        systemLang,
+        bashDir,
+        secret: systemConfig?.native?.secret || 'Zgfr56gFe87jJOM',
+        log: adapter.log,
+    });
 
-        checkStates();
+    await checkStates();
 
-        if (adapter.config.hostType !== 'Slave') {
-            createBackupSchedule();
-            nextBackup(true, null);
+    if (adapter.config.hostType !== 'Slave') {
+        createBackupSchedule();
+        await nextBackup(true, null);
 
-            detectLatestBackupFile(adapter);
-        }
-    });
+        detectLatestBackupFile(adapter);
+    }
 
     // subscribe on all variables of this adapter instance with pattern "adapterName.X.memory*"
     adapter.subscribeStates('oneClick.*');